[Fix] #244 - mypage 로직 수정

DO-NOTTO-DO · Mar 23, 2024 · 438c7c3 · 438c7c3
1 parent a48c85b
commit 438c7c3
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 19 deletions.
diff --git a/iOS-NOTTODO/iOS-NOTTODO/Presentation/Home/ViewControllers/MyPageViewController.swift b/iOS-NOTTODO/iOS-NOTTODO/Presentation/Home/ViewControllers/MyPageViewController.swift
diff --git a/iOS-NOTTODO/iOS-NOTTODO/Presentation/MyPage/Cells/InfoCollecitonViewCell.swift b/iOS-NOTTODO/iOS-NOTTODO/Presentation/MyPage/Cells/InfoCollecitonViewCell.swift
@@ -96,9 +96,8 @@ extension InfoCollectionViewCell {
     }
 
     func configure(with model: MyPageRowData) {
-        horizontalStackView.removeArrangedSubview(iconImage)
-        iconImage.removeFromSuperview()
+        iconImage.isHidden = true
         titleLabel.text = model.title
-        arrowImage.isHidden = false
+        arrowImage.isHidden = model.isArrowHidden
     }
 }
diff --git a/iOS-NOTTODO/iOS-NOTTODO/Presentation/MyPage/Model/MyPageModel.swift b/iOS-NOTTODO/iOS-NOTTODO/Presentation/MyPage/Model/MyPageModel.swift
@@ -58,6 +58,7 @@ struct MyPageRowData: Hashable {
     var user: String?
     var email: String?
     var title: String?
+    var isArrowHidden: Bool = false
 
     static var profile: [MyPageRowData] {
         let user = UserDefaults.standard.bool(forKey: DefaultKeys.isAppleLogin) ? KeychainUtil.getAppleUsername() : KeychainUtil.getKakaoNickname()
@@ -78,6 +79,6 @@ struct MyPageRowData: Hashable {
     ]
 
     static func version() -> [MyPageRowData] {
-        return [MyPageRowData(title: I18N.version + " " + (Utils.version ?? "1.0.0"))]
+        return [MyPageRowData(title: I18N.version + " " + (Utils.version ?? "1.0.0"), isArrowHidden: true)]
     }
 }
diff --git a/iOS-NOTTODO/iOS-NOTTODO/Presentation/MyPage/ViewControllers/MyPageViewController.swift b/iOS-NOTTODO/iOS-NOTTODO/Presentation/MyPage/ViewControllers/MyPageViewController.swift
@@ -101,8 +101,6 @@ extension MyPageViewController {
             switch section {
             case .support:
                 cell.configureWithIcon(with: item)
-            case .info:
-                cell.configure(with: item)
             default:
                 cell.configure(with: item)
             }
@@ -118,7 +116,7 @@ extension MyPageViewController {
                 return collectionView.dequeueConfiguredReusableCell(using: profileCellRegistration,
                                                                     for: indexPath,
                                                                     item: item)
-            case  .support, .info, .version:
+            case .support, .info, .version:
                 return collectionView.dequeueConfiguredReusableCell(using: infoCellRegistration,
                                                                     for: indexPath,
                                                                     item: item)

diff --git a/iOS-NOTTODO/iOS-NOTTODO/Presentation/MyPage/ViewModel/MyPageViewModelImpl.swift b/iOS-NOTTODO/iOS-NOTTODO/Presentation/MyPage/ViewModel/MyPageViewModelImpl.swift
@@ -22,7 +22,6 @@ final class MyPageViewModelImpl: MyPageViewModel {
     func transform(input: MyPageViewModelInput) -> MyPageViewModelOutput {
 
         let viewWillAppearSubject =  input.viewWillAppearSubject
-
             .map { _ -> MyPageModel in
                 AmplitudeAnalyticsService.shared.send(event: AnalyticsEvent.MyInfo.viewMyInfo)
 
@@ -37,15 +36,15 @@ final class MyPageViewModelImpl: MyPageViewModel {
 
         input.myPageCellTapped
             .sink { [weak self] indexPath in
-                guard let self else { return }
+                guard let self = self else { return }
                 guard let section = MyPageModel.Section(rawValue: indexPath.section),
                       indexPath.item < section.events.count else { return }
-
+                guard let coordinator = self.coordinator else { return }
                 self.sendAnalyticsEvent(section.events[indexPath.item])
 
                 switch section {
                 case .profile:
-                    self.coordinator?.showMyInfoAccountViewController()
+                    coordinator.showMyInfoAccountViewController()
                 case .support, .info:
                     let url = section.urls[indexPath.item]
                     self.openSafariController.send(url.url)
@@ -61,4 +60,8 @@ final class MyPageViewModelImpl: MyPageViewModel {
     private func sendAnalyticsEvent(_ event: AnalyticsEvent.MyInfo) {
         AmplitudeAnalyticsService.shared.send(event: event)
     }
+
+    deinit {
+        cancelBag.forEach { $0.cancel() }
+    }
 }