fix (+) fab visible after profile change (activity recreation)

[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 bc481a6de20a319008b42dba06f39509a73d1956..3f71e0a4707cf0f19dd5883b372795d9b6cacc96 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
@@ -37,6 +37,7 @@ import android.widget.LinearLayout;
 import android.widget.ProgressBar;
 import android.widget.TextView;
 
+import androidx.annotation.NonNull;
 import androidx.appcompat.app.ActionBarDrawerToggle;
 import androidx.appcompat.widget.Toolbar;
 import androidx.core.view.GravityCompat;
@@ -184,6 +185,23 @@ public class MainActivity extends ProfileThemedActivity {
             drawer.addDrawerListener(barDrawerToggle);
         }
         barDrawerToggle.syncState();
+        drawer.addDrawerListener(new DrawerLayout.DrawerListener() {
+            @Override
+            public void onDrawerSlide(@NonNull View drawerView, float slideOffset) {
+                if (slideOffset > 0.2)
+                    fabHide();
+            }
+            @Override
+            public void onDrawerOpened(@NonNull View drawerView) {
+                fabHide();
+            }
+            @Override
+            public void onDrawerClosed(@NonNull View drawerView) {
+                fabShouldShow();
+            }
+            @Override
+            public void onDrawerStateChanged(int newState) {}
+        });
 
 
         try {
@@ -308,7 +326,6 @@ public class MainActivity extends ProfileThemedActivity {
             };
             drawer.addDrawerListener(drawerListener);
         }
-        setupProfile();
     }
     private void scheduleDataRetrievalIfStale(Date lastUpdate) {
         long now = new Date().getTime();
@@ -364,18 +381,18 @@ public class MainActivity extends ProfileThemedActivity {
             // profiles not yet loaded from DB
             findViewById(R.id.loading_layout).setVisibility(View.VISIBLE);
             findViewById(R.id.no_profiles_layout).setVisibility(View.GONE);
-            findViewById(R.id.pager_layout).setVisibility(View.GONE);
+            findViewById(R.id.main_app_layout).setVisibility(View.GONE);
             return;
         }
 
         if (newList.isEmpty()) {
             findViewById(R.id.no_profiles_layout).setVisibility(View.VISIBLE);
-            findViewById(R.id.pager_layout).setVisibility(View.GONE);
+            findViewById(R.id.main_app_layout).setVisibility(View.GONE);
             findViewById(R.id.loading_layout).setVisibility(View.GONE);
             return;
         }
 
-        findViewById(R.id.pager_layout).setVisibility(View.VISIBLE);
+        findViewById(R.id.main_app_layout).setVisibility(View.VISIBLE);
         findViewById(R.id.no_profiles_layout).setVisibility(View.GONE);
         findViewById(R.id.loading_layout).setVisibility(View.GONE);
 
@@ -392,8 +409,6 @@ public class MainActivity extends ProfileThemedActivity {
      */
     private void onProfileChanged(MobileLedgerProfile profile) {
         boolean haveProfile = profile != null;
-        findViewById(R.id.no_profiles_layout).setVisibility(haveProfile ? View.GONE : View.VISIBLE);
-        findViewById(R.id.pager_layout).setVisibility(haveProfile ? View.VISIBLE : View.VISIBLE);
 
         if (haveProfile)
             setTitle(profile.getName());
@@ -402,20 +417,23 @@ public class MainActivity extends ProfileThemedActivity {
 
         this.profile = profile;
 
-        mProfileListAdapter.notifyDataSetChanged();
-
         int newProfileTheme = haveProfile ? profile.getThemeHue() : -1;
         if (newProfileTheme != Colors.profileThemeId) {
             debug("profiles",
                     String.format(Locale.ENGLISH, "profile theme %d → %d", Colors.profileThemeId,
                             newProfileTheme));
-            MainActivity.this.profileThemeChanged();
             Colors.profileThemeId = newProfileTheme;
+            profileThemeChanged();
             // profileThemeChanged would restart the activity, so no need to reload the
             // data sets below
             return;
         }
 
+        findViewById(R.id.no_profiles_layout).setVisibility(haveProfile ? View.GONE : View.VISIBLE);
+        findViewById(R.id.pager_layout).setVisibility(haveProfile ? View.VISIBLE : View.VISIBLE);
+
+        mProfileListAdapter.notifyDataSetChanged();
+
         drawer.closeDrawers();
 
         Data.transactions.clear();
@@ -460,21 +478,14 @@ public class MainActivity extends ProfileThemedActivity {
         scheduleDataRetrievalIfStale(newValue);
     }
     private void profileThemeChanged() {
-        Bundle bundle = new Bundle();
-        onSaveInstanceState(bundle);
-
         storeThemeIdInPrefs(profile.getThemeHue());
 
-        // restart activity to reflect theme change
-        finish();
-
         // un-hook all observed LiveData
         Data.profile.removeObservers(this);
         Data.profiles.removeObservers(this);
         Data.lastUpdateDate.removeObservers(this);
-        Intent intent = new Intent(this, this.getClass());
-        intent.putExtra(BUNDLE_SAVED_STATE, bundle);
-        startActivity(intent);
+
+        recreate();
     }
     private void storeThemeIdInPrefs(int themeId) {
         // store the new theme id in the preferences
@@ -634,8 +645,10 @@ public class MainActivity extends ProfileThemedActivity {
         }
     }
     public void fabShouldShow() {
-        if ((profile != null) && profile.isPostingPermitted())
+        if ((profile != null) && profile.isPostingPermitted() && !drawer.isOpen())
             fab.show();
+        else
+            fabHide();
     }
     public void fabHide() {
         fab.hide();