From f7c7f6aaa0d518b7d1eb28db184981c2a12fb515 Mon Sep 17 00:00:00 2001 From: jjinwoong Date: Wed, 16 Nov 2022 14:04:04 +0900 Subject: [PATCH] =?UTF-8?q?[fix]=20=EC=8B=A4=ED=96=89=EB=90=98=EA=B2=8C=20?= =?UTF-8?q?=EB=B3=80=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- DailyQuest/DailyQuest.xcodeproj/project.pbxproj | 8 -------- .../Browse/ViewModel/BrowseViewModel.swift | 12 ++++++------ .../Presentation/Common/Cells/QuestCell.swift | 2 +- 3 files changed, 7 insertions(+), 15 deletions(-) diff --git a/DailyQuest/DailyQuest.xcodeproj/project.pbxproj b/DailyQuest/DailyQuest.xcodeproj/project.pbxproj index 0e6f582..ede479a 100644 --- a/DailyQuest/DailyQuest.xcodeproj/project.pbxproj +++ b/DailyQuest/DailyQuest.xcodeproj/project.pbxproj @@ -57,11 +57,8 @@ A5AC96D929223648003B7637 /* RealmStorage.swift in Sources */ = {isa = PBXBuildFile; fileRef = A5AC96D829223648003B7637 /* RealmStorage.swift */; }; A5AC96DC292237C3003B7637 /* UserQuestEntity.swift in Sources */ = {isa = PBXBuildFile; fileRef = A5AC96DB292237C3003B7637 /* UserQuestEntity.swift */; }; A5AC96DF292239CA003B7637 /* RealmSwift in Frameworks */ = {isa = PBXBuildFile; productRef = A5AC96DE292239CA003B7637 /* RealmSwift */; }; - A5AC96E329223E2F003B7637 /* DefaultQuestsRepository.swift in Sources */ = {isa = PBXBuildFile; fileRef = A5AC96E229223E2F003B7637 /* DefaultQuestsRepository.swift */; }; A5AC96E629223F06003B7637 /* UserQuestsStorage.swift in Sources */ = {isa = PBXBuildFile; fileRef = A5AC96E529223F06003B7637 /* UserQuestsStorage.swift */; }; A5AC96E829223F27003B7637 /* RealmUserQuestsStorage.swift in Sources */ = {isa = PBXBuildFile; fileRef = A5AC96E729223F27003B7637 /* RealmUserQuestsStorage.swift */; }; - 9B1CFB392922AFC700CCE97A /* QuestView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9B1CFB362922763E00CCE97A /* QuestView.swift */; }; - 9B1CFB3B2922BBDA00CCE97A /* BrowseCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9B1CFB342922460100CCE97A /* BrowseCell.swift */; }; B50078D629222F3F0070AFC4 /* CircleCheckView.swift in Sources */ = {isa = PBXBuildFile; fileRef = B50078D529222F3F0070AFC4 /* CircleCheckView.swift */; }; B58DFC0A29227DA800C68A4B /* CalendarCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = B58DFC0929227DA800C68A4B /* CalendarCell.swift */; }; /* End PBXBuildFile section */ @@ -130,11 +127,8 @@ A51F01DC2923468F0031ECA2 /* BrowseQuestEntity+Mapping.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "BrowseQuestEntity+Mapping.swift"; sourceTree = ""; }; A5AC96D829223648003B7637 /* RealmStorage.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RealmStorage.swift; sourceTree = ""; }; A5AC96DB292237C3003B7637 /* UserQuestEntity.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = UserQuestEntity.swift; sourceTree = ""; }; - A5AC96E229223E2F003B7637 /* DefaultQuestsRepository.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DefaultQuestsRepository.swift; sourceTree = ""; }; A5AC96E529223F06003B7637 /* UserQuestsStorage.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = UserQuestsStorage.swift; sourceTree = ""; }; A5AC96E729223F27003B7637 /* RealmUserQuestsStorage.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RealmUserQuestsStorage.swift; sourceTree = ""; }; - 9B1CFB342922460100CCE97A /* BrowseCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BrowseCell.swift; sourceTree = ""; }; - 9B1CFB362922763E00CCE97A /* QuestView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = QuestView.swift; sourceTree = ""; }; B50078D529222F3F0070AFC4 /* CircleCheckView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CircleCheckView.swift; sourceTree = ""; }; B58DFC0929227DA800C68A4B /* CalendarCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CalendarCell.swift; sourceTree = ""; }; /* End PBXFileReference section */ @@ -496,7 +490,6 @@ A5AC96D42922356E003B7637 /* Repositories */ = { isa = PBXGroup; children = ( - A5AC96E229223E2F003B7637 /* DefaultQuestsRepository.swift */, A5AC96D52922357E003B7637 /* Util */, ); path = Repositories; @@ -721,7 +714,6 @@ 3499551529232533007AB99E /* UIColor+.swift in Sources */, 34A529DA29247B9C001BAD34 /* AppDIContainer.swift in Sources */, 34ACC32D291DE9C000741371 /* AppDelegate.swift in Sources */, - A5AC96E329223E2F003B7637 /* DefaultQuestsRepository.swift in Sources */, A5AC96D929223648003B7637 /* RealmStorage.swift in Sources */, A51189C329226E66008A9D33 /* UserQuestEntity+Mapping.swift in Sources */, A51F01D3292340360031ECA2 /* BrowseQuestsStorage.swift in Sources */, diff --git a/DailyQuest/DailyQuest/Presentation/Browse/ViewModel/BrowseViewModel.swift b/DailyQuest/DailyQuest/Presentation/Browse/ViewModel/BrowseViewModel.swift index e518efd..be4d408 100644 --- a/DailyQuest/DailyQuest/Presentation/Browse/ViewModel/BrowseViewModel.swift +++ b/DailyQuest/DailyQuest/Presentation/Browse/ViewModel/BrowseViewModel.swift @@ -12,16 +12,16 @@ import RxSwift final class BrowseViewModel { let user1 = User(uuid: UUID(), nickName: "jinwoong", profile: Data(), backgroundImage: Data(), description: "") let quests1 = [ - Quest(title: "물마시기", startDay: Date(), endDay: Date(), repeat: 1, currentCount: 2, totalCount: 5), - Quest(title: "코딩하기", startDay: Date(), endDay: Date(), repeat: 1, currentCount: 0, totalCount: 10) + Quest(uuid: UUID(), title: "물마시기", startDay: Date(), endDay: Date(), repeat: 1, currentCount: 2, totalCount: 5), + Quest(uuid: UUID(), title: "코딩하기", startDay: Date(), endDay: Date(), repeat: 1, currentCount: 0, totalCount: 10) ] let user2 = User(uuid: UUID(), nickName: "someone", profile: Data(), backgroundImage: Data(), description: "") let quests2 = [ - Quest(title: "물마시기", startDay: Date(), endDay: Date(), repeat: 1, currentCount: 4, totalCount: 5), - Quest(title: "책읽기", startDay: Date(), endDay: Date(), repeat: 1, currentCount: 9, totalCount: 20), - Quest(title: "달리기", startDay: Date(), endDay: Date(), repeat: 1, currentCount: 4, totalCount: 9), - Quest(title: "잠자기", startDay: Date(), endDay: Date(), repeat: 1, currentCount: 1, totalCount: 1) + Quest(uuid: UUID(), title: "물마시기", startDay: Date(), endDay: Date(), repeat: 1, currentCount: 4, totalCount: 5), + Quest(uuid: UUID(), title: "책읽기", startDay: Date(), endDay: Date(), repeat: 1, currentCount: 9, totalCount: 20), + Quest(uuid: UUID(), title: "달리기", startDay: Date(), endDay: Date(), repeat: 1, currentCount: 4, totalCount: 9), + Quest(uuid: UUID(), title: "잠자기", startDay: Date(), endDay: Date(), repeat: 1, currentCount: 1, totalCount: 1) ] let data: Observable<[(User, [Quest])]> diff --git a/DailyQuest/DailyQuest/Presentation/Common/Cells/QuestCell.swift b/DailyQuest/DailyQuest/Presentation/Common/Cells/QuestCell.swift index 38433d6..bd7c7b7 100644 --- a/DailyQuest/DailyQuest/Presentation/Common/Cells/QuestCell.swift +++ b/DailyQuest/DailyQuest/Presentation/Common/Cells/QuestCell.swift @@ -111,7 +111,7 @@ struct QuestCellPreview: PreviewProvider{ static var previews: some View { UIViewPreview { let cell = QuestCell(frame: .zero) - let quest = Quest(title: "my quest", startDay: Date(), endDay: Date(), repeat: 1, currentCount: 2, totalCount: 5) + let quest = Quest(uuid: UUID(), title: "my quest", startDay: Date(), endDay: Date(), repeat: 1, currentCount: 2, totalCount: 5) cell.setup(with: quest) return cell