Feat: 추천 루틴 화면 서버 v2 연동 (#T3-173)

* Feat: 추천 루틴 서버 v2 적용 및 디자인 연동 (#T3-173)

* Chore: 기존 RecommendedRoutineCardView 삭제 (#T3-173)

* Feat: RoutineCardView delegate 추가 및 수정 뷰 연결 (#T3-173)

Author: choijungp

Projects/DataSource/Sources/DTO/RecommendedRoutineDTO.swift

@@ -12,13 +12,15 @@ struct RecommendedRoutineDTO: Decodable {
     let routineName: String
     let routineDescription: String
     let routineLevel: String?
+    let routineType: String
     let subRoutines: [RecommendedSubRoutineDTO]
 
     enum CodingKeys: String, CodingKey {
         case id = "recommendedRoutineId"
         case routineName = "recommendedRoutineName"
         case routineDescription = "recommendedRoutineDescription"
         case routineLevel = "recommendedRoutineLevel"
+        case routineType = "recommendedRoutineType"
         case subRoutines = "recommendedSubRoutineSearchResult"
     }
 }
@@ -39,6 +41,7 @@ extension RecommendedRoutineDTO {
             title: routineName,
             description: routineDescription,
             category: routineCategory,
+            type: RoutineCategoryType(rawValue: routineType) ?? .rest,
             level: level,
             subRoutines: subRoutines.compactMap({ $0.toRecommendedSubRoutineEntity() }))
     }

Projects/Domain/Sources/Entity/RecommendedRoutineEntity.swift

@@ -10,6 +10,7 @@ public struct RecommendedRoutineEntity {
     public let title: String
     public let description: String
     public let category: RoutineCategoryType?
+    public let type: RoutineCategoryType
     public let level: RoutineLevelType?
     public let subRoutines: [RecommendedSubRoutineEntity]
 
@@ -18,13 +19,15 @@ public struct RecommendedRoutineEntity {
         title: String,
         description: String,
         category: RoutineCategoryType?,
+        type: RoutineCategoryType,
         level: RoutineLevelType?,
         subRoutines: [RecommendedSubRoutineEntity]
     ) {
         self.id = id
         self.title = title
         self.description = description
         self.category = category
+        self.type = type
         self.level = level
         self.subRoutines = subRoutines
     }

Projects/Presentation/Sources/Common/Component/RoutineCardView.swift

@@ -9,6 +9,10 @@ import Domain
 import SnapKit
 import UIKit
 
+protocol RoutineCardViewDelegate: AnyObject {
+    func routineCardView(_ sender: RoutineCardView, didTapPlusButton routine: RecommendedRoutine)
+}
+
 final class RoutineCardView: UIView {
     private enum Layout {
         static let horizontalMargin: CGFloat = 16
@@ -29,7 +33,7 @@ final class RoutineCardView: UIView {
     }
 
     private let headerInfoStackView = UIStackView()
-    private let categoryIconView = RoutineCategoryIcon(routineCategory: .connection)
+    private lazy var categoryIconView = RoutineCategoryIcon(routineCategory: routine.routineType)
     private let titleLabel = UILabel()
     private let editButton = UIButton()
     private let deleteButton = UIButton()
@@ -38,7 +42,10 @@ final class RoutineCardView: UIView {
     private let subRoutineLabel = UILabel()
     private let subRoutineStackView = UIStackView()
 
-    init() {
+    private let routine: RecommendedRoutine
+    weak var delegate: RoutineCardViewDelegate?
+    init(routine: RecommendedRoutine) {
+        self.routine = routine
         super.init(frame: .zero)
         configureAttribute()
         configureLayout()
@@ -56,14 +63,19 @@ final class RoutineCardView: UIView {
         headerInfoStackView.axis = .horizontal
         headerInfoStackView.spacing = Layout.headerInfoStackViewSpacing
 
-        titleLabel.text = "개운하게 일어나기"
+        titleLabel.text = routine.mainTitle
         titleLabel.font = BitnagilFont(style: .body1, weight: .semiBold).font
         titleLabel.textColor = BitnagilColor.gray10
 
         let plusImage = BitnagilIcon.plusIcon?
             .resizeAspectFit(to: CGSize(width: Layout.plusImageSize, height: Layout.plusImageSize))
         plusButton.setImage(plusImage, for: .normal)
         plusButton.tintColor = BitnagilColor.gray10
+        plusButton.addAction(
+            UIAction { [weak self] _ in
+                guard let self else { return }
+                delegate?.routineCardView(self, didTapPlusButton: routine)
+            }, for: .touchUpInside)
 
         grayLine.backgroundColor = BitnagilColor.gray97
 
@@ -78,7 +90,7 @@ final class RoutineCardView: UIView {
         }
         subRoutineStackView.addArrangedSubview(subRoutineLabel)
 
-        ["물 마시기", "물 마시기", "물 마시기"].forEach {
+        routine.subRoutines.forEach {
             let subRoutineTitleLabel = UILabel()
             subRoutineTitleLabel.text = "• \($0)"
             subRoutineTitleLabel.font = BitnagilFont(style: .body2, weight: .medium).font

Projects/Presentation/Sources/Onboarding/Model/RecommendedRoutine.swift

@@ -11,20 +11,26 @@ public struct RecommendedRoutine: OnboardingChoiceProtocol, Hashable {
     let id: Int
     let mainTitle: String
     let subTitle: String?
+    let subRoutines: [String]
     let routineCategory: RoutineCategoryType
+    let routineType: RoutineCategoryType
     let routineLevel: RoutineLevelType
 
     init(
         id: Int,
         mainTitle: String,
         subTitle: String?,
+        subRoutines: [String],
         routineCategory: RoutineCategoryType,
+        routineType: RoutineCategoryType,
         routineLevel: RoutineLevelType
     ) {
         self.id = id
         self.mainTitle = mainTitle
         self.subTitle = subTitle
+        self.subRoutines = subRoutines
         self.routineCategory = routineCategory
+        self.routineType = routineType
         self.routineLevel = routineLevel
     }
 }
@@ -35,7 +41,9 @@ extension RecommendedRoutineEntity {
             id: id,
             mainTitle: title,
             subTitle: description,
+            subRoutines: subRoutines.map({ $0.title }),
             routineCategory: category ?? .recommendation,
+            routineType: type,
             routineLevel: level ?? .easy
         )
     }

Projects/Presentation/Sources/RecommendedRoutine/View/Component/RecommendedRoutineCardView.swift

@@ -23,8 +23,7 @@ final class RecommendedRoutineViewController: BaseViewController<RecommendedRout
         static let headerStackViewHeight: CGFloat = 40
         static let recommendedRoutineStackViewSpacing: CGFloat = 12
         static let recommendedRoutineScrollViewTopSpacing: CGFloat = 12
-        static let recommendedRoutineScrollViewBottomSpacing: CGFloat = 10
-        static let recommendedRoutineStackViewBottomSpacing: CGFloat = 50
+        static let recommendedRoutineStackViewBottomSpacing: CGFloat = 65
         static let routineCardHeight: CGFloat = 80
         static let registerEmotionButtonTopSpacing: CGFloat = 20
         static let registerEmotionButtonHeight: CGFloat = 66
@@ -44,7 +43,7 @@ final class RecommendedRoutineViewController: BaseViewController<RecommendedRout
 
     private let recommendedRoutineScrollView = UIScrollView()
     private let recommendedRoutineStackView = UIStackView()
-    private var recommendedRoutineCards: [Int: RecommendedRoutineCardView] = [:]
+    private var recommendedRoutineCards: [Int: RoutineCardView] = [:]
     private let registerEmotionButton = RegisterEmotionButtonView()
     private let recommendedRoutineEmptyView = RecommendedRoutineEmptyView()
 
@@ -167,7 +166,7 @@ final class RecommendedRoutineViewController: BaseViewController<RecommendedRout
             make.leading.equalTo(safeArea).offset(Layout.horizontalMargin)
             make.trailing.equalTo(safeArea).inset(Layout.horizontalMargin)
             make.top.equalTo(headerStackView.snp.bottom).offset(Layout.recommendedRoutineScrollViewTopSpacing)
-            make.bottom.equalTo(safeArea).inset(Layout.recommendedRoutineScrollViewBottomSpacing)
+            make.bottom.equalTo(safeArea)
         }
 
         recommendedRoutineStackView.snp.makeConstraints { make in
@@ -200,6 +199,7 @@ final class RecommendedRoutineViewController: BaseViewController<RecommendedRout
             .sink { [weak self] selectedCategory in
                 self?.categoryView.updateSelectedCategory(selectedCategory: selectedCategory)
                 self?.showEmotionButton(isShowEmotionButton: selectedCategory == .recommendation)
+                self?.recommendedRoutineScrollView.setContentOffset(CGPoint(x: 0, y: 0), animated: true)
             }
             .store(in: &cancellables)
 
@@ -231,17 +231,12 @@ final class RecommendedRoutineViewController: BaseViewController<RecommendedRout
         }
         recommendedRoutineCards.removeAll()
 
-//        let testView = RoutineCardView()
-//        recommendedRoutineStackView.addArrangedSubview(testView)
         recommendedRoutineEmptyView.isHidden = !recommendedRoutines.isEmpty
         for routine in recommendedRoutines {
-            let routineCard = RecommendedRoutineCardView(recommendedRoutine: routine)
-            recommendedRoutineCards[routine.id] = routineCard
-            recommendedRoutineStackView.addArrangedSubview(routineCard)
-            routineCard.delegate = self
-            routineCard.snp.makeConstraints { make in
-                make.height.equalTo(Layout.routineCardHeight)
-            }
+            let routineCardView = RoutineCardView(routine: routine)
+            recommendedRoutineCards[routine.id] = routineCardView
+            routineCardView.delegate = self
+            recommendedRoutineStackView.addArrangedSubview(routineCardView)
         }
     }
 
@@ -298,25 +293,14 @@ extension RecommendedRoutineViewController: RoutineCategoryViewDelegate {
     }
 }
 
-// MARK: RecommendedRoutineCardViewDelegate
-extension RecommendedRoutineViewController: RecommendedRoutineCardViewDelegate {
-    func recommendedRoutineCardView(_ sender: RecommendedRoutineCardView, didTapRecommendedRoutine routine: RecommendedRoutine) {
-        guard let routineCreationViewModel = DIContainer.shared.resolve(type: RoutineCreationViewModel.self)
-        else { fatalError("routineCreationViewModel 의존성이 등록되지 않았습니다.") }
-
-        let routineCreationView = RoutineCreationViewController(viewModel: routineCreationViewModel, recommendRoutineId: routine.id)
-        routineCreationView.hidesBottomBarWhenPushed = true
-        self.navigationController?.pushViewController(routineCreationView, animated: true)
-    }
-}
-
 // MARK: SelectableItemTableViewDelegate
 extension RecommendedRoutineViewController: SelectableItemTableViewDelegate {
     func selectableItemTableView<T: SelectableItem & CaseIterable & Equatable>(_ sender: SelectableItemTableView<T>, didSelectItem: T?) {
         guard let didSelectLevel = didSelectItem as? RoutineLevelType?
         else { return }
         viewModel.action(input: .selectLevel(selectedLevel: didSelectLevel))
         levelButton.updateButton(level: didSelectLevel)
+        recommendedRoutineScrollView.setContentOffset(CGPoint(x: 0, y: 0), animated: true)
     }
 }
 
@@ -333,6 +317,7 @@ extension RecommendedRoutineViewController: FloatingMenuViewDelegate {
     }
 }
 
+// MARK: RegisterEmotionButtonViewDelegate
 extension RecommendedRoutineViewController: RegisterEmotionButtonViewDelegate {
     func registerEmotionButtonViewDidTapRegisterButton(_ sender: RegisterEmotionButtonView) {
         guard let emotionRegisterViewModel = DIContainer.shared.resolve(type: EmotionRegisterViewModel.self)
@@ -343,3 +328,15 @@ extension RecommendedRoutineViewController: RegisterEmotionButtonViewDelegate {
         self.navigationController?.pushViewController(emotionRegisterView, animated: true)
     }
 }
+
+// MARK: RoutineCardViewDelegate
+extension RecommendedRoutineViewController: RoutineCardViewDelegate {
+    func routineCardView(_ sender: RoutineCardView, didTapPlusButton routine: RecommendedRoutine) {
+        guard let routineCreationViewModel = DIContainer.shared.resolve(type: RoutineCreationViewModel.self)
+        else { fatalError("routineCreationViewModel 의존성이 등록되지 않았습니다.") }
+
+        let routineCreationView = RoutineCreationViewController(viewModel: routineCreationViewModel, recommendRoutineId: routine.id)
+        routineCreationView.hidesBottomBarWhenPushed = true
+        self.navigationController?.pushViewController(routineCreationView, animated: true)
+    }
+}