taler-android

commit 4b4cf989aa0bfb5e9223ced86242cdd51be47701
parent 390b562828b8ef0da98c2c8cf06a88055b2c8695
Author: Iván Ávalos <avalos@disroot.org>
Date:   Tue, 20 Feb 2024 14:45:03 -0600

[wallet] Set input digits of some amount inputs

(cherry picked from commit acb03da41f452d85248effa7d7b6579541446b63)

Diffstat:
M
wallet/src/main/java/net/taler/wallet/ReceiveFundsFragment.kt
 | 
2
++
M
wallet/src/main/java/net/taler/wallet/SendFundsFragment.kt
 | 
2
++
M
wallet/src/main/java/net/taler/wallet/compose/AmountInputField.kt
 | 
4
+++-

3 files changed, 7 insertions(+), 1 deletion(-)
diff --git a/wallet/src/main/java/net/taler/wallet/ReceiveFundsFragment.kt b/wallet/src/main/java/net/taler/wallet/ReceiveFundsFragment.kt
@@ -53,6 +53,7 @@ import androidx.navigation.fragment.findNavController
 import net.taler.common.Amount
 import net.taler.common.CurrencySpecification
 import net.taler.wallet.compose.AmountInputField
+import net.taler.wallet.compose.DEFAULT_INPUT_DECIMALS
 import net.taler.wallet.compose.TalerSurface
 import net.taler.wallet.exchanges.ExchangeItem
 
@@ -149,6 +150,7 @@ private fun ReceiveFundsIntro(
                     if (isError) Text(stringResource(R.string.receive_amount_invalid))
                 },
                 isError = isError,
+                numberOfDecimals = spec?.numFractionalInputDigits ?: DEFAULT_INPUT_DECIMALS,
             )
             Text(
                 modifier = Modifier,
diff --git a/wallet/src/main/java/net/taler/wallet/SendFundsFragment.kt b/wallet/src/main/java/net/taler/wallet/SendFundsFragment.kt
@@ -50,6 +50,7 @@ import androidx.navigation.fragment.findNavController
 import net.taler.common.Amount
 import net.taler.common.CurrencySpecification
 import net.taler.wallet.compose.AmountInputField
+import net.taler.wallet.compose.DEFAULT_INPUT_DECIMALS
 import net.taler.wallet.compose.TalerSurface
 
 class SendFundsFragment : Fragment() {
@@ -133,6 +134,7 @@ private fun SendFundsIntro(
                     }
                 },
                 isError = isError || insufficientBalance,
+                numberOfDecimals = spec?.numFractionalInputDigits ?: DEFAULT_INPUT_DECIMALS,
             )
             Text(
                 modifier = Modifier,
diff --git a/wallet/src/main/java/net/taler/wallet/compose/AmountInputField.kt b/wallet/src/main/java/net/taler/wallet/compose/AmountInputField.kt
@@ -40,6 +40,8 @@ import kotlin.math.max
 import kotlin.math.pow
 import kotlin.math.roundToLong
 
+const val DEFAULT_INPUT_DECIMALS = 2
+
 @Composable
 fun AmountInputField(
     value: String,
@@ -50,7 +52,7 @@ fun AmountInputField(
     isError: Boolean = false,
     keyboardActions: KeyboardActions = KeyboardActions.Default,
     decimalFormatSymbols: DecimalFormatSymbols = DecimalFormat().decimalFormatSymbols,
-    numberOfDecimals: Int = 2,
+    numberOfDecimals: Int = DEFAULT_INPUT_DECIMALS,
 ) {
     var amountInput by remember { mutableStateOf(value) }