X-Git-Url: https://git.ktnx.net/?p=mobile-ledger.git;a=blobdiff_plain;f=app%2Fsrc%2Fmain%2Fjava%2Fnet%2Fktnx%2Fmobileledger%2Fui%2Faccount_summary%2FAccountSummaryFragment.java;h=5534acacb3d6d6036e473ce161211d86562bc49d;hp=362dadb9658c1d8a841c9ba55bf2d6bc49f01083;hb=0fc2ddc465cd9b9314ae336e69535020a96a7fbc;hpb=bd5da50ef980c0c9657ec1e9c3e681ab5092f438 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 362dadb9..5534acac 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 @@ -18,13 +18,8 @@ package net.ktnx.mobileledger.ui.account_summary; import android.content.Context; -import android.content.SharedPreferences; import android.os.Bundle; -import android.preference.PreferenceManager; import android.view.LayoutInflater; -import android.view.Menu; -import android.view.MenuInflater; -import android.view.MenuItem; import android.view.View; import android.view.ViewGroup; @@ -44,14 +39,15 @@ import androidx.recyclerview.widget.DividerItemDecoration; import androidx.recyclerview.widget.LinearLayoutManager; import androidx.recyclerview.widget.RecyclerView; -import static net.ktnx.mobileledger.ui.activity.SettingsActivity.PREF_KEY_SHOW_ONLY_STARRED_ACCOUNTS; import static net.ktnx.mobileledger.utils.Logger.debug; public class AccountSummaryFragment extends MobileLedgerListFragment { - private MenuItem mShowOnlyStarred; public AccountSummaryAdapter modelAdapter; - private Menu optMenu; + /* + private MenuItem mShowOnlyStarred; + private Menu optMenu; + */ private FloatingActionButton fab; @Override public void onCreate(@Nullable Bundle savedInstanceState) { @@ -87,71 +83,27 @@ public class AccountSummaryFragment extends MobileLedgerListFragment { llm.setOrientation(RecyclerView.VERTICAL); root.setLayoutManager(llm); root.setAdapter(modelAdapter); - DividerItemDecoration did = new DividerItemDecoration(mActivity, DividerItemDecoration.VERTICAL); + DividerItemDecoration did = + new DividerItemDecoration(mActivity, 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(); - root.addOnScrollListener(new RecyclerView.OnScrollListener() { - @Override - public void onScrolled(@NonNull RecyclerView recyclerView, int dx, int dy) { - if (fab != null) { - if (dy < 0) mActivity.fabShouldShow(); - if (dy > 0) fab.hide(); - } - } - }); + + manageFabOnScroll(); + swiper = mActivity.findViewById(R.id.account_swiper); Colors.themeWatch.observe(this, this::themeChanged); swiper.setOnRefreshListener(() -> { debug("ui", "refreshing accounts via swipe"); - mActivity.scheduleTransactionListRetrieval(); + Data.scheduleTransactionListRetrieval(mActivity); }); Data.accounts.addObserver( (o, arg) -> mActivity.runOnUiThread(() -> modelAdapter.notifyDataSetChanged())); } - private void update_account_table() { - if (this.getContext() == null) return; - - AccountSummaryViewModel.scheduleAccountListReload(); - } +/* void stopSelection() { modelAdapter.stopSelection(); if (optMenu != null) { @@ -218,4 +170,5 @@ public class AccountSummaryFragment extends MobileLedgerListFragment { return true; }); } +*/ }