Set CalculatorModal.kt initial value based on AmountModal.kt

Ivy-Apps · Nov 15, 2021 · 206c4fe · 206c4fe
1 parent 56f5af3
commit 206c4fe
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/app/src/main/java/com/ivy/wallet/ui/theme/modal/edit/AmountModal.kt b/app/src/main/java/com/ivy/wallet/ui/theme/modal/edit/AmountModal.kt
@@ -114,6 +114,7 @@ fun BoxWithConstraintsScope.AmountModal(
 
     CalculatorModal(
         visible = calculatorModalVisible,
+        initialAmount = amount.amountToDoubleOrNull(),
         currency = currency,
         dismiss = {
             calculatorModalVisible = false

diff --git a/app/src/main/java/com/ivy/wallet/ui/theme/modal/edit/CalculatorModal.kt b/app/src/main/java/com/ivy/wallet/ui/theme/modal/edit/CalculatorModal.kt
@@ -22,14 +22,15 @@ import java.util.*
 @Composable
 fun BoxWithConstraintsScope.CalculatorModal(
     id: UUID = UUID.randomUUID(),
+    initialAmount: Double?,
     visible: Boolean,
     currency: String,
 
     dismiss: () -> Unit,
     onCalculation: (Double) -> Unit
 ) {
-    var expression by remember(id) {
-        mutableStateOf("")
+    var expression by remember(id, initialAmount) {
+        mutableStateOf(initialAmount?.format(currency) ?: "")
     }
 
     IvyModal(
@@ -155,6 +156,7 @@ private fun Preview() {
     IvyAppPreview {
         CalculatorModal(
             visible = true,
+            initialAmount = 50.23,
             currency = "BGN",
             dismiss = { },
             onCalculation = {}