]> git.ktnx.net Git - mobile-ledger.git/blobdiff - app/src/main/java/net/ktnx/mobileledger/ui/activity/MainActivity.java
add app shortcuts (Android 7.1+) for adding new transaction for top profiles
[mobile-ledger.git] / app / src / main / java / net / ktnx / mobileledger / ui / activity / MainActivity.java
index 7373d0d85b3f858a06804aae12a346a51846976a..a6c29db6a9884c7c395f2ec354c4978a9ba14b8b 100644 (file)
@@ -19,8 +19,12 @@ package net.ktnx.mobileledger.ui.activity;
 
 import android.content.Intent;
 import android.content.pm.PackageInfo;
+import android.content.pm.ShortcutInfo;
+import android.content.pm.ShortcutManager;
 import android.content.res.ColorStateList;
+import android.content.res.Resources;
 import android.graphics.Color;
+import android.graphics.drawable.Icon;
 import android.os.AsyncTask;
 import android.os.Build;
 import android.os.Bundle;
@@ -57,6 +61,7 @@ import net.ktnx.mobileledger.utils.MLDB;
 
 import java.lang.ref.WeakReference;
 import java.text.DateFormat;
+import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
 import java.util.Observer;
@@ -99,6 +104,7 @@ public class MainActivity extends ProfileThemedActivity {
     private Observer profileObserver;
     private Observer profilesObserver;
     private Observer lastUpdateDateObserver;
+    private Toolbar mToolbar;
     @Override
     protected void onStart() {
         super.onStart();
@@ -106,14 +112,15 @@ public class MainActivity extends ProfileThemedActivity {
         Log.d("flow", "MainActivity.onStart()");
         mViewPager.setCurrentItem(mCurrentPage, false);
         if (mAccountFilter != null) showTransactionsFragment(mAccountFilter);
+        else Data.accountFilter.set(null);
 
     }
     @Override
     protected void onSaveInstanceState(Bundle outState) {
         super.onSaveInstanceState(outState);
         outState.putInt(STATE_CURRENT_PAGE, mViewPager.getCurrentItem());
-        if (TransactionListFragment.accountFilter.get() != null)
-            outState.putString(STATE_ACC_FILTER, TransactionListFragment.accountFilter.get());
+        if (Data.accountFilter.get() != null)
+            outState.putString(STATE_ACC_FILTER, Data.accountFilter.get());
     }
     @Override
     protected void onDestroy() {
@@ -155,87 +162,21 @@ public class MainActivity extends ProfileThemedActivity {
         if (extra != null && savedInstanceState == null) savedInstanceState = extra;
 
 
-        Toolbar toolbar = findViewById(R.id.toolbar);
-        setSupportActionBar(toolbar);
+        mToolbar = findViewById(R.id.toolbar);
+        setSupportActionBar(mToolbar);
 
         if (profileObserver == null) {
-            profileObserver = (o, arg) -> {
-                MobileLedgerProfile profile = Data.profile.get();
-                MainActivity.this.runOnUiThread(() -> {
-
-                    Data.transactions.clear();
-                    Log.d("transactions", "requesting list reload");
-                    TransactionListViewModel.scheduleTransactionListReload();
-
-                    Data.accounts.clear();
-                    AccountSummaryViewModel.scheduleAccountListReload();
-
-                    if (profile == null) MainActivity.this.setTitle(R.string.app_name);
-                    else MainActivity.this.setTitle(profile.getName());
-                    MainActivity.this.updateLastUpdateTextFromDB();
-                    int old_index = -1;
-                    int new_index = -1;
-                    if (arg != null) {
-                        MobileLedgerProfile old = (MobileLedgerProfile) arg;
-                        old_index = Data.getProfileIndex(old);
-                        new_index = Data.getProfileIndex(profile);
-                    }
-
-                    if ((old_index != -1) && (new_index != -1)) {
-                        mProfileListAdapter.notifyItemChanged(old_index);
-                        mProfileListAdapter.notifyItemChanged(new_index);
-                    }
-                    else mProfileListAdapter.notifyDataSetChanged();
-
-                    MainActivity.this.collapseProfileList();
-
-                    int newProfileTheme = (profile == null) ? -1 : profile.getThemeId();
-                    if (newProfileTheme != Colors.profileThemeId) {
-                        Log.d("profiles",
-                                String.format("profile theme %d → %d", Colors.profileThemeId,
-                                        newProfileTheme));
-                        MainActivity.this.profileThemeChanged();
-                        Colors.profileThemeId = newProfileTheme;
-                        // profileThemeChanged would restart the activity, so no need to reload the
-                        // data sets below
-                        return;
-                    }
-                    drawer.closeDrawers();
-
-                    if (profile == null) {
-                        toolbar.setSubtitle(null);
-                        fab.hide();
-                    }
-                    else {
-                        if (profile.isPostingPermitted()) {
-                            toolbar.setSubtitle(null);
-                            fab.show();
-                        }
-                        else {
-                            toolbar.setSubtitle(R.string.profile_subitlte_read_only);
-                            fab.hide();
-                        }
-                    }
-                });
-            };
+            profileObserver = (o, arg) -> onProfileChanged(arg);
             Data.profile.addObserver(profileObserver);
         }
 
         if (profilesObserver == null) {
-            profilesObserver = (o, arg) -> {
-                findViewById(R.id.nav_profile_list).setMinimumHeight(
-                        (int) (getResources().getDimension(R.dimen.thumb_row_height) *
-                               Data.profiles.size()));
-
-                Log.d("profiles", "profile list changed");
-                if (arg == null) mProfileListAdapter.notifyDataSetChanged();
-                else mProfileListAdapter.notifyItemChanged((int) arg);
-            };
+            profilesObserver = (o, arg) -> onProfileListChanged(arg);
             Data.profiles.addObserver(profilesObserver);
         }
 
         ActionBarDrawerToggle toggle =
-                new ActionBarDrawerToggle(this, drawer, toolbar, R.string.navigation_drawer_open,
+                new ActionBarDrawerToggle(this, drawer, mToolbar, R.string.navigation_drawer_open,
                         R.string.navigation_drawer_close);
         drawer.addDrawerListener(toggle);
         toggle.syncState();
@@ -285,6 +226,7 @@ public class MainActivity extends ProfileThemedActivity {
             }
             mAccountFilter = savedInstanceState.getString(STATE_ACC_FILTER, null);
         }
+        else mAccountFilter = null;
 
         lastUpdateDateObserver = (o, arg) -> {
             Log.d("main", "lastUpdateDate changed");
@@ -344,6 +286,7 @@ public class MainActivity extends ProfileThemedActivity {
         });
 
         setupProfile();
+        onProfileChanged(null);
 
         updateLastUpdateTextFromDB();
         Date lastUpdate = Data.lastUpdateDate.get();
@@ -358,6 +301,96 @@ public class MainActivity extends ProfileThemedActivity {
             scheduleTransactionListRetrieval();
         }
     }
+    private void createShortcuts() {
+        Resources rm = getResources();
+        List<ShortcutInfo> shortcuts = new ArrayList<>();
+        try (LockHolder lh = Data.profiles.lockForReading()) {
+            for (int i = 0; i < Data.profiles.size(); i++) {
+                MobileLedgerProfile p = Data.profiles.get(i);
+                if (!p.isPostingPermitted()) continue;
+
+                ShortcutInfo si = new ShortcutInfo.Builder(this, "new_transaction_" + p.getUuid())
+                        .setShortLabel(p.getName())
+                        .setIcon(Icon.createWithResource(this, R.drawable.svg_thick_plus_white))
+                        .setIntent(new Intent(Intent.ACTION_VIEW, null, this,
+                                NewTransactionActivity.class).putExtra("profile_uuid", p.getUuid()))
+                        .setRank(i)
+                        .build();
+                shortcuts.add(si);
+            }
+        }
+        ShortcutManager sm = getSystemService(ShortcutManager.class);
+        sm.setDynamicShortcuts(shortcuts);
+    }
+    private void onProfileListChanged(Object arg) {
+        findViewById(R.id.nav_profile_list).setMinimumHeight(
+                (int) (getResources().getDimension(R.dimen.thumb_row_height) *
+                       Data.profiles.size()));
+
+        Log.d("profiles", "profile list changed");
+        if (arg == null) mProfileListAdapter.notifyDataSetChanged();
+        else mProfileListAdapter.notifyItemChanged((int) arg);
+
+        createShortcuts();
+    }
+    private void onProfileChanged(Object arg) {
+        MobileLedgerProfile profile = Data.profile.get();
+        MainActivity.this.runOnUiThread(() -> {
+
+            Data.transactions.clear();
+            Log.d("transactions", "requesting list reload");
+            TransactionListViewModel.scheduleTransactionListReload();
+
+            Data.accounts.clear();
+            AccountSummaryViewModel.scheduleAccountListReload();
+
+            if (profile == null) MainActivity.this.setTitle(R.string.app_name);
+            else MainActivity.this.setTitle(profile.getName());
+            MainActivity.this.updateLastUpdateTextFromDB();
+            int old_index = -1;
+            int new_index = -1;
+            if (arg != null) {
+                MobileLedgerProfile old = (MobileLedgerProfile) arg;
+                old_index = Data.getProfileIndex(old);
+                new_index = Data.getProfileIndex(profile);
+            }
+
+            if ((old_index != -1) && (new_index != -1)) {
+                mProfileListAdapter.notifyItemChanged(old_index);
+                mProfileListAdapter.notifyItemChanged(new_index);
+            }
+            else mProfileListAdapter.notifyDataSetChanged();
+
+            MainActivity.this.collapseProfileList();
+
+            int newProfileTheme = (profile == null) ? -1 : profile.getThemeId();
+            if (newProfileTheme != Colors.profileThemeId) {
+                Log.d("profiles", String.format("profile theme %d → %d", Colors.profileThemeId,
+                        newProfileTheme));
+                MainActivity.this.profileThemeChanged();
+                Colors.profileThemeId = newProfileTheme;
+                // profileThemeChanged would restart the activity, so no need to reload the
+                // data sets below
+                return;
+            }
+            drawer.closeDrawers();
+
+            if (profile == null) {
+                mToolbar.setSubtitle(null);
+                fab.hide();
+            }
+            else {
+                if (profile.isPostingPermitted()) {
+                    mToolbar.setSubtitle(null);
+                    fab.show();
+                }
+                else {
+                    mToolbar.setSubtitle(R.string.profile_subitlte_read_only);
+                    fab.hide();
+                }
+            }
+        });
+    }
     private void updateLastUpdateDisplay() {
         LinearLayout l = findViewById(R.id.transactions_last_update_layout);
         TextView v = findViewById(R.id.transactions_last_update);
@@ -412,16 +445,7 @@ public class MainActivity extends ProfileThemedActivity {
         String profileUUID = MLDB.getOption(MLDB.OPT_PROFILE_UUID, null);
         MobileLedgerProfile profile;
 
-        if (Data.profiles.isEmpty()) {
-            profile = MobileLedgerProfile.loadAllFromDB(profileUUID);
-        }
-        else {
-            try(LockHolder lh = Data.profiles.lockForReading()) {
-                int i = Data.getProfileIndex(profileUUID);
-                if (i == -1 ) i = 0;
-                profile = Data.profiles.get(i);
-            }
-        }
+        profile = Data.getProfile(profileUUID);
 
         if (Data.profiles.isEmpty()) {
             findViewById(R.id.no_profiles_layout).setVisibility(View.VISIBLE);
@@ -467,7 +491,7 @@ public class MainActivity extends ProfileThemedActivity {
     }
     private void showAccountSummaryFragment() {
         mViewPager.setCurrentItem(0, true);
-        TransactionListFragment.accountFilter.set(null);
+        Data.accountFilter.set(null);
 //        FragmentTransaction ft = fragmentManager.beginTransaction();
 //        accountSummaryFragment = new AccountSummaryFragment();
 //        ft.replace(R.id.root_frame, accountSummaryFragment);
@@ -483,8 +507,8 @@ public class MainActivity extends ProfileThemedActivity {
 //        fragmentManager.popBackStack(0, FragmentManager.POP_BACK_STACK_INCLUSIVE);
     }
     private void showTransactionsFragment(String accName) {
-        TransactionListFragment.accountFilter.set(accName);
-        TransactionListFragment.accountFilter.notifyObservers();
+        Data.accountFilter.set(accName);
+        Data.accountFilter.notifyObservers();
         mViewPager.setCurrentItem(1, true);
     }
     private void showTransactionsFragment(LedgerAccount account) {
@@ -519,7 +543,7 @@ public class MainActivity extends ProfileThemedActivity {
         }
         else {
             if (mBackMeansToAccountList && (mViewPager.getCurrentItem() == 1)) {
-                TransactionListFragment.accountFilter.set(null);
+                Data.accountFilter.set(null);
                 showAccountSummaryFragment();
                 mBackMeansToAccountList = false;
             }
@@ -673,10 +697,14 @@ public class MainActivity extends ProfileThemedActivity {
 
     }
     public void onAccountSummaryRowViewClicked(View view) {
-        ViewGroup row = (ViewGroup) view.getParent();
+        ViewGroup row;
+        if (view.getId() == R.id.account_expander) row = (ViewGroup) view.getParent().getParent();
+        else row = (ViewGroup) view.getParent();
+
         LedgerAccount acc = (LedgerAccount) row.getTag();
         switch (view.getId()) {
             case R.id.account_row_acc_name:
+            case R.id.account_expander:
             case R.id.account_expander_container:
                 Log.d("accounts", "Account expander clicked");
                 if (!acc.hasSubAccounts()) return;