From db8d64946718acf2370561009d57aaec69ecf38e Mon Sep 17 00:00:00 2001 From: Jean-Luc Makiola Date: Fri, 13 Nov 2026 19:04:25 +0100 Subject: [PATCH] fix(#270): review round 2 - safe pref reads, diff-only editor saves, optimistic picker --- .../jeanlucmakiola/calendula/domain/Models.kt | 4 +++ .../calendula/ui/calendars/CalendarsScreen.kt | 26 ++++++++++++------- .../ui/calendars/CalendarsViewModel.kt | 21 +++++++++++---- .../ui/common/ViewHiddenCalendars.kt | 18 ++++++------- .../calendula/ui/filter/FilterViewModel.kt | 3 ++- .../calendula/widget/WidgetData.kt | 2 +- .../widget/countdown/CountdownData.kt | 2 +- .../ui/common/ViewHiddenCalendarsTest.kt | 4 +-- docs/ARCHITECTURE.md | 4 +-- 9 files changed, 54 insertions(+), 30 deletions(-) diff --git a/app/src/main/java/de/jeanlucmakiola/calendula/domain/Models.kt b/app/src/main/java/de/jeanlucmakiola/calendula/domain/Models.kt index 11e39eb8..6f0cfe08 100644 --- a/app/src/main/java/de/jeanlucmakiola/calendula/domain/Models.kt +++ b/app/src/main/java/de/jeanlucmakiola/calendula/domain/Models.kt @@ -309,3 +309,7 @@ enum class FailureReason { EventNotFound, Unknown, } + +/** [this] without the events of [hidden] calendars. */ +fun List.withoutCalendars(hidden: Set): List = + if (hidden.isEmpty()) this else filterNot { it.calendarId in hidden } 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 6d33fdeb..8f23b9ce 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 @@ -372,7 +372,7 @@ internal fun CalendarEditor( initialName: String, initialColor: Int, initialDescription: String, - onSave: (name: String, color: Int, description: String?, hiddenViews: Set?) -> Unit, + onSave: (name: String, color: Int, description: String?, hiddenChanges: Map) -> Unit, onDelete: () -> Unit, onClose: () -> Unit, deleteLocked: Boolean = false, @@ -380,9 +380,8 @@ internal fun CalendarEditor( initialHiddenViews: Set = emptySet(), ) { var name by rememberSaveable(sessionKey) { mutableStateOf(initialName) } + val seededHiddenViews = rememberSaveable(sessionKey) { initialHiddenViews } var hiddenViews by rememberSaveable(sessionKey) { mutableStateOf(initialHiddenViews) } - // Only a set the user touched is written back, so a save never resets one read before it loaded. - var hiddenViewsEdited by rememberSaveable(sessionKey) { mutableStateOf(false) } var pickHiddenViews by rememberSaveable(sessionKey) { mutableStateOf(false) } var color by rememberSaveable(sessionKey) { mutableStateOf(initialColor) } var description by rememberSaveable(sessionKey) { mutableStateOf(initialDescription) } @@ -392,7 +391,10 @@ internal fun CalendarEditor( val valid = name.isNotBlank() val commit = { if (valid) { - onSave(name.trim(), color, description.trim().ifEmpty { null }, hiddenViews.takeIf { hiddenViewsEdited }) + // Only the views toggled here are written, so a save never resets ones it didn't load. + val changes = (hiddenViews + seededHiddenViews - (hiddenViews intersect seededHiddenViews)) + .associateWith { it in hiddenViews } + onSave(name.trim(), color, description.trim().ifEmpty { null }, changes) } } @@ -469,7 +471,6 @@ internal fun CalendarEditor( hidden = hiddenViews, onToggle = { view, hide -> hiddenViews = if (hide) hiddenViews + view else hiddenViews - view - hiddenViewsEdited = true }, onDismiss = { pickHiddenViews = false }, ) @@ -757,8 +758,9 @@ private fun CalendarManagerRow( } /** - * Which views one calendar stays out of (#270). Applies each toggle as it is - * made; display only, so reminders and search keep the calendar. + * Which views one calendar stays out of (#270); display only, so reminders and + * search keep the calendar. [onToggle] decides when a toggle lands: at once for + * a synced calendar, on Save inside the local editor. */ @Composable private fun HiddenViewsPicker( @@ -767,12 +769,18 @@ private fun HiddenViewsPicker( onToggle: (CalendarView, Boolean) -> Unit, onDismiss: () -> Unit, ) { + // Ahead of the store, so a second tap before the first write lands still flips. + var shown by remember { mutableStateOf(hidden) } + LaunchedEffect(hidden) { shown = hidden } MultiOptionPicker( title = stringResource(R.string.calendars_hide_in_views), options = IMPLEMENTED_VIEWS, - selected = hidden, + selected = shown, label = { it.label() }, - onToggle = onToggle, + onToggle = { view, hide -> + shown = if (hide) shown + view else shown - view + onToggle(view, hide) + }, onDismiss = onDismiss, leading = { Icon(it.icon, contentDescription = null) }, header = { 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 21d61dbb..f9663788 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 @@ -3,6 +3,7 @@ package de.jeanlucmakiola.calendula.ui.calendars import android.content.Context import android.content.Intent import android.net.Uri +import android.util.Log import androidx.lifecycle.ViewModel import androidx.lifecycle.viewModelScope import dagger.hilt.android.lifecycle.HiltViewModel @@ -29,6 +30,7 @@ import kotlinx.coroutines.flow.flowOn import kotlinx.coroutines.flow.map import kotlinx.coroutines.launch import kotlinx.coroutines.withContext +import java.io.IOException import kotlin.coroutines.cancellation.CancellationException import kotlin.time.Clock import javax.inject.Inject @@ -157,10 +159,10 @@ class CalendarsViewModel @Inject constructor( displayName: String, color: Int, description: String?, - hiddenViews: Set?, + hiddenChanges: Map = emptyMap(), ) = write { val id = repository.createLocalCalendar(displayName, color, description) - if (!hiddenViews.isNullOrEmpty()) settingsPrefs.setCalendarHiddenViews(id, hiddenViews) + applyHiddenChanges(id, hiddenChanges) } fun updateCalendar( @@ -168,15 +170,24 @@ class CalendarsViewModel @Inject constructor( displayName: String, color: Int, description: String?, - hiddenViews: Set?, + hiddenChanges: Map, ) = write { repository.updateCalendar(id, displayName, color, description) - if (hiddenViews != null) settingsPrefs.setCalendarHiddenViews(id, hiddenViews) + applyHiddenChanges(id, hiddenChanges) + } + + private suspend fun applyHiddenChanges(id: Long, changes: Map) { + changes.forEach { (view, hidden) -> settingsPrefs.setCalendarHiddenIn(id, view, hidden) } } fun deleteCalendar(id: Long) = write { repository.deleteCalendar(id) - settingsPrefs.setCalendarHiddenViews(id, emptySet()) + // Tidy-up only: the delete already landed, so a failure here isn't its failure. + try { + settingsPrefs.setCalendarHiddenViews(id, emptySet()) + } catch (e: IOException) { + Log.w("CalendarsViewModel", "Could not clear hidden views of $id", e) + } } /** diff --git a/app/src/main/java/de/jeanlucmakiola/calendula/ui/common/ViewHiddenCalendars.kt b/app/src/main/java/de/jeanlucmakiola/calendula/ui/common/ViewHiddenCalendars.kt index 7ecb7071..38654561 100644 --- a/app/src/main/java/de/jeanlucmakiola/calendula/ui/common/ViewHiddenCalendars.kt +++ b/app/src/main/java/de/jeanlucmakiola/calendula/ui/common/ViewHiddenCalendars.kt @@ -2,9 +2,11 @@ package de.jeanlucmakiola.calendula.ui.common import de.jeanlucmakiola.calendula.data.calendar.CalendarRepository import de.jeanlucmakiola.calendula.domain.EventInstance +import de.jeanlucmakiola.calendula.domain.withoutCalendars import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.flow.Flow import kotlinx.coroutines.flow.SharingStarted +import kotlinx.coroutines.flow.catch import kotlinx.coroutines.flow.combine import kotlinx.coroutines.flow.distinctUntilChanged import kotlinx.coroutines.flow.map @@ -16,20 +18,19 @@ fun Map>.calendarsHiddenIn(view: CalendarView): Set