move account name filter to the transaction list fragment

it is not relevant to the account list and should not be visible there

diff --git a/app/src/main/java/net/ktnx/mobileledger/ui/transaction_list/TransactionListFragment.java b/app/src/main/java/net/ktnx/mobileledger/ui/transaction_list/TransactionListFragment.java
index 6340b3e2869f490b7bc6fda5a7e671264b5d0944..8de45dce7712ceacb440240d31b068f118a21cc4 100644 (file)
--- a/app/src/main/java/net/ktnx/mobileledger/ui/transaction_list/TransactionListFragment.java
+++ b/app/src/main/java/net/ktnx/mobileledger/ui/transaction_list/TransactionListFragment.java
@@ -168,7 +168,9 @@ public class TransactionListFragment extends MobileLedgerListFragment {
         menuTransactionListFilter = menu.findItem(R.id.menu_transaction_list_filter);
         if ((menuTransactionListFilter == null)) throw new AssertionError();
 
-        if (Data.accountFilter.getValue() != null) {
+        if ((Data.accountFilter.getValue() != null) ||
+            (vAccountFilter.getVisibility() == View.VISIBLE))
+        {
             menuTransactionListFilter.setVisible(false);
         }
 

diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index 625a3af21f214acbca51754a33135223f20df9e5..820a26832df73296a363a97355c2124d2742facc 100644 (file)
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -69,38 +69,6 @@
                     app:layout_constraintStart_toStartOf="parent"
                     app:layout_constraintTop_toTopOf="parent">
 
-                    <LinearLayout
-                        android:id="@+id/transaction_list_account_name_filter"
-                        android:layout_width="match_parent"
-                        android:layout_height="match_parent"
-                        android:orientation="horizontal"
-                        android:theme="@style/ThemeOverlay.AppCompat.Light"
-                        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:textColor="?textColor"
-                            android:hint="@string/new_transaction_account_hint"
-                            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:backgroundTint="?colorAccent"
-                            android:clickable="true"
-                            android:focusable="true" />
-
-                    </LinearLayout>
-
                     <LinearLayout
                         android:id="@+id/transactions_last_update_layout"
                         android:layout_width="match_parent"

diff --git a/app/src/main/res/layout/transaction_list_fragment.xml b/app/src/main/res/layout/transaction_list_fragment.xml
index 37e98b6e0ae1407f83183f47a2978a6203fb5bf6..115a8a377a50a0a393b0fda6013f6fef5e77a1a2 100644 (file)
--- a/app/src/main/res/layout/transaction_list_fragment.xml
+++ b/app/src/main/res/layout/transaction_list_fragment.xml
@@ -15,24 +15,53 @@
   ~ along with MoLe. If not, see <https://www.gnu.org/licenses/>.
   -->
 
-<androidx.constraintlayout.widget.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/transaction_list_account_name_filter"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:orientation="horizontal"
+        android:theme="@style/ThemeOverlay.AppCompat.Light"
+        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"
+            android:hint="@string/new_transaction_account_hint"
+            android:textColor="?textColor" />
+
+        <TextView
+            android:id="@+id/clearAccountNameFilter"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:background="@drawable/ic_clear_black_24dp"
+            android:backgroundTint="?colorAccent"
+            android:clickable="true"
+            android:focusable="true" />
+
+    </LinearLayout>
+
     <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_toTopOf="parent">
+        android:layout_height="match_parent">
 
         <androidx.recyclerview.widget.RecyclerView
             android:id="@+id/transaction_root"
@@ -41,4 +70,4 @@
             android:scrollbars="vertical" />
     </androidx.swiperefreshlayout.widget.SwipeRefreshLayout>
 
-</androidx.constraintlayout.widget.ConstraintLayout>
+</LinearLayout>