Hide detailed history events by default

Also implement history changes after latest feedback

4 files changed, 45 insertions, 32 deletions

diff --git a/app/src/main/res/layout/fragment_show_history.xml b/app/src/main/res/layout/fragment_show_history.xml
index 6265a50..dc93889 100644
--- a/app/src/main/res/layout/fragment_show_history.xml
+++ b/app/src/main/res/layout/fragment_show_history.xml
@@ -1,28 +1,31 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.core.widget.NestedScrollView
-        xmlns:android="http://schemas.android.com/apk/res/android"
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
         xmlns:tools="http://schemas.android.com/tools"
         android:layout_width="match_parent"
         android:layout_height="match_parent">
 
-    <LinearLayout
+    <androidx.recyclerview.widget.RecyclerView
+            android:id="@+id/historyList"
             android:layout_width="match_parent"
             android:layout_height="match_parent"
-            android:orientation="vertical">
+            android:scrollbars="vertical" />
 
-        <androidx.recyclerview.widget.RecyclerView
-                android:id="@+id/list_history"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:scrollbars="vertical"/>
+    <TextView
+            android:id="@+id/historyEmptyState"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center"
+            android:text="@string/history_empty"
+            android:visibility="invisible"
+            tools:visibility="visible" />
 
-        <TextView
-                android:id="@+id/list_history_placeholder"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_gravity="center"
-                android:text="The wallet history is empty"
-                tools:visibility="gone"/>
-    </LinearLayout>
+    <ProgressBar
+            android:id="@+id/historyProgressBar"
+            style="?android:progressBarStyleLarge"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center"
+            android:visibility="invisible"
+            tools:visibility="visible" />
 
-</androidx.core.widget.NestedScrollView>
\ No newline at end of file
+</FrameLayout>
diff --git a/app/src/main/res/layout/history_payment_sent.xml b/app/src/main/res/layout/history_payment_sent.xml
index 0c39133..cf03998 100644
--- a/app/src/main/res/layout/history_payment_sent.xml
+++ b/app/src/main/res/layout/history_payment_sent.xml
@@ -22,16 +22,15 @@
 
     <TextView
             android:id="@+id/title"
+            style="@style/HistoryTitle"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:layout_marginStart="8dp"
             android:layout_marginEnd="8dp"
-            android:text="@string/history_event_payment_sent"
-            android:textColor="?android:textColorPrimary"
-            android:textSize="20sp"
             app:layout_constraintEnd_toStartOf="@+id/amountPaidWithFees"
             app:layout_constraintStart_toEndOf="@+id/icon"
-            app:layout_constraintTop_toTopOf="parent" />
+            app:layout_constraintTop_toTopOf="parent"
+            tools:text="Lots of books with very long titles" />
 
     <TextView
             android:id="@+id/summary"
@@ -46,16 +45,18 @@
             app:layout_constraintStart_toEndOf="@+id/icon"
             app:layout_constraintTop_toBottomOf="@+id/title"
             app:layout_constraintVertical_bias="0.0"
-            tools:text="Lots of books" />
+            tools:text="@string/history_event_payment_sent" />
 
     <TextView
             android:id="@+id/amountPaidWithFees"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:textColor="@color/red"
+            android:textSize="16sp"
             app:layout_constraintBottom_toTopOf="@+id/time"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintTop_toTopOf="parent"
+            app:layout_constraintVertical_bias="0.0"
             tools:text="0.2 TESTKUDOS" />
 
     <TextView
diff --git a/app/src/main/res/layout/history_row.xml b/app/src/main/res/layout/history_row.xml
index cab7f0f..394ad79 100644
--- a/app/src/main/res/layout/history_row.xml
+++ b/app/src/main/res/layout/history_row.xml
@@ -18,11 +18,11 @@
             tools:ignore="ContentDescription" />
 
     <TextView
+            style="@style/HistoryTitle"
             android:id="@+id/title"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:layout_marginStart="8dp"
-            android:textSize="20sp"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toEndOf="@+id/icon"
             app:layout_constraintTop_toTopOf="parent"
diff --git a/app/src/main/res/layout/history_withdrawn.xml b/app/src/main/res/layout/history_withdrawn.xml
index e02046b..75bae07 100644
--- a/app/src/main/res/layout/history_withdrawn.xml
+++ b/app/src/main/res/layout/history_withdrawn.xml
@@ -22,29 +22,38 @@
 
     <TextView
             android:id="@+id/title"
+            style="@style/HistoryTitle"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginStart="8dp"
             android:text="@string/history_event_withdrawn"
-            android:textColor="?android:textColorPrimary"
-            android:textSize="20sp"
+            android:visibility="gone"
             app:layout_constraintStart_toEndOf="@+id/icon"
             app:layout_constraintTop_toTopOf="parent" />
 
     <TextView
             android:id="@+id/exchangeUrl"
-            android:layout_width="wrap_content"
+            android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:layout_marginStart="8dp"
             android:layout_marginTop="8dp"
+            android:layout_marginEnd="8dp"
+            android:layout_marginBottom="8dp"
             app:layout_constrainedWidth="true"
             app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintEnd_toStartOf="@+id/fee"
-            app:layout_constraintHorizontal_bias="0.0"
+            app:layout_constraintEnd_toStartOf="@+id/feeLabel"
             app:layout_constraintStart_toEndOf="@+id/icon"
             app:layout_constraintTop_toBottomOf="@+id/title"
-            app:layout_constraintVertical_bias="0.0"
-            tools:text="http://taler.exchange.url" />
+            tools:text="http://taler.quite-long-exchange.url" />
+
+    <TextView
+            android:id="@+id/feeLabel"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginEnd="2dp"
+            android:text="@string/history_fee_label"
+            app:layout_constraintEnd_toStartOf="@+id/fee"
+            app:layout_constraintTop_toTopOf="@+id/fee" />
 
     <TextView
             android:id="@+id/fee"
@@ -76,6 +85,6 @@
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintTop_toBottomOf="@+id/fee"
-            tools:text="23 min ago" />
+            tools:text="23 min. ago" />
 
 </androidx.constraintlayout.widget.ConstraintLayout>