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=d1aca96d8f48907d21b409ac24fbc83f1a6ee162;hp=8eef8fbeaf3256ce9d984087760e4b3e39f82e67;hb=d63a611dce420b30fa0c0711eea1d02603945a43;hpb=233b37f00eb4abcda08cacade8ab6d13a8e0ebcf

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 8eef8fbe..d1aca96d 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,18 +25,26 @@ 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 net.ktnx.mobileledger.R;
+import net.ktnx.mobileledger.model.AccountListItem;
 import net.ktnx.mobileledger.model.Data;
+import net.ktnx.mobileledger.ui.FabManager;
+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 {
@@ -46,14 +54,10 @@ public class AccountSummaryFragment extends MobileLedgerListFragment {
         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,
@@ -63,35 +67,46 @@ public class AccountSummaryFragment extends MobileLedgerListFragment {
     }
 
     @Override
-
-    public void onActivityCreated(@Nullable Bundle savedInstanceState) {
+    public void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceState) {
         debug("flow", "AccountSummaryFragment.onActivityCreated()");
-        super.onActivityCreated(savedInstanceState);
+        super.onViewCreated(view, 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 = view.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);
 
-        mActivity.fabShouldShow();
+        mainActivity.fabShouldShow();
 
-        manageFabOnScroll();
+        if (mainActivity instanceof FabManager.FabHandler)
+            FabManager.handle((FabManager.FabHandler) mainActivity, root);
 
-        swiper = mActivity.findViewById(R.id.account_swiper);
+        refreshLayout = view.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()));
+        model.getDisplayedAccounts()
+             .observe(getViewLifecycleOwner(), this::onAccountsChanged);
+    }
+    private void onAccountsChanged(List<AccountListItem> accounts) {
+        Logger.debug("async-acc",
+                String.format(Locale.US, "fragment: got new account list (%d items)",
+                        accounts.size()));
+        modelAdapter.setAccounts(accounts);
     }
 }