X-Git-Url: https://git.ktnx.net/?a=blobdiff_plain;f=app%2Fsrc%2Fmain%2Fjava%2Fnet%2Fktnx%2Fmobileledger%2Fui%2Faccount_summary%2FAccountSummaryFragment.java;h=9654f140f5739cdfe800e939e0eef4f535e24590;hb=32479d6cca6ffb6b74edbd4b884b9062d42fcbff;hp=86f66d8d895647921391cc6105dc0b7ec4b0e74f;hpb=c6dd0097d1e6f59b0c82b36b103e7ccdafb1f85d;p=mobile-ledger.git diff --git a/app/src/main/java/net/ktnx/mobileledger/ui/account_summary/AccountSummaryFragment.java b/app/src/main/java/net/ktnx/mobileledger/ui/account_summary/AccountSummaryFragment.java index 86f66d8d..9654f140 100644 --- a/app/src/main/java/net/ktnx/mobileledger/ui/account_summary/AccountSummaryFragment.java +++ b/app/src/main/java/net/ktnx/mobileledger/ui/account_summary/AccountSummaryFragment.java @@ -1,5 +1,5 @@ /* - * Copyright © 2019 Damyan Ivanov. + * Copyright © 2020 Damyan Ivanov. * This file is part of MoLe. * MoLe is free software: you can distribute it and/or modify it * under the term of the GNU General Public License as published by @@ -23,44 +23,40 @@ import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; -import com.google.android.material.floatingactionbutton.FloatingActionButton; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; +import androidx.lifecycle.ViewModelProvider; +import androidx.recyclerview.widget.DividerItemDecoration; +import androidx.recyclerview.widget.LinearLayoutManager; +import androidx.recyclerview.widget.RecyclerView; import net.ktnx.mobileledger.R; +import net.ktnx.mobileledger.model.AccountListItem; import net.ktnx.mobileledger.model.Data; +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; +import net.ktnx.mobileledger.utils.Logger; import org.jetbrains.annotations.NotNull; -import androidx.annotation.NonNull; -import androidx.annotation.Nullable; -import androidx.recyclerview.widget.DividerItemDecoration; -import androidx.recyclerview.widget.LinearLayoutManager; -import androidx.recyclerview.widget.RecyclerView; +import java.util.List; +import java.util.Locale; import static net.ktnx.mobileledger.utils.Logger.debug; public class AccountSummaryFragment extends MobileLedgerListFragment { - public AccountSummaryAdapter modelAdapter; -/* - private MenuItem mShowOnlyStarred; - private Menu optMenu; -*/ - private FloatingActionButton fab; @Override public void onCreate(@Nullable Bundle savedInstanceState) { super.onCreate(savedInstanceState); debug("flow", "AccountSummaryFragment.onCreate()"); setHasOptionsMenu(true); - - Data.backgroundTasksRunning.observe(this, this::onBackgroundTaskRunningChanged); } public void onAttach(@NotNull Context context) { super.onAttach(context); debug("flow", "AccountSummaryFragment.onAttach()"); - mActivity = (MainActivity) context; } @Override public View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup container, @@ -71,138 +67,45 @@ public class AccountSummaryFragment extends MobileLedgerListFragment { @Override - public void onActivityCreated(@Nullable Bundle savedInstanceState) { + public void onViewCreated(@Nullable View view, @Nullable Bundle savedInstanceState) { debug("flow", "AccountSummaryFragment.onActivityCreated()"); - super.onActivityCreated(savedInstanceState); + super.onViewCreated(view, savedInstanceState); + + MainModel model = new ViewModelProvider(requireActivity()).get(MainModel.class); - modelAdapter = new AccountSummaryAdapter(); + Data.backgroundTasksRunning.observe(this.getViewLifecycleOwner(), + this::onBackgroundTaskRunningChanged); - mActivity.mAccountSummaryFragment = this; - root = mActivity.findViewById(R.id.account_root); - LinearLayoutManager llm = new LinearLayoutManager(mActivity); + modelAdapter = new AccountSummaryAdapter(model); + MainActivity mainActivity = getMainActivity(); + + root = mainActivity.findViewById(R.id.account_root); + LinearLayoutManager llm = new LinearLayoutManager(mainActivity); llm.setOrientation(RecyclerView.VERTICAL); root.setLayoutManager(llm); root.setAdapter(modelAdapter); - DividerItemDecoration did = new DividerItemDecoration(mActivity, DividerItemDecoration.VERTICAL); + DividerItemDecoration did = + new DividerItemDecoration(mainActivity, DividerItemDecoration.VERTICAL); root.addItemDecoration(did); - fab = mActivity.findViewById(R.id.btn_add_transaction); - -// root.addOnItemTouchListener(new RecyclerItemListener(mActivity, root, -// new RecyclerItemListener.RecyclerTouchListener() { -// @Override -// public void onClickItem(View v, int position) { -// debug("value", String.format("item %d clicked", position)); -// if (modelAdapter.isSelectionActive()) { -// modelAdapter.selectItem(position); -// } -// else { -// List accounts = Data.accounts.get(); -// if (accounts != null) { -// LedgerAccount account = accounts.get(position); -// -// mActivity.showAccountTransactions(account); -// } -// } -// } -// -// @Override -// public void onLongClickItem(View v, int position) { -// debug("value", String.format("item %d long-clicked", position)); -// modelAdapter.startSelection(); -// if (optMenu != null) { -// optMenu.findItem(R.id.menu_acc_summary_cancel_selection) -// .setVisible(true); -// optMenu.findItem(R.id.menu_acc_summary_confirm_selection) -// .setVisible(true); -// optMenu.findItem(R.id.menu_acc_summary_only_starred).setVisible(false); -// } -// { -// if (fab != null) fab.hide(); -// } -// } -// })); - - mActivity.fabShouldShow(); + mainActivity.fabShouldShow(); manageFabOnScroll(); - swiper = mActivity.findViewById(R.id.account_swiper); - Colors.themeWatch.observe(this, this::themeChanged); - swiper.setOnRefreshListener(() -> { + refreshLayout = mainActivity.findViewById(R.id.account_swipe_refresh_layout); + Colors.themeWatch.observe(getViewLifecycleOwner(), this::themeChanged); + refreshLayout.setOnRefreshListener(() -> { debug("ui", "refreshing accounts via swipe"); - mActivity.scheduleTransactionListRetrieval(); + model.scheduleTransactionListRetrieval(); }); - Data.accounts.addObserver( - (o, arg) -> mActivity.runOnUiThread(() -> modelAdapter.notifyDataSetChanged())); + model.getDisplayedAccounts() + .observe(getViewLifecycleOwner(), this::onAccountsChanged); } -/* - void stopSelection() { - modelAdapter.stopSelection(); - if (optMenu != null) { - optMenu.findItem(R.id.menu_acc_summary_cancel_selection).setVisible(false); - optMenu.findItem(R.id.menu_acc_summary_confirm_selection).setVisible(false); - optMenu.findItem(R.id.menu_acc_summary_only_starred).setVisible(true); - } - { - if (fab != null) fab.show(); - } - } - public void onCancelAccSelection(MenuItem item) { - stopSelection(); - } - public void onConfirmAccSelection(MenuItem item) { - AccountSummaryViewModel.commitSelections(mActivity); - stopSelection(); - } - @Override - public void onCreateOptionsMenu(@NotNull Menu menu, @NotNull MenuInflater inflater) { - // Inflate the menu; this adds items to the action bar if it is present. - inflater.inflate(R.menu.account_summary, menu); - optMenu = menu; - - mShowOnlyStarred = menu.findItem(R.id.menu_acc_summary_only_starred); - if (mShowOnlyStarred == null) throw new AssertionError(); - MenuItem mCancelSelection = menu.findItem(R.id.menu_acc_summary_cancel_selection); - if (mCancelSelection == null) throw new AssertionError(); - MenuItem mConfirmSelection = menu.findItem(R.id.menu_acc_summary_confirm_selection); - if (mConfirmSelection == null) throw new AssertionError(); - - Data.optShowOnlyStarred.addObserver((o, arg) -> { - boolean newValue = Data.optShowOnlyStarred.get(); - debug("pref", String.format("pref change came (%s)", newValue ? "true" : "false")); - mShowOnlyStarred.setChecked(newValue); - update_account_table(); - }); - - mShowOnlyStarred.setChecked(Data.optShowOnlyStarred.get()); - - debug("menu", "Accounts: onCreateOptionsMenu called"); - - mShowOnlyStarred.setOnMenuItemClickListener(item -> { - SharedPreferences pref = PreferenceManager.getDefaultSharedPreferences(mActivity); - SharedPreferences.Editor editor = pref.edit(); - boolean flag = item.isChecked(); - editor.putBoolean(PREF_KEY_SHOW_ONLY_STARRED_ACCOUNTS, !flag); - debug("pref", - "Setting show only starred accounts pref to " + (flag ? "false" : "true")); - editor.apply(); - - return true; - }); - - mCancelSelection.setOnMenuItemClickListener(item -> { - stopSelection(); - return true; - }); - - mConfirmSelection.setOnMenuItemClickListener(item -> { - AccountSummaryViewModel.commitSelections(mActivity); - stopSelection(); - - return true; - }); + private void onAccountsChanged(List accounts) { + Logger.debug("async-acc", + String.format(Locale.US, "fragment: got new account list (%d items)", + accounts.size())); + modelAdapter.setAccounts(accounts); } -*/ }