From: Damyan Ivanov Date: Sun, 5 May 2019 19:56:13 +0000 (+0300) Subject: move account name filter to the transaction list fragment X-Git-Tag: v0.10.0~2 X-Git-Url: https://git.ktnx.net/?a=commitdiff_plain;h=d9cb51bbeadd5a98ff1c4abe71a1d53288c20289;p=mobile-ledger.git 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 6340b3e2..8de45dce 100644 --- 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 625a3af2..820a2683 100644 --- 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"> - - - - - - - - - - . --> - + + + + + + + + + + + android:layout_height="match_parent"> - +