Feat: 추천 루틴 화면 동작 분기 처리 (#T3-187)

choijungp · choijungp · commit d569012b9f16 · 2025-10-01T13:53:20.000+09:00
diff --git a/Projects/Presentation/Sources/MyPage/View/MypageView.swift b/Projects/Presentation/Sources/MyPage/View/MypageView.swift
@@ -41,6 +41,9 @@ final class MypageView: BaseViewController<MypageViewModel> {
 
     override func viewWillAppear(_ animated: Bool) {
         super.viewWillAppear(animated)
+
+        navigationController?.setNavigationBarHidden(false, animated: animated)
+
         let appearance = UINavigationBarAppearance()
         appearance.configureWithOpaqueBackground()
         appearance.backgroundColor = .white
diff --git a/Projects/Presentation/Sources/ResultRecommendedRoutine/View/ResultRecommendedRoutineViewController.swift b/Projects/Presentation/Sources/ResultRecommendedRoutine/View/ResultRecommendedRoutineViewController.swift
@@ -37,8 +37,7 @@ final class ResultRecommendedRoutineViewController: BaseViewController<ResultRec
 
         var confirmButtonLabel: String {
             switch self {
-            case .onboarding: "등록하기"
-            case .mypage: "확인"
+            case .onboarding, .mypage: "등록하기"
             case .emotion: "맞춤 추천 루틴 보러 가기"
             }
         }
@@ -54,9 +53,9 @@ final class ResultRecommendedRoutineViewController: BaseViewController<ResultRec
 
         var isRoutineButtonEnabled: Bool {
             switch self {
-            case .onboarding, .emotion:
+            case .onboarding, .mypage:
                 true
-            case .mypage:
+            case .emotion:
                 false
             }
         }
@@ -132,7 +131,7 @@ final class ResultRecommendedRoutineViewController: BaseViewController<ResultRec
         case .onboarding, .mypage:
             configureCustomNavigationBar(navigationBarStyle: .withProgressBar(step: OnboardingType.allCases.count + 1))
         case .emotion:
-            configureCustomNavigationBar(navigationBarStyle: .withBackButton(title: ""))
+            configureCustomNavigationBar(navigationBarStyle: .withTitle(title: ""))
         }
 
         let mainLabelText = entryPoint.mainLabelText
@@ -216,9 +215,9 @@ final class ResultRecommendedRoutineViewController: BaseViewController<ResultRec
         case .onboarding:
             confirmButton = PrimaryButton(buttonState: .disabled, buttonTitle: entryPoint.confirmButtonLabel)
         case .mypage:
-            confirmButton = PrimaryButton(buttonState: .default, buttonTitle: entryPoint.confirmButtonLabel)
-        case .emotion:
             confirmButton = PrimaryButton(buttonState: .disabled, buttonTitle: entryPoint.confirmButtonLabel)
+        case .emotion:
+            confirmButton = PrimaryButton(buttonState: .default, buttonTitle: entryPoint.confirmButtonLabel)
         }
     }
 
