X-Git-Url: https://git.ktnx.net/?a=blobdiff_plain;f=app%2Fsrc%2Fmain%2Fjava%2Fnet%2Fktnx%2Fmobileledger%2Fui%2Ftransaction_list%2FTransactionListFragment.java;h=4495863cc6927dfdd3e02134c95552dd885c1f6d;hb=e107a105c4588e0b84b1d626a6bed2daf4490c58;hp=e936f2f4ec4dcdc7153224b625481ad9faf35024;hpb=60c444f557ab404619a765279f4089402140aef4;p=mobile-ledger-staging.git 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 e936f2f4..4495863c 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 @@ -31,15 +31,16 @@ import android.widget.AutoCompleteTextView; import androidx.annotation.NonNull; import androidx.annotation.Nullable; +import androidx.lifecycle.ViewModelProvider; 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.async.TransactionDateFinder; import net.ktnx.mobileledger.model.Data; +import net.ktnx.mobileledger.model.MobileLedgerProfile; import net.ktnx.mobileledger.ui.DatePickerFragment; +import net.ktnx.mobileledger.ui.MainModel; import net.ktnx.mobileledger.ui.MobileLedgerListFragment; import net.ktnx.mobileledger.ui.activity.MainActivity; import net.ktnx.mobileledger.utils.Colors; @@ -55,13 +56,12 @@ import java.util.Locale; 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 implements DatePickerFragment.DatePickedListener { private MenuItem menuTransactionListFilter; private View vAccountFilter; private AutoCompleteTextView accNameFilter; + private MainModel model; @Override public void onCreate(@Nullable Bundle savedInstanceState) { super.onCreate(savedInstanceState); @@ -89,22 +89,24 @@ public class TransactionListFragment extends MobileLedgerListFragment debug("flow", "TransactionListFragment.onPause()"); } @Override - public void onActivityCreated(@Nullable Bundle savedInstanceState) { + public void onViewCreated(@NotNull View view, @Nullable Bundle savedInstanceState) { debug("flow", "TransactionListFragment.onActivityCreated called"); - super.onActivityCreated(savedInstanceState); + super.onViewCreated(view, savedInstanceState); Data.backgroundTasksRunning.observe(getViewLifecycleOwner(), this::onBackgroundTaskRunningChanged); MainActivity mainActivity = getMainActivity(); - refreshLayout = mainActivity.findViewById(R.id.transaction_swipe); + model = new ViewModelProvider(requireActivity()).get(MainModel.class); + + refreshLayout = view.findViewById(R.id.transaction_swipe); if (refreshLayout == null) throw new RuntimeException("Can't get hold on the swipe layout"); - root = mainActivity.findViewById(R.id.transaction_root); + root = view.findViewById(R.id.transaction_root); if (root == null) throw new RuntimeException("Can't get hold on the transaction value view"); - modelAdapter = new TransactionListAdapter(); + modelAdapter = new TransactionListAdapter(model); root.setAdapter(modelAdapter); mainActivity.fabShouldShow(); @@ -118,52 +120,47 @@ public class TransactionListFragment extends MobileLedgerListFragment refreshLayout.setOnRefreshListener(() -> { debug("ui", "refreshing transactions via swipe"); - mainActivity.scheduleDataRetrieval(); + model.scheduleTransactionListRetrieval(); }); Colors.themeWatch.observe(getViewLifecycleOwner(), this::themeChanged); - vAccountFilter = mainActivity.findViewById(R.id.transaction_list_account_name_filter); - accNameFilter = mainActivity.findViewById(R.id.transaction_filter_account_name); + vAccountFilter = view.findViewById(R.id.transaction_list_account_name_filter); + accNameFilter = view.findViewById(R.id.transaction_filter_account_name); MLDB.hookAutocompletionAdapter(mainActivity, accNameFilter, "accounts", "name"); - accNameFilter.setOnItemClickListener((parent, view, position, id) -> { + accNameFilter.setOnItemClickListener((parent, v, position, id) -> { // debug("tmp", "direct onItemClick"); Cursor c = (Cursor) parent.getItemAtPosition(position); - Data.accountFilter.setValue(c.getString(1)); + model.getAccountFilter() + .setValue(c.getString(1)); Globals.hideSoftKeyboard(mainActivity); }); - Data.accountFilter.observe(getViewLifecycleOwner(), this::onAccountNameFilterChanged); + model.getAccountFilter() + .observe(getViewLifecycleOwner(), this::onAccountNameFilterChanged); - TransactionListViewModel.updating.addObserver( - (o, arg) -> refreshLayout.setRefreshing(TransactionListViewModel.updating.get())); - TransactionListViewModel.updateError.addObserver((o, arg) -> { - String err = TransactionListViewModel.updateError.get(); - if (err == null) - return; - - Snackbar.make(this.root, err, Snackbar.LENGTH_LONG) - .show(); - TransactionListViewModel.updateError.set(null); - }); - Data.transactions.addObserver( - (o, arg) -> mainActivity.runOnUiThread(() -> modelAdapter.notifyDataSetChanged())); + model.getUpdatingFlag() + .observe(getViewLifecycleOwner(), (flag) -> refreshLayout.setRefreshing(flag)); + MobileLedgerProfile profile = Data.getProfile(); + model.getDisplayedTransactions() + .observe(getViewLifecycleOwner(), list -> modelAdapter.setTransactions(list)); - mainActivity.findViewById(R.id.clearAccountNameFilter) - .setOnClickListener(v -> { - Data.accountFilter.setValue(null); + view.findViewById(R.id.clearAccountNameFilter) + .setOnClickListener(v -> { + model.getAccountFilter() + .setValue(null); vAccountFilter.setVisibility(View.GONE); menuTransactionListFilter.setVisible(true); Globals.hideSoftKeyboard(mainActivity); }); - Data.foundTransactionItemIndex.observe(getViewLifecycleOwner(), pos -> { + model.foundTransactionItemIndex.observe(getViewLifecycleOwner(), pos -> { Logger.debug("go-to-date", String.format(Locale.US, "Found pos %d", pos)); if (pos != null) { root.scrollToPosition(pos); // reset the value to avoid re-notification upon reconfiguration or app restart - Data.foundTransactionItemIndex.setValue(null); + model.foundTransactionItemIndex.setValue(null); } }); } @@ -183,7 +180,7 @@ public class TransactionListFragment extends MobileLedgerListFragment if (menuTransactionListFilter != null) menuTransactionListFilter.setVisible(!filterActive); - TransactionListViewModel.scheduleTransactionListReload(); + model.scheduleTransactionListReload(); } @Override @@ -194,8 +191,8 @@ public class TransactionListFragment extends MobileLedgerListFragment if ((menuTransactionListFilter == null)) throw new AssertionError(); - if ((Data.accountFilter.getValue() != null) || - (vAccountFilter.getVisibility() == View.VISIBLE)) + if ((model.getAccountFilter() + .getValue() != null) || (vAccountFilter.getVisibility() == View.VISIBLE)) { menuTransactionListFilter.setVisible(false); } @@ -218,8 +215,8 @@ public class TransactionListFragment extends MobileLedgerListFragment .setOnMenuItemClickListener(item -> { DatePickerFragment picker = new DatePickerFragment(); picker.setOnDatePickedListener(this); - picker.setDateRange(Data.earliestTransactionDate.getValue(), - Data.latestTransactionDate.getValue()); + picker.setDateRange(model.getFirstTransactionDate(), + model.getLastTransactionDate()); picker.show(requireActivity().getSupportFragmentManager(), null); return true; }); @@ -227,8 +224,9 @@ public class TransactionListFragment extends MobileLedgerListFragment @Override public void onDatePicked(int year, int month, int day) { RecyclerView list = requireActivity().findViewById(R.id.transaction_root); - AsyncTask finder = new TransactionDateFinder(); + AsyncTask finder = new TransactionDateFinder(); - finder.execute(new SimpleDate(year, month + 1, day)); + finder.execute( + new TransactionDateFinder.Params(model, new SimpleDate(year, month + 1, day))); } }