From c3f777e6154d33d26b2431fa886678edf029dd34 Mon Sep 17 00:00:00 2001
From: Torsten Grote <t@grobox.de>
Date: Thu, 2 Apr 2020 10:57:36 -0300
Subject: [wallet] remove abort/cancel buttons

---
 .../main/res/layout-w550dp/payment_bottom_bar.xml  | 18 +---------------
 .../main/res/layout/fragment_prompt_withdraw.xml   | 24 +++++++---------------
 .../res/layout/fragment_review_exchange_tos.xml    | 14 ++-----------
 wallet/src/main/res/layout/payment_bottom_bar.xml  | 22 +++++---------------
 wallet/src/main/res/values/strings.xml             |  2 --
 5 files changed, 15 insertions(+), 65 deletions(-)

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

diff --git a/wallet/src/main/res/layout-w550dp/payment_bottom_bar.xml b/wallet/src/main/res/layout-w550dp/payment_bottom_bar.xml
index d9952f8..b5eabbe 100644
--- a/wallet/src/main/res/layout-w550dp/payment_bottom_bar.xml
+++ b/wallet/src/main/res/layout-w550dp/payment_bottom_bar.xml
@@ -31,14 +31,13 @@
             android:id="@+id/totalLabelView"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginStart="8dp"
             android:text="@string/payment_label_amount_total"
             android:visibility="invisible"
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintEnd_toStartOf="@+id/totalView"
             app:layout_constraintHorizontal_bias="1.0"
             app:layout_constraintHorizontal_chainStyle="packed"
-            app:layout_constraintStart_toEndOf="@+id/abortButton"
+            app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toTopOf="@+id/totalView"
             app:layout_constraintVertical_bias="0.0"
             tools:visibility="visible" />
@@ -78,19 +77,6 @@
             tools:text="@string/payment_fee"
             tools:visibility="visible" />
 
-        <Button
-            android:id="@+id/abortButton"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_margin="8dp"
-            android:backgroundTint="@color/red"
-            android:text="@string/payment_button_abort"
-            app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintEnd_toStartOf="@+id/confirmButton"
-            app:layout_constraintHorizontal_chainStyle="spread_inside"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toTopOf="parent" />
-
         <Button
             android:id="@+id/confirmButton"
             android:layout_width="wrap_content"
@@ -101,8 +87,6 @@
             android:text="@string/payment_button_confirm"
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintHorizontal_bias="0.5"
-            app:layout_constraintStart_toEndOf="@+id/abortButton"
             app:layout_constraintTop_toTopOf="parent"
             tools:enabled="true" />
 
diff --git a/wallet/src/main/res/layout/fragment_prompt_withdraw.xml b/wallet/src/main/res/layout/fragment_prompt_withdraw.xml
index 0d507c8..fe64bad 100644
--- a/wallet/src/main/res/layout/fragment_prompt_withdraw.xml
+++ b/wallet/src/main/res/layout/fragment_prompt_withdraw.xml
@@ -131,18 +131,7 @@
             android:padding="8dp">
 
             <Button
-                android:id="@+id/button_cancel_withdraw"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:backgroundTint="@color/red"
-                android:text="@string/button_cancel"
-                app:layout_constraintBottom_toBottomOf="parent"
-                app:layout_constraintEnd_toStartOf="@+id/button_confirm_withdraw"
-                app:layout_constraintHorizontal_chainStyle="spread_inside"
-                app:layout_constraintStart_toStartOf="parent" />
-
-            <Button
-                android:id="@+id/button_confirm_withdraw"
+                android:id="@+id/confirmWithdrawButton"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:backgroundTint="@color/green"
@@ -150,7 +139,8 @@
                 android:text="@string/withdraw_button_confirm"
                 app:layout_constraintBottom_toBottomOf="parent"
                 app:layout_constraintEnd_toEndOf="parent"
-                app:layout_constraintStart_toEndOf="@+id/button_cancel_withdraw" />
+                app:layout_constraintHorizontal_bias="1.0"
+                app:layout_constraintStart_toStartOf="parent" />
 
             <ProgressBar
                 android:id="@+id/confirmProgressBar"
