fix video gestures when Gesture Down To Close is disabled

This commit is contained in:
tibbi 2020-03-01 10:19:31 +01:00
parent 226374599d
commit ada0661d89
2 changed files with 10 additions and 13 deletions

View file

@ -140,21 +140,18 @@ class VideoFragment : ViewPagerFragment(), TextureView.SurfaceTextureListener, S
} }
}) })
if (mConfig.allowDownGesture) { video_preview.setOnTouchListener { view, event ->
video_preview.setOnTouchListener { view, event -> handleEvent(event)
false
}
video_surface_frame.setOnTouchListener { view, event ->
if (video_surface_frame.controller.state.zoom == 1f) {
handleEvent(event) handleEvent(event)
false
}
video_surface_frame.setOnTouchListener { view, event ->
if (video_surface_frame.controller.state.zoom == 1f) {
handleEvent(event)
}
gestureDetector.onTouchEvent(event)
false
} }
gestureDetector.onTouchEvent(event)
false
} }
} }

View file

@ -140,7 +140,7 @@ abstract class ViewPagerFragment : Fragment() {
val diffY = mTouchDownY - event.y val diffY = mTouchDownY - event.y
val downGestureDuration = System.currentTimeMillis() - mTouchDownTime val downGestureDuration = System.currentTimeMillis() - mTouchDownTime
if (!mIgnoreCloseDown && Math.abs(diffY) > Math.abs(diffX) && diffY < -mCloseDownThreshold && downGestureDuration < MAX_CLOSE_DOWN_GESTURE_DURATION) { if (!mIgnoreCloseDown && Math.abs(diffY) > Math.abs(diffX) && diffY < -mCloseDownThreshold && downGestureDuration < MAX_CLOSE_DOWN_GESTURE_DURATION && context?.config?.allowDownGesture == true) {
activity?.supportFinishAfterTransition() activity?.supportFinishAfterTransition()
} }
mIgnoreCloseDown = false mIgnoreCloseDown = false