Fix issue DImuthuUpe#315

Clean fling code
Update README and CHANGELOG
Update version

Author: barteksc

CHANGELOG.md

@@ -1,3 +1,6 @@
+## 2.6.1 (2017-06-08)
+* Fix disappearing scroll handle
+
 ## 2.6.0 (2017-06-04)
 * Fix fling on single-page documents
 * Greatly improve overall fling experience

README.md

@@ -14,6 +14,8 @@ Licensed under Apache License 2.0.
 * Fix fling on single-page documents
 * Greatly improve overall fling experience
 
+Version 2.6.1. fixes disappearing scroll handle
+
 ## Changes in 2.0 API
 * `Configurator#defaultPage(int)` and `PDFView#jumpTo(int)` now require page index (i.e. starting from 0)
 * `OnPageChangeListener#onPageChanged(int, int)` is called with page index (i.e. starting from 0)
@@ -27,7 +29,7 @@ Licensed under Apache License 2.0.
 
 Add to _build.gradle_:
 
-`compile 'com.github.barteksc:android-pdf-viewer:2.6.0'`
+`compile 'com.github.barteksc:android-pdf-viewer:2.6.1'`
 
 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 = '2.6.0'
+    libraryVersion = '2.6.1'
 
     developerId = 'barteksc'
     developerName = 'Bartosz Schiller'
@@ -32,7 +32,7 @@ android {
         minSdkVersion 11
         targetSdkVersion 25
         versionCode 1
-        versionName "2.6.0"
+        versionName "2.6.1"
     }
 
 }

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

@@ -38,6 +38,8 @@ class AnimationManager {
 
     private OverScroller scroller;
 
+    private boolean flinging = false;
+
     public AnimationManager(PDFView pdfView) {
         this.pdfView = pdfView;
         scroller = new OverScroller(pdfView.getContext());
@@ -74,9 +76,21 @@ public void startZoomAnimation(float centerX, float centerY, float zoomFrom, flo
 
     public void startFlingAnimation(int startX, int startY, int velocityX, int velocityY, int minX, int maxX, int minY, int maxY) {
         stopAll();
+        flinging = true;
         scroller.fling(startX, startY, velocityX, velocityY, minX, maxX, minY, maxY);
     }
 
+    void computeFling() {
+        if (scroller.computeScrollOffset()) {
+            pdfView.moveTo(scroller.getCurrX(), scroller.getCurrY());
+            pdfView.loadPageByOffset();
+        } else if(flinging) { // fling finished
+            flinging = false;
+            pdfView.loadPages();
+            hideHandle();
+        }
+    }
+
     public void stopAll() {
         if (animation != null) {
             animation.cancel();
@@ -86,13 +100,10 @@ public void stopAll() {
     }
 
     public void stopFling() {
+        flinging = false;
         scroller.forceFinished(true);
     }
 
-    public OverScroller getScroller() {
-        return scroller;
-    }
-
     class XAnimation implements AnimatorUpdateListener {
 
         @Override

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

@@ -31,7 +31,6 @@
 import android.os.HandlerThread;
 import android.util.AttributeSet;
 import android.util.Log;
-import android.widget.OverScroller;
 import android.widget.RelativeLayout;
 
 import com.github.barteksc.pdfviewer.listener.OnDrawListener;
@@ -528,17 +527,7 @@ public boolean isRecycled() {
     @Override
     public void computeScroll() {
         super.computeScroll();
-
-        OverScroller scroller = animationManager.getScroller();
-        if (scroller.computeScrollOffset()) {
-            moveTo(scroller.getCurrX(), scroller.getCurrY());
-            loadPageByOffset();
-        } else { // fling finished
-            loadPages();
-            if (getScrollHandle() != null) {
-                getScrollHandle().hideDelayed();
-            }
-        }
+        animationManager.computeFling();
     }
 
     @Override