flow 기초 추가

Projects/Core/Sources/Base/BaseViewModel.swift

@@ -4,7 +4,8 @@ import RxSwift
 import RxCocoa
 import RxFlow
 
-public protocol BaseViewModel {
+public protocol BaseViewModel: ViewModel {
+
     associatedtype Input
     associatedtype Output
 

Projects/Core/Sources/Coordinator/FlowSugar.swift

@@ -0,0 +1,112 @@
+import RxFlow
+import UIKit
+import Then
+
+typealias ViewModelStepper = BaseViewModel & Stepper
+typealias ViewModelController = ViewModelProtocol & UIViewController
+
+class FlowSugar<VM, VC>: NSObject where VM: ViewModelStepper, VC: ViewModelController {
+    var vm: VM!
+    var vc: VC?
+
+    override init() {
+        fatalError("init() has not been supported")
+    }
+
+    init(viewModel vm: VM) {
+        self.vm = vm
+        super.init()
+    }
+
+    init(_ flow: Flow, _ step: Step) {
+    }
+
+    init(_ vm: VM, _ vc: VC.Type) {
+        self.vm = vm
+        self.vc = VC().then {
+            $0.viewModel = vm as? VC.ViewModelType
+        }
+        super.init()
+    }
+
+    func presentable(_ vc: VC.Type) -> Self {
+        self.vc = VC().then {
+            $0.viewModel = vm as? VC.ViewModelType
+        }
+        return self
+    }
+
+    func presentableForStoryBoard(_ vc: VC) -> Self {
+        self.vc = vc
+        vc.viewModel = vm as? VC.ViewModelType
+        return self
+    }
+
+    func navigationItem(with block: @escaping (UIViewController) -> Void) -> Self {
+        if let vc = self.vc {
+            block(vc)
+        }
+        return self
+    }
+
+    func getViewController() -> VC? {
+        if let vc = self.vc {
+            return vc
+        } else {
+            return nil
+        }
+    }
+
+    func setVCProperty(viewControllerBlock block: @escaping (VC) -> Void) -> Self {
+        if let vc = self.vc {
+            block(vc)
+        }
+        return self
+    }
+
+    func justRegiste() -> FlowContributor? {
+        if let vc = self.vc {
+            return .contribute(withNextPresentable: vc, withNextStepper: vm)
+        }
+        return nil
+    }
+
+    func oneStepPushBy(_ navi: UINavigationController, isHideBottombar: Bool = false, includeOpaqueBar: Bool = false, animation: Bool = true) -> FlowContributors {
+        if let vc = self.vc {
+            vc.hidesBottomBarWhenPushed = isHideBottombar
+            vc.extendedLayoutIncludesOpaqueBars = includeOpaqueBar
+            navi.pushViewController(vc, animated: animation)
+            return .one(flowContributor: .contribute(withNextPresentable: vc, withNextStepper: vm))
+        }
+        return .none
+    }
+
+    func oneStepModalPresent(_ parentVC: UIViewController, _ modalStyle: UIModalPresentationStyle = .fullScreen, _ animated: Bool = true) -> FlowContributors {
+        if let vc = self.vc {
+            vc.modalPresentationStyle = modalStyle
+            parentVC.present(vc, animated: animated)
+            return .one(flowContributor: .contribute(withNextPresentable: vc, withNextStepper: vm))
+        }
+        return .none
+    }
+
+    func oneStepPopoverPresent(_ parentVC: UIViewController, _ modalStyle: UIModalPresentationStyle = .popover, _ animated: Bool = true) -> FlowContributors {
+        if let vc = self.vc {
+            vc.modalPresentationStyle = modalStyle
+            parentVC.present(vc, animated: animated)
+            return .one(flowContributor: .contribute(withNextPresentable: vc, withNextStepper: vm))
+        }
+        return .none
+    }
+
+    func oneStepModalPresentMakeNavi(_ parentVC: UIViewController, _ modalStyle: UIModalPresentationStyle = .fullScreen, _ animated: Bool = true) -> FlowContributors {
+        if let vc = self.vc {
+            let navigationController = UINavigationController(rootViewController: vc)
+            navigationController.setNavigationBarHidden(true, animated: true)
+            navigationController.modalPresentationStyle = modalStyle
+            parentVC.present(navigationController, animated: animated)
+            return .one(flowContributor: .contribute(withNextPresentable: navigationController, withNextStepper: vm))
+        }
+        return .none
+    }
+}

Projects/Core/Sources/Setp/AppStep.swift → Projects/Core/Sources/Coordinator/Setp/AppStep.swift

@@ -11,4 +11,9 @@ public enum AppStep: Step {
     case pickleRequired
 
     case otherDestination
+
+    case initialization
+
+    //selfCore
+    case myProfileRequired
 }

Projects/Core/Sources/Coordinator/Stepper/AppStepper.swift

@@ -0,0 +1,18 @@
+import Foundation
+import UIKit
+import RxFlow
+import RxCocoa
+
+public class AppStepper: Stepper {
+    public static let shared = AppStepper()
+
+    public var steps = PublishRelay<Step>()
+
+    public var initialStep: Step {
+        return AppStep.initialization
+    }
+
+    public init(steps: PublishRelay<Step> = PublishRelay<Step>()) {
+        self.steps = steps
+    }
+}

Projects/Core/Sources/Supporter/ViewModel.swift

@@ -0,0 +1,30 @@
+//
+//  ViewModel.swift
+//  Core
+//
+//  Created by 박준하 on 2/27/24.
+//  Copyright © 2024 MaeumGaGym-iOS. All rights reserved.
+//
+
+import UIKit
+
+public protocol ViewModel {
+}
+
+public protocol ServicesViewModel: ViewModel {
+    associatedtype Services
+    var services: Services! { get set }
+}
+
+public protocol ViewModelProtocol: AnyObject {
+    associatedtype ViewModelType: ViewModel
+    var viewModel: ViewModelType! { get set }
+}
+
+public extension ViewModelProtocol where Self: UIViewController {
+    static func instantiate<ViewModelType> (withViewModel viewModel: ViewModelType) -> Self where ViewModelType == Self.ViewModelType {
+        let viewController = Self()
+        viewController.viewModel = viewModel
+        return viewController
+    }
+}

Projects/Domain/Sources/Model/Posture/PostureSearchModel.swift

@@ -1,3 +1,11 @@
+//
+//  PostureSearchModel.swift
+//  Domain
+//
+//  Created by 박준하 on 2/27/24.
+//  Copyright © 2024 MaeumGaGym-iOS. All rights reserved.
+//
+
 import UIKit
 
 public struct PostureSearchModel {
@@ -13,7 +21,7 @@ public struct PostureSearchContentModel {
     public var exerciseName: String
     public var exercisePart: String
 
-    public init(exerciseImage: UIImage, 
+    public init(exerciseImage: UIImage,
                 exerciseName: String,
                 exercisePart: String
     ) {

Projects/Features/AuthFeature/Sources/SignupScene/VC/NicknameViewController.swift

@@ -32,7 +32,7 @@ public class NicknameViewController: BaseViewController<NicknameViewModel> {
 
     private let nicknameTF = MGTextField(placeholder: "닉네임")
 
-    private let cancelButton = MGImageButton(image: DSKitAsset.Assets.cancle.image)
+    private let cancelButton = MGImageButton(image: DSKitAsset.Assets.whiteCancel.image)
 
     private var checkButton = MGCheckButton(text: "회원가입")
 

Projects/Features/HomeFeature/Sources/TimerScene/Supporter/HomeTimerView.swift

@@ -39,7 +39,7 @@ public class HomeTimerView: UIView {
     }
 
     private let alarmImage = UIImageView().then {
-        $0.image = DSKitAsset.Assets.homeTimerBell.image
+        $0.image = DSKitAsset.Assets.timerActIcon.image
     }
 
     private var timerAlarmTitle = UILabel().then {

Projects/Features/HomeFeature/Sources/TimerScene/Supporter/TimerAlarmAlertView.swift

@@ -21,7 +21,7 @@ public class TimerAlarmAlertView: BaseView {
         $0.layer.shadowRadius = 6
     }
     private let timerImage = UIImageView().then {
-        $0.image = DSKitAsset.Assets.homeTimerLogo.image
+        $0.image = DSKitAsset.Assets.timerActIcon.image
     }
 
     private let timerTitleLabel = UILabel().then {

Projects/Features/HomeFeature/Sources/TimerScene/Supporter/TimerCollectionViewCell.swift

@@ -13,7 +13,7 @@ public class TimerCollectionViewCell: UICollectionViewCell {
     private var containerView = UIView()
 
     private var checkImage = UIImageView().then {
-        $0.image = DSKitAsset.Assets.yesCheck.image
+        $0.image = DSKitAsset.Assets.yesCheckActIcon.image
         $0.isHidden = true
     }
 

Projects/Features/HomeFeature/Sources/TimerScene/View/TimerViewController.swift

@@ -17,11 +17,11 @@ public class TimerViewController: BaseViewController<TimerViewModel> {
 
     private var alaertView = TimerAlarmAlertView()
 
-    private var navBeforeButton = MGImageButton(image: DSKitAsset.Assets.timerNavLeft.image)
+    private var navBeforeButton = MGImageButton(image: DSKitAsset.Assets.leftBarArrow.image)
 
-    private var navAddButton = MGImageButton(image: DSKitAsset.Assets.timerNavPlus.image)
+    private var navAddButton = MGImageButton(image: DSKitAsset.Assets.blackPlus.image)
 
-    private var navEditButton = MGImageButton(image: DSKitAsset.Assets.timerNavDots.image)
+    private var navEditButton = MGImageButton(image: DSKitAsset.Assets.dotsActIcon.image)
 
     private var editView = TimerEditView()
 

Projects/Features/PickleFeature/Sources/PickleScene/VC/PickleCell.swift

@@ -64,7 +64,7 @@ public class PickleCell: PickleCollectionViewCell {
         self.contentStackView.addArrangedSubviews(heartButton, commentButton, shareButton, dotButton)
 
         bottomSheetItems = [
-            BottomSheetItem(icon: DSKitAsset.Assets.pencil.image, title: "신고")
+            BottomSheetItem(icon: DSKitAsset.Assets.pencilActIcon.image, title: "신고")
          ]
 
         bottomSheetViewController.bottomSheetDelegate = self

Projects/Features/PickleFeature/Sources/Supporter/Profile/UserProfileView.swift

@@ -13,11 +13,11 @@ open class UserProfileView: UIView {
 
     public init(
         userName: String,
-        userProfileImage: UIImage? = DSKitAsset.Assets.basicProfile.image
+        userProfileImage: UIImage? = DSKitAsset.Assets.basicProfileIcon.image
     ) {
         super.init(frame: .zero)
 
-        setupUI(text: userName, image: userProfileImage ?? DSKitAsset.Assets.basicProfile.image)
+        setupUI(text: userName, image: userProfileImage ?? DSKitAsset.Assets.basicProfileIcon.image)
     }
 
     required public init?(coder: NSCoder) {

Projects/Features/RootFeature/Demo/Sources/SceneDelegate.swift

@@ -2,14 +2,17 @@ import UIKit
 import RootFeature
 import RxFlow
 import Core
+import Foundation
 
 class SceneDelegate: UIResponder, UIWindowSceneDelegate {
 
     var window: UIWindow?
     var coordinator = FlowCoordinator()
     var mainFlow: AppFlow!
 
-    func scene(_ scene: UIScene, willConnectTo session: UISceneSession, options connectionOptions: UIScene.ConnectionOptions) {
+    func scene(_ scene: UIScene,
+               willConnectTo session: UISceneSession,
+               options connectionOptions: UIScene.ConnectionOptions) {
         guard let windowScene = (scene as? UIWindowScene) else { return }
 
         window = UIWindow(windowScene: windowScene)

Projects/Features/RootFeature/Sources/AppFlow.swift

@@ -41,7 +41,7 @@ public class AppFlow: Flow {
         let homeService = HomeService()
         let homeRepository = HomeRepository(networkService: homeService)
         let homeFlow = HomeFlow(repository: homeRepository)
-        
+
         let postureFlow = PostureFlow()
         let shopFlow = ShopFlow()
         let pickleFlow = PickleFlow()
@@ -61,6 +61,6 @@ public class AppFlow: Flow {
     }
 
     public init() {
-        
+
     }
 }

Projects/Features/RootFeature/Sources/HomeFlow.swift

@@ -12,9 +12,9 @@ import HomeFeature
 import HomeFeatureInterface
 
 public class HomeFlow: Flow {
-    
+
     public var repository: HomeRepositoryInterface
-    
+
     public var root: Presentable {
         return self.rootViewController
     }
@@ -23,15 +23,15 @@ public class HomeFlow: Flow {
 
     init(repository: HomeRepositoryInterface) {
         self.repository = repository
-        
+
         let useCase = DefaultHomeUseCase(repository: repository)
         let viewModel = HomeViewModel(useCase: useCase)
         let viewController = HomeViewController(viewModel)
-        
+
         viewController.view.backgroundColor = DSKitAsset.Colors.gray25.color
         viewController.tabBarItem = UITabBarItem(title: "홈",
-                                                 image: DSKitAsset.Assets.blackHome.image,
-                                                 selectedImage: DSKitAsset.Assets.blueHome.image
+                                                 image: DSKitAsset.Assets.blackHomeTapBar.image,
+                                                 selectedImage: DSKitAsset.Assets.blueHomeTapBar.image
         )
 
         self.rootViewController.setViewControllers([viewController], animated: false)
@@ -42,7 +42,7 @@ public class HomeFlow: Flow {
 
         switch step {
         case .otherDestination:
-            rootViewController.tabBarItem.image = DSKitAsset.Assets.blackHome.image
+            rootViewController.tabBarItem.image = DSKitAsset.Assets.blackHomeTapBar.image
             return .none
         default:
             return .none