From d72548e82e6993486180f5528ae8073ab2a99a25 Mon Sep 17 00:00:00 2001
From: Torsten Grote <t@grobox.de>
Date: Fri, 3 Apr 2020 15:12:29 -0300
Subject: [wallet] add detail page for payment sent event in history

---
 wallet/src/main/res/layout/fragment_event_paid.xml | 124 ++++++++++++++++
 .../main/res/layout/fragment_event_withdraw.xml    | 143 ++++++++++++++++++
 .../src/main/res/layout/fragment_history_event.xml | 160 ---------------------
 3 files changed, 267 insertions(+), 160 deletions(-)
 create mode 100644 wallet/src/main/res/layout/fragment_event_paid.xml
 create mode 100644 wallet/src/main/res/layout/fragment_event_withdraw.xml
 delete mode 100644 wallet/src/main/res/layout/fragment_history_event.xml

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

diff --git a/wallet/src/main/res/layout/fragment_event_paid.xml b/wallet/src/main/res/layout/fragment_event_paid.xml
new file mode 100644
index 0000000..4485744
--- /dev/null
+++ b/wallet/src/main/res/layout/fragment_event_paid.xml
@@ -0,0 +1,124 @@
+<?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/>
+  -->
+
+<ScrollView 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"
+    android:fillViewport="true"
+    tools:context=".history.HistoryEventFragment">
+
+    <androidx.constraintlayout.widget.ConstraintLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content">
+
+        <TextView
+            android:id="@+id/timeView"
+            style="@style/HistoryEventLabel.Time"
+            app:layout_constraintBottom_toTopOf="@+id/amountPaidWithFeesLabel"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="parent"
+            app:layout_constraintVertical_chainStyle="packed"
+            tools:text="23 March 2020 23:42pm" />
+
+        <TextView
+            android:id="@+id/amountPaidWithFeesLabel"
+            style="@style/HistoryEventLabel"
+            android:text="@string/history_event_payment_sent_paid"
+            app:layout_constraintBottom_toTopOf="@+id/amountPaidWithFeesView"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@+id/timeView" />
+
+        <TextView
+            android:id="@+id/amountPaidWithFeesView"
+            style="@style/HistoryEventContent"
+            android:textColor="@color/red"
+            app:layout_constraintBottom_toTopOf="@+id/orderAmountLabel"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@+id/amountPaidWithFeesLabel"
+            tools:text="-23.42 TESTKUDOS" />
+
+        <TextView
+            android:id="@+id/orderAmountLabel"
+            style="@style/HistoryEventLabel"
+            android:text="@string/history_event_payment_sent_amount"
+            app:layout_constraintBottom_toTopOf="@+id/orderAmountView"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@+id/amountPaidWithFeesView" />
+
+        <TextView
+            android:id="@+id/orderAmountView"
+            style="@style/HistoryEventContent"
+            app:layout_constraintBottom_toTopOf="@+id/feeLabel"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@+id/orderAmountLabel"
+            tools:text="23 TESTKUDOS" />
+
+        <TextView
+            android:id="@+id/feeLabel"
+            style="@style/HistoryEventLabel"
+            android:text="@string/withdraw_fees"
+            app:layout_constraintBottom_toTopOf="@+id/feeView"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@+id/orderAmountView" />
+
+        <TextView
+            android:id="@+id/feeView"
+            style="@style/HistoryEventContent"
+            android:textColor="@color/red"
+            app:layout_constraintBottom_toTopOf="@+id/orderSummaryLabel"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@+id/feeLabel"
+            tools:text="-0.42 TESTKUDOS" />
+
+        <TextView
+            android:id="@+id/orderSummaryLabel"
+            style="@style/HistoryEventLabel"
+            android:text="@string/history_event_payment_sent_order"
+            app:layout_constraintBottom_toTopOf="@+id/orderSummaryView"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@+id/feeView" />
+
+        <TextView
+            android:id="@+id/orderSummaryView"
+            style="@style/HistoryEventContent"
+            app:layout_constraintBottom_toTopOf="@+id/orderIdView"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@+id/orderSummaryLabel"
+            tools:text="Some Product that was bought and can have quite a long label" />
+
+        <TextView
+            android:id="@+id/orderIdView"
+            style="@style/HistoryEventLabel"
+            android:text="@string/history_event_payment_sent_order_id"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@+id/orderSummaryView" />
+
+    </androidx.constraintlayout.widget.ConstraintLayout>
+
+</ScrollView>
diff --git a/wallet/src/main/res/layout/fragment_event_withdraw.xml b/wallet/src/main/res/layout/fragment_event_withdraw.xml
new file mode 100644
index 0000000..9c5d818
--- /dev/null
+++ b/wallet/src/main/res/layout/fragment_event_withdraw.xml
@@ -0,0 +1,143 @@
+<?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/>
+  -->
+
+<ScrollView 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"
+    android:fillViewport="true"
+    tools:context=".history.HistoryEventFragment">
+
+    <androidx.constraintlayout.widget.ConstraintLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content">
+
+        <TextView
+            android:id="@+id/timeView"
+            style="@style/HistoryEventLabel.Time"
+            app:layout_constraintBottom_toTopOf="@+id/effectiveAmountLabel"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="parent"
+            app:layout_constraintVertical_chainStyle="packed"
+            tools:text="23 March 2020 23:42pm" />
+
+        <TextView
+            android:id="@+id/effectiveAmountLabel"
+            style="@style/HistoryEventLabel"
+            app:layout_constraintBottom_toTopOf="@+id/effectiveAmountView"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@+id/timeView"
+            tools:text="@string/withdraw_total" />
+
+        <TextView
+            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:layout_marginBottom="16dp"
+            android:gravity="center"
+            android:textColor="@color/green"
+            android:textSize="24sp"
+            app:layout_constraintBottom_toTopOf="@+id/chosenAmountLabel"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@+id/effectiveAmountLabel"
+            tools:text="23.42 TESTKUDOS" />
+
+        <TextView
+            android:id="@+id/chosenAmountLabel"
+            style="@style/HistoryEventLabel"
+            app:layout_constraintBottom_toTopOf="@+id/chosenAmountView"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@+id/effectiveAmountView"
+            tools:text="@string/amount_chosen" />
+
+        <TextView
+            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:layout_marginBottom="16dp"
+            android:gravity="center"
+            android:textSize="24sp"
+            app:layout_constraintBottom_toTopOf="@+id/feeLabel"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@+id/chosenAmountLabel"
+            tools:text="24 TESTKUDOS" />
+
+        <TextView
+            android:id="@+id/feeLabel"
+            style="@style/HistoryEventLabel"
+            android:text="@string/withdraw_fees"
+            app:layout_constraintBottom_toTopOf="@+id/feeView"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@+id/chosenAmountView" />
+
+        <TextView
+            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:layout_marginBottom="16dp"
+            android:gravity="center"
+            android:textColor="@color/red"
+            android:textSize="24sp"
+            app:layout_constraintBottom_toTopOf="@+id/exchangeLabel"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@+id/feeLabel"
+            tools:text="-0.38 TESTKUDOS" />
+
+        <TextView
+            android:id="@+id/exchangeLabel"
+            style="@style/HistoryEventLabel"
+            android:text="@string/withdraw_exchange"
+            app:layout_constraintBottom_toTopOf="@+id/exchangeView"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@+id/feeView" />
+
+        <TextView
+            android:id="@+id/exchangeView"
+            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:textSize="24sp"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintHorizontal_bias="0.5"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@+id/exchangeLabel"
+            tools:text="exchange.demo.taler.net" />
+
+    </androidx.constraintlayout.widget.ConstraintLayout>
+
+</ScrollView>
diff --git a/wallet/src/main/res/layout/fragment_history_event.xml b/wallet/src/main/res/layout/fragment_history_event.xml
deleted file mode 100644
index 4224093..0000000
--- a/wallet/src/main/res/layout/fragment_history_event.xml
+++ /dev/null
@@ -1,160 +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.constraintlayout.widget.ConstraintLayout 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"
-    tools:context=".history.HistoryEventFragment">
-
-    <TextView
-        android:id="@+id/timeView"
-        android:layout_width="0dp"
-        android:layout_height="wrap_content"
-        android:layout_margin="16dp"
-        android:gravity="center"
-        android:textAppearance="@style/TextAppearance.AppCompat.Medium"
-        app:layout_constraintBottom_toTopOf="@+id/effectiveAmountLabel"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent"
-        app:layout_constraintVertical_chainStyle="packed"
-        tools:text="23 March 2020 23:42pm" />
-
-    <TextView
-        android:id="@+id/effectiveAmountLabel"
-        android:layout_width="0dp"
-        android:layout_height="wrap_content"
-        android:layout_marginStart="16dp"
-        android:layout_marginTop="16dp"
-        android:layout_marginEnd="16dp"
-        android:gravity="center"
-        app:layout_constraintBottom_toTopOf="@+id/effectiveAmountView"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/timeView"
-        tools:text="@string/withdraw_total" />
-
-    <TextView
-        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:layout_marginBottom="16dp"
-        android:gravity="center"
-        android:textColor="@color/green"
-        android:textSize="24sp"
-        app:layout_constraintBottom_toTopOf="@+id/chosenAmountLabel"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/effectiveAmountLabel"
-        tools:text="23.42 TESTKUDOS" />
-
-    <TextView
-        android:id="@+id/chosenAmountLabel"
-        android:layout_width="0dp"
-        android:layout_height="wrap_content"
-        android:layout_marginStart="16dp"
-        android:layout_marginTop="16dp"
-        android:layout_marginEnd="16dp"
-        android:gravity="center"
-        app:layout_constraintBottom_toTopOf="@+id/chosenAmountView"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/effectiveAmountView"
-        tools:text="@string/amount_chosen" />
-
-    <TextView
-        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:layout_marginBottom="16dp"
-        android:gravity="center"
-        android:textSize="24sp"
-        app:layout_constraintBottom_toTopOf="@+id/feeLabel"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/chosenAmountLabel"
-        tools:text="24 TESTKUDOS" />
-
-    <TextView
-        android:id="@+id/feeLabel"
-        android:layout_width="0dp"
-        android:layout_height="wrap_content"
-        android:layout_marginStart="16dp"
-        android:layout_marginTop="16dp"
-        android:layout_marginEnd="16dp"
-        android:gravity="center"
-        android:text="@string/withdraw_fees"
-        app:layout_constraintBottom_toTopOf="@+id/feeView"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/chosenAmountView" />
-
-    <TextView
-        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:layout_marginBottom="16dp"
-        android:gravity="center"
-        android:textColor="@color/red"
-        android:textSize="24sp"
-        app:layout_constraintBottom_toTopOf="@+id/exchangeLabel"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/feeLabel"
-        tools:text="-0.38 TESTKUDOS" />
-
-    <TextView
-        android:id="@+id/exchangeLabel"
-        android:layout_width="0dp"
-        android:layout_height="wrap_content"
-        android:layout_marginStart="16dp"
-        android:layout_marginTop="16dp"
-        android:layout_marginEnd="16dp"
-        android:gravity="center"
-        android:text="@string/withdraw_exchange"
-        app:layout_constraintBottom_toTopOf="@+id/exchangeView"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/feeView" />
-
-    <TextView
-        android:id="@+id/exchangeView"
-        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:textSize="24sp"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintHorizontal_bias="0.5"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/exchangeLabel"
-        tools:text="exchange.demo.taler.net" />
-
-</androidx.constraintlayout.widget.ConstraintLayout>
-- 
cgit v1.2.3