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=6610c3b2deccd783f55a4f22d161c7663e378169;hp=79c34b8950ca8d8f86a6d19704de1d1a06a67c38;hb=b5ce02c84db901506139f9e0aaab3c56e394a6e3;hpb=d3a64f9a064a144b0ea8e4568517595615b2d943

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 79c34b89..6610c3b2 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
@@ -34,8 +34,8 @@ import android.view.MenuItem;
 import android.view.View;
 import android.view.ViewGroup;
 import android.view.inputmethod.InputMethodManager;
-import android.widget.AdapterView;
 import android.widget.AutoCompleteTextView;
+import android.widget.Toast;
 
 import net.ktnx.mobileledger.R;
 import net.ktnx.mobileledger.model.Data;
@@ -43,6 +43,7 @@ import net.ktnx.mobileledger.ui.MobileLedgerListFragment;
 import net.ktnx.mobileledger.ui.activity.MainActivity;
 import net.ktnx.mobileledger.utils.Globals;
 import net.ktnx.mobileledger.utils.MLDB;
+import net.ktnx.mobileledger.utils.ObservableValue;
 
 import java.util.Observable;
 import java.util.Observer;
@@ -51,6 +52,7 @@ import static android.content.Context.INPUT_METHOD_SERVICE;
 
 public class TransactionListFragment extends MobileLedgerListFragment {
     public static final String BUNDLE_KEY_FILTER_ACCOUNT_NAME = "filter_account_name";
+    public static ObservableValue<String> accountFilter = new ObservableValue<>();
     private String mShowOnlyAccountName;
     private MenuItem menuTransactionListFilter;
     private View vAccountFilter;
@@ -114,14 +116,26 @@ public class TransactionListFragment extends MobileLedgerListFragment {
                              @Nullable Bundle savedInstanceState) {
         return inflater.inflate(R.layout.transaction_list_fragment, container, false);
     }
-
+    @Override
+    public void onResume() {
+        super.onResume();
+        Log.d("flow", "TransactionListFragment.onResume()");
+    }
+    @Override
+    public void onStop() {
+        super.onStop();
+        Log.d("flow", "TransactionListFragment.onStop()");
+    }
+    @Override
+    public void onPause() {
+        super.onPause();
+        Log.d("flow", "TransactionListFragment.onPause()");
+    }
     @Override
     public void onActivityCreated(@Nullable Bundle savedInstanceState) {
         Log.d("flow", "TransactionListFragment.onActivityCreated called");
         super.onActivityCreated(savedInstanceState);
 
-        mActivity.markDrawerItemCurrent(R.id.nav_latest_transactions);
-
         swiper = mActivity.findViewById(R.id.transaction_swipe);
         if (swiper == null) throw new RuntimeException("Can't get hold on the swipe layout");
         root = mActivity.findViewById(R.id.transaction_root);
@@ -131,12 +145,10 @@ public class TransactionListFragment extends MobileLedgerListFragment {
         modelAdapter = new TransactionListAdapter();
 
         modelAdapter.setBoldAccountName(mShowOnlyAccountName);
+        root.setAdapter(modelAdapter);
 
         FloatingActionButton fab = mActivity.findViewById(R.id.btn_add_transaction);
 
-        RecyclerView root = mActivity.findViewById(R.id.transaction_root);
-        root.setAdapter(modelAdapter);
-
         fab.show();
         root.addOnScrollListener(new RecyclerView.OnScrollListener() {
             @Override
@@ -162,40 +174,52 @@ public class TransactionListFragment extends MobileLedgerListFragment {
         accNameFilter = mActivity.findViewById(R.id.transaction_filter_account_name);
 
         TransactionListFragment me = this;
-        MLDB.hook_autocompletion_adapter(mActivity, accNameFilter, "accounts", "name");
-        accNameFilter.setOnItemClickListener(new AdapterView.OnItemClickListener() {
-            @Override
-            public void onItemClick(AdapterView<?> parent, View view, int position, long id) {
-                Log.d("tmp", "direct onItemClick");
-                TransactionListViewModel.scheduleTransactionListReload(mActivity);
-                MatrixCursor mc = (MatrixCursor) parent.getItemAtPosition(position);
-                modelAdapter.setBoldAccountName(mc.getString(1));
-                modelAdapter.notifyDataSetChanged();
-                Globals.hideSoftKeyboard(mActivity);
-            }
+        MLDB.hookAutocompletionAdapter(mActivity, accNameFilter, "accounts", "name", true);
+        accNameFilter.setOnItemClickListener((parent, view, position, id) -> {
+//                Log.d("tmp", "direct onItemClick");
+            TransactionListViewModel.scheduleTransactionListReload();
+            MatrixCursor mc = (MatrixCursor) parent.getItemAtPosition(position);
+            accountFilter.set(mc.getString(1));
+            Globals.hideSoftKeyboard(mActivity);
         });
 
-        if (mShowOnlyAccountName != null) {
-            accNameFilter.setText(mShowOnlyAccountName, false);
-            onShowFilterClick(null);
-            Log.d("flow", String.format("Account filter set to '%s'", mShowOnlyAccountName));
-        }
-
-        TransactionListViewModel.scheduleTransactionListReload(mActivity);
-        TransactionListViewModel.updating.addObserver(new Observer() {
-            @Override
-            public void update(Observable o, Object arg) {
-                swiper.setRefreshing(TransactionListViewModel.updating.get());
-            }
+        accountFilter.addObserver((o, arg) -> {
+            String accountName = accountFilter.get();
+            modelAdapter.setBoldAccountName(accountName);
+            setShowOnlyAccountName(accountName);
+            TransactionListViewModel.scheduleTransactionListReload();
+            if (menuTransactionListFilter != null) menuTransactionListFilter.setVisible(false);
         });
 
-        Data.transactions.addObserver(new Observer() {
+        Data.profile.addObserver((o, arg) -> mActivity.runOnUiThread(() -> {
+            Log.d("transactions", "requesting list reload");
+            TransactionListViewModel.scheduleTransactionListReload();
+        }));
+
+        TransactionListViewModel.scheduleTransactionListReload();
+        TransactionListViewModel.updating.addObserver(
+                (o, arg) -> swiper.setRefreshing(TransactionListViewModel.updating.get()));
+        TransactionListViewModel.updateError.addObserver(new Observer() {
             @Override
             public void update(Observable o, Object arg) {
-                mActivity.runOnUiThread(() -> modelAdapter.notifyDataSetChanged());
+                String err = TransactionListViewModel.updateError.get();
+                if (err == null) return;
+
+                Toast.makeText(mActivity, err, Toast.LENGTH_SHORT).show();
+                TransactionListViewModel.updateError.set(null);
             }
         });
-
+        Data.transactions.addObserver(
+                (o, arg) -> mActivity.runOnUiThread(() -> modelAdapter.notifyDataSetChanged()));
+
+        mActivity.findViewById(R.id.clearAccountNameFilter).setOnClickListener(v -> {
+            vAccountFilter.setVisibility(View.GONE);
+            if (menuTransactionListFilter != null) menuTransactionListFilter.setVisible(true);
+            accountFilter.set(null);
+            accNameFilter.setText(null);
+            TransactionListViewModel.scheduleTransactionListReload();
+            Globals.hideSoftKeyboard(mActivity);
+        });
     }
     @Override
     public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) {
@@ -209,25 +233,16 @@ public class TransactionListFragment extends MobileLedgerListFragment {
         }
 
         super.onCreateOptionsMenu(menu, inflater);
-    }
 
-    public void onClearAccountNameClick(View view) {
-        vAccountFilter.setVisibility(View.GONE);
-        if (menuTransactionListFilter != null) menuTransactionListFilter.setVisible(true);
-        accNameFilter.setText(null);
-        mShowOnlyAccountName = null;
-        modelAdapter.resetBoldAccountName();
-        TransactionListViewModel.scheduleTransactionListReload(mActivity);
-        Globals.hideSoftKeyboard(mActivity);
-    }
-    public void onShowFilterClick(MenuItem menuItem) {
-        vAccountFilter.setVisibility(View.VISIBLE);
-        if (menuTransactionListFilter != null) menuTransactionListFilter.setVisible(false);
-        if (menuItem != null) {
+        menuTransactionListFilter.setOnMenuItemClickListener(item -> {
+            vAccountFilter.setVisibility(View.VISIBLE);
+            if (menuTransactionListFilter != null) menuTransactionListFilter.setVisible(false);
             accNameFilter.requestFocus();
             InputMethodManager imm =
                     (InputMethodManager) mActivity.getSystemService(INPUT_METHOD_SERVICE);
             imm.showSoftInput(accNameFilter, 0);
-        }
+
+            return true;
+        });
     }
 }
\ No newline at end of file