Hide Jetpack banner when searching in reader on a phone in landscape orientation

Author: ovitrif

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

@@ -123,6 +123,7 @@
 import org.wordpress.android.util.AppLog;
 import org.wordpress.android.util.AppLog.T;
 import org.wordpress.android.util.DisplayUtils;
+import org.wordpress.android.util.DisplayUtilsWrapper;
 import org.wordpress.android.util.JetpackBrandingUtils;
 import org.wordpress.android.util.JetpackBrandingUtils.Screen;
 import org.wordpress.android.util.NetworkUtils;
@@ -233,6 +234,7 @@ public class ReaderPostListFragment extends ViewPagerFragment
     @Inject QuickStartRepository mQuickStartRepository;
     @Inject ReaderTracker mReaderTracker;
     @Inject SnackbarSequencer mSnackbarSequencer;
+    @Inject DisplayUtilsWrapper mDisplayUtilsWrapper;
 
     private enum ActionableEmptyViewButtonType {
         DISCOVER,
@@ -502,13 +504,24 @@ public void onCreate(Bundle savedInstanceState) {
         }
     }
 
-    private void toggleJetpackBannerIfEnabled(final boolean forceShow) {
+    private void toggleJetpackBannerIfEnabled(final boolean showIfEnabled, boolean animateOnScroll) {
         if (!isAdded() || getView() == null || !isSearching()) return;
 
-        if (forceShow && mJetpackBrandingUtils.shouldShowJetpackBranding()) {
-            showJetpackBanner();
-        } else {
-            hideJetpackBanner();
+        if (mJetpackBrandingUtils.shouldShowJetpackBranding()) {
+            if (animateOnScroll) {
+                mJetpackBrandingUtils.showJetpackBannerIfScrolledToTop(
+                        mJetpackBanner,
+                        mRecyclerView.getInternalRecyclerView()
+                );
+                // Return early since the visibility was handled by showJetpackBannerIfScrolledToTop
+                return;
+            }
+
+            if (showIfEnabled && !mDisplayUtilsWrapper.isPhoneLandscape()) {
+                showJetpackBanner();
+            } else {
+                hideJetpackBanner();
+            }
         }
     }
 
@@ -1234,7 +1247,7 @@ private void showSearchMessageOrSuggestions() {
         boolean hasQuery = !isSearchViewEmpty();
         boolean hasPerformedSearch = !TextUtils.isEmpty(mCurrentSearchQuery);
 
-        toggleJetpackBannerIfEnabled(true);
+        toggleJetpackBannerIfEnabled(true, false);
 
         // prevents suggestions from being shown after the search view has been collapsed
         if (!isSearching()) {
@@ -1323,7 +1336,7 @@ private void submitSearchQuery(@NonNull String query) {
         updatePostsInCurrentSearch(0);
         updateSitesInCurrentSearch(0);
 
-        toggleJetpackBannerIfEnabled(false);
+        toggleJetpackBannerIfEnabled(false, false);
 
         // track that the user performed a search
         if (!trimQuery.equals("")) {
@@ -1872,7 +1885,7 @@ public void onDataLoaded(boolean isEmpty) {
                 if (isSearching() && !isSearchTabsShowing()) {
                     showSearchTabs();
                 } else if (isSearching()) {
-                    toggleJetpackBannerIfEnabled(true);
+                    toggleJetpackBannerIfEnabled(true, true);
                 }
             }
             mRestorePosition = 0;

WordPress/src/main/java/org/wordpress/android/ui/reader/ReaderSearchActivity.kt

@@ -61,7 +61,6 @@ class ReaderSearchActivity : LocaleAwareActivity(),
                 val scrollableView = fragmentView.findViewById<View>(containerId) as RecyclerView
 
                 if (jetpackBrandingUtils.shouldShowJetpackBranding()) {
-                    jetpackBrandingUtils.showJetpackBannerIfScrolledToTop(jetpackBannerView, scrollableView)
                     jetpackBrandingUtils.initJetpackBannerAnimation(jetpackBannerView, scrollableView)
                 }
             }

WordPress/src/main/java/org/wordpress/android/util/DisplayUtilsWrapper.kt

@@ -6,10 +6,12 @@ import javax.inject.Inject
 
 @Reusable
 class DisplayUtilsWrapper @Inject constructor(private val contextProvider: ContextProvider) {
+    private val windowWidth get() = DisplayUtils.getWindowPixelWidth(contextProvider.getContext())
+    private val windowHeight get() = DisplayUtils.getWindowPixelHeight(contextProvider.getContext())
+
     fun getDisplayPixelWidth() = DisplayUtils.getDisplayPixelWidth()
 
-    fun isLandscapeBySize() =
-            getDisplayPixelWidth() > DisplayUtils.getWindowPixelHeight(contextProvider.getContext())
+    fun isLandscapeBySize() = windowWidth > windowHeight
 
     fun isLandscape() = DisplayUtils.isLandscape(contextProvider.getContext())