Feat: SignUpView DI Container 반영

APP-iOS5th · Oct 27, 2024 · 8629a59 · 8629a59
1 parent 880eeaf
commit 8629a59
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 16 deletions.
diff --git a/Kabinett/Application/KabinettApp.swift b/Kabinett/Application/KabinettApp.swift
@@ -22,9 +22,6 @@ struct KabinettApp: App {
     // MARK: - Profile Flow
     @StateObject private var profileViewModel: ProfileViewModel
 
-    // MARK: - SignUp Flow
-    @StateObject private var signUpViewModel: SignUpViewModel
-
     // MARK: - Componets Flow
     @StateObject private var imagePickerViewModel: ImagePickerViewModel
     @StateObject private var customTabViewModel: CustomTabViewModel
@@ -120,13 +117,6 @@ struct KabinettApp: App {
             )
         )
 
-        // MARK: - SignUp ViewModel
-        _signUpViewModel = .init(
-            wrappedValue: SignUpViewModel(
-                signUpUseCase: signUpUseCase
-            )
-        )
-
         // MARK: - Componets ViewModels
         _imagePickerViewModel = .init(
             wrappedValue: ImagePickerViewModel(
@@ -174,7 +164,6 @@ struct KabinettApp: App {
                 .environmentObject(letterBoxDetailViewModel)
                 .environmentObject(calendarViewModel)
                 .environmentObject(profileViewModel)
-                .environmentObject(signUpViewModel)
                 .environmentObject(imagePickerViewModel)
                 .environmentObject(customTabViewModel)
                 .environmentObject(userSelectionViewModel)

diff --git a/Kabinett/Presentation/View/SignUp/SignUpKabinettNumberSelectView.swift b/Kabinett/Presentation/View/SignUp/SignUpKabinettNumberSelectView.swift
@@ -8,7 +8,7 @@
 import SwiftUI
 
 struct SignUpKabinettNumberSelectView: View {
-    @EnvironmentObject var viewModel: SignUpViewModel
+    @ObservedObject var viewModel: SignUpViewModel
     @Environment(\.dismiss) var dismiss
     let horizontalPadding: CGFloat = UIScreen.main.bounds.width * 0.06
 

diff --git a/Kabinett/Presentation/View/SignUp/SignUpNameInputView.swift b/Kabinett/Presentation/View/SignUp/SignUpNameInputView.swift
@@ -8,7 +8,7 @@
 import SwiftUI
 
 struct SignUpNameInputView: View {
-    @EnvironmentObject var viewModel: SignUpViewModel
+    @ObservedObject var viewModel: SignUpViewModel
     @State private var shouldNavigate = false
     let horizontalPadding: CGFloat = UIScreen.main.bounds.width * 0.06
 
@@ -51,7 +51,7 @@ struct SignUpNameInputView: View {
                 .keyboardType(.alphabet)
                 .submitLabel(.done)
                 .navigationDestination(isPresented: $shouldNavigate) {
-                    SignUpKabinettNumberSelectView()
+                    SignUpKabinettNumberSelectView(viewModel: viewModel)
                 }
             }
             .frame(maxWidth: .infinity, maxHeight: .infinity)

diff --git a/Kabinett/Presentation/View/SignUp/SignUpView.swift b/Kabinett/Presentation/View/SignUp/SignUpView.swift
@@ -9,9 +9,17 @@ import SwiftUI
 import AuthenticationServices
 
 struct SignUpView: View {
-    @EnvironmentObject private var viewModel: SignUpViewModel
+    @StateObject private var viewModel: SignUpViewModel
     let horizontalPadding: CGFloat = UIScreen.main.bounds.width * 0.06
 
+    init() {
+        @Injected(SignUpUseCaseKey.self)
+        var signUpUseCase: SignUpUseCase
+
+        self._viewModel = StateObject(
+            wrappedValue: SignUpViewModel(signUpUseCase: signUpUseCase))
+    }
+
     var body: some View {
         ZStack {
             Color.background.ignoresSafeArea(.all)
@@ -55,7 +63,7 @@ struct SignUpView: View {
             viewModel.isLoading ? LoadingView() : nil
         )
         .navigationDestination(isPresented: $viewModel.showSignUpFlow) {
-            SignUpNameInputView()
+            SignUpNameInputView(viewModel: viewModel)
         }
         .alert(
             "오류",