X-Git-Url: https://git.ktnx.net/?a=blobdiff_plain;f=app%2Fsrc%2Fmain%2Fjava%2Fnet%2Fktnx%2Fmobileledger%2Fui%2Faccount_summary%2FAccountSummaryFragment.java;h=d1241601809c09f5699e74924db6363b0f1cef63;hb=a1d55154e1c9fb72fcd60de31d6e64e8d046f96d;hp=b0b673273a8424b59491fb7267316a677aa9c9f3;hpb=0bbdc409d82da31324c031f36607510f17d992e6;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 b0b67327..d1241601 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 © 2018 Damyan Ivanov.
+ * Copyright © 2019 Damyan Ivanov.
  * This file is part of Mobile-Ledger.
  * Mobile-Ledger is free software: you can distribute it and/or modify it
  * under the term of the GNU General Public License as published by
@@ -25,9 +25,6 @@ import android.preference.PreferenceManager;
 import android.support.annotation.NonNull;
 import android.support.annotation.Nullable;
 import android.support.design.widget.FloatingActionButton;
-import android.support.design.widget.Snackbar;
-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;
@@ -39,9 +36,10 @@ import android.view.View;
 import android.view.ViewGroup;
 
 import net.ktnx.mobileledger.R;
-import net.ktnx.mobileledger.ui.RecyclerItemListener;
 import net.ktnx.mobileledger.async.RetrieveAccountsTask;
 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 net.ktnx.mobileledger.utils.MLDB;
 
@@ -51,7 +49,7 @@ import java.util.List;
 
 import static net.ktnx.mobileledger.ui.activity.SettingsActivity.PREF_KEY_SHOW_ONLY_STARRED_ACCOUNTS;
 
-public class AccountSummaryFragment extends Fragment {
+public class AccountSummaryFragment extends MobileLedgerListFragment {
 
     private static long account_list_last_updated;
     private static boolean account_list_needs_update = true;
@@ -60,9 +58,7 @@ public class AccountSummaryFragment extends Fragment {
     private AccountSummaryViewModel model;
     private AccountSummaryAdapter modelAdapter;
     private Menu optMenu;
-    private MainActivity mActivity;
     private FloatingActionButton fab;
-    private SwipeRefreshLayout swiper;
     @Override
     public void onCreate(@Nullable Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
@@ -82,6 +78,8 @@ public class AccountSummaryFragment extends Fragment {
     public void onActivityCreated(@Nullable Bundle savedInstanceState) {
         super.onActivityCreated(savedInstanceState);
 
+        mActivity.markDrawerItemCurrent(R.id.nav_account_summary);
+
         model = ViewModelProviders.of(this).get(AccountSummaryViewModel.class);
         List<LedgerAccount> accounts = model.getAccounts(this.getContext());
         modelAdapter = new AccountSummaryAdapter(accounts);
@@ -99,15 +97,23 @@ public class AccountSummaryFragment extends Fragment {
                 new RecyclerItemListener.RecyclerTouchListener() {
                     @Override
                     public void onClickItem(View v, int position) {
-                        Log.d("list", String.format("item %d clicked", position));
+                        Log.d("value", String.format("item %d clicked", position));
                         if (modelAdapter.isSelectionActive()) {
                             modelAdapter.selectItem(position);
                         }
+                        else {
+                            List<LedgerAccount> accounts = model.getAccounts(mActivity);
+                            if (accounts != null) {
+                                LedgerAccount account = accounts.get(position);
+
+                                mActivity.showAccountTransactions(account);
+                            }
+                        }
                     }
 
                     @Override
                     public void onLongClickItem(View v, int position) {
-                        Log.d("list", String.format("item %d long-clicked", position));
+                        Log.d("value", String.format("item %d long-clicked", position));
                         modelAdapter.startSelection();
                         if (optMenu != null) {
                             optMenu.findItem(R.id.menu_acc_summary_cancel_selection)
@@ -122,6 +128,7 @@ public class AccountSummaryFragment extends Fragment {
                     }
                 }));
 
+        fab.show();
         root.addOnScrollListener(new RecyclerView.OnScrollListener() {
             @Override
             public void onScrolled(@NonNull RecyclerView recyclerView, int dx, int dy) {
@@ -143,7 +150,7 @@ public class AccountSummaryFragment extends Fragment {
 
     }
     private void prepare_db() {
-        account_list_last_updated = MLDB.get_option_value(mActivity, "last_refresh", (long) 0);
+        account_list_last_updated = MLDB.get_option_value(MLDB.OPT_LAST_REFRESH, (long) 0);
     }
 
     private void update_accounts(boolean force) {
@@ -157,34 +164,18 @@ public class AccountSummaryFragment extends Fragment {
     }
 
     private void update_accounts() {
-        RetrieveAccountsTask task = new RetrieveAccountsTask(new WeakReference<>(this));
+        RetrieveAccountsTask task = new RetrieveAccountsTask(new WeakReference<>(mActivity));
 
         task.setPref(PreferenceManager.getDefaultSharedPreferences(mActivity));
         task.execute();
 
     }
-    public void onAccountRefreshDone(int error) {
-        swiper.setRefreshing(false);
-        if (error != 0) {
-            String err_text = getResources().getString(error);
-            Log.d("visual", String.format("showing snackbar: %s", err_text));
-            Snackbar.make(swiper, err_text, Snackbar.LENGTH_LONG).show();
-        }
-        else {
-            MLDB.set_option_value(mActivity, "last_refresh", new Date().getTime());
-            update_account_table();
-        }
-    }
     private void update_account_table() {
         if (this.getContext() == null) return;
 
         model.reloadAccounts(this.getContext());
         modelAdapter.notifyDataSetChanged();
     }
-    public void onRefreshAccountSummaryClicked(MenuItem mi) {
-        update_accounts(true);
-    }
-
     public void onShowOnlyStarredClicked(MenuItem mi) {
         SharedPreferences pref = PreferenceManager.getDefaultSharedPreferences(mActivity);
         boolean flag = pref.getBoolean(PREF_KEY_SHOW_ONLY_STARRED_ACCOUNTS, false);