From 0936fc851232c8c6c41ce4a0c479ba7a1e452137 Mon Sep 17 00:00:00 2001
From: Torsten Grote <t@grobox.de>
Date: Mon, 28 Sep 2020 12:12:20 -0300
Subject: [wallet] implement exchange selection for withdrawals

---
 .../src/main/res/layout/fragment_exchange_fees.xml | 140 +++++++++++++++++++++
 .../main/res/layout/fragment_prompt_withdraw.xml   |   2 +-
 .../main/res/layout/fragment_select_exchange.xml   | 140 ---------------------
 wallet/src/main/res/navigation/nav_graph.xml       |   4 +-
 wallet/src/main/res/values/strings.xml             |   1 +
 5 files changed, 144 insertions(+), 143 deletions(-)
 create mode 100644 wallet/src/main/res/layout/fragment_exchange_fees.xml
 delete mode 100644 wallet/src/main/res/layout/fragment_select_exchange.xml

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

diff --git a/wallet/src/main/res/layout/fragment_exchange_fees.xml b/wallet/src/main/res/layout/fragment_exchange_fees.xml
new file mode 100644
index 0000000..6f8814f
--- /dev/null
+++ b/wallet/src/main/res/layout/fragment_exchange_fees.xml
@@ -0,0 +1,140 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+  ~ This file is part of GNU Taler
+  ~ (C) 2020 Taler Systems S.A.
+  ~
+  ~ GNU Taler is free software; you can redistribute it and/or modify it under the
+  ~ terms of the GNU General Public License as published by the Free Software
+  ~ Foundation; either version 3, or (at your option) any later version.
+  ~
+  ~ GNU Taler is distributed in the hope that it will be useful, but WITHOUT ANY
+  ~ WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+  ~ A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+  ~
+  ~ You should have received a copy of the GNU General Public License along with
+  ~ GNU Taler; see the file COPYING.  If not, see <http://www.gnu.org/licenses/>
+  -->
+
+<androidx.core.widget.NestedScrollView xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+
+    <androidx.constraintlayout.widget.ConstraintLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content">
+
+        <TextView
+            android:id="@+id/withdrawFeeLabel"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="16dp"
+            android:layout_marginTop="16dp"
+            android:text="@string/exchange_fee_withdrawal_fee_label"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="parent" />
+
+        <TextView
+            android:id="@+id/withdrawFeeView"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="8dp"
+            android:layout_marginEnd="16dp"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toEndOf="@+id/withdrawFeeLabel"
+            app:layout_constraintTop_toTopOf="@+id/withdrawFeeLabel"
+            tools:text="-0.23 TESTKUDOS"
+            tools:textColor="@color/red" />
+
+        <TextView
+            android:id="@+id/overheadLabel"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="16dp"
+            android:text="@string/exchange_fee_overhead_label"
+            app:layout_constraintStart_toStartOf="@+id/withdrawFeeLabel"
+            app:layout_constraintTop_toBottomOf="@+id/withdrawFeeLabel" />
+
+        <TextView
+            android:id="@+id/overheadView"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="8dp"
+            app:layout_constraintEnd_toEndOf="@+id/withdrawFeeView"
+            app:layout_constraintStart_toEndOf="@+id/overheadLabel"
+            app:layout_constraintTop_toTopOf="@+id/overheadLabel"
+            tools:text="-0.42 TESTKUDOS"
+            tools:textColor="@color/red" />
+
+        <TextView
+            android:id="@+id/expirationLabel"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="16dp"
+            android:text="@string/exchange_fee_coin_expiration_label"
+            app:layout_constraintStart_toStartOf="@+id/withdrawFeeLabel"
+            app:layout_constraintTop_toBottomOf="@+id/overheadLabel" />
+
+        <TextView
+            android:id="@+id/expirationView"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="8dp"
+            android:layout_marginEnd="16dp"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toEndOf="@+id/expirationLabel"
+            app:layout_constraintTop_toTopOf="@+id/expirationLabel"
+            tools:text="in 5 years" />
+
+        <TextView
+            android:id="@+id/coinFeesLabel"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="16dp"
+            android:text="@string/exchange_fee_coin_fees_label"
+            android:textColor="?android:attr/textColorPrimary"
+            android:textSize="16sp"
+            app:layout_constraintStart_toStartOf="@+id/withdrawFeeLabel"
+            app:layout_constraintTop_toBottomOf="@+id/expirationLabel" />
+
+        <androidx.recyclerview.widget.RecyclerView
+            android:id="@+id/coinFeesList"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="16dp"
+            android:layout_marginTop="8dp"
+            android:layout_marginEnd="16dp"
+            android:overScrollMode="never"
+            app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@+id/coinFeesLabel"
+            tools:listitem="@layout/list_item_coin_fee" />
+
+        <TextView
+            android:id="@+id/wireFeesLabel"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="16dp"
+            android:text="@string/exchange_fee_wire_fees_label"
+            android:textColor="?android:attr/textColorPrimary"
+            android:textSize="16sp"
+            app:layout_constraintStart_toStartOf="@+id/withdrawFeeLabel"
+            app:layout_constraintTop_toBottomOf="@+id/coinFeesList" />
+
+        <androidx.recyclerview.widget.RecyclerView
+            android:id="@+id/wireFeesList"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="16dp"
+            android:layout_marginTop="8dp"
+            android:layout_marginEnd="16dp"
+            android:overScrollMode="never"
+            app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@+id/wireFeesLabel"
+            tools:listitem="@layout/list_item_wire_fee" />
+
+    </androidx.constraintlayout.widget.ConstraintLayout>
+</androidx.core.widget.NestedScrollView>
diff --git a/wallet/src/main/res/layout/fragment_prompt_withdraw.xml b/wallet/src/main/res/layout/fragment_prompt_withdraw.xml
index 6bca4ef..421911a 100644
--- a/wallet/src/main/res/layout/fragment_prompt_withdraw.xml
+++ b/wallet/src/main/res/layout/fragment_prompt_withdraw.xml
@@ -169,7 +169,7 @@
         android:contentDescription="@string/nav_exchange_fees"
         android:src="@drawable/ic_edit"
         android:tint="?attr/colorOnPrimary"
