From f574f039f53377b187bf1ab64bd7833a98c38547 Mon Sep 17 00:00:00 2001 From: Jean-Luc Makiola Date: Mon, 9 Nov 2026 18:24:44 +0100 Subject: [PATCH] Month widget: keep a lane in short week rows (#491) --- .../calendula/widget/month/MonthGrid.kt | 16 ++++++++++++--- .../calendula/widget/month/MonthGridViews.kt | 13 +++++++----- .../calendula/widget/month/MonthWidget.kt | 5 +++-- .../res/layout/widget_month_lane_compact.xml | 8 ++++++++ .../calendula/widget/month/MonthGridTest.kt | 20 +++++++++++++++---- 5 files changed, 48 insertions(+), 14 deletions(-) create mode 100644 app/src/main/res/layout/widget_month_lane_compact.xml diff --git a/app/src/main/java/de/jeanlucmakiola/calendula/widget/month/MonthGrid.kt b/app/src/main/java/de/jeanlucmakiola/calendula/widget/month/MonthGrid.kt index e43d95c6..b6b007a0 100644 --- a/app/src/main/java/de/jeanlucmakiola/calendula/widget/month/MonthGrid.kt +++ b/app/src/main/java/de/jeanlucmakiola/calendula/widget/month/MonthGrid.kt @@ -62,12 +62,20 @@ internal class WeekLayout(val week: MonthWeek, val laneCap: Int, val showsOverfl } } +/** How many lanes a week row holds, and whether they're the [compact] height. */ +internal data class LaneFit(val lanes: Int, val compact: Boolean = false) + /** * Event lanes a week row [weekHeight] tall holds under its day number, held to - * [MAX_LANES] so a tall widget's payload stays bounded (#214). + * [MAX_LANES] so a tall widget's payload stays bounded (#214). The last lane's + * bottom gap may be cut off, and a row too short for one full lane still gets + * one compact lane when that fits (#491). */ -internal fun lanesFitting(weekHeight: Dp): Int = - ((weekHeight.value - DAY_ROW_DP - LANES_TOP_DP) / LANE_ROW_DP).toInt().coerceIn(0, MAX_LANES) +internal fun lanesFitting(weekHeight: Dp): LaneFit { + val room = weekHeight.value - DAY_ROW_DP - LANES_TOP_DP + LANE_GAP_DP + val full = (room / LANE_ROW_DP).toInt().coerceIn(0, MAX_LANES) + return if (full == 0 && room >= COMPACT_LANE_ROW_DP) LaneFit(1, compact = true) else LaneFit(full) +} /** * Seats each week in [lanes] lanes. A week whose events need more gives its @@ -85,4 +93,6 @@ internal const val MAX_LANES = 8 private const val DAY_ROW_DP = 18f private const val LANES_TOP_DP = 2f private const val LANE_ROW_DP = 15f +private const val COMPACT_LANE_ROW_DP = 12f +private const val LANE_GAP_DP = 1f private const val UNCAPPED_LANES = 64 diff --git a/app/src/main/java/de/jeanlucmakiola/calendula/widget/month/MonthGridViews.kt b/app/src/main/java/de/jeanlucmakiola/calendula/widget/month/MonthGridViews.kt index f5854d29..82566f49 100644 --- a/app/src/main/java/de/jeanlucmakiola/calendula/widget/month/MonthGridViews.kt +++ b/app/src/main/java/de/jeanlucmakiola/calendula/widget/month/MonthGridViews.kt @@ -46,6 +46,7 @@ internal data class GridColors( internal fun monthGridViews( context: Context, layouts: List, + compact: Boolean, currentMonth: Month, today: LocalDate, soften: Boolean, @@ -54,13 +55,14 @@ internal fun monthGridViews( ): RemoteViews { val grid = RemoteViews(context.packageName, R.layout.widget_month_grid) grid.removeAllViews(R.id.month_grid) - layouts.forEach { grid.addView(R.id.month_grid, weekViews(context, it, currentMonth, today, soften, colors, mode)) } + layouts.forEach { grid.addView(R.id.month_grid, weekViews(context, it, compact, currentMonth, today, soften, colors, mode)) } return grid } private fun weekViews( context: Context, layout: WeekLayout, + compact: Boolean, currentMonth: Month, today: LocalDate, soften: Boolean, @@ -92,7 +94,7 @@ private fun weekViews( if (isToday) week.setImageTint(context, TODAY_IDS[col], colors.primary) } layout.lanes.forEach { cells -> - val lane = laneViews(context) + val lane = laneViews(context, compact) cells.forEach { cell -> val event = cell.item lane.addView(R.id.lane, if (event == null) gap(context, cell.cols) else bar(context, event, cell.cols, soften, mode)) @@ -100,7 +102,7 @@ private fun weekViews( week.addView(R.id.week_lanes, lane) } if (layout.showsOverflow && layout.overflow.isNotEmpty()) { - val lane = laneViews(context) + val lane = laneViews(context, compact) layout.overflow.forEach { cell -> val count = cell.item if (count == null) { @@ -117,8 +119,9 @@ private fun weekViews( return week } -private fun laneViews(context: Context) = - RemoteViews(context.packageName, R.layout.widget_month_lane).apply { removeAllViews(R.id.lane) } +private fun laneViews(context: Context, compact: Boolean) = + RemoteViews(context.packageName, if (compact) R.layout.widget_month_lane_compact else R.layout.widget_month_lane) + .apply { removeAllViews(R.id.lane) } private fun gap(context: Context, cols: Int) = RemoteViews(context.packageName, GAP_LAYOUTS[cols - 1]) diff --git a/app/src/main/java/de/jeanlucmakiola/calendula/widget/month/MonthWidget.kt b/app/src/main/java/de/jeanlucmakiola/calendula/widget/month/MonthWidget.kt index 227405c3..49388525 100644 --- a/app/src/main/java/de/jeanlucmakiola/calendula/widget/month/MonthWidget.kt +++ b/app/src/main/java/de/jeanlucmakiola/calendula/widget/month/MonthWidget.kt @@ -254,7 +254,8 @@ private fun MonthWidgetBody(source: MonthWidgetSource, index: Int) { val context = LocalContext.current val fontScale = context.resources.configuration.fontScale val weekHeight = (LocalSize.current.height - gridChromeHeight(fontScale)) / weeks.size - val layouts = fitWeeks(weeks, lanesFitting(weekHeight)) + val fit = lanesFitting(weekHeight) + val layouts = fitWeeks(weeks, fit.lanes) val mode = LocalWidgetThemeMode.current val colors = GridColors( onSurface = remoteColor(WidgetColorRole.ON_SURFACE), @@ -272,7 +273,7 @@ private fun MonthWidgetBody(source: MonthWidgetSource, index: Int) { Column(modifier = GlanceModifier.fillMaxWidth().defaultWeight()) { WeekdayHeader(weekStart = source.weekStart) AndroidRemoteViews( - remoteViews = monthGridViews(context, layouts, ym.month, source.today, source.soften, colors, mode), + remoteViews = monthGridViews(context, layouts, fit.compact, ym.month, source.today, source.soften, colors, mode), modifier = GlanceModifier.fillMaxWidth().defaultWeight(), ) } diff --git a/app/src/main/res/layout/widget_month_lane_compact.xml b/app/src/main/res/layout/widget_month_lane_compact.xml new file mode 100644 index 00000000..71010c26 --- /dev/null +++ b/app/src/main/res/layout/widget_month_lane_compact.xml @@ -0,0 +1,8 @@ + + diff --git a/app/src/test/java/de/jeanlucmakiola/calendula/widget/month/MonthGridTest.kt b/app/src/test/java/de/jeanlucmakiola/calendula/widget/month/MonthGridTest.kt index fa69afcf..9223f521 100644 --- a/app/src/test/java/de/jeanlucmakiola/calendula/widget/month/MonthGridTest.kt +++ b/app/src/test/java/de/jeanlucmakiola/calendula/widget/month/MonthGridTest.kt @@ -56,14 +56,26 @@ class MonthGridTest { @Test fun `a taller week fits more lanes`() { - assertThat(lanesFitting(19.dp)).isEqualTo(0) - assertThat(lanesFitting(50.dp)).isEqualTo(2) - assertThat(lanesFitting(100.dp)).isEqualTo(5) + assertThat(lanesFitting(19.dp)).isEqualTo(LaneFit(0)) + assertThat(lanesFitting(50.dp)).isEqualTo(LaneFit(2)) + assertThat(lanesFitting(100.dp)).isEqualTo(LaneFit(5)) + } + + @Test + fun `the last lane may lose its bottom gap`() { + assertThat(lanesFitting(34.dp)).isEqualTo(LaneFit(1)) + assertThat(lanesFitting(49.dp)).isEqualTo(LaneFit(2)) + } + + @Test + fun `a row too short for a full lane gets a compact one`() { + assertThat(lanesFitting(31.dp)).isEqualTo(LaneFit(1, compact = true)) + assertThat(lanesFitting(30.dp)).isEqualTo(LaneFit(0)) } @Test fun `lanes stop at the cap however tall the week`() { - assertThat(lanesFitting(1000.dp)).isEqualTo(MAX_LANES) + assertThat(lanesFitting(1000.dp)).isEqualTo(LaneFit(MAX_LANES)) } @Test