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=1f6fbda69e5e2d83d23ae77fe02e2d73898bf2c1;hp=d719259237c5ded76fd946123483aaac37fd9aff;hb=22f72903c1b7d827064c90b4472ff5c69ab3ba2f;hpb=2e6d7c5f759986f89a867ee5b9162496019d5130 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 d7192592..1f6fbda6 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 @@ -35,6 +35,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 +117,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); @@ -133,11 +149,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 +174,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 +199,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()));