From 560e4ca9ab42c81112a4add95906f4b51df423ae Mon Sep 17 00:00:00 2001 From: solbat Date: Tue, 13 Dec 2022 20:42:29 +0900 Subject: [PATCH 1/4] =?UTF-8?q?[fix]=20HomeViewModel=20:=20=EB=9E=9C?= =?UTF-8?q?=EB=8D=A4=EC=9C=BC=EB=A1=9C=20=EC=B6=9C=EB=A0=A5=ED=95=98?= =?UTF-8?q?=EC=A7=80=20=EC=95=8A=EA=B3=A0=20=EA=B3=A0=EC=A0=95=20=EC=88=9C?= =?UTF-8?q?=EC=84=9C=EB=A1=9C=20=EC=B6=9C=EB=A0=A5=ED=95=98=EB=8F=84?= =?UTF-8?q?=EB=A1=9D=20=EB=B3=80=EA=B2=BD=20(#107)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- SpaceCapsule/SpaceCapsule/Scene/TabBar/Home/HomeViewModel.swift | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/SpaceCapsule/SpaceCapsule/Scene/TabBar/Home/HomeViewModel.swift b/SpaceCapsule/SpaceCapsule/Scene/TabBar/Home/HomeViewModel.swift index 814342e..b143cff 100644 --- a/SpaceCapsule/SpaceCapsule/Scene/TabBar/Home/HomeViewModel.swift +++ b/SpaceCapsule/SpaceCapsule/Scene/TabBar/Home/HomeViewModel.swift @@ -57,7 +57,7 @@ final class HomeViewModel: BaseViewModel, CapsuleCellNeedable { return } owner.output.featuredCapsuleCellItems.accept( - CapsuleType.allCases.shuffled() + CapsuleType.allCases .map { owner.getHomeCapsuleCellItem(capsules: capsuleList, type: $0) } .compactMap({ $0 }) ) From e522f7efa0b42c75cf81f862cd89050434f7810d Mon Sep 17 00:00:00 2001 From: solbat Date: Tue, 13 Dec 2022 20:43:27 +0900 Subject: [PATCH 2/4] =?UTF-8?q?[fix]=20HomeVC=20:=20=ED=99=88=20=ED=99=94?= =?UTF-8?q?=EB=A9=B4=EC=97=90=20=EB=8F=8C=EC=95=84=EA=B0=88=20=EB=95=8C?= =?UTF-8?q?=EB=A7=88=EB=8B=A4=20=EB=A7=A4=EB=B2=88=20fetchCapsules?= =?UTF-8?q?=ED=95=98=EC=97=AC=20refresh=20=ED=95=98=EB=8F=84=EB=A1=9D=20(#?= =?UTF-8?q?107)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../SpaceCapsule/Scene/TabBar/Home/HomeViewController.swift | 4 ---- 1 file changed, 4 deletions(-) diff --git a/SpaceCapsule/SpaceCapsule/Scene/TabBar/Home/HomeViewController.swift b/SpaceCapsule/SpaceCapsule/Scene/TabBar/Home/HomeViewController.swift index 2819491..52e68ce 100644 --- a/SpaceCapsule/SpaceCapsule/Scene/TabBar/Home/HomeViewController.swift +++ b/SpaceCapsule/SpaceCapsule/Scene/TabBar/Home/HomeViewController.swift @@ -27,7 +27,6 @@ final class HomeViewController: UIViewController, BaseViewController { override func viewDidLoad() { super.viewDidLoad() - configure() configureView() bind() @@ -37,9 +36,6 @@ final class HomeViewController: UIViewController, BaseViewController { override func viewWillAppear(_ animated: Bool) { super.viewWillAppear(animated) viewModel?.input.viewWillAppear.onNext(()) - } - - private func configure() { AppDataManager.shared.fetchCapsules() } From 058dd6015bae54fbc0dd4b26462f5106aeea557e Mon Sep 17 00:00:00 2001 From: solbat Date: Tue, 13 Dec 2022 20:45:36 +0900 Subject: [PATCH 3/4] =?UTF-8?q?[fix]=20CapsuleType=EC=9D=98=20title?= =?UTF-8?q?=EC=9D=98=20=EC=88=9C=EC=84=9C=EC=99=80=20=ED=91=9C=ED=98=84=20?= =?UTF-8?q?=EB=B3=80=EA=B2=BD=20(#107)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Home/Components/HomeCapsuleCellItem.swift | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/SpaceCapsule/SpaceCapsule/Scene/TabBar/Home/Components/HomeCapsuleCellItem.swift b/SpaceCapsule/SpaceCapsule/Scene/TabBar/Home/Components/HomeCapsuleCellItem.swift index 0cab4b6..2868af7 100644 --- a/SpaceCapsule/SpaceCapsule/Scene/TabBar/Home/Components/HomeCapsuleCellItem.swift +++ b/SpaceCapsule/SpaceCapsule/Scene/TabBar/Home/Components/HomeCapsuleCellItem.swift @@ -20,18 +20,18 @@ enum CapsuleType: CaseIterable { var title: String { switch self { - case .closedLongest: - return "밀봉한지 가장 오래된 캡슐" - case .closedShortest: - return "가장 최근에 생성한 캡슐" - case .memoryOldest: - return "가장 오래된 추억이 담긴 캡슐" - case .memoryNewest: - return "가장 최근 추억이 담긴 캡슐" case .nearest: return "가장 가까운 위치의 캡슐" case .farthest: return "가장 먼 위치의 캡슐" + case .closedShortest: + return "가장 최근에 생성한 캡슐" + case .closedLongest: + return "가장 오래전 생성한 캡슐" + case .memoryNewest: + return "가장 최근 추억이 담긴 캡슐" + case .memoryOldest: + return "가장 오랜 추억이 담긴 캡슐" case .leastOpened: return "열어본 횟수가 가장 적은 캡슐" case .mostOpened: From d61db64b4abc376628e2eb54d259b870ad3d9474 Mon Sep 17 00:00:00 2001 From: solbat Date: Tue, 13 Dec 2022 20:47:35 +0900 Subject: [PATCH 4/4] =?UTF-8?q?[fix]=20CapsuleType=20=EC=88=9C=EC=84=9C=20?= =?UTF-8?q?=EB=B3=80=EA=B2=BD=20(#107)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../TabBar/Home/Components/HomeCapsuleCellItem.swift | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/SpaceCapsule/SpaceCapsule/Scene/TabBar/Home/Components/HomeCapsuleCellItem.swift b/SpaceCapsule/SpaceCapsule/Scene/TabBar/Home/Components/HomeCapsuleCellItem.swift index 2868af7..3ceb94c 100644 --- a/SpaceCapsule/SpaceCapsule/Scene/TabBar/Home/Components/HomeCapsuleCellItem.swift +++ b/SpaceCapsule/SpaceCapsule/Scene/TabBar/Home/Components/HomeCapsuleCellItem.swift @@ -9,12 +9,12 @@ import UIKit import CoreLocation enum CapsuleType: CaseIterable { - case closedLongest - case closedShortest - case memoryOldest - case memoryNewest case nearest case farthest + case closedShortest + case closedLongest + case memoryNewest + case memoryOldest case leastOpened case mostOpened