Merge pull request lsjwzh#162 from dilix/master

Fir issue when onpage changed was not fired
MaTriXy · May 19, 2017 · f7dd9c9 · f7dd9c9
2 parents f426828 + b1abe93
commit f7dd9c9
Show file tree

Hide file tree

Showing 6 changed files with 44 additions and 28 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -7,13 +7,13 @@ repositories {
 apply plugin: 'com.android.application'
 
 android {
-    compileSdkVersion 23
-    buildToolsVersion "23.0.3"
+    compileSdkVersion 25
+    buildToolsVersion "25.0.3"
 
     defaultConfig {
         applicationId "com.lsjwzh.widget.recyclerviewpagerdeomo"
-        minSdkVersion 11
-        targetSdkVersion 22
+        minSdkVersion 16
+        targetSdkVersion 25
         versionCode 1
         versionName "1.0"
     }
@@ -33,9 +33,12 @@ dependencies {
     compile fileTree(dir: 'libs', include: ['*.jar'])
     compile project(':lib')
     compile project(':tablayoutsupport')
-    compile 'com.android.support:appcompat-v7:23.3.0'
-    compile 'com.android.support:design:23.3.0'
+    compile 'com.android.support:appcompat-v7:25.3.1'
+    compile 'com.android.support:appcompat-v7:25.3.1'
+    compile 'com.android.support:design:25.3.1'
+    compile 'com.android.support:support-v4:25.3.1'
+    compile 'com.android.support:support-v13:25.3.1'
 
-    compile 'com.github.bumptech.glide:glide:3.6.0'
+    compile 'com.github.bumptech.glide:glide:3.7.0'
     compile 'de.hdodenhof:circleimageview:1.3.0'
 }
diff --git a/build.gradle b/build.gradle
@@ -6,7 +6,7 @@ buildscript {
         maven { url 'https://oss.sonatype.org/content/repositories/snapshots' }
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:2.1.0'
+        classpath 'com.android.tools.build:gradle:2.3.1'
 
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files

diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Wed Apr 27 11:07:47 IDT 2016
+#Fri Apr 28 13:11:28 MSK 2017
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-2.10-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-3.3-all.zip
diff --git a/lib/build.gradle b/lib/build.gradle
@@ -1,11 +1,11 @@
 apply plugin: 'com.android.library'
 
 android {
-    compileSdkVersion 23
-    buildToolsVersion '23.0.3'
+    compileSdkVersion 25
+    buildToolsVersion '25.0.3'
     defaultConfig {
-        minSdkVersion 7
-        targetSdkVersion 23
+        minSdkVersion 9
+        targetSdkVersion 25
         versionCode 27
         versionName "1.0.12"
     }
@@ -25,5 +25,7 @@ android {
 
 dependencies {
     compile fileTree(dir: 'libs', include: ['*.jar'])
-    compile 'com.android.support:recyclerview-v7:23.3.0'
+    compile 'com.android.support:recyclerview-v7:25.3.1'
+    compile 'com.android.support:appcompat-v7:25.3.1'
+    compile 'com.android.support:support-v4:25.3.1'
 }
diff --git a/lib/src/main/java/com/lsjwzh/widget/recyclerviewpager/RecyclerViewPager.java b/lib/src/main/java/com/lsjwzh/widget/recyclerviewpager/RecyclerViewPager.java
@@ -245,7 +245,21 @@ protected void onTargetFound(View targetView, RecyclerView.State state, Action a
                         protected float calculateSpeedPerPixel(DisplayMetrics displayMetrics) {
                             return mMillisecondsPerInch / displayMetrics.densityDpi;
                         }
+
+                        @Override
+                        protected void onStop() {
+                            super.onStop();
+                            if (mOnPageChangedListeners != null) {
+                                for (OnPageChangedListener onPageChangedListener : mOnPageChangedListeners) {
+                                    if (onPageChangedListener != null) {
+                                        onPageChangedListener.OnPageChanged(mPositionBeforeScroll, mSmoothScrollTargetPosition);
+                                    }
+                                }
+                            }
+                            mHasCalledOnPageChanged = true;
+                        }
                     };
+
             linearSmoothScroller.setTargetPosition(position);
             if (position == RecyclerView.NO_POSITION) {
                 return;
@@ -535,14 +549,6 @@ public void onScrollStateChanged(int state) {
                 if (DEBUG) {
                     Log.d("@", "onPageChanged:" + mSmoothScrollTargetPosition);
                 }
-                if (mOnPageChangedListeners != null) {
-                    for (OnPageChangedListener onPageChangedListener : mOnPageChangedListeners) {
-                        if (onPageChangedListener != null) {
-                            onPageChangedListener.OnPageChanged(mPositionBeforeScroll, mSmoothScrollTargetPosition);
-                        }
-                    }
-                }
-                mHasCalledOnPageChanged = true;
                 mPositionBeforeScroll = mSmoothScrollTargetPosition;
             }
             // reset
@@ -582,6 +588,11 @@ private int safeTargetPosition(int position, int count) {
     }
 
     public interface OnPageChangedListener {
+        /**
+         * Fires when viewpager changes it's page
+         * @param oldPosition old position
+         * @param newPosition new position
+         */
         void OnPageChanged(int oldPosition, int newPosition);
     }
 

diff --git a/tablayoutsupport/build.gradle b/tablayoutsupport/build.gradle
@@ -1,12 +1,12 @@
 apply plugin: 'com.android.library'
 
 android {
-    compileSdkVersion 23
-    buildToolsVersion "23.0.2"
+    compileSdkVersion 25
+    buildToolsVersion "25.0.3"
 
     defaultConfig {
-        minSdkVersion 7
-        targetSdkVersion 23
+        minSdkVersion 9
+        targetSdkVersion 25
         versionCode 1
         versionName "1.0"
     }
@@ -19,6 +19,6 @@ android {
 }
 
 dependencies {
-    compile 'com.android.support:design:23.3.0'
+    compile 'com.android.support:design:25.3.1'
     compile project(':lib')
 }