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=aad6b50649bd8075a5a172b44a63f41a66402eb9;hp=3b14b422c8906b5e7817dc2c3d01278d8cc86497;hb=2c9601c763805df628328312468278404f448663;hpb=ad9d5f1bd733759a41b0acc9841900e8a901553d 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 3b14b422..aad6b506 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 @@ -58,6 +58,8 @@ import net.ktnx.mobileledger.utils.Colors; import net.ktnx.mobileledger.utils.LockHolder; import net.ktnx.mobileledger.utils.MLDB; +import org.jetbrains.annotations.NotNull; + import java.lang.ref.WeakReference; import java.text.DateFormat; import java.util.ArrayList; @@ -76,6 +78,8 @@ import androidx.recyclerview.widget.LinearLayoutManager; import androidx.recyclerview.widget.RecyclerView; import androidx.viewpager.widget.ViewPager; +import static net.ktnx.mobileledger.utils.Logger.debug; + public class MainActivity extends ProfileThemedActivity { public static final String STATE_CURRENT_PAGE = "current_page"; public static final String BUNDLE_SAVED_STATE = "bundle_savedState"; @@ -111,18 +115,18 @@ public class MainActivity extends ProfileThemedActivity { protected void onStart() { super.onStart(); - Log.d("flow", "MainActivity.onStart()"); + debug("flow", "MainActivity.onStart()"); mViewPager.setCurrentItem(mCurrentPage, false); if (mAccountFilter != null) showTransactionsFragment(mAccountFilter); - else Data.accountFilter.set(null); + else Data.accountFilter.setValue(null); } @Override protected void onSaveInstanceState(Bundle outState) { super.onSaveInstanceState(outState); outState.putInt(STATE_CURRENT_PAGE, mViewPager.getCurrentItem()); - if (Data.accountFilter.get() != null) - outState.putString(STATE_ACC_FILTER, Data.accountFilter.get()); + if (mAccountFilter != null) + outState.putString(STATE_ACC_FILTER, mAccountFilter); } @Override protected void onDestroy() { @@ -147,7 +151,7 @@ public class MainActivity extends ProfileThemedActivity { @Override protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); - Log.d("flow", "MainActivity.onCreate()"); + debug("flow", "MainActivity.onCreate()"); int profileColor = Data.retrieveCurrentThemeIdFromDb(); Colors.setupTheme(this, profileColor); Colors.profileThemeId = profileColor; @@ -267,15 +271,25 @@ public class MainActivity extends ProfileThemedActivity { profileListHeadArrow.clearAnimation(); profileListHeadArrow.setVisibility(View.GONE); profileListHeadMore.setVisibility(View.GONE); + profileListHeadMore + .startAnimation(AnimationUtils.loadAnimation(this, R.anim.fade_out)); profileListHeadCancel.setVisibility(View.VISIBLE); + profileListHeadCancel + .startAnimation(AnimationUtils.loadAnimation(this, R.anim.fade_in)); } else { profileListHeadArrow.setRotation(180f); profileListHeadArrow.setVisibility(View.VISIBLE); profileListHeadCancel.setVisibility(View.GONE); + profileListHeadCancel + .startAnimation(AnimationUtils.loadAnimation(this, R.anim.fade_out)); profileListHeadMore.setVisibility(View.GONE); - profileListHeadMore - .setVisibility(profileListExpanded ? View.VISIBLE : View.GONE); + if (profileListExpanded) { + profileListHeadMore.setVisibility(View.VISIBLE); + profileListHeadMore + .startAnimation(AnimationUtils.loadAnimation(this, R.anim.fade_in)); + } + else profileListHeadMore.setVisibility(View.GONE); } }; mProfileListAdapter.addEditingProfilesObserver(editingProfilesObserver); @@ -305,16 +319,17 @@ public class MainActivity extends ProfileThemedActivity { findViewById(R.id.nav_profile_list_head_layout) .setOnClickListener(this::navProfilesHeadClicked); findViewById(R.id.nav_profiles_label).setOnClickListener(this::navProfilesHeadClicked); + boolean initialStart = Data.profile.get() == null; setupProfile(); - onProfileChanged(null); + if (!initialStart) onProfileChanged(null); updateLastUpdateTextFromDB(); } private void scheduleDataRetrievalIfStale(Date lastUpdate) { long now = new Date().getTime(); if ((lastUpdate == null) || (now > (lastUpdate.getTime() + (24 * 3600 * 1000)))) { - if (lastUpdate == null) Log.d("db::", "WEB data never fetched. scheduling a fetch"); - else Log.d("db", + if (lastUpdate == null) debug("db::", "WEB data never fetched. scheduling a fetch"); + else debug("db", String.format("WEB data last fetched at %1.3f and now is %1.3f. re-fetching", lastUpdate.getTime() / 1000f, now / 1000f)); @@ -347,7 +362,7 @@ public class MainActivity extends ProfileThemedActivity { (int) (getResources().getDimension(R.dimen.thumb_row_height) * Data.profiles.size())); - Log.d("profiles", "profile list changed"); + debug("profiles", "profile list changed"); if (arg == null) mProfileListAdapter.notifyDataSetChanged(); else mProfileListAdapter.notifyItemChanged((int) arg); @@ -363,13 +378,6 @@ public class MainActivity extends ProfileThemedActivity { findViewById(R.id.pager_layout) .setVisibility(haveProfile ? View.VISIBLE : View.VISIBLE); - Data.transactions.clear(); - Log.d("transactions", "requesting list reload"); - TransactionListViewModel.scheduleTransactionListReload(); - - Data.accounts.clear(); - AccountSummaryViewModel.scheduleAccountListReload(); - if (profile == null) MainActivity.this.setTitle(R.string.app_name); else MainActivity.this.setTitle(profile.getName()); MainActivity.this.updateLastUpdateTextFromDB(); @@ -391,7 +399,7 @@ public class MainActivity extends ProfileThemedActivity { int newProfileTheme = (profile == null) ? -1 : profile.getThemeId(); if (newProfileTheme != Colors.profileThemeId) { - Log.d("profiles", String.format("profile theme %d → %d", Colors.profileThemeId, + debug("profiles", String.format("profile theme %d → %d", Colors.profileThemeId, newProfileTheme)); MainActivity.this.profileThemeChanged(); Colors.profileThemeId = newProfileTheme; @@ -401,6 +409,13 @@ public class MainActivity extends ProfileThemedActivity { } drawer.closeDrawers(); + Data.transactions.clear(); + debug("transactions", "requesting list reload"); + TransactionListViewModel.scheduleTransactionListReload(); + + Data.accounts.clear(); + AccountSummaryViewModel.scheduleAccountListReload(); + if (profile == null) { mToolbar.setSubtitle(null); fab.hide(); @@ -424,13 +439,13 @@ public class MainActivity extends ProfileThemedActivity { TextView v = findViewById(R.id.transactions_last_update); if (newValue == null) { l.setVisibility(View.INVISIBLE); - Log.d("main", "no last update date :("); + debug("main", "no last update date :("); } else { final String text = DateFormat.getDateTimeInstance().format(newValue); v.setText(text); l.setVisibility(View.VISIBLE); - Log.d("main", String.format("Date formatted: %s", text)); + debug("main", String.format("Date formatted: %s", text)); } scheduleDataRetrievalIfStale(newValue); @@ -520,7 +535,7 @@ public class MainActivity extends ProfileThemedActivity { } private void showAccountSummaryFragment() { mViewPager.setCurrentItem(0, true); - Data.accountFilter.set(null); + Data.accountFilter.setValue(null); // FragmentTransaction ft = fragmentManager.beginTransaction(); // accountSummaryFragment = new AccountSummaryFragment(); // ft.replace(R.id.root_frame, accountSummaryFragment); @@ -536,15 +551,14 @@ public class MainActivity extends ProfileThemedActivity { // fragmentManager.popBackStack(0, FragmentManager.POP_BACK_STACK_INCLUSIVE); } private void showTransactionsFragment(String accName) { - Data.accountFilter.set(accName); - Data.accountFilter.notifyObservers(); + Data.accountFilter.setValue(accName); mViewPager.setCurrentItem(1, true); } private void showTransactionsFragment(LedgerAccount account) { showTransactionsFragment((account == null) ? (String) null : account.getName()); // FragmentTransaction ft = fragmentManager.beginTransaction(); // if (transactionListFragment == null) { -// Log.d("flow", "MainActivity creating TransactionListFragment"); +// debug("flow", "MainActivity creating TransactionListFragment"); // transactionListFragment = new TransactionListFragment(); // } // Bundle bundle = new Bundle(); @@ -572,12 +586,12 @@ public class MainActivity extends ProfileThemedActivity { } else { if (mBackMeansToAccountList && (mViewPager.getCurrentItem() == 1)) { - Data.accountFilter.set(null); + Data.accountFilter.setValue(null); showAccountSummaryFragment(); mBackMeansToAccountList = false; } else { - Log.d("fragments", String.format("manager stack: %d", + debug("fragments", String.format("manager stack: %d", fragmentManager.getBackStackEntryCount())); super.onBackPressed(); @@ -588,7 +602,7 @@ public class MainActivity extends ProfileThemedActivity { final MobileLedgerProfile profile = Data.profile.get(); long last_update = (profile != null) ? profile.getLongOption(MLDB.OPT_LAST_SCRAPE, 0L) : 0; - Log.d("transactions", String.format("Last update = %d", last_update)); + debug("transactions", String.format("Last update = %d", last_update)); if (last_update == 0) { Data.lastUpdateDate.postValue(null); } @@ -604,7 +618,7 @@ public class MainActivity extends ProfileThemedActivity { retrieveTransactionsTask.execute(); } public void onStopTransactionRefreshClick(View view) { - Log.d("interactive", "Cancelling transactions refresh"); + debug("interactive", "Cancelling transactions refresh"); if (retrieveTransactionsTask != null) retrieveTransactionsTask.cancel(false); bTransactionListCancelDownload.setEnabled(false); } @@ -695,7 +709,18 @@ public class MainActivity extends ProfileThemedActivity { profileListHeadArrow.setRotation(0f); profileListHeadArrow .startAnimation(AnimationUtils.loadAnimation(this, R.anim.rotate_180_back)); - profileListHeadMore.setVisibility(View.GONE); + final Animation moreAnimation = AnimationUtils.loadAnimation(this, R.anim.fade_out); + moreAnimation.setAnimationListener(new Animation.AnimationListener() { + @Override + public void onAnimationStart(Animation animation) {} + @Override + public void onAnimationEnd(Animation animation) { + profileListHeadMore.setVisibility(View.GONE); + } + @Override + public void onAnimationRepeat(Animation animation) {} + }); + profileListHeadMore.startAnimation(moreAnimation); } public void onAccountSummaryRowViewClicked(View view) { ViewGroup row; @@ -707,7 +732,7 @@ public class MainActivity extends ProfileThemedActivity { case R.id.account_row_acc_name: case R.id.account_expander: case R.id.account_expander_container: - Log.d("accounts", "Account expander clicked"); + debug("accounts", "Account expander clicked"); if (!acc.hasSubAccounts()) return; boolean wasExpanded = acc.isExpanded(); @@ -723,7 +748,7 @@ public class MainActivity extends ProfileThemedActivity { }); if (wasExpanded) { - Log.d("accounts", String.format("Collapsing account '%s'", acc.getName())); + debug("accounts", String.format("Collapsing account '%s'", acc.getName())); arrow.setRotation(0); animator.rotationBy(180); @@ -732,7 +757,7 @@ public class MainActivity extends ProfileThemedActivity { try (LockHolder lh = Data.accounts.lockForWriting()) { for (int i = 0; i < Data.accounts.size(); i++) { if (acc.isParentOf(Data.accounts.get(i))) { -// Log.d("accounts", String.format("Found a child '%s' at position %d", +// debug("accounts", String.format("Found a child '%s' at position %d", // Data.accounts.get(i).getName(), i)); if (start == -1) { start = i; @@ -741,7 +766,7 @@ public class MainActivity extends ProfileThemedActivity { } else { if (start != -1) { -// Log.d("accounts", +// debug("accounts", // String.format("Found a non-child '%s' at position %d", // Data.accounts.get(i).getName(), i)); break; @@ -751,7 +776,7 @@ public class MainActivity extends ProfileThemedActivity { if (start != -1) { for (int j = 0; j < count; j++) { -// Log.d("accounts", String.format("Removing item %d: %s", start + j, +// debug("accounts", String.format("Removing item %d: %s", start + j, // Data.accounts.get(start).getName())); Data.accounts.removeQuietly(start); } @@ -762,7 +787,7 @@ public class MainActivity extends ProfileThemedActivity { } } else { - Log.d("accounts", String.format("Expanding account '%s'", acc.getName())); + debug("accounts", String.format("Expanding account '%s'", acc.getName())); arrow.setRotation(180); animator.rotationBy(-180); List children = @@ -798,12 +823,13 @@ public class MainActivity extends ProfileThemedActivity { super(fm); } + @NotNull @Override public Fragment getItem(int position) { - Log.d("main", String.format("Switching to fragment %d", position)); + debug("main", String.format("Switching to fragment %d", position)); switch (position) { case 0: -// Log.d("flow", "Creating account summary fragment"); +// debug("flow", "Creating account summary fragment"); return mAccountSummaryFragment = new AccountSummaryFragment(); case 1: return new TransactionListFragment();