refactor: 토글의 isOn에 BindingAction 처리

Author: opficdev

Application/DevLogPresentation/Sources/Profile/ProfileFeature+State.swift

@@ -35,6 +35,33 @@ extension ProfileFeature.State {
         }
     }
 
+    var isCreatedActivitySelected: Bool {
+        get { selectedActivityKinds.contains(.created) }
+        set { setActivityKind(.created, isSelected: newValue) }
+    }
+
+    var isCompletedActivitySelected: Bool {
+        get { selectedActivityKinds.contains(.completed) }
+        set { setActivityKind(.completed, isSelected: newValue) }
+    }
+
+    var isDeletedActivitySelected: Bool {
+        get { selectedActivityKinds.contains(.deleted) }
+        set { setActivityKind(.deleted, isSelected: newValue) }
+    }
+
+    var isCreatedActivityToggleDisabled: Bool {
+        selectedActivityKinds == [.created]
+    }
+
+    var isCompletedActivityToggleDisabled: Bool {
+        selectedActivityKinds == [.completed]
+    }
+
+    var isDeletedActivityToggleDisabled: Bool {
+        selectedActivityKinds == [.deleted]
+    }
+
     var canMoveToPreviousQuarter: Bool {
         ProfileHeatmapBuilder.canMoveToQuarter(offsetMonths: -3, state: self)
     }
@@ -73,4 +100,12 @@ extension ProfileFeature.State {
     func isQuarterSelectedForPicker(_ quarter: Int) -> Bool {
         quarterStartForPicker(quarter: quarter) == selectedQuarterStart
     }
+
+    private mutating func setActivityKind(_ activityKind: ActivityKind, isSelected: Bool) {
+        if isSelected {
+            selectedActivityKinds.insert(activityKind)
+        } else if 1 < selectedActivityKinds.count {
+            selectedActivityKinds.remove(activityKind)
+        }
+    }
 }

Application/DevLogPresentation/Sources/Profile/ProfileFeature.swift

@@ -53,7 +53,6 @@ struct ProfileFeature {
         case selectQuarter(Date)
         case moveToCurrentQuarter
         case moveQuarter(Int)
-        case toggleActivityKind(ActivityKind)
         case selectDay(HeatmapDay?)
         case updateStatusTextFieldFocus(Bool)
         case store(StoreAction)
@@ -89,6 +88,12 @@ struct ProfileFeature {
                 state.alert = nil
             case .alert:
                 break
+            case .binding(\.isCreatedActivitySelected):
+                return updateHeatmapActivityKindsEffectIfNeeded(.created, state: state)
+            case .binding(\.isCompletedActivitySelected):
+                return updateHeatmapActivityKindsEffectIfNeeded(.completed, state: state)
+            case .binding(\.isDeletedActivitySelected):
+                return updateHeatmapActivityKindsEffectIfNeeded(.deleted, state: state)
             case .binding:
                 break
             case .startObserving:
@@ -144,18 +149,6 @@ struct ProfileFeature {
                 ) else { break }
                 guard ProfileHeatmapBuilder.canSelectQuarter(nextQuarterStart, state: state) else { break }
                 return updateSelectedQuarter(to: nextQuarterStart, state: &state)
-            case .toggleActivityKind(let activityKind):
-                if state.selectedActivityKinds.contains(activityKind),
-                   state.selectedActivityKinds.count == 1 {
-                    break
-                }
-
-                if state.selectedActivityKinds.contains(activityKind) {
-                    state.selectedActivityKinds.remove(activityKind)
-                } else {
-                    state.selectedActivityKinds.insert(activityKind)
-                }
-                return updateHeatmapActivityKindsEffect(state.selectedActivityKinds)
             case .selectDay(let day):
                 if let day, state.selectedDay?.date == day.date {
                     state.selectedDay = nil
@@ -277,6 +270,14 @@ private extension ProfileFeature {
         }
     }
 
+    func updateHeatmapActivityKindsEffectIfNeeded(
+        _ activityKind: ActivityKind,
+        state: State
+    ) -> Effect<Action> {
+        guard state.selectedActivityKinds != [activityKind] else { return .none }
+        return updateHeatmapActivityKindsEffect(state.selectedActivityKinds)
+    }
+
     func updateSelectedQuarter(
         to quarterStart: Date,
         state: inout State

Application/DevLogPresentation/Sources/Profile/ProfileView.swift

@@ -157,34 +157,19 @@ struct ProfileView: View {
                 }
                 Menu {
                     ForEach(ActivityKindItem.selectableItems) { activityKindItem in
-                        Toggle(
-                            activityKindItem.title,
-                            isOn: Binding(
-                                get: {
-                                    guard let activityKind = ActivityKind(
-                                        rawValue: activityKindItem.rawValue
-                                    ) else {
-                                        return false
-                                    }
-                                    return store.selectedActivityKinds.contains(activityKind)
-                                },
-                                set: { _ in
-                                    guard let activityKind = ActivityKind(
-                                        rawValue: activityKindItem.rawValue
-                                    ) else {
-                                        return
-                                    }
-                                    store.send(.toggleActivityKind(activityKind))
-                                }
-                            )
-                        )
-                        .disabled({
-                            guard let activityKind = ActivityKind(rawValue: activityKindItem.rawValue) else {
-                                return false
+                        if let activityKind = ActivityKind(rawValue: activityKindItem.rawValue) {
+                            switch activityKind {
+                            case .created:
+                                Toggle(activityKindItem.title, isOn: $store.isCreatedActivitySelected)
+                                    .disabled(store.isCreatedActivityToggleDisabled)
+                            case .completed:
+                                Toggle(activityKindItem.title, isOn: $store.isCompletedActivitySelected)
+                                    .disabled(store.isCompletedActivityToggleDisabled)
+                            case .deleted:
+                                Toggle(activityKindItem.title, isOn: $store.isDeletedActivitySelected)
+                                    .disabled(store.isDeletedActivityToggleDisabled)
                             }
-                            return store.selectedActivityKinds.count == 1
-                                && store.selectedActivityKinds.contains(activityKind)
-                        }())
+                        }
                     }
                 } label: {
                     Image(systemName: "line.3.horizontal.decrease")

Application/DevLogPresentation/Tests/Profile/ProfileViewModelTests.swift

@@ -207,7 +207,20 @@ private struct ProfileStoreTestAdapter {
     }
 
     func toggleActivityKind(_ activityKind: ActivityKind) async {
-        await store.send(.toggleActivityKind(activityKind))
+        switch activityKind {
+        case .created:
+            await store.send(.binding(.set(\.isCreatedActivitySelected, !store.state.isCreatedActivitySelected))) {
+                $0.isCreatedActivitySelected.toggle()
+            }
+        case .completed:
+            await store.send(.binding(.set(\.isCompletedActivitySelected, !store.state.isCompletedActivitySelected))) {
+                $0.isCompletedActivitySelected.toggle()
+            }
+        case .deleted:
+            await store.send(.binding(.set(\.isDeletedActivitySelected, !store.state.isDeletedActivitySelected))) {
+                $0.isDeletedActivitySelected.toggle()
+            }
+        }
         await drainReceivedActions()
     }