wip

Author: devMinseok

Projects/Domain/PomodoroService/Sources/PomodoroService.swift

@@ -32,7 +32,7 @@ extension PomodoroService: DependencyKey {
       },
       getSelectedCategory: { userDefaultsClient, databaseClient in
         let selectedCategoryID = userDefaultsClient.integerForKey(selectedCategoryKey)
-        let results = try await databaseClient.read(PomodoroCategory.self, predicateFormat: "no == %d", args: selectedCategoryID)
+        let results = try await databaseClient.read(PomodoroCategory.self, predicateFormat: "#no == %d", args: selectedCategoryID)
         return results.first
       }
     )

Projects/Feature/HomeFeature/Sources/CategorySelect/CategorySelectCore.swift

@@ -8,6 +8,7 @@
 
 import PomodoroServiceInterface
 import DatabaseClientInterface
+import UserDefaultsClientInterface
 
 import ComposableArchitecture
 
@@ -22,17 +23,20 @@ public struct CategorySelectCore {
   }
 
   public enum Action {
+    case onDismiss
     case onAppear
     case dismissButtonTapped
     case bottomCheckButtonTapped
 
     case getCategoryListResponse(Result<[PomodoroCategory], Error>)
 
+    case setSelectedCategory(PomodoroCategory?)
     case selectCategory(PomodoroCategory)
   }
 
   @Dependency(PomodoroService.self) var pomodoroService
   @Dependency(DatabaseClient.self) var databaseClient
+  @Dependency(UserDefaultsClient.self) var userDefaultsClient
 
   public init() {}
 
@@ -42,6 +46,9 @@ public struct CategorySelectCore {
 
   private func core(state: inout State, action: Action) -> EffectOf<Self> {
     switch action {
+    case .onDismiss:
+      return .none
+      
     case .onAppear:
       return .run { send in
         await send(
@@ -53,13 +60,28 @@ public struct CategorySelectCore {
             }
           )
         )
+        let selectedCategory = try await self.pomodoroService.getSelectedCategory(
+          userDefaultsClient: self.userDefaultsClient,
+          databaseClient: self.databaseClient
+        )
+        await send(.setSelectedCategory(selectedCategory))
       }
 
     case .dismissButtonTapped:
-      return .none
+      return .run { send in
+        await send(.onDismiss)
+      }
 
     case .bottomCheckButtonTapped:
-      return .none
+      return .run { [selectedCategory = state.selectedCategory] send in
+        if let selectedCategory {
+          await self.pomodoroService.changeSelectedCategory(
+            userDefaultsClient: self.userDefaultsClient,
+            categoryID: selectedCategory.id
+          )
+        }
+        await send(.onDismiss)
+      }
 
     case let .getCategoryListResponse(.success(response)):
       state.categoryList = response
@@ -68,6 +90,10 @@ public struct CategorySelectCore {
     case .getCategoryListResponse(.failure):
       return .none
 
+    case let .setSelectedCategory(category):
+      state.selectedCategory = category
+      return .none
+      
     case let .selectCategory(category):
       state.selectedCategory = category
       return .none

Projects/Feature/HomeFeature/Sources/Home/HomeCore.swift

@@ -116,7 +116,7 @@ public struct HomeCore {
     case .playButtonTapped:
       return .none
 
-    case .categorySelect(.presented(.dismissButtonTapped)):
+    case .categorySelect(.presented(.onDismiss)):
       state.categorySelect = nil
       return .none
 

Projects/Feature/HomeFeature/Sources/TimeSelect/TimeSelectCore.swift

@@ -10,6 +10,8 @@ import Foundation
 
 import FeedbackGeneratorClientInterface
 import PomodoroServiceInterface
+import UserDefaultsClientInterface
+import DatabaseClientInterface
 
 import ComposableArchitecture
 
@@ -27,9 +29,13 @@ public struct TimeSelectCore {
   public enum Action {
     case onAppear
     case pickerSelection(TimeItem?)
+    case setSelectedCategory(PomodoroCategory?)
   }
 
   @Dependency(FeedbackGeneratorClient.self) var feedbackGeneratorClient
+  @Dependency(UserDefaultsClient.self) var userDefaultsClient
+  @Dependency(DatabaseClient.self) var databaseClient
+  @Dependency(PomodoroService.self) var pomodoroService
 
   public init() {}
 
@@ -42,13 +48,23 @@ public struct TimeSelectCore {
     case .onAppear:
       state.timeList = generateFocusTimeByMinute().map { .init(title: "\($0):00", data: $0) }
       state.selectedTime = state.timeList.last
-      return .none
+      return .run { send in
+        let selectedCategory = try await self.pomodoroService.getSelectedCategory(
+          userDefaultsClient: self.userDefaultsClient,
+          databaseClient: self.databaseClient
+        )
+        await send(.setSelectedCategory(selectedCategory))
+      }
 
     case let .pickerSelection(selection):
       state.selectedTime = selection
       return .run { _ in
         await self.feedbackGeneratorClient.impactOccurred(.soft)
       }
+      
+    case let .setSelectedCategory(category):
+      state.selectedCategory = category
+      return .none
     }
   }
 

Projects/Feature/HomeFeature/Sources/TimeSelect/TimeSelectView.swift

@@ -40,12 +40,9 @@ public struct TimeSelectView: View {
           selection: $store.selectedTime.sending(\.pickerSelection)
         )
 
-        Button(
-          icon: DesignSystemAsset.Image._32PlayPrimary.swiftUIImage,
-          action: {
-            
-          }
-        )
+        Button(icon: DesignSystemAsset.Image._32PlayPrimary.swiftUIImage) {
+          
+        }
         .buttonStyle(.round(level: .secondary))
         .padding(.bottom, 40)
       }

Projects/Shared/DesignSystem/Sources/Component/BottomSheet/BottomSheetViewModifier.swift

@@ -19,6 +19,9 @@ struct BottomSheetViewModifier<
     ZStack(alignment: .bottom) {
       content
         .frame(maxWidth: .infinity, maxHeight: .infinity)
+        .transaction { transaction in
+          transaction.disablesAnimations = true
+        }
         .zIndex(1)
 
       if let item {