taler-android

commit f5d9e93e6d643fbd413c58da24cac4cbad4bf55b
parent 97f8c41c87f07dcbf418f81060cc8e8842938201
Author: Iván Ávalos <avalos@disroot.org>
Date:   Tue,  1 Oct 2024 23:43:08 +0200

[wallet] fix crash on withdraw-exchange and adjust line break in subject line

Diffstat:
M
wallet/src/main/java/net/taler/wallet/withdraw/PromptWithdrawFragment.kt
 | 
4
++++
M
wallet/src/main/java/net/taler/wallet/withdraw/manual/ScreenTransfer.kt
 | 
8
+++++++-
M
wallet/src/main/java/net/taler/wallet/withdraw/manual/TransferIBAN.kt
 | 
8
+++++++-
M
wallet/src/main/java/net/taler/wallet/withdraw/manual/TransferTaler.kt
 | 
8
+++++++-

4 files changed, 25 insertions(+), 3 deletions(-)
diff --git a/wallet/src/main/java/net/taler/wallet/withdraw/PromptWithdrawFragment.kt b/wallet/src/main/java/net/taler/wallet/withdraw/PromptWithdrawFragment.kt
@@ -199,6 +199,10 @@ class PromptWithdrawFragment: Fragment() {
                         }
 
                         ManualTransferRequired -> {
+                            if (!navigating) {
+                                navigating = true
+                            } else return@collect
+
                             findNavController().navigate(
                                 R.id.action_promptWithdraw_to_nav_exchange_manual_withdrawal_success,
                             )
diff --git a/wallet/src/main/java/net/taler/wallet/withdraw/manual/ScreenTransfer.kt b/wallet/src/main/java/net/taler/wallet/withdraw/manual/ScreenTransfer.kt
@@ -45,6 +45,7 @@ import androidx.compose.ui.Modifier
 import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.text.font.FontFamily
+import androidx.compose.ui.text.style.LineBreak
 import androidx.compose.ui.text.style.TextAlign
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
@@ -189,6 +190,7 @@ fun DetailRow(
     label: String,
     content: String,
     copy: Boolean = true,
+    characterBreak: Boolean = false,
 ) {
     val context = LocalContext.current
 
@@ -209,7 +211,11 @@ fun DetailRow(
                 end = 6.dp,
             ),
             text = content,
-            style = MaterialTheme.typography.bodyLarge,
+            style = if (characterBreak) {
+                MaterialTheme.typography.bodyLarge.copy(
+                    lineBreak = LineBreak.Heading,
+                )
+            } else MaterialTheme.typography.bodyLarge,
             fontFamily = if (copy) FontFamily.Monospace else FontFamily.Default,
             textAlign = TextAlign.Center,
         )
diff --git a/wallet/src/main/java/net/taler/wallet/withdraw/manual/TransferIBAN.kt b/wallet/src/main/java/net/taler/wallet/withdraw/manual/TransferIBAN.kt
@@ -73,10 +73,16 @@ fun TransferIBAN(
                 .padding(all = 16.dp)
         )
 
-        DetailRow(stringResource(R.string.withdraw_manual_ready_subject), transfer.subject)
+        DetailRow(
+            stringResource(R.string.withdraw_manual_ready_subject),
+            transfer.subject,
+            characterBreak = true,
+        )
+
         transfer.receiverName?.let {
             DetailRow(stringResource(R.string.withdraw_manual_ready_receiver), it)
         }
+
         DetailRow(stringResource(R.string.withdraw_manual_ready_iban), transfer.iban)
 
         TransactionInfoComposable(
diff --git a/wallet/src/main/java/net/taler/wallet/withdraw/manual/TransferTaler.kt b/wallet/src/main/java/net/taler/wallet/withdraw/manual/TransferTaler.kt
@@ -73,10 +73,16 @@ fun TransferTaler(
                 .padding(all = 16.dp)
         )
 
-        DetailRow(stringResource(R.string.withdraw_manual_ready_subject), transfer.subject)
+        DetailRow(
+            stringResource(R.string.withdraw_manual_ready_subject),
+            transfer.subject,
+            characterBreak = true,
+        )
+
         transfer.receiverName?.let {
             DetailRow(stringResource(R.string.withdraw_manual_ready_receiver), it)
         }
+
         DetailRow(stringResource(R.string.withdraw_manual_ready_account), transfer.account)
 
         TransactionInfoComposable(