Fix loading document from subfolder in assets directory

Fix scroll handle NPE after document loading error (improvement of 2.0.3 fix)
Fix incorrect scroll handle position with additional views in RelativeLayout
Improve cache usage and fix bug with rendering when zooming
Update gradle version
Update gradle plugin and maven gradle plugin
Update README and CHANGELOG
Update version

Author: barteksc

CHANGELOG.md

@@ -1,3 +1,10 @@
+## 2.1.0 (2016-09-16)
+* fixed loading document from subfolder in assets directory
+* fixed scroll handle NPE after document loading error (improvement of 2.0.3 fix)
+* fixed incorrect scroll handle position with additional views in RelativeLayout
+* improved cache usage and fixed bug with rendering when zooming
+* if you are using custom scroll handle: scroll handle implementation changed a little bit, check DefaultScrollHandle source for details
+
 ## 2.0.3 (2016-08-30)
 * Fix scroll handle NPE after document loading error
 

README.md

@@ -6,18 +6,12 @@ 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 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
-
-2.0.1 fixes NPE when onDetachFromWindow is called.
-
-2.0.2 fixes exceptions caused by improperly finishing rendering task.
-
-2.0.3 fixes scroll handle NPE after document loading error
+## What's new in 2.1.0?
+* fixed loading document from subfolder in assets directory
+* fixed scroll handle NPE after document loading error (improvement of 2.0.3 fix)
+* fixed incorrect scroll handle position with additional views in RelativeLayout
+* improved cache usage and fixed bug with rendering when zooming
+* if you are using custom scroll handle: scroll handle implementation changed a little bit, check DefaultScrollHandle source for details
 
 ## Changes in 2.0 API
 * `Configurator#defaultPage(int)` and `PDFView#jumpTo(int)` now require page index (i.e. starting from 0)
@@ -32,7 +26,7 @@ Licensed under Apache License 2.0.
 
 Add to _build.gradle_:
 
-`compile 'com.github.barteksc:android-pdf-viewer:2.0.3'`
+`compile 'com.github.barteksc:android-pdf-viewer:2.1.0'`
 
 Library is available in jcenter repository, probably it'll be in Maven Central soon.
 
@@ -78,7 +72,7 @@ pdfView.fromAsset(String)
 
 Scroll handle is replacement for **ScrollBar** from 1.x branch.
 
-If you want to use **ScrollHandle**, it's important that the parent view is **RelativeLayout**.
+From version 2.1.0 putting **PDFView** in **RelativeLayout** to use **ScrollHandle** is not required, you can use any layout.
 
 To use scroll handle just register it using method `Configurator#scrollHandle()`.
 This method accepts implementations of **ScrollHandle** interface.

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.0.3'
+    libraryVersion = '2.1.0'
 
     developerId = 'barteksc'
     developerName = 'Bartosz Schiller'
@@ -32,7 +32,7 @@ android {
         minSdkVersion 11
         targetSdkVersion 23
         versionCode 1
-        versionName "2.0.3"
+        versionName "2.1.0"
     }
 
 }

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

@@ -29,6 +29,7 @@
 import android.util.AttributeSet;
 import android.util.Log;
 import android.view.View;
+import android.widget.RelativeLayout;
 
 import com.github.barteksc.pdfviewer.exception.FileNotFoundException;
 import com.github.barteksc.pdfviewer.listener.OnDrawListener;
