summaryrefslogtreecommitdiff
path: root/wallet/src/main/res
diff options
context:
space:
mode:
Diffstat (limited to 'wallet/src/main/res')
-rw-r--r--wallet/src/main/res/drawable/ic_keyboard_arrow_down.xml9
-rw-r--r--wallet/src/main/res/drawable/ic_keyboard_arrow_up.xml9
-rw-r--r--wallet/src/main/res/layout/fragment_review_exchange_tos.xml37
-rw-r--r--wallet/src/main/res/layout/list_item_tos.xml69
-rw-r--r--wallet/src/main/res/values/strings.xml1
5 files changed, 110 insertions, 15 deletions
diff --git a/wallet/src/main/res/drawable/ic_keyboard_arrow_down.xml b/wallet/src/main/res/drawable/ic_keyboard_arrow_down.xml
new file mode 100644
index 0000000..c7ba402
--- /dev/null
+++ b/wallet/src/main/res/drawable/ic_keyboard_arrow_down.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+ android:width="24dp"
+ android:height="24dp"
+ android:viewportWidth="24.0"
+ android:viewportHeight="24.0">
+ <path
+ android:fillColor="#FF000000"
+ android:pathData="M7.41,7.84L12,12.42l4.59,-4.58L18,9.25l-6,6 -6,-6z" />
+</vector>
diff --git a/wallet/src/main/res/drawable/ic_keyboard_arrow_up.xml b/wallet/src/main/res/drawable/ic_keyboard_arrow_up.xml
new file mode 100644
index 0000000..328e17c
--- /dev/null
+++ b/wallet/src/main/res/drawable/ic_keyboard_arrow_up.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+ android:width="24dp"
+ android:height="24dp"
+ android:viewportWidth="24.0"
+ android:viewportHeight="24.0">
+ <path
+ android:fillColor="#FF000000"
+ android:pathData="M7.41,15.41L12,10.83l4.59,4.58L18,14l-6,-6 -6,6z" />
+</vector>
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 2587c1a..ec8d996 100644
--- a/wallet/src/main/res/layout/fragment_review_exchange_tos.xml
+++ b/wallet/src/main/res/layout/fragment_review_exchange_tos.xml
@@ -21,36 +21,43 @@
android:layout_height="match_parent"
tools:context=".withdraw.ReviewExchangeTosFragment">
- <ScrollView
- android:id="@+id/tosScrollView"
+ <androidx.recyclerview.widget.RecyclerView
+ android:id="@+id/tosList"
android:layout_width="0dp"
android:layout_height="0dp"
+ app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"
app:layout_constraintBottom_toTopOf="@+id/buttonCard"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
- app:layout_constraintTop_toTopOf="parent">
-
- <TextView
- android:id="@+id/tosTextView"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:padding="16dp"
- android:visibility="invisible"
- tools:text="@tools:sample/lorem/random"
- tools:visibility="visible" />
-
- </ScrollView>
+ app:layout_constraintTop_toTopOf="parent"
+ tools:listitem="@layout/list_item_tos" />
<ProgressBar
android:id="@+id/progressBar"
style="?android:attr/progressBarStyleLarge"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- app:layout_constraintBottom_toBottomOf="@+id/tosScrollView"
+ app:layout_constraintBottom_toBottomOf="@+id/tosList"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
+ <TextView
+ android:id="@+id/errorView"
+ android:layout_width="0dp"
+ android:layout_height="wrap_content"
+ android:layout_margin="16dp"
+ android:gravity="center"
+ android:textColor="@color/red"
+ android:textSize="16sp"
+ android:visibility="invisible"
+ app:layout_constraintBottom_toBottomOf="parent"
+ app:layout_constraintEnd_toEndOf="parent"
+ app:layout_constraintStart_toStartOf="parent"
+ app:layout_constraintTop_toTopOf="parent"
+ tools:text="@string/exchange_tos_error"
+ tools:visibility="visible" />
+
<com.google.android.material.card.MaterialCardView
android:id="@+id/buttonCard"
style="@style/BottomCard"
diff --git a/wallet/src/main/res/layout/list_item_tos.xml b/wallet/src/main/res/layout/list_item_tos.xml
new file mode 100644
index 0000000..7a584dc
--- /dev/null
+++ b/wallet/src/main/res/layout/list_item_tos.xml
@@ -0,0 +1,69 @@
+<?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.cardview.widget.CardView 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="wrap_content"
+ app:cardUseCompatPadding="true">
+
+ <androidx.constraintlayout.widget.ConstraintLayout
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content">
+
+ <TextView
+ android:id="@+id/sectionTitle"
+ android:layout_width="0dp"
+ android:layout_height="wrap_content"
+ android:background="?attr/selectableItemBackground"
+ android:paddingStart="8dp"
+ android:paddingTop="8dp"
+ android:paddingEnd="56dp"
+ android:paddingBottom="8dp"
+ android:textAppearance="@style/TextAppearance.AppCompat.Headline"
+ app:layout_constraintEnd_toEndOf="parent"
+ app:layout_constraintStart_toStartOf="parent"
+ app:layout_constraintTop_toTopOf="parent"
+ tools:text="A Terms of Service section title that might be rather long in some cases" />
+
+ <ImageView
+ android:id="@+id/expandButton"
+ android:layout_width="48dp"
+ android:layout_height="0dp"
+ android:padding="8dp"
+ android:scaleType="center"
+ android:src="@drawable/ic_keyboard_arrow_up"
+ app:layout_constraintBottom_toBottomOf="@+id/sectionTitle"
+ app:layout_constraintEnd_toEndOf="parent"
+ app:layout_constraintTop_toTopOf="@+id/sectionTitle"
+ app:tint="?android:attr/textColorPrimary"
+ tools:ignore="ContentDescription" />
+
+ <TextView
+ android:id="@+id/sectionText"
+ android:layout_width="0dp"
+ android:layout_height="wrap_content"
+ android:padding="8dp"
+ app:layout_constraintBottom_toBottomOf="parent"
+ app:layout_constraintEnd_toEndOf="parent"
+ app:layout_constraintStart_toStartOf="parent"
+ app:layout_constraintTop_toBottomOf="@+id/sectionTitle"
+ tools:text="@tools:sample/lorem/random" />
+
+ </androidx.constraintlayout.widget.ConstraintLayout>
+
+</androidx.cardview.widget.CardView>
diff --git a/wallet/src/main/res/values/strings.xml b/wallet/src/main/res/values/strings.xml
index cc846cd..dd3a810 100644
--- a/wallet/src/main/res/values/strings.xml
+++ b/wallet/src/main/res/values/strings.xml
@@ -128,6 +128,7 @@ GNU Taler is immune against many types of fraud, such as phishing of credit card
<string name="exchange_fee_wire_fee_wire_fee">Wire Fee: %s</string>
<string name="exchange_fee_wire_fee_closing_fee">Closing Fee: %s</string>
<string name="exchange_tos_accept">Accept Terms of Service</string>
+ <string name="exchange_tos_error">Error showing Terms of Service: %s</string>
<string name="pending_operations_title">Pending Operations</string>
<string name="pending_operations_refuse">Refuse Proposal</string>