X-Git-Url: https://git.ktnx.net/?a=blobdiff_plain;f=app%2Fsrc%2Fmain%2Fjava%2Fnet%2Fktnx%2Fmobileledger%2Fui%2Factivity%2FMainActivity.java;h=945e81c51043d0865a80d0d83bb4344b1d22681d;hb=5df10dc0b58df4d4be4e9ab34f1e0f477ca46766;hp=da86d3ae1402c2f503a8e8bdd78ba386053aa73c;hpb=7d007e4633d4b2192230da39bfdb486707d08832;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 da86d3ae..945e81c5 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 @@ -17,9 +17,7 @@ package net.ktnx.mobileledger.ui.activity; -import android.animation.Animator; -import android.animation.AnimatorListenerAdapter; -import android.animation.TimeInterpolator; +import android.content.Context; import android.content.Intent; import android.content.pm.PackageInfo; import android.content.pm.ShortcutInfo; @@ -32,11 +30,11 @@ import android.os.Bundle; import android.text.format.DateUtils; import android.util.Log; import android.view.View; -import android.view.ViewPropertyAnimator; 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; @@ -54,11 +52,14 @@ import com.google.android.material.snackbar.Snackbar; 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.Profile; import net.ktnx.mobileledger.model.Data; -import net.ktnx.mobileledger.model.MobileLedgerProfile; +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; @@ -78,7 +79,7 @@ import java.util.Objects; * TODO: reports * */ -public class MainActivity extends ProfileThemedActivity { +public class MainActivity extends ProfileThemedActivity implements FabManager.FabHandler { 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"; @@ -91,12 +92,11 @@ public class MainActivity extends ProfileThemedActivity { 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; - private ViewPropertyAnimator fabSlideAnimator; - private boolean wantedFabState = FAB_SHOWN; + private FabManager fabManager; @Override protected void onStart() { super.onStart(); @@ -153,6 +153,7 @@ public class MainActivity extends ProfileThemedActivity { Data.observeProfile(this, this::onProfileChanged); Data.profiles.observe(this, this::onProfileListChanged); + Data.backgroundTaskProgress.observe(this, this::onRetrieveProgress); Data.backgroundTasksRunning.observe(this, this::onRetrieveRunningChanged); @@ -211,13 +212,11 @@ public class MainActivity extends ProfileThemedActivity { .setValue(savedInstanceState.getString(STATE_ACC_FILTER, null)); } - b.btnNoProfilesAdd.setOnClickListener( - v -> MobileLedgerProfile.startEditProfileActivity(this, null)); + b.btnNoProfilesAdd.setOnClickListener(v -> ProfileDetailActivity.start(this, null)); 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); @@ -256,6 +255,8 @@ public class MainActivity extends ProfileThemedActivity { mProfileListAdapter.notifyDataSetChanged(); }); + fabManager = new FabManager(b.btnAddTransaction); + LinearLayoutManager llm = new LinearLayoutManager(this); llm.setOrientation(RecyclerView.VERTICAL); @@ -271,7 +272,7 @@ public class MainActivity extends ProfileThemedActivity { @Override public void onDrawerSlide(@NonNull View drawerView, float slideOffset) { if (slideOffset > 0.2) - fabHide(); + fabManager.hideFab(); } @Override public void onDrawerClosed(View drawerView) { @@ -286,7 +287,7 @@ public class MainActivity extends ProfileThemedActivity { super.onDrawerOpened(drawerView); mProfileListAdapter.setAnimationsEnabled(true); Data.drawerOpen.setValue(true); - fabHide(); + fabManager.hideFab(); } }; b.drawerLayout.addDrawerListener(drawerListener); @@ -333,28 +334,31 @@ public class MainActivity extends ProfileThemedActivity { mainModel.scheduleTransactionListRetrieval(); } } - private void createShortcuts(List list) { + private void createShortcuts(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); @@ -362,7 +366,7 @@ public class MainActivity extends ProfileThemedActivity { } sm.setDynamicShortcuts(shortcuts); } - private void onProfileListChanged(List newList) { + private void onProfileListChanged(List newList) { if ((newList == null) || newList.isEmpty()) { b.noProfilesLayout.setVisibility(View.VISIBLE); b.mainAppLayout.setVisibility(View.GONE); @@ -376,35 +380,31 @@ public class MainActivity extends ProfileThemedActivity { (int) (getResources().getDimension(R.dimen.thumb_row_height) * newList.size())); Logger.debug("profiles", "profile list changed"); - mProfileListAdapter.notifyDataSetChanged(); + mProfileListAdapter.setProfileList(newList); createShortcuts(newList); } /** * called when the current profile has changed */ - private void onProfileChanged(MobileLedgerProfile profile) { + private void onProfileChanged(@Nullable Profile newProfile) { if (this.profile == null) { - if (profile == null) + if (newProfile == null) return; } else { - if (this.profile.equals(profile)) + 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() : -1; if (newProfileTheme != Colors.profileThemeId) { Logger.debug("profiles", String.format(Locale.ENGLISH, "profile theme %d → %d", Colors.profileThemeId, @@ -416,20 +416,18 @@ public class MainActivity extends ProfileThemedActivity { 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) { - mainModel.scheduleAccountListReload(); - Logger.debug("transactions", "requesting list reload"); - mainModel.scheduleTransactionListReload(); - - if (profile.isPostingPermitted()) { + if (newProfile.permitPosting()) { b.toolbar.setSubtitle(null); b.btnAddTransaction.show(); } @@ -444,6 +442,21 @@ public class MainActivity extends ProfileThemedActivity { } updateLastUpdateTextFromDB(); + + if (sameProfileId) { + Logger.debug(TAG, String.format(Locale.ROOT, "Short-cut profile 'changed' to %d", + newProfile.getId())); + return; + } + + mainModel.stopTransactionsRetrieval(); + + mainModel.clearTransactions(); + + if (haveProfile) { + Logger.debug("transactions", "requesting list reload"); + mainModel.scheduleTransactionListReload(); + } } private void profileThemeChanged() { // un-hook all observed LiveData @@ -453,10 +466,13 @@ public class MainActivity extends ProfileThemedActivity { Data.lastUpdateAccountCount.removeObservers(this); Data.lastUpdateDate.removeObservers(this); + Logger.debug("MainActivity", "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.getTheme()); startActivity(intent); overridePendingTransition(R.anim.slide_in_up, R.anim.dummy); } @@ -519,18 +535,30 @@ public class MainActivity extends ProfileThemedActivity { 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(), MLDB.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 | @@ -542,16 +570,16 @@ public class MainActivity extends ProfileThemedActivity { Integer transactionCount = Data.lastUpdateTransactionCount.getValue(); Date lastUpdate = Data.lastUpdateDate.getValue(); if (lastUpdate == null) { - Data.lastTransactionsUpdateText.set("----"); - Data.lastAccountsUpdateText.set("----"); + Data.lastTransactionsUpdateText.setValue("----"); + Data.lastAccountsUpdateText.setValue("----"); } else { - Data.lastTransactionsUpdateText.set( + Data.lastTransactionsUpdateText.setValue( String.format(Objects.requireNonNull(Data.locale.getValue()), templateForTransactions, transactionCount == null ? 0 : transactionCount, DateUtils.formatDateTime(this, lastUpdate.getTime(), formatFlags))); - Data.lastAccountsUpdateText.set( + Data.lastAccountsUpdateText.setValue( String.format(Objects.requireNonNull(Data.locale.getValue()), templateForAccounts, accountCount == null ? 0 : accountCount, DateUtils.formatDateTime(this, lastUpdate.getTime(), formatFlags))); @@ -597,7 +625,7 @@ public class MainActivity extends ProfileThemedActivity { builder.setMessage(error); builder.setPositiveButton(R.string.btn_profile_options, (dialog, which) -> { Logger.debug("error", "will start profile editor"); - MobileLedgerProfile.startEditProfileActivity(this, profile); + ProfileDetailActivity.start(this, profile); }); builder.create() .show(); @@ -639,60 +667,21 @@ public class MainActivity extends ProfileThemedActivity { } } public void fabShouldShow() { - if (fabVerticalOffset <= 0) { - int top = b.btnAddTransaction.getTop(); - int parentHeight = b.mainAppLayout.getHeight(); - fabVerticalOffset = parentHeight - top; - } - if ((profile != null) && profile.isPostingPermitted() && !b.drawerLayout.isOpen()) { - fabShow(); - } - else - fabHide(); + if ((profile != null) && profile.permitPosting() && !b.drawerLayout.isOpen()) + fabManager.showFab(); } - private void fabShow() { - if (wantedFabState == FAB_SHOWN) - return; - -// b.btnAddTransaction.show(); - if (this.fabSlideAnimator != null) { - this.fabSlideAnimator.cancel(); - b.btnAddTransaction.clearAnimation(); - } - - wantedFabState = FAB_SHOWN; - slideFabTo(b.btnAddTransaction, 0, 200L, - com.google.android.material.animation.AnimationUtils.LINEAR_OUT_SLOW_IN_INTERPOLATOR); + @Override + public Context getContext() { + return this; } - public void fabHide() { - if (wantedFabState == FAB_HIDDEN) - return; - - if (fabVerticalOffset <= 0) - return; - -// b.btnAddTransaction.hide(); - if (this.fabSlideAnimator != null) { - this.fabSlideAnimator.cancel(); - b.btnAddTransaction.clearAnimation(); - } - - wantedFabState = FAB_HIDDEN; - slideFabTo(b.btnAddTransaction, fabVerticalOffset, 150L, - com.google.android.material.animation.AnimationUtils.FAST_OUT_LINEAR_IN_INTERPOLATOR); + @Override + public void showManagedFab() { + fabShouldShow(); } - private void slideFabTo(View view, int target, long duration, TimeInterpolator interpolator) { - fabSlideAnimator = view.animate() - .translationY((float) target) - .setInterpolator(interpolator) - .setDuration(duration) - .setListener(new AnimatorListenerAdapter() { - public void onAnimationEnd(Animator animation) { - fabSlideAnimator = null; - } - }); + @Override + public void hideManagedFab() { + fabManager.hideFab(); } - public static class SectionsPagerAdapter extends FragmentStateAdapter { public SectionsPagerAdapter(@NonNull FragmentActivity fragmentActivity) {