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=cad021770fa25866bb17b1705a527606c0d30504;hp=28a1af842325996c663d993083c8b9f54620840b;hb=HEAD;hpb=fac0809065787fb473646db5770f4f2fae0d1e8f 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 28a1af84..e686d96f 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 @@ -34,12 +34,15 @@ import android.view.animation.AnimationUtils; import android.widget.TextView; import androidx.annotation.NonNull; +import androidx.annotation.Nullable; import androidx.appcompat.app.ActionBarDrawerToggle; import androidx.appcompat.app.AlertDialog; import androidx.core.view.GravityCompat; import androidx.drawerlayout.widget.DrawerLayout; import androidx.fragment.app.Fragment; import androidx.fragment.app.FragmentActivity; +import androidx.lifecycle.LiveData; +import androidx.lifecycle.MutableLiveData; import androidx.lifecycle.ViewModelProvider; import androidx.recyclerview.widget.LinearLayoutManager; import androidx.recyclerview.widget.RecyclerView; @@ -48,21 +51,28 @@ import androidx.viewpager2.widget.ViewPager2; import com.google.android.material.snackbar.Snackbar; +import net.ktnx.mobileledger.BackupsActivity; import net.ktnx.mobileledger.R; import net.ktnx.mobileledger.async.RetrieveTransactionsTask; +import net.ktnx.mobileledger.async.TransactionAccumulator; 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.db.TransactionWithAccounts; import net.ktnx.mobileledger.model.Data; -import net.ktnx.mobileledger.model.MobileLedgerProfile; +import net.ktnx.mobileledger.model.LedgerTransaction; import net.ktnx.mobileledger.ui.FabManager; import net.ktnx.mobileledger.ui.MainModel; import net.ktnx.mobileledger.ui.account_summary.AccountSummaryFragment; import net.ktnx.mobileledger.ui.new_transaction.NewTransactionActivity; +import net.ktnx.mobileledger.ui.profiles.ProfileDetailActivity; import net.ktnx.mobileledger.ui.profiles.ProfilesRecyclerViewAdapter; 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 net.ktnx.mobileledger.utils.Misc; import org.jetbrains.annotations.NotNull; @@ -77,11 +87,13 @@ 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"; private static final boolean FAB_HIDDEN = false; private static final boolean FAB_SHOWN = true; + private ConverterThread converterThread = null; private SectionsPagerAdapter mSectionsPagerAdapter; private ProfilesRecyclerViewAdapter mProfileListAdapter; private int mCurrentPage; @@ -89,7 +101,7 @@ public class MainActivity extends ProfileThemedActivity implements FabManager.Fa private DrawerLayout.SimpleDrawerListener drawerListener; private ActionBarDrawerToggle barDrawerToggle; private ViewPager2.OnPageChangeCallback pageChangeCallback; - private MobileLedgerProfile profile; + private Profile profile; private MainModel mainModel; private ActivityMainBinding b; private int fabVerticalOffset; @@ -98,7 +110,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); } @@ -130,9 +142,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()); @@ -150,12 +162,12 @@ public class MainActivity extends ProfileThemedActivity implements FabManager.Fa 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, b.drawerLayout, b.toolbar, - R.string.navigation_drawer_open, R.string.navigation_drawer_close); + barDrawerToggle = new ActionBarDrawerToggle(this, b.drawerLayout, b.toolbar, R.string.navigation_drawer_open, R.string.navigation_drawer_close); b.drawerLayout.addDrawerListener(barDrawerToggle); } barDrawerToggle.syncState(); @@ -164,8 +176,7 @@ public class MainActivity extends ProfileThemedActivity implements FabManager.Fa PackageInfo pi = getApplicationContext().getPackageManager() .getPackageInfo(getPackageName(), 0); ((TextView) b.navUpper.findViewById(R.id.drawer_version_text)).setText(pi.versionName); - ((TextView) b.noProfilesLayout.findViewById(R.id.drawer_version_text)).setText( - pi.versionName); + ((TextView) b.noProfilesLayout.findViewById(R.id.drawer_version_text)).setText(pi.versionName); } catch (Exception e) { e.printStackTrace(); @@ -174,6 +185,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() { @@ -188,8 +200,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); @@ -208,13 +219,12 @@ public class MainActivity extends ProfileThemedActivity implements FabManager.Fa .setValue(savedInstanceState.getString(STATE_ACC_FILTER, null)); } - b.btnNoProfilesAdd.setOnClickListener( - v -> MobileLedgerProfile.startEditProfileActivity(this, null)); + b.btnNoProfilesAdd.setOnClickListener(v -> ProfileDetailActivity.start(this, null)); + b.btnRestore.setOnClickListener(v -> BackupsActivity.start(this)); b.btnAddTransaction.setOnClickListener(this::fabNewTransactionClicked); - b.navNewProfileButton.setOnClickListener( - v -> MobileLedgerProfile.startEditProfileActivity(this, null)); + b.navNewProfileButton.setOnClickListener(v -> ProfileDetailActivity.start(this, null)); b.transactionListCancelDownload.setOnClickListener(this::onStopTransactionRefreshClick); @@ -261,10 +271,8 @@ public class MainActivity extends ProfileThemedActivity implements FabManager.Fa b.navProfileList.setLayoutManager(llm); b.navProfilesStartEdit.setOnClickListener((v) -> mProfileListAdapter.flipEditingProfiles()); - b.navProfilesCancelEdit.setOnClickListener( - (v) -> mProfileListAdapter.flipEditingProfiles()); - b.navProfileListHeadButtons.setOnClickListener( - (v) -> mProfileListAdapter.flipEditingProfiles()); + b.navProfilesCancelEdit.setOnClickListener((v) -> mProfileListAdapter.flipEditingProfiles()); + b.navProfileListHeadButtons.setOnClickListener((v) -> mProfileListAdapter.flipEditingProfiles()); if (drawerListener == null) { drawerListener = new DrawerLayout.SimpleDrawerListener() { @Override @@ -314,6 +322,11 @@ public class MainActivity extends ProfileThemedActivity implements FabManager.Fa b.navAccountSummary.setOnClickListener(this::onAccountSummaryClicked); b.navLatestTransactions.setOnClickListener(this::onLatestTransactionsClicked); b.navPatterns.setOnClickListener(this::onPatternsClick); + b.navBackupRestore.setOnClickListener(this::onBackupRestoreClick); + } + private void onBackupRestoreClick(View view) { + Intent intent = new Intent(this, BackupsActivity.class); + startActivity(intent); } private void onPatternsClick(View view) { Intent intent = new Intent(this, TemplatesActivity.class); @@ -332,18 +345,18 @@ public class MainActivity extends ProfileThemedActivity implements FabManager.Fa mainModel.scheduleTransactionListRetrieval(); } } - private void createShortcuts(List list) { + private void createShortcuts(@NotNull List list) { 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) { + for (Profile p : list) { if (shortcuts.size() >= sm.getMaxShortcutCountPerActivity()) break; - if (!p.isPostingPermitted()) + if (!p.permitPosting()) continue; final ShortcutInfo.Builder builder = @@ -356,7 +369,7 @@ public class MainActivity extends ProfileThemedActivity implements FabManager.Fa ProfileThemedActivity.PARAM_PROFILE_ID, p.getId()) .putExtra( ProfileThemedActivity.PARAM_THEME, - p.getThemeHue())) + p.getTheme())) .setRank(i) .build(); shortcuts.add(si); @@ -364,8 +377,10 @@ public class MainActivity extends ProfileThemedActivity implements FabManager.Fa } sm.setDynamicShortcuts(shortcuts); } - private void onProfileListChanged(List newList) { - if ((newList == null) || newList.isEmpty()) { + private void onProfileListChanged(@NotNull List newList) { + createShortcuts(newList); + + if (newList.isEmpty()) { b.noProfilesLayout.setVisibility(View.VISIBLE); b.mainAppLayout.setVisibility(View.GONE); return; @@ -378,35 +393,44 @@ public class MainActivity extends ProfileThemedActivity implements FabManager.Fa (int) (getResources().getDimension(R.dimen.thumb_row_height) * newList.size())); Logger.debug("profiles", "profile list changed"); - mProfileListAdapter.notifyDataSetChanged(); + mProfileListAdapter.setProfileList(newList); + + final Profile currentProfile = Data.getProfile(); + Profile replacementProfile = null; + if (currentProfile != null) { + for (Profile p : newList) { + if (p.getId() == currentProfile.getId()) { + replacementProfile = p; + break; + } + } + } - createShortcuts(newList); + if (replacementProfile == null) { + Logger.debug(TAG, "Switching profile because the current is no longer available"); + Data.setCurrentProfile(newList.get(0)); + } + else { + Data.setCurrentProfile(replacementProfile); + } } /** * 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)) + private void onProfileChanged(@Nullable Profile newProfile) { + if (this.profile != null) { + if (this.profile.equals(newProfile)) return; } - boolean haveProfile = profile != null; + boolean haveProfile = newProfile != null; if (haveProfile) - setTitle(profile.getName()); + setTitle(newProfile.getName()); else setTitle(R.string.app_name); - mainModel.setProfile(profile); - - this.profile = profile; - - int newProfileTheme = haveProfile ? profile.getThemeHue() : -1; + int newProfileTheme = haveProfile ? newProfile.getTheme() : Colors.DEFAULT_HUE_DEG; if (newProfileTheme != Colors.profileThemeId) { Logger.debug("profiles", String.format(Locale.ENGLISH, "profile theme %d → %d", Colors.profileThemeId, @@ -418,19 +442,18 @@ public class MainActivity extends ProfileThemedActivity implements FabManager.Fa return; } + final boolean sameProfileId = (newProfile != null) && (this.profile != null) && + this.profile.getId() == newProfile.getId(); + + this.profile = newProfile; + b.noProfilesLayout.setVisibility(haveProfile ? View.GONE : View.VISIBLE); b.pagerLayout.setVisibility(haveProfile ? View.VISIBLE : View.VISIBLE); mProfileListAdapter.notifyDataSetChanged(); - mainModel.clearAccounts(); - mainModel.clearTransactions(); - if (haveProfile) { - Logger.debug("transactions", "requesting list reload"); - mainModel.scheduleTransactionListReload(); - - if (profile.isPostingPermitted()) { + if (newProfile.permitPosting()) { b.toolbar.setSubtitle(null); b.btnAddTransaction.show(); } @@ -445,6 +468,47 @@ public class MainActivity extends ProfileThemedActivity implements FabManager.Fa } updateLastUpdateTextFromDB(); + + if (sameProfileId) { + Logger.debug(TAG, String.format(Locale.ROOT, "Short-cut profile 'changed' to %d", + newProfile.getId())); + return; + } + + mainModel.getAccountFilter() + .observe(this, this::onAccountFilterChanged); + + mainModel.stopTransactionsRetrieval(); + mainModel.clearTransactions(); + } + private void onAccountFilterChanged(String accFilter) { + Logger.debug(TAG, "account filter changed, reloading transactions"); +// mainModel.scheduleTransactionListReload(); + LiveData> transactions = + new MutableLiveData<>(new ArrayList<>()); + if (profile != null) { + if (accFilter == null || accFilter.isEmpty()) { + transactions = DB.get() + .getTransactionDAO() + .getAllWithAccounts(profile.getId()); + } + else { + transactions = DB.get() + .getTransactionDAO() + .getAllWithAccountsFiltered(profile.getId(), accFilter); + } + } + + transactions.observe(this, list -> { + Logger.debug(TAG, + String.format(Locale.ROOT, "got transaction list from DB (%d transactions)", + list.size())); + + if (converterThread != null) + converterThread.interrupt(); + converterThread = new ConverterThread(mainModel, list, accFilter); + converterThread.start(); + }); } private void profileThemeChanged() { // un-hook all observed LiveData @@ -454,13 +518,13 @@ 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) { Intent intent = new Intent(this, NewTransactionActivity.class); intent.putExtra(ProfileThemedActivity.PARAM_PROFILE_ID, profile.getId()); - intent.putExtra(ProfileThemedActivity.PARAM_THEME, profile.getThemeHue()); + intent.putExtra(ProfileThemedActivity.PARAM_THEME, profile.getTheme()); startActivity(intent); overridePendingTransition(R.anim.slide_in_up, R.anim.dummy); } @@ -512,7 +576,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(); @@ -523,18 +587,30 @@ public class MainActivity extends ProfileThemedActivity implements FabManager.Fa if (profile == null) return; - long lastUpdate = profile.getLongOption(MLDB.OPT_LAST_SCRAPE, 0L); - - Logger.debug("transactions", String.format(Locale.ENGLISH, "Last update = %d", lastUpdate)); - if (lastUpdate == 0) { - Data.lastUpdateDate.postValue(null); - } - else { - Data.lastUpdateDate.postValue(new Date(lastUpdate)); - } - - scheduleDataRetrievalIfStale(lastUpdate); - + DB.get() + .getOptionDAO() + .load(profile.getId(), Option.OPT_LAST_SCRAPE) + .observe(this, opt -> { + long lastUpdate = 0; + if (opt != null) { + try { + lastUpdate = Long.parseLong(opt.getValue()); + } + catch (NumberFormatException ex) { + Logger.debug(TAG, String.format("Error parsing '%s' as long", opt.getValue()), + ex); + } + } + + if (lastUpdate == 0) { + Data.lastUpdateDate.postValue(null); + } + else { + Data.lastUpdateDate.postValue(new Date(lastUpdate)); + } + + scheduleDataRetrievalIfStale(lastUpdate); + }); } private void refreshLastUpdateInfo() { final int formatFlags = DateUtils.FORMAT_SHOW_DATE | DateUtils.FORMAT_SHOW_YEAR | @@ -562,7 +638,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); } @@ -585,14 +661,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); @@ -600,8 +678,8 @@ 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"); - MobileLedgerProfile.startEditProfileActivity(this, profile); + Logger.debug(TAG, "will start profile editor"); + ProfileDetailActivity.start(this, profile); }); builder.create() .show(); @@ -624,14 +702,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) @@ -643,7 +722,7 @@ public class MainActivity extends ProfileThemedActivity implements FabManager.Fa } } public void fabShouldShow() { - if ((profile != null) && profile.isPostingPermitted() && !b.drawerLayout.isOpen()) + if ((profile != null) && profile.permitPosting() && !b.drawerLayout.isOpen()) fabManager.showFab(); } @Override @@ -666,11 +745,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(); @@ -685,4 +763,37 @@ public class MainActivity extends ProfileThemedActivity implements FabManager.Fa return 2; } } + + static private class ConverterThread extends Thread { + private final List list; + private final MainModel model; + private final String accFilter; + public ConverterThread(@NonNull MainModel model, + @NonNull List list, String accFilter) { + this.model = model; + this.list = list; + this.accFilter = accFilter; + } + @Override + public void run() { + TransactionAccumulator accumulator = new TransactionAccumulator(accFilter, accFilter); + + for (TransactionWithAccounts tr : list) { + if (isInterrupted()) { + Logger.debug(TAG, "ConverterThread bailing out on interrupt"); + return; + } + accumulator.put(new LedgerTransaction(tr)); + } + + if (isInterrupted()) { + Logger.debug(TAG, "ConverterThread bailing out on interrupt"); + return; + } + + Logger.debug(TAG, "ConverterThread publishing results"); + + Misc.onMainThread(() -> accumulator.publishResults(model)); + } + } }