wbrawner/thunderbird-android
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #6524 from thundernest/swipe_gesture_outside_webview

Browse source 
Ignore WebView's scroll state when swipe gesture started in other view
This commit is contained in:
cketti 2022-12-12 16:33:44 +01:00 committed by GitHub
commit 942eca1393
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 15 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
app/ui/legacy/src/main/java/com/fsck/k9/ui/messageview/TouchInterceptView.kt
View file

@ -1,6 +1,7 @@
package com.fsck.k9.ui.messageview
import android.content.Context
import android.graphics.Rect
import android.util.AttributeSet
import android.view.MotionEvent
import android.view.ViewConfiguration
@ -26,6 +27,11 @@ class TouchInterceptView(context: Context, attrs: AttributeSet?) : FrameLayout(c
private var initialX: Float = 0f
private var initialY: Float = 0f
private var initialRawX = 0
private var initialRawY = 0
private val webViewScreenLocation = IntArray(2)
private val webViewRect = Rect()
override fun onInterceptTouchEvent(event: MotionEvent): Boolean {
handleOnInterceptTouchEvent(event)
@ -41,6 +47,8 @@ class TouchInterceptView(context: Context, attrs: AttributeSet?) : FrameLayout(c
MotionEvent.ACTION_DOWN -> {
initialX = event.x
initialY = event.y
initialRawX = event.rawX.toInt()
initialRawY = event.rawY.toInt()
scrollViewParent.requestDisallowInterceptTouchEvent(false)
}
MotionEvent.ACTION_POINTER_DOWN -> {
@ -61,7 +69,13 @@ class TouchInterceptView(context: Context, attrs: AttributeSet?) : FrameLayout(c
} else if (absoluteDeltaX > touchSlop && absoluteDeltaX > absoluteDeltaY &&
webView.canScrollHorizontally(deltaX.toInt())
) {
scrollViewParent.requestDisallowInterceptTouchEvent(true)
webView.getHitRect(webViewRect)
webView.getLocationOnScreen(webViewScreenLocation)
webViewRect.offset(webViewScreenLocation[0], webViewScreenLocation[1])
if (webViewRect.contains(initialRawX, initialRawY)) {
scrollViewParent.requestDisallowInterceptTouchEvent(true)
}
}
}
}