[taler-taler-android] 03/12: [wallet] Manual withdrawal: hide fee when zero and relax paddings for smaller screens

[gnunet]

This is an automated email from the git hooks/post-receive script.

torsten-grote pushed a commit to branch master
in repository taler-android.

commit e2e65738838fb9bebedd8721c4bbd2d28483c709
Author: Iván Ávalos <avalos@disroot.org>
AuthorDate: Tue Dec 12 13:32:58 2023 -0600

    [wallet] Manual withdrawal: hide fee when zero and relax paddings for 
smaller screens
---
 .../java/net/taler/wallet/withdraw/PromptWithdrawFragment.kt   | 10 ++++++----
 .../java/net/taler/wallet/withdraw/manual/ScreenTransfer.kt    | 10 ++--------
 wallet/src/main/res/layout/fragment_prompt_withdraw.xml        |  4 ++--
 3 files changed, 10 insertions(+), 14 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
index fd67e71..caad7b6 100644
--- a/wallet/src/main/java/net/taler/wallet/withdraw/PromptWithdrawFragment.kt
+++ b/wallet/src/main/java/net/taler/wallet/withdraw/PromptWithdrawFragment.kt
@@ -164,10 +164,12 @@ class PromptWithdrawFragment : Fragment() {
         ui.chosenAmountView.text = amountRaw.toString()
         ui.chosenAmountView.fadeIn()
 
-        ui.feeLabel.fadeIn()
-        ui.feeView.text =
-            getString(R.string.amount_negative, (amountRaw - 
amountEffective).toString())
-        ui.feeView.fadeIn()
+        val fee = amountRaw - amountEffective
+        if (!fee.isZero()) {
+            ui.feeLabel.fadeIn()
+            ui.feeView.text = getString(R.string.amount_negative, 
fee.toString())
+            ui.feeView.fadeIn()
+        }
 
         ui.exchangeIntroView.fadeIn()
         ui.withdrawExchangeUrl.text = cleanExchange(exchange)
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
index 508fcc3..3179ebd 100644
--- a/wallet/src/main/java/net/taler/wallet/withdraw/manual/ScreenTransfer.kt
+++ b/wallet/src/main/java/net/taler/wallet/withdraw/manual/ScreenTransfer.kt
@@ -83,15 +83,9 @@ fun ScreenTransfer(
         val scrollState = rememberScrollState()
         Column(
             modifier = Modifier
-                .verticalScroll(scrollState)
-                .padding(all = 16.dp),
+                .verticalScroll(scrollState),
             horizontalAlignment = Alignment.CenterHorizontally,
         ) {
-            Text(
-                text = stringResource(R.string.withdraw_manual_ready_title),
-                style = MaterialTheme.typography.headlineSmall,
-            )
-
             when (val transfer = selectedTransfer) {
                 is TransferData.IBAN -> TransferIBAN(
                     transfer = transfer,
@@ -111,7 +105,7 @@ fun ScreenTransfer(
                 Button(
                     onClick = { bankAppClick(selectedTransfer) },
                     modifier = Modifier
-                        .padding(top = 16.dp)
+                        .padding(bottom = 16.dp)
                 ) {
                     Text(text = 
stringResource(R.string.withdraw_manual_ready_bank_button))
                 }
diff --git a/wallet/src/main/res/layout/fragment_prompt_withdraw.xml 
b/wallet/src/main/res/layout/fragment_prompt_withdraw.xml
index 7b63d1b..748a51a 100644
--- a/wallet/src/main/res/layout/fragment_prompt_withdraw.xml
+++ b/wallet/src/main/res/layout/fragment_prompt_withdraw.xml
@@ -98,7 +98,7 @@
         android:layout_marginEnd="16dp"
         android:gravity="center"
         android:text="@string/withdraw_fees"
-        android:visibility="invisible"
+        android:visibility="gone"
         app:layout_constraintBottom_toTopOf="@+id/feeView"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintHorizontal_bias="0.5"
@@ -116,7 +116,7 @@
         android:gravity="center"
         android:textColor="?colorError"
         android:textSize="20sp"
-        android:visibility="invisible"
+        android:visibility="gone"
         app:layout_constraintBottom_toTopOf="@+id/exchangeIntroView"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"

-- 
To stop receiving notification emails like this one, please contact
gnunet@gnunet.org.