drop unused instantiation of TransactionListViewModel

[mobile-ledger.git] / app / src / main / java / net / ktnx / mobileledger / ui / transaction_list / TransactionListFragment.java

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 d719259237c5ded76fd946123483aaac37fd9aff..eb17aed72ffcb1df908b68fb723f4596406ec303 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
@@ -17,7 +17,6 @@
 
 package net.ktnx.mobileledger.ui.transaction_list;
 
-import android.arch.lifecycle.ViewModelProviders;
 import android.content.Context;
 import android.database.MatrixCursor;
 import android.os.Bundle;
@@ -35,6 +34,7 @@ import android.view.View;
 import android.view.ViewGroup;
 import android.view.inputmethod.InputMethodManager;
 import android.widget.AutoCompleteTextView;
+import android.widget.Toast;
 
 import net.ktnx.mobileledger.R;
 import net.ktnx.mobileledger.model.Data;
@@ -116,6 +116,21 @@ public class TransactionListFragment extends MobileLedgerListFragment {
         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);
@@ -125,7 +140,6 @@ public class TransactionListFragment extends MobileLedgerListFragment {
         root = mActivity.findViewById(R.id.transaction_root);
         if (root == null)
             throw new RuntimeException("Can't get hold on the transaction value view");
-        model = ViewModelProviders.of(this).get(TransactionListViewModel.class);
         modelAdapter = new TransactionListAdapter();
 
         modelAdapter.setBoldAccountName(mShowOnlyAccountName);
@@ -133,11 +147,11 @@ public class TransactionListFragment extends MobileLedgerListFragment {
 
         FloatingActionButton fab = mActivity.findViewById(R.id.btn_add_transaction);
 
-        fab.show();
+        mActivity.fabShouldShow();
         root.addOnScrollListener(new RecyclerView.OnScrollListener() {
             @Override
             public void onScrolled(@NonNull RecyclerView recyclerView, int dx, int dy) {
-                if (dy < 0) fab.show();
+                if (dy < 0) mActivity.fabShouldShow();
                 if (dy > 0) fab.hide();
             }
         });
@@ -158,7 +172,7 @@ 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", true);
+        MLDB.hookAutocompletionAdapter(mActivity, accNameFilter, "accounts", "name", true);
         accNameFilter.setOnItemClickListener((parent, view, position, id) -> {
 //                Log.d("tmp", "direct onItemClick");
             TransactionListViewModel.scheduleTransactionListReload();
@@ -183,7 +197,16 @@ public class TransactionListFragment extends MobileLedgerListFragment {
         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) {
+                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()));