Merge pull request #73 from sunny5875/bugfix/72-bug-010-1차-qa-ui-수정

Bugfix/72 bug 010 1차 qa UI 수정

Author: sunny5875

Projects/Core/Network/Sources/Services/Article/ArticleAPIClient.swift

@@ -25,7 +25,7 @@ public extension DependencyValues {
 
 extension ArticleAPIClient: DependencyKey {
   public static var liveValue: ArticleAPIClient = .init(
-    _fetchArticles: { reqeust in
+    fetchArticles: { reqeust in
       let api = ArticleAPI.fetchArticles(
         .init(
           categoryId: reqeust.category?.id,
@@ -40,7 +40,7 @@ extension ArticleAPIClient: DependencyKey {
   )
 
   public static var testValue: ArticleAPIClient = .init(
-    _fetchArticles: { _ in
+    fetchArticles: { _ in
       return Article.mockArticles
     }
   )

Projects/Feature/History/Sources/Component/CheckListBottomSheetView.swift

@@ -29,7 +29,7 @@ struct CheckListBottomSheetView: View {
       )
 
       HStack {
-        Text("내용 변경")
+        Text("제목변경")
           .notoSans(.body_3)
           .foregroundStyle(Color.greyScale950)
         Spacer()

Projects/Feature/History/Sources/HistoryView.swift

@@ -26,7 +26,12 @@ public struct HistoryView: View {
     NavigationStack(path: $store.scope(state: \.path, action: \.path)) {
       VStack {
         TopNavigation(centerTitle: "나의 기록")
-        content
+          
+        if store.state.checkList.isEmpty {
+          emptyView
+        } else {
+          content
+        }
       }
       .onAppear {
         store.send(.onAppear)
@@ -89,10 +94,14 @@ public struct HistoryView: View {
   }
 
   private var emptyView: some View {
-    Image.historyEmptyView
-      .resizable()
-      .scaledToFit()
-      .frame(width: 192, height: 186)
+    VStack {
+      Spacer()
+      Image.historyEmptyView
+        .resizable()
+        .scaledToFit()
+        .frame(width: 192, height: 186)
+      Spacer()
+    }
   }
 
   @ViewBuilder

Projects/Feature/Home/Sources/DetailChecklist/DetailChecklistStore.swift

@@ -17,6 +17,7 @@ public struct DetailChecklistStore {
 
   @ObservableState
   public struct State {
+    var index: Int
     var card: Card
     var isPresentDeleteCheckBoxAlert: Bool = false
     var willDeleteCheckBox: CheckBox?

Projects/Feature/Home/Sources/DetailChecklist/DetailChecklistView.swift

@@ -14,9 +14,11 @@ import ComposableArchitecture
 
 struct DetailChecklistView: View {
   @Bindable private var store: StoreOf<DetailChecklistStore>
+  private let colorType: ChecklistColorType
 
   init(store: StoreOf<DetailChecklistStore>) {
     self.store = store
+    self.colorType = ChecklistColorType(index: store.index)
   }
 
   var body: some View {
@@ -48,6 +50,7 @@ struct DetailChecklistView: View {
             DetailColorChecklistCellView(
               title: checkBox.label,
               isSelected: checkBox.isCompleted,
+              colorType: colorType,
               onToggle: {
                 store.send(.didTapChecklistCompleteButton(checkBox: checkBox))
               },

Projects/Feature/Home/Sources/Home/HomeStore.swift

@@ -83,7 +83,7 @@ public struct HomeStore {
 
     // MARK: - Delegate Actions(parent)
 
-    case onNaviagteToDetailChecklist(card: Card)
+    case onNaviagteToDetailChecklist(card: Card, index: Int)
     case onRouteToHistoryScreen
 
     // MARK: - Scope Actions(child)
@@ -141,7 +141,9 @@ public struct HomeStore {
         return .none
 
       case .didTapNavigateToDetailChecklist(let card):
-        return .send(.onNaviagteToDetailChecklist(card: card))
+        guard let index = state.cards.firstIndex(of: card)
+        else { return .none }
+        return .send(.onNaviagteToDetailChecklist(card: card, index: index))
 
       case .fetchData:
         return .run { send in

Projects/Feature/Home/Sources/Home/Views/Checklist/CardProgressView.swift

@@ -7,14 +7,19 @@
 
 import SwiftUI
 
+import SharedDesignSystem
+
 struct CardProgressView: View {
   private let progress: CGFloat
   private let isSelected: Bool
+  private let colorType: ChecklistColorType
 
   init(
+    colorType: ChecklistColorType,
     isSelected: Bool,
     progress: CGFloat
   ) {
+    self.colorType = colorType
     self.isSelected = isSelected
     self.progress = progress
   }
@@ -29,7 +34,7 @@ struct CardProgressView: View {
         Circle()
           .trim(from: 0, to: progress)
           .stroke(
-            isSelected ? .primary800 : .greyScale400,
+            isSelected ? colorType.cardTintColor : .greyScale400,
             style: StrokeStyle(lineWidth: 8, lineCap: .butt, lineJoin: .bevel)
           )
           .rotationEffect(.degrees(-90))
@@ -42,7 +47,7 @@ struct CardProgressView: View {
           Text("%")
             .notoSans(.subhead_2)
         }
-        .foregroundStyle(isSelected ? .primary800 : .greyScale400)
+        .foregroundStyle(isSelected ? colorType.cardTintColor : .greyScale400)
       }
     }
   }

Projects/Feature/Home/Sources/Home/Views/Checklist/CardView.swift

@@ -7,18 +7,23 @@
 
 import SwiftUI
 
+import SharedDesignSystem
+
 struct CardView: View {
   private let title: String
   private let isSelected: Bool
   private let progress: CGFloat
   private let onTap: () -> Void
+  private let colorType: ChecklistColorType
 
   init(
+    colorType: ChecklistColorType,
     title: String,
     isSelected: Bool,
     progress: CGFloat,
     onTap: @escaping () -> Void
   ) {
+    self.colorType = colorType
     self.title = title
     self.isSelected = isSelected
     self.progress = progress
@@ -31,21 +36,47 @@ struct CardView: View {
     }) {
       HStack(spacing: .zero) {
         VStack(alignment: .leading, spacing: 10) {
-          CardProgressView(isSelected: isSelected, progress: progress)
+          CardProgressView(colorType: colorType, isSelected: isSelected, progress: progress)
             .padding(.top, 14)
 
           Text(title)
             .notoSans(.subhead_3)
-            .foregroundStyle(isSelected ? .primary800 : .greyScale600)
+            .foregroundStyle(isSelected ? colorType.cardTintColor : .greyScale600)
         }
         Spacer()
       }
     }
     .padding(.horizontal, 12)
     .frame(width: 162, height: 120)
-    .background(isSelected ? .primary100 : .greyScale050)
+    .background(isSelected ? colorType.cardColor : .greyScale050)
     .clipShape(
       .rect(cornerRadius: 10)
     )
   }
 }
+
+extension ChecklistColorType {
+  
+  // MARK: - 카드 색상
+  var cardColor: Color {
+    switch self {
+    case .blue:
+      return Color.primary100
+    case .green:
+      return Color(hex: "EFFAF3")
+    case .orange:
+      return Color(hex: "FBF1D2")
+    }
+  }
+  
+  var cardTintColor: Color {
+    switch self {
+    case .blue:
+      return Color.primary800
+    case .green:
+      return Color(hex: "84E1AF")
+    case .orange:
+      return Color(hex: "F07603")
+    }
+  }
+}

Projects/Feature/Home/Sources/Home/Views/Checklist/ChecklistList.swift

@@ -14,10 +14,18 @@ import ComposableArchitecture
 struct ChecklistList: View {
   @Bindable private var store: StoreOf<HomeStore>
   private let width: CGFloat
+  private let colorType: ChecklistColorType
 
   init(store: StoreOf<HomeStore>, width: CGFloat) {
     self.store = store
     self.width = width
+    
+    if let selected = store.selectedCard,
+       let index = store.cards.firstIndex(of: selected) {
+      self.colorType = ChecklistColorType(index: index)
+    } else {
+      self.colorType = .blue
+    }
   }
 
   var body: some View {
@@ -43,7 +51,8 @@ struct ChecklistList: View {
                   isSelected: checkBox.isCompleted,
                   onToggle: {
                     store.send(.didTapChecklistCompleteButton(checkBox: checkBox))
-                  }
+                  },
+                  colorType: colorType
                 )
               }
             }

Projects/Feature/Home/Sources/Home/Views/HeaderView.swift

@@ -7,6 +7,8 @@
 
 import SwiftUI
 
+import SharedDesignSystem
+
 import ComposableArchitecture
 
 struct HeaderView: View {
@@ -85,8 +87,11 @@ struct HeaderView: View {
 
       ScrollView(.horizontal, showsIndicators: false) {
         HStack(spacing: 8) {
-          ForEach(store.cards) { card in
+          ForEach(0..<store.cards.count) { i in
+            let card = store.cards[i]
+            let colorType: ChecklistColorType = .init(index: i)
             CardView(
+              colorType: colorType,
               title: card.title,
               isSelected: store.selectedCard == card,
               progress: card.progress,