Skip to content

Commit a6c2bca

Browse files
authored
[#459] SettingView에서 내비게이션이 되지 않는 현상을 해결한다 (#480)
* refactor: ViewModel 파일을 화면별 디렉토리로 이동 * refactor: Settings 화면의 네비게이션 상태를 Profile 코디네이터로 이동 * refactor: path -> route
1 parent 708287d commit a6c2bca

22 files changed

Lines changed: 172 additions & 137 deletions

Application/DevLogPresentation/Sources/Home/HomeView.swift renamed to Application/DevLogPresentation/Sources/Home/Home/HomeView.swift

File renamed without changes.

Application/DevLogPresentation/Sources/Home/HomeViewCoordinator.swift renamed to Application/DevLogPresentation/Sources/Home/Home/HomeViewCoordinator.swift

File renamed without changes.

Application/DevLogPresentation/Sources/ViewModel/HomeViewModel.swift renamed to Application/DevLogPresentation/Sources/Home/Home/HomeViewModel.swift

File renamed without changes.

Application/DevLogPresentation/Sources/ViewModel/TodoDetailViewModel.swift renamed to Application/DevLogPresentation/Sources/Home/TodoDetailViewModel.swift

File renamed without changes.

Application/DevLogPresentation/Sources/ViewModel/TodoEditorViewModel.swift renamed to Application/DevLogPresentation/Sources/Home/TodoEditorViewModel.swift

File renamed without changes.

Application/DevLogPresentation/Sources/ViewModel/TodoListViewModel.swift renamed to Application/DevLogPresentation/Sources/Home/TodoListViewModel.swift

File renamed without changes.

Application/DevLogPresentation/Sources/ViewModel/TodoManageViewModel.swift renamed to Application/DevLogPresentation/Sources/Home/TodoManageViewModel.swift

File renamed without changes.

Application/DevLogPresentation/Sources/ViewModel/LoginViewModel.swift renamed to Application/DevLogPresentation/Sources/Login/LoginViewModel.swift

File renamed without changes.

Application/DevLogPresentation/Sources/Main/MainView.swift

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ struct MainView: View {
1414
@State private var coordinator: MainViewCoordinator
1515
@State private var homeViewCoordinator: HomeViewCoordinator
1616
@State private var todayViewCoordinator: TodayViewCoordinator
17+
@State private var profileViewCoordinator: ProfileViewCoordinator
1718
@Binding var selectedTab: MainTab
1819

1920
init(
@@ -23,6 +24,7 @@ struct MainView: View {
2324
self._coordinator = State(initialValue: MainViewCoordinator(container: container))
2425
self._homeViewCoordinator = State(initialValue: HomeViewCoordinator(container: container))
2526
self._todayViewCoordinator = State(initialValue: TodayViewCoordinator(container: container))
27+
self._profileViewCoordinator = State(initialValue: ProfileViewCoordinator(container: container))
2628
self._selectedTab = selectedTab
2729
}
2830

@@ -316,7 +318,7 @@ struct MainView: View {
316318
}
317319

318320
private var profileView: some View {
319-
ProfileView(viewModel: coordinator.profileViewModel)
321+
ProfileView(coordinator: profileViewCoordinator)
320322
}
321323
}
322324

Application/DevLogPresentation/Sources/Main/MainViewCoordinator.swift

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@ import DevLogDomain
1414
final class MainViewCoordinator {
1515
let mainViewModel: MainViewModel
1616
let pushNotificationListViewModel: PushNotificationListViewModel
17-
let profileViewModel: ProfileViewModel
1817
var todoIdToPresent: TodoIdItem?
1918
private let diContainer: DIContainer
2019
@ObservationIgnored
@@ -35,14 +34,6 @@ final class MainViewCoordinator {
3534
fetchQueryUseCase: container.resolve(FetchPushNotificationQueryUseCase.self),
3635
updateQueryUseCase: container.resolve(UpdatePushNotificationQueryUseCase.self)
3736
)
38-
self.profileViewModel = ProfileViewModel(
39-
fetchUserDataUseCase: container.resolve(FetchUserDataUseCase.self),
40-
fetchTodosUseCase: container.resolve(FetchTodosUseCase.self),
41-
upsertStatusMessageUseCase: container.resolve(UpsertStatusMessageUseCase.self),
42-
networkConnectivityUseCase: container.resolve(ObserveNetworkConnectivityUseCase.self),
43-
fetchHeatmapActivityTypesUseCase: container.resolve(FetchHeatmapActivityTypesUseCase.self),
44-
updateHeatmapActivityTypesUseCase: container.resolve(UpdateHeatmapActivityTypesUseCase.self)
45-
)
4637
}
4738

4839
func todoListViewModel(category: TodoCategory) -> TodoListViewModel {

0 commit comments

Comments
 (0)