Draw core-time from floret-kit (TimeBridge) via submodule + composite build

Phase 1 of the shared-kit plan: Calendula becomes the second core-time consumer.
floret-kit is embedded as a git submodule and wired with includeBuild, so the
app depends on de.jeanlucmakiola.floret:core-time and Gradle substitutes the
local source module (built from source).

- Remove the app's TimeBridge (Instant <-> epoch millis) + its test; the helpers
  now live in core-time. Repoint the 7 call sites to de.jeanlucmakiola.floret.time.
- Calendula's richer time formatting (TimeFormat, 24h CompositionLocal) stays
  app-local by design.

Reproducible-build handling (Calendula publishes via official F-Droid repro):
- Pin the submodule to a foojay-free kit commit (the resolver would let a build
  fetch a JDK -> non-reproducible; the kit never used a toolchain block).
- Harden scripts/check_reproducible_release.sh to scan the included build's
  Gradle scripts for the toolchain-resolver invariant.
- Draft fdroiddata recipe: submodules: true (else F-Droid checks out an empty
  floret-kit/ and the from-source build fails).
- CI build checkouts fetch submodules recursively.

Clean composite build + unit tests + lintDebug + repro guard all green.

Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>

.gitea/workflows/ci.yaml

@@ -26,6 +26,8 @@ jobs:
     steps:
       - name: Checkout
         uses: actions/checkout@v4
+          with:
+            submodules: recursive
         with:
           # Full history so the base..HEAD diff below has a merge-base.
           fetch-depth: 0

.gitea/workflows/release.yaml

@@ -33,6 +33,8 @@ jobs:
     steps:
       - name: Checkout
         uses: actions/checkout@v4
+          with:
+            submodules: recursive
 
       - name: Resolve version and whether it is a new release
         id: v
@@ -82,6 +84,8 @@ jobs:
     steps:
       - name: Checkout
         uses: actions/checkout@v4
+          with:
+            submodules: recursive
 
       - name: Setup Java
         uses: actions/setup-java@v4

.gitmodules

@@ -0,0 +1,3 @@
+[submodule "floret-kit"]
+	path = floret-kit
+	url = https://gitea.jeanlucmakiola.de/makiolaj/floret-kit.git

CHANGELOG.md

