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 2a60fe14..80acdbe1 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 @@ -85,12 +85,13 @@ internal fun lanesFitting(weekHeight: Dp, fontScale: Float = 1f): LaneFit { /** * Seats each week in [fit]'s lanes. A week whose events need more gives its - * last lane to the "+N" row instead, unless that would leave it no lane at all: - * a single lane keeps its bars and drops the count (#491). + * last lane to the "+N" row instead. A compact lane has no room for that row, + * so it keeps its bars (#491). */ internal fun fitWeeks(weeks: List, fit: LaneFit): List = weeks.map { week -> val lanes = fit.lanes - if (lanes <= 1) return@map WeekLayout(week, laneCap = lanes, showsOverflow = false, compact = fit.compact) + if (lanes == 0) return@map WeekLayout(week, laneCap = 0, showsOverflow = false) + if (fit.compact) return@map WeekLayout(week, laneCap = lanes, showsOverflow = false, compact = true) val needed = WeekLayout(week, UNCAPPED_LANES).usedLanes WeekLayout(week, if (needed <= lanes) lanes else lanes - 1) } @@ -103,5 +104,5 @@ private const val LANES_TOP_DP = 2f private const val LANE_ROW_DP = 15f /** Matches `widget_month_lane_compact`'s height; its 9sp text clips past [COMPACT_MAX_FONT_SCALE]. */ private const val COMPACT_LANE_ROW_DP = 12f -private const val COMPACT_MAX_FONT_SCALE = 1.1f +private const val COMPACT_MAX_FONT_SCALE = 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 bbd280ba..2ac5145a 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 @@ -100,7 +100,7 @@ private fun weekViews( week.addView(R.id.week_lanes, lane) } if (layout.showsOverflow && layout.overflow.isNotEmpty()) { - val lane = laneViews(context, layout.compact) + val lane = laneViews(context) layout.overflow.forEach { cell -> val count = cell.item if (count == null) { @@ -117,7 +117,7 @@ private fun weekViews( return week } -private fun laneViews(context: Context, compact: Boolean) = +private fun laneViews(context: Context, compact: Boolean = false) = RemoteViews(context.packageName, if (compact) R.layout.widget_month_lane_compact else R.layout.widget_month_lane) .apply { removeAllViews(R.id.lane) } 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 946af7c8..d8617694 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 @@ -71,11 +71,17 @@ class MonthGridTest { @Test fun `no compact lane at a large font scale`() { - assertThat(lanesFitting(34.dp, fontScale = 1.3f)).isEqualTo(LaneFit(0)) + assertThat(lanesFitting(34.dp, fontScale = 1.1f)).isEqualTo(LaneFit(0)) } @Test - fun `a single lane keeps its bars in a busy week`() { + fun `a single full lane still folds a busy week into the count`() { + val layouts = fitWeeks(busyWeeks(perDay = 5), LaneFit(1)) + assertThat(layouts.all { it.laneCap == 0 && it.showsOverflow && it.overflow.isNotEmpty() }).isTrue() + } + + @Test + fun `a compact lane keeps its bars in a busy week`() { val layouts = fitWeeks(busyWeeks(perDay = 5), LaneFit(1, compact = true)) assertThat(layouts.all { it.laneCap == 1 && it.lanes.size == 1 && it.compact }).isTrue() assertThat(layouts.none { it.showsOverflow }).isTrue()