taler-android

commit 143ff853f67a89b8e4415950f26c432682b777c2
parent 67c7b0c70eedaf7a3b1e702882ffd7a6fcdf2724
Author: Iván Ávalos <avalos@disroot.org>
Date:   Thu,  4 Dec 2025 18:18:12 +0100

[wallet] make error screens scrollable

Diffstat:
M
wallet/src/main/java/net/taler/wallet/accounts/AddAccountComposable.kt
 | 
4
+++-
M
wallet/src/main/java/net/taler/wallet/deposit/DepositAmountComposable.kt
 | 
11
++++++-----
M
wallet/src/main/java/net/taler/wallet/peer/OutgoingPullComposable.kt
 | 
2
+-
M
wallet/src/main/java/net/taler/wallet/peer/OutgoingPushComposable.kt
 | 
2
+-
M
wallet/src/main/java/net/taler/wallet/withdraw/WithdrawalShowInfo.kt
 | 
2
+-

5 files changed, 12 insertions(+), 9 deletions(-)
diff --git a/wallet/src/main/java/net/taler/wallet/accounts/AddAccountComposable.kt b/wallet/src/main/java/net/taler/wallet/accounts/AddAccountComposable.kt
@@ -79,7 +79,9 @@ fun AddAccountComposable(
         return ErrorComposable(
             error = TalerErrorInfo.makeCustomError(
                 stringResource(R.string.send_deposit_no_methods_error)),
-            modifier = Modifier.verticalScroll(rememberScrollState()),
+            modifier = Modifier
+                .fillMaxSize()
+                .verticalScroll(rememberScrollState()),
             devMode = false,
             onClose = onClose,
         )
diff --git a/wallet/src/main/java/net/taler/wallet/deposit/DepositAmountComposable.kt b/wallet/src/main/java/net/taler/wallet/deposit/DepositAmountComposable.kt
@@ -49,6 +49,7 @@ import net.taler.wallet.backend.TalerErrorInfo
 import net.taler.wallet.compose.AmountCurrencyField
 import net.taler.wallet.compose.BottomButtonBox
 import net.taler.wallet.compose.ErrorComposable
+import net.taler.wallet.compose.TalerSurface
 import net.taler.wallet.systemBarsPaddingBottom
 import net.taler.wallet.transactions.AmountType.Negative
 import net.taler.wallet.transactions.AmountType.Positive
@@ -98,7 +99,7 @@ fun DepositAmountComposable(
                     // FIXME: i18n string
                     error = TalerErrorInfo.makeCustomError(
                         "It is not possible to deposit to this account, please select another one"),
-                    modifier = Modifier.weight(1f),
+                    modifier = Modifier.fillMaxSize(),
                     devMode = false,
                     onClose = onClose,
                 )
@@ -206,7 +207,7 @@ fun DepositAmountComposable(
 @Preview
 @Composable
 fun DepositAmountComposablePreview() {
-    Surface {
+    TalerSurface {
         val state = DepositState.AccountSelected(
             KnownBankAccountInfo(
                 bankAccountId = "acct:1234",
@@ -250,14 +251,14 @@ fun DepositAmountComposablePreview() {
 @Preview
 @Composable
 fun DepositAmountComposableErrorPreview() {
-    Surface {
+    TalerSurface {
         val state = DepositState.AccountSelected(
             KnownBankAccountInfo(
                 bankAccountId = "acct:1234",
                 paytoUri = "payto://",
                 kycCompleted = false,
-                currencies = listOf("KUDOS", "TESTKUDOS"),
-                label = "Test accoul "
+                currencies = listOf(),
+                label = "Test account"
             ),
             maxDepositable = mapOf(),
         )
diff --git a/wallet/src/main/java/net/taler/wallet/peer/OutgoingPullComposable.kt b/wallet/src/main/java/net/taler/wallet/peer/OutgoingPullComposable.kt
@@ -163,7 +163,7 @@ fun OutgoingPullComposable(
 
             if (state is OutgoingError) {
                 ErrorComposable(state.info,
-                    modifier = Modifier.weight(1f),
+                    modifier = Modifier.fillMaxSize(),
                     devMode = devMode)
                 return@Column
             }
diff --git a/wallet/src/main/java/net/taler/wallet/peer/OutgoingPushComposable.kt b/wallet/src/main/java/net/taler/wallet/peer/OutgoingPushComposable.kt
@@ -213,7 +213,7 @@ fun OutgoingPushIntroComposable(
 
             if (state is OutgoingError) {
                 ErrorComposable(state.info,
-                    modifier = Modifier.weight(1f),
+                    modifier = Modifier.fillMaxSize(),
                     devMode = devMode)
                 return@Column
             }
diff --git a/wallet/src/main/java/net/taler/wallet/withdraw/WithdrawalShowInfo.kt b/wallet/src/main/java/net/taler/wallet/withdraw/WithdrawalShowInfo.kt
@@ -166,7 +166,7 @@ fun WithdrawalShowInfo(
                 return
             } else if (status.status == Error && status.error != null) {
                 ErrorComposable(status.error,
-                    modifier = Modifier.weight(1f),
+                    modifier = Modifier.fillMaxSize(),
                     devMode = devMode)
                 return
             } else if (status.isCashAcceptor) {