[NL-55] : Onboarding 기능 수정 (#28)

* [NL-55] : SplashViewContoller + ViewModel 리팩토링

* [NL-55] : OnboardingViewController + viewModel Refactor
- Routing시 delegate 설정

* [NL-55] : setFactories 호출 변경
- viewModel let으로 변경

Author: GomHyeok

Common/Lib/Sources/Router/AppRouter.swift

@@ -45,6 +45,7 @@ public enum AppRoute: Hashable {
 @MainActor
 public protocol Routable: AnyObject {
   func navigate(to route: Any, how: NavigateType, with data: [String: Any])
+    func setFactories()
 }
 
 public final class AppRouter: Routable {
@@ -62,7 +63,7 @@ public final class AppRouter: Routable {
     guard let appRoute = route as? AppRoute else { return }
     guard let factory = factories[appRoute] else { return }
     let subRouter = factory()
-
+      
     switch appRoute {
     case .fortune:
       break
@@ -72,11 +73,14 @@ public final class AppRouter: Routable {
       break
     case .onboarding(let onboardingRoute):
       guard let onboardingRoute = onboardingRoute else { return }
+        
       subRouter.navigate(to: onboardingRoute, how: how, with: data)
     case .setting:
       break
     }
   }
+    
+    public func setFactories() { }
 }
 
 extension Routable {

Common/Lib/Sources/Router/OnbaordingRoute.swift

@@ -6,10 +6,11 @@
 //
 
 import Foundation
+import UIKit
 
 public enum OnboardingRoute {
   case splash
   case onboarding
-  case agreement
-  case timePicker
+    case agreement
+    case timePicker
 }

Feature/Onboarding/Sources/OnbaordingRouter.swift

@@ -13,19 +13,38 @@ public final class OnboardingRouter: Routable {
   private var factories: [OnboardingRoute: () -> UIViewController]
 
   public init() {
-    self.factories = [
-      .splash: { SplashViewcontroller() },
-      .agreement: { AgreementViewController() },
-      .onboarding: { OnboardingViewController() },
-      .timePicker: { TimePickerBottomSheetViewController() },
-    ]
+    self.factories = [:]
+      self.setFactories()
   }
+    
+    public func setFactories() {
+        self.factories = [
+            .splash: {
+                let viewModel = SplashViewModel()
+                return SplashViewcontroller(viewModel: viewModel, router: self)
+            },
+          .agreement: { AgreementViewController() },
+            .onboarding: { OnboardingViewController(router: self) },
+          .timePicker: { TimePickerBottomSheetViewController() },
+        ]
+    }
 
   public func navigate(to route: Any, how: NavigateType, with data: [String: Any]) {
     guard let onboardingRoute = route as? OnboardingRoute else { return }
     guard let factory = factories[onboardingRoute] else { return }
     let viewController = factory()
-
+      
+      if onboardingRoute == .agreement {
+          if let agreementVC = viewController as? AgreementViewController,
+             let delegate = data["delegate"] as? AgreementViewDelegate {
+              agreementVC.delegate = delegate
+          }
+      } else if onboardingRoute == .timePicker {
+          if let timePickerVC = viewController as? TimePickerBottomSheetViewController,
+             let delegate = data["delegate"] as? TimePickerBottomSheetDelegate {
+              timePickerVC.delegate = delegate
+          }
+      }
     manageViewController(viewController, how: how)
   }
 }

Feature/Onboarding/Sources/Onboarding/OnboardingViewModel.swift

@@ -7,94 +7,76 @@
 
 import Combine
 import Foundation
-
-public enum OnboardingAction {
-  case checkNameFormat(name: String)
-  case genderSelected(isSelected: GenderType)
-  case checkBirthFormat(birth: String)
-  case bornTimeSelected(bornTime: BornType)
-  case nextButtonTap
-  case completeButtonTap
-}
-
-public protocol OnboardingOutputProtocol {
-  var showNameError: AnyPublisher<Bool, Never> { get }
-  var showBirthError: AnyPublisher<Bool, Never> { get }
-  var isNextButtonEnabled: AnyPublisher<Bool, Never> { get }
-}
-
-public protocol OnboardingViewModelProtocol: OnboardingOutputProtocol {
-  var inputStream: PassthroughSubject<OnboardingAction, Never> { get }
-}
-
-public class OnboardingViewModel: OnboardingViewModelProtocol {
-  var stor: Set<AnyCancellable> = []
-
-  @Published private var _isNameValid: Bool = false
-  @Published private var _isBirthDateValid: Bool = false
-  @Published private var _isBornTimeValied: Bool = false
-
-  public var inputStream: PassthroughSubject<OnboardingAction, Never> = .init()
-
-  public var isNextButtonEnabled: AnyPublisher<Bool, Never> {
-    Publishers.CombineLatest3($_isNameValid, $_isBirthDateValid, $_isBornTimeValied).map {
-      (nameValid, birthBalid, bornTimeValid) in
-      return nameValid && birthBalid && bornTimeValid
+import Lib
+
+public class OnboardingViewModel {
+    
+    enum Input {
+        case checkNameFormat(name: String)
+        case genderSelected(isSelected: GenderType)
+        case checkBirthFormat(birth: String)
+        case bornTimeSelected(bornTime: BornType)
+        case nextButtonTap
+        case completeButtonTap
+        case timePickerTap
     }
-    .eraseToAnyPublisher()
-  }
-
-  public var showNameError: AnyPublisher<Bool, Never> {
-    $_isNameValid
-      .eraseToAnyPublisher()
-  }
-
-  public var showBirthError: AnyPublisher<Bool, Never> {
-    $_isBirthDateValid
-      .eraseToAnyPublisher()
-  }
-
-  private var state: State = .init()
-
-  public init() {
-    inputStream
-      .sink { [weak self] action in
-        guard let self = self else { return }
-        switch action {
-        case .checkNameFormat(let name):
-          self._isNameValid = checkNameFormat(name: name)
-          if self._isNameValid { self.state.name = name }
-        case .genderSelected(let isSelected):
-          self.state.gender = isSelected
-        case .checkBirthFormat(let birth):
-          self._isBirthDateValid = checkBirthFormat(birth: birth)
-          if self._isBirthDateValid { self.state.birthDate = birth }
-        case .bornTimeSelected(let bornTime):
-          switch bornTime {
-          case .dontKnow(let isSelected):
-            self._isBornTimeValied = (self.state.bornTime != nil || !isSelected)
-          case .time(let time):
-            self._isBornTimeValied = true
-            self.state.bornTime = bornTime
-          }
+    
+    struct Output {
+        let showNameError : PassthroughSubject<Bool, Never> = .init()
+        let showBirthError : PassthroughSubject<Bool, Never> = .init()
+        let isNextButtonEnabled: PassthroughSubject<Bool, Never> = .init()
+        let navigate : PassthroughSubject<OnboardingRoute, Never> = .init()
+    }
+    
+    let output : Output = Output()
+    
+    private var _isNameValid: Bool = false
+    private var _isBirthDateValid: Bool = false
+    private var _isBornTimeValied: Bool = false
+    
+    private var state: State = .init()
+    
+    func send(input : Input) {
+        switch input {
+        case .checkNameFormat(name: let name):
+            self._isNameValid = checkNameFormat(name: name)
+            if self._isNameValid { self.state.name = name }
+            self.output.showNameError.send(self._isNameValid)
+            self.output.isNextButtonEnabled.send(_isNameValid && _isBirthDateValid && _isBornTimeValied)
+        case .genderSelected(isSelected: let isSelected):
+            self.state.gender = isSelected
+        case .checkBirthFormat(birth: let birth):
+            self._isBirthDateValid = checkBirthFormat(birth: birth)
+            if self._isBirthDateValid { self.state.birthDate = birth }
+            self.output.showBirthError.send(self._isBirthDateValid)
+            self.output.isNextButtonEnabled.send(_isNameValid && _isBirthDateValid && _isBornTimeValied)
+        case .bornTimeSelected(bornTime: let bornTime):
+            switch bornTime {
+            case .dontKnow(let isSelected):
+                self._isBornTimeValied = (self.state.bornTime != nil || !isSelected)
+            case .time(let time):
+                self._isBornTimeValied = true
+                self.state.bornTime = time
+            }
+            self.output.isNextButtonEnabled.send(_isNameValid && _isBirthDateValid && _isBornTimeValied)
         case .nextButtonTap:
-          // TODO: Modal present
-          break
+            self.output.navigate.send(.agreement)
         case .completeButtonTap:
-          // TODO: API 연결 부분
-          break
+            break
+        case .timePickerTap :
+            self.output.navigate.send(.timePicker)
         }
-      }
-      .store(in: &stor)
-  }
+    }
+    
+    public init() { }
 }
 
 extension OnboardingViewModel {
   struct State {
     var name: String?
     var gender: GenderType?
     var birthDate: String?
-    var bornTime: BornType?
+      var bornTime: String?
   }
 }