Improved rendering speed and accuracy

Use Android gesture detector
Add continuous scroll
Add fling scroll gesture for velocity based scrolling
Remove Scrollbar
Add scroll handle
Update README and CHANGELOG
Update version

Author: barteksc

CHANGELOG.md

@@ -1,3 +1,19 @@
+## 2.0.0 (2016-08-14)
+* few API changes
+* improved rendering speed and accuracy
+* added continuous scroll - now it behaves like Adobe Reader and others
+* added `fling` scroll gesture for velocity based scrolling
+* added scroll handle as a replacement for scrollbar
+
+### 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)
+* removed scrollbar
+* added scroll handle as a replacement for scrollbar, use with `Configurator#scrollHandle()`
+* added `OnPageScrollListener` listener due to continuous scroll, register with `Configurator#onPageScroll()`
+* default scroll direction is vertical, so `Configurator#swipeVertical()` was changed to `Configurator#swipeHorizontal()`
+* removed minimap and mask configuration
+
 ## 1.4.0 (2016-07-25)
 * Fix NPE and IndexOutOfBound bugs when rendering parts
 * Merge pull request by [paulo-sato-daitan](https://github.com/paulo-sato-daitan) for disabling page change animation

README.md

@@ -6,19 +6,27 @@ Library for displaying PDF documents on Android, with `animations`, `gestures`,
 It is based on [PdfiumAndroid](https://github.com/barteksc/PdfiumAndroid) for decoding PDF files. Works on API 11 and higher.
 Licensed under Apache License 2.0.
 
-## What's new in 1.4.0?
-* Fix NPE and IndexOutOfBound bugs when rendering parts
-* Merge pull request by [paulo-sato-daitan](https://github.com/paulo-sato-daitan) for disabling page change animation
-* Merge pull request by [Miha-x64](https://github.com/Miha-x64) for drawing background if set on `PDFView`
-
-Next release is coming soon, it will introduce continuous scroll through whole document
-and some incompatibilities with current API (only few small).
+## What's new in 2.0.0?
+* few API changes
+* improved rendering speed and accuracy
+* added continuous scroll - now it behaves like Adobe Reader and others
+* added `fling` scroll gesture for velocity based scrolling
+* added scroll handle as a replacement for scrollbar
+
+## 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)
+* removed scrollbar
+* added scroll handle as a replacement for scrollbar, use with `Configurator#scrollHandle()`
+* added `OnPageScrollListener` listener due to continuous scroll, register with `Configurator#onPageScroll()`
+* default scroll direction is vertical, so `Configurator#swipeVertical()` was changed to `Configurator#swipeHorizontal()`
+* removed minimap and mask configuration
 
 ## Installation
 
 Add to _build.gradle_:
 
-`compile 'com.github.barteksc:android-pdf-viewer:1.4.0'`
+`compile 'com.github.barteksc:android-pdf-viewer:2.0.0'`
 
 Library is available in jcenter repository, probably it'll be in Maven Central soon.
 
@@ -42,105 +50,41 @@ or
 pdfView.fromAsset(String)
     .pages(0, 2, 1, 3, 3, 3) // all pages are displayed by default
     .enableSwipe(true)
+    .swipeHorizontal(false)
     .enableDoubletap(true)
-    .swipeVertical(false)
-    .defaultPage(1)
-    .showMinimap(false)
+    .defaultPage(0)
     .onDraw(onDrawListener)
     .onLoad(onLoadCompleteListener)
     .onPageChange(onPageChangeListener)
+    .onPageScroll(onPageScrollListener)
     .onError(onErrorListener)
     .enableAnnotationRendering(false)
     .password(null)
-    .showPageWithAnimation(true)
+    .scrollHandle(null)
     .load();
 ```
 
 * `enableSwipe` is optional, it allows you to block changing pages using swipe
 * `pages` is optional, it allows you to filter and order the pages of the PDF as you need
 * `onDraw` is also optional, and allows you to draw something on a provided canvas, above the current page
 
-## Show scrollbar
+## Scroll handle
 
-Use **ScrollBar** class to place scrollbar view near **PDFView**
+Scroll handle is replacement for **ScrollBar** from 1.x branch.
 
-1. in layout XML (it's important that the parent view is **RelativeLayout**):
+If you want to use **ScrollHandle**, it's important that the parent view is **RelativeLayout**.
 
-    Vertically:
-    ``` xml
-    <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent">
-
-        <com.github.barteksc.pdfviewer.PDFView
-            android:id="@+id/pdfView"
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:layout_toLeftOf="@+id/scrollBar"/>
-
-        <com.github.barteksc.pdfviewer.ScrollBar
-            android:id="@+id/scrollBar"
-            android:layout_width="wrap_content"
-            android:layout_height="match_parent"
-            android:layout_alignParentRight="true"
-            android:layout_alignParentEnd="true" />
-
-    </RelativeLayout>
-    ```
-    Horizontally:
-    ``` xml
-    <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    	android:layout_width="match_parent"
-    	android:layout_height="match_parent"
-    	xmlns:app="http://schemas.android.com/apk/res-auto">
-
-        <com.github.barteksc.pdfviewer.PDFView
-            android:id="@+id/pdfView"
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"/>
-
-    	<com.github.barteksc.pdfviewer.ScrollBar
-    		android:id="@+id/scrollBar"
-    		android:layout_width="match_parent"
-    		android:layout_height="wrap_content"
-    		app:sb_horizontal="true"
-    		android:layout_alignParentBottom="true" />
-
-    </RelativeLayout>
-    ```
-2. in activity or fragment
-    ``` java
-
-    @Override
-        protected void onCreate(Bundle savedInstanceState) {
-            super.onCreate(savedInstanceState);
-
-            ...
-
-            PDFView pdfView = (PDFView) findViewById(R.id.pdfView);
-            ScrollBar scrollBar = (ScrollBar) findViewById(R.id.scrollBar);
-            pdfView.setScrollBar(scrollBar);
-        }
-    ```
-
-    `scrollBar.setHorizontal(true);` or `app:sb_horizontal="true"` may be used to set **ScrollBar** in horizontal mode.
-
-
-Scrollbar styling:
-``` xml
-    <com.github.barteksc.pdfviewpager.view.ScrollBar
-        android:layout_width="wrap_content"
-        android:layout_height="match_parent"
-        app:sb_handlerColor="..." <!-- scrollbar handler color -->
-        app:sb_indicatorColor="..." <!-- background color of current page indicator -->
-        app:sb_indicatorTextColor="..." <!-- text color of current page indicator -->
-        app:sb_horizontal="true|false|reference" <!-- whether to set horizontal mode -->
-        android:background="..." <!-- scrollbar background -->
-        />
-```
+To use scroll handle just register it using method `Configurator#scrollHandle()`.
+This method accepts implementations of **ScrollHandle** interface.
+
+There is default implementation shipped with AndroidPdfViewer, and you can use it with
+`.scrollHandle(new DefaultScrollHandle(this))`.
+**DefaultScrollHandle** is placed on the right (when scrolling vertically) or on the bottom (when scrolling horizontally).
+By using constructor with second argument (`new DefaultScrollHandle(this, true)`), handle can be placed left or top.
+
+You can also create custom scroll handles, just implement **ScrollHandle** interface.
+All methods are documented as Javadoc comments on interface [source](https://github.com/barteksc/AndroidPdfViewer/tree/master/android-pdf-viewer/src/main/java/com/github/barteksc/pdfviewer/scroll/ScrollHandle.java).
 
-**ScrollBarPageIndicator** is added to scrollbar automatically and is shown while dragging scrollbar handler,
- displaying number of page on current position. Its position is automatically calculated based on **ScrollBar**'s position.
 
 ## Additional options
 

android-pdf-viewer/build.gradle

@@ -13,7 +13,7 @@ ext {
     siteUrl = 'https://github.com/barteksc/AndroidPdfViewer'
     gitUrl = 'https://github.com/barteksc/AndroidPdfViewer.git'
 
-    libraryVersion = '1.4.0'
+    libraryVersion = '2.0.0'
 
     developerId = 'barteksc'
     developerName = 'Bartosz Schiller'
@@ -32,7 +32,7 @@ android {
         minSdkVersion 11
         targetSdkVersion 23
         versionCode 1
-        versionName "1.4.0"
+        versionName "2.0.0"
     }
 
 }

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

@@ -1,12 +1,12 @@
 /**
  * Copyright 2016 Bartosz Schiller
- * <p>
+ * <p/>
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
- * <p>
+ * <p/>
  * http://www.apache.org/licenses/LICENSE-2.0
- * <p>
+ * <p/>
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -21,6 +21,7 @@
 import android.animation.ValueAnimator.AnimatorUpdateListener;
 import android.graphics.PointF;
 import android.view.animation.DecelerateInterpolator;
+import android.widget.Scroller;
 
 
 /**
@@ -31,21 +32,21 @@
  */
 class AnimationManager {
 
-    /**
-     * PDF View
-     */
     private PDFView pdfView;
 
     private ValueAnimator animation;
 
+    private Scroller scroller;
+
+    private ValueAnimator flingAnimation;
+
     public AnimationManager(PDFView pdfView) {
         this.pdfView = pdfView;
+        scroller = new Scroller(pdfView.getContext(), null, true);
     }
 
     public void startXAnimation(float xFrom, float xTo) {
-        if (animation != null) {
-            animation.cancel();
-        }
+        stopAll();
         animation = ValueAnimator.ofFloat(xFrom, xTo);
         animation.setInterpolator(new DecelerateInterpolator());
         animation.addUpdateListener(new XAnimation());
@@ -54,34 +55,50 @@ public void startXAnimation(float xFrom, float xTo) {
     }
 
     public void startYAnimation(float yFrom, float yTo) {
-        if (animation != null) {
-            animation.cancel();
-        }
+        stopAll();
         animation = ValueAnimator.ofFloat(yFrom, yTo);
         animation.setInterpolator(new DecelerateInterpolator());
         animation.addUpdateListener(new YAnimation());
         animation.setDuration(400);
         animation.start();
     }
 
-    public void startZoomAnimation(float zoomFrom, float zoomTo) {
-        if (animation != null) {
-            animation.cancel();
-        }
+    public void startZoomAnimation(float centerX, float centerY, float zoomFrom, float zoomTo) {
+        stopAll();
         animation = ValueAnimator.ofFloat(zoomFrom, zoomTo);
         animation.setInterpolator(new DecelerateInterpolator());
-        ZoomAnimation zoomAnim = new ZoomAnimation();
+        ZoomAnimation zoomAnim = new ZoomAnimation(centerX, centerY);
         animation.addUpdateListener(zoomAnim);
         animation.addListener(zoomAnim);
         animation.setDuration(400);
         animation.start();
     }
 
+    public void startFlingAnimation(int startX, int startY, int velocityX, int velocityY, int minX, int maxX, int minY, int maxY) {
+        stopAll();
+        flingAnimation = ValueAnimator.ofFloat(0, 1);
+        FlingAnimation flingAnim = new FlingAnimation();
+        flingAnimation.addUpdateListener(flingAnim);
+        flingAnimation.addListener(flingAnim);
+        scroller.fling(startX, startY, velocityX, velocityY, minX, maxX, minY, maxY);
+        flingAnimation.setDuration(scroller.getDuration());
+        flingAnimation.start();
+    }
+
     public void stopAll() {
         if (animation != null) {
             animation.cancel();
             animation = null;
         }
+        stopFling();
+    }
+
+    public void stopFling() {
+        if (flingAnimation != null) {
+            scroller.forceFinished(true);
+            flingAnimation.cancel();
+            flingAnimation = null;
+        }
     }
 
     class XAnimation implements AnimatorUpdateListener {
@@ -106,10 +123,18 @@ public void onAnimationUpdate(ValueAnimator animation) {
 
     class ZoomAnimation implements AnimatorUpdateListener, AnimatorListener {
 
+        private final float centerX;
+        private final float centerY;
+
+        public ZoomAnimation(float centerX, float centerY) {
+            this.centerX = centerX;
+            this.centerY = centerY;
+        }
+
         @Override
         public void onAnimationUpdate(ValueAnimator animation) {
             float zoom = (Float) animation.getAnimatedValue();
-            pdfView.zoomCenteredTo(zoom, new PointF(pdfView.getWidth() / 2, pdfView.getHeight() / 2));
+            pdfView.zoomCenteredTo(zoom, new PointF(centerX, centerY));
         }
 
         @Override
@@ -119,6 +144,7 @@ public void onAnimationCancel(Animator animation) {
         @Override
         public void onAnimationEnd(Animator animation) {
             pdfView.loadPages();
+            hideHandle();
         }
 
         @Override
@@ -131,4 +157,42 @@ public void onAnimationStart(Animator animation) {
 
     }
 
+    class FlingAnimation implements AnimatorUpdateListener, AnimatorListener {
+        @Override
+        public void onAnimationUpdate(ValueAnimator animation) {
+            if (!scroller.isFinished()) {
+                scroller.computeScrollOffset();
+                pdfView.moveTo(scroller.getCurrX(), scroller.getCurrY());
+                pdfView.loadPageByOffset();
+            }
+        }
+
+        @Override
+        public void onAnimationStart(Animator animation) {
+
+        }
+
+        @Override
+        public void onAnimationEnd(Animator animation) {
+            pdfView.loadPages();
+            hideHandle();
+        }
+
+        @Override
+        public void onAnimationCancel(Animator animation) {
+
+        }
+
+        @Override
+        public void onAnimationRepeat(Animator animation) {
+
+        }
+    }
+
+    private void hideHandle() {
+        if (pdfView.getScrollHandle() != null) {
+            pdfView.getScrollHandle().hideDelayed();
+        }
+    }
+
 }