AccountSummary: fix stuck refreshing indicator after swipe-refresh is followed by...

[mobile-ledger.git] / app / src / main / java / net / ktnx / mobileledger / ui / account_summary / AccountSummaryFragment.java

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 6482dfd1397389d5c4eb4a75770c960a5e1d88fc..cdb2e59a56f5a960d9007236186573c5eeb3d70b 100644 (file)
--- 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
@@ -23,7 +23,11 @@ import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 
-import com.google.android.material.floatingactionbutton.FloatingActionButton;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.recyclerview.widget.DividerItemDecoration;
+import androidx.recyclerview.widget.LinearLayoutManager;
+import androidx.recyclerview.widget.RecyclerView;
 
 import net.ktnx.mobileledger.R;
 import net.ktnx.mobileledger.model.Data;
@@ -33,29 +37,15 @@ import net.ktnx.mobileledger.utils.Colors;
 
 import org.jetbrains.annotations.NotNull;
 
-import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
-import androidx.recyclerview.widget.DividerItemDecoration;
-import androidx.recyclerview.widget.LinearLayoutManager;
-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 FloatingActionButton fab;
     @Override
     public void onCreate(@Nullable Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         debug("flow", "AccountSummaryFragment.onCreate()");
         setHasOptionsMenu(true);
-
-        Data.backgroundTasksRunning.observe(this.getViewLifecycleOwner(),
-                this::onBackgroundTaskRunningChanged);
     }
     public void onAttach(@NotNull Context context) {
         super.onAttach(context);
@@ -75,6 +65,9 @@ public class AccountSummaryFragment extends MobileLedgerListFragment {
         debug("flow", "AccountSummaryFragment.onActivityCreated()");
         super.onActivityCreated(savedInstanceState);
 
+        Data.backgroundTasksRunning.observe(this.getViewLifecycleOwner(),
+                this::onBackgroundTaskRunningChanged);
+
         modelAdapter = new AccountSummaryAdapter();
 
         mActivity.mAccountSummaryFragment = this;
@@ -87,8 +80,6 @@ public class AccountSummaryFragment extends MobileLedgerListFragment {
                 new DividerItemDecoration(mActivity, DividerItemDecoration.VERTICAL);
         root.addItemDecoration(did);
 
-        fab = mActivity.findViewById(R.id.btn_add_transaction);
-
         mActivity.fabShouldShow();
 
         manageFabOnScroll();
@@ -103,72 +94,4 @@ public class AccountSummaryFragment extends MobileLedgerListFragment {
         Data.accounts.addObserver(
                 (o, arg) -> mActivity.runOnUiThread(() -> modelAdapter.notifyDataSetChanged()));
     }
-/*
-    void stopSelection() {
-        modelAdapter.stopSelection();
-        if (optMenu != null) {
-            optMenu.findItem(R.id.menu_acc_summary_cancel_selection).setVisible(false);
-            optMenu.findItem(R.id.menu_acc_summary_confirm_selection).setVisible(false);
-            optMenu.findItem(R.id.menu_acc_summary_only_starred).setVisible(true);
-        }
-        {
-            if (fab != null) fab.show();
-        }
-    }
-    public void onCancelAccSelection(MenuItem item) {
-        stopSelection();
-    }
-    public void onConfirmAccSelection(MenuItem item) {
-        AccountSummaryViewModel.commitSelections(mActivity);
-        stopSelection();
-    }
-    @Override
-    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;
-
-        mShowOnlyStarred = menu.findItem(R.id.menu_acc_summary_only_starred);
-        if (mShowOnlyStarred == null) throw new AssertionError();
-        MenuItem mCancelSelection = menu.findItem(R.id.menu_acc_summary_cancel_selection);
-        if (mCancelSelection == null) throw new AssertionError();
-        MenuItem mConfirmSelection = menu.findItem(R.id.menu_acc_summary_confirm_selection);
-        if (mConfirmSelection == null) throw new AssertionError();
-
-        Data.optShowOnlyStarred.addObserver((o, arg) -> {
-            boolean newValue = Data.optShowOnlyStarred.get();
-            debug("pref", String.format("pref change came (%s)", newValue ? "true" : "false"));
-            mShowOnlyStarred.setChecked(newValue);
-            update_account_table();
-        });
-
-        mShowOnlyStarred.setChecked(Data.optShowOnlyStarred.get());
-
-        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);
-            debug("pref",
-                    "Setting show only starred accounts pref to " + (flag ? "false" : "true"));
-            editor.apply();
-
-            return true;
-        });
-
-        mCancelSelection.setOnMenuItemClickListener(item -> {
-            stopSelection();
-            return true;
-        });
-
-        mConfirmSelection.setOnMenuItemClickListener(item -> {
-            AccountSummaryViewModel.commitSelections(mActivity);
-            stopSelection();
-
-            return true;
-        });
-    }
-*/
 }