@@ -312,20 +311,27 @@ final class ResultRecommendedRoutineViewController: BaseViewController<ResultRec
     }
 
     private func configureSkipButton() {
-        skipButton.addAction(UIAction { [weak self] _ in
-            guard let self else { return }
-            switch entryPoint {
-            case .emotion:
-                if let navigationController = self.navigationController {
-                    let viewControllers = navigationController.viewControllers
-                    if viewControllers.count >= 3 {
-                        navigationController.popToViewController(viewControllers[viewControllers.count - 3], animated: false)
+        skipButton.addAction(
+            UIAction { [weak self] _ in
+                guard let self else { return }
+                switch entryPoint {
+                case .emotion:
+                    if
+                        let windowScene = UIApplication.shared.connectedScenes.first as? UIWindowScene,
+                        let window = windowScene.windows.first(where: { $0.isKeyWindow }),
+                        let tabBarView = window.rootViewController as? TabBarView {
+                        self.navigationController?.popToRootViewController(animated: false)
+                        tabBarView.selectedIndex = 0
                     }
+
+                case .onboarding:
+                    goToNextView()
+
+                case .mypage:
+                    break
                 }
-            case .onboarding, .mypage:
-                goToNextView()
-            }
-        }, for: .touchUpInside)
+            },
+            for: .touchUpInside)
     }
 
     private func goToNextView() {
@@ -337,6 +343,9 @@ final class ResultRecommendedRoutineViewController: BaseViewController<ResultRec
             }
 
         case .mypage:
+            viewModel.action(input: .fetchSelectedRoutineId)
+
+        case .emotion:
             if
                 let windowScene = UIApplication.shared.connectedScenes.first as? UIWindowScene,
                 let window = windowScene.windows.first(where: { $0.isKeyWindow }),
@@ -345,16 +354,16 @@ final class ResultRecommendedRoutineViewController: BaseViewController<ResultRec
                 tabBarView.selectedIndex = 1
             }
             viewModel.action(input: .showRecommendedRoutineToastMessageView)
-
-        case .emotion:
-            viewModel.action(input: .fetchSelectedRoutineId)
         }
     }
 
     private func goToRoutineCreationView(routineId: Int) {
         guard let routineCreationViewModel = DIContainer.shared.resolve(type: RoutineCreationViewModel.self)
         else { fatalError("routineCreationViewModel 의존성이 등록되지 않았습니다.") }
-        let routineCreationView = RoutineCreationViewController(viewModel: routineCreationViewModel, recommendRoutineId: routineId)
+        let routineCreationView = RoutineCreationViewController(
+            viewModel: routineCreationViewModel,
+            recommendRoutineId: routineId,
+            isFromMypage: true)
         routineCreationView.hidesBottomBarWhenPushed = true
         self.navigationController?.pushViewController(routineCreationView, animated: true)
     }
