show New transaction button when the app is brought back to the foreground

[mobile-ledger.git] / app / src / main / java / net / ktnx / mobileledger / ui / activity / MainActivity.java

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 5a8e198f778400ef00ef9aac6cbe1fd8336056dd..e17046703c59b1d2b8a41005263bb7f1173f7b63 100644 (file)
--- a/app/src/main/java/net/ktnx/mobileledger/ui/activity/MainActivity.java
+++ b/app/src/main/java/net/ktnx/mobileledger/ui/activity/MainActivity.java
@@ -108,7 +108,9 @@ public class MainActivity extends ProfileThemedActivity {
     protected void onStart() {
         super.onStart();
 
-        debug("flow", "MainActivity.onStart()");
+        debug("flow", String.format(Locale.ENGLISH,
+                "MainActivity.onStart(), currentPage is %d, accountFilter is %s", mCurrentPage,
+                (mAccountFilter == null) ? "<NULL>" : mAccountFilter));
         mViewPager.setCurrentItem(mCurrentPage, false);
         if (mAccountFilter != null) showTransactionsFragment(mAccountFilter);
         else Data.accountFilter.setValue(null);
@@ -143,6 +145,11 @@ public class MainActivity extends ProfileThemedActivity {
         storeThemeIdInPrefs(profileColor);
     }
     @Override
+    protected void onResume() {
+        super.onResume();
+        fabShouldShow();
+    }
+    @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         debug("flow", "MainActivity.onCreate()");
@@ -204,6 +211,7 @@ public class MainActivity extends ProfileThemedActivity {
             pageChangeListener = new ViewPager.SimpleOnPageChangeListener() {
                 @Override
                 public void onPageSelected(int position) {
+                    mCurrentPage = position;
                     switch (position) {
                         case 0:
                             markDrawerItemCurrent(R.id.nav_account_summary);
@@ -249,37 +257,36 @@ public class MainActivity extends ProfileThemedActivity {
         if (mProfileListAdapter == null) mProfileListAdapter = new ProfilesRecyclerViewAdapter();
         root.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(AnimationUtils
-                                    .loadAnimation(MainActivity.this, R.anim.fade_out));
-                            profileListHeadCancel.startAnimation(AnimationUtils
-                                    .loadAnimation(MainActivity.this, R.anim.fade_in));
-                            profileListHeadAddProfile.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(AnimationUtils
-                                    .loadAnimation(MainActivity.this, R.anim.fade_out));
-                            profileListHeadMore.startAnimation(AnimationUtils
-                                    .loadAnimation(MainActivity.this, R.anim.fade_in));
-                            profileListHeadAddProfile.startAnimation(AnimationUtils
-                                    .loadAnimation(MainActivity.this, R.anim.fade_out));
-                        }
-                    }
+        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(
+                            AnimationUtils.loadAnimation(MainActivity.this, R.anim.fade_out));
+                    profileListHeadCancel.startAnimation(
+                            AnimationUtils.loadAnimation(MainActivity.this, R.anim.fade_in));
+                    profileListHeadAddProfile.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(
+                            AnimationUtils.loadAnimation(MainActivity.this, R.anim.fade_out));
+                    profileListHeadMore.startAnimation(
+                            AnimationUtils.loadAnimation(MainActivity.this, R.anim.fade_in));
+                    profileListHeadAddProfile.startAnimation(
+                            AnimationUtils.loadAnimation(MainActivity.this, R.anim.fade_out));
+                }
+            }
 
-                    mProfileListAdapter.notifyDataSetChanged();
-                });
+            mProfileListAdapter.notifyDataSetChanged();
+        });
 
         LinearLayoutManager llm = new LinearLayoutManager(this);