Feature/pinch to zoom bug (duckduckgo#228)

CDRussell · web-flow · commit 0e9252a8fc8c · 2018-03-22T14:22:30.000Z
* Formatting only

* Fix pinch to zoom by handling all remaining MotionEvents
diff --git a/app/build.gradle b/app/build.gradle
@@ -54,7 +54,7 @@ android {
     testOptions {
         unitTests.returnDefaultValues = true
 
-        if(USE_ORCHESTRATOR) {
+        if (USE_ORCHESTRATOR) {
             execution 'ANDROID_TEST_ORCHESTRATOR'
         }
     }
diff --git a/app/src/main/java/com/duckduckgo/app/browser/DuckDuckGoWebView.kt b/app/src/main/java/com/duckduckgo/app/browser/DuckDuckGoWebView.kt
@@ -100,11 +100,10 @@ class DuckDuckGoWebView : WebView, NestedScrollingChild {
             MotionEvent.ACTION_DOWN -> {
                 returnValue = super.onTouchEvent(event)
                 lastY = eventY
-
                 startNestedScroll(ViewCompat.SCROLL_AXIS_VERTICAL)
             }
 
-            MotionEvent.ACTION_UP, MotionEvent.ACTION_CANCEL -> {
+            else -> {
                 returnValue = super.onTouchEvent(event)
                 stopNestedScroll()
             }

Original file line number	Diff line number	Diff line change
`@@ -54,7 +54,7 @@ android {`
`54`	`54`	`testOptions {`
`55`	`55`	`unitTests.returnDefaultValues = true`
`56`	`56`
`57`		`- if(USE_ORCHESTRATOR) {`
	`57`	`+ if (USE_ORCHESTRATOR) {`
`58`	`58`	`execution 'ANDROID_TEST_ORCHESTRATOR'`
`59`	`59`	`}`
`60`	`60`	`}`
Original file line number	Diff line number	Diff line change
`@@ -100,11 +100,10 @@ class DuckDuckGoWebView : WebView, NestedScrollingChild {`
`100`	`100`	`MotionEvent.ACTION_DOWN -> {`
`101`	`101`	`returnValue = super.onTouchEvent(event)`
`102`	`102`	`lastY = eventY`
`103`		`-`
`104`	`103`	`startNestedScroll(ViewCompat.SCROLL_AXIS_VERTICAL)`
`105`	`104`	`}`
`106`	`105`
`107`		`- MotionEvent.ACTION_UP, MotionEvent.ACTION_CANCEL -> {`
	`106`	`+ else -> {`
`108`	`107`	`returnValue = super.onTouchEvent(event)`
`109`	`108`	`stopNestedScroll()`
`110`	`109`	`}`