Day view title: call the month title directly (#501)

This commit is contained in:
makiolaj committed 2026-11-13 11:53:36 +01:00
1 parent 404b310466
commit 64ce3b83c8
2 files changed
+5 -10

No files matched your search

@@ -8,8 +8,7 @@ import java.util.Locale
* out in [locale]'s own order, with the year shown only when [date] falls outside
* [currentYear].
*
* Pass [skeleton] *without* a year field — "LLLL" for a month, "EEEdMMM" for a
* day. A skeleton is a field list, so wanting the year is just asking for one
* Pass [skeleton] *without* a year field, e.g. "LLLL" for a month. A skeleton is a field list, so wanting the year is just asking for one
* more field; the locale still decides where it lands ("July 2026" vs "2026年7月").
*
* Dropping the year in the current year is the one bit of policy here: the title
@@ -310,11 +310,6 @@ internal enum class TimelineKind(
// A run of days often straddles two weeks, so no single number fits it.
MultiDay(showWeekNumber = false, todayText = R.string.week_today_action, headerBias = 0f),
Day(showWeekNumber = false, todayText = R.string.day_today_action, headerBias = -1f),
;
// The day view names the month too: its header already shows weekday and date (#501).
fun title(start: LocalDate, end: LocalDate, locale: Locale, currentYear: Int, abbreviated: Boolean): String =
formatWeekTitle(start, end, locale, currentYear, abbreviated)
}
internal val CalendarView.timelineKind: TimelineKind
@@ -489,9 +484,10 @@ private fun PagedTimelineScreen(
val jumpToToday = { jumpToDate(today) }
val locale = currentLocale()
val (title, shortTitle) = remember(titleKind, weekStart, weekEnd, locale, today.year) {
titleKind.title(weekStart, weekEnd, locale, today.year, abbreviated = false) to
titleKind.title(weekStart, weekEnd, locale, today.year, abbreviated = true)
// Every timeline names the month, the day view too: its header already shows weekday and date (#501).
val (title, shortTitle) = remember(weekStart, weekEnd, locale, today.year) {
formatWeekTitle(weekStart, weekEnd, locale, today.year, abbreviated = false) to
formatWeekTitle(weekStart, weekEnd, locale, today.year, abbreviated = true)
}
PublishChrome(
ScreenChrome(