diff --git a/app/src/main/java/de/jeanlucmakiola/calendula/data/prefs/CalendarPrefs.kt b/app/src/main/java/de/jeanlucmakiola/calendula/data/prefs/CalendarPrefs.kt index 0bbb8c90..422be9ed 100644 --- a/app/src/main/java/de/jeanlucmakiola/calendula/data/prefs/CalendarPrefs.kt +++ b/app/src/main/java/de/jeanlucmakiola/calendula/data/prefs/CalendarPrefs.kt @@ -32,10 +32,6 @@ class CalendarPrefs @Inject constructor( suspend fun setHiddenCalendarIds(ids: Set) = prefs.set(HIDDEN_IDS, ids) - /** Hide or show [ids] in the drawer filter in one atomic write. */ - suspend fun setCalendarsHidden(ids: Collection, hidden: Boolean) = - updateHiddenCalendarIds { if (hidden) it + ids else it - ids.toSet() } - /** Rewrite the drawer's hidden set atomically from its current value. */ suspend fun updateHiddenCalendarIds(transform: (Set) -> Set) { prefs.update(HIDDEN_IDS, transform) diff --git a/app/src/main/java/de/jeanlucmakiola/calendula/ui/filter/CalendarFilterList.kt b/app/src/main/java/de/jeanlucmakiola/calendula/ui/filter/CalendarFilterList.kt index 6a196b4f..7352d688 100644 --- a/app/src/main/java/de/jeanlucmakiola/calendula/ui/filter/CalendarFilterList.kt +++ b/app/src/main/java/de/jeanlucmakiola/calendula/ui/filter/CalendarFilterList.kt @@ -56,7 +56,7 @@ fun CalendarFilterList( is FilterUiState.Success -> FilterList( groups = s.groups, hidden = s.hidden, - onSetVisible = viewModel::setVisible, + onToggleCalendar = viewModel::toggleCalendar, onToggleGroup = viewModel::toggleGroup, modifier = modifier, ) @@ -72,7 +72,7 @@ fun CalendarFilterList( private fun FilterList( groups: List, hidden: Set, - onSetVisible: (Long, Boolean) -> Unit, + onToggleCalendar: (Long) -> Unit, onToggleGroup: (List) -> Unit, modifier: Modifier = Modifier, ) { @@ -94,10 +94,10 @@ private fun FilterList( trailing = { Checkbox( checked = visible, - onCheckedChange = { onSetVisible(cal.id, it) }, + onCheckedChange = { onToggleCalendar(cal.id) }, ) }, - onClick = { onSetVisible(cal.id, !visible) }, + onClick = { onToggleCalendar(cal.id) }, ) } } diff --git a/app/src/main/java/de/jeanlucmakiola/calendula/ui/filter/FilterViewModel.kt b/app/src/main/java/de/jeanlucmakiola/calendula/ui/filter/FilterViewModel.kt index 0a903705..702b334c 100644 --- a/app/src/main/java/de/jeanlucmakiola/calendula/ui/filter/FilterViewModel.kt +++ b/app/src/main/java/de/jeanlucmakiola/calendula/ui/filter/FilterViewModel.kt @@ -47,15 +47,17 @@ class FilterViewModel @Inject constructor( initialValue = FilterUiState.Loading, ) - /** Show or hide a single calendar; persists the new hidden set. */ - fun setVisible(calendarId: Long, visible: Boolean) { - viewModelScope.launch { prefs.setCalendarsHidden(listOf(calendarId), hidden = !visible) } + /** + * Flip one calendar, or a whole group from its header (#143). Both decide + * against the stored set rather than the last drawn state, so quick repeated + * taps still alternate. + */ + fun toggleCalendar(calendarId: Long) { + viewModelScope.launch { + prefs.updateHiddenCalendarIds { if (calendarId in it) it - calendarId else it + calendarId } + } } - /** - * The group header's tap (#143), decided against the stored set rather than - * the last drawn state so quick repeated taps still alternate. - */ fun toggleGroup(calendarIds: List) { viewModelScope.launch { prefs.updateHiddenCalendarIds { toggledGroup(it, calendarIds) } } } diff --git a/app/src/test/java/de/jeanlucmakiola/calendula/data/prefs/CalendarPrefsTest.kt b/app/src/test/java/de/jeanlucmakiola/calendula/data/prefs/CalendarPrefsTest.kt index 65605e2c..085c38ab 100644 --- a/app/src/test/java/de/jeanlucmakiola/calendula/data/prefs/CalendarPrefsTest.kt +++ b/app/src/test/java/de/jeanlucmakiola/calendula/data/prefs/CalendarPrefsTest.kt @@ -35,14 +35,12 @@ class CalendarPrefsTest { } @Test - fun `setCalendarsHidden adds and removes only the given ids`(@TempDir tempDir: Path) = runTest { + fun `updateHiddenCalendarIds transforms the stored set`(@TempDir tempDir: Path) = runTest { val prefs = testPrefs(tempDir) prefs.setHiddenCalendarIds(setOf(9L)) - prefs.setCalendarsHidden(listOf(1L, 2L), hidden = true) + prefs.updateHiddenCalendarIds { it + listOf(1L, 2L) } assertThat(prefs.hiddenCalendarIds.first()).isEqualTo(setOf(1L, 2L, 9L)) - prefs.setCalendarsHidden(listOf(2L, 3L), hidden = false) - assertThat(prefs.hiddenCalendarIds.first()).isEqualTo(setOf(1L, 9L)) - prefs.setCalendarsHidden(listOf(1L, 9L), hidden = false) + prefs.updateHiddenCalendarIds { emptySet() } assertThat(prefs.hiddenCalendarIds.first()).isEmpty() }