[wallet] Show withdraw summary before ToS and do one-click accept

4 files changed, 24 insertions, 40 deletions

diff --git a/wallet/src/main/res/layout/fragment_prompt_withdraw.xml b/wallet/src/main/res/layout/fragment_prompt_withdraw.xml
index fe64bad..b03ee03 100644
--- a/wallet/src/main/res/layout/fragment_prompt_withdraw.xml
+++ b/wallet/src/main/res/layout/fragment_prompt_withdraw.xml
@@ -29,7 +29,7 @@
         android:layout_marginEnd="16dp"
         android:layout_marginBottom="8dp"
         android:gravity="center"
-        android:text="@string/withdraw_do_you_want"
+        android:text="@string/withdraw_total"
         android:visibility="invisible"
         app:layout_constraintBottom_toTopOf="@+id/withdrawAmountView"
         app:layout_constraintEnd_toEndOf="parent"
@@ -97,13 +97,13 @@
         android:layout_marginStart="16dp"
         android:layout_marginEnd="16dp"
         android:gravity="center"
-        android:textSize="25sp"
+        android:textSize="24sp"
         android:visibility="invisible"
         app:layout_constraintBottom_toTopOf="@+id/withdrawCard"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@+id/exchangeIntroView"
-        tools:text="(exchange base url)"
+        tools:text="long.exchange.demo.taler.net"
         tools:visibility="visible" />
 
     <ProgressBar
@@ -121,9 +121,11 @@
         style="@style/BottomCard"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
+        android:visibility="invisible"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent">
+        app:layout_constraintStart_toStartOf="parent"
+        tools:visibility="visible">
 
         <androidx.constraintlayout.widget.ConstraintLayout
             android:layout_width="match_parent"
@@ -140,7 +142,9 @@
                 app:layout_constraintBottom_toBottomOf="parent"
                 app:layout_constraintEnd_toEndOf="parent"
                 app:layout_constraintHorizontal_bias="1.0"
-                app:layout_constraintStart_toStartOf="parent" />
+                app:layout_constraintStart_toStartOf="parent"
+                tools:enabled="true"
+                tools:text="@string/withdraw_button_tos" />
 
             <ProgressBar
                 android:id="@+id/confirmProgressBar"
diff --git a/wallet/src/main/res/layout/fragment_review_exchange_tos.xml b/wallet/src/main/res/layout/fragment_review_exchange_tos.xml
index 9c7d7a1..2587c1a 100644
--- a/wallet/src/main/res/layout/fragment_review_exchange_tos.xml
+++ b/wallet/src/main/res/layout/fragment_review_exchange_tos.xml
@@ -60,35 +60,15 @@
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent">
 
-        <androidx.constraintlayout.widget.ConstraintLayout
-            android:layout_width="match_parent"
+        <CheckBox
+            android:id="@+id/acceptTosCheckBox"
+            android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:padding="8dp">
-
-            <CheckBox
-                android:id="@+id/acceptTosCheckBox"
-                android:layout_width="0dp"
-                android:layout_height="wrap_content"
-                android:text="@string/exchange_tos_accept"
-                android:visibility="invisible"
-                app:layout_constraintBottom_toTopOf="@+id/acceptTosButton"
-                app:layout_constraintEnd_toEndOf="parent"
-                app:layout_constraintStart_toStartOf="parent"
-                tools:visibility="visible" />
-
-            <Button
-                android:id="@+id/acceptTosButton"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:backgroundTint="@color/green"
-                android:enabled="false"
-                android:text="@string/exchange_tos_button_continue"
-                app:layout_constraintBottom_toBottomOf="parent"
-                app:layout_constraintEnd_toEndOf="parent"
-                app:layout_constraintHorizontal_bias="1.0"
-                app:layout_constraintStart_toStartOf="parent" />
-
-        </androidx.constraintlayout.widget.ConstraintLayout>
+            android:layout_marginStart="8dp"
+            android:layout_marginEnd="8dp"
+            android:text="@string/exchange_tos_accept"
+            android:visibility="invisible"
+            tools:visibility="visible" />
 
     </com.google.android.material.card.MaterialCardView>
 
diff --git a/wallet/src/main/res/navigation/nav_graph.xml b/wallet/src/main/res/navigation/nav_graph.xml
index 39aa182..9875b8a 100644
--- a/wallet/src/main/res/navigation/nav_graph.xml
+++ b/wallet/src/main/res/navigation/nav_graph.xml
@@ -74,14 +74,13 @@
         android:label="@string/nav_prompt_withdraw"
         tools:layout="@layout/fragment_prompt_withdraw">
         <action
+            android:id="@+id/action_promptWithdraw_to_reviewExchangeTOS"
+            app:destination="@id/reviewExchangeTOS" />
+        <action
             android:id="@+id/action_promptWithdraw_to_withdrawSuccessful"
             app:destination="@id/withdrawSuccessful"
             app:popUpTo="@id/showBalance" />
         <action
-            android:id="@+id/action_promptWithdraw_to_reviewExchangeTOS"
-            app:destination="@id/reviewExchangeTOS"
-            app:popUpTo="@id/showBalance" />
-        <action
             android:id="@+id/action_promptWithdraw_to_errorFragment"
             app:destination="@id/errorFragment"
             app:popUpTo="@id/showBalance" />
diff --git a/wallet/src/main/res/values/strings.xml b/wallet/src/main/res/values/strings.xml
index b16808c..8cd2dd8 100644
--- a/wallet/src/main/res/values/strings.xml
+++ b/wallet/src/main/res/values/strings.xml
@@ -79,11 +79,12 @@
 
     <string name="withdraw_accepted">Withdrawal accepted</string>
     <string name="withdraw_success_info">The wire transfer now needs to be confirmed with the bank. Once the wire transfer is complete, the digital cash will automatically show in this wallet.</string>
-    <string name="withdraw_do_you_want">Do you want to withdraw</string>
-    <string name="withdraw_fees">(minus exchange fees not shown in this prototype)</string>
-    <string name="withdraw_exchange">Using the exchange provider</string>
+    <string name="withdraw_total">Withdraw</string>
+    <string name="withdraw_fees">(minus exchange fees)</string>
+    <string name="withdraw_exchange">Exchange</string>
     <string name="withdraw_button_testkudos">Withdraw TESTKUDOS</string>
     <string name="withdraw_button_confirm">Confirm Withdraw</string>
+    <string name="withdraw_button_tos">Review Terms</string>
     <string name="withdraw_error_title">Withdrawal Error</string>
     <string name="withdraw_error_message">Withdrawing is currently not possible. Please try again later!</string>