X-Git-Url: https://git.ktnx.net/?a=blobdiff_plain;f=app%2Fsrc%2Fmain%2Fjava%2Fnet%2Fktnx%2Fmobileledger%2Fui%2Factivity%2FMainActivity.java;h=bce01de75c9ffc29ee61bc21b5ee04c04e8f30fa;hb=8a7234e211e68af2e54f082606c8bb4fe5924f0c;hp=3bed02614c30f6f211f343acda9fde705e7669a4;hpb=b8024af6cd622a2c9b1e016b7be1238ad7ddbcf0;p=mobile-ledger-staging.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 3bed0261..bce01de7 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 @@ -25,19 +25,16 @@ import android.content.pm.ShortcutManager; import android.content.res.ColorStateList; import android.graphics.Color; import android.graphics.drawable.Icon; -import android.os.AsyncTask; 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; @@ -45,29 +42,25 @@ import androidx.drawerlayout.widget.DrawerLayout; import androidx.fragment.app.Fragment; import androidx.fragment.app.FragmentManager; import androidx.fragment.app.FragmentPagerAdapter; +import androidx.lifecycle.ViewModelProvider; 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; -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.MainModel; 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; @@ -78,8 +71,6 @@ import java.util.Date; import java.util.List; import java.util.Locale; -import static net.ktnx.mobileledger.utils.Logger.debug; - /* * TODO: reports * */ @@ -89,7 +80,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; @@ -104,29 +94,38 @@ public class MainActivity extends ProfileThemedActivity { private ActionBarDrawerToggle barDrawerToggle; private ViewPager.SimpleOnPageChangeListener pageChangeListener; private MobileLedgerProfile profile; + private MainModel mainModel; @Override protected void onStart() { super.onStart(); + Logger.debug("MainActivity", "onStart()"); + mViewPager.setCurrentItem(mCurrentPage, false); } @Override protected void onSaveInstanceState(@NotNull Bundle outState) { super.onSaveInstanceState(outState); outState.putInt(STATE_CURRENT_PAGE, mViewPager.getCurrentItem()); - if (Data.accountFilter.getValue() != null) - outState.putString(STATE_ACC_FILTER, Data.accountFilter.getValue()); + if (mainModel.getAccountFilter() + .getValue() != null) + outState.putString(STATE_ACC_FILTER, mainModel.getAccountFilter() + .getValue()); } @Override 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(); } @@ -134,7 +133,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); @@ -146,10 +146,13 @@ public class MainActivity extends ProfileThemedActivity { } @Override protected void onCreate(Bundle savedInstanceState) { + Logger.debug("MainActivity", "onCreate()/entry"); super.onCreate(savedInstanceState); - debug("flow", "MainActivity.onCreate()"); + Logger.debug("MainActivity", "onCreate()/after super"); setContentView(R.layout.activity_main); + mainModel = new ViewModelProvider(this).get(MainModel.class); + fab = findViewById(R.id.btn_add_transaction); profileListHeadMore = findViewById(R.id.nav_profiles_start_edit); profileListHeadCancel = findViewById(R.id.nav_profiles_cancel_edit); @@ -162,15 +165,18 @@ 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); 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, @@ -179,12 +185,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); + 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(); @@ -223,24 +230,26 @@ public class MainActivity extends ProfileThemedActivity { if (currentPage != -1) { mCurrentPage = currentPage; } - Data.accountFilter.setValue(savedInstanceState.getString(STATE_ACC_FILTER, null)); + mainModel.getAccountFilter() + .setValue(savedInstanceState.getString(STATE_ACC_FILTER, null)); } - Data.lastUpdateDate.observe(this, this::updateLastUpdateDisplay); + mainModel.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 -> { @@ -281,81 +290,107 @@ 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 + 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(); + }); + + mainModel.getUpdateError() + .observe(this, (error) -> { + if (error == null) + return; + + Snackbar.make(mViewPager, error, Snackbar.LENGTH_LONG) + .show(); + mainModel.clearUpdateError(); + }); } - private void scheduleDataRetrievalIfStale(Date lastUpdate) { + private void scheduleDataRetrievalIfStale(long 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)); - - Data.scheduleTransactionListRetrieval(this); + if ((lastUpdate == 0) || (now > (lastUpdate + (24 * 3600 * 1000)))) { + if (lastUpdate == 0) + Logger.debug("db::", "WEB data never fetched. scheduling a fetch"); + else + Logger.debug("db", String.format(Locale.ENGLISH, + "WEB data last fetched at %1.3f and now is %1.3f. re-fetching", + lastUpdate / 1000f, now / 1000f)); + + mainModel.scheduleTransactionListRetrieval(); } } private void createShortcuts(List list) { - if (Build.VERSION.SDK_INT < Build.VERSION_CODES.N_MR1) 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; + + 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++; } - ShortcutManager sm = getSystemService(ShortcutManager.class); 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())); - debug("profiles", "profile list changed"); + Logger.debug("profiles", "profile list changed"); mProfileListAdapter.notifyDataSetChanged(); createShortcuts(newList); @@ -364,45 +399,56 @@ 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); + if (haveProfile) + setTitle(profile.getName()); + else + setTitle(R.string.app_name); - this.profile = profile; + mainModel.setProfile(profile); - mProfileListAdapter.notifyDataSetChanged(); + this.profile = profile; - int newProfileTheme = haveProfile ? profile.getThemeId() : -1; + int newProfileTheme = haveProfile ? profile.getThemeHue() : -1; if (newProfileTheme != Colors.profileThemeId) { - debug("profiles", + Logger.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); - Data.transactions.clear(); - debug("transactions", "requesting list reload"); - TransactionListViewModel.scheduleTransactionListReload(); + mProfileListAdapter.notifyDataSetChanged(); - Data.accounts.clear(); - AccountSummaryViewModel.scheduleAccountListReload(); + mainModel.clearTransactions(); if (haveProfile) { + mainModel.scheduleAccountListReload(); + Logger.debug("transactions", "requesting list reload"); + mainModel.scheduleTransactionListReload(); + if (profile.isPostingPermitted()) { mToolbar.setSubtitle(null); fab.show(); } else { - mToolbar.setSubtitle(R.string.profile_subitlte_read_only); + mToolbar.setSubtitle(R.string.profile_subtitle_read_only); fab.hide(); } } @@ -418,33 +464,25 @@ public class MainActivity extends ProfileThemedActivity { TextView v = findViewById(R.id.transactions_last_update); if (newValue == null) { l.setVisibility(View.INVISIBLE); - debug("main", "no last update date :("); + Logger.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)); + Logger.debug("main", String.format("Date formatted: %s", text)); } - - 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.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); + mainModel.lastUpdateDate.removeObservers(this); + + recreate(); } private void storeThemeIdInPrefs(int themeId) { // store the new theme id in the preferences @@ -458,32 +496,17 @@ 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); } - 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); overridePendingTransition(R.anim.slide_in_up, R.anim.dummy); } - public void navSettingsClicked(View view) { - Intent intent = new Intent(this, SettingsActivity.class); - startActivity(intent); - drawer.closeDrawers(); - } public void markDrawerItemCurrent(int id) { TextView item = drawer.findViewById(id); item.setBackgroundColor(Colors.tableRowDarkBG); @@ -503,23 +526,22 @@ public class MainActivity extends ProfileThemedActivity { } private void showAccountSummaryFragment() { mViewPager.setCurrentItem(0, true); - Data.accountFilter.setValue(null); + mainModel.getAccountFilter() + .setValue(null); } public void onLatestTransactionsClicked(View view) { drawer.closeDrawers(); - showTransactionsFragment((String) null); + showTransactionsFragment(null); } - private void showTransactionsFragment(String accName) { - Data.accountFilter.setValue(accName); + public void showTransactionsFragment(String accName) { + mainModel.getAccountFilter() + .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() { @@ -529,12 +551,13 @@ public class MainActivity extends ProfileThemedActivity { } else { if (mBackMeansToAccountList && (mViewPager.getCurrentItem() == 1)) { - Data.accountFilter.setValue(null); + mainModel.getAccountFilter() + .setValue(null); showAccountSummaryFragment(); mBackMeansToAccountList = false; } else { - debug("fragments", String.format(Locale.ENGLISH, "manager stack: %d", + Logger.debug("fragments", String.format(Locale.ENGLISH, "manager stack: %d", getSupportFragmentManager().getBackStackEntryCount())); super.onBackPressed(); @@ -542,179 +565,122 @@ 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); - debug("transactions", String.format(Locale.ENGLISH, "Last update = %d", last_update)); + Logger.debug("transactions", + String.format(Locale.ENGLISH, "Last update = %d", last_update)); if (last_update == 0) { - Data.lastUpdateDate.postValue(null); + mainModel.lastUpdateDate.postValue(null); } else { - Data.lastUpdateDate.postValue(new Date(last_update)); + mainModel.lastUpdateDate.postValue(new Date(last_update)); } + scheduleDataRetrievalIfStale(last_update); + } public void onStopTransactionRefreshClick(View view) { - debug("interactive", "Cancelling transactions refresh"); - Data.stopTransactionsRetrieval(); + Logger.debug("interactive", "Cancelling transactions refresh"); + mainModel.stopTransactionsRetrieval(); bTransactionListCancelDownload.setEnabled(false); } - public void onRetrieveDone(String error) { - Data.transactionRetrievalDone(); - findViewById(R.id.transaction_progress_layout).setVisibility(View.GONE); - - if (error == null) { - updateLastUpdateTextFromDB(); - - new RefreshDescriptionsTask().executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR); - TransactionListViewModel.scheduleTransactionListReload(); + 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); } - else Toast.makeText(this, error, Toast.LENGTH_LONG).show(); } - public void onRetrieveStart() { + 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); + + mainModel.transactionRetrievalDone(); + + if (progress.getError() != null) { + Snackbar.make(mViewPager, progress.getError(), Snackbar.LENGTH_LONG) + .show(); + return; + } + + return; + } + + 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); - } - else progressBar.setProgress(progress.getProgress()); - progressBar.setIndeterminate(false); + // 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()); } } 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(); - - 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); + super(fm, BEHAVIOR_RESUME_ONLY_CURRENT_FRAGMENT); } @NotNull @Override public Fragment getItem(int position) { - debug("main", String.format(Locale.ENGLISH, "Switching to fragment %d", position)); + Logger.debug("main", + String.format(Locale.ENGLISH, "Switching to fragment %d", position)); switch (position) { case 0: // debug("flow", "Creating account summary fragment"); - return mAccountSummaryFragment = new AccountSummaryFragment(); + return new AccountSummaryFragment(); case 1: return new TransactionListFragment(); default: