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=6340b3e2869f490b7bc6fda5a7e671264b5d0944;hp=631205f24448f0501aef8df95362bbf5db8c4802;hb=aff298c5d65b279b40884cf8273bd4eeb054adaa;hpb=bb9d4a9c9708a568dddf2b1c637ae54ec53caa25 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 631205f2..6340b3e2 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; @@ -40,10 +37,8 @@ import net.ktnx.mobileledger.ui.activity.MainActivity; import net.ktnx.mobileledger.utils.Colors; 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; +import org.jetbrains.annotations.NotNull; import androidx.annotation.NonNull; import androidx.annotation.Nullable; @@ -51,65 +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 { - public static final String BUNDLE_KEY_FILTER_ACCOUNT_NAME = "filter_account_name"; - public static ObservableValue accountFilter = new ObservableValue<>(); - private String mShowOnlyAccountName; 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) { - this.mShowOnlyAccountName = mShowOnlyAccountName; - if (modelAdapter != null) { - modelAdapter.setBoldAccountName(mShowOnlyAccountName); - } - if (accNameFilter != null) { - accNameFilter.setText(mShowOnlyAccountName, false); - } - if (vAccountFilter != null) { - vAccountFilter.setVisibility( - ((mShowOnlyAccountName != null) && !mShowOnlyAccountName.isEmpty()) - ? View.VISIBLE : View.GONE); - } - } - @Override - public void setArguments(@Nullable Bundle args) { - super.setArguments(args); - mShowOnlyAccountName = args.getString(BUNDLE_KEY_FILTER_ACCOUNT_NAME); - } @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; } @@ -122,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); @@ -145,92 +95,80 @@ public class TransactionListFragment extends MobileLedgerListFragment { if (root == null) throw new RuntimeException("Can't get hold on the transaction value view"); modelAdapter = new TransactionListAdapter(); - - modelAdapter.setBoldAccountName(mShowOnlyAccountName); 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); + MLDB.hookAutocompletionAdapter(mActivity, accNameFilter, "accounts", "name"); accNameFilter.setOnItemClickListener((parent, view, position, id) -> { -// Log.d("tmp", "direct onItemClick"); - TransactionListViewModel.scheduleTransactionListReload(); +// debug("tmp", "direct onItemClick"); MatrixCursor mc = (MatrixCursor) parent.getItemAtPosition(position); - accountFilter.set(mc.getString(1)); + Data.accountFilter.setValue(mc.getString(1)); Globals.hideSoftKeyboard(mActivity); }); - if (accountFilterObserver == null) { - accountFilterObserver = (o, arg) -> { - String accountName = accountFilter.get(); - modelAdapter.setBoldAccountName(accountName); - setShowOnlyAccountName(accountName); - TransactionListViewModel.scheduleTransactionListReload(); - if (menuTransactionListFilter != null) menuTransactionListFilter.setVisible(false); - }; - accountFilter.addObserver(accountFilterObserver); - } + Data.accountFilter.observe(this, this::onAccountNameFilterChanged); - 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); - } + 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 -> { + Data.accountFilter.setValue(null); vAccountFilter.setVisibility(View.GONE); - if (menuTransactionListFilter != null) menuTransactionListFilter.setVisible(true); - accountFilter.set(null); - accNameFilter.setText(null); - TransactionListViewModel.scheduleTransactionListReload(); + menuTransactionListFilter.setVisible(true); Globals.hideSoftKeyboard(mActivity); }); } + private void onAccountNameFilterChanged(String accName) { + final String fieldText = accNameFilter.getText().toString(); + if ((accName == null) && (fieldText.equals(""))) return; + + if (accNameFilter != null) { + accNameFilter.setText(accName, false); + } + final boolean filterActive = (accName != null) && !accName.isEmpty(); + if (vAccountFilter != null) { + vAccountFilter.setVisibility(filterActive ? View.VISIBLE : View.GONE); + } + if (menuTransactionListFilter != null) menuTransactionListFilter.setVisible(!filterActive); + + 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 (mShowOnlyAccountName != null) { + if (Data.accountFilter.getValue() != null) { menuTransactionListFilter.setVisible(false); }