Fix the touch event bug in the sample app

Author: manjunathc23

README.md

@@ -4,7 +4,7 @@ a simple pinch zoom in / out for image view.
 
 [![Platform](https://img.shields.io/badge/platform-android-green.svg)](http://developer.android.com/index.html)
 ![SDK](https://img.shields.io/badge/SDK-16%2B-green.svg)
-![Release](https://img.shields.io/badge/release-0.0.5-green.svg)
+![Release](https://img.shields.io/badge/release-0.0.6-green.svg)
 [![Jitpack](https://jitpack.io/v/metagalactic/ScalableImageView.svg)](https://jitpack.io/#metagalactic/ScalableImageView)
 [![Build Status](https://travis-ci.org/metagalactic/ScalableImageView.svg?branch=master)](https://github.com/metagalactic/ScalableImageView)
 [![CircleCI](https://circleci.com/gh/metagalactic/ScalableImageView.svg?style=svg)](https://circleci.com/gh/metagalactic/ScalableImageView)
@@ -24,7 +24,7 @@ Add jitpack to your root `build.gradle`
 Add the dependency
 ```
 	dependencies {
-	        compile 'com.github.metagalactic:ScalableImageView:0.0.5'
+	        compile 'com.github.metagalactic:ScalableImageView:0.0.6'
 	}
 ```
 

sample/build.gradle

@@ -12,7 +12,7 @@ android {
         targetSdkVersion versions.targetSdk
 
         versionCode 1
-        versionName "0.0.5"
+        versionName "0.0.6"
     }
 
     buildTypes {

sample/src/main/res/layout/activity_scalable_image_view_demo.xml

@@ -7,6 +7,8 @@
         android:id="@+id/scalable_image_view"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:contentDescription="@null" />
+        android:clickable="true"
+        android:contentDescription="@null"
+        android:focusableInTouchMode="true" />
 
 </FrameLayout>

scalableimageview/build.gradle

@@ -8,7 +8,7 @@ android {
         minSdkVersion versions.minSdk
         targetSdkVersion versions.targetSdk
         versionCode 1
-        versionName "0.0.5"
+        versionName "0.0.6"
     }
 
     buildTypes {

scalableimageview/src/main/java/com/github/metagalactic/views/ScalableImageView.java

@@ -101,7 +101,7 @@ public boolean onTouchEvent(@NonNull MotionEvent event) {
         boolean handled = false;
         switch (event.getActionMasked()) {
             case MotionEvent.ACTION_DOWN:
-                mIsMultiPointerEventSeries = true;
+                mIsMultiPointerEventSeries = false;
                 mInitialCoordinates.x = event.getX();
                 mInitialCoordinates.y = event.getY();
                 mPreviousCoordinates.x = event.getX();
@@ -114,9 +114,9 @@ public boolean onTouchEvent(@NonNull MotionEvent event) {
             case MotionEvent.ACTION_MOVE:
                 if (event.getPointerCount() > 1) {
                     // If at any point in this series of events we have more than one pointer, we'll
-                    // update this flag to indicate that
-                    // (a) we should not allow parent intercepts at any point during the series
-                    // (b) we should treat any event as handled if was not otherwise handled to prevent strange "click" behavior.
+                    // update this flag to indicate that (a) we should not allow parent intercepts
+                    // at any point during the series and (b) we should treat any event as handled
+                    // if was not otherwise handled to prevent strange "click" behavior.
                     mIsMultiPointerEventSeries = true;
                 }
 
@@ -169,7 +169,6 @@ public boolean onTouchEvent(@NonNull MotionEvent event) {
                     if (!mIsMultiPointerEventSeries &&
                             Float.compare(diff.length(), mTouchSlop) > 0) {
                         requestAllowParentIntercept = true;
-                        mIsMultiPointerEventSeries = false;
                     }
                 }
                 mPreviousCoordinates.x = event.getX();
@@ -178,7 +177,6 @@ public boolean onTouchEvent(@NonNull MotionEvent event) {
             case MotionEvent.ACTION_CANCEL:
             case MotionEvent.ACTION_UP:
                 mLastPointerId = NO_POINTER;
-                //mIsMultiPointerEventSeries = false;
                 if (hasScaled() || hasAttemptedPan() || hasAttemptedScale()) {
                     handled = true;
                 }