X-Git-Url: https://git.ktnx.net/?p=mobile-ledger.git;a=blobdiff_plain;f=app%2Fsrc%2Fmain%2Fres%2Flayout%2Ftransaction_list_fragment.xml;h=25b6a57f6b833416cf0814fcf8bc0ea1565fcba5;hp=09f5611e1c9787d82c3b2c87893bcd29e7e010f7;hb=742d3e8ab5f4cf63a3eb7d017cd8f0a1edbcfe37;hpb=0a84e9d51777c88736e24c3503f8f136682b5ff5

diff --git a/app/src/main/res/layout/transaction_list_fragment.xml b/app/src/main/res/layout/transaction_list_fragment.xml
index 09f5611e..25b6a57f 100644
--- a/app/src/main/res/layout/transaction_list_fragment.xml
+++ b/app/src/main/res/layout/transaction_list_fragment.xml
@@ -20,64 +20,86 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/transaction_list"
     android:layout_width="match_parent"
-    android:layout_height="wrap_content"
+    android:layout_height="match_parent"
     app:layout_behavior="@string/appbar_scrolling_view_behavior"
     app:layout_constraintBottom_toBottomOf="parent"
     tools:context=".TransactionListActivity">
 
     <LinearLayout
         android:id="@+id/last_update_row"
-        android:layout_width="0dp"
+        android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:orientation="horizontal"
+        android:orientation="vertical"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent">
 
-        <TextView
-            android:id="@+id/transaction_last_update_label"
-            android:layout_width="wrap_content"
+        <LinearLayout
+            android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:paddingEnd="8dp"
-            android:text="@string/transactions_last_update_label"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent" />
+            android:elevation="24dp"
+            android:orientation="horizontal">
+
+            <TextView
+                android:id="@+id/transaction_last_update_label"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:paddingEnd="8dp"
+                android:text="@string/transactions_last_update_label"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintStart_toStartOf="parent" />
 
-        <TextView
-            android:id="@+id/transactions_last_update"
-            android:layout_width="wrap_content"
+            <TextView
+                android:id="@+id/transactions_last_update"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_weight="1"
+                android:text="\?"
+                tools:ignore="HardcodedText" />
+        </LinearLayout>
+
+        <LinearLayout
+            android:id="@+id/transaction_progress_layout"
+            android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_weight="1"
-            android:text="\?"
-            tools:ignore="HardcodedText" />
-    </LinearLayout>
+            android:gravity="center_vertical"
+            android:orientation="horizontal"
+            android:visibility="gone">
 
-    <View
-        android:id="@+id/view"
-        android:layout_width="0dp"
-        android:layout_height="6dp"
-        android:background="@drawable/drop_shadow"
-        app:layout_constraintTop_toBottomOf="@+id/last_update_row" />
+            <ProgressBar
+                android:id="@+id/transaction_list_progress_bar"
+                style="?android:attr/progressBarStyleHorizontal"
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="-8dp"
+                android:layout_marginBottom="-7dp"
+                android:layout_weight="1"
+                android:indeterminate="true"
+                android:padding="0dp"
+                android:progressTint="@color/colorPrimary"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toBottomOf="@+id/last_update_row" />
 
-    <ProgressBar
-        android:id="@+id/transaction_progress_bar"
-        style="?android:attr/progressBarStyleHorizontal"
-        android:layout_width="0dp"
-        android:layout_height="wrap_content"
-        android:indeterminate="true"
-        android:indeterminateBehavior="cycle"
-        android:progressTint="@color/colorPrimary"
-        android:visibility="gone"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/last_update_row" />
+            <TextView
+                android:id="@+id/transaction_list_cancel_download"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:background="@drawable/ic_clear_black_24dp"
+                android:clickable="true"
+                android:onClick="onStopTransactionRefreshClick" />
+        </LinearLayout>
+
+    </LinearLayout>
 
     <android.support.v4.widget.SwipeRefreshLayout
         android:id="@+id/transaction_swipe"
         android:layout_width="match_parent"
         android:layout_height="0dp"
         app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/transaction_progress_bar">
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/last_update_row">
 
         <android.support.v7.widget.RecyclerView
             android:id="@+id/transaction_root"
@@ -85,4 +107,10 @@
             android:layout_height="match_parent"
             android:scrollbars="vertical" />
     </android.support.v4.widget.SwipeRefreshLayout>
+
+    <View
+        android:layout_width="0dp"
+        android:layout_height="4dp"
+        android:background="@drawable/drop_shadow"
+        app:layout_constraintTop_toBottomOf="@+id/last_update_row" />
 </android.support.constraint.ConstraintLayout>