@@ -5,15 +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.11.1] — 2026-06-28
-
-### Fixed
-- Calendula can now be set as your default calendar app. It registers the
-  calendar-app intent filters the system uses, so it appears in the chooser when
-  you tap a date in a launcher or clock — and opening one takes you straight to
-  that day. Android has no way for an app to make itself the default, so you pick
-  it once from the system picker. Thanks to @abrossimow for the report ([#9]).
-
 ## [2.11.0] — 2026-06-27
 
 ### Added
@@ -694,4 +685,3 @@ automatically, with zero telemetry and no internet permission.
 [#6]: https://codeberg.org/jlmakiola/calendula/issues/6
 [#7]: https://codeberg.org/jlmakiola/calendula/issues/7
 [#8]: https://codeberg.org/jlmakiola/calendula/issues/8
-[#9]: https://codeberg.org/jlmakiola/calendula/issues/9

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 = 21101
+        versionCode = 21100
-        versionName = "2.11.1"
+        versionName = "2.11.0"
 
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
     }
@@ -159,6 +159,7 @@ dependencies {
     implementation(libs.androidx.glance.material3)
 
     implementation(libs.kotlinx.datetime)
+    implementation("de.jeanlucmakiola.floret:core-time")
     implementation(libs.kotlinx.coroutines.core)
 
     debugImplementation(libs.androidx.ui.tooling)

app/src/main/AndroidManifest.xml

@@ -59,35 +59,6 @@
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
 
-            <!-- Be selectable as the system calendar app. Android has no API for
-                 an app to make itself the default, so registering the filters
-                 launchers and the OS use is what lets the user pick Calendula
-                 from the system chooser when a date action fires (issue #9).
-                 APP_CALENDAR is the "open the calendar app" action; the VIEW
-                 filters below catch a tapped date. -->
-            <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <category android:name="android.intent.category.DEFAULT" />
-                <category android:name="android.intent.category.APP_CALENDAR" />
-            </intent-filter>
-            <!-- A launcher/clock date tap fires ACTION_VIEW on the provider's
-                 time Uri (content://com.android.calendar/time/<epochMillis>);
-                 some surfaces use the time/epoch mime type. We open the day view
-                 on that date (MainActivity.calendarTimeDateOrNull). -->
-            <intent-filter>
-                <action android:name="android.intent.action.VIEW" />
-                <category android:name="android.intent.category.DEFAULT" />
-                <data
-                    android:scheme="content"
-                    android:host="com.android.calendar"
-                    android:pathPrefix="/time" />
-            </intent-filter>
-            <intent-filter>
-                <action android:name="android.intent.action.VIEW" />
-                <category android:name="android.intent.category.DEFAULT" />
-                <data android:mimeType="time/epoch" />
-            </intent-filter>
-
             <!-- Open a .ics file (file manager / email attachment / browser). -->
             <intent-filter>
                 <action android:name="android.intent.action.VIEW" />

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

@@ -35,9 +35,6 @@ import de.jeanlucmakiola.calendula.ui.crash.submitCrashReport
 import de.jeanlucmakiola.calendula.ui.settings.SettingsViewModel
 import de.jeanlucmakiola.calendula.ui.theme.CalendulaTheme
 import kotlinx.datetime.LocalDate
-import kotlinx.datetime.TimeZone
-import kotlinx.datetime.toLocalDateTime
-import kotlin.time.Instant
 
 @AndroidEntryPoint
 class MainActivity : AppCompatActivity() {
@@ -159,33 +156,10 @@ class MainActivity : AppCompatActivity() {
             Intent.ACTION_SEND -> IntentCompat.getParcelableExtra(this, Intent.EXTRA_STREAM, Uri::class.java)
             else -> null
         } ?: return null
-        // The calendar "view time" Uri (a date tap) is also ACTION_VIEW/content;
-        // it's a navigation, not a file to import, so [navRequestOrNull] owns it.
-        if (uri.host == CALENDAR_PROVIDER_HOST) return null
         return uri.takeIf { it.scheme == "content" || it.scheme == "file" }
     }
 
-    /**
-     * The date a launcher/clock date tap points at, parsed from the AOSP calendar
-     * "view time" intent: ACTION_VIEW on `content://com.android.calendar/time/
-     * <epochMillis>`. Null for any other intent. The matching manifest filter is
-     * what lets users pick Calendula from the system calendar chooser (issue #9).
-     */
-    private fun Intent.calendarTimeDateOrNull(): LocalDate? {
-        if (action != Intent.ACTION_VIEW) return null
-        val uri = data ?: return null
-        if (uri.host != CALENDAR_PROVIDER_HOST) return null
-        val segments = uri.pathSegments
-        if (segments.firstOrNull() != "time") return null
-        val millis = segments.getOrNull(1)?.toLongOrNull() ?: return null
-        return Instant.fromEpochMilliseconds(millis)
-            .toLocalDateTime(TimeZone.currentSystemDefault()).date
-    }
-
     private fun Intent.navRequestOrNull(): WidgetNavRequest? {
-        // An external date tap (launcher/clock) has no widget source, so it opens
-        // the day view rooted over the default home view (OpenDate source = null).
-        calendarTimeDateOrNull()?.let { return WidgetNavRequest.OpenDate(it.toString(), source = null) }
         val source = sourceViewOrNull()
         val eventId = getLongExtra(EXTRA_EVENT_ID, -1L)
         return when {
@@ -227,10 +201,6 @@ class MainActivity : AppCompatActivity() {
     }
 
     companion object {
-        // The calendar provider's authority/host. A date tap arrives as
-        // ACTION_VIEW on content://com.android.calendar/time/<epochMillis>.
-        private const val CALENDAR_PROVIDER_HOST = "com.android.calendar"
-
         private const val EXTRA_EVENT_ID = "de.jeanlucmakiola.calendula.extra.EVENT_ID"
         private const val EXTRA_BEGIN_MILLIS = "de.jeanlucmakiola.calendula.extra.BEGIN"
         private const val EXTRA_END_MILLIS = "de.jeanlucmakiola.calendula.extra.END"

app/src/main/java/de/jeanlucmakiola/calendula/data/calendar/CalendarDataSource.kt

@@ -1,5 +1,7 @@
 package de.jeanlucmakiola.calendula.data.calendar
 
+import de.jeanlucmakiola.floret.time.toEpochMillis
+import de.jeanlucmakiola.floret.time.toKotlinInstantFromEpochMillis
 import android.Manifest
 import android.content.ContentResolver
 import android.content.ContentUris

app/src/main/java/de/jeanlucmakiola/calendula/data/calendar/CalendarRepositoryImpl.kt

@@ -1,5 +1,6 @@
 package de.jeanlucmakiola.calendula.data.calendar
 
+import de.jeanlucmakiola.floret.time.toEpochMillis
 import de.jeanlucmakiola.calendula.data.di.IoDispatcher
 import de.jeanlucmakiola.calendula.data.prefs.CalendarPrefs
 import de.jeanlucmakiola.calendula.data.prefs.SettingsPrefs

app/src/main/java/de/jeanlucmakiola/calendula/data/calendar/EventDetailMapper.kt

@@ -1,5 +1,6 @@
 package de.jeanlucmakiola.calendula.data.calendar
 
+import de.jeanlucmakiola.floret.time.toKotlinInstantFromEpochMillis
 import android.provider.CalendarContract
 import android.util.Log
 import de.jeanlucmakiola.calendula.domain.AccessLevel

app/src/main/java/de/jeanlucmakiola/calendula/data/calendar/IcsExportMapper.kt

@@ -1,5 +1,6 @@
 package de.jeanlucmakiola.calendula.data.calendar
 
+import de.jeanlucmakiola.floret.time.toKotlinInstantFromEpochMillis
 import de.jeanlucmakiola.calendula.domain.EventStatus
 import de.jeanlucmakiola.calendula.domain.ics.IcsEvent
 import de.jeanlucmakiola.calendula.domain.ics.deriveIcsUid

app/src/main/java/de/jeanlucmakiola/calendula/data/calendar/InstanceMapper.kt

@@ -1,5 +1,6 @@
 package de.jeanlucmakiola.calendula.data.calendar
 
+import de.jeanlucmakiola.floret.time.toKotlinInstantFromEpochMillis
 import android.util.Log
 import de.jeanlucmakiola.calendula.domain.EventInstance
 

app/src/main/java/de/jeanlucmakiola/calendula/data/calendar/SearchMapper.kt

@@ -1,5 +1,6 @@
 package de.jeanlucmakiola.calendula.data.calendar
 
+import de.jeanlucmakiola.floret.time.toKotlinInstantFromEpochMillis
 import de.jeanlucmakiola.calendula.domain.EventInstance
 import de.jeanlucmakiola.calendula.domain.ics.parseRfc2445DurationMillis
 

app/src/main/java/de/jeanlucmakiola/calendula/data/calendar/TimeBridge.kt

@@ -1,7 +0,0 @@
-package de.jeanlucmakiola.calendula.data.calendar
-
-import kotlin.time.Instant
-
-fun Long.toKotlinInstantFromEpochMillis(): Instant = Instant.fromEpochMilliseconds(this)
-
-fun Instant.toEpochMillis(): Long = toEpochMilliseconds()

app/src/main/java/de/jeanlucmakiola/calendula/ui/CalendarHost.kt

@@ -196,9 +196,7 @@ fun CalendarHost(
                 dismissCoveringOverlays()
                 createDateIso = null
                 pendingDayIso = req.dateIso
-                // No widget source (an external date tap) roots over the default
+                viewStack = viewBaseStack(defaultView, req.source).drillToDay()
-                // home view, so backing out of the day returns home then exits.
-                viewStack = viewBaseStack(defaultView, req.source ?: defaultView).drillToDay()
                 onWidgetNavConsumed()
             }
             is WidgetNavRequest.OpenEvent -> {

app/src/main/java/de/jeanlucmakiola/calendula/ui/WidgetNavRequest.kt

@@ -13,13 +13,8 @@ import de.jeanlucmakiola.calendula.ui.common.CalendarView
  * detail-key channel and leave the base view untouched.)
  */
 sealed interface WidgetNavRequest {
-    /**
+    /** Open the day view anchored on [dateIso] (an ISO `yyyy-MM-dd` date), over [source]. */
-     * Open the day view anchored on [dateIso] (an ISO `yyyy-MM-dd` date), over
+    data class OpenDate(val dateIso: String, val source: CalendarView) : WidgetNavRequest
-     * [source]. A null [source] means the request came from outside the app (a
-     * launcher/clock date tap, issue #9) rather than a widget, so it roots over
-     * the default home view instead of a widget's view.
-     */
-    data class OpenDate(val dateIso: String, val source: CalendarView?) : WidgetNavRequest
 
     /** Open one occurrence's detail (an agenda-widget event tap), over [source]. */
     data class OpenEvent(

app/src/test/java/de/jeanlucmakiola/calendula/data/calendar/TimeBridgeTest.kt

@@ -1,26 +0,0 @@
-package de.jeanlucmakiola.calendula.data.calendar
-
-import com.google.common.truth.Truth.assertThat
-import kotlin.time.Instant
-import org.junit.jupiter.api.Test
-
-class TimeBridgeTest {
-
-    @Test
-    fun `epoch millis round-trips through Instant`() {
-        val original = 1_717_840_800_000L // 2024-06-08T10:00:00Z
-        val instant = original.toKotlinInstantFromEpochMillis()
-        assertThat(instant.toEpochMillis()).isEqualTo(original)
-    }
-
-    @Test
-    fun `zero millis maps to Instant epoch`() {
-        assertThat(0L.toKotlinInstantFromEpochMillis()).isEqualTo(Instant.fromEpochMilliseconds(0L))
-    }
-
-    @Test
-    fun `negative epoch millis is supported`() {
-        val original = -1_000_000L
-        assertThat(original.toKotlinInstantFromEpochMillis().toEpochMillis()).isEqualTo(original)
-    }
-}

docs/fdroid-official/de.jeanlucmakiola.calendula.yml

@@ -43,11 +43,21 @@ Builds:
     versionCode: 20705
     commit: v2.7.5
     subdir: app
+    submodules: true
     gradle:
       - yes
     # 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.
+    #
+    # submodules: true — REQUIRED from v2.11.0 onward, where the build pulls
+    # shared code from the `floret-kit` git submodule via a Gradle composite
+    # build (`includeBuild("floret-kit")`). Without it F-Droid checks out an
+    # empty floret-kit/ and the from-source build fails, stalling publishing.
+    # Inert for v2.7.5 (no submodule yet); kept here so AutoUpdateMode copies it
+    # onto every auto-generated future build entry. The kit is plain-Kotlin and
+    # carries no foojay toolchain resolver, so it clears the same reproducibility
+    # bar (enforced by scripts/check_reproducible_release.sh).
 
 # SHA-256 of our app signing certificate (public; embedded in every published
 # APK). Locks F-Droid to publish only binaries signed with our key.

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

@@ -1,6 +0,0 @@
-### Fixed
-- Calendula can now be set as your default calendar app. It registers the
-  calendar-app intent filters the system uses, so it appears in the chooser when
-  you tap a date in a launcher or clock — and opening one takes you straight to
-  that day. Android has no way for an app to make itself the default, so you pick
-  it once from the system picker. Thanks to @abrossimow for the report ([#9]).

scripts/check_reproducible_release.sh

@@ -34,8 +34,15 @@ else
 fi
 
 # 2. The foojay toolchain resolver must not be present in any Gradle script.
+#    This includes the floret-kit submodule: it's an included build (composite
+#    build via `includeBuild`), so F-Droid evaluates its Gradle scripts too when
+#    building from source — the same offline-scanner bar applies to it.
 gradle_files=("$SETTINGS" "$APP")
 [ -f build.gradle.kts ] && gradle_files+=(build.gradle.kts)
+if [ -d floret-kit ]; then
+  while IFS= read -r f; do gradle_files+=("$f"); done \
+    < <(find floret-kit -name '*.gradle.kts' -not -path '*/build/*')
+fi
 if grep -qi 'foojay' "${gradle_files[@]}"; then
   echo "ERROR: foojay toolchain resolver found in: $(grep -li foojay "${gradle_files[@]}" | tr '\n' ' ')" >&2
   echo "       F-Droid's source scanner rejects org.gradle.toolchains.foojay-resolver" >&2

settings.gradle.kts

@@ -22,3 +22,4 @@ dependencyResolutionManagement {
 
 rootProject.name = "Calendula"
 include(":app")
+includeBuild("floret-kit")