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=88cc39d0c03f6ae25134ea879d31403e6a7cef35;hp=344f33f8a8a5225cfb7953f528342221ac42b7d1;hb=23b8360d4f884bbdb20cc2de1825486ef42f37d6;hpb=826bfbfb7fe7a2491954793b0a954f26e28a784d 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 344f33f8..88cc39d0 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 @@ -56,13 +56,17 @@ 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.LockHolder; +import net.ktnx.mobileledger.utils.Logger; import net.ktnx.mobileledger.utils.MLDB; +import org.jetbrains.annotations.NotNull; + import java.lang.ref.WeakReference; import java.text.DateFormat; import java.util.ArrayList; import java.util.Date; import java.util.List; +import java.util.Locale; import java.util.Observer; import androidx.appcompat.app.ActionBarDrawerToggle; @@ -76,6 +80,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"; @@ -84,9 +90,7 @@ public class MainActivity extends ProfileThemedActivity { DrawerLayout drawer; private LinearLayout profileListContainer; private View profileListHeadArrow, profileListHeadMore, profileListHeadCancel; - private LinearLayout profileListHeadMoreAndCancel; private FragmentManager fragmentManager; - private TextView tvLastUpdate; private RetrieveTransactionsTask retrieveTransactionsTask; private View bTransactionListCancelDownload; private ProgressBar progressBar; @@ -94,7 +98,6 @@ public class MainActivity extends ProfileThemedActivity { private SectionsPagerAdapter mSectionsPagerAdapter; private ViewPager mViewPager; private FloatingActionButton fab; - private boolean profileModificationEnabled = false; private boolean profileListExpanded = false; private ProfilesRecyclerViewAdapter mProfileListAdapter; private int mCurrentPage; @@ -111,18 +114,17 @@ 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.setValue(null); } @Override - protected void onSaveInstanceState(Bundle outState) { + protected void onSaveInstanceState(@NotNull Bundle outState) { super.onSaveInstanceState(outState); outState.putInt(STATE_CURRENT_PAGE, mViewPager.getCurrentItem()); - if (mAccountFilter != null) - outState.putString(STATE_ACC_FILTER, mAccountFilter); + if (mAccountFilter != null) outState.putString(STATE_ACC_FILTER, mAccountFilter); } @Override protected void onDestroy() { @@ -147,7 +149,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; @@ -158,9 +160,9 @@ public class MainActivity extends ProfileThemedActivity { profileListHeadArrow = findViewById(R.id.nav_profiles_arrow); profileListHeadMore = findViewById(R.id.nav_profiles_start_edit); profileListHeadCancel = findViewById(R.id.nav_profiles_cancel_edit); - profileListHeadMoreAndCancel = findViewById(R.id.nav_profile_list_head_buttons); + LinearLayout profileListHeadMoreAndCancel = + findViewById(R.id.nav_profile_list_head_buttons); drawer = findViewById(R.id.drawer_layout); - tvLastUpdate = findViewById(R.id.transactions_last_update); bTransactionListCancelDownload = findViewById(R.id.transaction_list_cancel_download); progressBar = findViewById(R.id.transaction_list_progress_bar); progressLayout = findViewById(R.id.transaction_progress_layout); @@ -264,18 +266,24 @@ public class MainActivity extends ProfileThemedActivity { if (editingProfilesObserver == null) { editingProfilesObserver = (o, arg) -> { if (mProfileListAdapter.isEditingProfiles()) { - 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,18 +313,19 @@ 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", - String.format("WEB data last fetched at %1.3f and now is %1.3f. re-fetching", - lastUpdate.getTime() / 1000f, now / 1000f)); + if (lastUpdate == null) debug("db::", "WEB data never fetched. scheduling a fetch"); + else 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)); scheduleTransactionListRetrieval(); } @@ -325,7 +334,7 @@ public class MainActivity extends ProfileThemedActivity { if (Build.VERSION.SDK_INT < Build.VERSION_CODES.N) return; List shortcuts = new ArrayList<>(); - try (LockHolder lh = Data.profiles.lockForReading()) { + try (LockHolder ignored = Data.profiles.lockForReading()) { for (int i = 0; i < Data.profiles.size(); i++) { MobileLedgerProfile p = Data.profiles.get(i); if (!p.isPostingPermitted()) continue; @@ -347,7 +356,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 +372,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 +393,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 +403,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 +433,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); @@ -521,43 +530,18 @@ public class MainActivity extends ProfileThemedActivity { private void showAccountSummaryFragment() { mViewPager.setCurrentItem(0, true); Data.accountFilter.setValue(null); -// FragmentTransaction ft = fragmentManager.beginTransaction(); -// accountSummaryFragment = new AccountSummaryFragment(); -// ft.replace(R.id.root_frame, accountSummaryFragment); -// ft.commit(); -// currentFragment = accountSummaryFragment; } public void onLatestTransactionsClicked(View view) { drawer.closeDrawers(); showTransactionsFragment((String) null); } - private void resetFragmentBackStack() { -// fragmentManager.popBackStack(0, FragmentManager.POP_BACK_STACK_INCLUSIVE); - } private void showTransactionsFragment(String accName) { 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"); -// transactionListFragment = new TransactionListFragment(); -// } -// Bundle bundle = new Bundle(); -// if (account != null) { -// bundle.putString(TransactionListFragment.BUNDLE_KEY_FILTER_ACCOUNT_NAME, -// account.getName()); -// } -// transactionListFragment.setArguments(bundle); -// ft.replace(R.id.root_frame, transactionListFragment); -// if (account != null) -// ft.addToBackStack(getResources().getString(R.string.title_activity_transaction_list)); -// ft.commit(); -// -// currentFragment = transactionListFragment; + showTransactionsFragment((account == null) ? null : account.getName()); } public void showAccountTransactions(LedgerAccount account) { mBackMeansToAccountList = true; @@ -576,7 +560,7 @@ public class MainActivity extends ProfileThemedActivity { mBackMeansToAccountList = false; } else { - Log.d("fragments", String.format("manager stack: %d", + debug("fragments", String.format(Locale.ENGLISH, "manager stack: %d", fragmentManager.getBackStackEntryCount())); super.onBackPressed(); @@ -587,7 +571,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(Locale.ENGLISH, "Last update = %d", last_update)); if (last_update == 0) { Data.lastUpdateDate.postValue(null); } @@ -603,7 +587,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); } @@ -649,6 +633,9 @@ public class MainActivity extends ProfileThemedActivity { MobileLedgerProfile profile = Data.profile.get(); if ((profile != null) && profile.isPostingPermitted()) fab.show(); } + public void fabHide() { + fab.hide(); + } public void navProfilesHeadClicked(View view) { if (profileListExpanded) { collapseProfileList(); @@ -671,30 +658,51 @@ public class MainActivity extends ProfileThemedActivity { Data.profiles.size())); } private void collapseProfileList() { + boolean wasExpanded = profileListExpanded; profileListExpanded = false; - final Animation animation = AnimationUtils.loadAnimation(this, R.anim.slide_up); - animation.setAnimationListener(new Animation.AnimationListener() { - @Override - public void onAnimationStart(Animation animation) { - - } - @Override - public void onAnimationEnd(Animation animation) { - profileListContainer.setVisibility(View.GONE); - } - @Override - public void onAnimationRepeat(Animation animation) { + if (wasExpanded) { + final Animation animation = AnimationUtils.loadAnimation(this, R.anim.slide_up); + animation.setAnimationListener(new Animation.AnimationListener() { + @Override + public void onAnimationStart(Animation animation) { - } - }); - mProfileListAdapter.stopEditingProfiles(); + } + @Override + public void onAnimationEnd(Animation animation) { + profileListContainer.setVisibility(View.GONE); + } + @Override + public void onAnimationRepeat(Animation animation) { - profileListContainer.startAnimation(animation); - profileListHeadArrow.setRotation(0f); - profileListHeadArrow - .startAnimation(AnimationUtils.loadAnimation(this, R.anim.rotate_180_back)); - profileListHeadMore.setVisibility(View.GONE); + } + }); + mProfileListAdapter.stopEditingProfiles(); + + profileListContainer.startAnimation(animation); + profileListHeadArrow.setRotation(0f); + profileListHeadArrow + .startAnimation(AnimationUtils.loadAnimation(this, R.anim.rotate_180_back)); + 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); + } + else { + profileListContainer.setVisibility(View.GONE); + profileListHeadArrow.setRotation(0f); + profileListHeadMore.setVisibility(View.GONE); + } } public void onAccountSummaryRowViewClicked(View view) { ViewGroup row; @@ -706,7 +714,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(); @@ -722,16 +730,16 @@ 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); // removing all child accounts from the view int start = -1, count = 0; - try (LockHolder lh = Data.accounts.lockForWriting()) { + try (LockHolder ignored = 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; @@ -740,7 +748,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; @@ -750,7 +758,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); } @@ -761,12 +769,12 @@ 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 = Data.profile.get().loadVisibleChildAccountsOf(acc); - try (LockHolder lh = Data.accounts.lockForWriting()) { + try (LockHolder ignored = Data.accounts.lockForWriting()) { int parentPos = Data.accounts.indexOf(acc); if (parentPos != -1) { // may have disappeared in a concurrent refresh operation @@ -793,16 +801,17 @@ public class MainActivity extends ProfileThemedActivity { public class SectionsPagerAdapter extends FragmentPagerAdapter { - public SectionsPagerAdapter(FragmentManager fm) { + SectionsPagerAdapter(FragmentManager fm) { super(fm); } + @NotNull @Override public Fragment getItem(int position) { - Log.d("main", String.format("Switching to fragment %d", position)); + debug("main", String.format(Locale.ENGLISH, "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();