docs(fdroid): warn against premature submodules:true in official recipe

fdroidserver's initsubmodules() raises NoSubmodulesException on any build entry whose commit lacks .gitmodules, so `submodules: true` is a hard build failure on every release before the floret-kit submodule lands (verified 2026-06-28 against fdroiddata MR !41553). Document that it must be added only in the recipe entry targeting the first release that ships the floret-kit composite build. Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
2026-06-28 19:32:23 +02:00
26 changed files with 80 additions and 517 deletions
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,27 +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.12.0] — 2026-06-28
-
-### Added
- See past events your way. Two new settings change how events that have already
-  ended are shown. **Past events** (Settings → Appearance → Agenda) lets the
-  agenda — both in the app and the home-screen "Upcoming" widget — keep them as
-  usual, dim them, or hide them from the list entirely. **Dim completed events**
-  (Settings → Appearance) separately fades finished events in the month and week
-  views. Both are off by default, an event only counts as finished once it has
-  actually ended (events still in progress are never dimmed), and the lists
-  update on their own as the day goes on. Thanks to @ptab for the suggestion
-  ([#12]).
-
-### Changed
- Readable titles on overlapping events. In the week and day views, events that
-  overlap split a day into slim columns where the title used to be clipped to a
-  character or two. The title now wraps across as many lines as the block can
-  fit, and the time is hidden on those narrow blocks so the name can fill the
-  space — so you can tell events apart without opening each one. Thanks to @ptab
-  for the suggestion ([#13]).
-
 ## [2.11.2] — 2026-06-28

 ### Added
@@ -727,5 +706,3 @@ automatically, with zero telemetry and no internet permission.
 [#8]: https://codeberg.org/jlmakiola/calendula/issues/8
 [#9]: https://codeberg.org/jlmakiola/calendula/issues/9
 [#10]: https://codeberg.org/jlmakiola/calendula/issues/10
-[#12]: https://codeberg.org/jlmakiola/calendula/issues/12
-[#13]: https://codeberg.org/jlmakiola/calendula/issues/13
--- a/app/build.gradle.kts
+++ b/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 = 21200
-        versionName = "2.12.0"
+        versionCode = 21102
+        versionName = "2.11.2"

        testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
    }
@@ -90,8 +90,6 @@ android {

    buildFeatures {
        compose = true
-        // BuildConfig.DEBUG gates the in-app debug ribbon (see DebugRibbon).
-        buildConfig = true
    }

    // Don't embed AGP's dependency-metadata block in the APK signing block. It's
--- a/app/src/debug/res/values/colors.xml
+++ b/app/src/debug/res/values/colors.xml
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-    Debug-only launcher-icon background. Production is slate (#5C6B7A); the
-    debug build paints the adaptive-icon background burnt orange instead, so the
-    debug icon reads at a glance as "not the real app" on the home screen. The
-    off-white foreground mark contrasts on both. See drawable/ic_launcher_background.
-->
-<resources>
-    <color name="ic_launcher_background">#FFB23B00</color>
-</resources>
--- a/app/src/debug/res/values/strings.xml
+++ b/app/src/debug/res/values/strings.xml
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-    Debug-build resource overrides. Merged on top of src/main for the `debug`
-    build type only (release/releaseTest keep the production values), so the
-    debug app is unmistakable on the launcher: its own label, alongside the
-    real app thanks to the `.debug` applicationId suffix.
-->
-<resources>
-    <string name="app_name">Calendula Debug</string>
-</resources>
--- a/app/src/main/java/de/jeanlucmakiola/calendula/MainActivity.kt
+++ b/app/src/main/java/de/jeanlucmakiola/calendula/MainActivity.kt
@@ -8,7 +8,6 @@ import androidx.activity.compose.setContent
 import androidx.activity.enableEdgeToEdge
 import androidx.appcompat.app.AppCompatActivity
 import androidx.compose.foundation.isSystemInDarkTheme
-import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.runtime.CompositionLocalProvider
 import androidx.compose.runtime.getValue
@@ -30,7 +29,6 @@ import de.jeanlucmakiola.calendula.ui.common.LocalShowHourLines
 import de.jeanlucmakiola.calendula.ui.common.LocalUse24HourFormat
 import de.jeanlucmakiola.calendula.ui.WidgetNavRequest
 import de.jeanlucmakiola.calendula.ui.common.CalendarView
-import de.jeanlucmakiola.calendula.ui.common.DebugRibbon
 import de.jeanlucmakiola.calendula.ui.crash.CrashReportActivity
 import de.jeanlucmakiola.calendula.ui.crash.CrashReportDialog
 import de.jeanlucmakiola.calendula.ui.crash.submitCrashReport
@@ -103,24 +101,19 @@ class MainActivity : AppCompatActivity() {
                darkTheme = darkTheme,
                dynamicColor = settings.dynamicColor,
            ) {
-                Box(modifier = Modifier.fillMaxSize()) {
-                    CompositionLocalProvider(
-                        LocalUse24HourFormat provides use24Hour,
-                        LocalShowHourLines provides settings.showHourLines,
-                    ) {
-                        RootScreen(
-                            modifier = Modifier.fillMaxSize(),
-                            requestedDetailKey = requestedDetailKey,
-                            onDetailKeyConsumed = { requestedDetailKey = null },
-                            widgetNavRequest = requestedNav,
-                            onWidgetNavConsumed = { requestedNav = null },
-                            requestedImportUri = requestedImportUri,
-                            onImportConsumed = { requestedImportUri = null },
-                        )
-                    }
-                    // A persistent corner marker so a debug build is never
-                    // mistaken for the production app; compiled out of release.
-                    if (BuildConfig.DEBUG) DebugRibbon()
+                CompositionLocalProvider(
+                    LocalUse24HourFormat provides use24Hour,
+                    LocalShowHourLines provides settings.showHourLines,
+                ) {
+                    RootScreen(
+                        modifier = Modifier.fillMaxSize(),
+                        requestedDetailKey = requestedDetailKey,
+                        onDetailKeyConsumed = { requestedDetailKey = null },
+                        widgetNavRequest = requestedNav,
+                        onWidgetNavConsumed = { requestedNav = null },
+                        requestedImportUri = requestedImportUri,
+                        onImportConsumed = { requestedImportUri = null },
+                    )
                }
                pendingCrashReport?.let { report ->
                    CrashReportDialog(
--- a/app/src/main/java/de/jeanlucmakiola/calendula/data/calendar/EventWriteMapper.kt
+++ b/app/src/main/java/de/jeanlucmakiola/calendula/data/calendar/EventWriteMapper.kt
@@ -118,14 +118,8 @@ internal fun buildEventUpdateValues(
 * provider clone the series row and apply these on top. Unlike the series
 * update there is no dirty check — the exception is a fresh row, so every
 * form-backed column is written (empty optionals as explicit NULLs, since the
- * clone starts from the parent's values).
- *
- * The occurrence's length travels as DURATION, never DTEND: the provider
- * rejects DTEND on an exception outright (`CalendarProvider2`:
- * "Exceptions can't overwrite dtend") and derives the instance end from
- * DTSTART + DURATION itself, clearing the inherited RRULE in the process. This
- * matches how AOSP Calendar/Etar write exceptions; sending DTEND is what made
- * "only this event" fail on-device (Codeberg #16).
+ * clone starts from the parent's values). An exception is a single event:
+ * DTEND, never RRULE/DURATION.
 */
 internal fun buildOccurrenceExceptionValues(
    form: EventForm,
@@ -137,7 +131,7 @@ internal fun buildOccurrenceExceptionValues(
    put(CalendarContract.Events.TITLE, form.title.trim())
    put(CalendarContract.Events.ALL_DAY, if (form.isAllDay) 1 else 0)
    put(CalendarContract.Events.DTSTART, times.dtStartMillis)
-    put(CalendarContract.Events.DURATION, times.toRfc2445Duration(form.isAllDay))
+    put(CalendarContract.Events.DTEND, times.dtEndMillis)
    put(CalendarContract.Events.EVENT_TIMEZONE, times.timezone)
    put(CalendarContract.Events.AVAILABILITY, form.availability.toProviderValue())
    put(CalendarContract.Events.ACCESS_LEVEL, form.accessLevel.toProviderValue())
--- a/app/src/main/java/de/jeanlucmakiola/calendula/data/prefs/SettingsPrefs.kt
+++ b/app/src/main/java/de/jeanlucmakiola/calendula/data/prefs/SettingsPrefs.kt
@@ -38,19 +38,6 @@ sealed interface WeekStartPref {
 */
 enum class TimeFormatPref { AUTO, TWELVE_HOUR, TWENTY_FOUR_HOUR }

-/**
- * How the Agenda screen treats events that have already finished today: [SHOW]
- * leaves them as-is (the historical behaviour), [DIM] fades them, [HIDE] drops
- * them from the list entirely.
- */
-enum class PastEventDisplay { SHOW, DIM, HIDE }
-
-/** Parse a stored [PastEventDisplay.name]; unknown/null falls back to [default]. */
-fun parsePastEventDisplay(
-    stored: String?,
-    default: PastEventDisplay = PastEventDisplay.SHOW,
-): PastEventDisplay = PastEventDisplay.entries.firstOrNull { it.name == stored } ?: default
-
 /**
 * Resolve to a concrete 24-hour flag. AUTO defers to [systemIs24Hour] (the
 * device's `DateFormat.is24HourFormat` value).
@@ -129,31 +116,6 @@ class SettingsPrefs @Inject constructor(
        store.edit { it[SHOW_HOUR_LINES_KEY] = enabled }
    }

-    /**
-     * How the Agenda screen treats events that already ended today. Defaults to
-     * [PastEventDisplay.SHOW] — the historical behaviour; users opt into dimming
-     * or hiding.
-     */
-    val pastEventDisplay: Flow<PastEventDisplay> = store.data.map { prefs ->
-        prefs[PAST_EVENT_DISPLAY_KEY].toEnum(PastEventDisplay.SHOW)
-    }
-
-    suspend fun setPastEventDisplay(mode: PastEventDisplay) {
-        store.edit { it[PAST_EVENT_DISPLAY_KEY] = mode.name }
-    }
-
-    /**
-     * Whether the month/week grids fade events that have already finished.
-     * Defaults to OFF — independent of the Agenda's [pastEventDisplay].
-     */
-    val dimCompletedEvents: Flow<Boolean> = store.data.map { prefs ->
-        prefs[DIM_COMPLETED_EVENTS_KEY] ?: false
-    }
-
-    suspend fun setDimCompletedEvents(enabled: Boolean) {
-        store.edit { it[DIM_COMPLETED_EVENTS_KEY] = enabled }
-    }
-
    /**
     * How far ahead the in-app Agenda screen shows events (v2.11). Defaults to
     * [AgendaRange.Month] — a month of upcoming events. Independent of the
@@ -442,8 +404,6 @@ class SettingsPrefs @Inject constructor(
        internal val AGENDA_SHOW_RANGE_BAR_KEY = booleanPreferencesKey("agenda_show_range_bar")
        internal val TIME_FORMAT_KEY = stringPreferencesKey("time_format")
        internal val SHOW_HOUR_LINES_KEY = booleanPreferencesKey("show_hour_lines")
-        internal val PAST_EVENT_DISPLAY_KEY = stringPreferencesKey("agenda_past_event_display")
-        internal val DIM_COMPLETED_EVENTS_KEY = booleanPreferencesKey("dim_completed_events")
        internal val DEFAULT_VIEW_KEY = stringPreferencesKey("default_view")
        internal val FORM_FIELDS_KEY = stringPreferencesKey("event_form_default_fields")
        internal val AUTOFOCUS_EVENT_TITLE_KEY = booleanPreferencesKey("autofocus_event_title")
--- a/app/src/main/java/de/jeanlucmakiola/calendula/domain/Models.kt
+++ b/app/src/main/java/de/jeanlucmakiola/calendula/domain/Models.kt
@@ -40,14 +40,6 @@ data class EventInstance(
    val location: String?,
 )

-/**
- * Whether this event has finished relative to [now] — its end is at or before
- * the current instant. An in-progress event (already started but not yet ended)
- * is *not* considered ended. All-day events end at the exclusive next-midnight,
- * so they only count as ended once their day is fully over.
- */
-fun EventInstance.hasEnded(now: Instant): Boolean = end <= now
-
 data class EventDetail(
    val instance: EventInstance,
    val description: String?,
--- a/app/src/main/java/de/jeanlucmakiola/calendula/ui/agenda/AgendaScreen.kt
+++ b/app/src/main/java/de/jeanlucmakiola/calendula/ui/agenda/AgendaScreen.kt
@@ -45,7 +45,6 @@ import androidx.compose.runtime.rememberCoroutineScope
 import androidx.compose.runtime.setValue
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
-import androidx.compose.ui.draw.alpha
 import androidx.compose.ui.draw.clip
 import androidx.compose.ui.input.nestedscroll.nestedScroll
 import androidx.compose.ui.res.stringResource
@@ -54,9 +53,7 @@ import androidx.compose.ui.unit.dp
 import androidx.hilt.navigation.compose.hiltViewModel
 import androidx.lifecycle.compose.collectAsStateWithLifecycle
 import de.jeanlucmakiola.calendula.R
-import de.jeanlucmakiola.calendula.data.prefs.PastEventDisplay
 import de.jeanlucmakiola.calendula.domain.EventInstance
-import de.jeanlucmakiola.calendula.domain.hasEnded
 import de.jeanlucmakiola.calendula.ui.common.AgendaRangePicker
 import de.jeanlucmakiola.calendula.ui.common.agendaRangeLabel
 import de.jeanlucmakiola.calendula.ui.common.calendarAnimateItem
@@ -64,14 +61,12 @@ import de.jeanlucmakiola.calendula.ui.common.CalendarDrawer
 import de.jeanlucmakiola.calendula.ui.common.CalendarFabColumn
 import de.jeanlucmakiola.calendula.ui.common.CalendarFailure
 import de.jeanlucmakiola.calendula.ui.common.CalendarView
-import de.jeanlucmakiola.calendula.ui.common.EventDimAlpha
 import de.jeanlucmakiola.calendula.ui.common.GroupedRow
 import de.jeanlucmakiola.calendula.ui.common.Position
 import de.jeanlucmakiola.calendula.ui.common.ViewSwitcherPill
 import de.jeanlucmakiola.calendula.ui.common.next
 import de.jeanlucmakiola.calendula.ui.common.pastelize
 import de.jeanlucmakiola.calendula.ui.common.positionOf
-import de.jeanlucmakiola.calendula.ui.common.rememberCurrentMinute
 import de.jeanlucmakiola.calendula.ui.common.currentLocale
 import de.jeanlucmakiola.calendula.ui.common.LocalUse24HourFormat
 import de.jeanlucmakiola.calendula.ui.common.formatTimeOfDay
@@ -101,7 +96,6 @@ fun AgendaScreen(
 ) {
    val state by viewModel.state.collectAsStateWithLifecycle()
    val anchor by viewModel.anchor.collectAsStateWithLifecycle()
-    val pastDisplay by viewModel.pastEventDisplay.collectAsStateWithLifecycle()

    val scrollBehavior = TopAppBarDefaults.pinnedScrollBehavior()
    val drawerState = rememberDrawerState(DrawerValue.Closed)
@@ -184,7 +178,6 @@ fun AgendaScreen(
                }
                AgendaContent(
                    state = state,
-                    pastDisplay = pastDisplay,
                    onRetry = viewModel::goToToday,
                    onEventClick = onEventClick,
                    modifier = Modifier
@@ -282,7 +275,6 @@ private fun AgendaRangeBanner(
@Composable
 private fun AgendaContent(
    state: AgendaUiState,
-    pastDisplay: PastEventDisplay,
    onRetry: () -> Unit,
    onEventClick: (EventInstance) -> Unit,
    modifier: Modifier = Modifier,
@@ -292,42 +284,19 @@ private fun AgendaContent(
        is AgendaUiState.Failure -> Box(modifier) {
            CalendarFailure(reason = state.reason, onRetry = onRetry)
        }
-        is AgendaUiState.Success -> {
-            val now by rememberCurrentMinute()
-            // Hiding drops finished events — and any day they leave empty; dimming
-            // keeps them but fades the row. Recomputed each minute so events fall
-            // away (or fade) as they end while the screen stays open.
-            val days = if (pastDisplay == PastEventDisplay.HIDE) {
-                state.days.mapNotNull { day ->
-                    val remaining = day.events.filterNot { it.hasEnded(now) }
-                    if (remaining.isEmpty()) null else day.copy(events = remaining)
-                }
-            } else {
-                state.days
-            }
-            if (days.isEmpty()) {
+        is AgendaUiState.Success ->
+            if (state.days.isEmpty()) {
                AgendaEmpty(modifier)
            } else {
-                AgendaList(
-                    days = days,
-                    today = state.today,
-                    dimPast = pastDisplay == PastEventDisplay.DIM,
-                    now = now,
-                    onEventClick = onEventClick,
-                    modifier = modifier,
-                )
+                AgendaList(state = state, onEventClick = onEventClick, modifier = modifier)
            }
-        }
    }
 }

@OptIn(ExperimentalFoundationApi::class)
@Composable
 private fun AgendaList(
-    days: List<AgendaDay>,
-    today: LocalDate,
-    dimPast: Boolean,
-    now: Instant,
+    state: AgendaUiState.Success,
    onEventClick: (EventInstance) -> Unit,
    modifier: Modifier = Modifier,
 ) {
@@ -336,9 +305,9 @@ private fun AgendaList(
        // Bottom inset clears the FAB stack so the last row stays tappable.
        contentPadding = PaddingValues(top = 8.dp, bottom = 96.dp),
    ) {
-        days.forEach { day ->
+        state.days.forEach { day ->
            stickyHeader(key = "header-${day.date}") {
-                AgendaDayHeader(date = day.date, today = today)
+                AgendaDayHeader(date = day.date, today = state.today)
            }
            itemsIndexed(
                items = day.events,
@@ -347,7 +316,6 @@ private fun AgendaList(
                AgendaEventRow(
                    event = event,
                    position = positionOf(index, day.events.size),
-                    dimmed = dimPast && event.hasEnded(now),
                    modifier = calendarAnimateItem(),
                    onClick = { onEventClick(event) },
                )
@@ -380,14 +348,13 @@ private fun AgendaDayHeader(date: LocalDate, today: LocalDate) {
 private fun AgendaEventRow(
    event: EventInstance,
    position: Position,
-    dimmed: Boolean,
    modifier: Modifier = Modifier,
    onClick: () -> Unit,
 ) {
    val dark = isSystemInDarkTheme()
    val title = event.title.ifBlank { stringResource(R.string.event_untitled) }
    GroupedRow(
-        modifier = if (dimmed) modifier.alpha(EventDimAlpha) else modifier,
+        modifier = modifier,
        title = title,
        summary = agendaTimeSummary(event),
        position = position,
--- a/app/src/main/java/de/jeanlucmakiola/calendula/ui/agenda/AgendaViewModel.kt
+++ b/app/src/main/java/de/jeanlucmakiola/calendula/ui/agenda/AgendaViewModel.kt
@@ -5,7 +5,6 @@ import androidx.lifecycle.viewModelScope
 import dagger.hilt.android.lifecycle.HiltViewModel
 import de.jeanlucmakiola.calendula.data.calendar.CalendarRepository
 import de.jeanlucmakiola.calendula.data.di.IoDispatcher
-import de.jeanlucmakiola.calendula.data.prefs.PastEventDisplay
 import de.jeanlucmakiola.calendula.data.prefs.SettingsPrefs
 import de.jeanlucmakiola.calendula.data.prefs.resolveFirstDay
 import de.jeanlucmakiola.calendula.domain.CalendarSource
@@ -54,18 +53,6 @@ class AgendaViewModel @Inject constructor(
    private val weekStartDay = settingsPrefs.weekStart
        .map { it.resolveFirstDay(Locale.getDefault()) }

-    /**
-     * How to treat events that already ended today (show / dim / hide). A display
-     * concern only, so it rides alongside the data state rather than re-querying;
-     * the screen combines it with a per-minute "now" to fade or drop past rows.
-     */
-    val pastEventDisplay: StateFlow<PastEventDisplay> = settingsPrefs.pastEventDisplay
-        .stateIn(
-            scope = viewModelScope,
-            started = SharingStarted.WhileSubscribed(5_000L),
-            initialValue = PastEventDisplay.SHOW,
-        )
-
    private val zone = TimeZone.currentSystemDefault()

    private val todayDate: LocalDate
--- a/app/src/main/java/de/jeanlucmakiola/calendula/ui/common/DebugRibbon.kt
+++ b/app/src/main/java/de/jeanlucmakiola/calendula/ui/common/DebugRibbon.kt
@@ -1,50 +0,0 @@
-package de.jeanlucmakiola.calendula.ui.common
-
-import androidx.compose.foundation.background
-import androidx.compose.foundation.layout.BoxScope
-import androidx.compose.foundation.layout.offset
-import androidx.compose.foundation.layout.padding
-import androidx.compose.foundation.layout.width
-import androidx.compose.material3.Text
-import androidx.compose.runtime.Composable
-import androidx.compose.ui.Alignment
-import androidx.compose.ui.Modifier
-import androidx.compose.ui.draw.rotate
-import androidx.compose.ui.graphics.Color
-import androidx.compose.ui.text.font.FontWeight
-import androidx.compose.ui.text.style.TextAlign
-import androidx.compose.ui.unit.dp
-import androidx.compose.ui.unit.sp
-import androidx.compose.ui.zIndex
-
-/**
- * A Flutter-style "DEBUG" corner ribbon, drawn across the top-right corner of
- * the app. Deliberately a stark, un-themed marker (not a product component) so a
- * debug build is unmistakable at a glance — gate it on `BuildConfig.DEBUG` at the
- * call site so it never reaches a release build. Non-interactive: it's a plain
- * label with no pointer handler, so taps fall through to whatever is beneath it.
- *
- * Drop it in as the last child of a full-screen [androidx.compose.foundation.layout.Box]
- * so it overlays the UI.
- */
-@Composable
-fun BoxScope.DebugRibbon() {
-    Text(
-        text = "DEBUG",
-        color = Color.White,
-        fontSize = 10.sp,
-        fontWeight = FontWeight.Bold,
-        letterSpacing = 1.sp,
-        textAlign = TextAlign.Center,
-        modifier = Modifier
-            .align(Alignment.TopEnd)
-            .zIndex(1f)
-            // Push the band out so its midline crosses the very corner, then
-            // rotate it to the classic 45° ribbon.
-            .offset(x = 36.dp, y = 24.dp)
-            .rotate(45f)
-            .background(Color(0xFFB23B00))
-            .width(140.dp)
-            .padding(vertical = 2.dp),
-    )
-}
--- a/app/src/main/java/de/jeanlucmakiola/calendula/ui/common/NowLine.kt
+++ b/app/src/main/java/de/jeanlucmakiola/calendula/ui/common/NowLine.kt
@@ -34,7 +34,7 @@ private val LineThickness = 2.dp
 * the middle of a minute. Drives the "now" line in the day/week grids.
 */
@Composable
-fun rememberCurrentMinute(): State<Instant> {
+private fun rememberCurrentMinute(): State<Instant> {
    val instant = remember { mutableStateOf(Clock.System.now()) }
    LaunchedEffect(Unit) {
        while (true) {
--- a/app/src/main/java/de/jeanlucmakiola/calendula/ui/common/PastEvents.kt
+++ b/app/src/main/java/de/jeanlucmakiola/calendula/ui/common/PastEvents.kt
@@ -1,16 +0,0 @@
-package de.jeanlucmakiola.calendula.ui.common
-
-import androidx.compose.runtime.compositionLocalOf
-import kotlin.time.Instant
-
-/**
- * The cut-off instant before which a calendar event counts as "completed" and is
- * drawn dimmed in the month/week grids — i.e. the current wall-clock minute when
- * the "dim completed events" setting is on, or `null` when it is off (nothing
- * dims). Provided per grid screen so only the event chips that read it recompose
- * as the minute ticks, mirroring [LocalShowHourLines] / [LocalUse24HourFormat].
- */
-val LocalDimCutoff = compositionLocalOf<Instant?> { null }
-
-/** Opacity applied to a completed/past event chip when it is dimmed. */
-const val EventDimAlpha = 0.4f
--- a/app/src/main/java/de/jeanlucmakiola/calendula/ui/month/MonthScreen.kt
+++ b/app/src/main/java/de/jeanlucmakiola/calendula/ui/month/MonthScreen.kt
@@ -36,8 +36,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.CompositionLocalProvider
-import androidx.compose.runtime.derivedStateOf
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.mutableFloatStateOf
 import androidx.compose.runtime.mutableIntStateOf
@@ -46,7 +44,6 @@ import androidx.compose.runtime.rememberCoroutineScope
 import androidx.compose.runtime.setValue
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
-import androidx.compose.ui.draw.alpha
 import androidx.compose.ui.draw.clip
 import androidx.compose.ui.draw.clipToBounds
 import androidx.compose.ui.graphics.Color
@@ -63,14 +60,10 @@ import androidx.compose.ui.unit.dp
 import androidx.hilt.navigation.compose.hiltViewModel
 import androidx.lifecycle.compose.collectAsStateWithLifecycle
 import de.jeanlucmakiola.calendula.R
-import de.jeanlucmakiola.calendula.domain.hasEnded
 import de.jeanlucmakiola.calendula.ui.common.CalendarDrawer
 import de.jeanlucmakiola.calendula.ui.common.CalendarFabColumn
 import de.jeanlucmakiola.calendula.ui.common.CalendarFailure
 import de.jeanlucmakiola.calendula.ui.common.CalendarView
-import de.jeanlucmakiola.calendula.ui.common.EventDimAlpha
-import de.jeanlucmakiola.calendula.ui.common.LocalDimCutoff
-import de.jeanlucmakiola.calendula.ui.common.rememberCurrentMinute
 import de.jeanlucmakiola.calendula.ui.common.ViewSwitcherPill
 import de.jeanlucmakiola.calendula.ui.common.calendarSlideTransition
 import de.jeanlucmakiola.calendula.ui.common.rememberCalendarFadeSpec
@@ -104,14 +97,6 @@ fun MonthScreen(
    val state by viewModel.state.collectAsStateWithLifecycle()
    val month by viewModel.month.collectAsStateWithLifecycle()
    val weekStart by viewModel.weekStart.collectAsStateWithLifecycle()
-    val dimCompleted by viewModel.dimCompletedEvents.collectAsStateWithLifecycle()
-    // The instant before which an event counts as completed, or null when dimming
-    // is off. derivedStateOf keeps the per-minute "now" from recomposing the
-    // screen while the setting is off (it stays null regardless of the tick).
-    val nowState = rememberCurrentMinute()
-    val dimCutoff by remember(dimCompleted) {
-        derivedStateOf { if (dimCompleted) nowState.value else null }
-    }

    val scrollBehavior = TopAppBarDefaults.pinnedScrollBehavior()
    val drawerState = rememberDrawerState(DrawerValue.Closed)
@@ -208,16 +193,14 @@ fun MonthScreen(
                    .fillMaxSize(),
            ) {
                WeekdayHeader(weekStart = weekStart)
-                CompositionLocalProvider(LocalDimCutoff provides dimCutoff) {
-                    MonthContent(
-                        state = state,
-                        slideDir = slideDir,
-                        onSwipeNext = goNext,
-                        onSwipePrev = goPrev,
-                        onRetry = jumpToToday,
-                        onOpenDay = onOpenDay,
-                    )
-                }
+                MonthContent(
+                    state = state,
+                    slideDir = slideDir,
+                    onSwipeNext = goNext,
+                    onSwipePrev = goPrev,
+                    onRetry = jumpToToday,
+                    onOpenDay = onOpenDay,
+                )
            }
        }
    }
@@ -575,8 +558,6 @@ private fun MonthBar(
    modifier: Modifier = Modifier,
 ) {
    val title = event.title.ifBlank { stringResource(R.string.event_untitled) }
-    val dimCutoff = LocalDimCutoff.current
-    val dimmed = dimCutoff != null && event.hasEnded(dimCutoff)
    val shape = RoundedCornerShape(
        topStart = if (continuesLeft) 0.dp else 4.dp,
        bottomStart = if (continuesLeft) 0.dp else 4.dp,
@@ -584,7 +565,7 @@ private fun MonthBar(
        bottomEnd = if (continuesRight) 0.dp else 4.dp,
    )
    Box(
-        modifier = (if (dimmed) modifier.alpha(EventDimAlpha) else modifier)
+        modifier = modifier
            .background(pastelize(event.color, dark), shape)
            .padding(horizontal = 4.dp)
            .semantics { contentDescription = title },
--- a/app/src/main/java/de/jeanlucmakiola/calendula/ui/month/MonthViewModel.kt
+++ b/app/src/main/java/de/jeanlucmakiola/calendula/ui/month/MonthViewModel.kt
@@ -59,14 +59,6 @@ class MonthViewModel @Inject constructor(
            initialValue = DayOfWeek.MONDAY,
        )

-    /** Whether to fade events that have already finished (display concern only). */
-    val dimCompletedEvents: StateFlow<Boolean> = settingsPrefs.dimCompletedEvents
-        .stateIn(
-            scope = viewModelScope,
-            started = SharingStarted.WhileSubscribed(5_000L),
-            initialValue = false,
-        )
-
    private val todayDate: LocalDate
        get() = Clock.System.now().toLocalDateTime(zone).date

--- a/app/src/main/java/de/jeanlucmakiola/calendula/ui/settings/SettingsScreen.kt
+++ b/app/src/main/java/de/jeanlucmakiola/calendula/ui/settings/SettingsScreen.kt
@@ -86,7 +86,6 @@ import androidx.lifecycle.compose.collectAsStateWithLifecycle
 import de.jeanlucmakiola.calendula.R
 import de.jeanlucmakiola.calendula.data.crash.CrashReporter
 import de.jeanlucmakiola.calendula.data.prefs.CalendarReminderOverride
-import de.jeanlucmakiola.calendula.data.prefs.PastEventDisplay
 import de.jeanlucmakiola.calendula.data.prefs.ThemeMode
 import de.jeanlucmakiola.calendula.data.prefs.TimeFormatPref
 import de.jeanlucmakiola.calendula.data.prefs.WeekStartPref
@@ -476,7 +475,6 @@ private fun AppearanceScreen(
    var showDefaultView by remember { mutableStateOf(false) }
    var showAgendaScreenRange by remember { mutableStateOf(false) }
    var showAgendaWidgetRange by remember { mutableStateOf(false) }
-    var showPastEvents by remember { mutableStateOf(false) }

    CollapsingScaffold(
        title = stringResource(R.string.settings_section_appearance),
@@ -535,7 +533,7 @@ private fun AppearanceScreen(
        GroupedRow(
            title = stringResource(R.string.settings_hour_lines),
            summary = stringResource(R.string.settings_hour_lines_summary),
-            position = Position.Middle,
+            position = Position.Bottom,
            trailing = {
                Switch(
                    checked = state.showHourLines,
@@ -544,36 +542,16 @@ private fun AppearanceScreen(
            },
            onClick = { viewModel.setShowHourLines(!state.showHourLines) },
        )
-        GroupedRow(
-            title = stringResource(R.string.settings_dim_completed),
-            summary = stringResource(R.string.settings_dim_completed_summary),
-            position = Position.Bottom,
-            trailing = {
-                Switch(
-                    checked = state.dimCompletedEvents,
-                    onCheckedChange = viewModel::setDimCompletedEvents,
-                )
-            },
-            onClick = { viewModel.setDimCompletedEvents(!state.dimCompletedEvents) },
-        )

        Spacer(Modifier.height(16.dp))

-        // Agenda — the only group labelled, so its agenda-specific rows are easy
-        // to pick out among the otherwise unheadered Appearance settings.
-        SectionHeader(stringResource(R.string.settings_agenda_header))
+        // Agenda
        GroupedRow(
            title = stringResource(R.string.settings_agenda_range),
            summary = agendaRangeLabel(state.agendaScreenRange),
            position = Position.Top,
            onClick = { showAgendaScreenRange = true },
        )
-        GroupedRow(
-            title = stringResource(R.string.settings_past_events),
-            summary = pastEventDisplayLabel(state.pastEventDisplay),
-            position = Position.Middle,
-            onClick = { showPastEvents = true },
-        )
        GroupedRow(
            title = stringResource(R.string.settings_agenda_widget_range),
            summary = agendaRangeLabel(state.agendaWidgetRange),
@@ -642,16 +620,6 @@ private fun AppearanceScreen(
            onDismiss = { showTimeFormat = false },
        )
    }
-    if (showPastEvents) {
-        OptionPicker(
-            title = stringResource(R.string.settings_past_events),
-            options = PastEventDisplay.entries,
-            selected = state.pastEventDisplay,
-            label = { pastEventDisplayLabel(it) },
-            onSelect = viewModel::setPastEventDisplay,
-            onDismiss = { showPastEvents = false },
-        )
-    }
    if (showDefaultView) {
        OptionPicker(
            title = stringResource(R.string.settings_default_view),
@@ -1202,26 +1170,6 @@ private fun timeFormatLabel(pref: TimeFormatPref): String = stringResource(
    },
 )

-/** A small primary-coloured group label, matching the Calendars settings screen. */
-@Composable
-private fun SectionHeader(text: String) {
-    Text(
-        text = text,
-        style = MaterialTheme.typography.labelLarge,
-        color = MaterialTheme.colorScheme.primary,
-        modifier = Modifier.padding(start = 24.dp, end = 24.dp, top = 16.dp, bottom = 4.dp),
-    )
-}
-
-@Composable
-private fun pastEventDisplayLabel(mode: PastEventDisplay): String = stringResource(
-    when (mode) {
-        PastEventDisplay.SHOW -> R.string.settings_past_events_show
-        PastEventDisplay.DIM -> R.string.settings_past_events_dim
-        PastEventDisplay.HIDE -> R.string.settings_past_events_hide
-    },
-)
-
@Composable
 private fun languageLabel(tag: String?): String =
    if (tag == null) stringResource(R.string.settings_language_auto) else AppLanguage.displayName(tag)
--- a/app/src/main/java/de/jeanlucmakiola/calendula/ui/settings/SettingsUiState.kt
+++ b/app/src/main/java/de/jeanlucmakiola/calendula/ui/settings/SettingsUiState.kt
@@ -1,6 +1,5 @@
 package de.jeanlucmakiola.calendula.ui.settings

-import de.jeanlucmakiola.calendula.data.prefs.PastEventDisplay
 import de.jeanlucmakiola.calendula.data.prefs.SettingsPrefs
 import de.jeanlucmakiola.calendula.data.prefs.ThemeMode
 import de.jeanlucmakiola.calendula.data.prefs.TimeFormatPref
@@ -25,10 +24,6 @@ data class SettingsUiState(
    val timeFormat: TimeFormatPref = TimeFormatPref.AUTO,
    /** Whether the week/day timeline draws an hour separator line (v2.11). */
    val showHourLines: Boolean = false,
-    /** How the Agenda screen treats events that already ended today. */
-    val pastEventDisplay: PastEventDisplay = PastEventDisplay.SHOW,
-    /** Whether the month/week grids fade events that have already finished. */
-    val dimCompletedEvents: Boolean = false,
    /** How far ahead the in-app Agenda screen shows events (v2.11). */
    val agendaScreenRange: AgendaRange = AgendaRange.Month,
    /** How far ahead the agenda widget shows events (v2.11). */
--- a/app/src/main/java/de/jeanlucmakiola/calendula/ui/settings/SettingsViewModel.kt
+++ b/app/src/main/java/de/jeanlucmakiola/calendula/ui/settings/SettingsViewModel.kt
@@ -11,7 +11,6 @@ import dagger.hilt.android.lifecycle.HiltViewModel
 import dagger.hilt.android.qualifiers.ApplicationContext
 import de.jeanlucmakiola.calendula.data.calendar.CalendarRepository
 import de.jeanlucmakiola.calendula.data.prefs.CalendarReminderOverride
-import de.jeanlucmakiola.calendula.data.prefs.PastEventDisplay
 import de.jeanlucmakiola.calendula.data.prefs.SettingsPrefs
 import de.jeanlucmakiola.calendula.data.prefs.ThemeMode
 import de.jeanlucmakiola.calendula.data.prefs.TimeFormatPref
@@ -21,7 +20,6 @@ import de.jeanlucmakiola.calendula.domain.EventFormField
 import de.jeanlucmakiola.calendula.ui.agenda.AgendaRange
 import de.jeanlucmakiola.calendula.ui.agenda.storageValue
 import de.jeanlucmakiola.calendula.ui.common.CalendarView
-import de.jeanlucmakiola.calendula.widget.agenda.AGENDA_PAST_DISPLAY_KEY
 import de.jeanlucmakiola.calendula.widget.agenda.AGENDA_RANGE_KEY
 import de.jeanlucmakiola.calendula.widget.agenda.AgendaWidget
 import de.jeanlucmakiola.calendula.widget.month.MonthWidget
@@ -101,8 +99,6 @@ class SettingsViewModel @Inject constructor(
            combine(
                prefs.agendaShowRangeBar,
                prefs.autofocusEventTitle,
-                prefs.pastEventDisplay,
-                prefs.dimCompletedEvents,
                ::MiscSettings,
            ),
        ) { base, defaults, overrides, views, misc ->
@@ -114,8 +110,6 @@ class SettingsViewModel @Inject constructor(
                showHourLines = views.showHourLines,
                agendaShowRangeBar = misc.showRangeBar,
                autofocusEventTitle = misc.autofocusEventTitle,
-                pastEventDisplay = misc.pastEventDisplay,
-                dimCompletedEvents = misc.dimCompletedEvents,
                allowColorOnUnsupportedCalendars = defaults.allowColor,
                defaultReminderMinutes = defaults.defaultReminder,
                defaultAllDayReminderMinutes = defaults.allDayReminder,
@@ -162,8 +156,6 @@ class SettingsViewModel @Inject constructor(
    private data class MiscSettings(
        val showRangeBar: Boolean,
        val autofocusEventTitle: Boolean,
-        val pastEventDisplay: PastEventDisplay,
-        val dimCompletedEvents: Boolean,
    )

    fun setThemeMode(mode: ThemeMode) {
@@ -219,26 +211,6 @@ class SettingsViewModel @Inject constructor(
        viewModelScope.launch { prefs.setShowHourLines(enabled) }
    }

-    fun setPastEventDisplay(mode: PastEventDisplay) {
-        viewModelScope.launch {
-            prefs.setPastEventDisplay(mode)
-            // The agenda widget honours this setting too, so push it into each
-            // instance's Glance state and recompose — same reliable-update path as
-            // setAgendaWidgetRange (updateAll alone won't re-run the data preamble).
-            widgetRefreshMutex.withLock {
-                val manager = GlanceAppWidgetManager(appContext)
-                manager.getGlanceIds(AgendaWidget::class.java).forEach { id ->
-                    updateAppWidgetState(appContext, id) { it[AGENDA_PAST_DISPLAY_KEY] = mode.name }
-                }
-                AgendaWidget().updateAll(appContext)
-            }
-        }
-    }
-
-    fun setDimCompletedEvents(enabled: Boolean) {
-        viewModelScope.launch { prefs.setDimCompletedEvents(enabled) }
-    }
-
    fun setDefaultView(view: CalendarView) {
        viewModelScope.launch { prefs.setDefaultView(view) }
    }
--- a/app/src/main/java/de/jeanlucmakiola/calendula/ui/week/WeekScreen.kt
+++ b/app/src/main/java/de/jeanlucmakiola/calendula/ui/week/WeekScreen.kt
@@ -45,9 +45,7 @@ import androidx.compose.material3.TopAppBar
 import androidx.compose.material3.TopAppBarDefaults
 import androidx.compose.material3.rememberDrawerState
 import androidx.compose.runtime.Composable
-import androidx.compose.runtime.CompositionLocalProvider
 import androidx.compose.runtime.LaunchedEffect
-import androidx.compose.runtime.derivedStateOf
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.mutableFloatStateOf
 import androidx.compose.runtime.mutableIntStateOf
@@ -57,7 +55,6 @@ import androidx.compose.runtime.snapshotFlow
 import androidx.compose.runtime.setValue
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
-import androidx.compose.ui.draw.alpha
 import androidx.compose.ui.draw.clip
 import androidx.compose.ui.draw.clipToBounds
 import androidx.compose.ui.graphics.Color
@@ -76,15 +73,11 @@ import androidx.hilt.navigation.compose.hiltViewModel
 import androidx.lifecycle.compose.collectAsStateWithLifecycle
 import de.jeanlucmakiola.calendula.R
 import de.jeanlucmakiola.calendula.domain.EventInstance
-import de.jeanlucmakiola.calendula.domain.hasEnded
 import de.jeanlucmakiola.calendula.ui.common.CalendarDrawer
 import de.jeanlucmakiola.calendula.ui.common.CalendarFabColumn
 import de.jeanlucmakiola.calendula.ui.common.CalendarFailure
 import de.jeanlucmakiola.calendula.ui.common.CalendarView
-import de.jeanlucmakiola.calendula.ui.common.EventDimAlpha
-import de.jeanlucmakiola.calendula.ui.common.LocalDimCutoff
 import de.jeanlucmakiola.calendula.ui.common.NowLine
-import de.jeanlucmakiola.calendula.ui.common.rememberCurrentMinute
 import de.jeanlucmakiola.calendula.ui.common.ViewSwitcherPill
 import de.jeanlucmakiola.calendula.ui.common.calendarSlideTransition
 import de.jeanlucmakiola.calendula.ui.common.rememberCalendarFadeSpec
@@ -136,14 +129,6 @@ fun WeekScreen(
 ) {
    val state by viewModel.state.collectAsStateWithLifecycle()
    val weekStart by viewModel.weekStartDate.collectAsStateWithLifecycle()
-    val dimCompleted by viewModel.dimCompletedEvents.collectAsStateWithLifecycle()
-    // The instant before which an event counts as completed, or null when dimming
-    // is off. derivedStateOf keeps the per-minute "now" from recomposing the
-    // screen while the setting is off (it stays null regardless of the tick).
-    val nowState = rememberCurrentMinute()
-    val dimCutoff by remember(dimCompleted) {
-        derivedStateOf { if (dimCompleted) nowState.value else null }
-    }

    val scrollBehavior = TopAppBarDefaults.pinnedScrollBehavior()
    val drawerState = rememberDrawerState(DrawerValue.Closed)
@@ -236,21 +221,19 @@ fun WeekScreen(
                )
            },
        ) { innerPadding ->
-            CompositionLocalProvider(LocalDimCutoff provides dimCutoff) {
-                WeekContent(
-                    state = state,
-                    slideDir = slideDir,
-                    topSectionColor = topSectionColor,
-                    onSwipeNext = goNext,
-                    onSwipePrev = goPrev,
-                    onRetry = jumpToToday,
-                    onEventClick = onEventClick,
-                    onCreateAt = { d, minutes -> onCreateEvent(d, minutes) },
-                    modifier = Modifier
-                        .padding(innerPadding)
-                        .fillMaxSize(),
-                )
-            }
+            WeekContent(
+                state = state,
+                slideDir = slideDir,
+                topSectionColor = topSectionColor,
+                onSwipeNext = goNext,
+                onSwipePrev = goPrev,
+                onRetry = jumpToToday,
+                onEventClick = onEventClick,
+                onCreateAt = { d, minutes -> onCreateEvent(d, minutes) },
+                modifier = Modifier
+                    .padding(innerPadding)
+                    .fillMaxSize(),
+            )
        }
    }
 }
@@ -567,10 +550,8 @@ private fun AllDayBar(
    modifier: Modifier = Modifier,
 ) {
    val title = event.title.ifBlank { stringResource(R.string.event_untitled) }
-    val dimCutoff = LocalDimCutoff.current
-    val dimmed = dimCutoff != null && event.hasEnded(dimCutoff)
    Box(
-        modifier = (if (dimmed) modifier.alpha(EventDimAlpha) else modifier)
+        modifier = modifier
            .background(pastelize(event.color, dark), RoundedCornerShape(4.dp))
            .clickable(onClick = onClick)
            .padding(horizontal = 6.dp, vertical = 2.dp)
@@ -711,7 +692,6 @@ private fun DayColumnCard(
                EventBlock(
                    block = block,
                    dark = dark,
-                    height = height,
                    onClick = { onEventClick(block.event) },
                    modifier = Modifier
                        .offset(x = laneWidth * block.lane, y = top)
@@ -732,7 +712,6 @@ private fun DayColumnCard(
 private fun EventBlock(
    block: TimedBlock,
    dark: Boolean,
-    height: Dp,
    onClick: () -> Unit,
    modifier: Modifier = Modifier,
 ) {
@@ -741,26 +720,9 @@ private fun EventBlock(
    val locale = currentLocale()
    val timeLabel = "${minToHm(block.startMin, use24Hour, locale)}–" +
        minToHm(block.endMin, use24Hour, locale)
-    // 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.
-    val showTime = block.endMin - block.startMin >= 45 && block.laneCount == 1
-    val density = LocalDensity.current
-    val titleLineHeight = with(density) {
-        MaterialTheme.typography.labelMedium.lineHeight.toDp()
-    }
-    val timeLineHeight = with(density) {
-        MaterialTheme.typography.labelSmall.lineHeight.toDp()
-    }
-    // Wrap the title across as many lines as the block can fit (minus the 2.dp
-    // top/bottom padding and the reserved time line) instead of clipping it to a
-    // single character on slim, overlapping blocks.
-    val contentHeight = height - 4.dp - if (showTime) timeLineHeight else 0.dp
-    val titleMaxLines = (contentHeight / titleLineHeight).toInt().coerceAtLeast(1)
-    val dimCutoff = LocalDimCutoff.current
-    val dimmed = dimCutoff != null && block.event.hasEnded(dimCutoff)
+    val showTime = block.endMin - block.startMin >= 45
    Box(
-        modifier = (if (dimmed) modifier.alpha(EventDimAlpha) else modifier)
+        modifier = modifier
            .background(pastelize(block.event.color, dark), RoundedCornerShape(4.dp))
            .clickable(onClick = onClick)
            .padding(horizontal = 4.dp, vertical = 2.dp)
@@ -770,15 +732,18 @@ private fun EventBlock(
            Text(
                text = title,
                style = MaterialTheme.typography.labelMedium,
-                maxLines = titleMaxLines,
+                maxLines = if (showTime) 1 else 2,
                overflow = TextOverflow.Ellipsis,
                color = Color.Black.copy(alpha = 0.85f),
            )
            if (showTime) {
+                // Narrow columns can't fit "13:00–14:00" on one line, so let it
+                // wrap to a second line (after the dash) instead of clipping the
+                // end time.
                Text(
                    text = timeLabel,
                    style = MaterialTheme.typography.labelSmall,
-                    maxLines = 1,
+                    maxLines = 2,
                    overflow = TextOverflow.Ellipsis,
                    color = Color.Black.copy(alpha = 0.6f),
                )
--- a/app/src/main/java/de/jeanlucmakiola/calendula/ui/week/WeekViewModel.kt
+++ b/app/src/main/java/de/jeanlucmakiola/calendula/ui/week/WeekViewModel.kt
@@ -50,14 +50,6 @@ class WeekViewModel @Inject constructor(
    private val zone = TimeZone.currentSystemDefault()
    private val locale: Locale = Locale.getDefault()

-    /** Whether to fade events that have already finished (display concern only). */
-    val dimCompletedEvents: StateFlow<Boolean> = settingsPrefs.dimCompletedEvents
-        .stateIn(
-            scope = viewModelScope,
-            started = SharingStarted.WhileSubscribed(5_000L),
-            initialValue = false,
-        )
-
    private val todayDate: LocalDate
        get() = Clock.System.now().toLocalDateTime(zone).date

--- a/app/src/main/java/de/jeanlucmakiola/calendula/widget/WidgetData.kt
+++ b/app/src/main/java/de/jeanlucmakiola/calendula/widget/WidgetData.kt
@@ -4,7 +4,6 @@ import android.Manifest
 import android.content.Context
 import android.content.pm.PackageManager
 import androidx.core.content.ContextCompat
-import de.jeanlucmakiola.calendula.data.prefs.PastEventDisplay
 import de.jeanlucmakiola.calendula.data.prefs.is24Hour
 import de.jeanlucmakiola.calendula.data.prefs.resolveFirstDay
 import de.jeanlucmakiola.calendula.domain.EventInstance
@@ -25,7 +24,6 @@ import kotlinx.datetime.toInstant
 import kotlinx.datetime.toLocalDateTime
 import java.util.Locale
 import kotlin.time.Clock
-import kotlin.time.Instant

 /**
 * How far either side of today the month widget pre-loads. The displayed month
@@ -54,8 +52,6 @@ sealed interface AgendaWidgetData {
         * range is sliced from this in the composition (read reactively from
         * Glance state), so a range change is pure recomposition rather than a
         * flaky widget session restart — the same approach the month widget uses.
-         * Kept unfiltered: hiding/dimming finished events also happens reactively
-         * in the composition, against [now], for the same reliable-update reason.
         */
        val days: List<AgendaDay>,
        /** Resolved clock convention for event time labels (the time-format pref). */
@@ -64,10 +60,6 @@ sealed interface AgendaWidgetData {
        val weekStart: DayOfWeek,
        /** Saved range pref — the fallback when an instance has no Glance state yet. */
        val savedRange: AgendaRange,
-        /** Saved past-event display pref — the fallback before Glance state is set. */
-        val savedPastDisplay: PastEventDisplay,
-        /** Snapshot instant the data was read at, for "has this event ended?" tests. */
-        val now: Instant,
    ) : AgendaWidgetData
 }

@@ -116,7 +108,6 @@ internal suspend fun Context.loadAgendaWidgetData(): AgendaWidgetData {
    val ep = widgetEntryPoint()
    val prefs = ep.settingsPrefs()
    val savedRange = prefs.agendaWidgetRange.first()
-    val savedPastDisplay = prefs.pastEventDisplay.first()
    val weekStart = prefs.weekStart.first().resolveFirstDay(Locale.getDefault())
    // Load the widest selectable window once; the displayed range is sliced in
    // the composition from Glance state, so changing the range is a plain
@@ -131,8 +122,6 @@ internal suspend fun Context.loadAgendaWidgetData(): AgendaWidgetData {
        is24Hour = is24Hour,
        weekStart = weekStart,
        savedRange = savedRange,
-        savedPastDisplay = savedPastDisplay,
-        now = Clock.System.now(),
    )
 }

--- a/app/src/main/java/de/jeanlucmakiola/calendula/widget/agenda/AgendaWidget.kt
+++ b/app/src/main/java/de/jeanlucmakiola/calendula/widget/agenda/AgendaWidget.kt
@@ -43,15 +43,11 @@ import androidx.glance.text.Text
 import androidx.glance.text.TextStyle
 import de.jeanlucmakiola.calendula.MainActivity
 import de.jeanlucmakiola.calendula.R
-import de.jeanlucmakiola.calendula.data.prefs.PastEventDisplay
-import de.jeanlucmakiola.calendula.data.prefs.parsePastEventDisplay
 import de.jeanlucmakiola.calendula.domain.EventInstance
-import de.jeanlucmakiola.calendula.domain.hasEnded
 import de.jeanlucmakiola.calendula.ui.agenda.AgendaRange
 import de.jeanlucmakiola.calendula.ui.agenda.dayCount
 import de.jeanlucmakiola.calendula.ui.agenda.parseAgendaRange
 import de.jeanlucmakiola.calendula.ui.common.CalendarView
-import de.jeanlucmakiola.calendula.ui.common.EventDimAlpha
 import de.jeanlucmakiola.calendula.ui.common.formatTimeOfDay
 import de.jeanlucmakiola.calendula.ui.common.pastelize
 import de.jeanlucmakiola.calendula.widget.AgendaWidgetData
@@ -83,14 +79,6 @@ import java.util.Locale
 */
 internal val AGENDA_RANGE_KEY = stringPreferencesKey("agenda_range")

-/**
- * Per-instance Glance state key holding the past-event display mode (as
- * [PastEventDisplay.name]). Read reactively in the composition for the same
- * reason as [AGENDA_RANGE_KEY] — so toggling the setting reflects on the live
- * widget without depending on the `provideGlance` preamble re-running.
- */
-internal val AGENDA_PAST_DISPLAY_KEY = stringPreferencesKey("agenda_past_display")
-
 class AgendaWidget : GlanceAppWidget() {

    override val stateDefinition = PreferencesGlanceStateDefinition
@@ -137,26 +125,11 @@ private fun AgendaWidgetBody(data: AgendaWidgetData, dark: Boolean) {
                // to the saved pref for a freshly placed widget), then the wide
                // pre-loaded window is sliced to it — pure recomposition.
                val range = parseAgendaRange(currentState(AGENDA_RANGE_KEY), data.savedRange)
-                val pastDisplay =
-                    parsePastEventDisplay(currentState(AGENDA_PAST_DISPLAY_KEY), data.savedPastDisplay)
                val rangeEnd = data.today.plus(
                    range.dayCount(data.today, data.weekStart) - 1,
                    DateTimeUnit.DAY,
                )
-                // Slice to the chosen range, then drop finished events (and any day
-                // they leave empty) when the mode is Hide — so "Upcoming" really is.
-                val visibleDays = data.days
-                    .filter { it.date <= rangeEnd }
-                    .let { days ->
-                        if (pastDisplay == PastEventDisplay.HIDE) {
-                            days.mapNotNull { day ->
-                                val remaining = day.events.filterNot { it.hasEnded(data.now) }
-                                if (remaining.isEmpty()) null else day.copy(events = remaining)
-                            }
-                        } else {
-                            days
-                        }
-                    }
+                val visibleDays = data.days.filter { it.date <= rangeEnd }
                if (visibleDays.isEmpty()) {
                    WidgetMessage(R.string.agenda_empty_title)
                } else {
@@ -170,13 +143,7 @@ private fun AgendaWidgetBody(data: AgendaWidgetData, dark: Boolean) {
                        items(rows.size) { index ->
                            when (val row = rows[index]) {
                                is AgendaRow.Header -> DayHeaderRow(row.date, row.today)
-                                is AgendaRow.Event -> EventRow(
-                                    event = row.event,
-                                    dark = dark,
-                                    is24Hour = data.is24Hour,
-                                    dimmed = pastDisplay == PastEventDisplay.DIM &&
-                                        row.event.hasEnded(data.now),
-                                )
+                                is AgendaRow.Event -> EventRow(row.event, dark, data.is24Hour)
                            }
                        }
                    }
@@ -257,15 +224,9 @@ private fun DayHeaderRow(date: LocalDate, today: LocalDate) {
 }

@Composable
-private fun EventRow(event: EventInstance, dark: Boolean, is24Hour: Boolean, dimmed: Boolean) {
+private fun EventRow(event: EventInstance, dark: Boolean, is24Hour: Boolean) {
    val context = androidx.glance.LocalContext.current
    val title = event.title.ifBlank { context.getString(R.string.event_untitled) }
-    // Glance has no generic alpha modifier, so dim by fading the colour stripe and
-    // dropping both text lines to the lower-emphasis on-surface-variant tone.
-    val stripeColor = pastelize(event.color, dark).let {
-        if (dimmed) it.copy(alpha = EventDimAlpha) else it
-    }
-    val titleColor = if (dimmed) GlanceTheme.colors.onSurfaceVariant else GlanceTheme.colors.onSurface
    Row(
        modifier = GlanceModifier
            .fillMaxWidth()
@@ -288,14 +249,14 @@ private fun EventRow(event: EventInstance, dark: Boolean, is24Hour: Boolean, dim
                .width(5.dp)
                .height(36.dp)
                .cornerRadius(3.dp)
-                .background(stripeColor),
+                .background(pastelize(event.color, dark)),
        ) {}
        Spacer(GlanceModifier.width(10.dp))
        Column(modifier = GlanceModifier.defaultWeight()) {
            Text(
                text = title,
                maxLines = 1,
-                style = TextStyle(color = titleColor, fontSize = 14.sp),
+                style = TextStyle(color = GlanceTheme.colors.onSurface, fontSize = 14.sp),
            )
            Text(
                text = eventTimeSummary(context, event, is24Hour),
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -282,13 +282,6 @@
    <string name="settings_time_format_24h">24-hour (14:00)</string>
    <string name="settings_hour_lines">Hour lines</string>
    <string name="settings_hour_lines_summary">Show a separator line at each hour in week and day view</string>
-    <string name="settings_dim_completed">Dim completed events</string>
-    <string name="settings_dim_completed_summary">Fade events that have already ended in month and week view</string>
-    <string name="settings_past_events">Past events</string>
-    <string name="settings_past_events_show">Show</string>
-    <string name="settings_past_events_dim">Dim</string>
-    <string name="settings_past_events_hide">Hide</string>
-    <string name="settings_agenda_header">Agenda</string>
    <string name="settings_agenda_range">Agenda range</string>
    <string name="settings_agenda_range_hint">How far ahead the Agenda screen lists events.</string>
    <string name="settings_agenda_widget_range">Agenda widget range</string>
--- a/app/src/test/java/de/jeanlucmakiola/calendula/data/calendar/EventWriteMapperTest.kt
+++ b/app/src/test/java/de/jeanlucmakiola/calendula/data/calendar/EventWriteMapperTest.kt
@@ -199,12 +199,11 @@ class EventWriteMapperTest {
        assertThat(values[CalendarContract.Events.TITLE]).isEqualTo("Moved")
        assertThat(values[CalendarContract.Events.EVENT_LOCATION]).isEqualTo("Berlin")
        assertThat(values[CalendarContract.Events.DTSTART]).isEqualTo(1_781_164_800_000L)
-        // The occurrence's length travels as DURATION, never DTEND — the provider
-        // rejects DTEND on an exception ("Exceptions can't overwrite dtend") and
-        // derives the end from DTSTART + DURATION, clearing the inherited RRULE.
-        assertThat(values[CalendarContract.Events.DURATION]).isEqualTo("P5400S")
-        assertThat(values).doesNotContainKey(CalendarContract.Events.DTEND)
+        assertThat(values[CalendarContract.Events.DTEND])
+            .isEqualTo(1_781_164_800_000L + 5_400_000L)
+        // A single occurrence never carries its own rule.
        assertThat(values).doesNotContainKey(CalendarContract.Events.RRULE)
+        assertThat(values).doesNotContainKey(CalendarContract.Events.DURATION)
    }

    @Test
--- a/docs/fdroid-official/de.jeanlucmakiola.calendula.yml
+++ b/docs/fdroid-official/de.jeanlucmakiola.calendula.yml
@@ -48,6 +48,19 @@ Builds:
    # No NDK / no flavors. The release buildType applies a signingConfig only
    # when key.properties exists; on the buildserver it does not, so this
    # produces the unsigned APK F-Droid compares against our binary.
+    #
+    # DO NOT add `submodules: true` here ahead of need. fdroidserver's
+    # initsubmodules() RAISES NoSubmodulesException ("No git submodules
+    # available") on any build entry whose commit has no `.gitmodules`, so
+    # `submodules: true` is a HARD BUILD FAILURE — not a no-op — on every
+    # release before the floret-kit submodule lands. (Verified 2026-06-28: it
+    # broke the fdroid build / checkupdates / check-source-code jobs on
+    # fdroiddata MR !41553; confirmed locally with the fdroidserver-master
+    # fetchsrclibs path.) Add `submodules: true` ONLY in the recipe entry that
+    # targets the FIRST release actually shipping the `floret-kit` git submodule
+    # (composite build via `includeBuild("floret-kit")`, core-time refactor on
+    # branch `chore/floret-kit-core-time`) — and only there. From that entry on
+    # it becomes the AutoUpdateMode template and propagates to future builds.

 # SHA-256 of our app signing certificate (public; embedded in every published
 # APK). Locks F-Droid to publish only binaries signed with our key.
--- a/fastlane/metadata/android/en-US/changelogs/21200.txt
+++ b/fastlane/metadata/android/en-US/changelogs/21200.txt
@@ -1,19 +0,0 @@
-### Added
- See past events your way. Two new settings change how events that have already
-  ended are shown. **Past events** (Settings → Appearance → Agenda) lets the
-  agenda — both in the app and the home-screen "Upcoming" widget — keep them as
-  usual, dim them, or hide them from the list entirely. **Dim completed events**
-  (Settings → Appearance) separately fades finished events in the month and week
-  views. Both are off by default, an event only counts as finished once it has
-  actually ended (events still in progress are never dimmed), and the lists
-  update on their own as the day goes on. Thanks to @ptab for the suggestion
-  ([#12]).
-
-### Changed
- Readable titles on overlapping events. In the week and day views, events that
-  overlap split a day into slim columns where the title used to be clipped to a
-  character or two. The title now wraps across as many lines as the block can
-  fit, and the time is hidden on those narrow blocks so the name can fill the
-  space — so you can tell events apart without opening each one. Thanks to @ptab
-  for the suggestion ([#13]).
-