From b51afe514541ee7511c8a65c3ccd94ad9443e67e Mon Sep 17 00:00:00 2001 From: Marcos Holgado Date: Wed, 14 Apr 2021 18:07:02 +0100 Subject: [PATCH 1/2] Wip --- .../main/java/com/duckduckgo/app/browser/DuckDuckGoWebView.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/src/main/java/com/duckduckgo/app/browser/DuckDuckGoWebView.kt b/app/src/main/java/com/duckduckgo/app/browser/DuckDuckGoWebView.kt index d449d2962794..0f88f4ffb535 100644 --- a/app/src/main/java/com/duckduckgo/app/browser/DuckDuckGoWebView.kt +++ b/app/src/main/java/com/duckduckgo/app/browser/DuckDuckGoWebView.kt @@ -105,7 +105,7 @@ class DuckDuckGoWebView : WebView, NestedScrollingChild { if (canSwipeToRefresh && scrollY == 0 && lastClampedTopY && nestedOffsetY == 0) { // we are on a new gesture, have reached the top, are clamped vertically and nestedScrollY is done too -> enable swipeRefresh (by default always disabled) - enableSwipeRefresh(true) + //enableSwipeRefresh(true) } lastDeltaY = deltaY From a3c506c2a5d2d7e87d5acac5ed623c86c5660551 Mon Sep 17 00:00:00 2001 From: Marcos Holgado Date: Fri, 16 Apr 2021 14:42:28 +0100 Subject: [PATCH 2/2] Remove unused code and js code to detect overscroll behaviour --- .../duckduckgo/app/browser/BrowserTabFragment.kt | 1 - .../duckduckgo/app/browser/DuckDuckGoWebView.kt | 15 --------------- 2 files changed, 16 deletions(-) diff --git a/app/src/main/java/com/duckduckgo/app/browser/BrowserTabFragment.kt b/app/src/main/java/com/duckduckgo/app/browser/BrowserTabFragment.kt index a53f9fd033de..0b4678eecf21 100644 --- a/app/src/main/java/com/duckduckgo/app/browser/BrowserTabFragment.kt +++ b/app/src/main/java/com/duckduckgo/app/browser/BrowserTabFragment.kt @@ -1674,7 +1674,6 @@ class BrowserTabFragment : if (!viewState.isLoading && lastSeenBrowserViewState?.browserShowing == true) { swipeRefreshContainer.isRefreshing = false - webView?.detectOverscrollBehavior() } } } diff --git a/app/src/main/java/com/duckduckgo/app/browser/DuckDuckGoWebView.kt b/app/src/main/java/com/duckduckgo/app/browser/DuckDuckGoWebView.kt index 0f88f4ffb535..322a9f8cc4f3 100644 --- a/app/src/main/java/com/duckduckgo/app/browser/DuckDuckGoWebView.kt +++ b/app/src/main/java/com/duckduckgo/app/browser/DuckDuckGoWebView.kt @@ -103,11 +103,6 @@ class DuckDuckGoWebView : WebView, NestedScrollingChild { lastY -= scrollOffset[1] } - if (canSwipeToRefresh && scrollY == 0 && lastClampedTopY && nestedOffsetY == 0) { - // we are on a new gesture, have reached the top, are clamped vertically and nestedScrollY is done too -> enable swipeRefresh (by default always disabled) - //enableSwipeRefresh(true) - } - lastDeltaY = deltaY } @@ -176,16 +171,6 @@ class DuckDuckGoWebView : WebView, NestedScrollingChild { enableSwipeRefreshCallback = callback } - /** - * Allows us to determine whether to (de)activate Swipe to Refresh behavior for the current page content, e.g. if page implements a swipe behavior of its - * own already (see twitter.com). - */ - fun detectOverscrollBehavior() { - evaluateJavascript("(function() { return getComputedStyle(document.querySelector('body')).overscrollBehaviorY; })();") { behavior -> - setContentAllowsSwipeToRefresh(behavior.replace("\"", "") == "auto") - } - } - private fun enableSwipeRefresh(enable: Boolean) { enableSwipeRefreshCallback?.invoke(enable && contentAllowsSwipeToRefresh) }