release: floret-kit 0.2.1

Adds components' `scrollable` opt-out on CollapsingScaffold (and its
FullScreenPicker passthrough), so a picker with more options than an
eagerly composed column can carry can drive its own LazyColumn.

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

CHANGELOG.md

@@ -6,12 +6,31 @@ All notable changes to floret-kit are documented here. The format follows
 floret-kit is consumed **from source** — each app embeds it as a git submodule
 and builds it through a Gradle composite build, pinning a specific commit. There
 are no binary releases; "version" tracks the shared `version` in the root build
-(currently `0.1.0`). Entries are grouped by module.
+(currently `0.2.1`). Entries are grouped by module.
 
 ## [Unreleased]
 
+## [0.2.1] - 2026-07-17
+
 ### Added
 
+- **`components`** — `CollapsingScaffold` takes a `scrollable` flag (default
+  `true`, so every existing caller is unchanged). Set it to `false` when the
+  content brings its own scrolling container: the scaffold's own
+  `verticalScroll` composes each row up front and can't host a `LazyColumn`
+  (nesting a same-axis scrollable throws), which ruled out any surface with more
+  options than fit an eager pass. Opting out hands the content a plain column and
+  leaves the insets, IME padding and top-bar collapse as they were.
+  `FullScreenPicker` forwards the flag. Consumed by Calendula's ~600-entry
+  time-zone picker from 2.16.0.
+
+## [0.2.0] - 2026-07-17
+
+### Added
+
+- **`components`** — `CustomAmountEditor`, the amount + unit editor behind an
+  "Custom…" picker option (Calendula's custom snooze duration). Consumed by
+  Calendula since 2.15.0.
 - **`core-locale`** — the locale-aware formatting half of the module, so apps
   stop hand-rolling `"$day. $month $year"` templates that bake one language's
   field order (and its separators, and its ordinal dot) into every language they
@@ -46,6 +65,12 @@ are no binary releases; "version" tracks the shared `version` in the root build
 
 ### Added
 
+- **`core-locale`** (Android library) — per-app language plumbing (`AppLanguage`):
+  read the shipped languages from the app's `res/xml/locales_config.xml`, get/set
+  the applied language via `AppCompatDelegate`, render each language's autonym.
+  The app passes its own `locales_config` resource id; the system-default choice
+  is `null`. _(Shipped in 0.1.0 but omitted from this changelog at the time;
+  recorded here retroactively.)_
 - **`core-time`** (JVM library) — pure-Kotlin date/time helpers, no Android and
   no third-party dependencies:
   - `DayWindow.today()` — local-day boundaries for smart-list logic.

build.gradle.kts

@@ -10,5 +10,5 @@ plugins {
 
 subprojects {
     group = "de.jeanlucmakiola.floret"
-    version = "0.2.0"
+    version = "0.2.1"
 }

components/src/main/kotlin/de/jeanlucmakiola/floret/components/CollapsingScaffold.kt

@@ -46,6 +46,16 @@ import de.jeanlucmakiola.floret.identity.predictiveBack
  * unchanged: [actions] adds trailing app-bar items; [snackbarHost] hosts
  * transient messages; [predictiveBack] (off by default) wires the gesture
  * preview to [onBack] for full-screen surfaces that want it.
+ *
+ * Set [scrollable] to false when [content] brings its own scrolling container.
+ * The default column scrolls as a whole, which composes every row up front —
+ * fine for the short lists these surfaces normally hold, but a list long enough
+ * to need a [androidx.compose.foundation.lazy.LazyColumn] can neither nest one
+ * inside it (same-axis scrolling throws) nor afford the eager pass. Opting out
+ * hands [content] a plain, unscrolled column to fill instead; the insets, IME
+ * padding and bar behaviour are unchanged, so a lazy list simply takes over the
+ * scrolling and gets the top bar's collapse for free through the shared
+ * nested-scroll connection.
  */
 @OptIn(ExperimentalMaterial3Api::class)
 @Composable
@@ -55,6 +65,7 @@ fun CollapsingScaffold(
     modifier: Modifier = Modifier,
     largeTopBar: Boolean = true,
     predictiveBack: Boolean = false,
+    scrollable: Boolean = true,
     actions: @Composable RowScope.() -> Unit = {},
     snackbarHost: @Composable () -> Unit = {},
     content: @Composable ColumnScope.() -> Unit,
@@ -112,8 +123,19 @@ fun CollapsingScaffold(
                 .fillMaxSize()
                 .background(MaterialTheme.colorScheme.surface)
                 .imePadding()
+                .then(
+                    if (scrollable) {
+                        Modifier
                             .verticalScroll(rememberScrollState())
-                .padding(top = 8.dp, bottom = 24.dp),
+                            .padding(top = 8.dp, bottom = 24.dp)
+                    } else {
+                        // The content scrolls itself, so it also owns the edge
+                        // spacing — a lazy list wants it as contentPadding, or
+                        // the first and last rows clip instead of scrolling
+                        // under the bars.
+                        Modifier
+                    },
+                ),
             content = content,
         )
     }

components/src/main/kotlin/de/jeanlucmakiola/floret/components/OptionPicker.kt

@@ -20,12 +20,17 @@ import androidx.compose.ui.window.DialogWindowProvider
  * width without a tall header — it's a short selection list, so the large
  * collapsing header would only be empty space to scroll past. [content] places
  * the connected grouped rows; selecting one calls [onDismiss].
+ *
+ * [scrollable] forwards to [CollapsingScaffold]: leave it on unless [content]
+ * scrolls itself, which a picker only needs for an option list long enough to
+ * warrant a lazy container.
  */
 @Composable
 fun FullScreenPicker(
     title: String,
     onDismiss: () -> Unit,
     predictiveBack: Boolean = false,
+    scrollable: Boolean = true,
     actions: @Composable RowScope.() -> Unit = {},
     content: @Composable ColumnScope.() -> Unit,
 ) {
@@ -50,6 +55,7 @@ fun FullScreenPicker(
             onBack = onDismiss,
             largeTopBar = false,
             predictiveBack = predictiveBack,
+            scrollable = scrollable,
             actions = actions,
             content = content,
         )

docs/ROADMAP.md

@@ -13,6 +13,7 @@ divergent or app-specific code where it lives.
 |---|---|---|
 | `core-time` | JVM | Agendula (and Calendula's pending branch) |
 | `core-reminders` | JVM | Agendula (and Calendula's pending branch) |
+| `core-locale` | Android | Agendula, Calendula |
 | `core-crash` | Android | Agendula |
 | `identity` | Android | Agendula |
 | `components` | Android | Agendula |