commit 56268671281dae81ebcb5b3a63dd979e732e26d8
parent 9a0c901734c8141327a6c9e6b50a10ad778a18f5
Author: Iván Ávalos <avalos@disroot.org>
Date: Mon, 15 Jul 2024 12:56:00 -0600
[wallet] Set amount in acceptBankIntegratedWithdrawal
Diffstat:
2 files changed, 10 insertions(+), 2 deletions(-)
diff --git a/wallet/src/main/java/net/taler/wallet/withdraw/WithdrawAmountFragment.kt b/wallet/src/main/java/net/taler/wallet/withdraw/WithdrawAmountFragment.kt
@@ -38,6 +38,8 @@ import androidx.compose.runtime.rememberCoroutineScope
import androidx.compose.runtime.setValue
import androidx.compose.ui.Alignment
import androidx.compose.ui.Modifier
+import androidx.compose.ui.focus.FocusRequester
+import androidx.compose.ui.focus.focusRequester
import androidx.compose.ui.platform.ComposeView
import androidx.compose.ui.platform.LocalContext
import androidx.compose.ui.res.stringResource
@@ -193,7 +195,7 @@ fun WithdrawAmountComposable(
var selectedAmount by remember {
mutableStateOf(amount?.amountStr ?: "0")
}
-
+ val focusRequester = remember { FocusRequester() }
val supportingText = @Composable {
if (error != null) { Text(error!!) }
}
@@ -219,7 +221,8 @@ fun WithdrawAmountComposable(
AmountInputField(
modifier = Modifier
.weight(1f)
- .padding(top = 16.dp, start = 16.dp, end = 16.dp),
+ .padding(top = 16.dp, start = 16.dp, end = 16.dp)
+ .focusRequester(focusRequester),
value = selectedAmount,
onValueChange = {
selectedAmount = it
@@ -285,6 +288,10 @@ fun WithdrawAmountComposable(
Text(stringResource(R.string.withdraw_select_amount))
}
}
+
+ LaunchedEffect(Unit) {
+ focusRequester.requestFocus()
+ }
}
@Preview
diff --git a/wallet/src/main/java/net/taler/wallet/withdraw/WithdrawManager.kt b/wallet/src/main/java/net/taler/wallet/withdraw/WithdrawManager.kt
@@ -492,6 +492,7 @@ class WithdrawManager(
restrictAge?.let { put("restrictAge", restrictAge) }
put("exchangeBaseUrl", status.exchangeBaseUrl)
put("talerWithdrawUri", status.talerWithdrawUri)
+ put("amount", status.amountRaw.toJSONString())
}.onError {
handleError("acceptBankIntegratedWithdrawal", it)
}.onSuccess {