@@ -158,10 +148,10 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:visibility="invisible"
-                app:layout_constraintBottom_toBottomOf="@+id/button_confirm_withdraw"
-                app:layout_constraintEnd_toEndOf="@+id/button_confirm_withdraw"
-                app:layout_constraintStart_toStartOf="@+id/button_confirm_withdraw"
-                app:layout_constraintTop_toTopOf="@+id/button_confirm_withdraw"
+                app:layout_constraintBottom_toBottomOf="@+id/confirmWithdrawButton"
+                app:layout_constraintEnd_toEndOf="@+id/confirmWithdrawButton"
+                app:layout_constraintStart_toStartOf="@+id/confirmWithdrawButton"
+                app:layout_constraintTop_toTopOf="@+id/confirmWithdrawButton"
                 tools:visibility="visible" />
 
         </androidx.constraintlayout.widget.ConstraintLayout>
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 69f5c7c..9c7d7a1 100644
--- a/wallet/src/main/res/layout/fragment_review_exchange_tos.xml
+++ b/wallet/src/main/res/layout/fragment_review_exchange_tos.xml
@@ -76,17 +76,6 @@
                 app:layout_constraintStart_toStartOf="parent"
                 tools:visibility="visible" />
 
-            <Button
-                android:id="@+id/abortTosButton"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:backgroundTint="@color/red"
-                android:text="@string/button_cancel"
-                app:layout_constraintBottom_toBottomOf="parent"
-                app:layout_constraintEnd_toStartOf="@+id/acceptTosButton"
-                app:layout_constraintHorizontal_chainStyle="spread_inside"
-                app:layout_constraintStart_toStartOf="parent" />
-
             <Button
                 android:id="@+id/acceptTosButton"
                 android:layout_width="wrap_content"
@@ -96,7 +85,8 @@
                 android:text="@string/exchange_tos_button_continue"
                 app:layout_constraintBottom_toBottomOf="parent"
                 app:layout_constraintEnd_toEndOf="parent"
-                app:layout_constraintStart_toEndOf="@+id/abortTosButton" />
+                app:layout_constraintHorizontal_bias="1.0"
+                app:layout_constraintStart_toStartOf="parent" />
 
         </androidx.constraintlayout.widget.ConstraintLayout>
 
diff --git a/wallet/src/main/res/layout/payment_bottom_bar.xml b/wallet/src/main/res/layout/payment_bottom_bar.xml
index c17068e..a19ac4e 100644
--- a/wallet/src/main/res/layout/payment_bottom_bar.xml
+++ b/wallet/src/main/res/layout/payment_bottom_bar.xml
@@ -32,13 +32,13 @@
             android:layout_height="wrap_content"
             android:layout_marginStart="8dp"
             android:layout_marginTop="8dp"
-            android:layout_marginBottom="8dp"
+            android:layout_marginBottom="27dp"
             android:text="@string/payment_label_amount_total"
             android:visibility="invisible"
-            app:layout_constraintBottom_toTopOf="@+id/abortButton"
+            app:layout_constraintBottom_toTopOf="@+id/confirmButton"
             app:layout_constraintEnd_toStartOf="@+id/totalView"
             app:layout_constraintHorizontal_bias="1.0"
-            app:layout_constraintHorizontal_chainStyle="spread_inside"
+            app:layout_constraintHorizontal_chainStyle="packed"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toTopOf="parent"
             app:layout_constraintVertical_bias="0.0"
@@ -79,18 +79,6 @@
             tools:text="@string/payment_fee"
             tools:visibility="visible" />
 
-        <Button
-            android:id="@+id/abortButton"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_margin="8dp"
-            android:backgroundTint="@color/red"
-            android:text="@string/payment_button_abort"
-            app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintEnd_toStartOf="@+id/confirmButton"
-            app:layout_constraintHorizontal_chainStyle="spread_inside"
-            app:layout_constraintStart_toStartOf="parent" />
-
         <Button
             android:id="@+id/confirmButton"
             android:layout_width="wrap_content"
@@ -101,8 +89,8 @@
             android:text="@string/payment_button_confirm"
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintHorizontal_bias="0.5"
-            app:layout_constraintStart_toEndOf="@+id/abortButton"
+            app:layout_constraintHorizontal_bias="1.0"
+            app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@+id/feeView"
             tools:enabled="true" />
 
diff --git a/wallet/src/main/res/values/strings.xml b/wallet/src/main/res/values/strings.xml
index 6bc073f..b16808c 100644
--- a/wallet/src/main/res/values/strings.xml
+++ b/wallet/src/main/res/values/strings.xml
@@ -26,7 +26,6 @@
     <string name="nav_error">Error</string>
 
     <string name="button_back">Go Back</string>
-    <string name="button_cancel">Cancel</string>
     <string name="button_continue">Continue</string>
     <string name="button_scan_qr_code">Scan Taler QR Code</string>
 
@@ -68,7 +67,6 @@
 
     <string name="payment_fee">+%s payment fee</string>
     <string name="payment_button_confirm">Confirm Payment</string>
-    <string name="payment_button_abort">Abort</string>
     <string name="payment_label_amount_total">Total Amount:</string>
     <string name="payment_label_order_summary">Order</string>
     <string name="payment_error">Error: %s</string>
-- 
cgit v1.2.3