X-Git-Url: https://git.ktnx.net/?a=blobdiff_plain;f=app%2Fsrc%2Fmain%2Fjava%2Fnet%2Fktnx%2Fmobileledger%2Fui%2Factivity%2FMainActivity.java;h=46cc410e18d401eb1da86bdcb21c950d79081dff;hb=1796886d67b4d62c9fad1ea0980f38f53b8ce3b7;hp=7df18278515ab2d1c548cb1ee5288343d2c210f1;hpb=c8bd976d1d7f03e20db21c3056ac33c095c0057e;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 7df18278..46cc410e 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 @@ -53,6 +53,7 @@ import net.ktnx.mobileledger.R; import net.ktnx.mobileledger.async.RetrieveTransactionsTask; import net.ktnx.mobileledger.databinding.ActivityMainBinding; import net.ktnx.mobileledger.db.DB; +import net.ktnx.mobileledger.db.Option; import net.ktnx.mobileledger.db.Profile; import net.ktnx.mobileledger.model.Data; import net.ktnx.mobileledger.ui.FabManager; @@ -65,7 +66,6 @@ import net.ktnx.mobileledger.ui.templates.TemplatesActivity; import net.ktnx.mobileledger.ui.transaction_list.TransactionListFragment; import net.ktnx.mobileledger.utils.Colors; import net.ktnx.mobileledger.utils.Logger; -import net.ktnx.mobileledger.utils.MLDB; import org.jetbrains.annotations.NotNull; @@ -80,6 +80,7 @@ import java.util.Objects; * */ public class MainActivity extends ProfileThemedActivity implements FabManager.FabHandler { + public static final String TAG = "main-act"; public static final String STATE_CURRENT_PAGE = "current_page"; public static final String BUNDLE_SAVED_STATE = "bundle_savedState"; public static final String STATE_ACC_FILTER = "account_filter"; @@ -101,7 +102,7 @@ public class MainActivity extends ProfileThemedActivity implements FabManager.Fa protected void onStart() { super.onStart(); - Logger.debug("MainActivity", "onStart()"); + Logger.debug(TAG, "onStart()"); b.mainPager.setCurrentItem(mCurrentPage, false); } @@ -133,9 +134,9 @@ public class MainActivity extends ProfileThemedActivity implements FabManager.Fa } @Override protected void onCreate(Bundle savedInstanceState) { - Logger.debug("MainActivity", "onCreate()/entry"); + Logger.debug(TAG, "onCreate()/entry"); super.onCreate(savedInstanceState); - Logger.debug("MainActivity", "onCreate()/after super"); + Logger.debug(TAG, "onCreate()/after super"); b = ActivityMainBinding.inflate(getLayoutInflater()); setContentView(b.getRoot()); @@ -178,6 +179,7 @@ public class MainActivity extends ProfileThemedActivity implements FabManager.Fa markDrawerItemCurrent(R.id.nav_account_summary); b.mainPager.setAdapter(mSectionsPagerAdapter); + b.mainPager.setOffscreenPageLimit(1); if (pageChangeCallback == null) { pageChangeCallback = new ViewPager2.OnPageChangeCallback() { @@ -192,8 +194,7 @@ public class MainActivity extends ProfileThemedActivity implements FabManager.Fa markDrawerItemCurrent(R.id.nav_latest_transactions); break; default: - Log.e("MainActivity", - String.format("Unexpected page index %d", position)); + Log.e(TAG, String.format("Unexpected page index %d", position)); } super.onPageSelected(position); @@ -455,14 +456,14 @@ public class MainActivity extends ProfileThemedActivity implements FabManager.Fa return; } - mainModel.stopTransactionsRetrieval(); + mainModel.getAccountFilter() + .observe(this, v -> { + Logger.debug(TAG, "account filter changed, reloading transactions"); + mainModel.scheduleTransactionListReload(); + }); + mainModel.stopTransactionsRetrieval(); mainModel.clearTransactions(); - - if (haveProfile) { - Logger.debug("transactions", "requesting list reload"); - mainModel.scheduleTransactionListReload(); - } } private void profileThemeChanged() { // un-hook all observed LiveData @@ -472,7 +473,7 @@ public class MainActivity extends ProfileThemedActivity implements FabManager.Fa Data.lastUpdateAccountCount.removeObservers(this); Data.lastUpdateDate.removeObservers(this); - Logger.debug("MainActivity", "profileThemeChanged(): recreating activity"); + Logger.debug(TAG, "profileThemeChanged(): recreating activity"); recreate(); } public void fabNewTransactionClicked(View view) { @@ -530,7 +531,7 @@ public class MainActivity extends ProfileThemedActivity implements FabManager.Fa mBackMeansToAccountList = false; } else { - Logger.debug("fragments", String.format(Locale.ENGLISH, "manager stack: %d", + Logger.debug(TAG, String.format(Locale.ENGLISH, "manager stack: %d", getSupportFragmentManager().getBackStackEntryCount())); super.onBackPressed(); @@ -543,7 +544,7 @@ public class MainActivity extends ProfileThemedActivity implements FabManager.Fa DB.get() .getOptionDAO() - .load(profile.getId(), MLDB.OPT_LAST_SCRAPE) + .load(profile.getId(), Option.OPT_LAST_SCRAPE) .observe(this, opt -> { long lastUpdate = 0; if (opt != null) { @@ -592,7 +593,7 @@ public class MainActivity extends ProfileThemedActivity implements FabManager.Fa } } public void onStopTransactionRefreshClick(View view) { - Logger.debug("interactive", "Cancelling transactions refresh"); + Logger.debug(TAG, "Cancelling transactions refresh"); mainModel.stopTransactionsRetrieval(); b.transactionListCancelDownload.setEnabled(false); } @@ -615,14 +616,16 @@ public class MainActivity extends ProfileThemedActivity implements FabManager.Fa b.transactionProgressLayout.setVisibility(View.GONE); } } - public void onRetrieveProgress(RetrieveTransactionsTask.Progress progress) { - if (progress.getState() == RetrieveTransactionsTask.ProgressState.FINISHED) { - Logger.debug("progress", "Done"); + public void onRetrieveProgress(@Nullable RetrieveTransactionsTask.Progress progress) { + if (progress == null || + progress.getState() == RetrieveTransactionsTask.ProgressState.FINISHED) + { + Logger.debug(TAG, "progress: Done"); b.transactionProgressLayout.setVisibility(View.GONE); mainModel.transactionRetrievalDone(); - String error = progress.getError(); + String error = (progress == null) ? null : progress.getError(); if (error != null) { if (error.equals(RetrieveTransactionsTask.Result.ERR_JSON_PARSER_ERROR)) error = getResources().getString(R.string.err_json_parser_error); @@ -630,7 +633,7 @@ public class MainActivity extends ProfileThemedActivity implements FabManager.Fa AlertDialog.Builder builder = new AlertDialog.Builder(this); builder.setMessage(error); builder.setPositiveButton(R.string.btn_profile_options, (dialog, which) -> { - Logger.debug("error", "will start profile editor"); + Logger.debug(TAG, "will start profile editor"); ProfileDetailActivity.start(this, profile); }); builder.create() @@ -654,14 +657,15 @@ public class MainActivity extends ProfileThemedActivity implements FabManager.Fa if (progress.isIndeterminate() || (progress.getTotal() <= 0)) { b.transactionListProgressBar.setIndeterminate(true); - Logger.debug("progress", "indeterminate"); + Logger.debug(TAG, "progress: indeterminate"); } else { if (b.transactionListProgressBar.isIndeterminate()) { b.transactionListProgressBar.setIndeterminate(false); } -// Logger.debug("progress", -// String.format(Locale.US, "%d/%d", progress.getProgress(), progress.getTotal +// Logger.debug(TAG, +// String.format(Locale.US, "progress: %d/%d", progress.getProgress(), +// progress.getTotal // ())); b.transactionListProgressBar.setMax(progress.getTotal()); // for some reason animation doesn't work - no progress is shown (stick at 0) @@ -696,11 +700,10 @@ public class MainActivity extends ProfileThemedActivity implements FabManager.Fa @NotNull @Override public Fragment createFragment(int position) { - Logger.debug("main", - String.format(Locale.ENGLISH, "Switching to fragment %d", position)); + Logger.debug(TAG, String.format(Locale.ENGLISH, "Switching to fragment %d", position)); switch (position) { case 0: -// debug("flow", "Creating account summary fragment"); +// debug(TAG, "Creating account summary fragment"); return new AccountSummaryFragment(); case 1: return new TransactionListFragment();