another major rework, transaction list is fully asynchronous

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

diff --git a/app/src/main/java/net/ktnx/mobileledger/ui/transaction_list/TransactionListFragment.java b/app/src/main/java/net/ktnx/mobileledger/ui/transaction_list/TransactionListFragment.java
index f8738a59d10810c0d15c463e792ce93a9338add3..c84da7921b6ab343b2dbaed5033fd897e00d8466 100644 (file)
--- a/app/src/main/java/net/ktnx/mobileledger/ui/transaction_list/TransactionListFragment.java
+++ b/app/src/main/java/net/ktnx/mobileledger/ui/transaction_list/TransactionListFragment.java
@@ -20,14 +20,10 @@ package net.ktnx.mobileledger.ui.transaction_list;
 import android.arch.lifecycle.ViewModelProviders;
 import android.content.Context;
 import android.database.MatrixCursor;
 import android.arch.lifecycle.ViewModelProviders;
 import android.content.Context;
 import android.database.MatrixCursor;

-import android.os.Build;

 import android.os.Bundle;
 import android.os.Bundle;

-import android.preference.PreferenceManager;

 import android.support.annotation.NonNull;
 import android.support.annotation.Nullable;
 import android.support.design.widget.FloatingActionButton;
 import android.support.annotation.NonNull;
 import android.support.annotation.Nullable;
 import android.support.design.widget.FloatingActionButton;

-import android.support.v4.app.Fragment;
-import android.support.v4.widget.SwipeRefreshLayout;

 import android.support.v7.widget.LinearLayoutManager;
 import android.support.v7.widget.RecyclerView;
 import android.util.Log;
 import android.support.v7.widget.LinearLayoutManager;
 import android.support.v7.widget.RecyclerView;
 import android.util.Log;


@@ -40,34 +36,27 @@ import android.view.ViewGroup;
 import android.view.inputmethod.InputMethodManager;
 import android.widget.AdapterView;
 import android.widget.AutoCompleteTextView;
 import android.view.inputmethod.InputMethodManager;
 import android.widget.AdapterView;
 import android.widget.AutoCompleteTextView;

-import android.widget.LinearLayout;
-import android.widget.ProgressBar;

 
 import net.ktnx.mobileledger.R;
 
 import net.ktnx.mobileledger.R;

-import net.ktnx.mobileledger.async.RetrieveTransactionsTask;
+import net.ktnx.mobileledger.model.Data;
+import net.ktnx.mobileledger.ui.MobileLedgerListFragment;

 import net.ktnx.mobileledger.ui.activity.MainActivity;
 import net.ktnx.mobileledger.utils.Globals;
 import net.ktnx.mobileledger.utils.MLDB;
 
 import net.ktnx.mobileledger.ui.activity.MainActivity;
 import net.ktnx.mobileledger.utils.Globals;
 import net.ktnx.mobileledger.utils.MLDB;
 

-import java.lang.ref.WeakReference;
+import java.util.Observable;
+import java.util.Observer;

 
 import static android.content.Context.INPUT_METHOD_SERVICE;
 
 
 import static android.content.Context.INPUT_METHOD_SERVICE;
 

-public class TransactionListFragment extends Fragment {
+public class TransactionListFragment extends MobileLedgerListFragment {

     public static final String BUNDLE_KEY_FILTER_ACCOUNT_NAME = "filter_account_name";
     public static final String BUNDLE_KEY_FILTER_ACCOUNT_NAME = "filter_account_name";

-    public TransactionListViewModel model;

     private String mShowOnlyAccountName;
     private String mShowOnlyAccountName;

-    private MainActivity mActivity;
-    private View bTransactionListCancelDownload;

     private MenuItem menuTransactionListFilter;
     private View vAccountFilter;
     private MenuItem menuTransactionListFilter;
     private View vAccountFilter;

-    private SwipeRefreshLayout swiper;
-    private RecyclerView root;
-    private ProgressBar progressBar;
-    private LinearLayout progressLayout;
-    private TransactionListAdapter modelAdapter;
-    private RetrieveTransactionsTask retrieveTransactionsTask;

     private AutoCompleteTextView accNameFilter;
     private AutoCompleteTextView accNameFilter;

+    private static void update(Observable o, Object arg) {
+    }

     public void setShowOnlyAccountName(String mShowOnlyAccountName) {
         this.mShowOnlyAccountName = mShowOnlyAccountName;
         if (modelAdapter != null) {
     public void setShowOnlyAccountName(String mShowOnlyAccountName) {
         this.mShowOnlyAccountName = mShowOnlyAccountName;
         if (modelAdapter != null) {


@@ -114,15 +103,10 @@ public class TransactionListFragment extends Fragment {
         swiper = mActivity.findViewById(R.id.transaction_swipe);
         if (swiper == null) throw new RuntimeException("Can't get hold on the swipe layout");
         root = mActivity.findViewById(R.id.transaction_root);
         swiper = mActivity.findViewById(R.id.transaction_swipe);
         if (swiper == null) throw new RuntimeException("Can't get hold on the swipe layout");
         root = mActivity.findViewById(R.id.transaction_root);

-        if (root == null) throw new RuntimeException("Can't get hold on the transaction list view");
-        progressBar = mActivity.findViewById(R.id.transaction_list_progress_bar);
-        if (progressBar == null)
-            throw new RuntimeException("Can't get hold on the transaction list progress bar");
-        progressLayout = mActivity.findViewById(R.id.transaction_progress_layout);
-        if (progressLayout == null) throw new RuntimeException(
-                "Can't get hold on the transaction list progress bar layout");
+        if (root == null)
+            throw new RuntimeException("Can't get hold on the transaction value view");

         model = ViewModelProviders.of(this).get(TransactionListViewModel.class);
         model = ViewModelProviders.of(this).get(TransactionListViewModel.class);

-        modelAdapter = new TransactionListAdapter(model);
+        modelAdapter = new TransactionListAdapter();

 
         modelAdapter.setBoldAccountName(mShowOnlyAccountName);
 
 
         modelAdapter.setBoldAccountName(mShowOnlyAccountName);
 


@@ -149,15 +133,13 @@ public class TransactionListFragment extends Fragment {
 
         swiper.setOnRefreshListener(() -> {
             Log.d("ui", "refreshing transactions via swipe");
 
         swiper.setOnRefreshListener(() -> {
             Log.d("ui", "refreshing transactions via swipe");

-            update_transactions();
+            mActivity.update_transactions();

         });
 
         swiper.setColorSchemeResources(R.color.colorPrimary, R.color.colorAccent);
 
         vAccountFilter = mActivity.findViewById(R.id.transaction_list_account_name_filter);
         accNameFilter = mActivity.findViewById(R.id.transaction_filter_account_name);
         });
 
         swiper.setColorSchemeResources(R.color.colorPrimary, R.color.colorAccent);
 
         vAccountFilter = mActivity.findViewById(R.id.transaction_list_account_name_filter);
         accNameFilter = mActivity.findViewById(R.id.transaction_filter_account_name);

-        bTransactionListCancelDownload =
-                mActivity.findViewById(R.id.transaction_list_cancel_download);

 
         TransactionListFragment me = this;
         MLDB.hook_autocompletion_adapter(mActivity, accNameFilter, "accounts", "name");
 
         TransactionListFragment me = this;
         MLDB.hook_autocompletion_adapter(mActivity, accNameFilter, "accounts", "name");


@@ -165,7 +147,7 @@ public class TransactionListFragment extends Fragment {
             @Override
             public void onItemClick(AdapterView<?> parent, View view, int position, long id) {
                 Log.d("tmp", "direct onItemClick");
             @Override
             public void onItemClick(AdapterView<?> parent, View view, int position, long id) {
                 Log.d("tmp", "direct onItemClick");

-                model.reloadTransactions(me);
+                ((TransactionListViewModel) model).scheduleTransactionListReload(mActivity);

                 MatrixCursor mc = (MatrixCursor) parent.getItemAtPosition(position);
                 modelAdapter.setBoldAccountName(mc.getString(1));
                 modelAdapter.notifyDataSetChanged();
                 MatrixCursor mc = (MatrixCursor) parent.getItemAtPosition(position);
                 modelAdapter.setBoldAccountName(mc.getString(1));
                 modelAdapter.notifyDataSetChanged();


@@ -179,7 +161,25 @@ public class TransactionListFragment extends Fragment {
             Log.d("flow", String.format("Account filter set to '%s'", mShowOnlyAccountName));
         }
 
             Log.d("flow", String.format("Account filter set to '%s'", mShowOnlyAccountName));
         }
 

-        model.reloadTransactions(this);
+        TransactionListViewModel.scheduleTransactionListReload(mActivity);
+        TransactionListViewModel.updating.addObserver(new Observer() {
+            @Override
+            public void update(Observable o, Object arg) {
+                swiper.setRefreshing(TransactionListViewModel.updating.get());
+            }
+        });
+
+        Data.transactions.addObserver(new Observer() {
+            @Override
+            public void update(Observable o, Object arg) {
+                mActivity.runOnUiThread(new Runnable() {
+                    @Override
+                    public void run() {
+                        modelAdapter.notifyDataSetChanged();
+                    }
+                });
+            }
+        });

     }
     @Override
     public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) {
     }
     @Override
     public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) {


@@ -194,57 +194,14 @@ public class TransactionListFragment extends Fragment {
 
         super.onCreateOptionsMenu(menu, inflater);
     }
 
         super.onCreateOptionsMenu(menu, inflater);
     }

-    private void update_transactions() {
-        retrieveTransactionsTask = new RetrieveTransactionsTask(new WeakReference<>(this));
-
-        RetrieveTransactionsTask.Params params = new RetrieveTransactionsTask.Params(
-                PreferenceManager.getDefaultSharedPreferences(mActivity));
-
-        retrieveTransactionsTask.execute(params);
-        bTransactionListCancelDownload.setEnabled(true);
-    }
-    public void onRetrieveStart() {
-        progressBar.setIndeterminate(true);
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) progressBar.setProgress(0, false);
-        else progressBar.setProgress(0);
-        progressLayout.setVisibility(View.VISIBLE);
-    }
-    public void onRetrieveProgress(RetrieveTransactionsTask.Progress progress) {
-        if ((progress.getTotal() == RetrieveTransactionsTask.Progress.INDETERMINATE) ||
-            (progress.getTotal() == 0))
-        {
-            progressBar.setIndeterminate(true);
-        }
-        else {
-            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
-                progressBar.setMin(0);
-            }
-            progressBar.setMax(progress.getTotal());
-            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {
-                progressBar.setProgress(progress.getProgress(), true);
-            }
-            else progressBar.setProgress(progress.getProgress());
-            progressBar.setIndeterminate(false);
-        }
-    }

 
 

-    public void onRetrieveDone(boolean success) {
-        progressLayout.setVisibility(View.GONE);
-        swiper.setRefreshing(false);
-        mActivity.updateLastUpdateText();
-        if (success) {
-            Log.d("transactions", "calling notifyDataSetChanged()");
-            modelAdapter.notifyDataSetChanged();
-        }
-    }

     public void onClearAccountNameClick(View view) {
         vAccountFilter.setVisibility(View.GONE);
         if (menuTransactionListFilter != null) menuTransactionListFilter.setVisible(true);
         accNameFilter.setText(null);
         mShowOnlyAccountName = null;
     public void onClearAccountNameClick(View view) {
         vAccountFilter.setVisibility(View.GONE);
         if (menuTransactionListFilter != null) menuTransactionListFilter.setVisible(true);
         accNameFilter.setText(null);
         mShowOnlyAccountName = null;

-        model.reloadTransactions(this);

         modelAdapter.resetBoldAccountName();
         modelAdapter.resetBoldAccountName();

-        modelAdapter.notifyDataSetChanged();
+        TransactionListViewModel.scheduleTransactionListReload(mActivity);

         Globals.hideSoftKeyboard(mActivity);
     }
     public void onShowFilterClick(MenuItem menuItem) {
         Globals.hideSoftKeyboard(mActivity);
     }
     public void onShowFilterClick(MenuItem menuItem) {


@@ -257,9 +214,4 @@ public class TransactionListFragment extends Fragment {
             imm.showSoftInput(accNameFilter, 0);
         }
     }
             imm.showSoftInput(accNameFilter, 0);
         }
     }

-    public void onStopTransactionRefreshClick(View view) {
-        Log.d("interactive", "Cancelling transactions refresh");
-        if (retrieveTransactionsTask != null) retrieveTransactionsTask.cancel(false);
-        bTransactionListCancelDownload.setEnabled(false);
-    }
-}
+}
\ No newline at end of file