-        android:visibility="invisible"
+        android:visibility="gone"
         app:layout_constraintBottom_toBottomOf="@+id/withdrawExchangeUrl"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toEndOf="@+id/withdrawExchangeUrl"
diff --git a/wallet/src/main/res/layout/fragment_select_exchange.xml b/wallet/src/main/res/layout/fragment_select_exchange.xml
deleted file mode 100644
index 6f8814f..0000000
--- a/wallet/src/main/res/layout/fragment_select_exchange.xml
+++ /dev/null
@@ -1,140 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?><!--
-  ~ This file is part of GNU Taler
-  ~ (C) 2020 Taler Systems S.A.
-  ~
-  ~ GNU Taler is free software; you can redistribute it and/or modify it under the
-  ~ terms of the GNU General Public License as published by the Free Software
-  ~ Foundation; either version 3, or (at your option) any later version.
-  ~
-  ~ GNU Taler is distributed in the hope that it will be useful, but WITHOUT ANY
-  ~ WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
-  ~ A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
-  ~
-  ~ You should have received a copy of the GNU General Public License along with
-  ~ GNU Taler; see the file COPYING.  If not, see <http://www.gnu.org/licenses/>
-  -->
-
-<androidx.core.widget.NestedScrollView xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent">
-
-    <androidx.constraintlayout.widget.ConstraintLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content">
-
-        <TextView
-            android:id="@+id/withdrawFeeLabel"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginStart="16dp"
-            android:layout_marginTop="16dp"
-            android:text="@string/exchange_fee_withdrawal_fee_label"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toTopOf="parent" />
-
-        <TextView
-            android:id="@+id/withdrawFeeView"
-            android:layout_width="0dp"
-            android:layout_height="wrap_content"
-            android:layout_marginStart="8dp"
-            android:layout_marginEnd="16dp"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toEndOf="@+id/withdrawFeeLabel"
-            app:layout_constraintTop_toTopOf="@+id/withdrawFeeLabel"
-            tools:text="-0.23 TESTKUDOS"
-            tools:textColor="@color/red" />
-
-        <TextView
-            android:id="@+id/overheadLabel"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="16dp"
-            android:text="@string/exchange_fee_overhead_label"
-            app:layout_constraintStart_toStartOf="@+id/withdrawFeeLabel"
-            app:layout_constraintTop_toBottomOf="@+id/withdrawFeeLabel" />
-
-        <TextView
-            android:id="@+id/overheadView"
-            android:layout_width="0dp"
-            android:layout_height="wrap_content"
-            android:layout_marginStart="8dp"
-            app:layout_constraintEnd_toEndOf="@+id/withdrawFeeView"
-            app:layout_constraintStart_toEndOf="@+id/overheadLabel"
-            app:layout_constraintTop_toTopOf="@+id/overheadLabel"
-            tools:text="-0.42 TESTKUDOS"
-            tools:textColor="@color/red" />
-
-        <TextView
-            android:id="@+id/expirationLabel"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="16dp"
-            android:text="@string/exchange_fee_coin_expiration_label"
-            app:layout_constraintStart_toStartOf="@+id/withdrawFeeLabel"
-            app:layout_constraintTop_toBottomOf="@+id/overheadLabel" />
-
-        <TextView
-            android:id="@+id/expirationView"
-            android:layout_width="0dp"
-            android:layout_height="wrap_content"
-            android:layout_marginStart="8dp"
-            android:layout_marginEnd="16dp"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toEndOf="@+id/expirationLabel"
-            app:layout_constraintTop_toTopOf="@+id/expirationLabel"
-            tools:text="in 5 years" />
-
-        <TextView
-            android:id="@+id/coinFeesLabel"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="16dp"
-            android:text="@string/exchange_fee_coin_fees_label"
-            android:textColor="?android:attr/textColorPrimary"
-            android:textSize="16sp"
-            app:layout_constraintStart_toStartOf="@+id/withdrawFeeLabel"
-            app:layout_constraintTop_toBottomOf="@+id/expirationLabel" />
-
-        <androidx.recyclerview.widget.RecyclerView
-            android:id="@+id/coinFeesList"
-            android:layout_width="0dp"
-            android:layout_height="wrap_content"
-            android:layout_marginStart="16dp"
-            android:layout_marginTop="8dp"
-            android:layout_marginEnd="16dp"
-            android:overScrollMode="never"
-            app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@+id/coinFeesLabel"
-            tools:listitem="@layout/list_item_coin_fee" />
-
-        <TextView
-            android:id="@+id/wireFeesLabel"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="16dp"
-            android:text="@string/exchange_fee_wire_fees_label"
-            android:textColor="?android:attr/textColorPrimary"
-            android:textSize="16sp"
-            app:layout_constraintStart_toStartOf="@+id/withdrawFeeLabel"
-            app:layout_constraintTop_toBottomOf="@+id/coinFeesList" />
-
-        <androidx.recyclerview.widget.RecyclerView
-            android:id="@+id/wireFeesList"
-            android:layout_width="0dp"
-            android:layout_height="wrap_content"
-            android:layout_marginStart="16dp"
-            android:layout_marginTop="8dp"
-            android:layout_marginEnd="16dp"
-            android:overScrollMode="never"
-            app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@+id/wireFeesLabel"
-            tools:listitem="@layout/list_item_wire_fee" />
-
-    </androidx.constraintlayout.widget.ConstraintLayout>
-</androidx.core.widget.NestedScrollView>
diff --git a/wallet/src/main/res/navigation/nav_graph.xml b/wallet/src/main/res/navigation/nav_graph.xml
index d8ce5b2..cf98b95 100644
--- a/wallet/src/main/res/navigation/nav_graph.xml
+++ b/wallet/src/main/res/navigation/nav_graph.xml
@@ -152,8 +152,8 @@
     <fragment
         android:id="@+id/selectExchangeFragment"
         android:name="net.taler.wallet.exchanges.SelectExchangeFragment"
-        android:label="@string/nav_exchange_fees"
-        tools:layout="@layout/fragment_select_exchange" />
+        android:label="@string/nav_exchange_select"
+        tools:layout="@layout/fragment_exchange_list" />
 
     <fragment
         android:id="@+id/nav_pending_operations"
diff --git a/wallet/src/main/res/values/strings.xml b/wallet/src/main/res/values/strings.xml
index 24db2b0..2e32c88 100644
--- a/wallet/src/main/res/values/strings.xml
+++ b/wallet/src/main/res/values/strings.xml
@@ -39,6 +39,7 @@ GNU Taler is immune against many types of fraud, such as phishing of credit card
 
     <string name="nav_prompt_withdraw">Withdraw Digital Cash</string>
     <string name="nav_exchange_tos">Exchange\'s Terms of Service</string>
+    <string name="nav_exchange_select">Select Exchange</string>
     <string name="nav_exchange_fees">Exchange Fees</string>
     <string name="nav_error">Error</string>
 
-- 
cgit v1.2.3