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=bb484929d9f221236bde6b05209cc5b07f5c25d4;hp=ff4b20f48c9ff3d7b464bae3af532df70140ee92;hb=6ab7b1bb9b7b5ffbbcc21db1d1e467e3d9752b6e;hpb=4c5624fe5d6b8ec63fb92cebc343855e35ae53ad

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 ff4b20f4..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
@@ -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;
 
@@ -45,38 +39,39 @@ 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;
     @Override
     public void onCreate(@Nullable Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
-        Log.d("flow", "AccountSummaryFragment.onCreate()");
+        debug("flow", "AccountSummaryFragment.onCreate()");
         setHasOptionsMenu(true);
 
         Data.backgroundTasksRunning.observe(this, this::onBackgroundTaskRunningChanged);
     }
     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();
@@ -87,71 +82,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) {
-//                        Log.d("value", String.format("item %d clicked", position));
-//                        if (modelAdapter.isSelectionActive()) {
-//                            modelAdapter.selectItem(position);
-//                        }
-//                        else {
-//                            List<LedgerAccount> accounts = Data.accounts.get();
-//                            if (accounts != null) {
-//                                LedgerAccount account = accounts.get(position);
-//
-//                                mActivity.showAccountTransactions(account);
-//                            }
-//                        }
-//                    }
-//
-//                    @Override
-//                    public void onLongClickItem(View v, int position) {
-//                        Log.d("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(() -> {
-            Log.d("ui", "refreshing accounts via swipe");
-            mActivity.scheduleTransactionListRetrieval();
+            debug("ui", "refreshing accounts via swipe");
+            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) {
@@ -185,21 +136,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();
 
@@ -218,4 +169,5 @@ public class AccountSummaryFragment extends MobileLedgerListFragment {
             return true;
         });
     }
+*/
 }