X-Git-Url: https://git.ktnx.net/?a=blobdiff_plain;f=app%2Fsrc%2Fmain%2Fjava%2Fnet%2Fktnx%2Fmobileledger%2Fui%2Faccount_summary%2FAccountSummaryFragment.java;h=29003b820f484ea75c06bb24a15a578bc83eddd7;hb=5bba2c06a81c87327fdcf3f2a85c3206d932c2f9;hp=cbdb191937455eeb8193ac55b62e6726795e1d1b;hpb=51c50c59207fb6280e57e2e2ae210d52c3887ec4;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 cbdb1919..29003b82 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
@@ -1,5 +1,5 @@
 /*
- * Copyright © 2019 Damyan Ivanov.
+ * Copyright © 2020 Damyan Ivanov.
  * This file is part of MoLe.
  * MoLe is free software: you can distribute it and/or modify it
  * under the term of the GNU General Public License as published by
@@ -25,42 +25,38 @@ import android.view.ViewGroup;
 
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
+import androidx.lifecycle.ViewModelProvider;
 import androidx.recyclerview.widget.DividerItemDecoration;
 import androidx.recyclerview.widget.LinearLayoutManager;
 import androidx.recyclerview.widget.RecyclerView;
 
-import com.google.android.material.floatingactionbutton.FloatingActionButton;
-
 import net.ktnx.mobileledger.R;
 import net.ktnx.mobileledger.model.Data;
+import net.ktnx.mobileledger.model.LedgerAccount;
+import net.ktnx.mobileledger.ui.MainModel;
 import net.ktnx.mobileledger.ui.MobileLedgerListFragment;
 import net.ktnx.mobileledger.ui.activity.MainActivity;
 import net.ktnx.mobileledger.utils.Colors;
+import net.ktnx.mobileledger.utils.Logger;
 
 import org.jetbrains.annotations.NotNull;
 
+import java.util.List;
+import java.util.Locale;
+
 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);
         debug("flow", "AccountSummaryFragment.onAttach()");
-        mActivity = (MainActivity) context;
     }
     @Override
     public View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup container,
@@ -75,100 +71,41 @@ public class AccountSummaryFragment extends MobileLedgerListFragment {
         debug("flow", "AccountSummaryFragment.onActivityCreated()");
         super.onActivityCreated(savedInstanceState);
 
-        modelAdapter = new AccountSummaryAdapter();
+        MainModel model = new ViewModelProvider(requireActivity()).get(MainModel.class);
 
-        mActivity.mAccountSummaryFragment = this;
-        root = mActivity.findViewById(R.id.account_root);
-        LinearLayoutManager llm = new LinearLayoutManager(mActivity);
+        Data.backgroundTasksRunning.observe(this.getViewLifecycleOwner(),
+                this::onBackgroundTaskRunningChanged);
+
+        modelAdapter = new AccountSummaryAdapter(model);
+        MainActivity mainActivity = getMainActivity();
+
+        root = mainActivity.findViewById(R.id.account_root);
+        LinearLayoutManager llm = new LinearLayoutManager(mainActivity);
         llm.setOrientation(RecyclerView.VERTICAL);
         root.setLayoutManager(llm);
         root.setAdapter(modelAdapter);
         DividerItemDecoration did =
-                new DividerItemDecoration(mActivity, DividerItemDecoration.VERTICAL);
+                new DividerItemDecoration(mainActivity, DividerItemDecoration.VERTICAL);
         root.addItemDecoration(did);
 
-        fab = mActivity.findViewById(R.id.btn_add_transaction);
-
-        mActivity.fabShouldShow();
+        mainActivity.fabShouldShow();
 
         manageFabOnScroll();
 
-        swiper = mActivity.findViewById(R.id.account_swiper);
+        refreshLayout = mainActivity.findViewById(R.id.account_swipe_refresh_layout);
         Colors.themeWatch.observe(getViewLifecycleOwner(), this::themeChanged);
-        swiper.setOnRefreshListener(() -> {
+        refreshLayout.setOnRefreshListener(() -> {
             debug("ui", "refreshing accounts via swipe");
-            Data.scheduleTransactionListRetrieval(mActivity);
+            model.scheduleTransactionListRetrieval();
         });
 
-        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();
+        model.getDisplayedAccounts()
+             .observe(getViewLifecycleOwner(), this::onAccountsChanged);
     }
-    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;
-        });
+    private void onAccountsChanged(List<LedgerAccount> accounts) {
+        Logger.debug("async-acc",
+                String.format(Locale.US, "fragment: got new account list (%d items)",
+                        accounts.size()));
+        modelAdapter.setAccounts(accounts);
     }
-*/
 }