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=e6ba48fb05e5b7bb2a6e8e32bbe8a60c64adf1d2;hp=93975b05e59357bf40ae8f484dbe057ac7add7a6;hb=c7cb254623c182cf8f37fbd445855e85c09d0157;hpb=8fd287a2b36f1d28ee1c1ca67687abaab4e95f2f 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 93975b05..e6ba48fb 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,14 +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.util.Log; import android.view.LayoutInflater; -import android.view.Menu; -import android.view.MenuInflater; -import android.view.MenuItem; import android.view.View; import android.view.ViewGroup; @@ -37,7 +31,7 @@ import net.ktnx.mobileledger.ui.MobileLedgerListFragment; import net.ktnx.mobileledger.ui.activity.MainActivity; import net.ktnx.mobileledger.utils.Colors; -import java.util.Observer; +import org.jetbrains.annotations.NotNull; import androidx.annotation.NonNull; import androidx.annotation.Nullable; @@ -45,58 +39,40 @@ 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 { - MenuItem mShowOnlyStarred; public AccountSummaryAdapter modelAdapter; - private Menu optMenu; + /* + private MenuItem mShowOnlyStarred; + private Menu optMenu; + */ private FloatingActionButton fab; - private Observer backgroundTaskCountObserver; - @Override - public void onDestroy() { - if (backgroundTaskCountObserver != null) { - Log.d("acc", "destroying background task count observer"); - Data.backgroundTaskCount.deleteObserver(backgroundTaskCountObserver); - } - super.onDestroy(); - } @Override public void onCreate(@Nullable Bundle savedInstanceState) { super.onCreate(savedInstanceState); - Log.d("flow", "AccountSummaryFragment.onCreate()"); + debug("flow", "AccountSummaryFragment.onCreate()"); setHasOptionsMenu(true); - if (backgroundTaskCountObserver == null) { - Log.d("acc", "creating background task count observer"); - Data.backgroundTaskCount.addObserver(backgroundTaskCountObserver = (o, arg) -> { - if (mActivity == null) return; - if (swiper == null) return; - mActivity.runOnUiThread(() -> { - int cnt = Data.backgroundTaskCount.get(); - Log.d("acc", String.format("background task count changed to %d", cnt)); - swiper.setRefreshing(cnt > 0); - }); - }); - } + Data.backgroundTasksRunning.observe(this, this::onBackgroundTaskRunningChanged); } - public void onAttach(Context context) { + public void onAttach(@NotNull Context context) { super.onAttach(context); - Log.d("flow", "AccountSummaryFragment.onAttach()"); + debug("flow", "AccountSummaryFragment.onAttach()"); mActivity = (MainActivity) context; } @Override public View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) { - Log.d("flow", "AccountSummaryFragment.onCreateView()"); + debug("flow", "AccountSummaryFragment.onCreateView()"); return inflater.inflate(R.layout.account_summary_fragment, container, false); } @Override public void onActivityCreated(@Nullable Bundle savedInstanceState) { - Log.d("flow", "AccountSummaryFragment.onActivityCreated()"); + debug("flow", "AccountSummaryFragment.onActivityCreated()"); super.onActivityCreated(savedInstanceState); modelAdapter = new AccountSummaryAdapter(); @@ -107,7 +83,8 @@ 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); @@ -116,7 +93,7 @@ public class AccountSummaryFragment extends MobileLedgerListFragment { // new RecyclerItemListener.RecyclerTouchListener() { // @Override // public void onClickItem(View v, int position) { -// Log.d("value", String.format("item %d clicked", position)); +// debug("value", String.format("item %d clicked", position)); // if (modelAdapter.isSelectionActive()) { // modelAdapter.selectItem(position); // } @@ -132,7 +109,7 @@ public class AccountSummaryFragment extends MobileLedgerListFragment { // // @Override // public void onLongClickItem(View v, int position) { -// Log.d("value", String.format("item %d long-clicked", position)); +// debug("value", String.format("item %d long-clicked", position)); // modelAdapter.startSelection(); // if (optMenu != null) { // optMenu.findItem(R.id.menu_acc_summary_cancel_selection) @@ -148,31 +125,20 @@ public class AccountSummaryFragment extends MobileLedgerListFragment { // })); 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.addObserver((o, arg) -> swiper.setColorSchemeColors(Colors.primary)); - swiper.setColorSchemeColors(Colors.primary); + Colors.themeWatch.observe(this, this::themeChanged); swiper.setOnRefreshListener(() -> { - Log.d("ui", "refreshing accounts via swipe"); + debug("ui", "refreshing accounts via swipe"); mActivity.scheduleTransactionListRetrieval(); }); 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) { @@ -192,7 +158,7 @@ public class AccountSummaryFragment extends MobileLedgerListFragment { stopSelection(); } @Override - public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) { + 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; @@ -206,21 +172,21 @@ public class AccountSummaryFragment extends MobileLedgerListFragment { Data.optShowOnlyStarred.addObserver((o, arg) -> { boolean newValue = Data.optShowOnlyStarred.get(); - Log.d("pref", String.format("pref change came (%s)", newValue ? "true" : "false")); + debug("pref", String.format("pref change came (%s)", newValue ? "true" : "false")); mShowOnlyStarred.setChecked(newValue); update_account_table(); }); mShowOnlyStarred.setChecked(Data.optShowOnlyStarred.get()); - Log.d("menu", "Accounts: onCreateOptionsMenu called"); + 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); - Log.d("pref", + debug("pref", "Setting show only starred accounts pref to " + (flag ? "false" : "true")); editor.apply(); @@ -239,4 +205,5 @@ public class AccountSummaryFragment extends MobileLedgerListFragment { return true; }); } +*/ }