From 506ebdb0925d9adb5bdcfbfe1aa9b2107aaf391c Mon Sep 17 00:00:00 2001 From: Jean-Luc Makiola Date: Mon, 9 Nov 2026 18:21:56 +0100 Subject: [PATCH 1/6] Number week rows by their Thursday (#493) --- .../java/de/jeanlucmakiola/calendula/ui/month/MonthScreen.kt | 4 ++-- .../java/de/jeanlucmakiola/calendula/ui/week/WeekScreen.kt | 4 ++-- floret-kit | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/app/src/main/java/de/jeanlucmakiola/calendula/ui/month/MonthScreen.kt b/app/src/main/java/de/jeanlucmakiola/calendula/ui/month/MonthScreen.kt index 2115f573..b28aab57 100644 --- a/app/src/main/java/de/jeanlucmakiola/calendula/ui/month/MonthScreen.kt +++ b/app/src/main/java/de/jeanlucmakiola/calendula/ui/month/MonthScreen.kt @@ -187,7 +187,7 @@ import de.jeanlucmakiola.floret.identity.itemEnter import de.jeanlucmakiola.floret.identity.rememberReduceMotion import de.jeanlucmakiola.floret.locale.currentLocale import de.jeanlucmakiola.calendula.ui.common.next -import de.jeanlucmakiola.floret.time.isoWeekNumber +import de.jeanlucmakiola.floret.time.rowWeekNumber import kotlinx.coroutines.delay import kotlinx.coroutines.flow.distinctUntilChanged import kotlinx.coroutines.flow.filterNotNull @@ -2707,7 +2707,7 @@ private fun monthChipDragModifier( */ @Composable private fun WeekNumberGutter(weekStart: LocalDate, modifier: Modifier = Modifier) { - val weekNumber = remember(weekStart) { weekStart.toJavaLocalDate().isoWeekNumber() } + val weekNumber = remember(weekStart) { weekStart.toJavaLocalDate().rowWeekNumber() } val label = stringResource(R.string.week_number_label) val openLabel = stringResource(R.string.month_open_week, weekNumber) val onOpenWeek = LocalOpenWeek.current diff --git a/app/src/main/java/de/jeanlucmakiola/calendula/ui/week/WeekScreen.kt b/app/src/main/java/de/jeanlucmakiola/calendula/ui/week/WeekScreen.kt index 72c09998..6c2b82d6 100644 --- a/app/src/main/java/de/jeanlucmakiola/calendula/ui/week/WeekScreen.kt +++ b/app/src/main/java/de/jeanlucmakiola/calendula/ui/week/WeekScreen.kt @@ -209,7 +209,7 @@ import de.jeanlucmakiola.calendula.ui.common.TIMELINE_CONTENT_END_INSET import de.jeanlucmakiola.calendula.ui.common.hourCellBlockInset import de.jeanlucmakiola.calendula.ui.common.hourGridCells import de.jeanlucmakiola.calendula.ui.common.tappedMinuteOfDay -import de.jeanlucmakiola.floret.time.isoWeekNumber +import de.jeanlucmakiola.floret.time.rowWeekNumber import kotlinx.coroutines.launch import kotlinx.datetime.DateTimeUnit import kotlinx.datetime.LocalDate @@ -1137,7 +1137,7 @@ private fun WeekDayHeader( */ @Composable private fun WeekNumberCell(weekStart: LocalDate, showBadge: Boolean, modifier: Modifier = Modifier) { - val weekNumber = remember(weekStart) { weekStart.toJavaLocalDate().isoWeekNumber() } + val weekNumber = remember(weekStart) { weekStart.toJavaLocalDate().rowWeekNumber() } Column( modifier = modifier .fillMaxWidth() diff --git a/floret-kit b/floret-kit index 1ff6702f..8b850b5b 160000 --- a/floret-kit +++ b/floret-kit @@ -1 +1 @@ -Subproject commit 1ff6702fe6ff1ab695157e6559ec3761ba9f01b9 +Subproject commit 8b850b5b756689b6c86ad6e77ec7fda2ad0765a2 From bd3b4605cb7220ff2cbcc87973b2c6b85defe510 Mon Sep 17 00:00:00 2001 From: Jean-Luc Makiola Date: Mon, 9 Nov 2026 18:41:40 +0100 Subject: [PATCH 2/6] Fix week number gutter KDoc (#493) --- .../java/de/jeanlucmakiola/calendula/ui/month/MonthScreen.kt | 4 ++-- floret-kit | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/app/src/main/java/de/jeanlucmakiola/calendula/ui/month/MonthScreen.kt b/app/src/main/java/de/jeanlucmakiola/calendula/ui/month/MonthScreen.kt index b28aab57..9eab737f 100644 --- a/app/src/main/java/de/jeanlucmakiola/calendula/ui/month/MonthScreen.kt +++ b/app/src/main/java/de/jeanlucmakiola/calendula/ui/month/MonthScreen.kt @@ -2702,8 +2702,8 @@ private fun monthChipDragModifier( * Left-gutter calendar-week cell (#25): a full-height tonal pill mirroring the * day cells' geometry, set apart by the secondaryContainer tint (matching the * Week view's badge), with the ISO week number centred like a day number. The - * week is computed on the row's first day — the same basis as the Week view — so - * the two agree. + * number comes from the row's Thursday, as in the Week view, so it is right for + * any first weekday (#493). */ @Composable private fun WeekNumberGutter(weekStart: LocalDate, modifier: Modifier = Modifier) { diff --git a/floret-kit b/floret-kit index 8b850b5b..968d6303 160000 --- a/floret-kit +++ b/floret-kit @@ -1 +1 @@ -Subproject commit 8b850b5b756689b6c86ad6e77ec7fda2ad0765a2 +Subproject commit 968d63034f0c78450dc04927c47d84aadbb3479e From 76314aebbd91393cb75235d5bfaf1dc05774af7e Mon Sep 17 00:00:00 2001 From: Jean-Luc Makiola Date: Mon, 9 Nov 2026 19:15:00 +0100 Subject: [PATCH 3/6] Number weeks by the locale's rules (#493) --- .../jeanlucmakiola/calendula/ui/month/MonthScreen.kt | 10 ++++++---- .../de/jeanlucmakiola/calendula/ui/week/WeekScreen.kt | 4 +++- floret-kit | 2 +- 3 files changed, 10 insertions(+), 6 deletions(-) diff --git a/app/src/main/java/de/jeanlucmakiola/calendula/ui/month/MonthScreen.kt b/app/src/main/java/de/jeanlucmakiola/calendula/ui/month/MonthScreen.kt index 9eab737f..a4dc9183 100644 --- a/app/src/main/java/de/jeanlucmakiola/calendula/ui/month/MonthScreen.kt +++ b/app/src/main/java/de/jeanlucmakiola/calendula/ui/month/MonthScreen.kt @@ -205,6 +205,7 @@ import java.time.format.TextStyle as JavaTextStyle import java.util.Locale import kotlinx.datetime.toJavaMonth import kotlinx.datetime.yearMonth +import java.time.temporal.WeekFields private val LocalTodayPulse = staticCompositionLocalOf { 0 } @@ -2701,13 +2702,14 @@ private fun monthChipDragModifier( /** * Left-gutter calendar-week cell (#25): a full-height tonal pill mirroring the * day cells' geometry, set apart by the secondaryContainer tint (matching the - * Week view's badge), with the ISO week number centred like a day number. The - * number comes from the row's Thursday, as in the Week view, so it is right for - * any first weekday (#493). + * Week view's badge), with the week number centred like a day number. It is + * numbered the locale's way from the row's mid-week day, as in the Week view, + * so it is right for any first weekday (#493). */ @Composable private fun WeekNumberGutter(weekStart: LocalDate, modifier: Modifier = Modifier) { - val weekNumber = remember(weekStart) { weekStart.toJavaLocalDate().rowWeekNumber() } + val locale = currentLocale() + val weekNumber = remember(weekStart, locale) { weekStart.toJavaLocalDate().rowWeekNumber(WeekFields.of(locale)) } val label = stringResource(R.string.week_number_label) val openLabel = stringResource(R.string.month_open_week, weekNumber) val onOpenWeek = LocalOpenWeek.current diff --git a/app/src/main/java/de/jeanlucmakiola/calendula/ui/week/WeekScreen.kt b/app/src/main/java/de/jeanlucmakiola/calendula/ui/week/WeekScreen.kt index 6c2b82d6..6a2cc629 100644 --- a/app/src/main/java/de/jeanlucmakiola/calendula/ui/week/WeekScreen.kt +++ b/app/src/main/java/de/jeanlucmakiola/calendula/ui/week/WeekScreen.kt @@ -221,6 +221,7 @@ import kotlinx.datetime.toLocalDateTime import java.time.format.TextStyle as JavaTextStyle import java.util.Locale import kotlinx.datetime.yearMonth +import java.time.temporal.WeekFields /** One lane of the all-day strip, sized to a trimmed bar line (#190). */ private val ALL_DAY_ROW_HEIGHT = 20.dp @@ -1137,7 +1138,8 @@ private fun WeekDayHeader( */ @Composable private fun WeekNumberCell(weekStart: LocalDate, showBadge: Boolean, modifier: Modifier = Modifier) { - val weekNumber = remember(weekStart) { weekStart.toJavaLocalDate().rowWeekNumber() } + val locale = currentLocale() + val weekNumber = remember(weekStart, locale) { weekStart.toJavaLocalDate().rowWeekNumber(WeekFields.of(locale)) } Column( modifier = modifier .fillMaxWidth() diff --git a/floret-kit b/floret-kit index 968d6303..003eca33 160000 --- a/floret-kit +++ b/floret-kit @@ -1 +1 @@ -Subproject commit 968d63034f0c78450dc04927c47d84aadbb3479e +Subproject commit 003eca337a124cf52e236479eafe5cd98465aa4c From 77b0c6db09933109740ead9cee5291d833f72221 Mon Sep 17 00:00:00 2001 From: Jean-Luc Makiola Date: Mon, 9 Nov 2026 19:22:55 +0100 Subject: [PATCH 4/6] Week numbers follow the device region, shared helper (#493) --- .../calendula/ui/common/WeekNumber.kt | 21 +++++++++++++++++++ .../calendula/ui/month/MonthScreen.kt | 10 ++++----- .../calendula/ui/week/WeekScreen.kt | 6 ++---- 3 files changed, 27 insertions(+), 10 deletions(-) create mode 100644 app/src/main/java/de/jeanlucmakiola/calendula/ui/common/WeekNumber.kt diff --git a/app/src/main/java/de/jeanlucmakiola/calendula/ui/common/WeekNumber.kt b/app/src/main/java/de/jeanlucmakiola/calendula/ui/common/WeekNumber.kt new file mode 100644 index 00000000..6b34b62c --- /dev/null +++ b/app/src/main/java/de/jeanlucmakiola/calendula/ui/common/WeekNumber.kt @@ -0,0 +1,21 @@ +package de.jeanlucmakiola.calendula.ui.common + +import android.content.res.Resources +import androidx.compose.runtime.Composable +import androidx.compose.runtime.remember +import de.jeanlucmakiola.floret.time.rowWeekNumber +import kotlinx.datetime.LocalDate +import kotlinx.datetime.toJavaLocalDate +import java.time.temporal.WeekFields + +/** + * The week number of the grid row starting on [rowStart], numbered by the + * device region's rules (#493). The region, not the app language: an English + * UI in the Netherlands still numbers weeks the ISO way. Shared by the Month + * gutter and the Week badge so the two always agree. + */ +@Composable +internal fun rememberRowWeekNumber(rowStart: LocalDate): Int { + val fields = remember { WeekFields.of(Resources.getSystem().configuration.locales[0]) } + return remember(rowStart, fields) { rowStart.toJavaLocalDate().rowWeekNumber(fields) } +} diff --git a/app/src/main/java/de/jeanlucmakiola/calendula/ui/month/MonthScreen.kt b/app/src/main/java/de/jeanlucmakiola/calendula/ui/month/MonthScreen.kt index a4dc9183..83001dfb 100644 --- a/app/src/main/java/de/jeanlucmakiola/calendula/ui/month/MonthScreen.kt +++ b/app/src/main/java/de/jeanlucmakiola/calendula/ui/month/MonthScreen.kt @@ -187,7 +187,6 @@ import de.jeanlucmakiola.floret.identity.itemEnter import de.jeanlucmakiola.floret.identity.rememberReduceMotion import de.jeanlucmakiola.floret.locale.currentLocale import de.jeanlucmakiola.calendula.ui.common.next -import de.jeanlucmakiola.floret.time.rowWeekNumber import kotlinx.coroutines.delay import kotlinx.coroutines.flow.distinctUntilChanged import kotlinx.coroutines.flow.filterNotNull @@ -205,7 +204,7 @@ import java.time.format.TextStyle as JavaTextStyle import java.util.Locale import kotlinx.datetime.toJavaMonth import kotlinx.datetime.yearMonth -import java.time.temporal.WeekFields +import de.jeanlucmakiola.calendula.ui.common.rememberRowWeekNumber private val LocalTodayPulse = staticCompositionLocalOf { 0 } @@ -2703,13 +2702,12 @@ private fun monthChipDragModifier( * Left-gutter calendar-week cell (#25): a full-height tonal pill mirroring the * day cells' geometry, set apart by the secondaryContainer tint (matching the * Week view's badge), with the week number centred like a day number. It is - * numbered the locale's way from the row's mid-week day, as in the Week view, - * so it is right for any first weekday (#493). + * numbered by the device region from the row's mid-week day, as in the Week + * view, so it is right for any first weekday (#493). */ @Composable private fun WeekNumberGutter(weekStart: LocalDate, modifier: Modifier = Modifier) { - val locale = currentLocale() - val weekNumber = remember(weekStart, locale) { weekStart.toJavaLocalDate().rowWeekNumber(WeekFields.of(locale)) } + val weekNumber = rememberRowWeekNumber(weekStart) val label = stringResource(R.string.week_number_label) val openLabel = stringResource(R.string.month_open_week, weekNumber) val onOpenWeek = LocalOpenWeek.current diff --git a/app/src/main/java/de/jeanlucmakiola/calendula/ui/week/WeekScreen.kt b/app/src/main/java/de/jeanlucmakiola/calendula/ui/week/WeekScreen.kt index 6a2cc629..f05c0fc8 100644 --- a/app/src/main/java/de/jeanlucmakiola/calendula/ui/week/WeekScreen.kt +++ b/app/src/main/java/de/jeanlucmakiola/calendula/ui/week/WeekScreen.kt @@ -209,7 +209,6 @@ import de.jeanlucmakiola.calendula.ui.common.TIMELINE_CONTENT_END_INSET import de.jeanlucmakiola.calendula.ui.common.hourCellBlockInset import de.jeanlucmakiola.calendula.ui.common.hourGridCells import de.jeanlucmakiola.calendula.ui.common.tappedMinuteOfDay -import de.jeanlucmakiola.floret.time.rowWeekNumber import kotlinx.coroutines.launch import kotlinx.datetime.DateTimeUnit import kotlinx.datetime.LocalDate @@ -221,7 +220,7 @@ import kotlinx.datetime.toLocalDateTime import java.time.format.TextStyle as JavaTextStyle import java.util.Locale import kotlinx.datetime.yearMonth -import java.time.temporal.WeekFields +import de.jeanlucmakiola.calendula.ui.common.rememberRowWeekNumber /** One lane of the all-day strip, sized to a trimmed bar line (#190). */ private val ALL_DAY_ROW_HEIGHT = 20.dp @@ -1138,8 +1137,7 @@ private fun WeekDayHeader( */ @Composable private fun WeekNumberCell(weekStart: LocalDate, showBadge: Boolean, modifier: Modifier = Modifier) { - val locale = currentLocale() - val weekNumber = remember(weekStart, locale) { weekStart.toJavaLocalDate().rowWeekNumber(WeekFields.of(locale)) } + val weekNumber = rememberRowWeekNumber(weekStart) Column( modifier = modifier .fillMaxWidth() From 9387bdc1eeca9831e2d53cc66142a8fb4aa76c56 Mon Sep 17 00:00:00 2001 From: Jean-Luc Makiola Date: Mon, 9 Nov 2026 20:32:00 +0100 Subject: [PATCH 5/6] Drop unused WorkManager permissions (#448) --- app/src/main/AndroidManifest.xml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 24e5c3e8..b272d8e9 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -41,6 +41,11 @@ --> + + + + +