From 81853300771c80c12d28df51388aa6b2d5eeb0d4 Mon Sep 17 00:00:00 2001
From: Iván Ávalos <avalos@disroot.org>
Date: Wed, 28 Feb 2024 13:24:51 -0600
Subject:     [wallet] More logical order of amounts

    bug 0008542
---
 .../main/res/layout/fragment_prompt_withdraw.xml   | 70 +++++++++++-----------
 1 file changed, 36 insertions(+), 34 deletions(-)

(limited to 'wallet/src/main/res/layout')

diff --git a/wallet/src/main/res/layout/fragment_prompt_withdraw.xml b/wallet/src/main/res/layout/fragment_prompt_withdraw.xml
index 748a51a..44d95de 100644
--- a/wallet/src/main/res/layout/fragment_prompt_withdraw.xml
+++ b/wallet/src/main/res/layout/fragment_prompt_withdraw.xml
@@ -22,106 +22,108 @@
     tools:context=".withdraw.PromptWithdrawFragment">
 
     <TextView
-        android:id="@+id/introView"
+        android:id="@+id/chosenAmountLabel"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_marginStart="16dp"
+        android:layout_marginTop="32dp"
         android:layout_marginEnd="16dp"
-        android:layout_marginBottom="8dp"
         android:gravity="center"
-        android:text="@string/withdraw_total"
+        android:text="@string/amount_chosen"
         android:visibility="invisible"
-        app:layout_constraintBottom_toTopOf="@+id/effectiveAmountView"
+        app:layout_constraintBottom_toTopOf="@+id/chosenAmountView"
         app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintHorizontal_bias="0.5"
         app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/effectiveAmountView"
         app:layout_constraintTop_toTopOf="parent"
         app:layout_constraintVertical_chainStyle="packed"
         tools:visibility="visible" />
 
     <TextView
-        android:id="@+id/effectiveAmountView"
+        android:id="@+id/chosenAmountView"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_marginStart="16dp"
+        android:layout_marginTop="8dp"
         android:layout_marginEnd="16dp"
         android:gravity="center"
-        android:textColor="@color/green"
-        android:textSize="24sp"
+        android:textSize="20sp"
         android:visibility="invisible"
-        app:layout_constraintBottom_toTopOf="@+id/chosenAmountLabel"
+        app:layout_constraintBottom_toTopOf="@+id/feeLabel"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/introView"
-        tools:text="9.8 TESTKUDOS"
+        app:layout_constraintTop_toBottomOf="@id/chosenAmountLabel"
+        tools:text="10 TESTKUDOS"
         tools:visibility="visible" />
 
     <TextView
-        android:id="@+id/chosenAmountLabel"
+        android:id="@+id/feeLabel"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_marginStart="16dp"
         android:layout_marginTop="32dp"
         android:layout_marginEnd="16dp"
         android:gravity="center"
-        android:text="@string/amount_chosen"
-        android:visibility="invisible"
-        app:layout_constraintBottom_toTopOf="@+id/chosenAmountView"
+        android:text="@string/withdraw_fees"
+        android:visibility="gone"
+        app:layout_constraintBottom_toTopOf="@+id/feeView"
         app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintHorizontal_bias="0.5"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/effectiveAmountView"
+        app:layout_constraintTop_toBottomOf="@+id/chosenAmountView"
         tools:visibility="visible" />
 
     <TextView
-        android:id="@+id/chosenAmountView"
+        android:id="@+id/feeView"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_marginStart="16dp"
         android:layout_marginTop="8dp"
         android:layout_marginEnd="16dp"
         android:gravity="center"
+        android:textColor="?colorError"
         android:textSize="20sp"
-        android:visibility="invisible"
-        app:layout_constraintBottom_toTopOf="@+id/feeLabel"
+        android:visibility="gone"
+        app:layout_constraintBottom_toTopOf="@+id/introView"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/chosenAmountLabel"
-        tools:text="10 TESTKUDOS"
+        app:layout_constraintTop_toBottomOf="@+id/feeLabel"
+        tools:text="-0.2 TESTKUDOS"
         tools:visibility="visible" />
 
     <TextView
-        android:id="@+id/feeLabel"
+        android:id="@+id/introView"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_marginStart="16dp"
         android:layout_marginTop="32dp"
         android:layout_marginEnd="16dp"
+        android:layout_marginBottom="8dp"
         android:gravity="center"
-        android:text="@string/withdraw_fees"
-        android:visibility="gone"
-        app:layout_constraintBottom_toTopOf="@+id/feeView"
+        android:text="@string/withdraw_total"
+        android:visibility="invisible"
+        app:layout_constraintBottom_toTopOf="@+id/effectiveAmountView"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintHorizontal_bias="0.5"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/chosenAmountView"
+        app:layout_constraintTop_toBottomOf="@id/feeView"
         tools:visibility="visible" />
 
     <TextView
-        android:id="@+id/feeView"
+        android:id="@+id/effectiveAmountView"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_marginStart="16dp"
-        android:layout_marginTop="8dp"
         android:layout_marginEnd="16dp"
         android:gravity="center"
-        android:textColor="?colorError"
-        android:textSize="20sp"
-        android:visibility="gone"
+        android:textColor="@color/green"
+        android:textSize="24sp"
+        android:visibility="invisible"
         app:layout_constraintBottom_toTopOf="@+id/exchangeIntroView"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/feeLabel"
-        tools:text="-0.2 TESTKUDOS"
+        app:layout_constraintTop_toBottomOf="@+id/introView"
+        tools:text="9.8 TESTKUDOS"
         tools:visibility="visible" />
 
     <TextView
@@ -139,7 +141,7 @@
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintHorizontal_bias="0.5"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/feeView"
+        app:layout_constraintTop_toBottomOf="@+id/effectiveAmountView"
         tools:visibility="visible" />
 
     <TextView
-- 
cgit v1.2.3