X-Git-Url: https://git.ktnx.net/?a=blobdiff_plain;f=app%2Fsrc%2Fmain%2Fres%2Flayout%2Ftransaction_list_fragment.xml;h=609e1c224fecf4e486b594736662c4e87f0c74ce;hb=4f910919819fbe8db070847cfbfba493a62c7c58;hp=86b8a9ef6ecf959cff381bfc338a8d8f9fa6490f;hpb=1da9ab53cfcbd88291785022f1cae225078fcc25;p=mobile-ledger-staging.git

diff --git a/app/src/main/res/layout/transaction_list_fragment.xml b/app/src/main/res/layout/transaction_list_fragment.xml
index 86b8a9ef..609e1c22 100644
--- a/app/src/main/res/layout/transaction_list_fragment.xml
+++ b/app/src/main/res/layout/transaction_list_fragment.xml
@@ -1,145 +1,72 @@
 <?xml version="1.0" encoding="utf-8"?><!--
-  ~ Copyright © 2018 Damyan Ivanov.
-  ~ This file is part of Mobile-Ledger.
-  ~ Mobile-Ledger is free software: you can distribute it and/or modify it
+  ~ Copyright © 2020 Damyan Ivanov.
+  ~ This file is part of MoLe.
+  ~ MoLe is free software: you can distribute it and/or modify it
   ~ under the term of the GNU General Public License as published by
   ~ the Free Software Foundation, either version 3 of the License, or
   ~ (at your opinion), any later version.
   ~
-  ~ Mobile-Ledger is distributed in the hope that it will be useful,
+  ~ MoLe 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 terms for details.
   ~
   ~ You should have received a copy of the GNU General Public License
-  ~ along with Mobile-Ledger. If not, see <https://www.gnu.org/licenses/>.
+  ~ along with MoLe. If not, see <https://www.gnu.org/licenses/>.
   -->
 
-<android.support.constraint.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<LinearLayout 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:gravity="top"
     android:id="@+id/transaction_list"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
+    android:orientation="vertical"
     app:layout_behavior="@string/appbar_scrolling_view_behavior"
-    app:layout_constraintBottom_toBottomOf="parent"
     tools:context="net.ktnx.mobileledger.ui.activity.MainActivity">
 
     <LinearLayout
-        android:id="@+id/last_update_row"
+        android:id="@+id/transaction_list_account_name_filter"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:orientation="vertical"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent">
+        android:orientation="horizontal"
+        android:visibility="gone">
 
-        <LinearLayout
-            android:id="@+id/transaction_list_account_name_filter"
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:orientation="horizontal"
-            android:visibility="gone">
-
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:background="@drawable/ic_filter_list_black_24dp" />
-
-            <AutoCompleteTextView
-                android:id="@+id/transaction_filter_account_name"
-                android:layout_width="0dp"
-                android:layout_height="wrap_content"
-                android:layout_weight="1" />
-
-            <TextView
-                android:id="@+id/clearAccountNameFilter"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:background="@drawable/ic_clear_black_24dp"
-                android:clickable="true"
-                android:onClick="onViewClicked"
-                android:focusable="true" />
-
-        </LinearLayout>
-
-        <LinearLayout
-            android:layout_width="match_parent"
+        <TextView
+            android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            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"
-                android:layout_height="wrap_content"
-                android:layout_weight="1"
-                android:text="\?"
-                tools:ignore="HardcodedText" />
-        </LinearLayout>
+            android:background="@drawable/ic_filter_list_black_24dp" />
 
-        <LinearLayout
-            android:id="@+id/transaction_progress_layout"
-            android:layout_width="match_parent"
+        <AutoCompleteTextView
+            android:id="@+id/transaction_filter_account_name"
+            android:layout_width="0dp"
             android:layout_height="wrap_content"
-            android:gravity="center_vertical"
-            android:orientation="horizontal"
-            android:visibility="gone">
-
-            <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" />
+            android:layout_weight="1"
+            android:hint="@string/new_transaction_account_hint"
+            android:textColor="?textColor" />
 
-            <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>
+        <TextView
+            android:id="@+id/clearAccountNameFilter"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:background="@drawable/ic_clear_accent_24dp"
+            android:backgroundTint="?colorAccent"
+            android:clickable="true"
+            android:focusable="true" />
 
     </LinearLayout>
 
-    <android.support.v4.widget.SwipeRefreshLayout
+    <androidx.swiperefreshlayout.widget.SwipeRefreshLayout
         android:id="@+id/transaction_swipe"
         android:layout_width="match_parent"
-        android:layout_height="0dp"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/last_update_row">
+        android:layout_height="match_parent">
 
-        <android.support.v7.widget.RecyclerView
+        <androidx.recyclerview.widget.RecyclerView
             android:id="@+id/transaction_root"
             android:layout_width="match_parent"
             android:layout_height="match_parent"
             android:scrollbars="vertical" />
-    </android.support.v4.widget.SwipeRefreshLayout>
+    </androidx.swiperefreshlayout.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>
+</LinearLayout>