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=3a210ef07720d04b9396e5b36d37ca504952e987;hb=HEAD;hpb=d08ab8235d0fd152c772b2dd5ffa1ca5747f67b1 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 3a210ef0..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 @@ -1,5 +1,5 @@ /* - * Copyright © 2020 Damyan Ivanov. + * Copyright © 2021 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 @@ -17,180 +17,166 @@ package net.ktnx.mobileledger.ui.activity; +import android.content.Context; import android.content.Intent; -import android.content.SharedPreferences; import android.content.pm.PackageInfo; import android.content.pm.ShortcutInfo; 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.text.format.DateUtils; import android.util.Log; import android.view.View; -import android.view.ViewGroup; import android.view.animation.AnimationUtils; -import android.widget.LinearLayout; -import android.widget.ProgressBar; import android.widget.TextView; import androidx.annotation.NonNull; +import androidx.annotation.Nullable; import androidx.appcompat.app.ActionBarDrawerToggle; -import androidx.appcompat.widget.Toolbar; +import androidx.appcompat.app.AlertDialog; 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.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; -import androidx.viewpager.widget.ViewPager; +import androidx.viewpager2.adapter.FragmentStateAdapter; +import androidx.viewpager2.widget.ViewPager2; -import com.google.android.material.floatingactionbutton.FloatingActionButton; import com.google.android.material.snackbar.Snackbar; +import net.ktnx.mobileledger.BackupsActivity; import net.ktnx.mobileledger.R; -import net.ktnx.mobileledger.async.RefreshDescriptionsTask; 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.LedgerAccount; -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.profiles.ProfileDetailFragment; +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.ui.transaction_list.TransactionListViewModel; import net.ktnx.mobileledger.utils.Colors; -import net.ktnx.mobileledger.utils.GetOptCallback; import net.ktnx.mobileledger.utils.Logger; -import net.ktnx.mobileledger.utils.MLDB; +import net.ktnx.mobileledger.utils.Misc; import org.jetbrains.annotations.NotNull; -import java.text.DateFormat; import java.util.ArrayList; import java.util.Date; import java.util.List; import java.util.Locale; - -import static net.ktnx.mobileledger.utils.Logger.debug; +import java.util.Objects; /* * TODO: reports * */ -public class MainActivity extends ProfileThemedActivity { +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 String PREF_THEME_ID = "themeId"; - DrawerLayout drawer; - private View profileListHeadMore, profileListHeadCancel, profileListHeadAddProfile; - private View bTransactionListCancelDownload; + private static final boolean FAB_HIDDEN = false; + private static final boolean FAB_SHOWN = true; + private ConverterThread converterThread = null; private SectionsPagerAdapter mSectionsPagerAdapter; - private ViewPager mViewPager; - private FloatingActionButton fab; private ProfilesRecyclerViewAdapter mProfileListAdapter; private int mCurrentPage; private boolean mBackMeansToAccountList = false; - private Toolbar mToolbar; private DrawerLayout.SimpleDrawerListener drawerListener; private ActionBarDrawerToggle barDrawerToggle; - private ViewPager.SimpleOnPageChangeListener pageChangeListener; - private MobileLedgerProfile profile; + private ViewPager2.OnPageChangeCallback pageChangeCallback; + private Profile profile; + private MainModel mainModel; + private ActivityMainBinding b; + private int fabVerticalOffset; + private FabManager fabManager; @Override protected void onStart() { super.onStart(); - Logger.debug("MainActivity", "onStart()"); + Logger.debug(TAG, "onStart()"); - mViewPager.setCurrentItem(mCurrentPage, false); + b.mainPager.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()); + outState.putInt(STATE_CURRENT_PAGE, b.mainPager.getCurrentItem()); + 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); + b.navProfileList.setAdapter(null); + b.drawerLayout.removeDrawerListener(drawerListener); drawerListener = null; - if (drawer != null) - drawer.removeDrawerListener(barDrawerToggle); + b.drawerLayout.removeDrawerListener(barDrawerToggle); barDrawerToggle = null; - if (mViewPager != null) - mViewPager.removeOnPageChangeListener(pageChangeListener); - pageChangeListener = null; + b.mainPager.unregisterOnPageChangeCallback(pageChangeCallback); + pageChangeCallback = null; super.onDestroy(); } @Override - protected void setupProfileColors() { - SharedPreferences prefs = getPreferences(MODE_PRIVATE); - int profileColor = prefs.getInt(PREF_THEME_ID, -2); - if (profileColor == -2) - profileColor = Data.retrieveCurrentThemeIdFromDb(); - Colors.setupTheme(this, profileColor); - Colors.profileThemeId = profileColor; - storeThemeIdInPrefs(profileColor); - } - @Override protected void onResume() { super.onResume(); fabShouldShow(); } @Override protected void onCreate(Bundle savedInstanceState) { - debug("MainActivity", "onCreate()/entry"); + Logger.debug(TAG, "onCreate()/entry"); super.onCreate(savedInstanceState); - debug("MainActivity", "onCreate()/after super"); - setContentView(R.layout.activity_main); - - fab = findViewById(R.id.btn_add_transaction); - profileListHeadMore = findViewById(R.id.nav_profiles_start_edit); - profileListHeadCancel = findViewById(R.id.nav_profiles_cancel_edit); - LinearLayout profileListHeadMoreAndCancel = - findViewById(R.id.nav_profile_list_head_buttons); - profileListHeadAddProfile = findViewById(R.id.nav_new_profile_button); - drawer = findViewById(R.id.drawer_layout); - bTransactionListCancelDownload = findViewById(R.id.transaction_list_cancel_download); - mSectionsPagerAdapter = new SectionsPagerAdapter(getSupportFragmentManager()); - mViewPager = findViewById(R.id.root_frame); + Logger.debug(TAG, "onCreate()/after super"); + b = ActivityMainBinding.inflate(getLayoutInflater()); + setContentView(b.getRoot()); + + mainModel = new ViewModelProvider(this).get(MainModel.class); + + mSectionsPagerAdapter = new SectionsPagerAdapter(this); Bundle extra = getIntent().getBundleExtra(BUNDLE_SAVED_STATE); if (extra != null && savedInstanceState == null) savedInstanceState = extra; - mToolbar = findViewById(R.id.toolbar); - setSupportActionBar(mToolbar); + setSupportActionBar(b.toolbar); - 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, - R.string.navigation_drawer_open, R.string.navigation_drawer_close); - drawer.addDrawerListener(barDrawerToggle); + barDrawerToggle = new ActionBarDrawerToggle(this, b.drawerLayout, b.toolbar, R.string.navigation_drawer_open, R.string.navigation_drawer_close); + b.drawerLayout.addDrawerListener(barDrawerToggle); } barDrawerToggle.syncState(); try { 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); + ((TextView) b.navUpper.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(); @@ -198,10 +184,11 @@ public class MainActivity extends ProfileThemedActivity { markDrawerItemCurrent(R.id.nav_account_summary); - mViewPager.setAdapter(mSectionsPagerAdapter); + b.mainPager.setAdapter(mSectionsPagerAdapter); + b.mainPager.setOffscreenPageLimit(1); - if (pageChangeListener == null) { - pageChangeListener = new ViewPager.SimpleOnPageChangeListener() { + if (pageChangeCallback == null) { + pageChangeCallback = new ViewPager2.OnPageChangeCallback() { @Override public void onPageSelected(int position) { mCurrentPage = position; @@ -213,14 +200,13 @@ public class MainActivity extends ProfileThemedActivity { 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); } }; - mViewPager.addOnPageChangeListener(pageChangeListener); + b.mainPager.registerOnPageChangeCallback(pageChangeCallback); } mCurrentPage = 0; @@ -229,51 +215,47 @@ 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); - - findViewById(R.id.btn_no_profiles_add).setOnClickListener( - v -> startEditProfileActivity(null)); + b.btnNoProfilesAdd.setOnClickListener(v -> ProfileDetailActivity.start(this, null)); + b.btnRestore.setOnClickListener(v -> BackupsActivity.start(this)); - findViewById(R.id.btn_add_transaction).setOnClickListener(this::fabNewTransactionClicked); + b.btnAddTransaction.setOnClickListener(this::fabNewTransactionClicked); - findViewById(R.id.nav_new_profile_button).setOnClickListener( - v -> startEditProfileActivity(null)); + b.navNewProfileButton.setOnClickListener(v -> ProfileDetailActivity.start(this, null)); - RecyclerView root = findViewById(R.id.nav_profile_list); - if (root == null) - throw new RuntimeException("Can't get hold on the transaction value view"); + b.transactionListCancelDownload.setOnClickListener(this::onStopTransactionRefreshClick); if (mProfileListAdapter == null) mProfileListAdapter = new ProfilesRecyclerViewAdapter(); - root.setAdapter(mProfileListAdapter); + b.navProfileList.setAdapter(mProfileListAdapter); mProfileListAdapter.editingProfiles.observe(this, newValue -> { if (newValue) { - profileListHeadMore.setVisibility(View.GONE); - profileListHeadCancel.setVisibility(View.VISIBLE); - profileListHeadAddProfile.setVisibility(View.VISIBLE); - if (drawer.isDrawerOpen(GravityCompat.START)) { - profileListHeadMore.startAnimation( + b.navProfilesStartEdit.setVisibility(View.GONE); + b.navProfilesCancelEdit.setVisibility(View.VISIBLE); + b.navNewProfileButton.setVisibility(View.VISIBLE); + if (b.drawerLayout.isDrawerOpen(GravityCompat.START)) { + b.navProfilesStartEdit.startAnimation( AnimationUtils.loadAnimation(MainActivity.this, R.anim.fade_out)); - profileListHeadCancel.startAnimation( + b.navProfilesCancelEdit.startAnimation( AnimationUtils.loadAnimation(MainActivity.this, R.anim.fade_in)); - profileListHeadAddProfile.startAnimation( + b.navNewProfileButton.startAnimation( AnimationUtils.loadAnimation(MainActivity.this, R.anim.fade_in)); } } else { - profileListHeadCancel.setVisibility(View.GONE); - profileListHeadMore.setVisibility(View.VISIBLE); - profileListHeadAddProfile.setVisibility(View.GONE); - if (drawer.isDrawerOpen(GravityCompat.START)) { - profileListHeadCancel.startAnimation( + b.navProfilesCancelEdit.setVisibility(View.GONE); + b.navProfilesStartEdit.setVisibility(View.VISIBLE); + b.navNewProfileButton.setVisibility(View.GONE); + if (b.drawerLayout.isDrawerOpen(GravityCompat.START)) { + b.navProfilesCancelEdit.startAnimation( AnimationUtils.loadAnimation(MainActivity.this, R.anim.fade_out)); - profileListHeadMore.startAnimation( + b.navProfilesStartEdit.startAnimation( AnimationUtils.loadAnimation(MainActivity.this, R.anim.fade_in)); - profileListHeadAddProfile.startAnimation( + b.navNewProfileButton.startAnimation( AnimationUtils.loadAnimation(MainActivity.this, R.anim.fade_out)); } } @@ -281,21 +263,22 @@ public class MainActivity extends ProfileThemedActivity { mProfileListAdapter.notifyDataSetChanged(); }); + fabManager = new FabManager(b.btnAddTransaction); + LinearLayoutManager llm = new LinearLayoutManager(this); llm.setOrientation(RecyclerView.VERTICAL); - root.setLayoutManager(llm); + b.navProfileList.setLayoutManager(llm); - profileListHeadMore.setOnClickListener((v) -> mProfileListAdapter.flipEditingProfiles()); - profileListHeadCancel.setOnClickListener((v) -> mProfileListAdapter.flipEditingProfiles()); - profileListHeadMoreAndCancel.setOnClickListener( - (v) -> mProfileListAdapter.flipEditingProfiles()); + b.navProfilesStartEdit.setOnClickListener((v) -> mProfileListAdapter.flipEditingProfiles()); + b.navProfilesCancelEdit.setOnClickListener((v) -> mProfileListAdapter.flipEditingProfiles()); + b.navProfileListHeadButtons.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(); + fabManager.hideFab(); } @Override public void onDrawerClosed(View drawerView) { @@ -310,54 +293,83 @@ public class MainActivity extends ProfileThemedActivity { super.onDrawerOpened(drawerView); mProfileListAdapter.setAnimationsEnabled(true); Data.drawerOpen.setValue(true); - fabHide(); + fabManager.hideFab(); } }; - drawer.addDrawerListener(drawerListener); + b.drawerLayout.addDrawerListener(drawerListener); } Data.drawerOpen.observe(this, open -> { if (open) - drawer.open(); + b.drawerLayout.open(); else - drawer.close(); + b.drawerLayout.close(); }); + + mainModel.getUpdateError() + .observe(this, (error) -> { + if (error == null) + return; + + Snackbar.make(b.mainPager, error, Snackbar.LENGTH_INDEFINITE) + .show(); + mainModel.clearUpdateError(); + }); + Data.locale.observe(this, l -> refreshLastUpdateInfo()); + Data.lastUpdateDate.observe(this, date -> refreshLastUpdateInfo()); + Data.lastUpdateTransactionCount.observe(this, date -> refreshLastUpdateInfo()); + Data.lastUpdateAccountCount.observe(this, date -> refreshLastUpdateInfo()); + 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 scheduleDataRetrievalIfStale(Date lastUpdate) { + private void onPatternsClick(View view) { + Intent intent = new Intent(this, TemplatesActivity.class); + startActivity(intent); + } + 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"); + if ((lastUpdate == 0) || (now > (lastUpdate + (24 * 3600 * 1000)))) { + if (lastUpdate == 0) + Logger.debug("db::", "WEB data never fetched. scheduling a fetch"); else - debug("db", String.format(Locale.ENGLISH, + Logger.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)); + lastUpdate / 1000f, now / 1000f)); - Data.scheduleTransactionListRetrieval(this); + 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 = - new ShortcutInfo.Builder(this, "new_transaction_" + p.getUuid()); + new ShortcutInfo.Builder(this, "new_transaction_" + p.getId()); 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())) + NewTransactionActivity.class).putExtra( + ProfileThemedActivity.PARAM_PROFILE_ID, p.getId()) + .putExtra( + ProfileThemedActivity.PARAM_THEME, + p.getTheme())) .setRank(i) .build(); shortcuts.add(si); @@ -365,44 +377,62 @@ public class MainActivity extends ProfileThemedActivity { } sm.setDynamicShortcuts(shortcuts); } - private void onProfileListChanged(List newList) { - if ((newList == null) || newList.isEmpty()) { - findViewById(R.id.no_profiles_layout).setVisibility(View.VISIBLE); - findViewById(R.id.main_app_layout).setVisibility(View.GONE); + private void onProfileListChanged(@NotNull List newList) { + createShortcuts(newList); + + if (newList.isEmpty()) { + b.noProfilesLayout.setVisibility(View.VISIBLE); + b.mainAppLayout.setVisibility(View.GONE); return; } - findViewById(R.id.main_app_layout).setVisibility(View.VISIBLE); - findViewById(R.id.no_profiles_layout).setVisibility(View.GONE); + b.mainAppLayout.setVisibility(View.VISIBLE); + b.noProfilesLayout.setVisibility(View.GONE); - findViewById(R.id.nav_profile_list).setMinimumHeight( + b.navProfileList.setMinimumHeight( (int) (getResources().getDimension(R.dimen.thumb_row_height) * newList.size())); - debug("profiles", "profile list changed"); - mProfileListAdapter.notifyDataSetChanged(); + Logger.debug("profiles", "profile list changed"); + mProfileListAdapter.setProfileList(newList); - createShortcuts(newList); + final Profile currentProfile = Data.getProfile(); + Profile replacementProfile = null; + if (currentProfile != null) { + for (Profile p : newList) { + if (p.getId() == currentProfile.getId()) { + replacementProfile = p; + break; + } + } + } + + 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) { - boolean haveProfile = profile != null; + private void onProfileChanged(@Nullable Profile newProfile) { + if (this.profile != null) { + if (this.profile.equals(newProfile)) + return; + } + + boolean haveProfile = newProfile != null; if (haveProfile) - setTitle(profile.getName()); + setTitle(newProfile.getName()); else setTitle(R.string.app_name); - if (this.profile != null) - this.profile.getAccounts() - .removeObservers(this); - - this.profile = profile; - - int newProfileTheme = haveProfile ? profile.getThemeHue() : -1; + int newProfileTheme = haveProfile ? newProfile.getTheme() : Colors.DEFAULT_HUE_DEG; if (newProfileTheme != Colors.profileThemeId) { - debug("profiles", + Logger.debug("profiles", String.format(Locale.ENGLISH, "profile theme %d → %d", Colors.profileThemeId, newProfileTheme)); Colors.profileThemeId = newProfileTheme; @@ -412,124 +442,122 @@ public class MainActivity extends ProfileThemedActivity { return; } - findViewById(R.id.no_profiles_layout).setVisibility(haveProfile ? View.GONE : View.VISIBLE); - findViewById(R.id.pager_layout).setVisibility(haveProfile ? View.VISIBLE : View.VISIBLE); + final boolean sameProfileId = (newProfile != null) && (this.profile != null) && + this.profile.getId() == newProfile.getId(); - mProfileListAdapter.notifyDataSetChanged(); + this.profile = newProfile; - Data.transactions.clear(); - debug("transactions", "requesting list reload"); - TransactionListViewModel.scheduleTransactionListReload(); + b.noProfilesLayout.setVisibility(haveProfile ? View.GONE : View.VISIBLE); + b.pagerLayout.setVisibility(haveProfile ? View.VISIBLE : View.VISIBLE); - if (haveProfile) { - profile.scheduleAccountListReload(); + mProfileListAdapter.notifyDataSetChanged(); - if (profile.isPostingPermitted()) { - mToolbar.setSubtitle(null); - fab.show(); + if (haveProfile) { + if (newProfile.permitPosting()) { + b.toolbar.setSubtitle(null); + b.btnAddTransaction.show(); } else { - mToolbar.setSubtitle(R.string.profile_subtitle_read_only); - fab.hide(); + b.toolbar.setSubtitle(R.string.profile_subtitle_read_only); + b.btnAddTransaction.hide(); } } else { - mToolbar.setSubtitle(null); - fab.hide(); + b.toolbar.setSubtitle(null); + b.btnAddTransaction.hide(); } updateLastUpdateTextFromDB(); - } - private void updateLastUpdateDisplay(Date newValue) { - LinearLayout l = findViewById(R.id.transactions_last_update_layout); - TextView v = findViewById(R.id.transactions_last_update); - if (newValue == null) { - l.setVisibility(View.INVISIBLE); - debug("main", "no last update date :("); + + if (sameProfileId) { + Logger.debug(TAG, String.format(Locale.ROOT, "Short-cut profile 'changed' to %d", + newProfile.getId())); + return; } - else { - final String text = DateFormat.getDateTimeInstance() - .format(newValue); - v.setText(text); - l.setVisibility(View.VISIBLE); - debug("main", String.format("Date formatted: %s", text)); + + 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); + } } - scheduleDataRetrievalIfStale(newValue); + 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() { - storeThemeIdInPrefs(profile.getThemeHue()); - // un-hook all observed LiveData - Data.profile.removeObservers(this); + Data.removeProfileObservers(this); Data.profiles.removeObservers(this); + Data.lastUpdateTransactionCount.removeObservers(this); + Data.lastUpdateAccountCount.removeObservers(this); Data.lastUpdateDate.removeObservers(this); + Logger.debug(TAG, "profileThemeChanged(): recreating activity"); recreate(); } - private void storeThemeIdInPrefs(int themeId) { - // store the new theme id in the preferences - SharedPreferences prefs = getPreferences(MODE_PRIVATE); - SharedPreferences.Editor e = prefs.edit(); - e.putInt(PREF_THEME_ID, themeId); - e.apply(); - } - public void startEditProfileActivity(MobileLedgerProfile profile) { - Intent intent = new Intent(this, ProfileDetailActivity.class); - Bundle args = new Bundle(); - if (profile != null) { - int index = Data.getProfileIndex(profile); - 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); + intent.putExtra(ProfileThemedActivity.PARAM_PROFILE_ID, profile.getId()); + intent.putExtra(ProfileThemedActivity.PARAM_THEME, profile.getTheme()); startActivity(intent); overridePendingTransition(R.anim.slide_in_up, R.anim.dummy); } public void markDrawerItemCurrent(int id) { - TextView item = drawer.findViewById(id); + TextView item = b.drawerLayout.findViewById(id); item.setBackgroundColor(Colors.tableRowDarkBG); - LinearLayout actions = drawer.findViewById(R.id.nav_actions); - for (int i = 0; i < actions.getChildCount(); i++) { - View view = actions.getChildAt(i); + for (int i = 0; i < b.navActions.getChildCount(); i++) { + View view = b.navActions.getChildAt(i); if (view.getId() != id) { view.setBackgroundColor(Color.TRANSPARENT); } } } public void onAccountSummaryClicked(View view) { - drawer.closeDrawers(); + b.drawerLayout.closeDrawers(); showAccountSummaryFragment(); } private void showAccountSummaryFragment() { - mViewPager.setCurrentItem(0, true); - Data.accountFilter.setValue(null); + b.mainPager.setCurrentItem(0, true); + mainModel.getAccountFilter() + .setValue(null); } public void onLatestTransactionsClicked(View view) { - drawer.closeDrawers(); + b.drawerLayout.closeDrawers(); - showTransactionsFragment((String) null); + showTransactionsFragment(null); } public void showTransactionsFragment(String accName) { - Data.accountFilter.setValue(accName); - mViewPager.setCurrentItem(1, true); + mainModel.getAccountFilter() + .setValue(accName); + b.mainPager.setCurrentItem(1, true); } public void showAccountTransactions(String accountName) { mBackMeansToAccountList = true; @@ -537,18 +565,18 @@ public class MainActivity extends ProfileThemedActivity { } @Override public void onBackPressed() { - DrawerLayout drawer = findViewById(R.id.drawer_layout); - if (drawer.isDrawerOpen(GravityCompat.START)) { - drawer.closeDrawer(GravityCompat.START); + if (b.drawerLayout.isDrawerOpen(GravityCompat.START)) { + b.drawerLayout.closeDrawer(GravityCompat.START); } else { - if (mBackMeansToAccountList && (mViewPager.getCurrentItem() == 1)) { - Data.accountFilter.setValue(null); + if (mBackMeansToAccountList && (b.mainPager.getCurrentItem() == 1)) { + mainModel.getAccountFilter() + .setValue(null); showAccountSummaryFragment(); mBackMeansToAccountList = false; } else { - debug("fragments", String.format(Locale.ENGLISH, "manager stack: %d", + Logger.debug(TAG, String.format(Locale.ENGLISH, "manager stack: %d", getSupportFragmentManager().getBackStackEntryCount())); super.onBackPressed(); @@ -559,119 +587,168 @@ public class MainActivity extends ProfileThemedActivity { 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)); - if (last_update == 0) { - Data.lastUpdateDate.postValue(null); + 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 | + DateUtils.FORMAT_SHOW_TIME | DateUtils.FORMAT_NUMERIC_DATE; + String templateForTransactions = + getResources().getString(R.string.transaction_count_summary); + String templateForAccounts = getResources().getString(R.string.account_count_summary); + Integer accountCount = Data.lastUpdateAccountCount.getValue(); + Integer transactionCount = Data.lastUpdateTransactionCount.getValue(); + Date lastUpdate = Data.lastUpdateDate.getValue(); + if (lastUpdate == null) { + Data.lastTransactionsUpdateText.setValue("----"); + Data.lastAccountsUpdateText.setValue("----"); } else { - Data.lastUpdateDate.postValue(new Date(last_update)); + Data.lastTransactionsUpdateText.setValue( + String.format(Objects.requireNonNull(Data.locale.getValue()), + templateForTransactions, + transactionCount == null ? 0 : transactionCount, + DateUtils.formatDateTime(this, lastUpdate.getTime(), formatFlags))); + Data.lastAccountsUpdateText.setValue( + String.format(Objects.requireNonNull(Data.locale.getValue()), + templateForAccounts, accountCount == null ? 0 : accountCount, + DateUtils.formatDateTime(this, lastUpdate.getTime(), formatFlags))); } } public void onStopTransactionRefreshClick(View view) { - debug("interactive", "Cancelling transactions refresh"); - Data.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(); + Logger.debug(TAG, "Cancelling transactions refresh"); + mainModel.stopTransactionsRetrieval(); + b.transactionListCancelDownload.setEnabled(false); + } + public void onRetrieveRunningChanged(Boolean running) { + if (running) { + b.transactionListCancelDownload.setEnabled(true); + ColorStateList csl = Colors.getColorStateList(); + b.transactionListProgressBar.setIndeterminateTintList(csl); + b.transactionListProgressBar.setProgressTintList(csl); + b.transactionListProgressBar.setIndeterminate(true); + if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) { + b.transactionListProgressBar.setProgress(0, false); + } + else { + b.transactionListProgressBar.setProgress(0); + } + b.transactionProgressLayout.setVisibility(View.VISIBLE); + } + else { + b.transactionProgressLayout.setVisibility(View.GONE); } - else - Snackbar.make(mViewPager, error, Snackbar.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); - 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)) + public void onRetrieveProgress(@Nullable RetrieveTransactionsTask.Progress progress) { + if (progress == null || + progress.getState() == RetrieveTransactionsTask.ProgressState.FINISHED) { - progressBar.setIndeterminate(true); + Logger.debug(TAG, "progress: Done"); + b.transactionProgressLayout.setVisibility(View.GONE); + + mainModel.transactionRetrievalDone(); + + 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); + + AlertDialog.Builder builder = new AlertDialog.Builder(this); + builder.setMessage(error); + builder.setPositiveButton(R.string.btn_profile_options, (dialog, which) -> { + Logger.debug(TAG, "will start profile editor"); + ProfileDetailActivity.start(this, profile); + }); + builder.create() + .show(); + return; + } + + return; + } + + + b.transactionListCancelDownload.setEnabled(true); +// 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); + b.transactionProgressLayout.setVisibility(View.VISIBLE); + + if (progress.isIndeterminate() || (progress.getTotal() <= 0)) { + b.transactionListProgressBar.setIndeterminate(true); + Logger.debug(TAG, "progress: indeterminate"); } else { - if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) { - progressBar.setMin(0); - } - progressBar.setMax(progress.getTotal()); - if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) { - progressBar.setProgress(progress.getProgress(), true); + if (b.transactionListProgressBar.isIndeterminate()) { + b.transactionListProgressBar.setIndeterminate(false); } +// 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) + // on lineageOS 14.1 (Nougat, 7.1.2) + if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) + b.transactionListProgressBar.setProgress(progress.getProgress(), false); else - progressBar.setProgress(progress.getProgress()); - progressBar.setIndeterminate(false); + b.transactionListProgressBar.setProgress(progress.getProgress()); } } public void fabShouldShow() { - if ((profile != null) && profile.isPostingPermitted() && !drawer.isOpen()) - fab.show(); - else - fabHide(); - } - public void fabHide() { - fab.hide(); - } - public void onAccountSummaryRowViewClicked(View view) { - ViewGroup row; - switch (view.getId()) { - case R.id.account_expander: - row = (ViewGroup) view.getParent() - .getParent() - .getParent(); - break; - case R.id.account_expander_container: - case R.id.account_row_acc_name: - row = (ViewGroup) view.getParent() - .getParent(); - break; - default: - row = (ViewGroup) view.getParent(); - break; - } - - 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: - break; - case R.id.account_row_acc_amounts: - break; - } + if ((profile != null) && profile.permitPosting() && !b.drawerLayout.isOpen()) + fabManager.showFab(); } + @Override + public Context getContext() { + return this; + } + @Override + public void showManagedFab() { + fabShouldShow(); + } + @Override + public void hideManagedFab() { + fabManager.hideFab(); + } + public static class SectionsPagerAdapter extends FragmentStateAdapter { - public class SectionsPagerAdapter extends FragmentPagerAdapter { - - SectionsPagerAdapter(FragmentManager fm) { - super(fm, BEHAVIOR_RESUME_ONLY_CURRENT_FRAGMENT); + public SectionsPagerAdapter(@NonNull FragmentActivity fragmentActivity) { + super(fragmentActivity); } - @NotNull @Override - public Fragment getItem(int position) { - debug("main", String.format(Locale.ENGLISH, "Switching to fragment %d", position)); + public Fragment createFragment(int 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(); @@ -682,8 +759,41 @@ public class MainActivity extends ProfileThemedActivity { } @Override - public int getCount() { + public int getItemCount() { 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)); + } + } }