Fix not loaded pages when using animated PDFView#jumpTo()

Fix NPE in canScrollVertically and canScrollHorizontally
Update PdfiumAndroid
Update README and CHANGELOG
Update version

Author: barteksc

CHANGELOG.md

@@ -1,3 +1,7 @@
+## 3.0.0-beta.4 (2017-12-15)
+* Fix not loaded pages when using animated `PDFView#jumpTo()`
+* Fix NPE in `canScrollVertically()` and `canScrollHorizontally()`
+
 ## 3.0.0-beta.3 (2017-11-18)
 * Fix bug preventing `OnErrorListener` from being called
 

README.md

@@ -20,6 +20,8 @@ Licensed under Apache License 2.0.
 
 3.0.0-beta.3 fixes bug preventing `OnErrorListener` from being called
 
+3.0.0-beta.4 fixes not loaded pages when using animated `PDFView#jumpTo()` and NPE in `canScrollVertically()` and `canScrollHorizontally()`
+
 ## Changes in 3.0 API
 * Replaced `Contants.PRELOAD_COUNT` with `PRELOAD_OFFSET`
 * Removed `PDFView#fitToWidth()` (variant without arguments)
@@ -31,11 +33,11 @@ Licensed under Apache License 2.0.
 
 Add to _build.gradle_:
 
-`compile 'com.github.barteksc:android-pdf-viewer:3.0.0-beta.3'`
+`compile 'com.github.barteksc:android-pdf-viewer:3.0.0-beta.4'`
 
 or if you want to use more stable version:
 
-`compile 'com.github.barteksc:android-pdf-viewer:2.8.1'`
+`compile 'com.github.barteksc:android-pdf-viewer:2.8.2'`
 
 Library is available in jcenter repository, probably it'll be in Maven Central soon.
 

android-pdf-viewer/build.gradle

@@ -13,7 +13,7 @@ ext {
     siteUrl = 'https://github.com/barteksc/AndroidPdfViewer'
     gitUrl = 'https://github.com/barteksc/AndroidPdfViewer.git'
 
-    libraryVersion = '3.0.0-beta.3'
+    libraryVersion = '3.0.0-beta.4'
 
     developerId = 'barteksc'
     developerName = 'Bartosz Schiller'
@@ -32,13 +32,13 @@ android {
         minSdkVersion 11
         targetSdkVersion 25
         versionCode 1
-        versionName "3.0.0-beta.3"
+        versionName "3.0.0-beta.4"
     }
 
 }
 
 dependencies {
-    compile 'com.github.barteksc:pdfium-android:1.8.1'
+    compile 'com.github.barteksc:pdfium-android:1.8.2'
 }
 
 apply from: 'https://raw.githubusercontent.com/nuuneoi/JCenter/master/installv1.gradle'

android-pdf-viewer/src/main/java/com/github/barteksc/pdfviewer/AnimationManager.java

@@ -17,6 +17,7 @@
 
 import android.animation.Animator;
 import android.animation.Animator.AnimatorListener;
+import android.animation.AnimatorListenerAdapter;
 import android.animation.ValueAnimator;
 import android.animation.ValueAnimator.AnimatorUpdateListener;
 import android.graphics.PointF;
@@ -48,17 +49,21 @@ public AnimationManager(PDFView pdfView) {
     public void startXAnimation(float xFrom, float xTo) {
         stopAll();
         animation = ValueAnimator.ofFloat(xFrom, xTo);
+        XAnimation xAnimation = new XAnimation();
         animation.setInterpolator(new DecelerateInterpolator());
-        animation.addUpdateListener(new XAnimation());
+        animation.addUpdateListener(xAnimation);
+        animation.addListener(xAnimation);
         animation.setDuration(400);
         animation.start();
     }
 
     public void startYAnimation(float yFrom, float yTo) {
         stopAll();
         animation = ValueAnimator.ofFloat(yFrom, yTo);
+        YAnimation yAnimation = new YAnimation();
         animation.setInterpolator(new DecelerateInterpolator());
-        animation.addUpdateListener(new YAnimation());
+        animation.addUpdateListener(yAnimation);
+        animation.addListener(yAnimation);
         animation.setDuration(400);
         animation.start();
     }
@@ -104,24 +109,44 @@ public void stopFling() {
         scroller.forceFinished(true);
     }
 
-    class XAnimation implements AnimatorUpdateListener {
+    class XAnimation extends AnimatorListenerAdapter implements AnimatorUpdateListener {
 
         @Override
         public void onAnimationUpdate(ValueAnimator animation) {
             float offset = (Float) animation.getAnimatedValue();
             pdfView.moveTo(offset, pdfView.getCurrentYOffset());
+            pdfView.loadPageByOffset();
+        }
+
+        @Override
+        public void onAnimationCancel(Animator animation) {
+            pdfView.loadPages();
         }
 
+        @Override
+        public void onAnimationEnd(Animator animation) {
+            pdfView.loadPages();
+        }
     }
 
-    class YAnimation implements AnimatorUpdateListener {
+    class YAnimation extends AnimatorListenerAdapter implements AnimatorUpdateListener {
 
         @Override
         public void onAnimationUpdate(ValueAnimator animation) {
             float offset = (Float) animation.getAnimatedValue();
             pdfView.moveTo(pdfView.getCurrentXOffset(), offset);
+            pdfView.loadPageByOffset();
+        }
+
+        @Override
+        public void onAnimationCancel(Animator animation) {
+            pdfView.loadPages();
         }
 
+        @Override
+        public void onAnimationEnd(Animator animation) {
+            pdfView.loadPages();
+        }
     }
 
     class ZoomAnimation implements AnimatorUpdateListener, AnimatorListener {

android-pdf-viewer/src/main/java/com/github/barteksc/pdfviewer/PDFView.java

@@ -444,6 +444,10 @@ protected void onSizeChanged(int w, int h, int oldw, int oldh) {
 
     @Override
     public boolean canScrollHorizontally(int direction) {
+        if (pdfFile == null) {
+            return true;
+        }
+
         if (swipeVertical) {
             if (direction < 0 && currentXOffset < 0) {
                 return true;
@@ -462,6 +466,10 @@ public boolean canScrollHorizontally(int direction) {
 
     @Override
     public boolean canScrollVertically(int direction) {
+        if (pdfFile == null) {
+            return true;
+        }
+
         if (swipeVertical) {
             if (direction < 0 && currentYOffset < 0) {
                 return true;