From 60166b349d853fe0253dab04ab09c1daef70de1e Mon Sep 17 00:00:00 2001 From: Jean-Luc Makiola Date: Fri, 13 Nov 2026 19:07:41 +0100 Subject: [PATCH 1/5] feat(#143): toggle a whole calendar group from its drawer header --- .../calendula/data/prefs/CalendarPrefs.kt | 5 ++ .../calendula/ui/filter/CalendarFilterList.kt | 62 ++++++++++++++++--- .../calendula/ui/filter/FilterViewModel.kt | 12 ++-- .../calendula/ui/filter/GroupVisibility.kt | 16 +++++ app/src/main/res/values/strings.xml | 3 + .../ui/filter/GroupVisibilityTest.kt | 31 ++++++++++ 6 files changed, 112 insertions(+), 17 deletions(-) create mode 100644 app/src/main/java/de/jeanlucmakiola/calendula/ui/filter/GroupVisibility.kt create mode 100644 app/src/test/java/de/jeanlucmakiola/calendula/ui/filter/GroupVisibilityTest.kt 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 f75b69a4..3198fa7c 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,6 +32,11 @@ 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() } + } + /** * Switch-offs the provider does not know about yet, because writing * `Calendars.VISIBLE` needs `WRITE_CALENDAR` (#75). Also inherits the 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 68191a85..f7f56a3b 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 @@ -1,19 +1,28 @@ package de.jeanlucmakiola.calendula.ui.filter import androidx.compose.foundation.background +import androidx.compose.foundation.clickable import androidx.compose.foundation.layout.Arrangement import androidx.compose.foundation.layout.Box import androidx.compose.foundation.layout.Column +import androidx.compose.foundation.layout.Row import androidx.compose.foundation.layout.fillMaxWidth import androidx.compose.foundation.layout.height import androidx.compose.foundation.layout.padding +import androidx.compose.foundation.layout.size import androidx.compose.material3.Checkbox import androidx.compose.material3.MaterialTheme import androidx.compose.material3.Text +import androidx.compose.material3.TriStateCheckbox import androidx.compose.runtime.Composable import androidx.compose.runtime.getValue +import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier import androidx.compose.ui.res.stringResource +import androidx.compose.ui.semantics.Role +import androidx.compose.ui.semantics.semantics +import androidx.compose.ui.semantics.toggleableState +import androidx.compose.ui.state.ToggleableState import androidx.compose.ui.text.style.TextAlign import androidx.compose.ui.unit.dp import androidx.hilt.navigation.compose.hiltViewModel @@ -47,6 +56,7 @@ fun CalendarFilterList( groups = s.groups, hidden = s.hidden, onSetVisible = viewModel::setVisible, + onSetGroupVisible = viewModel::setGroupVisible, modifier = modifier, ) } @@ -62,20 +72,15 @@ private fun FilterList( groups: List, hidden: Set, onSetVisible: (Long, Boolean) -> Unit, + onSetGroupVisible: (List, Boolean) -> Unit, modifier: Modifier = Modifier, ) { Column(modifier = modifier.fillMaxWidth()) { groups.forEach { group -> - Text( - text = accountGroupTitle(group), - style = MaterialTheme.typography.labelMedium, - color = MaterialTheme.colorScheme.onSurfaceVariant, - modifier = Modifier.padding( - start = GroupedListInset, - end = GroupedListInset, - top = 12.dp, - bottom = 4.dp, - ), + GroupHeader( + title = accountGroupTitle(group), + state = groupVisibility(group.calendars.map { it.id }, hidden), + onToggle = { visible -> onSetGroupVisible(group.calendars.map { it.id }, visible) }, ) group.calendars.forEachIndexed { index, cal -> val visible = cal.id !in hidden @@ -97,6 +102,43 @@ private fun FilterList( } } +/** + * An account's header doubling as the group's parent checkbox (#143): checked + * when every calendar shows, indeterminate when some do. Tapping it shows all, + * or hides all when the group is fully shown. + */ +@Composable +private fun GroupHeader( + title: String, + state: ToggleableState, + onToggle: (Boolean) -> Unit, +) { + val label = stringResource( + if (state.nextGroupVisible()) R.string.filter_group_show_all else R.string.filter_group_hide_all, + ) + Row( + verticalAlignment = Alignment.CenterVertically, + modifier = Modifier + .fillMaxWidth() + .padding(top = 4.dp) + .clickable(onClickLabel = label, role = Role.Checkbox) { onToggle(state.nextGroupVisible()) } + .semantics { toggleableState = state } + .padding(start = GroupedListInset, end = GroupedListInset + 16.dp), + ) { + Text( + text = title, + style = MaterialTheme.typography.labelMedium, + color = MaterialTheme.colorScheme.onSurfaceVariant, + modifier = Modifier + .weight(1f) + .padding(end = 8.dp), + ) + Box(Modifier.size(48.dp), contentAlignment = Alignment.Center) { + TriStateCheckbox(state = state, onClick = null) + } + } +} + @Composable private fun FilterLoading(modifier: Modifier = Modifier) { Column( 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 fda4c1fb..aee66108 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 @@ -14,7 +14,6 @@ import kotlinx.coroutines.CoroutineDispatcher import kotlinx.coroutines.flow.StateFlow import kotlinx.coroutines.flow.catch import kotlinx.coroutines.flow.combine -import kotlinx.coroutines.flow.first import kotlinx.coroutines.flow.flowOn import kotlinx.coroutines.launch import javax.inject.Inject @@ -49,12 +48,11 @@ class FilterViewModel @Inject constructor( ) /** Show or hide a single calendar; persists the new hidden set. */ - fun setVisible(calendarId: Long, visible: Boolean) { - viewModelScope.launch { - val current = prefs.hiddenCalendarIds.first() - val next = if (visible) current - calendarId else current + calendarId - if (next != current) prefs.setHiddenCalendarIds(next) - } + fun setVisible(calendarId: Long, visible: Boolean) = setGroupVisible(listOf(calendarId), visible) + + /** Show or hide every calendar in [calendarIds] at once (#143). */ + fun setGroupVisible(calendarIds: Collection, visible: Boolean) { + viewModelScope.launch { prefs.setCalendarsHidden(calendarIds, hidden = !visible) } } } 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 new file mode 100644 index 00000000..6e2a2102 --- /dev/null +++ b/app/src/main/java/de/jeanlucmakiola/calendula/ui/filter/GroupVisibility.kt @@ -0,0 +1,16 @@ +package de.jeanlucmakiola.calendula.ui.filter + +import androidx.compose.ui.state.ToggleableState + +/** The drawer group header's checkbox state: on, off, or some of [calendarIds] shown. */ +fun groupVisibility(calendarIds: Collection, hidden: Set): ToggleableState { + val shown = calendarIds.count { it !in hidden } + return when (shown) { + calendarIds.size -> ToggleableState.On + 0 -> ToggleableState.Off + else -> ToggleableState.Indeterminate + } +} + +/** What tapping the header does: a fully shown group hides, anything else shows all. */ +fun ToggleableState.nextGroupVisible(): Boolean = this != ToggleableState.On diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 278cc7ca..277a9909 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -550,6 +550,9 @@ Calendars + + Show all calendars in this group + Hide all calendars in this group Settings 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 new file mode 100644 index 00000000..1b19fb11 --- /dev/null +++ b/app/src/test/java/de/jeanlucmakiola/calendula/ui/filter/GroupVisibilityTest.kt @@ -0,0 +1,31 @@ +package de.jeanlucmakiola.calendula.ui.filter + +import androidx.compose.ui.state.ToggleableState +import com.google.common.truth.Truth.assertThat +import org.junit.jupiter.api.Test + +class GroupVisibilityTest { + + private val group = listOf(1L, 2L, 3L) + + @Test + fun `all shown is on and hides on tap`() { + val state = groupVisibility(group, hidden = setOf(9L)) + assertThat(state).isEqualTo(ToggleableState.On) + assertThat(state.nextGroupVisible()).isFalse() + } + + @Test + fun `none shown is off and shows on tap`() { + val state = groupVisibility(group, hidden = setOf(1L, 2L, 3L)) + assertThat(state).isEqualTo(ToggleableState.Off) + assertThat(state.nextGroupVisible()).isTrue() + } + + @Test + fun `some shown is indeterminate and shows all on tap`() { + val state = groupVisibility(group, hidden = setOf(2L)) + assertThat(state).isEqualTo(ToggleableState.Indeterminate) + assertThat(state.nextGroupVisible()).isTrue() + } +} From 22173be22e6074853733a257abb73e68c591b27c Mon Sep 17 00:00:00 2001 From: Jean-Luc Makiola Date: Fri, 13 Nov 2026 19:12:52 +0100 Subject: [PATCH 2/5] =?UTF-8?q?fix(#143):=20review=20round=201=20=E2=80=94?= =?UTF-8?q?=20empty=20group=20state,=20inset=20header=20ripple,=20prefs=20?= =?UTF-8?q?test?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../calendula/ui/filter/CalendarFilterList.kt | 11 +++++++---- .../calendula/ui/filter/GroupVisibility.kt | 6 +++--- .../calendula/data/prefs/CalendarPrefsTest.kt | 12 ++++++++++++ .../calendula/ui/filter/GroupVisibilityTest.kt | 5 +++++ 4 files changed, 27 insertions(+), 7 deletions(-) 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 f7f56a3b..fe2f2593 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 @@ -18,6 +18,7 @@ import androidx.compose.runtime.Composable import androidx.compose.runtime.getValue import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier +import androidx.compose.ui.draw.clip import androidx.compose.ui.res.stringResource import androidx.compose.ui.semantics.Role import androidx.compose.ui.semantics.semantics @@ -77,10 +78,11 @@ private fun FilterList( ) { Column(modifier = modifier.fillMaxWidth()) { groups.forEach { group -> + val ids = group.calendars.map { it.id } GroupHeader( title = accountGroupTitle(group), - state = groupVisibility(group.calendars.map { it.id }, hidden), - onToggle = { visible -> onSetGroupVisible(group.calendars.map { it.id }, visible) }, + state = groupVisibility(ids, hidden), + onToggle = { visible -> onSetGroupVisible(ids, visible) }, ) group.calendars.forEachIndexed { index, cal -> val visible = cal.id !in hidden @@ -120,10 +122,11 @@ private fun GroupHeader( verticalAlignment = Alignment.CenterVertically, modifier = Modifier .fillMaxWidth() - .padding(top = 4.dp) + .padding(horizontal = GroupedListInset / 2) + .clip(MaterialTheme.shapes.large) .clickable(onClickLabel = label, role = Role.Checkbox) { onToggle(state.nextGroupVisible()) } .semantics { toggleableState = state } - .padding(start = GroupedListInset, end = GroupedListInset + 16.dp), + .padding(start = GroupedListInset / 2, end = GroupedListInset / 2 + 16.dp), ) { Text( text = title, 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 6e2a2102..2757405e 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 @@ -3,14 +3,14 @@ package de.jeanlucmakiola.calendula.ui.filter import androidx.compose.ui.state.ToggleableState /** The drawer group header's checkbox state: on, off, or some of [calendarIds] shown. */ -fun groupVisibility(calendarIds: Collection, hidden: Set): ToggleableState { +internal fun groupVisibility(calendarIds: Collection, hidden: Set): ToggleableState { val shown = calendarIds.count { it !in hidden } return when (shown) { - calendarIds.size -> ToggleableState.On 0 -> ToggleableState.Off + calendarIds.size -> ToggleableState.On else -> ToggleableState.Indeterminate } } /** What tapping the header does: a fully shown group hides, anything else shows all. */ -fun ToggleableState.nextGroupVisible(): Boolean = this != ToggleableState.On +internal fun ToggleableState.nextGroupVisible(): Boolean = this != ToggleableState.On 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 9f0fb46b..65605e2c 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 @@ -34,6 +34,18 @@ class CalendarPrefsTest { assertThat(prefs.hiddenCalendarIds.first()).isEmpty() } + @Test + fun `setCalendarsHidden adds and removes only the given ids`(@TempDir tempDir: Path) = runTest { + val prefs = testPrefs(tempDir) + prefs.setHiddenCalendarIds(setOf(9L)) + prefs.setCalendarsHidden(listOf(1L, 2L), hidden = true) + 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) + assertThat(prefs.hiddenCalendarIds.first()).isEmpty() + } + @Test fun `garbage stored string is parsed defensively`(@TempDir tempDir: Path) = runTest { val store = testDataStore(tempDir, "test_prefs") 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 1b19fb11..0647d0be 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 @@ -28,4 +28,9 @@ class GroupVisibilityTest { assertThat(state).isEqualTo(ToggleableState.Indeterminate) assertThat(state.nextGroupVisible()).isTrue() } + + @Test + fun `empty group is off`() { + assertThat(groupVisibility(emptyList(), hidden = emptySet())).isEqualTo(ToggleableState.Off) + } } From 4186640a6312a1657607ae91df20c0d54e8cf01c Mon Sep 17 00:00:00 2001 From: Jean-Luc Makiola Date: Fri, 13 Nov 2026 19:16:54 +0100 Subject: [PATCH 3/5] =?UTF-8?q?fix(#143):=20review=20round=202=20=E2=80=94?= =?UTF-8?q?=20decide=20group=20toggle=20from=20the=20stored=20set?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../calendula/data/prefs/CalendarPrefs.kt | 8 ++++++-- .../calendula/ui/filter/CalendarFilterList.kt | 10 +++++----- .../calendula/ui/filter/FilterViewModel.kt | 13 +++++++++---- .../calendula/ui/filter/GroupVisibility.kt | 4 ++++ .../calendula/ui/filter/GroupVisibilityTest.kt | 13 +++++++++++++ 5 files changed, 37 insertions(+), 11 deletions(-) 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)) + } } From 9511444c6befe84a4094e58e67a85e4ef9612e24 Mon Sep 17 00:00:00 2001 From: Jean-Luc Makiola Date: Fri, 13 Nov 2026 19:20:45 +0100 Subject: [PATCH 4/5] =?UTF-8?q?fix(#143):=20review=20round=203=20=E2=80=94?= =?UTF-8?q?=20rows=20toggle=20against=20the=20stored=20set=20too?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../calendula/data/prefs/CalendarPrefs.kt | 4 ---- .../calendula/ui/filter/CalendarFilterList.kt | 8 ++++---- .../calendula/ui/filter/FilterViewModel.kt | 16 +++++++++------- .../calendula/data/prefs/CalendarPrefsTest.kt | 8 +++----- 4 files changed, 16 insertions(+), 20 deletions(-) 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() } From e8d651fe96e2bd087aca96af5c9154eac003d0a7 Mon Sep 17 00:00:00 2001 From: Jean-Luc Makiola Date: Mon, 16 Nov 2026 20:32:26 +0100 Subject: [PATCH 5/5] fix(#143): the group header itself toggles, without a checkbox of its own --- .../calendula/ui/filter/CalendarFilterList.kt | 33 +++++++------------ 1 file changed, 12 insertions(+), 21 deletions(-) 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 7352d688..eb4d8df4 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 @@ -2,6 +2,8 @@ package de.jeanlucmakiola.calendula.ui.filter import androidx.compose.foundation.background import androidx.compose.foundation.clickable +import androidx.compose.foundation.layout.wrapContentHeight +import androidx.compose.foundation.layout.heightIn import androidx.compose.foundation.layout.Arrangement import androidx.compose.foundation.layout.Box import androidx.compose.foundation.layout.Column @@ -13,7 +15,6 @@ import androidx.compose.foundation.layout.size import androidx.compose.material3.Checkbox import androidx.compose.material3.MaterialTheme import androidx.compose.material3.Text -import androidx.compose.material3.TriStateCheckbox import androidx.compose.runtime.Composable import androidx.compose.runtime.getValue import androidx.compose.ui.Alignment @@ -21,8 +22,6 @@ import androidx.compose.ui.Modifier import androidx.compose.ui.draw.clip import androidx.compose.ui.res.stringResource import androidx.compose.ui.semantics.Role -import androidx.compose.ui.semantics.semantics -import androidx.compose.ui.semantics.toggleableState import androidx.compose.ui.state.ToggleableState import androidx.compose.ui.text.style.TextAlign import androidx.compose.ui.unit.dp @@ -118,28 +117,20 @@ private fun GroupHeader( val label = stringResource( if (state.nextGroupVisible()) R.string.filter_group_show_all else R.string.filter_group_hide_all, ) - Row( - verticalAlignment = Alignment.CenterVertically, + // The header itself is the toggle; the rows' checkboxes show the result. + Text( + text = title, + style = MaterialTheme.typography.labelMedium, + color = MaterialTheme.colorScheme.onSurfaceVariant, modifier = Modifier .fillMaxWidth() .padding(horizontal = GroupedListInset / 2) .clip(MaterialTheme.shapes.large) - .clickable(onClickLabel = label, role = Role.Checkbox) { onToggle() } - .semantics { toggleableState = state } - .padding(start = GroupedListInset / 2, end = GroupedListInset / 2 + 16.dp), - ) { - Text( - text = title, - style = MaterialTheme.typography.labelMedium, - color = MaterialTheme.colorScheme.onSurfaceVariant, - modifier = Modifier - .weight(1f) - .padding(end = 8.dp), - ) - Box(Modifier.size(48.dp), contentAlignment = Alignment.Center) { - TriStateCheckbox(state = state, onClick = null) - } - } + .clickable(onClickLabel = label, role = Role.Button) { onToggle() } + .heightIn(min = 48.dp) + .wrapContentHeight(Alignment.CenterVertically) + .padding(horizontal = GroupedListInset / 2), + ) } @Composable