sopt-makers · dlwogus0128 · Sep 29, 2024 · Sep 27, 2024 · Sep 27, 2024 · Sep 27, 2024
diff --git a/SOPT-iOS/Projects/Core/Sources/Extension/UIKit+/UIColor+.swift b/SOPT-iOS/Projects/Core/Sources/Extension/UIKit+/UIColor+.swift
@@ -24,4 +24,18 @@ public extension UIColor {
            blue: rgb & 0xFF
        )
    }
+
+    convenience init(hex: String) {
+        let scanner = Scanner(string: hex)
+        _ = scanner.scanString("#")
+
+        var rgb: UInt64 = 0
+        scanner.scanHexInt64(&rgb)
+
+        let r = CGFloat((rgb >> 16) & 0xFF) / 255.0
+        let g = CGFloat((rgb >> 8) & 0xFF) / 255.0
+        let b = CGFloat((rgb >> 0) & 0xFF) / 255.0
+
+        self.init(red: r, green: g, blue: b, alpha: 1.0)
+    }
 }
diff --git a/SOPT-iOS/Projects/Data/Sources/Transform/DailySoptuneCardTransform.swift b/SOPT-iOS/Projects/Data/Sources/Transform/DailySoptuneCardTransform.swift
@@ -13,6 +13,6 @@ import Networks
 
 extension FortuneCardEntity {
     public func toDomain() -> DailySoptuneCardModel {
-        return DailySoptuneCardModel(name: name, description: description, imageURL: imageURL)
+        return DailySoptuneCardModel(name: name, description: description, imageURL: imageURL, imageColorCode: imageColorCode)
     }
 }
diff --git a/SOPT-iOS/Projects/Domain/Sources/Model/DailySoptuneCardModel.swift b/SOPT-iOS/Projects/Domain/Sources/Model/DailySoptuneCardModel.swift
@@ -12,10 +12,12 @@ public struct DailySoptuneCardModel: Codable {
     public let name: String
     public let description: String
     public let imageURL: String
+    public let imageColorCode: String
 
-    public init(name: String, description: String, imageURL: String) {
+    public init(name: String, description: String, imageURL: String, imageColorCode: String) {
         self.name = name
         self.description = description
         self.imageURL = imageURL
+        self.imageColorCode = imageColorCode
     }
 }
diff --git a/...Projects/Features/DailySoptuneFeature/Interface/Sources/DailySoptuneCardPresentable.swift b/...Projects/Features/DailySoptuneFeature/Interface/Sources/DailySoptuneCardPresentable.swift
@@ -0,0 +1,20 @@
+//
+//  DailySoptuneCardPresentable.swift
+//  DailySoptuneFeatureInterface
+//
+//  Created by Jae Hyun Lee on 9/28/24.
+//  Copyright © 2024 SOPT-iOS. All rights reserved.
+//
+
+import BaseFeatureDependency
+import Core
+
+public protocol DailySoptuneCardViewControllable: ViewControllable { }
+
+public protocol DailySoptuneCardCoordinatable {
+    var onGoToHomeButtonTapped: (() -> Void)? { get set }
+    var onBackButtonTapped: (() -> Void)? { get set }
+}
+
+public typealias DailySoptuneCardViewModelType = ViewModelType & DailySoptuneCardCoordinatable
+public typealias DailySoptuneCardPresentable = (vc: DailySoptuneCardViewControllable, vm: any DailySoptuneCardViewModelType)
diff --git a/...rojects/Features/DailySoptuneFeature/Interface/Sources/DailySoptuneFeatureBuildable.swift b/...rojects/Features/DailySoptuneFeature/Interface/Sources/DailySoptuneFeatureBuildable.swift
@@ -15,4 +15,5 @@ public protocol DailySoptuneFeatureBuildable {
     func makeDailySoptuneResultVC(resultModel: DailySoptuneResultModel) -> DailySoptuneResultPresentable
     func makePokeMessageTemplateBottomSheet(messageType: PokeMessageType) -> PokeMessageTemplatesPresentable
     func makeDailySoptuneMainVC() -> DailySoptuneMainPresentable
+    func makeDailySoptuneCardVC(cardModel: DailySoptuneCardModel) -> DailySoptuneCardPresentable
 }
diff --git a/...ojects/Features/DailySoptuneFeature/Interface/Sources/DailySoptuneResultPresentable.swift b/...ojects/Features/DailySoptuneFeature/Interface/Sources/DailySoptuneResultPresentable.swift
@@ -13,7 +13,9 @@ import Domain
 public protocol DailySoptuneResultViewControllable: ViewControllable { }
 
 public protocol DailySoptuneResultCoordinatable {
+    var onNaviBackButtonTapped: (() -> Void)? { get set }
     var onKokButtonTapped: ((PokeUserModel) -> Driver<(PokeUserModel, PokeMessageModel, isAnonymous: Bool)>)? { get set }
+    var onReceiveTodaysFortuneCardButtonTapped: ((DailySoptuneCardModel) -> Void)? { get set }
 }
 
 public typealias DailySoptuneResultViewModelType = ViewModelType & DailySoptuneResultCoordinatable

diff --git a/SOPT-iOS/Projects/Features/DailySoptuneFeature/Sources/Coordinator/DailySoptuneBuilder.swift b/SOPT-iOS/Projects/Features/DailySoptuneFeature/Sources/Coordinator/DailySoptuneBuilder.swift
@@ -9,8 +9,6 @@
 import Core
 import Domain
 @_exported import DailySoptuneFeatureInterface
-import PokeFeature
-import PokeFeatureInterface
 
 public final class DailySoptuneBuilder {
     @Injected public var dailySoptuneRepository: DailySoptuneRepositoryInterface
@@ -29,18 +27,19 @@ extension DailySoptuneBuilder: DailySoptuneFeatureBuildable {
             resultModel: resultModel)
         return (dailySoptuneResultVC, viewModel)
     }
-
-    public func makePokeMessageTemplateBottomSheet(messageType: Domain.PokeMessageType) -> PokeFeatureInterface.PokeMessageTemplatesPresentable {
-        let useCase = DefaultPokeMessageTemplateUsecase(repository: self.pokeOnboardingRepository)
-        let viewModel = PokeMessageTemplateViewModel(messageType: messageType, usecase: useCase)
-        let viewController = PokeMessageTemplateBottomSheet(viewModel: viewModel)
-        return (viewController, viewModel)
-    }
 
 	public func makeDailySoptuneMainVC() -> DailySoptuneMainPresentable {
         let useCase = DefaultDailySoptuneUseCase(repository: dailySoptuneRepository)
         let viewModel = DailySoptuneMainViewModel(useCase: useCase)
 		let dailySoptuneMainVC = DailySoptuneMainVC(viewModel: viewModel)
 		return (dailySoptuneMainVC, viewModel)
 	}
+
+    public func makeDailySoptuneCardVC(cardModel: DailySoptuneCardModel) -> DailySoptuneCardPresentable {
+        let useCase = DefaultDailySoptuneUseCase(repository: dailySoptuneRepository)
+        let viewModel = DailySoptuneCardViewModel(useCase: useCase)
+        let dailySoptuneCardVC = DailySoptuneCardVC(cardModel: cardModel, viewModel: viewModel)
+        return (dailySoptuneCardVC, viewModel)
+    }
+
 }
