X-Git-Url: https://git.ktnx.net/?a=blobdiff_plain;ds=sidebyside;f=app%2Fsrc%2Fmain%2Fjava%2Fnet%2Fktnx%2Fmobileledger%2Fui%2Faccount_summary%2FAccountSummaryFragment.java;h=bb484929d9f221236bde6b05209cc5b07f5c25d4;hb=6ab7b1bb9b7b5ffbbcc21db1d1e467e3d9752b6e;hp=d75577ff3d8f94c26f82a2493a960242d9605a78;hpb=d1cdfcec0a7e66bc0fb49bc19e0dff540caac899;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 d75577ff..bb484929 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 @@ -42,12 +42,11 @@ import androidx.recyclerview.widget.RecyclerView; import static net.ktnx.mobileledger.utils.Logger.debug; public class AccountSummaryFragment extends MobileLedgerListFragment { - public AccountSummaryAdapter modelAdapter; -/* - private MenuItem mShowOnlyStarred; - private Menu optMenu; -*/ + /* + private MenuItem mShowOnlyStarred; + private Menu optMenu; + */ private FloatingActionButton fab; @Override public void onCreate(@Nullable Bundle savedInstanceState) { @@ -83,61 +82,21 @@ 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(