From 33fc5204684b462430af731d9db83158574cc83f Mon Sep 17 00:00:00 2001
From: Mugurell <Mugurell@users.noreply.github.com>
Date: Fri, 28 Aug 2020 12:13:33 +0300
Subject: [PATCH] For #10241 - Use VerticalSwipeRefreshLayout for pull to
 refresh

And so resolve many of the issues found in the platform's SwipeRefreshLayout.
---
 .../java/org/mozilla/fenix/browser/BaseBrowserFragment.kt     | 4 +---
 app/src/main/res/layout/fragment_browser.xml                  | 4 ++--
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/app/src/main/java/org/mozilla/fenix/browser/BaseBrowserFragment.kt b/app/src/main/java/org/mozilla/fenix/browser/BaseBrowserFragment.kt
index 2f509b03ae..8858302854 100644
--- a/app/src/main/java/org/mozilla/fenix/browser/BaseBrowserFragment.kt
+++ b/app/src/main/java/org/mozilla/fenix/browser/BaseBrowserFragment.kt
@@ -658,6 +658,7 @@ abstract class BaseBrowserFragment : Fragment(), UserInteractionHandler, Session
                 }
             }
 
+            view.swipeRefresh.isEnabled = FeatureFlags.pullToRefreshEnabled
             @Suppress("ConstantConditionIf")
             if (FeatureFlags.pullToRefreshEnabled) {
                 val primaryTextColor =
@@ -673,9 +674,6 @@ abstract class BaseBrowserFragment : Fragment(), UserInteractionHandler, Session
                     owner = this,
                     view = view
                 )
-            } else {
-                // Disable pull to refresh
-                view.swipeRefresh.setOnChildScrollUpCallback { _, _ -> true }
             }
 
             webchannelIntegration.set(
diff --git a/app/src/main/res/layout/fragment_browser.xml b/app/src/main/res/layout/fragment_browser.xml
index 09c23b747f..8a9738e535 100644
--- a/app/src/main/res/layout/fragment_browser.xml
+++ b/app/src/main/res/layout/fragment_browser.xml
@@ -22,7 +22,7 @@
             app:layout_constraintTop_toTopOf="parent"
             tools:context="browser.BrowserFragment">
 
-            <androidx.swiperefreshlayout.widget.SwipeRefreshLayout
+            <mozilla.components.ui.widgets.VerticalSwipeRefreshLayout
                 android:id="@+id/swipeRefresh"
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
@@ -34,7 +34,7 @@
                     android:layout_width="match_parent"
                     android:layout_height="match_parent"
                     android:visibility="gone" />
-            </androidx.swiperefreshlayout.widget.SwipeRefreshLayout>
+            </mozilla.components.ui.widgets.VerticalSwipeRefreshLayout>
 
             <ViewStub
                 android:id="@+id/stubFindInPage"