@@ -68,7 +69,7 @@
  * using {@link #load(String, boolean, String, OnLoadCompleteListener, OnErrorListener, int[])}. In this
  * particular case, a userPage of 5 can refer to a documentPage of 17.
  */
-public class PDFView extends View {
+public class PDFView extends RelativeLayout {
 
     private static final String TAG = PDFView.class.getSimpleName();
 
@@ -238,6 +239,8 @@ enum ScrollDir {
 
     private ScrollHandle scrollHandle;
 
+    private boolean isScrollHandleInit = false;
+
     ScrollHandle getScrollHandle() {
         return scrollHandle;
     }
@@ -273,6 +276,7 @@ public PDFView(Context context, AttributeSet set) {
         debugPaint.setStyle(Style.STROKE);
 
         pdfiumCore = new PdfiumCore(context);
+        setWillNotDraw(false);
     }
 
     private void load(String path, boolean isAsset, String password, OnLoadCompleteListener listener, OnErrorListener onErrorListener) {
@@ -446,7 +450,7 @@ public void recycle() {
         // Clear caches
         cacheManager.recycle();
 
-        if (scrollHandle != null && state != State.ERROR) {
+        if (scrollHandle != null && isScrollHandleInit) {
             scrollHandle.destroyLayout();
         }
 
@@ -459,6 +463,7 @@ public void recycle() {
         filteredUserPageIndexes = null;
         pdfDocument = null;
         scrollHandle = null;
+        isScrollHandleInit = false;
         currentXOffset = currentYOffset = 0;
         zoom = 1f;
         recycled = true;
@@ -666,6 +671,7 @@ public void loadComplete(PdfDocument pdfDocument) {
 
         if (scrollHandle != null) {
             scrollHandle.setupLayout(this);
+            isScrollHandleInit = true;
         }
 
         // Notify the listener

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

@@ -116,7 +116,11 @@ private int loadRelative(int number, int nbOfPartsLoadable, boolean outsideView)
         loadThumbnail(holder.page, documentPage);
 
         if (pdfView.isSwipeVertical()) {
-            for (int col = 0; col < colsRows.first; col++) {
+            int firstCol = MathUtils.floor(xOffset / colWidth);
+            firstCol = MathUtils.min(firstCol - 1, 0);
+            int lastCol = MathUtils.ceil((xOffset + pdfView.getWidth()) / colWidth);
+            lastCol = MathUtils.max(lastCol + 1, colsRows.first);
+            for (int col = firstCol; col <= lastCol; col++) {
                 if (loadCell(holder.page, documentPage, holder.row, col, pageRelativePartWidth, pageRelativePartHeight)) {
                     loaded++;
                 }
@@ -125,7 +129,11 @@ private int loadRelative(int number, int nbOfPartsLoadable, boolean outsideView)
                 }
             }
         } else {
-            for (int row = 0; row < colsRows.second; row++) {
+            int firstRow = MathUtils.floor(yOffset / rowHeight);
+            firstRow = MathUtils.min(firstRow - 1, 0);
+            int lastRow = MathUtils.ceil((yOffset + pdfView.getHeight()) / rowHeight);
+            lastRow = MathUtils.max(lastRow + 1, colsRows.second);
+            for (int row = firstRow; row <= lastRow; row++) {
                 if (loadCell(holder.page, documentPage, row, holder.col, pageRelativePartWidth, pageRelativePartHeight)) {
                     loaded++;
                 }

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

@@ -60,20 +60,20 @@ public void setupLayout(PDFView pdfView) {
             width = HANDLE_LONG;
             height = HANDLE_SHORT;
             if (inverted) { // left
-                align = ALIGN_LEFT;
+                align = ALIGN_PARENT_LEFT;
                 background = ContextCompat.getDrawable(context, R.drawable.default_scroll_handle_left);
             } else { // right
-                align = ALIGN_RIGHT;
+                align = ALIGN_PARENT_RIGHT;
                 background = ContextCompat.getDrawable(context, R.drawable.default_scroll_handle_right);
             }
         } else {
             width = HANDLE_SHORT;
             height = HANDLE_LONG;
             if (inverted) { // top
-                align = ALIGN_TOP;
+                align = ALIGN_PARENT_TOP;
                 background = ContextCompat.getDrawable(context, R.drawable.default_scroll_handle_top);
             } else { // bottom
-                align = ALIGN_BOTTOM;
+                align = ALIGN_PARENT_BOTTOM;
                 background = ContextCompat.getDrawable(context, R.drawable.default_scroll_handle_bottom);
             }
         }
@@ -92,20 +92,15 @@ public void setupLayout(PDFView pdfView) {
 
         addView(textView, tvlp);
 
-        lp.addRule(align, pdfView.getId());
-        ((ViewGroup) pdfView.getParent()).addView(this, lp);
+        lp.addRule(align);
+        pdfView.addView(this, lp);
 
         this.pdfView = pdfView;
     }
 
     @Override
     public void destroyLayout() {
-        post(new Runnable() {
-            @Override
-            public void run() {
-                ((ViewGroup) pdfView.getParent()).removeView(DefaultScrollHandle.this);
-            }
-        });
+        pdfView.removeView(this);
     }
 
     @Override

android-pdf-viewer/src/main/java/com/github/barteksc/pdfviewer/util/FileUtils.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.
@@ -31,6 +31,9 @@ private FileUtils() {
 
     public static File fileFromAsset(Context context, String assetName) throws IOException {
         File outFile = new File(context.getCacheDir(), assetName + "-pdfview.pdf");
+        if (assetName.contains("/")) {
+            outFile.getParentFile().mkdirs();
+        }
         copy(context.getAssets().open(assetName), outFile);
         return outFile;
     }

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

@@ -73,6 +73,20 @@ public static float min(float number, float min) {
         return number;
     }
 
+    public static int max(int number, int max) {
+        if (number > max) {
+            return max;
+        }
+        return number;
+    }
+
+    public static int min(int number, int min) {
+        if (number < min) {
+            return min;
+        }
+        return number;
+    }
+
     /**
      * Methods from libGDX - https://github.com/libgdx/libgdx
      */

build.gradle

@@ -4,9 +4,9 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:2.1.2'
+        classpath 'com.android.tools.build:gradle:2.1.3'
         classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.6'
-        classpath 'com.github.dcendents:android-maven-gradle-plugin:1.3'
+        classpath 'com.github.dcendents:android-maven-gradle-plugin:1.4.1'
     }
 }
 

gradle/wrapper/gradle-wrapper.properties

@@ -3,4 +3,4 @@ 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-2.14.1-all.zip