Remove bottom nav color when banner is hidden + fix redundant bottom margin in suggestions list

Author: ovitrif

WordPress/src/main/java/org/wordpress/android/ui/reader/ReaderPostListFragment.java

@@ -3,6 +3,7 @@
 import android.app.Activity;
 import android.content.Context;
 import android.content.Intent;
+import android.content.res.Configuration;
 import android.graphics.drawable.Drawable;
 import android.os.Bundle;
 import android.text.Html;
@@ -506,16 +507,15 @@ public void onCreate(Bundle savedInstanceState) {
     private void toggleJetpackBannerIfEnabled(final boolean showIfEnabled, boolean animateOnScroll) {
         if (!isAdded() || getView() == null || !isSearching()) return;
 
-        if (mJetpackBrandingUtils.shouldShowJetpackBranding()) {
-            if (animateOnScroll) {
-                mJetpackBrandingUtils.showJetpackBannerIfScrolledToTop(
-                        mJetpackBanner,
-                        mRecyclerView.getInternalRecyclerView()
-                );
-                // Return early since the visibility was handled by showJetpackBannerIfScrolledToTop
-                return;
-            }
+        if (animateOnScroll) {
+            RecyclerView scrollView = mRecyclerView.getInternalRecyclerView();
+            mJetpackBrandingUtils.showJetpackBannerIfScrolledToTop(mJetpackBanner, scrollView);
+            mJetpackBrandingUtils.setNavigationBarColorForBanner(requireActivity().getWindow());
+            // Return early since the banner visibility was handled by showJetpackBannerIfScrolledToTop
+            return;
+        }
 
+        if (mJetpackBrandingUtils.shouldShowJetpackBranding()) {
             if (showIfEnabled && !mDisplayUtilsWrapper.isPhoneLandscape()) {
                 showJetpackBanner();
             } else {
@@ -525,8 +525,8 @@ private void toggleJetpackBannerIfEnabled(final boolean showIfEnabled, boolean a
     }
 
     private void showJetpackBanner() {
-        mJetpackBrandingUtils.setNavigationBarColorForBanner(requireActivity().getWindow());
         mJetpackBanner.setVisibility(View.VISIBLE);
+        mJetpackBrandingUtils.setNavigationBarColorForBanner(requireActivity().getWindow());
 
         // Add bottom margin to search suggestions list and empty view.
         int jetpackBannerHeight = getResources().getDimensionPixelSize(R.dimen.jetpack_banner_height);
@@ -537,8 +537,13 @@ private void showJetpackBanner() {
 
     private void hideJetpackBanner() {
         mJetpackBanner.setVisibility(View.GONE);
-        // Remove bottom margin from search suggestions post list and empty view
-        ((MarginLayoutParams) mRecyclerView.getLayoutParams()).bottomMargin = 0;
+
+        if (getResources().getConfiguration().orientation == Configuration.ORIENTATION_PORTRAIT) {
+            requireActivity().getWindow().setNavigationBarColor(0);
+        }
+
+        // Remove bottom margin from search suggestions list and empty view.
+        ((MarginLayoutParams) mRecyclerView.getSearchSuggestionsRecyclerView().getLayoutParams()).bottomMargin = 0;
         ((MarginLayoutParams) mActionableEmptyView.getLayoutParams()).bottomMargin = 0;
     }