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=3f71e0a4707cf0f19dd5883b372795d9b6cacc96;hp=bd28ab299c52f47d62a9025bef5287bfc73f7f56;hb=5a90fe491df28aa545df97278222b4120b56b2a7;hpb=52aac35d8e7fd33dea55aa29f5b19ca6c39aaaa8 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 bd28ab29..3f71e0a4 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 @@ -36,9 +36,21 @@ import android.view.animation.AnimationUtils; import android.widget.LinearLayout; import android.widget.ProgressBar; import android.widget.TextView; -import android.widget.Toast; + +import androidx.annotation.NonNull; +import androidx.appcompat.app.ActionBarDrawerToggle; +import androidx.appcompat.widget.Toolbar; +import androidx.core.view.GravityCompat; +import androidx.drawerlayout.widget.DrawerLayout; +import androidx.fragment.app.Fragment; +import androidx.fragment.app.FragmentManager; +import androidx.fragment.app.FragmentPagerAdapter; +import androidx.recyclerview.widget.LinearLayoutManager; +import androidx.recyclerview.widget.RecyclerView; +import androidx.viewpager.widget.ViewPager; import com.google.android.material.floatingactionbutton.FloatingActionButton; +import com.google.android.material.snackbar.Snackbar; import net.ktnx.mobileledger.R; import net.ktnx.mobileledger.async.DbOpQueue; @@ -67,19 +79,12 @@ import java.util.Date; import java.util.List; import java.util.Locale; -import androidx.appcompat.app.ActionBarDrawerToggle; -import androidx.appcompat.widget.Toolbar; -import androidx.core.view.GravityCompat; -import androidx.drawerlayout.widget.DrawerLayout; -import androidx.fragment.app.Fragment; -import androidx.fragment.app.FragmentManager; -import androidx.fragment.app.FragmentPagerAdapter; -import androidx.recyclerview.widget.LinearLayoutManager; -import androidx.recyclerview.widget.RecyclerView; -import androidx.viewpager.widget.ViewPager; - import static net.ktnx.mobileledger.utils.Logger.debug; +/* + * TODO: reports + * */ + public class MainActivity extends ProfileThemedActivity { public static final String STATE_CURRENT_PAGE = "current_page"; public static final String BUNDLE_SAVED_STATE = "bundle_savedState"; @@ -117,12 +122,16 @@ public class MainActivity extends ProfileThemedActivity { protected void onDestroy() { mSectionsPagerAdapter = null; RecyclerView root = findViewById(R.id.nav_profile_list); - if (root != null) root.setAdapter(null); - if (drawer != null) drawer.removeDrawerListener(drawerListener); + if (root != null) + root.setAdapter(null); + if (drawer != null) + drawer.removeDrawerListener(drawerListener); drawerListener = null; - if (drawer != null) drawer.removeDrawerListener(barDrawerToggle); + if (drawer != null) + drawer.removeDrawerListener(barDrawerToggle); barDrawerToggle = null; - if (mViewPager != null) mViewPager.removeOnPageChangeListener(pageChangeListener); + if (mViewPager != null) + mViewPager.removeOnPageChangeListener(pageChangeListener); pageChangeListener = null; super.onDestroy(); } @@ -130,7 +139,8 @@ public class MainActivity extends ProfileThemedActivity { protected void setupProfileColors() { SharedPreferences prefs = getPreferences(MODE_PRIVATE); int profileColor = prefs.getInt(PREF_THEME_ID, -2); - if (profileColor == -2) profileColor = Data.retrieveCurrentThemeIdFromDb(); + if (profileColor == -2) + profileColor = Data.retrieveCurrentThemeIdFromDb(); Colors.setupTheme(this, profileColor); Colors.profileThemeId = profileColor; storeThemeIdInPrefs(profileColor); @@ -158,7 +168,8 @@ public class MainActivity extends ProfileThemedActivity { mViewPager = findViewById(R.id.root_frame); Bundle extra = getIntent().getBundleExtra(BUNDLE_SAVED_STATE); - if (extra != null && savedInstanceState == null) savedInstanceState = extra; + if (extra != null && savedInstanceState == null) + savedInstanceState = extra; mToolbar = findViewById(R.id.toolbar); @@ -174,13 +185,32 @@ public class MainActivity extends ProfileThemedActivity { drawer.addDrawerListener(barDrawerToggle); } barDrawerToggle.syncState(); + drawer.addDrawerListener(new DrawerLayout.DrawerListener() { + @Override + public void onDrawerSlide(@NonNull View drawerView, float slideOffset) { + if (slideOffset > 0.2) + fabHide(); + } + @Override + public void onDrawerOpened(@NonNull View drawerView) { + fabHide(); + } + @Override + public void onDrawerClosed(@NonNull View drawerView) { + fabShouldShow(); + } + @Override + public void onDrawerStateChanged(int newState) {} + }); - TextView ver = drawer.findViewById(R.id.drawer_version_text); try { - PackageInfo pi = - getApplicationContext().getPackageManager().getPackageInfo(getPackageName(), 0); - ver.setText(pi.versionName); + PackageInfo pi = getApplicationContext().getPackageManager() + .getPackageInfo(getPackageName(), 0); + ((TextView) findViewById(R.id.nav_upper).findViewById( + R.id.drawer_version_text)).setText(pi.versionName); + ((TextView) findViewById(R.id.no_profiles_layout).findViewById( + R.id.drawer_version_text)).setText(pi.versionName); } catch (Exception e) { e.printStackTrace(); @@ -224,19 +254,20 @@ public class MainActivity extends ProfileThemedActivity { Data.lastUpdateDate.observe(this, this::updateLastUpdateDisplay); - findViewById(R.id.btn_no_profiles_add) - .setOnClickListener(v -> startEditProfileActivity(null)); + findViewById(R.id.btn_no_profiles_add).setOnClickListener( + v -> startEditProfileActivity(null)); findViewById(R.id.btn_add_transaction).setOnClickListener(this::fabNewTransactionClicked); - findViewById(R.id.nav_new_profile_button) - .setOnClickListener(v -> startEditProfileActivity(null)); + findViewById(R.id.nav_new_profile_button).setOnClickListener( + v -> startEditProfileActivity(null)); RecyclerView root = findViewById(R.id.nav_profile_list); if (root == null) throw new RuntimeException("Can't get hold on the transaction value view"); - if (mProfileListAdapter == null) mProfileListAdapter = new ProfilesRecyclerViewAdapter(); + if (mProfileListAdapter == null) + mProfileListAdapter = new ProfilesRecyclerViewAdapter(); root.setAdapter(mProfileListAdapter); mProfileListAdapter.editingProfiles.observe(this, newValue -> { @@ -277,8 +308,8 @@ public class MainActivity extends ProfileThemedActivity { profileListHeadMore.setOnClickListener((v) -> mProfileListAdapter.flipEditingProfiles()); profileListHeadCancel.setOnClickListener((v) -> mProfileListAdapter.flipEditingProfiles()); - profileListHeadMoreAndCancel - .setOnClickListener((v) -> mProfileListAdapter.flipEditingProfiles()); + profileListHeadMoreAndCancel.setOnClickListener( + (v) -> mProfileListAdapter.flipEditingProfiles()); if (drawerListener == null) { drawerListener = new DrawerLayout.SimpleDrawerListener() { @Override @@ -295,37 +326,54 @@ public class MainActivity extends ProfileThemedActivity { }; drawer.addDrawerListener(drawerListener); } - setupProfile(); } private void scheduleDataRetrievalIfStale(Date lastUpdate) { long now = new Date().getTime(); if ((lastUpdate == null) || (now > (lastUpdate.getTime() + (24 * 3600 * 1000)))) { - if (lastUpdate == null) debug("db::", "WEB data never fetched. scheduling a fetch"); - else debug("db", String.format(Locale.ENGLISH, - "WEB data last fetched at %1.3f and now is %1.3f. re-fetching", - lastUpdate.getTime() / 1000f, now / 1000f)); + if (lastUpdate == null) + debug("db::", "WEB data never fetched. scheduling a fetch"); + else + debug("db", String.format(Locale.ENGLISH, + "WEB data last fetched at %1.3f and now is %1.3f. re-fetching", + lastUpdate.getTime() / 1000f, now / 1000f)); Data.scheduleTransactionListRetrieval(this); } } private void createShortcuts(List list) { - if (Build.VERSION.SDK_INT < Build.VERSION_CODES.O) return; + if (Build.VERSION.SDK_INT < Build.VERSION_CODES.N_MR1) + return; + ShortcutManager sm = getSystemService(ShortcutManager.class); List shortcuts = new ArrayList<>(); int i = 0; for (MobileLedgerProfile p : list) { - 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(); + if (shortcuts.size() >= sm.getMaxShortcutCountPerActivity()) + break; + + 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); i++; } - ShortcutManager sm = getSystemService(ShortcutManager.class); sm.setDynamicShortcuts(shortcuts); } private void onProfileListChanged(List newList) { @@ -333,18 +381,18 @@ public class MainActivity extends ProfileThemedActivity { // profiles not yet loaded from DB findViewById(R.id.loading_layout).setVisibility(View.VISIBLE); findViewById(R.id.no_profiles_layout).setVisibility(View.GONE); - findViewById(R.id.pager_layout).setVisibility(View.GONE); + findViewById(R.id.main_app_layout).setVisibility(View.GONE); return; } if (newList.isEmpty()) { findViewById(R.id.no_profiles_layout).setVisibility(View.VISIBLE); - findViewById(R.id.pager_layout).setVisibility(View.GONE); + findViewById(R.id.main_app_layout).setVisibility(View.GONE); findViewById(R.id.loading_layout).setVisibility(View.GONE); return; } - findViewById(R.id.pager_layout).setVisibility(View.VISIBLE); + findViewById(R.id.main_app_layout).setVisibility(View.VISIBLE); findViewById(R.id.no_profiles_layout).setVisibility(View.GONE); findViewById(R.id.loading_layout).setVisibility(View.GONE); @@ -361,28 +409,31 @@ public class MainActivity extends ProfileThemedActivity { */ private void onProfileChanged(MobileLedgerProfile profile) { 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); - if (haveProfile) setTitle(profile.getName()); - else setTitle(R.string.app_name); + if (haveProfile) + setTitle(profile.getName()); + else + setTitle(R.string.app_name); this.profile = profile; - mProfileListAdapter.notifyDataSetChanged(); - - int newProfileTheme = haveProfile ? profile.getThemeId() : -1; + int newProfileTheme = haveProfile ? profile.getThemeHue() : -1; if (newProfileTheme != Colors.profileThemeId) { debug("profiles", String.format(Locale.ENGLISH, "profile theme %d → %d", Colors.profileThemeId, newProfileTheme)); - MainActivity.this.profileThemeChanged(); Colors.profileThemeId = newProfileTheme; + profileThemeChanged(); // profileThemeChanged would restart the activity, so no need to reload the // data sets below return; } + findViewById(R.id.no_profiles_layout).setVisibility(haveProfile ? View.GONE : View.VISIBLE); + findViewById(R.id.pager_layout).setVisibility(haveProfile ? View.VISIBLE : View.VISIBLE); + + mProfileListAdapter.notifyDataSetChanged(); + drawer.closeDrawers(); Data.transactions.clear(); @@ -398,7 +449,7 @@ public class MainActivity extends ProfileThemedActivity { fab.show(); } else { - mToolbar.setSubtitle(R.string.profile_subitlte_read_only); + mToolbar.setSubtitle(R.string.profile_subtitle_read_only); fab.hide(); } } @@ -417,7 +468,8 @@ public class MainActivity extends ProfileThemedActivity { debug("main", "no last update date :("); } else { - final String text = DateFormat.getDateTimeInstance().format(newValue); + final String text = DateFormat.getDateTimeInstance() + .format(newValue); v.setText(text); l.setVisibility(View.VISIBLE); debug("main", String.format("Date formatted: %s", text)); @@ -426,21 +478,14 @@ public class MainActivity extends ProfileThemedActivity { scheduleDataRetrievalIfStale(newValue); } private void profileThemeChanged() { - Bundle bundle = new Bundle(); - onSaveInstanceState(bundle); - - storeThemeIdInPrefs(profile.getThemeId()); - - // restart activity to reflect theme change - finish(); + storeThemeIdInPrefs(profile.getThemeHue()); // un-hook all observed LiveData Data.profile.removeObservers(this); Data.profiles.removeObservers(this); Data.lastUpdateDate.removeObservers(this); - Intent intent = new Intent(this, this.getClass()); - intent.putExtra(BUNDLE_SAVED_STATE, bundle); - startActivity(intent); + + recreate(); } private void storeThemeIdInPrefs(int themeId) { // store the new theme id in the preferences @@ -454,7 +499,8 @@ public class MainActivity extends ProfileThemedActivity { Bundle args = new Bundle(); if (profile != null) { int index = Data.getProfileIndex(profile); - if (index != -1) intent.putExtra(ProfileDetailFragment.ARG_ITEM_ID, index); + if (index != -1) + intent.putExtra(ProfileDetailFragment.ARG_ITEM_ID, index); } intent.putExtras(args); startActivity(intent, args); @@ -473,12 +519,7 @@ public class MainActivity extends ProfileThemedActivity { public void fabNewTransactionClicked(View view) { Intent intent = new Intent(this, NewTransactionActivity.class); startActivity(intent); - overridePendingTransition(R.anim.slide_in_right, R.anim.dummy); - } - public void navSettingsClicked(View view) { - Intent intent = new Intent(this, SettingsActivity.class); - startActivity(intent); - drawer.closeDrawers(); + overridePendingTransition(R.anim.slide_in_up, R.anim.dummy); } public void markDrawerItemCurrent(int id) { TextView item = drawer.findViewById(id); @@ -538,7 +579,8 @@ public class MainActivity extends ProfileThemedActivity { } } public void updateLastUpdateTextFromDB() { - if (profile == null) return; + if (profile == null) + return; long last_update = profile.getLongOption(MLDB.OPT_LAST_SCRAPE, 0L); @@ -565,7 +607,9 @@ public class MainActivity extends ProfileThemedActivity { new RefreshDescriptionsTask().executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR); TransactionListViewModel.scheduleTransactionListReload(); } - else Toast.makeText(this, error, Toast.LENGTH_LONG).show(); + else + Snackbar.make(mViewPager, error, Snackbar.LENGTH_LONG) + .show(); } public void onRetrieveStart() { ProgressBar progressBar = findViewById(R.id.transaction_list_progress_bar); @@ -574,8 +618,10 @@ public class MainActivity extends ProfileThemedActivity { progressBar.setIndeterminateTintList(csl); progressBar.setProgressTintList(csl); progressBar.setIndeterminate(true); - if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) progressBar.setProgress(0, false); - else progressBar.setProgress(0); + if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) + progressBar.setProgress(0, false); + else + progressBar.setProgress(0); findViewById(R.id.transaction_progress_layout).setVisibility(View.VISIBLE); } public void onRetrieveProgress(RetrieveTransactionsTask.Progress progress) { @@ -593,20 +639,27 @@ public class MainActivity extends ProfileThemedActivity { if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) { progressBar.setProgress(progress.getProgress(), true); } - else progressBar.setProgress(progress.getProgress()); + else + progressBar.setProgress(progress.getProgress()); progressBar.setIndeterminate(false); } } public void fabShouldShow() { - if ((profile != null) && profile.isPostingPermitted()) fab.show(); + if ((profile != null) && profile.isPostingPermitted() && !drawer.isOpen()) + fab.show(); + else + fabHide(); } public void fabHide() { fab.hide(); } public void onAccountSummaryRowViewClicked(View view) { ViewGroup row; - if (view.getId() == R.id.account_expander) row = (ViewGroup) view.getParent().getParent(); - else row = (ViewGroup) view.getParent(); + 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()) { @@ -614,7 +667,8 @@ public class MainActivity extends ProfileThemedActivity { case R.id.account_expander: case R.id.account_expander_container: debug("accounts", "Account expander clicked"); - if (!acc.hasSubAccounts()) return; + if (!acc.hasSubAccounts()) + return; boolean wasExpanded = acc.isExpanded(); @@ -638,7 +692,8 @@ public class MainActivity extends ProfileThemedActivity { try (LockHolder ignored = Data.accounts.lockForWriting()) { for (int i = 0; i < Data.accounts.size(); i++) { if (acc.isParentOf(Data.accounts.get(i))) { -// debug("accounts", String.format("Found a child '%s' at position %d", +// debug("accounts", String.format("Found a child '%s' at position +// %d", // Data.accounts.get(i).getName(), i)); if (start == -1) { start = i; @@ -662,8 +717,8 @@ public class MainActivity extends ProfileThemedActivity { Data.accounts.removeQuietly(start); } - mAccountSummaryFragment.modelAdapter - .notifyItemRangeRemoved(start, count); + mAccountSummaryFragment.modelAdapter.notifyItemRangeRemoved(start, + count); } } } @@ -677,8 +732,8 @@ public class MainActivity extends ProfileThemedActivity { if (parentPos != -1) { // may have disappeared in a concurrent refresh operation Data.accounts.addAllQuietly(parentPos + 1, children); - mAccountSummaryFragment.modelAdapter - .notifyItemRangeInserted(parentPos + 1, children.size()); + mAccountSummaryFragment.modelAdapter.notifyItemRangeInserted( + parentPos + 1, children.size()); } } } @@ -686,11 +741,10 @@ public class MainActivity extends ProfileThemedActivity { case R.id.account_row_acc_amounts: if (acc.getAmountCount() > AccountSummaryAdapter.AMOUNT_LIMIT) { acc.toggleAmountsExpanded(); - DbOpQueue - .add("update accounts set amounts_expanded=? where name=? and profile=?", - new Object[]{acc.amountsExpanded(), acc.getName(), - profile.getUuid() - }); + DbOpQueue.add( + "update accounts set amounts_expanded=? where name=? and profile=?", + new Object[]{acc.amountsExpanded(), acc.getName(), profile.getUuid() + }); Data.accounts.triggerItemChangedNotification(acc); } break; @@ -700,7 +754,7 @@ public class MainActivity extends ProfileThemedActivity { public class SectionsPagerAdapter extends FragmentPagerAdapter { SectionsPagerAdapter(FragmentManager fm) { - super(fm); + super(fm, BEHAVIOR_RESUME_ONLY_CURRENT_FRAGMENT); } @NotNull