X-Git-Url: https://git.ktnx.net/?p=mobile-ledger.git;a=blobdiff_plain;f=app%2Fsrc%2Fmain%2Fjava%2Fnet%2Fktnx%2Fmobileledger%2Fui%2Ftransaction_list%2FTransactionListFragment.java;h=c9fd0bf33f51a75b0af907dd504eb07985cba65c;hp=a809a17eb2c243ee23fe482cdfcafba44076b343;hb=062d4edbcf358be32ef08d4ebbf85fddf272e82e;hpb=5df10dc0b58df4d4be4e9ab34f1e0f477ca46766

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 a809a17e..c9fd0bf3 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
@@ -59,9 +59,11 @@ import static net.ktnx.mobileledger.utils.Logger.debug;
 public class TransactionListFragment extends MobileLedgerListFragment
         implements DatePickerFragment.DatePickedListener {
     private MenuItem menuTransactionListFilter;
+    private MenuItem menuGoToDate;
     private View vAccountFilter;
     private AutoCompleteTextView accNameFilter;
     private MainModel model;
+    private boolean fragmentActive = false;
     @Override
     public void onCreate(@Nullable Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
@@ -76,16 +78,31 @@ public class TransactionListFragment extends MobileLedgerListFragment
     @Override
     public void onResume() {
         super.onResume();
+        fragmentActive = true;
+        toggleMenuItems();
         debug("flow", "TransactionListFragment.onResume()");
     }
+    private void toggleMenuItems() {
+        if (menuGoToDate != null)
+            menuGoToDate.setVisible(fragmentActive);
+        if (menuTransactionListFilter != null) {
+            final int filterVisibility = vAccountFilter.getVisibility();
+            menuTransactionListFilter.setVisible(
+                    fragmentActive && filterVisibility != View.VISIBLE);
+        }
+    }
     @Override
     public void onStop() {
         super.onStop();
+        fragmentActive = false;
+        toggleMenuItems();
         debug("flow", "TransactionListFragment.onStop()");
     }
     @Override
     public void onPause() {
         super.onPause();
+        fragmentActive = false;
+        toggleMenuItems();
         debug("flow", "TransactionListFragment.onPause()");
     }
     @Override
@@ -106,7 +123,7 @@ public class TransactionListFragment extends MobileLedgerListFragment
         root = view.findViewById(R.id.transaction_root);
         if (root == null)
             throw new RuntimeException("Can't get hold on the transaction value view");
-        modelAdapter = new TransactionListAdapter(model);
+        modelAdapter = new TransactionListAdapter();
         root.setAdapter(modelAdapter);
 
         mainActivity.fabShouldShow();
@@ -129,8 +146,8 @@ public class TransactionListFragment extends MobileLedgerListFragment
         vAccountFilter = view.findViewById(R.id.transaction_list_account_name_filter);
         accNameFilter = view.findViewById(R.id.transaction_filter_account_name);
 
-        Profile profile = Data.getProfile();
-        accNameFilter.setAdapter(new AccountAutocompleteAdapter(mainActivity, profile));
+        Data.observeProfile(getViewLifecycleOwner(), this::onProfileChanged);
+
         accNameFilter.setOnItemClickListener((parent, v, position, id) -> {
 //                debug("tmp", "direct onItemClick");
             model.getAccountFilter()
@@ -151,8 +168,6 @@ public class TransactionListFragment extends MobileLedgerListFragment
             .setOnClickListener(v -> {
                 model.getAccountFilter()
                      .setValue(null);
-                vAccountFilter.setVisibility(View.GONE);
-                menuTransactionListFilter.setVisible(true);
                 Globals.hideSoftKeyboard(mainActivity);
             });
 
@@ -165,24 +180,21 @@ public class TransactionListFragment extends MobileLedgerListFragment
             }
         });
     }
-    private void onAccountNameFilterChanged(String accName) {
-        final String fieldText = accNameFilter.getText()
-                                              .toString();
-        if ((accName == null) && (fieldText.equals("")))
+    private void onProfileChanged(Profile profile) {
+        if (profile == null)
             return;
 
-        if (accNameFilter != null) {
-            accNameFilter.setText(accName, false);
-        }
-        final boolean filterActive = (accName != null) && !accName.isEmpty();
+        accNameFilter.setAdapter(new AccountAutocompleteAdapter(getContext(), profile));
+    }
+    private void onAccountNameFilterChanged(String accName) {
+        accNameFilter.setText(accName, false);
+
+        boolean filterActive = (accName != null) && !accName.isEmpty();
         if (vAccountFilter != null) {
             vAccountFilter.setVisibility(filterActive ? View.VISIBLE : View.GONE);
         }
         if (menuTransactionListFilter != null)
             menuTransactionListFilter.setVisible(!filterActive);
-
-        model.scheduleTransactionListReload();
-
     }
     @Override
     public void onCreateOptionsMenu(@NotNull Menu menu, @NotNull MenuInflater inflater) {
@@ -191,19 +203,18 @@ public class TransactionListFragment extends MobileLedgerListFragment
         menuTransactionListFilter = menu.findItem(R.id.menu_transaction_list_filter);
         if ((menuTransactionListFilter == null))
             throw new AssertionError();
+        menuGoToDate = menu.findItem(R.id.menu_go_to_date);
+        if ((menuGoToDate == null))
+            throw new AssertionError();
 
-        if ((model.getAccountFilter()
-                  .getValue() != null) || (vAccountFilter.getVisibility() == View.VISIBLE))
-        {
-            menuTransactionListFilter.setVisible(false);
-        }
+        model.getAccountFilter()
+             .observe(this, v -> menuTransactionListFilter.setVisible(v == null));
 
         super.onCreateOptionsMenu(menu, inflater);
 
         menuTransactionListFilter.setOnMenuItemClickListener(item -> {
             vAccountFilter.setVisibility(View.VISIBLE);
-            if (menuTransactionListFilter != null)
-                menuTransactionListFilter.setVisible(false);
+            menuTransactionListFilter.setVisible(false);
             accNameFilter.requestFocus();
             InputMethodManager imm =
                     (InputMethodManager) getMainActivity().getSystemService(INPUT_METHOD_SERVICE);
@@ -212,15 +223,15 @@ public class TransactionListFragment extends MobileLedgerListFragment
             return true;
         });
 
-        menu.findItem(R.id.menu_go_to_date)
-            .setOnMenuItemClickListener(item -> {
-                DatePickerFragment picker = new DatePickerFragment();
-                picker.setOnDatePickedListener(this);
-                picker.setDateRange(model.getFirstTransactionDate(),
-                        model.getLastTransactionDate());
-                picker.show(requireActivity().getSupportFragmentManager(), null);
-                return true;
-            });
+        menuGoToDate.setOnMenuItemClickListener(item -> {
+            DatePickerFragment picker = new DatePickerFragment();
+            picker.setOnDatePickedListener(this);
+            picker.setDateRange(model.getFirstTransactionDate(), model.getLastTransactionDate());
+            picker.show(requireActivity().getSupportFragmentManager(), null);
+            return true;
+        });
+
+        toggleMenuItems();
     }
     @Override
     public void onDatePicked(int year, int month, int day) {