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 3198fa7c..0bbb8c90 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 @@ -33,8 +33,12 @@ 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) { - prefs.update(HIDDEN_IDS) { if (hidden) it + ids else it - ids.toSet() } + 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 fe2f2593..6a196b4f 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 @@ -57,7 +57,7 @@ fun CalendarFilterList( groups = s.groups, hidden = s.hidden, onSetVisible = viewModel::setVisible, - onSetGroupVisible = viewModel::setGroupVisible, + onToggleGroup = viewModel::toggleGroup, modifier = modifier, ) } @@ -73,7 +73,7 @@ private fun FilterList( groups: List, hidden: Set, onSetVisible: (Long, Boolean) -> Unit, - onSetGroupVisible: (List, Boolean) -> Unit, + onToggleGroup: (List) -> Unit, modifier: Modifier = Modifier, ) { Column(modifier = modifier.fillMaxWidth()) { @@ -82,7 +82,7 @@ private fun FilterList( GroupHeader( title = accountGroupTitle(group), state = groupVisibility(ids, hidden), - onToggle = { visible -> onSetGroupVisible(ids, visible) }, + onToggle = { onToggleGroup(ids) }, ) group.calendars.forEachIndexed { index, cal -> val visible = cal.id !in hidden @@ -113,7 +113,7 @@ private fun FilterList( private fun GroupHeader( title: String, state: ToggleableState, - onToggle: (Boolean) -> Unit, + onToggle: () -> Unit, ) { val label = stringResource( if (state.nextGroupVisible()) R.string.filter_group_show_all else R.string.filter_group_hide_all, @@ -124,7 +124,7 @@ private fun GroupHeader( .fillMaxWidth() .padding(horizontal = GroupedListInset / 2) .clip(MaterialTheme.shapes.large) - .clickable(onClickLabel = label, role = Role.Checkbox) { onToggle(state.nextGroupVisible()) } + .clickable(onClickLabel = label, role = Role.Checkbox) { onToggle() } .semantics { toggleableState = state } .padding(start = GroupedListInset / 2, end = GroupedListInset / 2 + 16.dp), ) { 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 aee66108..0a903705 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 @@ -48,11 +48,16 @@ class FilterViewModel @Inject constructor( ) /** Show or hide a single calendar; persists the new hidden set. */ - fun setVisible(calendarId: Long, visible: Boolean) = setGroupVisible(listOf(calendarId), visible) + fun setVisible(calendarId: Long, visible: Boolean) { + viewModelScope.launch { prefs.setCalendarsHidden(listOf(calendarId), hidden = !visible) } + } - /** Show or hide every calendar in [calendarIds] at once (#143). */ - fun setGroupVisible(calendarIds: Collection, visible: Boolean) { - viewModelScope.launch { prefs.setCalendarsHidden(calendarIds, hidden = !visible) } + /** + * 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/main/java/de/jeanlucmakiola/calendula/ui/filter/GroupVisibility.kt b/app/src/main/java/de/jeanlucmakiola/calendula/ui/filter/GroupVisibility.kt index 2757405e..3994bc9d 100644 --- a/app/src/main/java/de/jeanlucmakiola/calendula/ui/filter/GroupVisibility.kt +++ b/app/src/main/java/de/jeanlucmakiola/calendula/ui/filter/GroupVisibility.kt @@ -14,3 +14,7 @@ internal fun groupVisibility(calendarIds: Collection, hidden: Set): /** What tapping the header does: a fully shown group hides, anything else shows all. */ internal fun ToggleableState.nextGroupVisible(): Boolean = this != ToggleableState.On + +/** [hidden] after tapping the header of the group holding [calendarIds]. */ +internal fun toggledGroup(hidden: Set, calendarIds: Collection): Set = + if (groupVisibility(calendarIds, hidden).nextGroupVisible()) hidden - calendarIds.toSet() else hidden + calendarIds diff --git a/app/src/test/java/de/jeanlucmakiola/calendula/ui/filter/GroupVisibilityTest.kt b/app/src/test/java/de/jeanlucmakiola/calendula/ui/filter/GroupVisibilityTest.kt index 0647d0be..6e0cd4f6 100644 --- a/app/src/test/java/de/jeanlucmakiola/calendula/ui/filter/GroupVisibilityTest.kt +++ b/app/src/test/java/de/jeanlucmakiola/calendula/ui/filter/GroupVisibilityTest.kt @@ -33,4 +33,17 @@ class GroupVisibilityTest { fun `empty group is off`() { assertThat(groupVisibility(emptyList(), hidden = emptySet())).isEqualTo(ToggleableState.Off) } + + @Test + fun `toggling twice from the stored set alternates`() { + val hidden = setOf(9L) + val once = toggledGroup(hidden, group) + assertThat(once).isEqualTo(setOf(1L, 2L, 3L, 9L)) + assertThat(toggledGroup(once, group)).isEqualTo(setOf(9L)) + } + + @Test + fun `toggling a partly shown group shows all`() { + assertThat(toggledGroup(setOf(2L, 9L), group)).isEqualTo(setOf(9L)) + } }