fix: 프로필 상세 패널 라우팅 조정

Author: opficdev

Application/DevLogPresentation/Sources/Main/MainView.swift

@@ -328,9 +328,22 @@ struct MainView: View {
 
     private var profileRegularDetailView: some View {
         Group {
-            if let todoId = profileSelectedTodoId {
-                TodoDetailView(viewModel: profileViewCoordinator.makeTodoDetailViewModel(todoId: todoId))
-                    .id(todoId)
+            if let profileRoute = profileViewCoordinator.router.root {
+                switch profileRoute {
+                case .activity(let todoId):
+                    TodoDetailView(viewModel: profileViewCoordinator.makeTodoDetailViewModel(todoId: todoId))
+                        .id(todoId)
+                case .settings, .theme, .pushNotification, .account:
+                    NavigationStack(path: Binding(
+                        get: { profileViewCoordinator.router.detailPath },
+                        set: { profileViewCoordinator.router.detailPath = $0 }
+                    )) {
+                        profileRegularDestinationView(profileRoute)
+                            .navigationDestination(for: ProfileRoute.self) { route in
+                                profileRegularDestinationView(route)
+                            }
+                    }
+                }
             } else {
                 ContentUnavailableView(
                     String(localized: "profile_select_detail"),
@@ -340,6 +353,31 @@ struct MainView: View {
         }
         .background(Color(.secondarySystemBackground).ignoresSafeArea())
     }
+
+    @ViewBuilder
+    private func profileRegularDestinationView(_ route: ProfileRoute) -> some View {
+        switch route {
+        case .activity(let todoId):
+            TodoDetailView(viewModel: profileViewCoordinator.makeTodoDetailViewModel(todoId: todoId))
+                .id(todoId)
+        case .settings:
+            SettingView(viewModel: profileViewCoordinator.settingViewModel)
+                .environment(profileViewCoordinator.router)
+        case .theme:
+            ThemeView(
+                theme: Binding(
+                    get: { profileViewCoordinator.settingViewModel.state.theme },
+                    set: { profileViewCoordinator.settingViewModel.send(.setTheme($0)) }
+                )
+            )
+        case .pushNotification:
+            PushNotificationSettingsView(
+                viewModel: profileViewCoordinator.makePushNotificationSettingsViewModel()
+            )
+        case .account:
+            AccountView(viewModel: profileViewCoordinator.makeAccountViewModel())
+        }
+    }
 }
 
 private extension MainView {
@@ -393,15 +431,6 @@ private extension MainView {
         )
     }
 
-    var profileSelectedTodoId: String? {
-        for route in profileViewCoordinator.router.path.reversed() {
-            if case let .activity(todoId) = route {
-                return todoId
-            }
-        }
-        return nil
-    }
-
 }
 private extension MainTab {
     var title: String {

Application/DevLogPresentation/Sources/Profile/ProfileView.swift

@@ -19,15 +19,6 @@ struct ProfileView: View {
             if isCompactLayout {
                 NavigationStack(path: navigationPath) {
                     profileContentView
-                        .toolbar {
-                            ToolbarItem(placement: .topBarTrailing) {
-                                Button {
-                                    coordinator.router.push(.settings)
-                                } label: {
-                                    Image(systemName: "gearshape")
-                                }
-                            }
-                        }
                         .navigationDestination(for: ProfileRoute.self) { route in
                             profileDestinationView(route)
                         }
@@ -36,6 +27,7 @@ struct ProfileView: View {
                 profileContentView
             }
         }
+        .toolbar { profileToolbarContent }
         .onChange(of: focused) { _, newValue in
             withAnimation {
                 coordinator.viewModel.send(.updateStatusTextFieldFocus(newValue))
@@ -137,6 +129,21 @@ struct ProfileView: View {
         .background(Color(.systemGroupedBackground))
     }
 
+    @ToolbarContentBuilder
+    private var profileToolbarContent: some ToolbarContent {
+        ToolbarItem(placement: .topBarTrailing) {
+            Button {
+                if isCompactLayout {
+                    coordinator.router.push(.settings)
+                } else {
+                    coordinator.router.replace(with: .settings)
+                }
+            } label: {
+                Image(systemName: "gearshape")
+            }
+        }
+    }
+
     @ViewBuilder
     private func profileDestinationView(_ route: ProfileRoute) -> some View {
         switch route {
@@ -368,7 +375,11 @@ struct ProfileView: View {
                 ForEach(activities) { activity in
                     Button {
                         if !activity.isDeleted {
-                            coordinator.router.push(.activity(activity.todoId))
+                            if isCompactLayout {
+                                coordinator.router.push(.activity(activity.todoId))
+                            } else {
+                                coordinator.router.replace(with: .activity(activity.todoId))
+                            }
                         }
                     } label: {
                         let item = TodoCategoryItem(from: activity.category)