From 08d2452c514a07baf5195e70cab294e135939972 Mon Sep 17 00:00:00 2001 From: Jean-Luc Makiola Date: Sat, 14 Nov 2026 01:08:22 +0100 Subject: [PATCH] fix(#365): keep the default-reminder sentinel out of day rounding --- .../de/jeanlucmakiola/calendula/ui/common/ReminderFormatting.kt | 2 +- .../jeanlucmakiola/calendula/ui/common/ReminderPresetsTest.kt | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) 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 3e032f2d..078e5990 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 @@ -39,7 +39,7 @@ fun customReminderPlaceholder(units: List): String = * 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 + if (isAllDay) alreadyChosen.map { if (it == MINUTES_DEFAULT) it else 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/test/java/de/jeanlucmakiola/calendula/ui/common/ReminderPresetsTest.kt b/app/src/test/java/de/jeanlucmakiola/calendula/ui/common/ReminderPresetsTest.kt index cc4afa27..feee4d9c 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 @@ -1,6 +1,7 @@ package de.jeanlucmakiola.calendula.ui.common import com.google.common.truth.Truth.assertThat +import de.jeanlucmakiola.calendula.data.calendar.MINUTES_DEFAULT import de.jeanlucmakiola.floret.reminders.ReminderUnit import org.junit.jupiter.api.Test @@ -41,6 +42,7 @@ class ReminderPresetsTest { @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(MINUTES_DEFAULT), isAllDay = true)).containsExactly(MINUTES_DEFAULT) assertThat(reminderDaysTaken(listOf(10), isAllDay = false)).containsExactly(10) }