Skip to content

Pull to refresh sensitivity fix #1190

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Apr 20, 2021
Merged

Pull to refresh sensitivity fix #1190

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b51afe5
Wip
marcosholgado Apr 14, 2021
a3c506c
Remove unused code and js code to detect overscroll behaviour
marcosholgado Apr 16, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion app/src/main/java/com/duckduckgo/app/browser/BrowserTabFragment.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1674,7 +1674,6 @@ class BrowserTabFragment :

if (!viewState.isLoading && lastSeenBrowserViewState?.browserShowing == true) {
swipeRefreshContainer.isRefreshing = false
webView?.detectOverscrollBehavior()
}
}
}
Expand Down
15 changes: 0 additions & 15 deletions app/src/main/java/com/duckduckgo/app/browser/DuckDuckGoWebView.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
}

Expand Down Expand Up @@ -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)
}
Expand Down