🎨 refactor viewModel input

ngocpd-1250 · ngocpd-1250 · commit cbfe4994a3de · 2024-08-21T11:06:11.000+07:00
diff --git a/BaseSwiftUI/Presentation/Scene/Auth/Login/LoginScreen.swift b/BaseSwiftUI/Presentation/Scene/Auth/Login/LoginScreen.swift
@@ -8,8 +8,8 @@
 import SwiftUI
 
 struct LoginScreen: View {
-    @ObservedObject var input: LoginViewModel.Input
-    @ObservedObject var output: LoginViewModel.Output
+    @ObservedObject private var input: LoginViewModel.Input
+    @ObservedObject private var output: LoginViewModel.Output
 
     private let cancelBag = CancelBag()
     private let loginTrigger = PublishRelay<Void>()
diff --git a/BaseSwiftUI/Presentation/Scene/Auth/Onboarding/OnboardingScreen.swift b/BaseSwiftUI/Presentation/Scene/Auth/Onboarding/OnboardingScreen.swift
@@ -8,8 +8,8 @@
 import SwiftUI
 
 struct OnboardingScreen: View {
-    @ObservedObject var input: OnboardingViewModel.Input
-    @ObservedObject var output: OnboardingViewModel.Output
+    private var input: OnboardingViewModel.Input
+    @ObservedObject private var output: OnboardingViewModel.Output
 
     private let cancelBag = CancelBag()
     private let setIsDoneOnboarding = PublishRelay<Void>()
diff --git a/BaseSwiftUI/Presentation/Scene/Auth/Onboarding/OnboardingViewModel.swift b/BaseSwiftUI/Presentation/Scene/Auth/Onboarding/OnboardingViewModel.swift
@@ -16,12 +16,8 @@ struct OnboardingViewModel {
 
 // MARK: - ViewModelType
 extension OnboardingViewModel: ViewModel {
-    final class Input: ObservableObject {
+    struct Input {
         let setIsDoneOnboarding: Driver<Void>
-
-        init(setIsDoneOnboarding: Driver<Void>) {
-            self.setIsDoneOnboarding = setIsDoneOnboarding
-        }
     }
 
     final class Output: ObservableObject {}
diff --git a/BaseSwiftUI/Presentation/Scene/Auth/Register/RegisterScreen.swift b/BaseSwiftUI/Presentation/Scene/Auth/Register/RegisterScreen.swift
@@ -9,8 +9,8 @@ import SwiftUI
 import Combine
 
 struct RegisterScreen: View {
-    @ObservedObject var input: RegisterViewModel.Input
-    @ObservedObject var output: RegisterViewModel.Output
+    @ObservedObject private var input: RegisterViewModel.Input
+    @ObservedObject private var output: RegisterViewModel.Output
 
     private let cancelBag = CancelBag()
     private let registerTrigger = PublishRelay<Void>()
diff --git a/BaseSwiftUI/Presentation/Scene/Home/Movie/MovieDetail/MovieDetailScreen.swift b/BaseSwiftUI/Presentation/Scene/Home/Movie/MovieDetail/MovieDetailScreen.swift
@@ -9,8 +9,8 @@ import SwiftUI
 import Kingfisher
 
 struct MovieDetailScreen: View {
-    @ObservedObject var input: MovieDetailViewModel.Input
-    @ObservedObject var output: MovieDetailViewModel.Output
+    private var input: MovieDetailViewModel.Input
+    @ObservedObject private var output: MovieDetailViewModel.Output
 
     private let cancelBag = CancelBag()
     private let loadTrigger = PublishRelay<Bool>()
diff --git a/BaseSwiftUI/Presentation/Scene/Home/Movie/MovieDetail/MovieDetailViewModel.swift b/BaseSwiftUI/Presentation/Scene/Home/Movie/MovieDetail/MovieDetailViewModel.swift
@@ -18,12 +18,8 @@ struct MovieDetailViewModel {
 
 // MARK: - ViewModelType
 extension MovieDetailViewModel: ViewModel {
-    final class Input: ObservableObject {
+    struct Input {
         let loadTrigger: Driver<Bool>
-
-        init(loadTrigger: Driver<Bool>) {
-            self.loadTrigger = loadTrigger
-        }
     }
 
     final class Output: ObservableObject {
diff --git a/BaseSwiftUI/Presentation/Scene/Home/Movie/TopMovies/TopMoviesScreen.swift b/BaseSwiftUI/Presentation/Scene/Home/Movie/TopMovies/TopMoviesScreen.swift
@@ -8,8 +8,8 @@
 import SwiftUI
 
 struct TopMoviesScreen: View {
-    @ObservedObject var input: TopMoviesViewModel.Input
-    @ObservedObject var output: TopMoviesViewModel.Output
+    private var input: TopMoviesViewModel.Input
+    @ObservedObject private var output: TopMoviesViewModel.Output
 
     private let cancelBag = CancelBag()
     private let toDetailTrigger = PublishRelay<Int>()
diff --git a/BaseSwiftUI/Presentation/Scene/Home/Movie/TopMovies/TopMoviesViewModel.swift b/BaseSwiftUI/Presentation/Scene/Home/Movie/TopMovies/TopMoviesViewModel.swift
@@ -21,15 +21,9 @@ extension TopMoviesViewModel: ViewModel {
         var upcoming: [Movie] = []
     }
 
-    final class Input: ObservableObject {
+    struct Input {
         let loadTrigger: Driver<Bool>
         let toDetailTrigger: Driver<Int>
-
-        init(loadTrigger: Driver<Bool>,
-             toDetailTrigger: Driver<Int>) {
-            self.loadTrigger = loadTrigger
-            self.toDetailTrigger = toDetailTrigger
-        }
     }
 
     final class Output: ObservableObject {
diff --git a/BaseSwiftUI/Presentation/Scene/Home/Settings/SettingsScreen.swift b/BaseSwiftUI/Presentation/Scene/Home/Settings/SettingsScreen.swift
@@ -8,8 +8,8 @@
 import SwiftUI
 
 struct SettingsScreen: View {
-    @ObservedObject var input: SettingsViewModel.Input
-    @ObservedObject var output: SettingsViewModel.Output
+    private var input: SettingsViewModel.Input
+    @ObservedObject private var output: SettingsViewModel.Output
 
     private let cancelBag = CancelBag()
     private let logoutTrigger = PublishRelay<Void>()
diff --git a/BaseSwiftUI/Presentation/Scene/Home/Settings/SettingsViewModel.swift b/BaseSwiftUI/Presentation/Scene/Home/Settings/SettingsViewModel.swift
@@ -16,21 +16,11 @@ struct SettingsViewModel {
 
 // MARK: - ViewModelType
 extension SettingsViewModel: ViewModel {
-    final class Input: ObservableObject {
+    struct Input {
         let loadTrigger: Driver<Void>
         let logoutTrigger: Driver<Void>
         let toggleDarkModeTrigger: Driver<Void>
         let toggleLanguageTrigger: Driver<Void>
-
-        init(loadTrigger: Driver<Void>,
-             logoutTrigger: Driver<Void>,
-             toggleDarkModeTrigger: Driver<Void>,
-             toggleLanguageTrigger: Driver<Void>) {
-            self.loadTrigger = loadTrigger
-            self.logoutTrigger = logoutTrigger
-            self.toggleDarkModeTrigger = toggleDarkModeTrigger
-            self.toggleLanguageTrigger = toggleLanguageTrigger
-        }
     }
 
     final class Output: ObservableObject {
diff --git a/BaseSwiftUI/Presentation/Scene/Home/Todo/ListTodo/ListTodoScreen.swift b/BaseSwiftUI/Presentation/Scene/Home/Todo/ListTodo/ListTodoScreen.swift
@@ -8,8 +8,8 @@
 import SwiftUI
 
 struct ListTodoScreen: View {
-    @ObservedObject var input: ListTodoViewModel.Input
-    @ObservedObject var output: ListTodoViewModel.Output
+    @ObservedObject private var output: ListTodoViewModel.Output
+    private var input: ListTodoViewModel.Input
 
     private let cancelBag = CancelBag()
     private let updateCompleted = PublishRelay<TodoItem>()
diff --git a/BaseSwiftUI/Presentation/Scene/Home/Todo/ListTodo/ListTodoViewModel.swift b/BaseSwiftUI/Presentation/Scene/Home/Todo/ListTodo/ListTodoViewModel.swift
@@ -17,18 +17,10 @@ struct ListTodoViewModel {
 
 // MARK: - ViewModelType
 extension ListTodoViewModel: ViewModel {
-    final class Input: ObservableObject {
+    struct Input {
         let loadTrigger: Driver<Void>
         let updateCompleted: Driver<TodoItem>
         let deleteItem: Driver<TodoItem>
-
-        init(loadTrigger: Driver<Void>,
-             updateCompleted: Driver<TodoItem>,
-             deleteItem: Driver<TodoItem>) {
-            self.loadTrigger = loadTrigger
-            self.updateCompleted = updateCompleted
-            self.deleteItem = deleteItem
-        }
     }
 
     final class Output: ObservableObject {
diff --git a/BaseSwiftUI/Presentation/Scene/Home/Todo/NewTodo/NewTodoScreen.swift b/BaseSwiftUI/Presentation/Scene/Home/Todo/NewTodo/NewTodoScreen.swift
@@ -8,8 +8,8 @@
 import SwiftUI
 
 struct NewTodoScreen: View {
-    @ObservedObject var input: NewTodoViewModel.Input
-    @ObservedObject var output: NewTodoViewModel.Output
+    @ObservedObject private var input: NewTodoViewModel.Input
+    @ObservedObject private var output: NewTodoViewModel.Output
 
     private let cancelBag = CancelBag()
     private let closeTrigger = PublishRelay<Void>()
diff --git a/BaseSwiftUI/Presentation/Scene/Home/Todo/Todos/TodosScreen.swift b/BaseSwiftUI/Presentation/Scene/Home/Todo/Todos/TodosScreen.swift
@@ -10,7 +10,7 @@ import Defaults
 import Combine
 
 struct TodosScreen: View {
-    @ObservedObject var input: TodosViewModel.Input
+    private var input: TodosViewModel.Input
     @ObservedObject var output: TodosViewModel.Output
 
     private let cancelBag = CancelBag()
diff --git a/BaseSwiftUI/Presentation/Scene/Home/Todo/Todos/TodosViewModel.swift b/BaseSwiftUI/Presentation/Scene/Home/Todo/Todos/TodosViewModel.swift
@@ -16,18 +16,10 @@ struct TodosViewModel {
 
 // MARK: - ViewModelType
 extension TodosViewModel: ViewModel {
-    final class Input: ObservableObject {
+    struct Input {
         let loadTrigger: Driver<Void>
         let toAddNew: Driver<Void>
         let toTodoItems: Driver<TodoCategory>
-
-        init(loadTrigger: Driver<Void>,
-             toAddNew: Driver<Void>,
-             toTodoItems: Driver<TodoCategory>) {
-            self.loadTrigger = loadTrigger
-            self.toAddNew = toAddNew
-            self.toTodoItems = toTodoItems
-        }
     }
 
     final class Output: ObservableObject {
