From 8c454d52c7c55af04c52d07bab5d16355d159406 Mon Sep 17 00:00:00 2001
From: Alex Ning <chineseperson5@gmail.com>
Date: Tue, 18 Feb 2020 20:57:39 +0800
Subject: Fix the bottom app bar shows under the nav bar. Fix the bottom app
 bar vanishes after orientation change.

---
 .../Activity/ViewSubredditDetailActivity.java                 | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

(limited to 'app/src/main')

diff --git a/app/src/main/java/ml/docilealligator/infinityforreddit/Activity/ViewSubredditDetailActivity.java b/app/src/main/java/ml/docilealligator/infinityforreddit/Activity/ViewSubredditDetailActivity.java
index cbec2aba..72e90cd7 100644
--- a/app/src/main/java/ml/docilealligator/infinityforreddit/Activity/ViewSubredditDetailActivity.java
+++ b/app/src/main/java/ml/docilealligator/infinityforreddit/Activity/ViewSubredditDetailActivity.java
@@ -202,15 +202,21 @@ public class ViewSubredditDetailActivity extends BaseActivity implements SortTyp
 
                 int navBarResourceId = resources.getIdentifier("navigation_bar_height", "dimen", "android");
                 if (navBarResourceId > 0) {
+                    int navBarHeight = resources.getDimensionPixelSize(navBarResourceId);
                     CoordinatorLayout.LayoutParams params = (CoordinatorLayout.LayoutParams) fab.getLayoutParams();
-                    params.bottomMargin = resources.getDimensionPixelSize(navBarResourceId);
+                    params.bottomMargin = navBarHeight;
                     fab.setLayoutParams(params);
+                    linearLayoutBottomAppBar.setPadding(0,
+                            (int) (6 * resources.getDisplayMetrics().density), 0, navBarHeight);
 
                     showToast = true;
                 }
             }
         }
 
+        showBottomAppBar = mSharedPreferences.getBoolean(SharedPreferencesUtils.BOTTOM_APP_BAR_KEY, false);
+        lockBottomAppBar = mSharedPreferences.getBoolean(SharedPreferencesUtils.LOCK_BOTTOM_APP_BAR, false);
+
         subredditName = getIntent().getStringExtra(EXTRA_SUBREDDIT_NAME_KEY);
 
         if (savedInstanceState == null) {
@@ -272,9 +278,6 @@ public class ViewSubredditDetailActivity extends BaseActivity implements SortTyp
         toolbar.setLayoutParams(toolbarParams);
         setSupportActionBar(toolbar);
 
-        showBottomAppBar = mSharedPreferences.getBoolean(SharedPreferencesUtils.BOTTOM_APP_BAR_KEY, false);
-        lockBottomAppBar = mSharedPreferences.getBoolean(SharedPreferencesUtils.LOCK_BOTTOM_APP_BAR, false);
-
         glide = Glide.with(this);
 
         mSubredditViewModel = new ViewModelProvider(this,
-- 
cgit v1.2.3