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=3625ea40a64f3412adc99b7efb6573846e8d1de9;hp=0b9e4e33f5fe0d0c4cbca58b5d3cd41bb25b1cf1;hb=b95e098e5f1158ceb25a073cffd3068633e3fd05;hpb=bd5da50ef980c0c9657ec1e9c3e681ab5092f438 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 0b9e4e33..3625ea40 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 @@ -18,7 +18,7 @@ package net.ktnx.mobileledger.ui.transaction_list; import android.content.Context; -import android.database.MatrixCursor; +import android.database.Cursor; import android.os.Bundle; import android.view.LayoutInflater; import android.view.Menu; @@ -28,9 +28,13 @@ import android.view.View; import android.view.ViewGroup; import android.view.inputmethod.InputMethodManager; import android.widget.AutoCompleteTextView; -import android.widget.Toast; -import com.google.android.material.floatingactionbutton.FloatingActionButton; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; +import androidx.recyclerview.widget.LinearLayoutManager; +import androidx.recyclerview.widget.RecyclerView; + +import com.google.android.material.snackbar.Snackbar; import net.ktnx.mobileledger.R; import net.ktnx.mobileledger.model.Data; @@ -42,14 +46,11 @@ import net.ktnx.mobileledger.utils.MLDB; import org.jetbrains.annotations.NotNull; -import androidx.annotation.NonNull; -import androidx.annotation.Nullable; -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; +// TODO: support transaction-level comment + public class TransactionListFragment extends MobileLedgerListFragment { private MenuItem menuTransactionListFilter; private View vAccountFilter; @@ -58,7 +59,6 @@ public class TransactionListFragment extends MobileLedgerListFragment { public void onCreate(@Nullable Bundle savedInstanceState) { super.onCreate(savedInstanceState); setHasOptionsMenu(true); - Data.backgroundTasksRunning.observe(this, this::onBackgroundTaskRunningChanged); } @Override public void onAttach(@NotNull Context context) { @@ -91,71 +91,75 @@ public class TransactionListFragment extends MobileLedgerListFragment { debug("flow", "TransactionListFragment.onActivityCreated called"); super.onActivityCreated(savedInstanceState); + Data.backgroundTasksRunning.observe(getViewLifecycleOwner(), + this::onBackgroundTaskRunningChanged); + swiper = mActivity.findViewById(R.id.transaction_swipe); - if (swiper == null) throw new RuntimeException("Can't get hold on the swipe layout"); + if (swiper == null) + throw new RuntimeException("Can't get hold on the swipe layout"); root = mActivity.findViewById(R.id.transaction_root); if (root == null) throw new RuntimeException("Can't get hold on the transaction value view"); 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(() -> { debug("ui", "refreshing transactions via swipe"); - mActivity.scheduleTransactionListRetrieval(); + Data.scheduleTransactionListRetrieval(mActivity); }); - Colors.themeWatch.observe(this, this::themeChanged); - swiper.setColorSchemeColors(Colors.primary); + Colors.themeWatch.observe(getViewLifecycleOwner(), this::themeChanged); vAccountFilter = mActivity.findViewById(R.id.transaction_list_account_name_filter); accNameFilter = mActivity.findViewById(R.id.transaction_filter_account_name); - MLDB.hookAutocompletionAdapter(mActivity, accNameFilter, "accounts", "name", true); + MLDB.hookAutocompletionAdapter(mActivity, accNameFilter, "accounts", "name"); accNameFilter.setOnItemClickListener((parent, view, position, id) -> { // debug("tmp", "direct onItemClick"); - MatrixCursor mc = (MatrixCursor) parent.getItemAtPosition(position); - Data.accountFilter.setValue(mc.getString(1)); + Cursor c = (Cursor) parent.getItemAtPosition(position); + Data.accountFilter.setValue(c.getString(1)); Globals.hideSoftKeyboard(mActivity); }); - Data.accountFilter.observe(this, this::onAccountNameFilterChanged); + Data.accountFilter.observe(getViewLifecycleOwner(), this::onAccountNameFilterChanged); TransactionListViewModel.updating.addObserver( (o, arg) -> swiper.setRefreshing(TransactionListViewModel.updating.get())); TransactionListViewModel.updateError.addObserver((o, arg) -> { String err = TransactionListViewModel.updateError.get(); - if (err == null) return; + if (err == null) + return; - Toast.makeText(mActivity, err, Toast.LENGTH_SHORT).show(); + Snackbar.make(this.root, err, Snackbar.LENGTH_LONG) + .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); - menuTransactionListFilter.setVisible(true); - Globals.hideSoftKeyboard(mActivity); - }); + mActivity.findViewById(R.id.clearAccountNameFilter) + .setOnClickListener(v -> { + Data.accountFilter.setValue(null); + vAccountFilter.setVisibility(View.GONE); + 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); } @@ -163,7 +167,8 @@ public class TransactionListFragment extends MobileLedgerListFragment { if (vAccountFilter != null) { vAccountFilter.setVisibility(filterActive ? View.VISIBLE : View.GONE); } - if (menuTransactionListFilter != null) menuTransactionListFilter.setVisible(!filterActive); + if (menuTransactionListFilter != null) + menuTransactionListFilter.setVisible(!filterActive); TransactionListViewModel.scheduleTransactionListReload(); @@ -173,9 +178,12 @@ public class TransactionListFragment extends MobileLedgerListFragment { inflater.inflate(R.menu.transaction_list, menu); menuTransactionListFilter = menu.findItem(R.id.menu_transaction_list_filter); - if ((menuTransactionListFilter == null)) throw new AssertionError(); + if ((menuTransactionListFilter == null)) + throw new AssertionError(); - if (Data.accountFilter.getValue() != null) { + if ((Data.accountFilter.getValue() != null) || + (vAccountFilter.getVisibility() == View.VISIBLE)) + { menuTransactionListFilter.setVisible(false); } @@ -183,7 +191,8 @@ public class TransactionListFragment extends MobileLedgerListFragment { menuTransactionListFilter.setOnMenuItemClickListener(item -> { vAccountFilter.setVisibility(View.VISIBLE); - if (menuTransactionListFilter != null) menuTransactionListFilter.setVisible(false); + if (menuTransactionListFilter != null) + menuTransactionListFilter.setVisible(false); accNameFilter.requestFocus(); InputMethodManager imm = (InputMethodManager) mActivity.getSystemService(INPUT_METHOD_SERVICE); @@ -192,4 +201,4 @@ public class TransactionListFragment extends MobileLedgerListFragment { return true; }); } -} \ No newline at end of file +}