X-Git-Url: https://git.ktnx.net/?a=blobdiff_plain;f=app%2Fsrc%2Fmain%2Fjava%2Fnet%2Fktnx%2Fmobileledger%2Fui%2Factivity%2FMainActivity.java;h=bc164a55333a9d28450a78d346c7720a66e63bee;hb=ab42c559ad21aaf85d977f390e68b638346f51d7;hp=a6c29db6a9884c7c395f2ec354c4978a9ba14b8b;hpb=99c3bfb3451ebb1fc55d728d8d1741849cf789db;p=mobile-ledger.git 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 a6c29db6..bc164a55 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 @@ -22,7 +22,6 @@ 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; @@ -105,6 +104,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(); @@ -130,8 +133,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 @@ -175,11 +188,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); @@ -200,23 +214,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) { @@ -228,11 +247,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(); @@ -251,21 +272,24 @@ 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); @@ -277,20 +301,29 @@ 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); + } + findViewById(R.id.nav_profile_list_head_layout) + .setOnClickListener(this::navProfilesHeadClicked); + findViewById(R.id.nav_profiles_label).setOnClickListener(this::navProfilesHeadClicked); setupProfile(); onProfileChanged(null); updateLastUpdateTextFromDB(); - Date lastUpdate = Data.lastUpdateDate.get(); + scheduleDataRetrievalIfStale(); + } + private void scheduleDataRetrievalIfStale() { + Date lastUpdate = Data.lastUpdateDate.get(); long now = new Date().getTime(); if ((lastUpdate == null) || (now > (lastUpdate.getTime() + (24 * 3600 * 1000)))) { if (lastUpdate == null) Log.d("db::", "WEB data never fetched. scheduling a fetch"); @@ -302,7 +335,8 @@ public class MainActivity extends ProfileThemedActivity { } } private void createShortcuts() { - Resources rm = getResources(); + if (Build.VERSION.SDK_INT < Build.VERSION_CODES.N) return; + List shortcuts = new ArrayList<>(); try (LockHolder lh = Data.profiles.lockForReading()) { for (int i = 0; i < Data.profiles.size(); i++) { @@ -314,8 +348,7 @@ public class MainActivity extends ProfileThemedActivity { .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(); + .setRank(i).build(); shortcuts.add(si); } } @@ -337,6 +370,11 @@ public class MainActivity extends ProfileThemedActivity { MobileLedgerProfile profile = Data.profile.get(); MainActivity.this.runOnUiThread(() -> { + boolean haveProfile = profile != null; + findViewById(R.id.no_profiles_layout).setVisibility(haveProfile ? View.GONE : View.VISIBLE); + findViewById(R.id.pager_layout) + .setVisibility(haveProfile ? View.VISIBLE : View.VISIBLE); + Data.transactions.clear(); Log.d("transactions", "requesting list reload"); TransactionListViewModel.scheduleTransactionListReload(); @@ -389,6 +427,10 @@ public class MainActivity extends ProfileThemedActivity { fab.hide(); } } + + updateLastUpdateTextFromDB(); + + scheduleDataRetrievalIfStale(); }); } private void updateLastUpdateDisplay() {