Release v2.20.3

Bump versionName to 2.20.3 (versionCode 22003, per the MAJOR*10000 +
MINOR*100 + PATCH rule), promote the CHANGELOG's [Unreleased] section to
[2.20.3], and hand-write the per-version "What's New" for all twelve
store locales.

The release carries one user-visible fix: the French agenda-range plural
crash reported as #297 and #298.

2.20.0, 2.20.1 and 2.20.2 each shipped with only an en-US changelog, so
every other locale published nothing; this restores the full coverage
2.19.1 had (ar, de-DE, en-GB, en-US, es-ES, fr-FR, it-IT, pl-PL, pt-BR,
pt-PT, ru-RU, zh-CN). en-GB matters on its own because it, not en-US, is
the Play Console's default locale and what Play falls back to. Every file
is well inside Play's 500-character cap — the longest is it-IT at 348 —
and scripts/check_changelog_lengths.sh passes.

Per docs/RELEASING.md this bump is what triggers release.yaml once the
branch reaches main, so the on-device gate (step 4, scripts/verify-release.sh)
still has to pass before that merge.

CHANGELOG.md

@@ -5,24 +5,6 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.1.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
-## [2.20.4] — 2026-09-20
-
-### Fixed
-- **The app no longer reopens the event you last came in on.** Opening an event
-  from a reminder or a home-screen widget made the app return to that same
-  event on every later launch — and show an error screen once the event had
-  been deleted. Android hands an app the launch it was started with again each
-  time it is rebuilt, and Calendula was acting on it every time instead of
-  once ([#309]).
-- **"Today" works in the agenda again.** Scrolling a few days ahead and tapping
-  today did nothing, because the agenda is browsed by scrolling rather than by
-  moving its date, and the button only moved the date. It now brings the list
-  back to today, and it stays offered while the list is scrolled away — before,
-  it was hidden in exactly the situation it is for ([#305]).
-- **Calendula is filed under "Calendar & Agenda" in the self-hosted repo.**
-  Browsing by category in an F-Droid client set to prefer that repo listed the
-  app under "Time" instead ([#294]).
-
 ## [2.20.3] — 2026-09-12
 
 ### Fixed
@@ -1711,6 +1693,3 @@ automatically, with zero telemetry and no internet permission.
 [#239]: https://codeberg.org/jlmakiola/calendula/issues/239
 [#297]: https://codeberg.org/jlmakiola/calendula/issues/297
 [#298]: https://codeberg.org/jlmakiola/calendula/issues/298
-[#309]: https://codeberg.org/jlmakiola/calendula/issues/309
-[#305]: https://codeberg.org/jlmakiola/calendula/issues/305
-[#294]: https://codeberg.org/jlmakiola/calendula/issues/294

app/build.gradle.kts

@@ -28,8 +28,8 @@ android {
         // which builds this version and then creates the matching vX.Y.Z tag +
         // release itself (versionCode is pinned to MAJOR*10000 + MINOR*100 +
         // PATCH from versionName, e.g. 2.7.2 -> 20702). See docs/RELEASING.md.
-        versionCode = 22004
+        versionCode = 22003
-        versionName = "2.20.4"
+        versionName = "2.20.3"
 
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
     }

app/src/main/java/de/jeanlucmakiola/calendula/MainActivity.kt

@@ -113,26 +113,11 @@ class MainActivity : AppCompatActivity() {
         systemBarsDark = resources.configuration.uiMode and Configuration.UI_MODE_NIGHT_MASK ==
             Configuration.UI_MODE_NIGHT_YES
         applyEdgeToEdge()
-        // Android hands the intent that started the task back to onCreate every
+        requestedDetailKey = intent.detailKeyOrNull() ?: intent.viewEventKeyOrNull()
-        // time the activity is recreated — on a rotation, or on a restart after
-        // the system reclaimed the process. Re-running a launch that opens one
-        // specific event is what made a single reminder or widget tap re-open
-        // that event on every later launch, an error screen once the event had
-        // been deleted (#309); the user left it long ago, and the activity
-        // restores where they actually were along with its saved state.
-        //
-        // Only those channels are held back. An .ics import or a prefilled
-        // create form keeps no saved state of its own, so re-reading the intent
-        // is what carries one through a recreation.
-        val replaying = savedInstanceState != null || intent.isRelaunch()
-        if (!replaying) {
-            requestedDetailKey = intent.detailKeyOrNull() ?: intent.viewEventKeyOrNull()
-            requestedEditKey = intent.editEventKeyOrNull()
-        }
         requestedNav = intent.navRequestOrNull()
-            ?.takeUnless { replaying && it is WidgetNavRequest.OpenEvent }
         requestedImportUri = intent.importUriOrNull()
         requestedInsert = intent.insertRequestOrNull()
+        requestedEditKey = intent.editEventKeyOrNull()
         if (CrashReporter.shouldPrompt(this)) pendingCrashReport = CrashReporter.pendingReport(this)
         setContent {
             // One activity-scoped SettingsViewModel drives both the theme here
@@ -257,16 +242,6 @@ class MainActivity : AppCompatActivity() {
         intent.editEventKeyOrNull()?.let { requestedEditKey = it }
     }
 
-    /**
-     * Whether this launch is the task being resumed rather than a fresh
-     * delivery — Android sets the flag when an activity is started from the
-     * recents list, where the intent it carries is the one the task was started
-     * with however long ago. `onNewIntent` is the channel a real new request
-     * arrives on while the task lives, so nothing is lost by ignoring these.
-     */
-    private fun Intent.isRelaunch(): Boolean =
-        flags and Intent.FLAG_ACTIVITY_LAUNCHED_FROM_HISTORY != 0
-
     /**
      * The `.ics` Uri an external app asked us to open (file manager `ACTION_VIEW`)
      * or share into us (`ACTION_SEND`). Restricted to content/file schemes so the

app/src/main/java/de/jeanlucmakiola/calendula/ui/agenda/AgendaScreen.kt

@@ -13,9 +13,7 @@ import androidx.compose.foundation.layout.height
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.layout.size
 import androidx.compose.foundation.lazy.LazyColumn
-import androidx.compose.foundation.lazy.LazyListState
 import androidx.compose.foundation.lazy.itemsIndexed
-import androidx.compose.foundation.lazy.rememberLazyListState
 import androidx.compose.material.icons.Icons
 import androidx.compose.material.icons.filled.Coffee
 import androidx.compose.material.icons.filled.Menu
@@ -34,8 +32,6 @@ import androidx.compose.material3.TopAppBar
 import androidx.compose.material3.TopAppBarDefaults
 import androidx.compose.material3.rememberDrawerState
 import androidx.compose.runtime.Composable
-import androidx.compose.runtime.LaunchedEffect
-import androidx.compose.runtime.derivedStateOf
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.remember
@@ -110,27 +106,6 @@ fun AgendaScreen(
     }
     val successState = state as? AgendaUiState.Success
 
-    // The agenda window always starts at the anchor, so moving through it is a
-    // list scroll, not an anchor change — "today" has to bring the list back to
-    // the top as well, and stay offered while it is scrolled away (#305).
-    val listState = rememberLazyListState()
-    val scrolledAway by remember {
-        derivedStateOf {
-            listState.firstVisibleItemIndex > 0 || listState.firstVisibleItemScrollOffset > 0
-        }
-    }
-    // A new window is rendered from its first day, so the list belongs at the
-    // top. Keyed on the anchor the days arrived with, not the one just
-    // requested: scrolling before the new rows compose leaves the list keyed to
-    // a row that reappears further down, and it follows it there.
-    LaunchedEffect(successState?.anchor) { listState.scrollToItem(0) }
-    val jumpToToday = {
-        // Off today, moving the anchor is what resets the list (above); on today
-        // the window doesn't change, so the scroll back is the whole action.
-        if (isOnToday) scope.launch { listState.animateScrollToItem(0) }
-        viewModel.goToToday()
-    }
-
     ModalNavigationDrawer(
         drawerState = drawerState,
         drawerContent = {
@@ -164,15 +139,14 @@ fun AgendaScreen(
                     onOpenDrawer = { scope.launch { drawerState.open() } },
                     onOpenSearch = onOpenSearch,
                     showTodayButton = todayInToolbar,
-                    onToday = jumpToToday,
+                    onToday = viewModel::goToToday,
                 )
             },
             floatingActionButton = {
                 CalendarFabColumn(
-                    todayVisible = (!isOnToday || (scrolledAway && successState != null)) &&
+                    todayVisible = !isOnToday && !todayInToolbar,
-                        !todayInToolbar,
                     todayText = stringResource(R.string.agenda_today_action),
-                    onToday = jumpToToday,
+                    onToday = viewModel::goToToday,
                     onCreate = { onCreateEvent(anchor, null) },
                 )
             },
@@ -221,7 +195,6 @@ fun AgendaScreen(
                     state = state,
                     pastDisplay = pastDisplay,
                     showToday = showToday,
-                    listState = listState,
                     onRetry = viewModel::goToToday,
                     onEventClick = onEventClick,
                     onOpenDay = onOpenDay,
@@ -325,7 +298,6 @@ internal fun AgendaContent(
     onEventClick: (EventInstance) -> Unit,
     onOpenDay: (LocalDate) -> Unit,
     modifier: Modifier = Modifier,
-    listState: LazyListState = rememberLazyListState(),
 ) {
     when (state) {
         AgendaUiState.Loading -> Box(modifier)
@@ -354,16 +326,12 @@ internal fun AgendaContent(
                 enabled = showToday && state.anchor == state.today,
             )
             if (days.isEmpty()) {
-                // Nothing to scroll: drop the position a previous list left, so
-                // the today FAB doesn't linger over an empty screen.
-                LaunchedEffect(Unit) { listState.scrollToItem(0) }
                 AgendaEmpty(modifier)
             } else {
                 AgendaList(
                     days = days,
                     today = state.today,
                     zone = state.zone,
-                    listState = listState,
                     dimPast = pastDisplay == PastEventDisplay.DIM,
                     now = now,
                     onEventClick = onEventClick,
@@ -381,7 +349,6 @@ private fun AgendaList(
     days: List<AgendaDay>,
     today: LocalDate,
     zone: TimeZone,
-    listState: LazyListState,
     dimPast: Boolean,
     now: Instant,
     onEventClick: (EventInstance) -> Unit,
@@ -390,7 +357,6 @@ private fun AgendaList(
 ) {
     LazyColumn(
         modifier = modifier,
-        state = listState,
         // Bottom inset clears the FAB stack so the last row stays tappable.
         contentPadding = PaddingValues(top = 8.dp, bottom = 96.dp),
     ) {

app/src/main/java/de/jeanlucmakiola/calendula/ui/common/BlockPlacement.kt

@@ -32,68 +32,6 @@ val BLOCK_TEXT_PADDING = 4.dp
 /** The same, above and below — what a block's height has to pay before any text. */
 val BLOCK_TEXT_INSET = 2.dp
 
-/**
- * What a timed block of a given height has to spend on text, and what each line
- * of it costs.
- */
-@Immutable
-data class BlockTextMetrics(
-    /** Padding above and below the text — see [rememberBlockTextMetrics]. */
-    val inset: Dp,
-    /** Height left for text once [inset] is paid at both edges. */
-    val available: Dp,
-    /** What the first line of a title draws in. */
-    val titleLine: Dp,
-    /** What every title line after the first adds. */
-    val titleLeading: Dp,
-    /** What the time label's one line draws in. */
-    val timeLine: Dp,
-) {
-    /** Whether the block can draw a title at all. */
-    val fitsTitle: Boolean get() = available >= titleLine
-
-    /** Height a title of [lines] lines occupies. */
-    fun titleHeight(lines: Int): Dp =
-        if (lines <= 0) 0.dp else titleLine + titleLeading * (lines - 1)
-
-    /** Title lines that fit [within], which may be none. */
-    fun titleBudget(within: Dp): Int =
-        if (within < titleLine) 0 else 1 + ((within - titleLine) / titleLeading).toInt()
-}
-
-/**
- * The vertical padding a block [height] tall can afford around a title line of
- * [titleLine].
- *
- * The inset is what the block gives up first: breathing room is worth having
- * where there is room to breathe, but on a block down to its last few pixels a
- * bare colour chip where a label would have fit reads as a rendering fault. It
- * tapers rather than snapping, so a pinch closes the gap gradually instead of
- * dropping it in one frame (#289).
- */
-internal fun blockTextInset(height: Dp, titleLine: Dp): Dp =
-    minOf(BLOCK_TEXT_INSET, (height - titleLine) / 2).coerceAtLeast(0.dp)
-
-/** Text metrics for a timed block [height] tall. */
-@Composable
-fun rememberBlockTextMetrics(height: Dp): BlockTextMetrics {
-    val titleStyle = MaterialTheme.typography.labelMedium
-    val titleLine = rememberTrimmedLineHeight(titleStyle)
-    // Packed, so a second line costs what the first did rather than a whole
-    // Material line box — the gap between two lines of a wrapped title is the
-    // one place a block pays that leading twice (#190).
-    val titleLeading = titleLine
-    val timeLine = rememberTrimmedLineHeight(MaterialTheme.typography.labelSmall.asEventTime())
-    val inset = blockTextInset(height, titleLine)
-    return BlockTextMetrics(
-        inset = inset,
-        available = height - inset * 2,
-        titleLine = titleLine,
-        titleLeading = titleLeading,
-        timeLine = timeLine,
-    )
-}
-
 /** Most lines a time label may wrap over before it is worth more than a title line. */
 const val MAX_TIME_LINES = 2
 
@@ -132,9 +70,9 @@ fun blockTextLines(text: String, style: TextStyle, textWidth: Dp, max: Int): Int
  */
 @Composable
 fun blockTimeLines(label: String, textWidth: Dp, spare: Dp): Int {
-    val timeLineHeight = rememberTrimmedLineHeight(
+    val timeLineHeight = with(LocalDensity.current) {
-        MaterialTheme.typography.labelSmall.asEventTime(),
+        MaterialTheme.typography.labelSmall.lineHeight.toDp()
-    )
+    }
     return if (spare >= timeLineHeight) {
         blockTextLines(
             text = label,
@@ -170,10 +108,8 @@ fun BlockTitle(
     Text(
         text = title,
         modifier = modifier,
-        style = rememberPackedLines(
+        style = MaterialTheme.typography.labelMedium
-            MaterialTheme.typography.labelMedium
+            .let { if (fontWeight == null) it else it.copy(fontWeight = fontWeight) },
-                .let { if (fontWeight == null) it else it.copy(fontWeight = fontWeight) },
-        ),
         maxLines = maxLines,
         overflow = overflow.overflow,
         softWrap = overflow.softWrap,
@@ -205,8 +141,6 @@ fun BlockTimeLabel(
         MaterialTheme.motionScheme.fastEffectsSpec()
     }
     val overflow = eventTitleOverflow(singleLine = maxLines == 1)
-    // Regular weight against the title's medium above it (#219).
-    val style = rememberPackedLines(MaterialTheme.typography.labelSmall.asEventTime())
     Crossfade(
         targetState = label,
         animationSpec = spec,
@@ -215,7 +149,8 @@ fun BlockTimeLabel(
     ) { text ->
         Text(
             text = text,
-            style = style,
+            // Regular weight against the title's medium above it (#219).
+            style = MaterialTheme.typography.labelSmall.asEventTime(),
             maxLines = maxLines,
             overflow = overflow.overflow,
             softWrap = overflow.softWrap,

app/src/main/java/de/jeanlucmakiola/calendula/ui/common/CalendarText.kt

@@ -1,57 +0,0 @@
-package de.jeanlucmakiola.calendula.ui.common
-
-import androidx.compose.runtime.Composable
-import androidx.compose.runtime.remember
-import androidx.compose.ui.platform.LocalDensity
-import androidx.compose.ui.text.TextStyle
-import androidx.compose.ui.text.rememberTextMeasurer
-import androidx.compose.ui.text.style.LineHeightStyle
-import androidx.compose.ui.unit.Dp
-
-/**
- * The calendar surfaces' line-height treatment. Material wraps an 11sp glyph in
- * a 16sp line box — room a label wants when it stands on its own, and close to
- * a fifth of an event row when it doesn't. The outer edges only, so a wrapped
- * title keeps its interior line spacing (#190).
- *
- * Trimmed rather than set to a smaller line height: the font picker can load a
- * serif, a monospace or a file of the user's own, and a line height under a
- * face's own ascent and descent overlaps its lines. There is nothing to trim
- * below that, so this is safe whatever font is chosen.
- */
-private val TrimmedLines = LineHeightStyle(
-    alignment = LineHeightStyle.Alignment.Center,
-    trim = LineHeightStyle.Trim.Both,
-)
-
-/** Ascenders and descenders both, so a line is measured at its full extent. */
-private const val LINE_SAMPLE = "Ag"
-
-/** [this] with Material's outer leading trimmed — see [TrimmedLines]. */
-fun TextStyle.trimmedLines(): TextStyle = copy(lineHeightStyle = TrimmedLines)
-
-/**
- * [style] with its wrapped lines packed onto the face's own extent instead of
- * Material's line box.
- *
- * [trimmedLines] takes the leading off the outer edges of a run of text; this
- * takes it from between the lines as well, which is the half a wrapped event
- * title pays for twice over. The line height is *measured* from the font rather
- * than picked, so it lands exactly on the face's ascent-plus-descent and can
- * never be short enough to overlap — whatever the font picker has loaded (#190).
- */
-@Composable
-fun rememberPackedLines(style: TextStyle): TextStyle {
-    val line = rememberTrimmedLineHeight(style)
-    return with(LocalDensity.current) { style.trimmedLines().copy(lineHeight = line.toSp()) }
-}
-
-/** What one trimmed line of [style] actually draws in. */
-@Composable
-fun rememberTrimmedLineHeight(style: TextStyle): Dp {
-    val measurer = rememberTextMeasurer()
-    val density = LocalDensity.current
-    return remember(style, density, measurer) {
-        with(density) { measurer.measure(LINE_SAMPLE, style.trimmedLines()).size.height.toDp() }
-    }
-}

app/src/main/java/de/jeanlucmakiola/calendula/ui/common/TimelineDrag.kt

@@ -790,15 +790,20 @@ private fun DragCopy(
     val width = with(density) { sizePx.width.toDp() }
     val height = with(density) { sizePx.height.toDp() }
     val textWidth = width - (BLOCK_OUTER_INSET + BLOCK_TEXT_PADDING) * 2
+    val titleLineHeight = with(density) {
+        MaterialTheme.typography.labelMedium.lineHeight.toDp()
+    }
+    val timeLineHeight = with(density) {
+        MaterialTheme.typography.labelSmall.lineHeight.toDp()
+    }
     // The block's size, spent the block's way — text sits at the top as it does
-    // on the block, so the copy hands back to the grid without shifting (#267),
+    // on the block, so the copy hands back to the grid without shifting (#267).
-    // and it squeezes its inset on the same terms so a short block's title does
-    // not vanish the moment it is lifted (#289).
     // The title is served in full first and the range lives off what is left:
     // the hour gutter down the side still says where the copy sits, so the
     // range is the half that can afford to go.
-    val metrics = rememberBlockTextMetrics(height)
+    val available = height - BLOCK_TEXT_INSET * 2
-    val allowed = titleLines.coerceAtMost(metrics.titleBudget(metrics.available))
+    val titleBudget = (available / titleLineHeight).toInt().coerceAtLeast(0)
+    val allowed = titleLines.coerceAtMost(titleBudget)
     // Re-measured at the copy's own width rather than spent on the source's
     // count: a block sharing its column with another is a lane wide where the
     // copy is a whole column, so the source's second line is one the copy never
@@ -813,10 +818,10 @@ private fun DragCopy(
             max = allowed,
         )
     }
-    val left = metrics.available - metrics.titleHeight(lines)
+    val left = available - titleLineHeight * lines
-    val showTime = label != null && left >= metrics.timeLine
+    val showTime = label != null && left >= timeLineHeight
     val timeMaxLines = if (showTime) {
-        blockTimeLines(label!!, textWidth, left - metrics.timeLine)
+        blockTimeLines(label!!, textWidth, left - timeLineHeight)
     } else {
         1
     }
@@ -852,7 +857,7 @@ private fun DragCopy(
                 clip = false
             }
             .eventSurface(paint, shape, cuts)
-            .padding(horizontal = BLOCK_TEXT_PADDING, vertical = metrics.inset),
+            .padding(horizontal = BLOCK_TEXT_PADDING, vertical = BLOCK_TEXT_INSET),
     ) {
         Column {
             if (lines > 0) {

app/src/main/java/de/jeanlucmakiola/calendula/ui/common/TimelineZoom.kt

@@ -19,6 +19,7 @@ import androidx.compose.ui.input.pointer.PointerEventPass
 import androidx.compose.ui.input.pointer.pointerInput
 import androidx.compose.ui.unit.Dp
 import kotlin.math.abs
+import kotlin.math.ceil
 import kotlin.math.floor
 import kotlin.math.roundToInt
 
@@ -196,26 +197,18 @@ fun rememberTimelinePinchZoom(
  * names, jumping the whole column as a pinch drifts across each half pixel.
  * Pinning the hour to whole pixels keeps every part of the timeline on one grid.
  *
- * The ceiling is pulled onto that grid too, downwards, so it stays a height the
+ * The bounds themselves are pulled onto that grid too, each in the direction
- * pinch can actually land on.
+ * that keeps its own promise — up for the fill floor, so no dead space opens
- *
+ * under midnight, down for the ceiling. A fractional bound would be a height the
- * [fillPx] is deliberately *not* rounded (#290). It is the one height the whole
+ * pinch can be held against but never actually land on, and the difference feeds
- * day exactly fills the viewport at, and it is the same value
+ * the focal anchor a scroll correction on every frame the fingers sit still.
- * [TimelineScale.FitDay] resolves to — rounding it up by the fraction of a pixel
- * that 24 hours don't divide the viewport into leaves the timeline a pixel per
- * hour taller than its own viewport, so a pinched-all-the-way-out day still
- * scrolls a hair and bounces off Android's overscroll stretch, while the
- * identical FitDay preset sits still. Being the clamp result rather than a bound
- * the gesture is merely held against, it is a height the pinch does land on: the
- * next frame reads it back unchanged and the focal anchor is handed nothing to
- * correct.
  */
 internal fun pinchedHourHeightPx(target: Float, fillPx: Float, maxPx: Float): Float =
     // Filling the viewport wins over the ceiling: on a screen tall enough for
     // the two to disagree, dead space is the worse of the two failures.
     target.roundToInt().toFloat()
         .coerceAtMost(floor(maxPx))
-        .coerceAtLeast(fillPx)
+        .coerceAtLeast(ceil(fillPx))
 
 /**
  * The scroll offset that keeps the moment under [centroidY] under it after the

app/src/main/java/de/jeanlucmakiola/calendula/ui/day/DayScreen.kt

@@ -83,9 +83,9 @@ import de.jeanlucmakiola.calendula.ui.common.CalendarView
 import de.jeanlucmakiola.calendula.ui.common.IMPLEMENTED_VIEWS
 import de.jeanlucmakiola.calendula.ui.common.BLOCK_OUTER_INSET
 import de.jeanlucmakiola.calendula.ui.common.BLOCK_TEXT_PADDING
+import de.jeanlucmakiola.calendula.ui.common.BLOCK_TEXT_INSET
 import de.jeanlucmakiola.calendula.ui.common.BlockTimeLabel
 import de.jeanlucmakiola.calendula.ui.common.BlockTitle
-import de.jeanlucmakiola.calendula.ui.common.rememberBlockTextMetrics
 import de.jeanlucmakiola.calendula.ui.common.blockTimeLines
 import de.jeanlucmakiola.calendula.ui.common.animatedBlockPlacement
 import de.jeanlucmakiola.calendula.ui.common.ghostAlpha
@@ -115,7 +115,6 @@ import de.jeanlucmakiola.calendula.ui.common.rememberCalendarPageSwipe
 import de.jeanlucmakiola.floret.identity.rememberReduceMotion
 import de.jeanlucmakiola.calendula.ui.common.next
 import de.jeanlucmakiola.calendula.ui.common.EventChipShape
-import de.jeanlucmakiola.calendula.ui.common.trimmedLines
 import de.jeanlucmakiola.calendula.ui.common.rememberCalendarSlideSpec
 import de.jeanlucmakiola.floret.locale.currentLocale
 import de.jeanlucmakiola.calendula.ui.common.LocalUse24HourFormat
@@ -141,8 +140,7 @@ import kotlin.time.Clock
 import java.util.Locale
 import kotlin.math.roundToInt
 
-/** One lane of the all-day strip, sized to a trimmed bar line (#190). */
+private val ALL_DAY_ROW_HEIGHT = 24.dp
-private val ALL_DAY_ROW_HEIGHT = 20.dp
 private val ALL_DAY_VERTICAL_PADDING = 6.dp
 
 /** Total all-day strip height for the day (0 when there are no all-day events). */
@@ -531,7 +529,7 @@ private fun AllDayBar(
         val titleOverflow = eventTitleOverflow()
         Text(
             text = title,
-            style = MaterialTheme.typography.labelSmall.trimmedLines(),
+            style = MaterialTheme.typography.labelSmall,
             maxLines = 1,
             overflow = titleOverflow.overflow,
             softWrap = titleOverflow.softWrap,
@@ -765,24 +763,30 @@ private fun EventBlock(
     val timeLabel = "${minToHm(block.startMin, use24Hour, locale)}–" +
         minToHm(block.endMin, use24Hour, locale)
     val density = LocalDensity.current
-    val metrics = rememberBlockTextMetrics(height)
+    val titleLineHeight = with(density) {
+        MaterialTheme.typography.labelMedium.lineHeight.toDp()
+    }
+    val timeLineHeight = with(density) {
+        MaterialTheme.typography.labelSmall.lineHeight.toDp()
+    }
     // A block that cannot afford both lines spends its space on the title, and
     // one too short even for that drops the title rather than serving a sliced one.
     // Height alone decides: a duration threshold would keep hiding the time on a
     // half-hour block the user has pinched open to three times the room it needs.
-    val showTime = metrics.available >= metrics.titleLine + metrics.timeLine
+    val available = height - BLOCK_TEXT_INSET * 2
-    val showTitle = metrics.fitsTitle
+    val showTime = available >= titleLineHeight + timeLineHeight
+    val showTitle = available >= titleLineHeight
     val textWidth = width - (BLOCK_OUTER_INSET + BLOCK_TEXT_PADDING) * 2
     // Only lines the block can actually draw: a block too short for the time is
     // too short for a second title line too, and asking for one served a sliced
     // one — as well as handing the drag copy a count it couldn't honour, so the
     // title re-wrapped the moment the block was lifted (#267).
-    val titleBudget = metrics.titleBudget(metrics.available).coerceAtLeast(1)
+    val titleBudget = (available / titleLineHeight).toInt().coerceAtLeast(1)
     val titleMaxLines = if (showTime) 1 else titleBudget.coerceAtMost(2)
     // On a day column — wide enough for "09:30–11:00" several times over — the
     // range never needs the second line, until lanes cut the column down.
-    val spare = metrics.available - metrics.titleHeight(titleMaxLines) -
+    val spare = available - titleLineHeight * titleMaxLines -
-        if (showTime) metrics.timeLine else 0.dp
+        if (showTime) timeLineHeight else 0.dp
     val timeMaxLines = if (showTime) blockTimeLines(timeLabel, textWidth, spare) else 1
     val paint = eventPaint(block.event, dark)
     val zone = remember { TimeZone.currentSystemDefault() }
@@ -823,7 +827,7 @@ private fun EventBlock(
             // After clickable, so it is the inner node and wins the main pass;
             // the tap still works, since a drag consumes the up.
             .then(dragModifier)
-            .padding(horizontal = BLOCK_TEXT_PADDING, vertical = metrics.inset)
+            .padding(horizontal = BLOCK_TEXT_PADDING, vertical = BLOCK_TEXT_INSET)
             .semantics {
                 contentDescription = "$title, $timeLabel"
                 if (moveAction != null) customActions = listOf(moveAction)

app/src/main/java/de/jeanlucmakiola/calendula/ui/month/MonthScreen.kt

@@ -153,7 +153,6 @@ import de.jeanlucmakiola.calendula.ui.common.LocalUse24HourFormat
 import de.jeanlucmakiola.calendula.ui.common.inlineTimeLabel
 import de.jeanlucmakiola.calendula.ui.common.eventAccent
 import de.jeanlucmakiola.calendula.ui.common.EventChipShape
-import de.jeanlucmakiola.calendula.ui.common.trimmedLines
 import de.jeanlucmakiola.calendula.ui.common.monthBarShape
 import de.jeanlucmakiola.calendula.ui.common.rememberCurrentMinute
 import de.jeanlucmakiola.calendula.ui.common.ViewSwitcherPill
@@ -2545,7 +2544,7 @@ private fun MonthBar(
         val titleOverflow = eventTitleOverflow()
         Text(
             text = label,
-            style = MaterialTheme.typography.labelSmall.trimmedLines(),
+            style = MaterialTheme.typography.labelSmall,
             maxLines = 1,
             overflow = titleOverflow.overflow,
             softWrap = titleOverflow.softWrap,

app/src/main/java/de/jeanlucmakiola/calendula/ui/theme/Type.kt

@@ -1,24 +1,10 @@
 package de.jeanlucmakiola.calendula.ui.theme
 
 import androidx.compose.material3.Typography
-import androidx.compose.ui.unit.sp
 
 /**
- * Tracking the two label roles the calendar grids are set in. Material gives
+ * Default Material 3 Expressive typography. Custom font + tuned scale will
- * both 0.5sp, tuned for isolated UI labels with room around them; a month chip
+ * land in a later UI-design iteration; the defaults are intentional for V1
- * is a text box some 37dp wide, where 0.5sp on an 11sp glyph spends most of a
+ * scaffolding to keep the foundation lean.
- * character on spacing alone. 0.1sp is what Material itself sets labelLarge to,
- * so the label family stays coherent (#190).
  */
-private val LabelTracking = 0.1.sp
+val CalendulaTypography = Typography()
-
-/**
- * Material 3 Expressive typography with the label roles' tracking tightened.
- * Everything else is the default scale.
- */
-val CalendulaTypography: Typography = Typography().let { base ->
-    base.copy(
-        labelMedium = base.labelMedium.copy(letterSpacing = LabelTracking),
-        labelSmall = base.labelSmall.copy(letterSpacing = LabelTracking),
-    )
-}

app/src/main/java/de/jeanlucmakiola/calendula/ui/week/WeekScreen.kt

@@ -91,11 +91,11 @@ import de.jeanlucmakiola.calendula.ui.common.IMPLEMENTED_VIEWS
 import de.jeanlucmakiola.calendula.ui.common.EventDimAlpha
 import de.jeanlucmakiola.calendula.ui.common.BLOCK_OUTER_INSET
 import de.jeanlucmakiola.calendula.ui.common.BLOCK_TEXT_PADDING
+import de.jeanlucmakiola.calendula.ui.common.BLOCK_TEXT_INSET
 import de.jeanlucmakiola.calendula.ui.common.BlockTimeLabel
 import de.jeanlucmakiola.calendula.ui.common.BlockTitle
 import de.jeanlucmakiola.calendula.ui.common.blockTextLines
 import de.jeanlucmakiola.calendula.ui.common.blockTimeLines
-import de.jeanlucmakiola.calendula.ui.common.rememberBlockTextMetrics
 import de.jeanlucmakiola.calendula.ui.common.animatedBlockPlacement
 import de.jeanlucmakiola.calendula.ui.common.ghostAlpha
 import de.jeanlucmakiola.calendula.ui.common.LocalEventMove
@@ -118,7 +118,6 @@ import de.jeanlucmakiola.calendula.ui.common.rememberTimelineDragController
 import de.jeanlucmakiola.calendula.ui.common.startInstant
 import de.jeanlucmakiola.calendula.ui.common.LocalDimCutoff
 import de.jeanlucmakiola.calendula.ui.common.EventChipShape
-import de.jeanlucmakiola.calendula.ui.common.trimmedLines
 import de.jeanlucmakiola.calendula.ui.common.NowLine
 import de.jeanlucmakiola.calendula.ui.common.rememberCurrentMinute
 import de.jeanlucmakiola.calendula.ui.common.ViewSwitcherPill
@@ -156,8 +155,7 @@ import kotlin.time.Clock
 import java.time.format.TextStyle as JavaTextStyle
 import java.util.Locale
 
-/** One lane of the all-day strip, sized to a trimmed bar line (#190). */
+private val ALL_DAY_ROW_HEIGHT = 24.dp
-private val ALL_DAY_ROW_HEIGHT = 20.dp
 private val ALL_DAY_VERTICAL_PADDING = 6.dp
 /** Gap between day columns; part of the column pitch a drag maps positions through. */
 private val COLUMN_GAP = 2.dp
@@ -666,7 +664,7 @@ private fun AllDayBar(
         val titleOverflow = eventTitleOverflow()
         Text(
             text = title,
-            style = MaterialTheme.typography.labelSmall.trimmedLines(),
+            style = MaterialTheme.typography.labelSmall,
             maxLines = 1,
             overflow = titleOverflow.overflow,
             softWrap = titleOverflow.softWrap,
@@ -911,7 +909,13 @@ private fun EventBlock(
     val timeLabel = "${minToHm(block.startMin, use24Hour, locale)}–" +
         minToHm(block.endMin, use24Hour, locale)
     val density = LocalDensity.current
-    val metrics = rememberBlockTextMetrics(height)
+    val titleLineHeight = with(density) {
+        MaterialTheme.typography.labelMedium.lineHeight.toDp()
+    }
+    val timeLineHeight = with(density) {
+        MaterialTheme.typography.labelSmall.lineHeight.toDp()
+    }
+    val available = height - BLOCK_TEXT_INSET * 2
     // Only full-width (non-overlapping) blocks that are tall enough show the
     // time. On narrow overlapping columns we drop it so the title can wrap to
     // fill the whole block, mirroring Google Calendar — and a block that cannot
@@ -919,19 +923,19 @@ private fun EventBlock(
     // its own: a duration threshold would keep hiding the time on a half-hour
     // block the user has pinched open to three times the room it needs.
     val showTime = block.laneCount == 1 &&
-        metrics.available >= metrics.titleLine + metrics.timeLine
+        available >= titleLineHeight + timeLineHeight
     val textWidth = width - (BLOCK_OUTER_INSET + BLOCK_TEXT_PADDING) * 2
     // A short block drops the title rather than serving a horizontally sliced
     // one: half a letter reads as a rendering fault, while a bare colour chip
     // reads as what it is — an event too brief to label. Tap still opens it, and
     // the semantics description carries the full title either way.
-    val showTitle = metrics.fitsTitle
+    val showTitle = available >= titleLineHeight
     // The title is served first, out of everything the block has left once the
     // time is down to one line — but only takes the lines it will actually use,
     // and only wraps at all once a line is wide enough to hold more than a
     // syllable. Below that the extra lines just stack fragments of the word.
-    val contentHeight = metrics.available - if (showTime) metrics.timeLine else 0.dp
+    val contentHeight = available - if (showTime) timeLineHeight else 0.dp
-    val titleBudget = metrics.titleBudget(contentHeight).coerceAtLeast(1)
+    val titleBudget = (contentHeight / titleLineHeight).toInt().coerceAtLeast(1)
     val paint = eventPaint(block.event, dark)
     // Every line the height affords, however narrow the lane: two events side by
     // side leave columns well under a word wide, and cutting the title to one
@@ -944,8 +948,8 @@ private fun EventBlock(
         textWidth = textWidth,
         max = titleBudget,
     )
-    val spare = metrics.available - metrics.titleHeight(titleMaxLines) -
+    val spare = available - titleLineHeight * titleMaxLines -
-        if (showTime) metrics.timeLine else 0.dp
+        if (showTime) timeLineHeight else 0.dp
     val timeMaxLines = if (showTime) blockTimeLines(timeLabel, textWidth, spare) else 1
     val dimCutoff = LocalDimCutoff.current
     val dimmed = dimCutoff != null && block.event.hasEnded(dimCutoff)
@@ -987,7 +991,7 @@ private fun EventBlock(
             // After clickable, so it is the inner node and wins the main pass;
             // the tap still works, since a drag consumes the up.
             .then(dragModifier)
-            .padding(horizontal = BLOCK_TEXT_PADDING, vertical = metrics.inset)
+            .padding(horizontal = BLOCK_TEXT_PADDING, vertical = BLOCK_TEXT_INSET)
             .semantics {
                 contentDescription = "$title, $timeLabel"
                 if (moveAction != null) customActions = listOf(moveAction)

app/src/main/res/values-cs/strings.xml

@@ -106,7 +106,7 @@
     <string name="event_edit_timezone_search">Vyhledat časové pásmo</string>
     <string name="event_edit_timezone_recent">Nedávné</string>
     <string name="event_edit_timezone_all">Všechna časová pásma</string>
-    <string name="event_edit_timezone_none">Žádné časové pásmo neodpovídá „%1$s“</string>
+    <string name="event_edit_timezone_none">Žádné časové pásmo neodpovídá “%1$s”</string>
     <string name="event_edit_timezone_local_time">%1$s vašeho času</string>
     <string name="event_edit_color">Barva</string>
     <string name="event_edit_color_default">Barva kalendáře</string>
@@ -115,7 +115,7 @@
     <string name="event_edit_color_unsupported">Pro tento kalendář není k dispozici</string>
     <string name="event_edit_color_unsupported_hint">Tento kalendář nemá žádnou sadu barev. Vlastní barvy kalendářů můžete povolit v nastavení.</string>
     <string name="event_edit_color_sync_warning">Tato barva může být během příští synchronizace kalendáře ztracena nebo přepsána.</string>
-    <string name="event_edit_conflict_title">Ke změně události došlo na jiném místě</string>
+    <string name="event_edit_conflict_title">Ke změně události došlo na jiném místě.</string>
     <string name="event_edit_conflict_body">Během úpravy došlo ke změně události — v rámci synchronizace nebo pomocí jiné aplikací. Co se má stát s vašimi změnami?</string>
     <string name="event_edit_conflict_overwrite">Uložit změny</string>
     <string name="event_edit_conflict_overwrite_hint">Pouze u upravených polí dojde k přepsání vnějšího zdroje</string>
@@ -169,7 +169,7 @@
     <string name="recurrence_every_n_months">Každý %1$d. měsíc</string>
     <string name="recurrence_every_n_years">Každý %1$d. rok</string>
     <string name="recurrence_on_days">%1$s v %2$s</string>
-    <string name="recurrence_with_until">%1$s do %2$s</string>
+    <string name="recurrence_with_until">%1$s do%2$s</string>
     <string name="recurrence_with_count">%1$s, %2$d opakování</string>
     <string name="event_detail_not_found">Tato událost již neexistuje.</string>
     <string name="event_attendee_accepted">Přijato</string>
@@ -190,7 +190,7 @@
     <string name="event_access_confidential_summary">Označeno jako utajené; záleží na daném účtu kalendáře, jak s tímto štítkem naloží</string>
     <string name="event_attendee_organizer">Pořadatel</string>
     <string name="event_attendee_optional">Volitelné</string>
-    <string name="event_attendee_resource">Prostředky</string>
+    <string name="event_attendee_resource">Zdroj</string>
     <string name="event_detail_self_response">Vaše odpověď: %1$s</string>
     <string name="reminder_at_time">V době konání události</string>
     <string name="reminder_default">Výchozí připomínka</string>
@@ -296,7 +296,7 @@
     <string name="search_back">Zpět</string>
     <string name="search_clear">Vymazat</string>
     <string name="search_idle_hint">Prohledávejte své události podle názvu, místa konání nebo poznámek.</string>
-    <string name="search_empty">Žádná událost neodpovídá „%1$s“.</string>
+    <string name="search_empty">Žádná událost neodpovídá “%1$s”.</string>
     <plurals name="search_selected_count">
         <item quantity="one">%d označený</item>
         <item quantity="few">%d označené</item>
@@ -409,7 +409,7 @@
     <string name="settings_widget_size_medium">Střední</string>
     <string name="settings_widget_size_large">Velký</string>
     <string name="settings_widget_size_extra_large">Největší</string>
-    <string name="settings_widget_size_summary">Text události %1$d</string>
+    <string name="settings_widget_size_summary">Text události%1$d</string>
     <string name="settings_agenda_show_today">Vždy zobrazovat dnešek</string>
     <string name="settings_agenda_show_today_hint">Ponechat dnešní den na prvním místě agendy a jejího widgetu, třebaže již nezbývá žádná nadcházející událost.</string>
     <string name="state_failure_all_hidden">Všechny vaše kalendáře jsou vypnuté.</string>
@@ -430,12 +430,12 @@
     <string name="settings_agenda_range_bar_hint">V horní části agendy se zobrazí lišta s rozsahem dat a tlačítkem pro změnu rozsahu dané relace</string>
     <string name="agenda_range_showing_label">Zobrazit všechny nadcházející události pro</string>
     <plurals name="agenda_range_days">
-        <item quantity="one">%d den</item>
+        <item quantity="one">%dden</item>
-        <item quantity="few">%d dny</item>
+        <item quantity="few">%ddny</item>
-        <item quantity="many">%d dnů</item>
+        <item quantity="many">%ddnů</item>
-        <item quantity="other">%d dnů</item>
+        <item quantity="other">%ddnů</item>
     </plurals>
-    <string name="settings_section_views">Zobrazení</string>
+    <string name="settings_section_views">Pohledy</string>
     <string name="settings_month_header">Měsíční zobrazení</string>
     <string name="settings_month_view_style">Styl měsíčního zobrazení</string>
     <string name="month_style_paged">Stránky</string>
@@ -485,212 +485,4 @@
     <string name="settings_reliable_delivery_exempt">Výloučení z optimalizace baterie – připomínky chodí bez prodlení.</string>
     <string name="settings_notifications_subtitle">Připomínky a doručení</string>
     <string name="settings_special_dates_reminders">Připomínky</string>
-    <string name="settings_reliable_delivery">Spolehlivé doručení</string>
-    <string name="settings_snooze_duration">Doba odložení</string>
-    <string name="settings_section_calendars">Kalendáře</string>
-    <string name="settings_manage_calendars">Správa kalendářů</string>
-    <string name="settings_manage_calendars_hint">Vytvářet místní kalendáře; spravovat synchronizované kalendáře</string>
-    <string name="settings_section_language">Jazyk</string>
-    <string name="settings_language">Jazyk aplikace</string>
-    <string name="settings_language_auto">Výchozí nastavení systému</string>
-    <string name="settings_translate">Pomozte s překladem</string>
-    <string name="settings_translate_hint">Přidat nebo vylepšit jazyk na Weblate</string>
-    <string name="settings_group_look">Vzhled a chování</string>
-    <string name="settings_group_data">Data</string>
-    <string name="settings_group_app">Aplikace</string>
-    <string name="settings_group_about">O aplikaci</string>
-    <string name="settings_appearance_subtitle">Motiv, barvy, písma</string>
-    <string name="settings_views_subtitle">Výchozí zobrazení, rozložení a pořadí</string>
-    <string name="settings_event_form_subtitle">Výchozí pole a chování</string>
-    <string name="settings_special_dates_subtitle">Narozeniny a výročí kontaktů</string>
-    <string name="settings_widgets_subtitle">Widget s agendou, dlaždice rychlého nastavení</string>
-    <string name="settings_backup_subtitle">Export, import, automatické zálohování</string>
-    <string name="settings_section_widgets">Widgety a dlaždice</string>
-    <string name="settings_widgets_hint">Nastavení widgetů na domovské obrazovce a dlaždice rychlého nastavení. Widget přidáte dlouhým stisknutím domovské obrazovky.</string>
-    <string name="settings_section_backup">Záloha a obnovení</string>
-    <string name="settings_views_all_header">Všechny pohledy</string>
-    <string name="settings_week_day_header">Týden a den</string>
-    <string name="settings_default_view_hint">Pohled, který se otevře při spuštění aplikace.</string>
-    <string name="settings_week_start_hint">Počáteční den týdne ve všech zobrazeních a widgetech.</string>
-    <string name="settings_time_format_hint">Způsob zápisu času v celé aplikaci. Funkce „Automaticky“ se řídí nastavením vašeho systému.</string>
-    <string name="settings_past_events_hint">Jak program zachází s událostmi, které již skončily.</string>
-    <string name="settings_dynamic_color_summary">Aplikace převezme barvy z vaší tapety.</string>
-    <string name="settings_section_special_dates">Speciální data kontaktů</string>
-    <string name="settings_special_dates_enable">Zobrazit data kontaktů</string>
-    <string name="settings_special_dates_enable_hint">Zkopírujte data narozenin a další data svých kontaktů do místních kalendářů. Aplikace čte pouze kontakty v tomto zařízení – nikam se nic nenahrává, vaše kontakty zůstávají beze změny.</string>
-    <string name="settings_special_dates_type_birthday">Narozeniny</string>
-    <string name="settings_special_dates_type_anniversary">Výročí</string>
-    <string name="settings_special_dates_type_custom">Ostatní data</string>
-    <string name="settings_special_dates_template">Formát názvu</string>
-    <string name="settings_special_dates_template_hint">Pro kontakt použijte {name} a pro rok {year} (rok narození nebo rok zahájení výročí; pokud není znám, údaj se skryje).</string>
-    <string name="settings_special_dates_show_year">Zobrazit rok</string>
-    <string name="settings_special_dates_show_year_hint">Uvést {year} v názvu, je-li znám</string>
-    <string name="settings_special_dates_sync_now">Synchronizovat nyní</string>
-    <string name="settings_special_dates_never_synced">Zatím nesynchronizováno</string>
-    <string name="settings_special_dates_last_synced">Naposledy synchronizováno %1$s</string>
-    <string name="settings_special_dates_calendar_hint">Barvu a viditelnost jednotlivých kalendářů nastavte v nastavení kalendářů.</string>
-    <string name="settings_calendar_reminders_managed_hint">Nastavte v části Speciální data kontaktu</string>
-    <string name="settings_special_dates_paused_title">Pozastaveno</string>
-    <string name="settings_special_dates_paused_hint">Calendula už nemá přístup k vašim kontaktům, tudíž zůstávají bez aktualizace.</string>
-    <string name="settings_special_dates_grant">Udělit přístup</string>
-    <string name="settings_special_dates_disable_title">Vypnout data kontaktů?</string>
-    <string name="settings_special_dates_disable_type_message">Tímto se odstraní kalendář „%1$s“ a jeho události. Veškeré připomínky a poznámky, které jste do nich přidali, budou ztraceny.</string>
-    <string name="settings_special_dates_disable_confirm">Vypnout</string>
-    <string name="dialog_save">Uložit</string>
-    <string name="settings_section_about">O aplikaci</string>
-    <string name="settings_license">Licence</string>
-    <string name="settings_license_value">MIT</string>
-    <string name="settings_about_author">od Jean-Luca Makioly</string>
-    <string name="settings_about_source">Zdroj</string>
-    <string name="settings_licences">Licence open source</string>
-    <string name="settings_licences_subtitle">Projekty, na kterých je Calendula postavena</string>
-    <string name="settings_about_privacy">Zásady ochrany osobních údajů</string>
-    <string name="settings_about_support">Podpořte vývoj</string>
-    <string name="settings_about_version">Verze %1$s</string>
-    <string name="settings_about_logo_desc">Ikona aplikace</string>
-    <string name="settings_report_problem">Nahlásit problém</string>
-    <string name="settings_report_problem_hint">Odeslat hlášení o pádu nebo otevřít systém pro sledování chyb</string>
-    <string name="licences_title">Licence open source</string>
-    <string name="licences_intro">Calendula zahrnuje níže uvedené projekty. Klepnutím na libovolnou položku zobrazíte jeho zdrojový kód.</string>
-    <string name="licences_footer">Každý projekt je zde zahrnut v nezměněné podobě a pod uvedenou licencí.</string>
-    <string name="calendars_title">Kalendáře</string>
-    <string name="calendars_local_header">Vaše kalendáře</string>
-    <string name="calendars_local_empty">Zatím nejsou k dispozici žádné místní kalendáře. Vytvořte si kalendář, chcete-li události ukládat pouze do tohoto zařízení.</string>
-    <string name="calendars_add">Přidat kalendář</string>
-    <string name="calendars_visibility_hint">Vypnutím kalendáře jej na tomto zařízení skryjete – jeho události zmizí z aplikace a přestanou se zobrazovat připomínky. Jde o stejný přepínač, jaký používají i ostatní aplikace kalendáře, takže se kalendář skryje i v nich. Nic se nemaže, další zařízení to neovlivní a kalendář můžete kdykoli znovu zapnout.</string>
-    <string name="calendars_visibility_a11y">Zobrazit „%1$s“</string>
-    <string name="calendars_visibility_notice_title">Některé kalendáře jsou vypnuté</string>
-    <string name="calendars_visibility_notice_message">Calendula zobrazuje kalendáře, které jsou pro toto zařízení zapnuté; některé z vašich kalendářů jsou však vypnuté. Chcete-li zobrazit jejich události, zapněte je v nabídce Nastavení → Kalendáře.</string>
-    <string name="calendar_picker_missing_title">Chybí vám kalendář?</string>
-    <string name="calendar_picker_missing_summary">Může být vypnutý, nastavený na režim „pouze pro čtení“ nebo naplněný daty z vašich kontaktů – své kalendáře spravujte zde.</string>
-    <string name="calendars_state_read_only">Pouze pro čtení</string>
-    <string name="calendars_state_not_synced">Není synchronizováno s tímto zařízením</string>
-    <string name="calendars_state_managed">Vyplněno z vašich kontaktů</string>
-    <string name="calendars_managed_delete_locked">Tento kalendář se plní z vašich kontaktů, takže jej aplikace Calendula při příští synchronizaci znovu vytvoří. Chcete-li jej odstranit, vypněte možnost speciálních dat v nabídce Nastavení → Speciální data.</string>
-    <string name="calendars_synced_header">Synchronizované kalendáře</string>
-    <string name="calendars_synced_hint">Tyto kontakty pocházejí z účtů ve vašem zařízení. Vytvářejte je a upravujte v příslušné aplikaci.</string>
-    <string name="calendars_manage_in_app">Spravovat v aplikaci</string>
-    <string name="calendars_account_from_source">%1$s (%2$s)</string>
-    <string name="calendars_account_menu_a11y">Více možností pro %1$s</string>
-    <string name="calendars_enable_all">Povolit vše</string>
-    <string name="calendars_disable_all">Zakázat vše</string>
-    <string name="calendars_add_account">Přidat účet</string>
-    <string name="calendars_new_title">Nový kalendář</string>
-    <string name="calendars_edit_title">Upravit kalendář</string>
-    <string name="calendars_name_label">Jméno</string>
-    <string name="calendars_color_label">Barva</string>
-    <string name="calendars_description_hint">Přidat popis</string>
-    <string name="calendars_delete_confirm_title">Vymazat kalendář?</string>
-    <string name="calendars_delete_confirm_message">„%1$s“ a všechny jeho události budou z tohoto zařízení trvale odstraněny.</string>
-    <string name="calendars_write_error">Změnu se nepodařilo uložit.</string>
-    <string name="calendars_backup_header">Záloha</string>
-    <string name="calendars_backup_hint">Místní kalendáře nejsou nikde synchronizovány, proto je pro uchování kopie exportujte do souboru ve formátu .ics.</string>
-    <string name="calendars_backup_action">Exportovat jako soubor .ics</string>
-    <string name="calendars_export_title">Exportovat kalendáře</string>
-    <string name="calendars_export_hint">Vyberte, které kalendáře chcete zahrnout do souboru .ics.</string>
-    <string name="calendars_export_action">Exportovat</string>
-    <string name="calendars_restore_header">Obnovit</string>
-    <string name="calendars_restore_action">Obnovit ze souboru .ics</string>
-    <string name="calendars_restore_hint">Importuovat události ze zálohy nebo z jiné aplikace kalendáře.</string>
-    <string name="calendars_auto_backup">Automatické zálohování</string>
-    <string name="calendars_auto_backup_hint">Pravidelně exportujte své místní kalendáře do složky jako soubor .ics.</string>
-    <string name="calendars_auto_backup_folder">Složka pro zálohování</string>
-    <string name="calendars_auto_backup_folder_unset">Klepnutím vyberte složku</string>
-    <string name="calendars_auto_backup_interval">Interval</string>
-    <string name="calendars_auto_backup_every">Každý %1$s</string>
-    <string name="calendars_auto_backup_interval_min">Minimálně 30 minut.</string>
-    <string name="calendars_auto_backup_status_never">Zatím není nastaveno žádné automatické zálohování</string>
-    <string name="calendars_auto_backup_status_ok">Poslední záloha: %1$s</string>
-    <string name="calendars_auto_backup_status_failed">Poslední zálohování selhalo: %1$s</string>
-    <string name="backup_channel_name">Záloha</string>
-    <string name="backup_channel_description">Upozorní, pokud automatické zálohování opakovaně selže.</string>
-    <string name="backup_failed_title">Automatické zálohování selhalo</string>
-    <string name="backup_failed_text">Calendula nemohla zapsat záložní soubor. Zkontrolujte složku pro zálohování v nastavení.</string>
-    <string name="calendars_backup_failed">Zálohu se nepodařilo exportovat.</string>
-    <plurals name="calendars_backup_done">
-        <item quantity="one">%d událost exportována.</item>
-        <item quantity="few">%d události exportovány.</item>
-        <item quantity="many">%d událostí exportováno.</item>
-        <item quantity="other">%d událostí exportováno.</item>
-    </plurals>
-    <string name="import_title">Importovat události</string>
-    <string name="import_target_header">Přidat do kalendáře</string>
-    <string name="import_empty">V souboru nenalezeny žádné události.</string>
-    <string name="import_failed">Tento soubor se nepodařilo přečíst.</string>
-    <string name="import_no_calendar">Neexistuje žádný kalendář s právem zápisu, do kterého by bylo možné importovat. Nejprve vytvořte místní kalendář.</string>
-    <string name="import_done_title">Import dokončen</string>
-    <string name="import_done_dedup_note">Události, které již byly v kalendáři, byly přeskočeny.</string>
-    <string name="import_done_added_label">Přidáno</string>
-    <string name="import_done_skipped_label">Duplicity</string>
-    <string name="import_done_failed_label">Nepřidáno</string>
-    <string name="import_done_failed_note">Některé události se nepodařilo přidat, a proto byly vynechány.</string>
-    <string name="import_done_stopped_title">Import byl zastaven</string>
-    <string name="import_close">Zavřít</string>
-    <string name="import_warning_recurrence">Některé změněné výskyty opakujících se událostí byly přeskočeny.</string>
-    <string name="import_warning_no_start">Událost bez času zahájení byla přeskočena.</string>
-    <string name="import_warning_attendees">Seznamy hostů nebyly importovány.</string>
-    <string name="import_warning_timezone">Neznámé časové pásmo se přepnulo na časové pásmo vašeho zařízení.</string>
-    <string name="import_warning_tasks">Úkoly v tomto souboru byly přidány jako události.</string>
-    <string name="import_warning_recurrence_repaired">Chybné pravidlo pro opakování bylo opraveno.</string>
-    <string name="import_button">Importovat</string>
-    <plurals name="import_title_count">
-        <item quantity="one">Importována %d událost</item>
-        <item quantity="few">Importovány %d události</item>
-        <item quantity="many">Importováno %d událostí</item>
-        <item quantity="other">Importováno %d událostí</item>
-    </plurals>
-    <plurals name="import_event_count">
-        <item quantity="one">V tomto souboru je %d událost.</item>
-        <item quantity="few">V tomto souboru jsou %d události.</item>
-        <item quantity="many">V tomto souboru je %d událostí.</item>
-        <item quantity="other">V tomto souboru je %d událostí.</item>
-    </plurals>
-    <plurals name="import_action">
-        <item quantity="one">Importovat %d událost</item>
-        <item quantity="few">Importovat %d události</item>
-        <item quantity="many">Importovat %d událostí</item>
-        <item quantity="other">Importovat %d událostí</item>
-    </plurals>
-    <plurals name="import_done_stopped">
-        <item quantity="one">Kalendář přestal v průběhu procesu zpracovávat události. %d událost ze souboru nebyla přidána.</item>
-        <item quantity="few">Kalendář přestal v průběhu procesu zpracovávat události. %d události ze souboru nebyly přidány.</item>
-        <item quantity="many">Kalendář přestal v průběhu procesu zpracovávat události. %d událostí ze souboru nebylo přidáno.</item>
-        <item quantity="other">Kalendář přestal v průběhu procesu zpracovávat události. %d událostí ze souboru nebylo přidáno.</item>
-    </plurals>
-    <plurals name="import_done_imported">
-        <item quantity="one">%d událost importována.</item>
-        <item quantity="few">%d události importovány.</item>
-        <item quantity="many">%d událostí importováno.</item>
-        <item quantity="other">%d událostí importováno.</item>
-    </plurals>
-    <plurals name="import_done_skipped">
-        <item quantity="one">Přeskočena %d událost, která již v tomto kalendáři existuje.</item>
-        <item quantity="few">Přeskočeny %d události, která již v tomto kalendáři existují.</item>
-        <item quantity="many">Přeskočeno %d událostí, která již v tomto kalendáři existují.</item>
-        <item quantity="other">Přeskočeno %d událostí, která již v tomto kalendáři existují.</item>
-    </plurals>
-    <plurals name="import_done_failed">
-        <item quantity="one">%d událost nebylo možné přidat.</item>
-        <item quantity="few">%d události nebylo možné přidat.</item>
-        <item quantity="many">%d událostí nebylo možné přidat.</item>
-        <item quantity="other">%d událostí nebylo možné přidat.</item>
-    </plurals>
-    <string name="shortcut_new_event_short">Nová událost</string>
-    <string name="shortcut_new_event_long">Vytvořit novou událost</string>
-    <string name="qs_tile_new_event_label">Nová událost</string>
-    <string name="settings_qs_tile">Přidat dlaždici rychlého nastavení</string>
-    <string name="settings_qs_tile_hint">Přidat dlaždici „Nová událost“ do panelu rychlého nastavení.</string>
-    <string name="crash_dialog_title">%1$s selhalo</string>
-    <string name="crash_dialog_message">%1$s se minule neočekávaně ukončilo. Můžete pomoci problém vyřešit odesláním tohoto hlášení. Hlášení zůstane ve vašem zařízení, dokud se jej nerozhodnete odeslat, a neobsahuje žádné osobní údaje ani obsah kalendáře – pouze níže uvedené technické detaily.</string>
-    <string name="crash_dialog_report">Odeslat hlášení o selhání</string>
-    <string name="crash_dialog_dismiss">Později</string>
-    <string name="crash_report_clip_label">Hlášení o selhání %1$s</string>
-    <string name="crash_report_copied">Hlášení bylo zkopírováno do schránky</string>
-    <string name="crash_report_open_failed">Nepodařilo se otevřít systém pro hlášení problémů. Zpráva je zkopírována ve vaší schránce.</string>
-    <string name="special_dates_calendar_birthday">Narozeniny</string>
-    <string name="special_dates_calendar_anniversary">Výročí</string>
-    <string name="special_dates_calendar_custom">Speciální data</string>
-    <string name="special_dates_default_title_birthday">Narozeniny má {name} ({year})</string>
-    <string name="special_dates_default_title_anniversary">Výročí má {name} ({year})</string>
-    <string name="special_dates_default_title_custom">{name}</string>
 </resources>

app/src/main/res/values-sk/strings.xml

@@ -263,44 +263,4 @@
     <string name="onboarding_done_button">Otvoriť môj kalendár</string>
     <string name="reminder_channel_name">Pripomienky udalostí</string>
     <string name="reminder_channel_description">Notifikácie v časoch pripomienok vašich udalostí</string>
-    <string name="agenda_today_action">Dnes</string>
-    <string name="agenda_header_today">Dnes</string>
-    <string name="search_back">Späť</string>
-    <string name="widget_new_event">Nová udalosť</string>
-    <string name="widget_prev_month">Predchádzajúci mesiac</string>
-    <string name="widget_next_month">Nasledujúci mesiac</string>
-    <string name="widget_today">Dnes</string>
-    <string name="filter_title">Kalendáre</string>
-    <string name="settings_title">Nastavenia</string>
-    <string name="settings_back">Späť</string>
-    <string name="back">Späť</string>
-    <string name="timeline_scale_custom">Vlastné</string>
-    <string name="agenda_range_day">Dnes</string>
-    <string name="state_failure_all_hidden">Všetky vaše kalendáre sú vypnuté.</string>
-    <string name="state_failure_all_hidden_action">Správa kalendárov</string>
-    <string name="field_copy_action">Kopírovať</string>
-    <string name="field_copied">Skopirovane do schránky</string>
-    <string name="field_copy_failed">Toto sa nepodarilo skopírovať</string>
-    <string name="event_detail_title">Názov</string>
-    <string name="reminder_after">%1$s po</string>
-    <string name="reminder_onboarding_title">Nikdy nezmeškajte udalosť</string>
-    <string name="reminder_onboarding_body">Samotný Android nezobrazuje pripomienky udalostí - to musí zabezpečiť aplikácia kalendáru. Nechajte túto prácu na Calendule.</string>
-    <string name="reminder_benefit_delivery_title">Pripomienky, doručené</string>
-    <string name="reminder_benefit_delivery_body">Pripomienky k vašim udalostiam vám prídu ako notifikácia, vždy a načas.</string>
-    <string name="reminder_benefit_duplicates_title">Používate ďalšiu aplikáciu s kalendárom?</string>
-    <string name="reminder_onboarding_skip_button">Neskôr</string>
-    <plurals name="search_delete_title">
-        <item quantity="one">Odstrániť %d udalosť?</item>
-        <item quantity="few">Odstrániť %d udalosti?</item>
-        <item quantity="many">Odstrániť %d udalostí?</item>
-        <item quantity="other">Odstrániť %d udalostí?</item>
-    </plurals>
-    <plurals name="search_delete_done">
-        <item quantity="one">%d udalosť odstránená</item>
-        <item quantity="few">%d udalosti odstránené</item>
-        <item quantity="many">%d odstránených udalostí</item>
-        <item quantity="other">%d odstránených udalostí</item>
-    </plurals>
-    <string name="agenda_range_this_week">Tento týždeň</string>
-    <string name="agenda_range_custom">Vlastné…</string>
 </resources>

app/src/test/java/de/jeanlucmakiola/calendula/ui/common/BlockTextMetricsTest.kt

@@ -1,88 +0,0 @@
-package de.jeanlucmakiola.calendula.ui.common
-
-import androidx.compose.ui.unit.Dp
-import androidx.compose.ui.unit.dp
-import com.google.common.truth.Truth.assertThat
-import org.junit.jupiter.api.Test
-
-class BlockTextMetricsTest {
-
-    /** One trimmed labelMedium line at font scale 1: a 12sp glyph, leading off. */
-    private val titleLine = 14.dp
-
-    /** A block with room to spare, for the line arithmetic. */
-    private fun metrics(height: Dp = 100.dp) = BlockTextMetrics(
-        inset = blockTextInset(height, titleLine),
-        available = height - blockTextInset(height, titleLine) * 2,
-        titleLine = titleLine,
-        titleLeading = 16.dp,
-        timeLine = 13.dp,
-    )
-
-    @Test
-    fun `a block with room keeps the full inset`() {
-        assertThat(blockTextInset(height = 60.dp, titleLine = titleLine))
-            .isEqualTo(BLOCK_TEXT_INSET)
-    }
-
-    @Test
-    fun `the inset tapers instead of snapping as the block shrinks`() {
-        // Half the inset left over is half the inset kept, so a pinch closes the
-        // gap frame by frame rather than dropping it in one.
-        assertThat(blockTextInset(height = titleLine + 2.dp, titleLine = titleLine))
-            .isEqualTo(1.dp)
-    }
-
-    @Test
-    fun `a block exactly one title tall spends nothing on padding`() {
-        assertThat(blockTextInset(height = titleLine, titleLine = titleLine)).isEqualTo(0.dp)
-    }
-
-    @Test
-    fun `a block shorter than a line never insets negatively`() {
-        assertThat(blockTextInset(height = 4.dp, titleLine = titleLine)).isEqualTo(0.dp)
-    }
-
-    @Test
-    fun `the title survives a block that used to be too short for it`() {
-        // 18dp is under the old floor — a title line plus 2dp of inset at each
-        // edge — and over the new one, which is the line on its own (#289).
-        val m = metrics(height = 18.dp)
-        assertThat(m.fitsTitle).isTrue()
-    }
-
-    @Test
-    fun `a block under one line still drops the title`() {
-        assertThat(metrics(height = 10.dp).fitsTitle).isFalse()
-    }
-
-    @Test
-    fun `every title line after the first costs a whole line box`() {
-        // The trim reaches the outer edges only, so the leading between two
-        // lines is still there to pay for.
-        val m = metrics()
-        assertThat(m.titleHeight(1)).isEqualTo(14.dp)
-        assertThat(m.titleHeight(2)).isEqualTo(30.dp)
-        assertThat(m.titleHeight(3)).isEqualTo(46.dp)
-        assertThat(m.titleHeight(0)).isEqualTo(0.dp)
-    }
-
-    @Test
-    fun `the budget is what the block can actually draw, not what divides into it`() {
-        val m = metrics()
-        // Two lines cost 30dp: 29 buys one, 30 buys the second.
-        assertThat(m.titleBudget(29.dp)).isEqualTo(1)
-        assertThat(m.titleBudget(30.dp)).isEqualTo(2)
-        assertThat(m.titleBudget(13.dp)).isEqualTo(0)
-    }
-
-    @Test
-    fun `a budget line is always one the block can pay for`() {
-        val m = metrics()
-        (0..80).forEach { dp ->
-            val within = dp.dp
-            val budget = m.titleBudget(within)
-            assertThat(m.titleHeight(budget)).isAtMost(within)
-        }
-    }
-}

app/src/test/java/de/jeanlucmakiola/calendula/ui/common/TimelineZoomTest.kt

@@ -1,6 +1,5 @@
 package de.jeanlucmakiola.calendula.ui.common
 
-import androidx.compose.ui.unit.Density
 import androidx.compose.ui.unit.dp
 import com.google.common.truth.Truth.assertThat
 import org.junit.jupiter.api.Test
@@ -76,16 +75,17 @@ class TimelineZoomTest {
     }
 
     @Test
-    fun `a pinch held against either bound stays put`() {
+    fun `a pinch held against a fractional bound stays put`() {
+        // A bound that is not a whole pixel is a height the pinch can be pushed
+        // against but never land on, so every frame of a held gesture would look
+        // like a scale change and hand the focal anchor a scroll correction.
         val fillPx = 62.083f
         val maxPx = 616.5f
 
         val floor = pinchedHourHeightPx(target = 1f, fillPx, maxPx)
         val ceiling = pinchedHourHeightPx(target = 9_000f, fillPx, maxPx)
 
-        // The ceiling is pulled onto the pixel grid so it stays landable; the
+        assertThat(floor).isEqualTo(63f)
-        // fill floor is landable as it is, being the clamp result itself.
-        assertThat(floor).isEqualTo(fillPx)
         assertThat(ceiling).isEqualTo(616f)
         // Landing there and being pushed further must not move them again.
         assertThat(pinchedHourHeightPx(floor * 0.9f, fillPx, maxPx)).isEqualTo(floor)
@@ -100,35 +100,6 @@ class TimelineZoomTest {
         assertThat(floor * 24).isAtLeast(viewport)
     }
 
-    @Test
-    fun `pinching all the way out leaves nothing to scroll`() {
-        // #290: rounding the fill floor up to a whole pixel made the day one
-        // pixel per hour taller than the viewport it was supposed to fill, so a
-        // fully zoomed-out timeline still scrolled a hair and bounced off
-        // Android's overscroll stretch -- while FitDay, at the same zoom, sat
-        // still. 1490 is deliberately not divisible by 24.
-        val viewport = 1490f
-        val floor = pinchedHourHeightPx(target = 1f, fillPx = viewport / 24f, maxPx = 616f)
-        assertThat(floor * 24).isWithin(0.01f).of(viewport)
-    }
-
-    @Test
-    fun `the pinch floor is the height FitDay resolves to`() {
-        // The inconsistency the issue is about: the two ways to reach "the whole
-        // day on one screen" have to arrive at the same height.
-        val density = Density(2.5f)
-        val viewport = 596.dp
-        with(density) {
-            val fitDay = TimelineScale.FitDay.hourHeight(viewport).toPx()
-            val pinched = pinchedHourHeightPx(
-                target = 1f,
-                fillPx = fillHourHeight(viewport).toPx(),
-                maxPx = MAX_PINCH_HOUR_HEIGHT.toPx(),
-            )
-            assertThat(pinched).isWithin(0.01f).of(fitDay)
-        }
-    }
-
     @Test
     fun `a settled pinch is what gets persisted`() {
         var persisted: TimelineScale? = null

app/src/test/java/de/jeanlucmakiola/calendula/ui/theme/FontsTest.kt

@@ -1,6 +1,5 @@
 package de.jeanlucmakiola.calendula.ui.theme
 
-import androidx.compose.ui.unit.sp
 import com.google.common.truth.Truth.assertThat
 import org.junit.jupiter.api.Test
 
@@ -49,19 +48,6 @@ class FontsTest {
         assertThat(typography.labelSmall.fontFamily).isEqualTo(plain)
     }
 
-    @Test
-    fun `picking a font keeps the tightened label tracking`() {
-        // The font picker only swaps the family; the tracking the grids are laid
-        // out against has to survive it (#190).
-        val typography = calendulaTypography(
-            brand = BundledFont.Lora.family,
-            plain = BundledFont.AtkinsonHyperlegible.family,
-        )
-
-        assertThat(typography.labelSmall.letterSpacing).isEqualTo(0.1.sp)
-        assertThat(typography.labelMedium.letterSpacing).isEqualTo(0.1.sp)
-    }
-
     @Test
     fun `a null role keeps that role's default family while the other is applied`() {
         val plain = BundledFont.Lora.family

docs/PRIVACY.md

@@ -1,7 +1,7 @@
 ---
 title: Privacy Policy — Calendula
 description: What Calendula does with your data. It collects nothing, sends nothing, and has no internet permission at all.
-updated: 2026-09-15
+updated: 2026-07-28
 ---
 
 <!--
@@ -33,7 +33,7 @@ Calendula collects nothing, sends nothing, and has no user accounts. It has **no
 IT-Dienstleister | Jean-Luc Makiola  
 Mahlerstraße 10  
 14772 Brandenburg an der Havel  
-Email: [support@jeanlucmakiola.de](mailto:support@jeanlucmakiola.de)
+Email: [business@jeanlucmakiola.de](mailto:business@jeanlucmakiola.de)
 
 ## 2. No data collection
 

fastlane/metadata/android/en-US/changelogs/22004.txt

@@ -1,3 +0,0 @@
-Fixed
-• The app no longer reopens the event you last came in on. Opening an event from a reminder or a widget made it return to that event on every later launch, or show an error screen once the event was gone.
-• "Today" works in the Agenda again. It now scrolls the list back to today, and stays offered while you are scrolled away from it.

fdroid-metadata/de.jeanlucmakiola.calendula.yml

@@ -4,7 +4,7 @@ Name: Calendula
 Summary: A modern Material 3 Expressive calendar for Android.
 
 Categories:
-  - Calendar & Agenda
+  - Time
 
 SourceCode: https://codeberg.org/jlmakiola/calendula
 IssueTracker: https://codeberg.org/jlmakiola/calendula/issues