X-Git-Url: https://git.ktnx.net/?p=mobile-ledger.git;a=blobdiff_plain;f=app%2Fsrc%2Fmain%2Fjava%2Fnet%2Fktnx%2Fmobileledger%2Fui%2Factivity%2FMainActivity.java;h=531424534ffec2d76a920e1a4f5aa64f9d2e61a7;hp=d711247b5b5cdca63faa36dada771761b6b0ca16;hb=f24a8465a728e39188f262192dcea1cadf9ba64a;hpb=608de71a076ac030abb61ace753c9357ea33064e diff --git a/app/src/main/java/net/ktnx/mobileledger/ui/activity/MainActivity.java b/app/src/main/java/net/ktnx/mobileledger/ui/activity/MainActivity.java index d711247b..53142453 100644 --- a/app/src/main/java/net/ktnx/mobileledger/ui/activity/MainActivity.java +++ b/app/src/main/java/net/ktnx/mobileledger/ui/activity/MainActivity.java @@ -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; @@ -100,6 +105,10 @@ public class MainActivity extends ProfileThemedActivity { private Observer profilesObserver; private Observer lastUpdateDateObserver; private Toolbar mToolbar; + private DrawerLayout.SimpleDrawerListener drawerListener; + private ActionBarDrawerToggle barDrawerToggle; + private ViewPager.SimpleOnPageChangeListener pageChangeListener; + private Observer editingProfilesObserver; @Override protected void onStart() { super.onStart(); @@ -125,8 +134,18 @@ public class MainActivity extends ProfileThemedActivity { Data.profiles.deleteObserver(profilesObserver); profilesObserver = null; Data.lastUpdateDate.deleteObserver(lastUpdateDateObserver); + lastUpdateDateObserver = null; RecyclerView root = findViewById(R.id.nav_profile_list); if (root != null) root.setAdapter(null); + if (drawer != null) drawer.removeDrawerListener(drawerListener); + drawerListener = null; + if (drawer != null) drawer.removeDrawerListener(barDrawerToggle); + barDrawerToggle = null; + if (mViewPager != null) mViewPager.removeOnPageChangeListener(pageChangeListener); + pageChangeListener = null; + if (mProfileListAdapter != null) + mProfileListAdapter.deleteEditingProfilesObserver(editingProfilesObserver); + editingProfilesObserver = null; super.onDestroy(); } @Override @@ -170,11 +189,12 @@ public class MainActivity extends ProfileThemedActivity { Data.profiles.addObserver(profilesObserver); } - ActionBarDrawerToggle toggle = - new ActionBarDrawerToggle(this, drawer, mToolbar, R.string.navigation_drawer_open, - R.string.navigation_drawer_close); - drawer.addDrawerListener(toggle); - toggle.syncState(); + if (barDrawerToggle == null) { + barDrawerToggle = new ActionBarDrawerToggle(this, drawer, mToolbar, + R.string.navigation_drawer_open, R.string.navigation_drawer_close); + drawer.addDrawerListener(barDrawerToggle); + } + barDrawerToggle.syncState(); TextView ver = drawer.findViewById(R.id.drawer_version_text); @@ -195,23 +215,28 @@ public class MainActivity extends ProfileThemedActivity { markDrawerItemCurrent(R.id.nav_account_summary); mViewPager.setAdapter(mSectionsPagerAdapter); - mViewPager.addOnPageChangeListener(new ViewPager.SimpleOnPageChangeListener() { - @Override - public void onPageSelected(int position) { - switch (position) { - case 0: - markDrawerItemCurrent(R.id.nav_account_summary); - break; - case 1: - markDrawerItemCurrent(R.id.nav_latest_transactions); - break; - default: - Log.e("MainActivity", String.format("Unexpected page index %d", position)); - } - super.onPageSelected(position); - } - }); + if (pageChangeListener == null) { + pageChangeListener = new ViewPager.SimpleOnPageChangeListener() { + @Override + public void onPageSelected(int position) { + switch (position) { + case 0: + markDrawerItemCurrent(R.id.nav_account_summary); + break; + case 1: + markDrawerItemCurrent(R.id.nav_latest_transactions); + break; + default: + Log.e("MainActivity", + String.format("Unexpected page index %d", position)); + } + + super.onPageSelected(position); + } + }; + mViewPager.addOnPageChangeListener(pageChangeListener); + } mCurrentPage = 0; if (savedInstanceState != null) { @@ -223,11 +248,13 @@ public class MainActivity extends ProfileThemedActivity { } else mAccountFilter = null; - lastUpdateDateObserver = (o, arg) -> { - Log.d("main", "lastUpdateDate changed"); - runOnUiThread(this::updateLastUpdateDisplay); - }; - Data.lastUpdateDate.addObserver(lastUpdateDateObserver); + if (lastUpdateDateObserver == null) { + lastUpdateDateObserver = (o, arg) -> { + Log.d("main", "lastUpdateDate changed"); + runOnUiThread(this::updateLastUpdateDisplay); + }; + Data.lastUpdateDate.addObserver(lastUpdateDateObserver); + } updateLastUpdateDisplay(); @@ -246,21 +273,25 @@ public class MainActivity extends ProfileThemedActivity { if (mProfileListAdapter == null) mProfileListAdapter = new ProfilesRecyclerViewAdapter(); root.setAdapter(mProfileListAdapter); - mProfileListAdapter.addEditingProfilesObserver((o, arg) -> { - if (mProfileListAdapter.isEditingProfiles()) { - profileListHeadArrow.clearAnimation(); - profileListHeadArrow.setVisibility(View.GONE); - profileListHeadMore.setVisibility(View.GONE); - profileListHeadCancel.setVisibility(View.VISIBLE); - } - else { - profileListHeadArrow.setRotation(180f); - profileListHeadArrow.setVisibility(View.VISIBLE); - profileListHeadCancel.setVisibility(View.GONE); - profileListHeadMore.setVisibility(View.GONE); - profileListHeadMore.setVisibility(profileListExpanded ? View.VISIBLE : View.GONE); - } - }); + if (editingProfilesObserver == null) { + editingProfilesObserver = (o, arg) -> { + if (mProfileListAdapter.isEditingProfiles()) { + profileListHeadArrow.clearAnimation(); + profileListHeadArrow.setVisibility(View.GONE); + profileListHeadMore.setVisibility(View.GONE); + profileListHeadCancel.setVisibility(View.VISIBLE); + } + else { + profileListHeadArrow.setRotation(180f); + profileListHeadArrow.setVisibility(View.VISIBLE); + profileListHeadCancel.setVisibility(View.GONE); + profileListHeadMore.setVisibility(View.GONE); + profileListHeadMore + .setVisibility(profileListExpanded ? View.VISIBLE : View.GONE); + } + }; + mProfileListAdapter.addEditingProfilesObserver(editingProfilesObserver); + } LinearLayoutManager llm = new LinearLayoutManager(this); @@ -272,15 +303,19 @@ public class MainActivity extends ProfileThemedActivity { profileListHeadMoreAndCancel .setOnClickListener((v) -> mProfileListAdapter.flipEditingProfiles()); - drawer.addDrawerListener(new DrawerLayout.SimpleDrawerListener() { - @Override - public void onDrawerClosed(View drawerView) { - super.onDrawerClosed(drawerView); - collapseProfileList(); - } - }); + if (drawerListener == null) { + drawerListener = new DrawerLayout.SimpleDrawerListener() { + @Override + public void onDrawerClosed(View drawerView) { + super.onDrawerClosed(drawerView); + collapseProfileList(); + } + }; + drawer.addDrawerListener(drawerListener); + } setupProfile(); + onProfileChanged(null); updateLastUpdateTextFromDB(); Date lastUpdate = Data.lastUpdateDate.get(); @@ -295,6 +330,26 @@ public class MainActivity extends ProfileThemedActivity { scheduleTransactionListRetrieval(); } } + private void createShortcuts() { + Resources rm = getResources(); + List 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) * @@ -303,6 +358,8 @@ public class MainActivity extends ProfileThemedActivity { 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(); @@ -416,16 +473,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); @@ -678,7 +726,7 @@ public class MainActivity extends ProfileThemedActivity { } public void onAccountSummaryRowViewClicked(View view) { ViewGroup row; - if ( view.getId() == R.id.account_expander ) row = (ViewGroup) view.getParent().getParent(); + if (view.getId() == R.id.account_expander) row = (ViewGroup) view.getParent().getParent(); else row = (ViewGroup) view.getParent(); LedgerAccount acc = (LedgerAccount) row.getTag();