From 126f1d51effeba3c82ab840c839088f38167cbee Mon Sep 17 00:00:00 2001 From: Jean-Luc Makiola Date: Sat, 14 Nov 2026 01:06:06 +0100 Subject: [PATCH] fix(#365): no duplicate day reminders on all-day events, one placeholder rule --- .../de/jeanlucmakiola/calendula/ui/common/Picker.kt | 2 +- .../calendula/ui/common/ReminderFormatting.kt | 11 +++++++++++ .../calendula/ui/edit/EventEditScreen.kt | 9 ++++++--- .../calendula/ui/common/ReminderPresetsTest.kt | 6 ++++++ 4 files changed, 24 insertions(+), 4 deletions(-) diff --git a/app/src/main/java/de/jeanlucmakiola/calendula/ui/common/Picker.kt b/app/src/main/java/de/jeanlucmakiola/calendula/ui/common/Picker.kt index 7ec5f92a..cd13a282 100644 --- a/app/src/main/java/de/jeanlucmakiola/calendula/ui/common/Picker.kt +++ b/app/src/main/java/de/jeanlucmakiola/calendula/ui/common/Picker.kt @@ -213,7 +213,7 @@ private fun CustomReminderEditor( amountText = amountText, onAmountChange = onAmountChange, unitLabels = units.map { stringResource(reminderUnitLabel(it)) }, - placeholder = if (ReminderUnit.Minutes in units) "10" else "1", + placeholder = customReminderPlaceholder(units), selectedUnit = units.indexOf(unit), onUnitChange = { onUnitChange(units[it]) }, preview = amount?.let { reminderLeadTimeLabel(it * unit.minutesFactor) } diff --git a/app/src/main/java/de/jeanlucmakiola/calendula/ui/common/ReminderFormatting.kt b/app/src/main/java/de/jeanlucmakiola/calendula/ui/common/ReminderFormatting.kt index d166be23..3e032f2d 100644 --- a/app/src/main/java/de/jeanlucmakiola/calendula/ui/common/ReminderFormatting.kt +++ b/app/src/main/java/de/jeanlucmakiola/calendula/ui/common/ReminderFormatting.kt @@ -30,6 +30,17 @@ fun reminderPresets(isAllDay: Boolean): List = fun customReminderUnits(isAllDay: Boolean): List = if (isAllDay) listOf(ReminderUnit.Days, ReminderUnit.Weeks) else ReminderUnit.entries +/** Placeholder for the Custom amount field: a typical amount in the first unit offered. */ +fun customReminderPlaceholder(units: List): String = + if (ReminderUnit.Minutes in units) "10" else "1" + +/** + * Lead times an all-day event already covers, as the whole days they save as, so + * a sub-day value carried over from a timed event blocks the day it lands on. + */ +fun reminderDaysTaken(alreadyChosen: List, isAllDay: Boolean): List = + if (isAllDay) alreadyChosen.map { it / DAY * DAY } else alreadyChosen + /** Whether a picker over [presets] splits its rows into sub-day and day-scale groups. */ fun splitsSubDay(presets: Collection): Boolean = presets.any { it in 1 until DAY } diff --git a/app/src/main/java/de/jeanlucmakiola/calendula/ui/edit/EventEditScreen.kt b/app/src/main/java/de/jeanlucmakiola/calendula/ui/edit/EventEditScreen.kt index cc4a63a6..92627e46 100644 --- a/app/src/main/java/de/jeanlucmakiola/calendula/ui/edit/EventEditScreen.kt +++ b/app/src/main/java/de/jeanlucmakiola/calendula/ui/edit/EventEditScreen.kt @@ -167,6 +167,8 @@ import de.jeanlucmakiola.floret.components.groupedShape as floretGroupedShape import de.jeanlucmakiola.floret.components.positionOf import de.jeanlucmakiola.calendula.ui.common.reminderPresets import de.jeanlucmakiola.calendula.ui.common.customReminderUnits +import de.jeanlucmakiola.calendula.ui.common.customReminderPlaceholder +import de.jeanlucmakiola.calendula.ui.common.reminderDaysTaken import de.jeanlucmakiola.calendula.ui.common.splitsSubDay import de.jeanlucmakiola.calendula.ui.common.GroupedLeadTimeRows import de.jeanlucmakiola.calendula.ui.common.TimePickerAlert @@ -1593,6 +1595,7 @@ private fun ReminderPickerDialog( val units = customReminderUnits(isAllDay) var pickedUnit by rememberSaveable { mutableStateOf(units.first()) } val unit = pickedUnit.takeIf { it in units } ?: units.first() + val taken = reminderDaysTaken(alreadyChosen, isAllDay) val customMinutes = amountText.toIntOrNull() ?.takeIf { it in 1..999 } ?.let { it * unit.minutesFactor } @@ -1604,7 +1607,7 @@ private fun ReminderPickerDialog( // The quick-pick list adds on tap; only the custom step needs Add. if (customMode) { TextButton( - enabled = customMinutes != null && customMinutes !in alreadyChosen, + enabled = customMinutes != null && customMinutes !in taken, onClick = { customMinutes?.let(onSelect) }, ) { Text(stringResource(R.string.event_edit_add)) } } @@ -1613,7 +1616,7 @@ private fun ReminderPickerDialog( if (!customMode) { val presets = reminderPresets(isAllDay) GroupedLeadTimeRows( - minutes = presets.filterNot { it in alreadyChosen }, + minutes = presets.filterNot { it in taken }, splitSubDay = splitsSubDay(presets), row = { minutes, position -> GroupedRow( @@ -1638,7 +1641,7 @@ private fun ReminderPickerDialog( DialogAmountField( value = amountText, onValueChange = { amountText = it }, - placeholder = if (isAllDay) "1" else "10", + placeholder = customReminderPlaceholder(units), ) Spacer(Modifier.width(12.dp)) DialogUnitDropdown( diff --git a/app/src/test/java/de/jeanlucmakiola/calendula/ui/common/ReminderPresetsTest.kt b/app/src/test/java/de/jeanlucmakiola/calendula/ui/common/ReminderPresetsTest.kt index b5ab133d..cc4afa27 100644 --- a/app/src/test/java/de/jeanlucmakiola/calendula/ui/common/ReminderPresetsTest.kt +++ b/app/src/test/java/de/jeanlucmakiola/calendula/ui/common/ReminderPresetsTest.kt @@ -38,6 +38,12 @@ class ReminderPresetsTest { assertThat(customReminderUnits(isAllDay = false)).containsExactlyElementsIn(ReminderUnit.entries) } + @Test + fun `sub-day reminders on an all-day event block the day they save as`() { + assertThat(reminderDaysTaken(listOf(10, 1_500), isAllDay = true)).containsExactly(0, 1_440) + assertThat(reminderDaysTaken(listOf(10), isAllDay = false)).containsExactly(10) + } + @Test fun `only the timed list splits`() { assertThat(splitsSubDay(REMINDER_PRESETS)).isTrue()