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=362dadb9658c1d8a841c9ba55bf2d6bc49f01083;hp=14ec0209377a833d310cf15cbe0e1a412fd93c74;hb=bd5da50ef980c0c9657ec1e9c3e681ab5092f438;hpb=bb9d4a9c9708a568dddf2b1c637ae54ec53caa25

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 14ec0209..362dadb9 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
@@ -21,7 +21,6 @@ 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;
@@ -37,7 +36,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;
@@ -46,57 +45,38 @@ 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;
+    private MenuItem mShowOnlyStarred;
     public AccountSummaryAdapter modelAdapter;
     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();
@@ -116,7 +96,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 +112,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)
@@ -158,16 +138,14 @@ public class AccountSummaryFragment extends MobileLedgerListFragment {
             }
         });
         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()));
-        update_account_table();
     }
     private void update_account_table() {
         if (this.getContext() == null) return;
@@ -193,7 +171,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;
@@ -207,21 +185,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();