From bbcb8e00ed0526458093c543c275cdfe454fd357 Mon Sep 17 00:00:00 2001 From: Jean-Luc Makiola Date: Sat, 14 Nov 2026 03:22:35 +0100 Subject: [PATCH] fix(#517): review round 1 - close picker on external navigation, proper load/failure states, wait for stored hidden views --- .../java/de/jeanlucmakiola/calendula/ui/CalendarHost.kt | 5 ++++- .../calendula/ui/calendars/CalendarsScreen.kt | 8 +++++--- .../calendula/ui/calendars/CalendarsViewModel.kt | 6 +++--- .../calendula/ui/filter/CalendarFilterList.kt | 4 ++-- .../jeanlucmakiola/calendula/ui/filter/FilterUiState.kt | 2 +- .../calendula/ui/filter/ViewCalendarsPicker.kt | 7 +++---- app/src/main/res/values/strings.xml | 1 - 7 files changed, 18 insertions(+), 15 deletions(-) diff --git a/app/src/main/java/de/jeanlucmakiola/calendula/ui/CalendarHost.kt b/app/src/main/java/de/jeanlucmakiola/calendula/ui/CalendarHost.kt index c2bcb0a2..369baf0b 100644 --- a/app/src/main/java/de/jeanlucmakiola/calendula/ui/CalendarHost.kt +++ b/app/src/main/java/de/jeanlucmakiola/calendula/ui/CalendarHost.kt @@ -355,6 +355,7 @@ fun CalendarHost( fun dismissCoveringOverlays(keepCreate: Boolean = false) { showSettings = false showSearch = false + showViewCalendars = false showCalendars = false showBackup = false detailKey = null @@ -615,7 +616,9 @@ fun CalendarHost( onOpenDrawer = { switchScope.launch { drawerState.open() } }, onOpenSearch = onOpenSearch, showTodayButton = todayInToolbar, - hiddenInView = (filterState as? FilterUiState.Success)?.hiddenOnlyIn(view) ?: 0, + hiddenInView = remember(filterState, view) { + (filterState as? FilterUiState.Success)?.hiddenOnlyIn(view) ?: 0 + }, onOpenViewCalendars = { showViewCalendars = true }, ) }, diff --git a/app/src/main/java/de/jeanlucmakiola/calendula/ui/calendars/CalendarsScreen.kt b/app/src/main/java/de/jeanlucmakiola/calendula/ui/calendars/CalendarsScreen.kt index ac0c2a9d..69338fc3 100644 --- a/app/src/main/java/de/jeanlucmakiola/calendula/ui/calendars/CalendarsScreen.kt +++ b/app/src/main/java/de/jeanlucmakiola/calendula/ui/calendars/CalendarsScreen.kt @@ -137,7 +137,8 @@ fun CalendarsScreen( val calendars by viewModel.calendars.collectAsStateWithLifecycle() val deleteLockedIds by viewModel.deleteLockedCalendarIds.collectAsStateWithLifecycle() val error by viewModel.error.collectAsStateWithLifecycle() - val hiddenViews by viewModel.hiddenViews.collectAsStateWithLifecycle() + val loadedHiddenViews by viewModel.hiddenViews.collectAsStateWithLifecycle() + val hiddenViews = loadedHiddenViews.orEmpty() // null = list; NEW_CALENDAR_ID = create; any other id = edit that calendar. // [editorSession] bumps on every open so the editor's field state resets for @@ -147,7 +148,8 @@ fun CalendarsScreen( // A synced calendar has no editor; tapping it opens its hidden-views picker. var hidingId by rememberSaveable { mutableStateOf(null) } - if (editorId != null) { + // The editor and the picker seed from the stored hidden views, so both wait for the first read. + if (editorId != null && loadedHiddenViews != null) { val editing = calendars.firstOrNull { it.id == editorId } CalendarEditor( sessionKey = editorSession, @@ -194,7 +196,7 @@ fun CalendarsScreen( // Gone while the picker was up; an empty list is one still loading, not a deletion. if (calendar == null && calendars.isNotEmpty()) { LaunchedEffect(id) { hidingId = null } - } else if (calendar != null) { + } else if (calendar != null && loadedHiddenViews != null) { HiddenViewsPicker( calendarName = calendar.displayName.orUnnamed(), hidden = hiddenViews[id].orEmpty(), diff --git a/app/src/main/java/de/jeanlucmakiola/calendula/ui/calendars/CalendarsViewModel.kt b/app/src/main/java/de/jeanlucmakiola/calendula/ui/calendars/CalendarsViewModel.kt index 95f6c36f..062d703c 100644 --- a/app/src/main/java/de/jeanlucmakiola/calendula/ui/calendars/CalendarsViewModel.kt +++ b/app/src/main/java/de/jeanlucmakiola/calendula/ui/calendars/CalendarsViewModel.kt @@ -106,13 +106,13 @@ class CalendarsViewModel @Inject constructor( initialValue = emptySet(), ) - /** The views each calendar is hidden in (#270). */ - val hiddenViews: StateFlow>> = + /** The views each calendar is hidden in (#270); null until first read. */ + val hiddenViews: StateFlow>?> = settingsPrefs.perCalendarHiddenViews .catch { emit(emptyMap()) } .stateWhileSubscribed( scope = viewModelScope, - initialValue = emptyMap(), + initialValue = null, ) fun setHiddenIn(id: Long, view: CalendarView, hidden: Boolean) = write { 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 32e26c53..8e2d8f78 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 @@ -105,7 +105,7 @@ private fun FilterList( } @Composable -private fun FilterLoading(modifier: Modifier = Modifier) { +internal fun FilterLoading(modifier: Modifier = Modifier) { Column( modifier = modifier.fillMaxWidth(), verticalArrangement = Arrangement.spacedBy(8.dp), @@ -126,7 +126,7 @@ private fun FilterLoading(modifier: Modifier = Modifier) { } @Composable -private fun FilterMessage(reason: FailureReason, modifier: Modifier = Modifier) { +internal fun FilterMessage(reason: FailureReason, modifier: Modifier = Modifier) { val msg = when (reason) { FailureReason.NoCalendarsConfigured -> R.string.state_failure_no_calendars FailureReason.AllCalendarsHidden -> R.string.state_failure_all_hidden diff --git a/app/src/main/java/de/jeanlucmakiola/calendula/ui/filter/FilterUiState.kt b/app/src/main/java/de/jeanlucmakiola/calendula/ui/filter/FilterUiState.kt index 2d3b2e2b..f82967aa 100644 --- a/app/src/main/java/de/jeanlucmakiola/calendula/ui/filter/FilterUiState.kt +++ b/app/src/main/java/de/jeanlucmakiola/calendula/ui/filter/FilterUiState.kt @@ -27,7 +27,7 @@ sealed interface FilterUiState { * hidden everywhere from the drawer, or not listed, don't count. */ fun hiddenOnlyIn(view: CalendarView): Int { - val listed = groups.flatMap { group -> group.calendars.map { it.id } } + val listed = groups.flatMapTo(mutableSetOf()) { group -> group.calendars.map { it.id } } return hiddenViews.calendarsHiddenIn(view).count { it in listed && it !in hidden } } } diff --git a/app/src/main/java/de/jeanlucmakiola/calendula/ui/filter/ViewCalendarsPicker.kt b/app/src/main/java/de/jeanlucmakiola/calendula/ui/filter/ViewCalendarsPicker.kt index 436e776a..6163f816 100644 --- a/app/src/main/java/de/jeanlucmakiola/calendula/ui/filter/ViewCalendarsPicker.kt +++ b/app/src/main/java/de/jeanlucmakiola/calendula/ui/filter/ViewCalendarsPicker.kt @@ -12,7 +12,6 @@ import de.jeanlucmakiola.calendula.ui.common.CalendarColorChip import de.jeanlucmakiola.calendula.ui.common.CalendarView import de.jeanlucmakiola.calendula.ui.common.accountGroupTitle import de.jeanlucmakiola.calendula.ui.common.calendarsHiddenIn -import de.jeanlucmakiola.calendula.ui.common.label import de.jeanlucmakiola.calendula.ui.common.orUnnamed import de.jeanlucmakiola.floret.components.FullScreenPicker import de.jeanlucmakiola.floret.components.GroupedHint @@ -32,13 +31,13 @@ fun ViewCalendarsPicker( onDismiss: () -> Unit, ) { FullScreenPicker( - title = stringResource(R.string.view_calendars_title, view.label()), + title = stringResource(R.string.view_calendars_action), onDismiss = onDismiss, predictiveBack = true, ) { when (state) { - FilterUiState.Loading -> Unit - is FilterUiState.Failure -> GroupedHint(stringResource(R.string.state_failure_provider), verticalPadding = 8.dp) + FilterUiState.Loading -> FilterLoading() + is FilterUiState.Failure -> FilterMessage(state.reason) is FilterUiState.Success -> { // Seeded once, then ahead of the store: the picker is the only // writer while open, so a quick second tap still flips. diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 3b7fb5c5..4daa2c08 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -873,7 +873,6 @@ Calendars in this view, %d hidden Calendars in this view, %d hidden - Hide in %1$s Checked calendars stay out of this view only. Reminders, search and widgets still include them. Hidden in every view from the menu Mauve