somewhat complete profile implementation

[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 9214e79445d1ff0d9732b95a4a2a801da21eed8c..1f43c61ed5c0fabd8cddd5cdf8824dc2655e9959 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
@@ -36,15 +36,12 @@ import android.view.View;
 import android.view.ViewGroup;
 
 import net.ktnx.mobileledger.R;
-import net.ktnx.mobileledger.async.RetrieveAccountsTask;
 import net.ktnx.mobileledger.model.Data;
 import net.ktnx.mobileledger.model.LedgerAccount;
 import net.ktnx.mobileledger.ui.MobileLedgerListFragment;
 import net.ktnx.mobileledger.ui.RecyclerItemListener;
 import net.ktnx.mobileledger.ui.activity.MainActivity;
 
-import java.lang.ref.WeakReference;
-import java.util.Date;
 import java.util.List;
 import java.util.Observable;
 import java.util.Observer;
@@ -82,13 +79,10 @@ public class AccountSummaryFragment extends MobileLedgerListFragment {
                 public void update(Observable o, Object arg) {
                     if (mActivity == null) return;
                     if (swiper == null) return;
-                    mActivity.runOnUiThread(new Runnable() {
-                        @Override
-                        public void run() {
-                            int cnt = Data.backgroundTaskCount.get();
-                            Log.d("acc", String.format("background task count changed to %d", cnt));
-                            swiper.setRefreshing(cnt > 0);
-                        }
+                    mActivity.runOnUiThread(() -> {
+                        int cnt = Data.backgroundTaskCount.get();
+                        Log.d("acc", String.format("background task count changed to %d", cnt));
+                        swiper.setRefreshing(cnt > 0);
                     });
                 }
             });
@@ -101,24 +95,24 @@ public class AccountSummaryFragment extends MobileLedgerListFragment {
     @Override
     public View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup container,
                              @Nullable Bundle savedInstanceState) {
+        Log.d("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()");
         super.onActivityCreated(savedInstanceState);
 
-        mActivity.markDrawerItemCurrent(R.id.nav_account_summary);
-
         model = ViewModelProviders.of(this).get(AccountSummaryViewModel.class);
         modelAdapter = new AccountSummaryAdapter();
 
-        RecyclerView root = mActivity.findViewById(R.id.account_root);
-        root.setAdapter(modelAdapter);
-
+        root = mActivity.findViewById(R.id.account_root);
         LinearLayoutManager llm = new LinearLayoutManager(mActivity);
         llm.setOrientation(LinearLayoutManager.VERTICAL);
         root.setLayoutManager(llm);
+        root.setAdapter(modelAdapter);
 
         fab = mActivity.findViewById(R.id.btn_add_transaction);
 
@@ -171,40 +165,23 @@ public class AccountSummaryFragment extends MobileLedgerListFragment {
         swiper.setColorSchemeResources(R.color.colorPrimary, R.color.colorAccent);
         swiper.setOnRefreshListener(() -> {
             Log.d("ui", "refreshing accounts via swipe");
-            update_accounts(true);
+            mActivity.scheduleTransactionListRetrieval();
         });
 
         Data.accounts.addObserver(new Observer() {
             @Override
             public void update(Observable o, Object arg) {
-                mActivity.runOnUiThread(new Runnable() {
-                    @Override
-                    public void run() {
-                        modelAdapter.notifyDataSetChanged();
-                    }
-                });
+                mActivity.runOnUiThread(() -> modelAdapter.notifyDataSetChanged());
+            }
+        });
+        Data.profile.addObserver(new Observer() {
+            @Override
+            public void update(Observable o, Object arg) {
+                mActivity.runOnUiThread(() -> model.scheduleAccountListReload(mActivity));
             }
         });
         update_account_table();
     }
-
-    private void update_accounts(boolean force) {
-        long now = new Date().getTime();
-        if ((now > (account_list_last_updated + (24 * 3600 * 1000))) || force) {
-            Log.d("db",
-                    "accounts last updated at " + account_list_last_updated + " and now is " + now +
-                    ". re-fetching");
-            update_accounts();
-        }
-    }
-
-    private void update_accounts() {
-        RetrieveAccountsTask task = new RetrieveAccountsTask(new WeakReference<>(mActivity));
-
-        task.setPref(PreferenceManager.getDefaultSharedPreferences(mActivity));
-        task.execute();
-
-    }
     private void update_account_table() {
         if (this.getContext() == null) return;