Merge pull request Cleveroad#38 from Cleveroad/develop

ilchenko-peter · web-flow · commit 7cea5c6a7405 · 2016-10-03T20:18:16.000+03:00
Develop
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -6,6 +6,7 @@
 
 Version | Changes
 ---     | ---
+v.1.0.5 | Fixed NullPointerException & IndexOutOfBoundsException inside ViewPager. Added SlidingTutorialViewPager
 v.1.0.4 | Added ability to set PageTransformer
 v.1.0.3 | Fixed issues with layout customizations. Fixed issues with translate animations
 v.1.0.2 | Minor fixes
diff --git a/README.md b/README.md
@@ -31,7 +31,7 @@ All you need to do is:
 First, add gradle dependency into your build.gradle:
 ```groovy
 dependencies {
-    compile 'com.cleveroad:slidingtutorial:1.0.4'
+    compile 'com.cleveroad:slidingtutorial:1.0.5'
 }
 ``` 
 
diff --git a/gradle.properties b/gradle.properties
@@ -1,5 +1,5 @@
-VERSION_NAME=1.0.4
-VERSION_CODE=14
+VERSION_NAME=1.0.5
+VERSION_CODE=15
 GROUP=com.cleveroad
 
 POM_DESCRIPTION=Sliding tutorial is simple library that help other developers easy create great tutotial
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
diff --git a/gradlew b/gradlew
diff --git a/gradlew.bat b/gradlew.bat
diff --git a/lib/build.gradle b/lib/build.gradle
@@ -7,8 +7,8 @@ android {
     defaultConfig {
         minSdkVersion 14
         targetSdkVersion 24
-        versionCode 14
-        versionName "1.0.4"
+        versionCode 15
+        versionName "1.0.5"
     }
     buildTypes {
         release {
diff --git a/lib/src/main/java/com/cleveroad/slidingtutorial/SlidingTutorialViewPager.java b/lib/src/main/java/com/cleveroad/slidingtutorial/SlidingTutorialViewPager.java
@@ -0,0 +1,60 @@
+package com.cleveroad.slidingtutorial;
+
+import android.content.Context;
+import android.graphics.Canvas;
+import android.support.v4.view.ViewPager;
+import android.util.AttributeSet;
+import android.view.MotionEvent;
+
+/**
+ * {@link SlidingTutorialViewPager} fix well-known bug (Issue 66620) when:
+ * - {@link ViewPager#getChildDrawingOrder(int, int)} throws {@link ArrayIndexOutOfBoundsException}
+ * - {@link ViewPager#dispatchDraw(Canvas)} throws {@link NullPointerException}
+ * <p>
+ * This error is produced only in the SDK older than 17 (JELLY_BEAN_MR1).
+ *
+ * @see <a href="https://code.google.com/p/android/issues/detail?id=66620">Issue 66620</a>
+ */
+public class SlidingTutorialViewPager extends ViewPager {
+    public SlidingTutorialViewPager(Context context) {
+        super(context);
+    }
+
+    public SlidingTutorialViewPager(Context context, AttributeSet attrs) {
+        super(context, attrs);
+    }
+
+    @Override
+    public boolean onInterceptTouchEvent(MotionEvent event) {
+        if (getAdapter() == null || getAdapter().getCount() == 0) {
+            return false;
+        }
+        return super.onInterceptTouchEvent(event);
+    }
+
+    @Override
+    public boolean onTouchEvent(MotionEvent ev) {
+        if (getAdapter() == null || getAdapter().getCount() == 0) {
+            return false;
+        }
+        return super.onTouchEvent(ev);
+    }
+
+    @Override
+    protected int getChildDrawingOrder(int childCount, int i) {
+        try {
+            return super.getChildDrawingOrder(childCount, i);
+        } catch (IndexOutOfBoundsException ignored) {
+        }
+
+        return 0;
+    }
+
+    @Override
+    protected void dispatchDraw(Canvas canvas) {
+        try {
+            super.dispatchDraw(canvas);
+        } catch (NullPointerException ignored) {
+        }
+    }
+}
diff --git a/sample/src/main/res/layout/custom_tutorial_layout.xml b/sample/src/main/res/layout/custom_tutorial_layout.xml
@@ -1,13 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
 <FrameLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     tools:background="@android:color/darker_gray">
 
-    <android.support.v4.view.ViewPager
+    <com.cleveroad.slidingtutorial.SlidingTutorialViewPager
         android:id="@+id/viewPager"
         android:layout_width="match_parent"
         android:layout_height="match_parent"/>
diff --git a/sample/src/main/res/layout/custom_tutorial_layout_ids_example.xml b/sample/src/main/res/layout/custom_tutorial_layout_ids_example.xml
@@ -1,13 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
 <FrameLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     tools:background="@android:color/darker_gray">
 
-    <android.support.v4.view.ViewPager
+    <com.cleveroad.slidingtutorial.SlidingTutorialViewPager
         android:id="@+id/viewPagerCustom"
         android:layout_width="match_parent"
         android:layout_height="match_parent"/>

Original file line number	Diff line number	Diff line change
`@@ -31,7 +31,7 @@ All you need to do is:`
`31`	`31`	`First, add gradle dependency into your build.gradle:`
`32`	`32`	```groovy
`33`	`33`	`dependencies {`
`34`		`- compile 'com.cleveroad:slidingtutorial:1.0.4'`
	`34`	`+ compile 'com.cleveroad:slidingtutorial:1.0.5'`
`35`	`35`	`}`
`36`	`36`	```
`37`	`37`