Skip to content
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.

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

Fix IllegalArgumentException caused by broken Kotlin contract #83

Merged
merged 2 commits into from
Jan 31, 2019
Merged
Changes from all commits
Commits
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
4 changes: 2 additions & 2 deletions library/src/main/java/com/otaliastudios/zoom/ZoomEngine.kt
Original file line number Diff line number Diff line change
Expand Up @@ -1042,7 +1042,7 @@ internal constructor(context: Context) : ViewTreeObserver.OnGlobalLayoutListener
return true // We are interested in the gesture.
}

override fun onFling(e1: MotionEvent, e2: MotionEvent, velocityX: Float, velocityY: Float): Boolean {
override fun onFling(e1: MotionEvent?, e2: MotionEvent?, velocityX: Float, velocityY: Float): Boolean {
// If disabled, don't start the gesture.
if (!mFlingEnabled) return false
if (!mHorizontalPanEnabled && !mVerticalPanEnabled) return false
Expand All @@ -1061,7 +1061,7 @@ internal constructor(context: Context) : ViewTreeObserver.OnGlobalLayoutListener
*
* TODO this this not true! ^
*/
override fun onScroll(e1: MotionEvent, e2: MotionEvent,
override fun onScroll(e1: MotionEvent?, e2: MotionEvent?,
@AbsolutePan distanceX: Float, @AbsolutePan distanceY: Float): Boolean {
if (!mHorizontalPanEnabled && !mVerticalPanEnabled) return false

Expand Down