diff --git a/Projects/Presentation/Sources/ResultRecommendedRoutine/ViewModel/ResultRecommendedRoutineViewModel.swift b/Projects/Presentation/Sources/ResultRecommendedRoutine/ViewModel/ResultRecommendedRoutineViewModel.swift
@@ -128,7 +128,7 @@ final class ResultRecommendedRoutineViewModel: ViewModel {
         if selectedRoutines.contains(routine) {
             selectedRoutines.remove(routine)
         } else {
-            if case .emotion = viewModelType {
+            if case .mypage = viewModelType {
                 selectedRoutines.removeAll()
             }
             selectedRoutines.insert(routine)
diff --git a/Projects/Presentation/Sources/RoutineCreation/View/RoutineCreationViewController.swift b/Projects/Presentation/Sources/RoutineCreation/View/RoutineCreationViewController.swift
@@ -67,6 +67,7 @@ final class RoutineCreationViewController: BaseViewController<RoutineCreationVie
     private let registerButton = UIButton()
     private let navigationTitle: String
     private let registerButtonTitle: String
+    private let isFromMypage: Bool
     private var cancellables = Set<AnyCancellable>()
 
     init(
@@ -75,6 +76,7 @@ final class RoutineCreationViewController: BaseViewController<RoutineCreationVie
     ) {
         navigationTitle = updateInfo?.routineId == nil ? "루틴 등록" : "루틴 수정"
         registerButtonTitle = updateInfo?.routineId == nil ? "등록하기" : "수정하기"
+        self.isFromMypage = false
 
         super.init(viewModel: viewModel)
 
@@ -85,9 +87,14 @@ final class RoutineCreationViewController: BaseViewController<RoutineCreationVie
         }
     }
 
-    init(viewModel: RoutineCreationViewModel, recommendRoutineId: Int) {
+    init(
+        viewModel: RoutineCreationViewModel,
+        recommendRoutineId: Int,
+        isFromMypage: Bool = false
+    ) {
         navigationTitle = "루틴 등록"
         registerButtonTitle = "등록하기"
+        self.isFromMypage = isFromMypage
 
         super.init(viewModel: viewModel)
 
@@ -136,8 +143,20 @@ final class RoutineCreationViewController: BaseViewController<RoutineCreationVie
         registerButton.titleLabel?.font = BitnagilFont.init(style: .body1, weight: .semiBold).font
         registerButton.addAction(
             UIAction { [weak self] _ in
-                self?.viewModel.action(input: .registerRoutine)
-                self?.navigationController?.popViewController(animated: true)
+                guard let self else { return }
+                self.viewModel.action(input: .registerRoutine)
+                if self.isFromMypage {
+                    if
+                        let windowScene = UIApplication.shared.connectedScenes.first as? UIWindowScene,
+                        let window = windowScene.windows.first(where: { $0.isKeyWindow }),
+                        let tabBarView = window.rootViewController as? TabBarView {
+                        self.navigationController?.popToRootViewController(animated: false)
+                        tabBarView.selectedIndex = 1
+                        viewModel.action(input: .showRecommendedRoutineToastMessageView)
+                    }
+                } else {
+                    self.navigationController?.popViewController(animated: true)
+                }
             },
             for: .touchUpInside)
         bindCreationCardViews()
diff --git a/Projects/Presentation/Sources/RoutineCreation/ViewModel/RoutineCreationViewModel.swift b/Projects/Presentation/Sources/RoutineCreation/ViewModel/RoutineCreationViewModel.swift
@@ -33,6 +33,7 @@ final class RoutineCreationViewModel: ViewModel {
         case configureEndDate(date: Date)
         case configureExecution(type: ExecutionTime)
         case registerRoutine
+        case showRecommendedRoutineToastMessageView
     }
 
     struct Output {
@@ -108,6 +109,8 @@ final class RoutineCreationViewModel: ViewModel {
             periodStartSubject.send(date)
         case .configureEndDate(let date):
             periodEndSubject.send(date)
+        case .showRecommendedRoutineToastMessageView:
+            showRecommendedRoutineToastMessageView()
         }
         
         updateIsRoutineValid()
@@ -279,4 +282,13 @@ final class RoutineCreationViewModel: ViewModel {
             }
         }
     }
+
+    private func showRecommendedRoutineToastMessageView() {
+        DispatchQueue.main.asyncAfter(deadline: .now() + 0.1) {
+            NotificationCenter.default.post(
+                name: .showRecommendedRoutineToast,
+                object: nil,
+                userInfo: nil)
+        }
+    }
 }

Original file line number	Diff line number	Diff line change
`@@ -128,7 +128,7 @@ final class ResultRecommendedRoutineViewModel: ViewModel {`
`128`	`128`	`if selectedRoutines.contains(routine) {`
`129`	`129`	`selectedRoutines.remove(routine)`
`130`	`130`	`} else {`
`131`		`- if case .emotion = viewModelType {`
	`131`	`+ if case .mypage = viewModelType {`
`132`	`132`	`selectedRoutines.removeAll()`
`133`	`133`	`}`
`134`	`134`	`selectedRoutines.insert(routine)`
Original file line number	Diff line number	Diff line change
`@@ -33,6 +33,7 @@ final class RoutineCreationViewModel: ViewModel {`
`33`	`33`	`case configureEndDate(date: Date)`
`34`	`34`	`case configureExecution(type: ExecutionTime)`
`35`	`35`	`case registerRoutine`
	`36`	`+ case showRecommendedRoutineToastMessageView`
`36`	`37`	`}`
`37`	`38`
`38`	`39`	`struct Output {`
`@@ -108,6 +109,8 @@ final class RoutineCreationViewModel: ViewModel {`
`108`	`109`	`periodStartSubject.send(date)`
`109`	`110`	`case .configureEndDate(let date):`
`110`	`111`	`periodEndSubject.send(date)`
	`112`	`+ case .showRecommendedRoutineToastMessageView:`
	`113`	`+ showRecommendedRoutineToastMessageView()`
`111`	`114`	`}`
`112`	`115`
`113`	`116`	`updateIsRoutineValid()`
`@@ -279,4 +282,13 @@ final class RoutineCreationViewModel: ViewModel {`
`279`	`282`	`}`
`280`	`283`	`}`
`281`	`284`	`}`
	`285`	`+`
	`286`	`+ private func showRecommendedRoutineToastMessageView() {`
	`287`	`+ DispatchQueue.main.asyncAfter(deadline: .now() + 0.1) {`
	`288`	`+ NotificationCenter.default.post(`
	`289`	`+ name: .showRecommendedRoutineToast,`
	`290`	`+ object: nil,`
	`291`	`+ userInfo: nil)`
	`292`	`+ }`
	`293`	`+ }`
`282`	`294`	`}`