diff --git a/...ojects/Features/DailySoptuneFeature/Sources/Coordinator/DailySoptuneCardCoordinator.swift b/...ojects/Features/DailySoptuneFeature/Sources/Coordinator/DailySoptuneCardCoordinator.swift
@@ -0,0 +1,54 @@
+//
+//  DailySoptuneCardCoordinator.swift
+//  DailySoptuneFeature
+//
+//  Created by Jae Hyun Lee on 9/28/24.
+//  Copyright © 2024 SOPT-iOS. All rights reserved.
+//
+
+import UIKit
+import Combine
+
+import Core
+import BaseFeatureDependency
+import DailySoptuneFeatureInterface
+import Domain
+
+public final class DailySoptuneCardCoordinator: DefaultCoordinator {
+
+    public var requestCoordinating: (() -> Void)?
+    public var finishFlow: (() -> Void)?
+
+    private let factory: DailySoptuneFeatureBuildable
+    private let router: Router
+
+    private let cardModel: DailySoptuneCardModel
+
+    private weak var rootController: UINavigationController?
+
+    public init(router: Router, factory: DailySoptuneFeatureBuildable, cardModel: DailySoptuneCardModel) {
+        self.router = router
+        self.factory = factory
+        self.cardModel = cardModel
+    }
+
+    public override func start() {
+        showDailySoptuneCard()
+    }
+
+    private func showDailySoptuneCard() {
+        var dailySoptuneCard = factory.makeDailySoptuneCardVC(cardModel: cardModel)
+
+        dailySoptuneCard.vm.onBackButtonTapped = { [weak self] in
+            self?.router.dismissModule(animated: true)
+            self?.finishFlow?()
+        }
+
+        dailySoptuneCard.vm.onGoToHomeButtonTapped = { [weak self] in
+            self?.requestCoordinating?()
+        }
+
+        self.rootController = dailySoptuneCard.vc.asNavigationController
+        self.router.present(self.rootController, animated: true, modalPresentationSytle: .overFullScreen)
+    }
+}
diff --git a/...Coordinator/DailySoptuneCoordinator.swift → ...nator/DailySoptuneResultCoordinator.swift b/...Coordinator/DailySoptuneCoordinator.swift → ...nator/DailySoptuneResultCoordinator.swift
@@ -1,5 +1,5 @@
 //
