From 78632865f9bef75a1c116fbb3a8078069aabc6be Mon Sep 17 00:00:00 2001 From: Jean-Luc Makiola Date: Sun, 28 Jun 2026 15:17:57 +0200 Subject: [PATCH] edit: use the shared OptionalFormSection in the task form Drop the in-app copy in favour of floret-kit's. Bumps the submodule. Co-Authored-By: Claude Opus 4.8 (1M context) --- .../agendula/ui/edit/TaskEditScreen.kt | 15 +-------------- floret-kit | 2 +- 2 files changed, 2 insertions(+), 15 deletions(-) diff --git a/app/src/main/java/de/jeanlucmakiola/agendula/ui/edit/TaskEditScreen.kt b/app/src/main/java/de/jeanlucmakiola/agendula/ui/edit/TaskEditScreen.kt index 3dffc7c..5d09499 100644 --- a/app/src/main/java/de/jeanlucmakiola/agendula/ui/edit/TaskEditScreen.kt +++ b/app/src/main/java/de/jeanlucmakiola/agendula/ui/edit/TaskEditScreen.kt @@ -1,8 +1,5 @@ package de.jeanlucmakiola.agendula.ui.edit -import androidx.compose.animation.AnimatedVisibility -import de.jeanlucmakiola.floret.identity.collapseExit -import de.jeanlucmakiola.floret.identity.expandEnter import androidx.compose.foundation.background import androidx.compose.foundation.clickable import androidx.compose.foundation.isSystemInDarkTheme @@ -93,6 +90,7 @@ import de.jeanlucmakiola.agendula.domain.TaskList import de.jeanlucmakiola.agendula.domain.TaskSection import de.jeanlucmakiola.agendula.domain.TaskSections import de.jeanlucmakiola.floret.components.GroupedRow +import de.jeanlucmakiola.floret.components.OptionalFormSection import de.jeanlucmakiola.floret.components.InlineTextField import de.jeanlucmakiola.floret.components.OptionCard import de.jeanlucmakiola.agendula.ui.common.priorityFill @@ -543,17 +541,6 @@ private fun EditContent( * open instead of popping in. (Initially-visible sections render without * animating on the first frame they're added.) */ -@Composable -private fun OptionalFormSection(visible: Boolean, content: @Composable ColumnScope.() -> Unit) { - AnimatedVisibility( - visible = visible, - enter = expandEnter(), - exit = collapseExit(), - ) { - Column(modifier = Modifier.fillMaxWidth(), content = content) - } -} - /** * One info card mirroring the detail screen's card: tonal container, leading * icon in the gutter, value to the right. Optionally clickable as a whole. diff --git a/floret-kit b/floret-kit index 1e36c22..24ada18 160000 --- a/floret-kit +++ b/floret-kit @@ -1 +1 @@ -Subproject commit 1e36c229cac6715aa0fdf85e0b7973f9018f9732 +Subproject commit 24ada183e219d691308b842c1e8e6f2a141e6714