fix update on dismiss

snabble · Jan 31, 2024 · 6f7ae52 · 6f7ae52
1 parent f3b97e2
commit 6f7ae52
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 8 deletions.
diff --git a/app/src/main/java/io/snabble/pay/app/feature/detailsaccount/ui/AccountDetails.kt b/app/src/main/java/io/snabble/pay/app/feature/detailsaccount/ui/AccountDetails.kt
@@ -61,7 +61,7 @@ fun AccountDetails(
     val showDeleteDialog = remember { mutableStateOf(false) }
     SnabblePayTheme {
         AppBarLayout(
-            title = cardName.value,
+            title = accountCard.name,
             onBackClick = {
                 navigator?.navigate(HomeScreenDestination)
             }
@@ -82,10 +82,11 @@ fun AccountDetails(
                         modifier = Modifier
                             .fillMaxWidth()
                             .padding(horizontal = 16.dp),
-                        value = cardName.value,
+                        value = accountCard.name,
                         onValueChange = { cardName.value = it },
                         onAction = {
-                            onLabelChange(cardName.value, accountCard.cardBackgroundColor)
+                            cardName.value = it
+                            onLabelChange(it, accountCard.cardBackgroundColor)
                             showChangeTitleDialog.value = false
                         }
                     )

diff --git a/...rc/main/java/io/snabble/pay/app/feature/detailsaccount/ui/widget/EditTextFieldCentered.kt b/...rc/main/java/io/snabble/pay/app/feature/detailsaccount/ui/widget/EditTextFieldCentered.kt
@@ -11,6 +11,10 @@ import androidx.compose.material3.DividerDefaults
 import androidx.compose.material3.MaterialTheme
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.CompositionLocalProvider
+import androidx.compose.runtime.getValue
+import androidx.compose.runtime.mutableStateOf
+import androidx.compose.runtime.remember
+import androidx.compose.runtime.setValue
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.Color.Companion.Transparent
 import androidx.compose.ui.text.font.FontWeight
@@ -25,12 +29,15 @@ fun EditTextFieldCentered(
     modifier: Modifier = Modifier,
     value: String = "",
     onValueChange: (String) -> Unit,
-    onAction: () -> Unit,
+    onAction: (String) -> Unit,
 ) {
     val customTextSelectionColors = TextSelectionColors(
         handleColor = MaterialTheme.colorScheme.onSurface,
         backgroundColor = Transparent
     )
+
+    var inputValue by remember { mutableStateOf(value) }
+
     CompositionLocalProvider(
         LocalTextSelectionColors provides customTextSelectionColors
     ) {
@@ -49,13 +56,12 @@ fun EditTextFieldCentered(
                 imeAction = ImeAction.Done
             ),
             keyboardActions = KeyboardActions(
-                onDone = {
-                    onAction()
-                }
+                onDone = { onAction(inputValue) }
             ),
-            value = value,
+            value = inputValue,
             onValueChange = {
                 onValueChange(it)
+                inputValue = it
             },
             maxLines = 1,
             textStyle = MaterialTheme.typography.titleMedium.copy(