-//  DailySoptuneCoordinator.swift
+//  DailySoptuneResultCoordinator.swift
 //  DailySoptuneFeature
 //
 //  Created by Jae Hyun Lee on 9/21/24.
@@ -15,13 +15,16 @@ import DailySoptuneFeatureInterface
 import Domain
 import PokeFeatureInterface
 
-public final class DailySoptuneCoordinator: DefaultCoordinator {
+public final class DailySoptuneResultCoordinator: DefaultCoordinator {
+
+    public var requestCoordinating: (() -> Void)?
     public var finishFlow: (() -> Void)?
 
     private let factory: DailySoptuneFeatureBuildable
     private let pokeFactory: PokeFeatureBuildable
     private let router: Router
-
+    private weak var rootController: UINavigationController?
+
     public init(router: Router, factory: DailySoptuneFeatureBuildable, pokeFactory: PokeFeatureBuildable) {
         self.router = router
         self.factory = factory
@@ -52,12 +55,44 @@ public final class DailySoptuneCoordinator: DefaultCoordinator {
     private func showDailySoptuneResult(resultModel: DailySoptuneResultModel) {
         var dailySoptuneResult = factory.makeDailySoptuneResultVC(resultModel: resultModel)
 
+        dailySoptuneResult.vm.onNaviBackButtonTapped = { [weak self] in
+            self?.router.dismissModule(animated: true)
+            self?.finishFlow?()
+        }
+
         dailySoptuneResult.vm.onKokButtonTapped = { [weak self] userModel in
             guard let self else { return .empty() }
             return self.showMessageBottomSheet(userModel: userModel, on: dailySoptuneResult.vc.viewController)
         }
 
-        router.push(dailySoptuneResult.vc)
+        dailySoptuneResult.vm.onReceiveTodaysFortuneCardButtonTapped = { [weak self] cardModel in
+            guard let self else { return }
+            self.runDailySoptuneCardFlow(cardModel: cardModel)
+        }
+
+        rootController = dailySoptuneResult.vc.asNavigationController
+        router.present(rootController, animated: false, modalPresentationSytle: .overFullScreen)
+    }
+
+    internal func runDailySoptuneCardFlow(cardModel: DailySoptuneCardModel) {
+        let dailySoptuneCardCoordinator = DailySoptuneCardCoordinator(
+            router: Router(
+                rootController: rootController ?? self.router.asNavigationController
+            ), factory: factory
+            , cardModel: cardModel
+        )
+
+        dailySoptuneCardCoordinator.finishFlow = { [weak self, weak dailySoptuneCardCoordinator] in
+            dailySoptuneCardCoordinator?.childCoordinators = []
+            self?.removeDependency(dailySoptuneCardCoordinator)
+        }
+
+        dailySoptuneCardCoordinator.requestCoordinating = { [weak self] in
+            self?.requestCoordinating?()
+        }
+
+        addDependency(dailySoptuneCardCoordinator)
+        dailySoptuneCardCoordinator.start()
     }
 
     private func showMessageBottomSheet(userModel: PokeUserModel, on view: UIViewController?) -> AnyPublisher<(PokeUserModel, PokeMessageModel, isAnonymous: Bool), Never> {

diff --git a/...ojects/Features/DailySoptuneFeature/Sources/DailySoptuneScene/VC/DailySoptuneCardVC.swift b/...ojects/Features/DailySoptuneFeature/Sources/DailySoptuneScene/VC/DailySoptuneCardVC.swift
@@ -7,11 +7,21 @@
 //
 
 import UIKit
+import Combine
 
 import Core
 import DSKit
+import Domain
 
-public final class DailySoptuneCardVC: UIViewController {
+import BaseFeatureDependency
+
+public final class DailySoptuneCardVC: UIViewController, DailySoptuneCardViewControllable {
+
+    // MARK: - Properties
+
+    public var viewModel: DailySoptuneCardViewModel
+    private let cardModel: DailySoptuneCardModel
+    private var cancelBag = CancelBag()
 
 	// MARK: - UI Components
 
@@ -22,11 +32,9 @@ public final class DailySoptuneCardVC: UIViewController {
 	private let subCardLabel = UILabel().then {
 		$0.textColor = DSKitAsset.Colors.gray300.color
 		$0.font = DSKitFontFamily.Suit.semiBold.font(size: 16)
-		$0.text = "어려움을 전부 극복할"
 	}
 
 	private let cardLabel = UILabel().then {
-		$0.text = "OO부적이 왔솝"
 		$0.textColor = DSKitAsset.Colors.white100.color
 		$0.font = DSKitFontFamily.Suit.bold.font(size: 28)
 	}
@@ -36,12 +44,27 @@ public final class DailySoptuneCardVC: UIViewController {
 	}
 
 	private let goToHomeButton = AppOutlinedButton(title: I18N.DailySoptune.goHome)
+
+    // MARK: - initialization
+
+    init(cardModel: DailySoptuneCardModel, viewModel: DailySoptuneCardViewModel) {
+        self.cardModel = cardModel
+        self.viewModel = viewModel
+        super.init(nibName: nil, bundle: nil)
+    }
+
+    required init?(coder: NSCoder) {
+        fatalError("init(coder:) has not been implemented")
+    }
+
+    // MARK: - View Life Cycle
 
 	public override func viewDidLoad() {
 		super.viewDidLoad()
-
 		setUI()
 		setLayout()
+        setData()
+        bindViewModels()
 	}
 }
 
@@ -86,3 +109,23 @@ private extension DailySoptuneCardVC {
 		}
 	}
 }
+
+// MARK: - Methods
+
+private extension DailySoptuneCardVC {
+    func setData() {
+        self.subCardLabel.text = cardModel.description
+        self.cardLabel.text = "\(cardModel.name)이 왔솝"
+        self.cardLabel.partColorChange(targetString: "\(cardModel.name)", textColor: UIColor(hex: "\(cardModel.imageColorCode)"))
+        self.cardImage.setImage(with: cardModel.imageURL)
+    }
+
+    private func bindViewModels() {
+        let input = DailySoptuneCardViewModel.Input(
+            goToHomeButtonTap: self.goToHomeButton.publisher(for: .touchUpInside).mapVoid().asDriver(),
+            backButtonTap: self.backButton.publisher(for: .touchUpInside).mapVoid().asDriver()
+        )
+
+        let output = self.viewModel.transform(from: input, cancelBag: self.cancelBag)
+    }
+}
diff --git a/...s/DailySoptuneFeature/Sources/DailySoptuneScene/ViewModel/DailySoptuneCardViewModel.swift b/...s/DailySoptuneFeature/Sources/DailySoptuneScene/ViewModel/DailySoptuneCardViewModel.swift
@@ -0,0 +1,67 @@
+//
+//  DailySoptuneCardViewModel.swift
+//  DailySoptuneFeature
+//
+//  Created by Jae Hyun Lee on 9/28/24.
+//  Copyright © 2024 SOPT-iOS. All rights reserved.
+//
+
+import Foundation
+import Combine
+
+import Core
+import Domain
+
+import DailySoptuneFeatureInterface
+
+public final class DailySoptuneCardViewModel: DailySoptuneCardViewModelType {
+
+    public var onGoToHomeButtonTapped: (() -> Void)?
+    public var onBackButtonTapped: (() -> Void)?
+
+    // MARK: - Properties
+
+    private let useCase: DailySoptuneUseCase
+    private var cancelBag = CancelBag()
+
+    // MARK: - Inputs
+
+    public struct Input {
+        let goToHomeButtonTap: Driver<Void>
+        let backButtonTap: Driver<Void>
+    }
+
+    // MARK: - Outpust
+
+    public struct Output {
+
+    }
+
+    // MARK: - initialization
+
+    public init(useCase: DailySoptuneUseCase) {
+        self.useCase = useCase
+    }
+}
+
+extension DailySoptuneCardViewModel {
+
+    public func transform(from input: Input, cancelBag: CancelBag) -> Output {
+        let output = Output()
+
+        input.goToHomeButtonTap
+            .withUnretained(self)
+            .sink { _ in
+                self.onGoToHomeButtonTapped?()
+            }.store(in: cancelBag)
-        input.goToHomeButtonTap
-            .withUnretained(self)
-            .sink { _ in
-                self.onGoToHomeButtonTapped?()
-            }.store(in: cancelBag)
+        input.goToHomeButtonTap
+            .withUnretained(self)
+            .sink { owner in
+                owner.onGoToHomeButtonTapped?() // 여기서 owner가 self를 약한 참조한 변수
+            }.store(in: cancelBag)
-        input.goToHomeButtonTap
-            .withUnretained(self)
-            .sink { _ in
-                self.onGoToHomeButtonTapped?()
-            }.store(in: cancelBag)
+        input.goToHomeButtonTap
+            .withUnretained(self)
+            .sink { owner in
+                owner.onGoToHomeButtonTapped?() // 여기서 owner가 self를 약한 참조한 변수
+            }.store(in: cancelBag)
+
+        input.backButtonTap
+            .withUnretained(self)
+            .sink { _ in
+                self.onBackButtonTapped?()
+            }.store(in: cancelBag)
+
+        return output
+    }
+
+}