X-Git-Url: https://git.ktnx.net/?a=blobdiff_plain;f=app%2Fsrc%2Fmain%2Fjava%2Fnet%2Fktnx%2Fmobileledger%2Fui%2Factivity%2FMainActivity.java;h=9cacf3a1306e865b9e0ae4db55782e9f026a07d7;hb=7ea992dfac30dd23663da581505f9837d168879e;hp=64d32be4797a45c16249ac77f9b49c8d93467f96;hpb=2f9910b8f969400271d0d741bc8153338762971b;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 64d32be4..9cacf3a1 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 @@ -1,5 +1,5 @@ /* - * Copyright © 2019 Damyan Ivanov. + * Copyright © 2020 Damyan Ivanov. * This file is part of MoLe. * MoLe is free software: you can distribute it and/or modify it * under the term of the GNU General Public License as published by @@ -30,14 +30,12 @@ import android.os.Build; import android.os.Bundle; import android.util.Log; import android.view.View; -import android.view.ViewGroup; -import android.view.ViewPropertyAnimator; 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; @@ -50,24 +48,20 @@ 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; import net.ktnx.mobileledger.async.RefreshDescriptionsTask; import net.ktnx.mobileledger.async.RetrieveTransactionsTask; import net.ktnx.mobileledger.model.Data; -import net.ktnx.mobileledger.model.LedgerAccount; import net.ktnx.mobileledger.model.MobileLedgerProfile; -import net.ktnx.mobileledger.ui.account_summary.AccountSummaryAdapter; import net.ktnx.mobileledger.ui.account_summary.AccountSummaryFragment; -import net.ktnx.mobileledger.ui.account_summary.AccountSummaryViewModel; import net.ktnx.mobileledger.ui.profiles.ProfileDetailFragment; import net.ktnx.mobileledger.ui.profiles.ProfilesRecyclerViewAdapter; import net.ktnx.mobileledger.ui.transaction_list.TransactionListFragment; import net.ktnx.mobileledger.ui.transaction_list.TransactionListViewModel; import net.ktnx.mobileledger.utils.Colors; -import net.ktnx.mobileledger.utils.GetOptCallback; -import net.ktnx.mobileledger.utils.LockHolder; +import net.ktnx.mobileledger.utils.Logger; import net.ktnx.mobileledger.utils.MLDB; import org.jetbrains.annotations.NotNull; @@ -89,7 +83,6 @@ public class MainActivity extends ProfileThemedActivity { public static final String BUNDLE_SAVED_STATE = "bundle_savedState"; public static final String STATE_ACC_FILTER = "account_filter"; private static final String PREF_THEME_ID = "themeId"; - public AccountSummaryFragment mAccountSummaryFragment; DrawerLayout drawer; private View profileListHeadMore, profileListHeadCancel, profileListHeadAddProfile; private View bTransactionListCancelDownload; @@ -108,6 +101,8 @@ public class MainActivity extends ProfileThemedActivity { protected void onStart() { super.onStart(); + Logger.debug("MainActivity", "onStart()"); + mViewPager.setCurrentItem(mCurrentPage, false); } @Override @@ -151,8 +146,9 @@ public class MainActivity extends ProfileThemedActivity { } @Override protected void onCreate(Bundle savedInstanceState) { + debug("MainActivity", "onCreate()/entry"); super.onCreate(savedInstanceState); - debug("flow", "MainActivity.onCreate()"); + debug("MainActivity", "onCreate()/after super"); setContentView(R.layout.activity_main); fab = findViewById(R.id.btn_add_transaction); @@ -174,9 +170,11 @@ public class MainActivity extends ProfileThemedActivity { mToolbar = findViewById(R.id.toolbar); setSupportActionBar(mToolbar); - Data.profile.observe(this, this::onProfileChanged); + Data.observeProfile(this, this::onProfileChanged); Data.profiles.observe(this, this::onProfileListChanged); + Data.backgroundTaskProgress.observe(this, this::onRetrieveProgress); + Data.backgroundTasksRunning.observe(this, this::onRetrieveRunningChanged); if (barDrawerToggle == null) { barDrawerToggle = new ActionBarDrawerToggle(this, drawer, mToolbar, @@ -185,12 +183,13 @@ public class MainActivity extends ProfileThemedActivity { } barDrawerToggle.syncState(); - TextView ver = drawer.findViewById(R.id.drawer_version_text); - try { PackageInfo pi = getApplicationContext().getPackageManager() .getPackageInfo(getPackageName(), 0); - ver.setText(pi.versionName); + ((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(); @@ -292,21 +291,36 @@ public class MainActivity extends ProfileThemedActivity { (v) -> mProfileListAdapter.flipEditingProfiles()); if (drawerListener == null) { drawerListener = new DrawerLayout.SimpleDrawerListener() { + @Override + public void onDrawerSlide(@NonNull View drawerView, float slideOffset) { + if (slideOffset > 0.2) + fabHide(); + } @Override public void onDrawerClosed(View drawerView) { super.onDrawerClosed(drawerView); mProfileListAdapter.setAnimationsEnabled(false); mProfileListAdapter.editingProfiles.setValue(false); + Data.drawerOpen.setValue(false); + fabShouldShow(); } @Override public void onDrawerOpened(View drawerView) { super.onDrawerOpened(drawerView); mProfileListAdapter.setAnimationsEnabled(true); + Data.drawerOpen.setValue(true); + fabHide(); } }; drawer.addDrawerListener(drawerListener); } - setupProfile(); + + Data.drawerOpen.observe(this, open -> { + if (open) + drawer.open(); + else + drawer.close(); + }); } private void scheduleDataRetrievalIfStale(Date lastUpdate) { long now = new Date().getTime(); @@ -318,9 +332,12 @@ public class MainActivity extends ProfileThemedActivity { "WEB data last fetched at %1.3f and now is %1.3f. re-fetching", lastUpdate.getTime() / 1000f, now / 1000f)); - Data.scheduleTransactionListRetrieval(this); + scheduleDataRetrieval(); } } + public void scheduleDataRetrieval() { + Data.scheduleTransactionListRetrieval(); + } private void createShortcuts(List list) { if (Build.VERSION.SDK_INT < Build.VERSION_CODES.N_MR1) return; @@ -335,47 +352,30 @@ public class MainActivity extends ProfileThemedActivity { 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(); + final ShortcutInfo.Builder builder = + new ShortcutInfo.Builder(this, "new_transaction_" + p.getUuid()); + ShortcutInfo si = builder.setShortLabel(p.getName()) + .setIcon(Icon.createWithResource(this, + R.drawable.thick_plus_icon)) + .setIntent(new Intent(Intent.ACTION_VIEW, null, this, + NewTransactionActivity.class).putExtra("profile_uuid", + p.getUuid())) + .setRank(i) + .build(); shortcuts.add(si); i++; } sm.setDynamicShortcuts(shortcuts); } private void onProfileListChanged(List newList) { - if (newList == null) { - // 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); - return; - } - - if (newList.isEmpty()) { + if ((newList == null) || newList.isEmpty()) { findViewById(R.id.no_profiles_layout).setVisibility(View.VISIBLE); - findViewById(R.id.pager_layout).setVisibility(View.GONE); - findViewById(R.id.loading_layout).setVisibility(View.GONE); + findViewById(R.id.main_app_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); findViewById(R.id.nav_profile_list).setMinimumHeight( (int) (getResources().getDimension(R.dimen.thumb_row_height) * newList.size())); @@ -389,41 +389,52 @@ public class MainActivity extends ProfileThemedActivity { * called when the current profile has changed */ private void onProfileChanged(MobileLedgerProfile profile) { + if (this.profile == null) { + if (profile == null) + return; + } + else { + if (this.profile.equals(profile)) + return; + } + 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); - this.profile = profile; + if (this.profile != null) + this.profile.getDisplayedAccounts() + .removeObservers(this); - mProfileListAdapter.notifyDataSetChanged(); + this.profile = profile; 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; } - drawer.closeDrawers(); + 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(); Data.transactions.clear(); debug("transactions", "requesting list reload"); TransactionListViewModel.scheduleTransactionListReload(); - Data.accounts.clear(); - AccountSummaryViewModel.scheduleAccountListReload(); - if (haveProfile) { + profile.scheduleAccountListReload(); + if (profile.isPostingPermitted()) { mToolbar.setSubtitle(null); fab.show(); @@ -458,21 +469,14 @@ public class MainActivity extends ProfileThemedActivity { scheduleDataRetrievalIfStale(newValue); } private void profileThemeChanged() { - Bundle bundle = new Bundle(); - onSaveInstanceState(bundle); - storeThemeIdInPrefs(profile.getThemeHue()); - // restart activity to reflect theme change - finish(); - // un-hook all observed LiveData - Data.profile.removeObservers(this); + Data.removeProfileObservers(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 @@ -492,17 +496,6 @@ public class MainActivity extends ProfileThemedActivity { intent.putExtras(args); startActivity(intent, args); } - private void setupProfile() { - MLDB.getOption(MLDB.OPT_PROFILE_UUID, null, new GetOptCallback() { - @Override - protected void onResult(String profileUUID) { - MobileLedgerProfile startupProfile; - - startupProfile = Data.getProfile(profileUUID); - Data.setCurrentProfile(startupProfile); - } - }); - } public void fabNewTransactionClicked(View view) { Intent intent = new Intent(this, NewTransactionActivity.class); startActivity(intent); @@ -532,18 +525,15 @@ public class MainActivity extends ProfileThemedActivity { public void onLatestTransactionsClicked(View view) { drawer.closeDrawers(); - showTransactionsFragment((String) null); + showTransactionsFragment(null); } - private void showTransactionsFragment(String accName) { + public void showTransactionsFragment(String accName) { Data.accountFilter.setValue(accName); mViewPager.setCurrentItem(1, true); } - private void showTransactionsFragment(LedgerAccount account) { - showTransactionsFragment((account == null) ? null : account.getName()); - } - public void showAccountTransactions(LedgerAccount account) { + public void showAccountTransactions(String accountName) { mBackMeansToAccountList = true; - showTransactionsFragment(account); + showTransactionsFragment(accountName); } @Override public void onBackPressed() { @@ -584,159 +574,91 @@ public class MainActivity extends ProfileThemedActivity { Data.stopTransactionsRetrieval(); bTransactionListCancelDownload.setEnabled(false); } - public void onRetrieveDone(String error) { - Data.transactionRetrievalDone(); - findViewById(R.id.transaction_progress_layout).setVisibility(View.GONE); + public void onRetrieveRunningChanged(Boolean running) { + final View progressLayout = findViewById(R.id.transaction_progress_layout); + if (running) { + ProgressBar progressBar = findViewById(R.id.transaction_list_progress_bar); + bTransactionListCancelDownload.setEnabled(true); + ColorStateList csl = Colors.getColorStateList(); + 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); + } + progressLayout.setVisibility(View.VISIBLE); + } + else { + progressLayout.setVisibility(View.GONE); + } + } + public void onRetrieveProgress(RetrieveTransactionsTask.Progress progress) { + ProgressBar progressBar = findViewById(R.id.transaction_list_progress_bar); + + if (progress.getState() == RetrieveTransactionsTask.ProgressState.FINISHED) { + Logger.debug("progress", "Done"); + findViewById(R.id.transaction_progress_layout).setVisibility(View.GONE); + + Data.transactionRetrievalDone(); + + if (progress.getError() != null) { + Snackbar.make(mViewPager, progress.getError(), Snackbar.LENGTH_LONG) + .show(); + return; + } - if (error == null) { updateLastUpdateTextFromDB(); new RefreshDescriptionsTask().executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR); TransactionListViewModel.scheduleTransactionListReload(); + + return; } - else - Toast.makeText(this, error, Toast.LENGTH_LONG) - .show(); - } - public void onRetrieveStart() { - ProgressBar progressBar = findViewById(R.id.transaction_list_progress_bar); + + bTransactionListCancelDownload.setEnabled(true); - ColorStateList csl = Colors.getColorStateList(); - 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); +// ColorStateList csl = Colors.getColorStateList(); +// progressBar.setIndeterminateTintList(csl); +// progressBar.setProgressTintList(csl); +// 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) { - ProgressBar progressBar = findViewById(R.id.transaction_list_progress_bar); - if ((progress.getTotal() == RetrieveTransactionsTask.Progress.INDETERMINATE) || - (progress.getTotal() == 0)) - { + + if (progress.isIndeterminate() || (progress.getTotal() <= 0)) { progressBar.setIndeterminate(true); + Logger.debug("progress", "indeterminate"); } else { - if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) { - progressBar.setMin(0); + if (progressBar.isIndeterminate()) { + progressBar.setIndeterminate(false); } + Logger.debug("progress", + String.format(Locale.US, "%d/%d", progress.getProgress(), progress.getTotal())); progressBar.setMax(progress.getTotal()); - if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) { - progressBar.setProgress(progress.getProgress(), true); - } + // for some reason animation doesn't work - no progress is shown (stick at 0) + // on lineageOS 14.1 (Nougat, 7.1.2) + if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) + progressBar.setProgress(progress.getProgress(), false); else progressBar.setProgress(progress.getProgress()); - progressBar.setIndeterminate(false); } } public void fabShouldShow() { - if ((profile != null) && profile.isPostingPermitted()) + 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(); - - 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: - debug("accounts", "Account expander clicked"); - if (!acc.hasSubAccounts()) - return; - - boolean wasExpanded = acc.isExpanded(); - - View arrow = row.findViewById(R.id.account_expander_container); - - arrow.clearAnimation(); - ViewPropertyAnimator animator = arrow.animate(); - - acc.toggleExpanded(); - DbOpQueue.add("update accounts set expanded=? where name=? and profile=?", - new Object[]{acc.isExpanded(), acc.getName(), profile.getUuid() - }); - - if (wasExpanded) { - debug("accounts", String.format("Collapsing account '%s'", acc.getName())); - arrow.setRotation(0); - animator.rotationBy(180); - - // removing all child accounts from the view - int start = -1, count = 0; - 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", -// Data.accounts.get(i).getName(), i)); - if (start == -1) { - start = i; - } - count++; - } - else { - if (start != -1) { -// debug("accounts", -// String.format("Found a non-child '%s' at position %d", -// Data.accounts.get(i).getName(), i)); - break; - } - } - } - - if (start != -1) { - for (int j = 0; j < count; j++) { -// debug("accounts", String.format("Removing item %d: %s", start + j, -// Data.accounts.get(start).getName())); - Data.accounts.removeQuietly(start); - } - - mAccountSummaryFragment.modelAdapter.notifyItemRangeRemoved(start, - count); - } - } - } - else { - debug("accounts", String.format("Expanding account '%s'", acc.getName())); - arrow.setRotation(180); - animator.rotationBy(-180); - List children = profile.loadVisibleChildAccountsOf(acc); - try (LockHolder ignored = Data.accounts.lockForWriting()) { - int parentPos = Data.accounts.indexOf(acc); - if (parentPos != -1) { - // may have disappeared in a concurrent refresh operation - Data.accounts.addAllQuietly(parentPos + 1, children); - mAccountSummaryFragment.modelAdapter.notifyItemRangeInserted( - parentPos + 1, children.size()); - } - } - } - break; - 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() - }); - Data.accounts.triggerItemChangedNotification(acc); - } - break; - } - } - public class SectionsPagerAdapter extends FragmentPagerAdapter { + public static class SectionsPagerAdapter extends FragmentPagerAdapter { SectionsPagerAdapter(FragmentManager fm) { super(fm, BEHAVIOR_RESUME_ONLY_CURRENT_FRAGMENT); @@ -749,7 +671,7 @@ public class MainActivity extends ProfileThemedActivity { switch (position) { case 0: // debug("flow", "Creating account summary fragment"); - return mAccountSummaryFragment = new AccountSummaryFragment(); + return new AccountSummaryFragment(); case 1: return new TransactionListFragment(); default: