[codex] Multi-Select Toggle-Logik und Grid-Komponenten konsolidieren

Symi/Sources/Features/Capture/EntryFlowCoordinatorView.swift

@@ -162,22 +162,22 @@ private struct EntryHeadacheStepView: View {
             PainGaugeView(value: $coordinator.draft.intensity)
 
             InputFlowFieldGroup(title: "Wo spürst du den Schmerz?") {
-                HeadacheLocationGrid {
+                HeadacheOptionGrid {
                     ForEach(visiblePainLocations) { location in
                         PainLocationSelectionTile(
                             option: location,
                             isSelected: coordinator.draft.selectedPainLocations.contains(location.title),
                             theme: .pain,
                             accessibilityIdentifier: "entry-location-\(location.title)"
                         ) {
-                            toggle(location.title, in: &coordinator.draft.selectedPainLocations)
+                            coordinator.draft.selectedPainLocations.toggleMembership(location.title)
                         }
                     }
                 }
             }
 
             InputFlowFieldGroup(title: "Tagesbereich") {
-                HeadacheDayPartGrid {
+                HeadacheOptionGrid {
                     ForEach(EntryDayPartPreset.allCases) { preset in
                         InputFlowSelectionTile(
                             title: preset.title,
@@ -225,14 +225,6 @@ private struct EntryHeadacheStepView: View {
 
         coordinator.draft.selectedPainLocations = ["Schläfen"]
     }
-
-    private func toggle(_ option: String, in selection: inout Set<String>) {
-        if selection.contains(option) {
-            selection.remove(option)
-        } else {
-            selection.insert(option)
-        }
-    }
 }
 
 private extension EntryDayPartPreset {
@@ -324,50 +316,17 @@ private struct PainLocationSelectionTile: View {
         return SymiColors.subtleSeparator(for: colorScheme).opacity(SymiOpacity.strongSurface)
     }
 }
-private struct HeadacheLocationGrid<Content: View>: View {
+private struct HeadacheOptionGrid<Content: View>: View {
     let content: Content
 
     init(@ViewBuilder content: () -> Content) {
         self.content = content()
     }
 
     var body: some View {
-        LazyVGrid(
-            columns: Array(
-                repeating: GridItem(
-                    .flexible(minimum: SymiSize.headacheOptionGridMinWidth),
-                    spacing: SymiSpacing.xs,
-                    alignment: .top
-                ),
-                count: SymiSize.headacheOptionGridColumnCount
-            ),
-            alignment: .leading,
-            spacing: SymiSpacing.xs
-        ) {
-            content
-        }
-    }
-}
-
-private struct HeadacheDayPartGrid<Content: View>: View {
-    let content: Content
-
-    init(@ViewBuilder content: () -> Content) {
-        self.content = content()
-    }
-
-    var body: some View {
-        LazyVGrid(
-            columns: Array(
-                repeating: GridItem(
-                    .flexible(minimum: SymiSize.headacheOptionGridMinWidth),
-                    spacing: SymiSpacing.xs,
-                    alignment: .top
-                ),
-                count: SymiSize.headacheOptionGridColumnCount
-            ),
-            alignment: .leading,
-            spacing: SymiSpacing.xs
+        InputFlowFixedTileGrid(
+            minimumColumnWidth: SymiSize.headacheOptionGridMinWidth,
+            columnCount: SymiSize.headacheOptionGridColumnCount
         ) {
             content
         }
@@ -569,7 +528,7 @@ private struct EntryTriggersStepView: View {
                             theme: .trigger,
                             accessibilityIdentifier: "entry-trigger-\(option.title)"
                         ) {
-                            toggle(option.title, in: &coordinator.draft.selectedTriggers)
+                            coordinator.draft.selectedTriggers.toggleMembership(option.title)
                         }
                     }
                 }
@@ -589,14 +548,6 @@ private struct EntryTriggersStepView: View {
             )
         }
     }
-
-    private func toggle(_ option: String, in selection: inout Set<String>) {
-        if selection.contains(option) {
-            selection.remove(option)
-        } else {
-            selection.insert(option)
-        }
-    }
 }
 
 private struct EntryNoteStepView: View {

Symi/Sources/Features/Capture/NewEntryDesignSystem.swift

@@ -126,20 +126,12 @@ struct MultiSelectGrid: View {
                     isSelected: isSelected,
                     colorToken: colorToken
                 ) {
-                    toggle(option)
+                    selection.toggleMembership(option)
                 }
                 .accessibilityLabel("\(accessibilityPrefix): \(option)")
                 .accessibilityValue(isSelected ? "Ausgewählt" : "Nicht ausgewählt")
                 .accessibilityHint(isSelected ? "Entfernt die Auswahl." : "Wählt diese Option aus.")
             }
         }
     }
-
-    private func toggle(_ option: String) {
-        if selection.contains(option) {
-            selection.remove(option)
-        } else {
-            selection.insert(option)
-        }
-    }
 }

Symi/Sources/Features/InputFlow/Components/InputFlowLayout.swift

@@ -42,6 +42,42 @@ struct InputFlowTileGrid<Content: View>: View {
     }
 }
 
+struct InputFlowFixedTileGrid<Content: View>: View {
+    let minimumColumnWidth: CGFloat
+    let columnCount: Int
+    let spacing: CGFloat
+    let content: Content
+
+    init(
+        minimumColumnWidth: CGFloat,
+        columnCount: Int,
+        spacing: CGFloat = SymiSpacing.xs,
+        @ViewBuilder content: () -> Content
+    ) {
+        self.minimumColumnWidth = minimumColumnWidth
+        self.columnCount = columnCount
+        self.spacing = spacing
+        self.content = content()
+    }
+
+    var body: some View {
+        LazyVGrid(
+            columns: Array(
+                repeating: GridItem(
+                    .flexible(minimum: minimumColumnWidth),
+                    spacing: spacing,
+                    alignment: .top
+                ),
+                count: columnCount
+            ),
+            alignment: .leading,
+            spacing: spacing
+        ) {
+            content
+        }
+    }
+}
+
 struct InputFlowPillGrid<Content: View>: View {
     let minimumColumnWidth: CGFloat
     let content: Content

Symi/Sources/Shared/SetToggleMembership.swift

@@ -0,0 +1,9 @@
+extension Set {
+    mutating func toggleMembership(_ member: Element) {
+        if contains(member) {
+            remove(member)
+        } else {
+            insert(member)
+        }
+    }
+}

SymiTests/NewEntryDesignSystemTests.swift

@@ -96,4 +96,15 @@ struct NewEntryDesignSystemTests {
             #expect(token.lightColorValue.hexString == expected[token, default: ""])
         }
     }
+
+    @Test
+    func setToggleMembershipAddsAndRemovesMembers() {
+        var selection: Set<String> = ["Stress"]
+
+        selection.toggleMembership("Wetter")
+        #expect(selection == ["Stress", "Wetter"])
+
+        selection.toggleMembership("Stress")
+        #expect(selection == ["Wetter"])
+    }
 }