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=7ebf4e9161a409185475f63dcbff384682329e0e;hp=d39428525dcdffb2f047a66dff60ac9a7ba12e20;hb=be3bfabca0462fc0c8ca7ab241da304b68971056;hpb=826ef2c336fb66719c35f732446e92bde3523508 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 d3942852..7ebf4e91 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 @@ -20,7 +20,6 @@ package net.ktnx.mobileledger.ui.transaction_list; import android.content.Context; import android.database.MatrixCursor; import android.os.Bundle; -import android.util.Log; import android.view.LayoutInflater; import android.view.Menu; import android.view.MenuInflater; @@ -31,8 +30,6 @@ import android.view.inputmethod.InputMethodManager; import android.widget.AutoCompleteTextView; import android.widget.Toast; -import com.google.android.material.floatingactionbutton.FloatingActionButton; - import net.ktnx.mobileledger.R; import net.ktnx.mobileledger.model.Data; import net.ktnx.mobileledger.ui.MobileLedgerListFragment; @@ -41,8 +38,7 @@ import net.ktnx.mobileledger.utils.Colors; import net.ktnx.mobileledger.utils.Globals; import net.ktnx.mobileledger.utils.MLDB; -import java.util.Observable; -import java.util.Observer; +import org.jetbrains.annotations.NotNull; import androidx.annotation.NonNull; import androidx.annotation.Nullable; @@ -50,45 +46,20 @@ import androidx.recyclerview.widget.LinearLayoutManager; import androidx.recyclerview.widget.RecyclerView; import static android.content.Context.INPUT_METHOD_SERVICE; +import static net.ktnx.mobileledger.utils.Logger.debug; public class TransactionListFragment extends MobileLedgerListFragment { private MenuItem menuTransactionListFilter; private View vAccountFilter; private AutoCompleteTextView accNameFilter; - private Observer backgroundTaskCountObserver; - private Observer accountFilterObserver; - private static void update(Observable o, Object arg) { - } - @Override - public void onDestroy() { - if (backgroundTaskCountObserver != null) { - Log.d("rtl", "destroying background task count observer"); - Data.backgroundTaskCount.deleteObserver(backgroundTaskCountObserver); - } - super.onDestroy(); - } - public void setShowOnlyAccountName(String mShowOnlyAccountName) { - } @Override public void onCreate(@Nullable Bundle savedInstanceState) { super.onCreate(savedInstanceState); setHasOptionsMenu(true); - if (backgroundTaskCountObserver == null) { - Log.d("rtl", "creating background task count observer"); - Data.backgroundTaskCount.addObserver(backgroundTaskCountObserver = new Observer() { - @Override - public void update(Observable o, Object arg) { - mActivity.runOnUiThread(() -> { - int cnt = Data.backgroundTaskCount.get(); - Log.d("trl", String.format("background task count changed to %d", cnt)); - swiper.setRefreshing(cnt > 0); - }); - } - }); - } + Data.backgroundTasksRunning.observe(this, this::onBackgroundTaskRunningChanged); } @Override - public void onAttach(Context context) { + public void onAttach(@NotNull Context context) { super.onAttach(context); mActivity = (MainActivity) context; } @@ -101,21 +72,21 @@ public class TransactionListFragment extends MobileLedgerListFragment { @Override public void onResume() { super.onResume(); - Log.d("flow", "TransactionListFragment.onResume()"); + debug("flow", "TransactionListFragment.onResume()"); } @Override public void onStop() { super.onStop(); - Log.d("flow", "TransactionListFragment.onStop()"); + debug("flow", "TransactionListFragment.onStop()"); } @Override public void onPause() { super.onPause(); - Log.d("flow", "TransactionListFragment.onPause()"); + debug("flow", "TransactionListFragment.onPause()"); } @Override public void onActivityCreated(@Nullable Bundle savedInstanceState) { - Log.d("flow", "TransactionListFragment.onActivityCreated called"); + debug("flow", "TransactionListFragment.onActivityCreated called"); super.onActivityCreated(savedInstanceState); swiper = mActivity.findViewById(R.id.transaction_swipe); @@ -126,78 +97,58 @@ public class TransactionListFragment extends MobileLedgerListFragment { modelAdapter = new TransactionListAdapter(); root.setAdapter(modelAdapter); - FloatingActionButton fab = mActivity.findViewById(R.id.btn_add_transaction); - mActivity.fabShouldShow(); - root.addOnScrollListener(new RecyclerView.OnScrollListener() { - @Override - public void onScrolled(@NonNull RecyclerView recyclerView, int dx, int dy) { - if (dy < 0) mActivity.fabShouldShow(); - if (dy > 0) fab.hide(); - } - }); + + manageFabOnScroll(); LinearLayoutManager llm = new LinearLayoutManager(mActivity); - llm.setOrientation(LinearLayoutManager.VERTICAL); + llm.setOrientation(RecyclerView.VERTICAL); root.setLayoutManager(llm); swiper.setOnRefreshListener(() -> { - Log.d("ui", "refreshing transactions via swipe"); - mActivity.scheduleTransactionListRetrieval(); + debug("ui", "refreshing transactions via swipe"); + Data.scheduleTransactionListRetrieval(mActivity); }); - Colors.themeWatch.addObserver( - (o, arg) -> swiper.setColorSchemeColors(Colors.primary)); - swiper.setColorSchemeColors(Colors.primary); + Colors.themeWatch.observe(this, this::themeChanged); vAccountFilter = mActivity.findViewById(R.id.transaction_list_account_name_filter); accNameFilter = mActivity.findViewById(R.id.transaction_filter_account_name); - TransactionListFragment me = this; MLDB.hookAutocompletionAdapter(mActivity, accNameFilter, "accounts", "name", true); accNameFilter.setOnItemClickListener((parent, view, position, id) -> { -// Log.d("tmp", "direct onItemClick"); +// debug("tmp", "direct onItemClick"); MatrixCursor mc = (MatrixCursor) parent.getItemAtPosition(position); - Data.accountFilter.set(mc.getString(1)); + Data.accountFilter.setValue(mc.getString(1)); Globals.hideSoftKeyboard(mActivity); }); - if (accountFilterObserver == null) { - accountFilterObserver = (o, arg) -> onAccountNameFilterChanged(); - Data.accountFilter.addObserver(accountFilterObserver); - } + Data.accountFilter.observe(this, this::onAccountNameFilterChanged); 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); - } + TransactionListViewModel.updateError.addObserver((o, 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())); mActivity.findViewById(R.id.clearAccountNameFilter).setOnClickListener(v -> { - String current = Data.accountFilter.get(); - Data.accountFilter.set(null); + Data.accountFilter.setValue(null); vAccountFilter.setVisibility(View.GONE); menuTransactionListFilter.setVisible(true); Globals.hideSoftKeyboard(mActivity); }); - - onAccountNameFilterChanged(false); - } - private void onAccountNameFilterChanged() { - onAccountNameFilterChanged(true); } - private void onAccountNameFilterChanged(boolean reloadTransactions) { - String accName = Data.accountFilter.get(); + private void onAccountNameFilterChanged(String accName) { + final String fieldText = accNameFilter.getText().toString(); + if ((accName == null) && (fieldText.equals(""))) return; + if (accNameFilter != null) { accNameFilter.setText(accName, false); } @@ -207,17 +158,17 @@ public class TransactionListFragment extends MobileLedgerListFragment { } if (menuTransactionListFilter != null) menuTransactionListFilter.setVisible(!filterActive); - if (reloadTransactions) TransactionListViewModel.scheduleTransactionListReload(); + TransactionListViewModel.scheduleTransactionListReload(); } @Override - public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) { + public void onCreateOptionsMenu(@NotNull Menu menu, @NotNull MenuInflater inflater) { inflater.inflate(R.menu.transaction_list, menu); menuTransactionListFilter = menu.findItem(R.id.menu_transaction_list_filter); if ((menuTransactionListFilter == null)) throw new AssertionError(); - if (Data.accountFilter.get() != null) { + if (Data.accountFilter.getValue() != null) { menuTransactionListFilter.setVisible(false); }