chore: pin floret-kit to v0.1.0

Move the submodule pin from a loose main commit to the tagged v0.1.0
release (same tree content), so the from-source F-Droid build tracks a
stable, traceable kit version instead of a rolling commit.

Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>

app/src/main/java/de/jeanlucmakiola/calendula/ui/edit/EventEditScreen.kt

@@ -134,6 +134,7 @@ import de.jeanlucmakiola.floret.components.GroupedRow
 import de.jeanlucmakiola.calendula.ui.common.MILLIS_PER_DAY
 import de.jeanlucmakiola.floret.components.InlineTextField
 import de.jeanlucmakiola.floret.components.OptionCard
+import de.jeanlucmakiola.floret.components.OptionPicker
 import de.jeanlucmakiola.floret.components.Position
 import de.jeanlucmakiola.floret.components.positionOf
 import de.jeanlucmakiola.calendula.ui.common.REMINDER_PRESETS
@@ -345,29 +346,29 @@ private fun SaveConflictDialog(
     onDiscard: () -> Unit,
     onDismiss: () -> Unit,
 ) {
-    AlertDialog(
-        onDismissRequest = onDismiss,
-        title = { Text(stringResource(R.string.event_edit_conflict_title)) },
-        text = {
-            Column(verticalArrangement = Arrangement.spacedBy(8.dp)) {
-                Text(stringResource(R.string.event_edit_conflict_body))
-                Spacer(Modifier.height(4.dp))
-                OptionCard(
-                    label = stringResource(R.string.event_edit_conflict_overwrite),
-                    supportingText = stringResource(R.string.event_edit_conflict_overwrite_hint),
+    FullScreenPicker(
+        title = stringResource(R.string.event_edit_conflict_title),
+        onDismiss = onDismiss,
+    ) {
+        Text(
+            text = stringResource(R.string.event_edit_conflict_body),
+            style = MaterialTheme.typography.bodyMedium,
+            color = MaterialTheme.colorScheme.onSurfaceVariant,
+            modifier = Modifier.padding(horizontal = 24.dp, vertical = 8.dp),
+        )
+        GroupedRow(
+            title = stringResource(R.string.event_edit_conflict_overwrite),
+            summary = stringResource(R.string.event_edit_conflict_overwrite_hint),
+            position = positionOf(0, 2),
             onClick = onOverwrite,
         )
-                OptionCard(
-                    label = stringResource(R.string.event_edit_conflict_discard),
-                    supportingText = stringResource(R.string.event_edit_conflict_discard_hint),
+        GroupedRow(
+            title = stringResource(R.string.event_edit_conflict_discard),
+            summary = stringResource(R.string.event_edit_conflict_discard_hint),
+            position = positionOf(1, 2),
             onClick = onDiscard,
         )
     }
-        },
-        confirmButton = {
-            TextButton(onClick = onDismiss) { Text(stringResource(R.string.dialog_cancel)) }
-        },
-    )
 }
 
 /**
@@ -1064,24 +1065,19 @@ private fun FieldPickerDialog(
     onSelect: (EventFormField) -> Unit,
     onDismiss: () -> Unit,
 ) {
-    AlertDialog(
-        onDismissRequest = onDismiss,
-        title = { Text(stringResource(R.string.event_edit_more_fields)) },
-        text = {
-            Column(verticalArrangement = Arrangement.spacedBy(8.dp)) {
-                hiddenFields.forEach { field ->
-                    OptionCard(
-                        label = stringResource(eventFormFieldLabel(field)),
+    FullScreenPicker(
+        title = stringResource(R.string.event_edit_more_fields),
+        onDismiss = onDismiss,
+    ) {
+        hiddenFields.forEachIndexed { index, field ->
+            GroupedRow(
+                title = stringResource(eventFormFieldLabel(field)),
+                position = positionOf(index, hiddenFields.size),
+                leading = { Icon(imageVector = eventFormFieldIcon(field), contentDescription = null) },
                 onClick = { onSelect(field) },
-                        icon = eventFormFieldIcon(field),
             )
         }
     }
-        },
-        confirmButton = {
-            TextButton(onClick = onDismiss) { Text(stringResource(R.string.dialog_cancel)) }
-        },
-    )
 }
 
 /** Quick-pick lead times offered as chips in the reminder dialog. */
@@ -1106,26 +1102,39 @@ private fun ReminderPickerDialog(
         ?.takeIf { it in 1..999 }
         ?.let { it * unit.minutesFactor }
 
-    AlertDialog(
-        onDismissRequest = onDismiss,
-        title = { Text(stringResource(R.string.event_edit_add_reminder)) },
-        text = {
+    FullScreenPicker(
+        title = stringResource(R.string.event_edit_add_reminder),
+        onDismiss = onDismiss,
+        actions = {
+            // The quick-pick list adds on tap; only the custom step needs Add.
+            if (customMode) {
+                TextButton(
+                    enabled = customMinutes != null && customMinutes !in alreadyChosen,
+                    onClick = { customMinutes?.let(onSelect) },
+                ) { Text(stringResource(R.string.event_edit_add)) }
+            }
+        },
+    ) {
         if (!customMode) {
-                Column(verticalArrangement = Arrangement.spacedBy(8.dp)) {
-                    REMINDER_QUICK_PICKS.filterNot { it in alreadyChosen }.forEach { minutes ->
-                        OptionCard(
-                            label = reminderLabel(minutes),
+            val presets = REMINDER_QUICK_PICKS.filterNot { it in alreadyChosen }
+            val rowCount = presets.size + 1
+            presets.forEachIndexed { index, minutes ->
+                GroupedRow(
+                    title = reminderLabel(minutes),
+                    position = positionOf(index, rowCount),
                     onClick = { onSelect(minutes) },
                 )
             }
-                    OptionCard(
-                        label = stringResource(R.string.event_edit_reminder_custom),
+            GroupedRow(
+                title = stringResource(R.string.event_edit_reminder_custom),
+                position = positionOf(rowCount - 1, rowCount),
                 onClick = { customMode = true },
-                        labelColor = MaterialTheme.colorScheme.primary,
             )
-                }
         } else {
-                Row(verticalAlignment = Alignment.CenterVertically) {
+            Row(
+                verticalAlignment = Alignment.CenterVertically,
+                modifier = Modifier.padding(horizontal = 24.dp, vertical = 8.dp),
+            ) {
                 DialogAmountField(
                     value = amountText,
                     onValueChange = { amountText = it },
@@ -1139,20 +1148,7 @@ private fun ReminderPickerDialog(
                 )
             }
         }
-        },
-        confirmButton = {
-            // The quick-pick list adds on tap; only the custom step needs Add.
-            if (customMode) {
-                TextButton(
-                    enabled = customMinutes != null && customMinutes !in alreadyChosen,
-                    onClick = { customMinutes?.let(onSelect) },
-                ) { Text(stringResource(R.string.event_edit_add)) }
     }
-        },
-        dismissButton = {
-            TextButton(onClick = onDismiss) { Text(stringResource(R.string.dialog_cancel)) }
-        },
-    )
 }
 
 /** How a custom recurrence ends; mirrors [RecurrenceEnd] in saveable form. */
@@ -1222,33 +1218,46 @@ private fun RecurrencePickerDialog(
         null
     }
 
-    AlertDialog(
-        onDismissRequest = onDismiss,
-        title = { Text(stringResource(R.string.event_detail_recurrence)) },
-        text = {
+    FullScreenPicker(
+        title = stringResource(R.string.event_detail_recurrence),
+        onDismiss = onDismiss,
+        actions = {
+            // The preset list applies on tap; only the custom step needs OK.
+            if (customMode) {
+                TextButton(
+                    enabled = customResult != null,
+                    onClick = { customResult?.let(onSelect) },
+                ) { Text(stringResource(R.string.dialog_ok)) }
+            }
+        },
+    ) {
         if (!customMode) {
-                Column(verticalArrangement = Arrangement.spacedBy(8.dp)) {
-                    OptionCard(
-                        label = stringResource(R.string.event_edit_recurrence_none),
-                        onClick = { onSelect(null) },
+            val rowCount = RecurrenceFreq.entries.size + 2
+            GroupedRow(
+                title = stringResource(R.string.event_edit_recurrence_none),
+                position = positionOf(0, rowCount),
                 selected = current == null,
+                onClick = { onSelect(null) },
             )
-                    RecurrenceFreq.entries.forEach { entry ->
-                        OptionCard(
-                            label = stringResource(recurrencePresetLabel(entry)),
-                            onClick = { onSelect(SimpleRecurrence(entry).toRRule()) },
+            RecurrenceFreq.entries.forEachIndexed { index, entry ->
+                GroupedRow(
+                    title = stringResource(recurrencePresetLabel(entry)),
+                    position = positionOf(index + 1, rowCount),
                     selected = isPlainPreset && parsed?.freq == entry,
+                    onClick = { onSelect(SimpleRecurrence(entry).toRRule()) },
                 )
             }
-                    OptionCard(
-                        label = stringResource(R.string.event_edit_recurrence_custom),
-                        onClick = { customMode = true },
+            GroupedRow(
+                title = stringResource(R.string.event_edit_recurrence_custom),
+                position = positionOf(rowCount - 1, rowCount),
                 selected = current != null && !isPlainPreset,
-                        labelColor = MaterialTheme.colorScheme.primary,
+                onClick = { customMode = true },
             )
-                }
         } else {
-                Column(verticalArrangement = Arrangement.spacedBy(8.dp)) {
+            Column(
+                verticalArrangement = Arrangement.spacedBy(8.dp),
+                modifier = Modifier.padding(horizontal = 24.dp),
+            ) {
                 Row(verticalAlignment = Alignment.CenterVertically) {
                     Text(
                         text = stringResource(R.string.event_edit_recurrence_every),
@@ -1270,45 +1279,50 @@ private fun RecurrencePickerDialog(
                     )
                 }
                 if (freq == RecurrenceFreq.Weekly) {
-                        Spacer(Modifier.height(4.dp))
                     WeekdayToggleRow(
                         selected = daysMask.toDaySet(),
                         onToggle = { day -> daysMask = daysMask xor day.toMaskBit() },
                         locale = locale,
                     )
                 }
-                    Spacer(Modifier.height(4.dp))
                 Text(
                     text = stringResource(R.string.event_edit_recurrence_ends),
                     style = MaterialTheme.typography.bodyMedium,
                     color = MaterialTheme.colorScheme.onSurfaceVariant,
                 )
-                    OptionCard(
-                        label = stringResource(R.string.event_edit_recurrence_end_never),
-                        onClick = { endMode = RecurrenceEndMode.Never },
+            }
+            GroupedRow(
+                title = stringResource(R.string.event_edit_recurrence_end_never),
+                position = positionOf(0, 3),
                 selected = endMode == RecurrenceEndMode.Never,
+                onClick = { endMode = RecurrenceEndMode.Never },
             )
-                    OptionCard(
-                        label = stringResource(R.string.event_edit_recurrence_end_until),
-                        onClick = {
-                            endMode = RecurrenceEndMode.Until
-                            showUntilPicker = true
-                        },
-                        supportingText = untilDate?.let {
+            GroupedRow(
+                title = stringResource(R.string.event_edit_recurrence_end_until),
+                summary = untilDate?.let {
                     remember(it, locale) {
                         DateTimeFormatter.ofLocalizedDate(FormatStyle.MEDIUM)
                             .withLocale(locale).format(it.toJavaLocalDate())
                     }
                 },
+                position = positionOf(1, 3),
                 selected = endMode == RecurrenceEndMode.Until,
+                onClick = {
+                    endMode = RecurrenceEndMode.Until
+                    showUntilPicker = true
+                },
             )
-                    OptionCard(
-                        label = stringResource(R.string.event_edit_recurrence_end_count),
-                        onClick = { endMode = RecurrenceEndMode.Count },
+            GroupedRow(
+                title = stringResource(R.string.event_edit_recurrence_end_count),
+                position = positionOf(2, 3),
                 selected = endMode == RecurrenceEndMode.Count,
+                onClick = { endMode = RecurrenceEndMode.Count },
             )
             if (endMode == RecurrenceEndMode.Count) {
-                        Row(verticalAlignment = Alignment.CenterVertically) {
+                Row(
+                    verticalAlignment = Alignment.CenterVertically,
+                    modifier = Modifier.padding(horizontal = 24.dp, vertical = 4.dp),
+                ) {
                     DialogAmountField(
                         value = countText,
                         onValueChange = { countText = it },
@@ -1323,20 +1337,6 @@ private fun RecurrencePickerDialog(
             }
         }
     }
-        },
-        confirmButton = {
-            // The preset list applies on tap; only the custom step needs OK.
-            if (customMode) {
-                TextButton(
-                    enabled = customResult != null,
-                    onClick = { customResult?.let(onSelect) },
-                ) { Text(stringResource(R.string.dialog_ok)) }
-            }
-        },
-        dismissButton = {
-            TextButton(onClick = onDismiss) { Text(stringResource(R.string.dialog_cancel)) }
-        },
-    )
 
     if (showUntilPicker) {
         CalendarDatePickerDialog(
@@ -1701,24 +1701,14 @@ private fun VisibilityPickerDialog(
     onSelect: (AccessLevel) -> Unit,
     onDismiss: () -> Unit,
 ) {
-    AlertDialog(
-        onDismissRequest = onDismiss,
-        title = { Text(stringResource(R.string.event_edit_visibility)) },
-        text = {
-            Column(verticalArrangement = Arrangement.spacedBy(8.dp)) {
-                AccessLevel.entries.forEach { level ->
-                    OptionCard(
-                        label = stringResource(accessLevelLabel(level)),
-                        onClick = { onSelect(level) },
-                        icon = accessLevelIcon(level),
-                        selected = level == selected,
-                    )
-                }
-            }
-        },
-        confirmButton = {
-            TextButton(onClick = onDismiss) { Text(stringResource(R.string.dialog_cancel)) }
-        },
+    OptionPicker(
+        title = stringResource(R.string.event_edit_visibility),
+        options = AccessLevel.entries.toList(),
+        selected = selected,
+        label = { stringResource(accessLevelLabel(it)) },
+        onSelect = onSelect,
+        onDismiss = onDismiss,
+        leading = { Icon(imageVector = accessLevelIcon(it), contentDescription = null) },
     )
 }
 
@@ -1741,11 +1731,21 @@ private fun ColorPickerDialog(
     onDismiss: () -> Unit,
 ) {
     val dark = isSystemInDarkTheme()
-    AlertDialog(
-        onDismissRequest = onDismiss,
-        title = { Text(stringResource(R.string.event_edit_color)) },
-        text = {
-            Column(verticalArrangement = Arrangement.spacedBy(12.dp)) {
+    FullScreenPicker(
+        title = stringResource(R.string.event_edit_color),
+        onDismiss = onDismiss,
+        actions = {
+            if (hasExplicitColor) {
+                TextButton(onClick = onClear) {
+                    Text(stringResource(R.string.event_edit_color_reset))
+                }
+            }
+        },
+    ) {
+        Column(
+            verticalArrangement = Arrangement.spacedBy(12.dp),
+            modifier = Modifier.padding(horizontal = 24.dp, vertical = 8.dp),
+        ) {
             if (palette.isNotEmpty()) {
                 ColorSwatchRow(
                     colors = palette.map { it.argb },
@@ -1772,20 +1772,7 @@ private fun ColorPickerDialog(
                 }
             }
         }
-        },
-        confirmButton = {
-            TextButton(onClick = onDismiss) { Text(stringResource(R.string.dialog_cancel)) }
-        },
-        dismissButton = if (hasExplicitColor) {
-            {
-                TextButton(onClick = onClear) {
-                    Text(stringResource(R.string.event_edit_color_reset))
     }
-            }
-        } else {
-            null
-        },
-    )
 }
 
 private fun accessLevelIcon(level: AccessLevel): ImageVector = when (level) {

app/src/main/java/de/jeanlucmakiola/calendula/ui/settings/SettingsScreen.kt

@@ -160,7 +160,7 @@ private enum class ChipAccent { Neutral, Primary, Tertiary }
  * Settings (M4), restructured in v2.3 into a category hub with sub-screens.
  * Both the hub and the sub-screens use a collapsing [LargeTopAppBar] and the
  * grouped-row card system. Calendars opens the separate manager hoisted in
- * [CalendarHost]; Language opens an inline OptionCard dialog; About is a card
+ * [CalendarHost]; Language opens a full-screen picker; About is a card
  * at the top. A full-screen destination; [onBack] pops it.
  */
 @Composable

fastlane/metadata/android/es-ES/full_description.txt

@@ -0,0 +1,25 @@
+Calendula es una aplicación de calendario moderna y de código abierto
+para Android. Funciona directamente sobre el proveedor de calendario del
+sistema: cualquier origen sincronizado en tu dispositivo — Nextcloud
+mediante DAVx5, Google, calendarios locales, suscripciones WebCal —
+aparece automáticamente, y los cambios que hagas se sincronizan de vuelta
+del mismo modo.
+
+Crea, edita y elimina eventos, incluidos los recurrentes con cambios
+acotados (solo este evento / este y todos los siguientes / toda la serie)
+y un sencillo selector de repetición. Calendula también entrega los
+recordatorios de tus eventos como notificaciones: toca una y estarás en
+el evento.
+
+Si quieres, muestra en tu calendario los cumpleaños, aniversarios y otras
+fechas especiales de tus contactos. Tú mismo lo activas; los contactos se
+leen solo en tu dispositivo, nunca se suben y nunca se modifican —
+Calendula solo refleja las fechas en calendarios locales que controlas
+por completo.
+
+El factor diferenciador es el diseño: auténtico Material 3 Expressive en
+toda la aplicación, con Dynamic Color, movimiento expresivo y formas
+expresivas.
+
+Privacidad: cero telemetría, sin analíticas, sin acceso a la red — tus
+datos nunca salen del dispositivo.

fastlane/metadata/android/es-ES/short_description.txt

@@ -0,0 +1 @@
+Un calendario moderno con Material 3 Expressive para Android.

fastlane/metadata/android/es-ES/title.txt

@@ -0,0 +1 @@
+Calendula

fastlane/metadata/android/it-IT/full_description.txt

@@ -0,0 +1,24 @@
+Calendula è un'app di calendario moderna e open source per Android.
+Funziona direttamente sul provider di calendario di sistema: qualsiasi
+origine sincronizzata sul tuo dispositivo — Nextcloud tramite DAVx5,
+Google, calendari locali, iscrizioni WebCal — compare automaticamente, e
+le modifiche che apporti vengono sincronizzate a ritroso allo stesso
+modo.
+
+Crea, modifica ed elimina eventi, compresi quelli ricorrenti con
+modifiche mirate (solo questo evento / questo e tutti i successivi /
+l'intera serie) e un semplice selettore di ripetizione. Calendula
+recapita anche i promemoria dei tuoi eventi come notifiche: ne tocchi una
+e sei subito sull'evento.
+
+Se vuoi, mostra nel calendario i compleanni, gli anniversari e le altre
+date speciali dei tuoi contatti. Sei tu ad attivarlo; i contatti vengono
+letti solo sul tuo dispositivo, non vengono mai caricati e non vengono
+mai modificati — Calendula si limita a rispecchiare le date in calendari
+locali che controlli completamente.
+
+La differenza sta nel design: vero Material 3 Expressive ovunque, con
+Dynamic Color, animazioni espressive e forme espressive.
+
+Privacy: zero telemetria, nessuna analisi, nessun accesso alla rete — i
+tuoi dati non lasciano mai il dispositivo.

fastlane/metadata/android/it-IT/short_description.txt

@@ -0,0 +1 @@
+Un moderno calendario Material 3 Expressive per Android.

fastlane/metadata/android/it-IT/title.txt

@@ -0,0 +1 @@
+Calendula