Fix issue with Configurator#pages() from DImuthuUpe#486

Fix IllegalStateException from DImuthuUpe#464
Fix not detecting links
Add ProGuard info to README
Update version
Update README and CHANGELOG

Author: barteksc

CHANGELOG.md

@@ -1,3 +1,8 @@
+## 3.0.0-beta.5 (2018-01-06)
+* Fix issue with `Configurator#pages()` from #486
+* Fix `IllegalStateException` from #464
+* Fix not detecting links reported in #447
+
 ## 3.0.0-beta.4 (2017-12-15)
 * Fix not loaded pages when using animated `PDFView#jumpTo()`
 * Fix NPE in `canScrollVertically()` and `canScrollHorizontally()`

README.md

@@ -22,6 +22,11 @@ Licensed under Apache License 2.0.
 
 3.0.0-beta.4 fixes not loaded pages when using animated `PDFView#jumpTo()` and NPE in `canScrollVertically()` and `canScrollHorizontally()`
 
+3.0.0-beta.5 fixes:
+* Issue with `Configurator#pages()` from #486
+* `IllegalStateException` from #464
+* Not detecting links reported in #447
+
 ## Changes in 3.0 API
 * Replaced `Contants.PRELOAD_COUNT` with `PRELOAD_OFFSET`
 * Removed `PDFView#fitToWidth()` (variant without arguments)
@@ -33,14 +38,21 @@ Licensed under Apache License 2.0.
 
 Add to _build.gradle_:
 
-`compile 'com.github.barteksc:android-pdf-viewer:3.0.0-beta.4'`
+`compile 'com.github.barteksc:android-pdf-viewer:3.0.0-beta.5'`
 
 or if you want to use more stable version:
 
 `compile 'com.github.barteksc:android-pdf-viewer:2.8.2'`
 
 Library is available in jcenter repository, probably it'll be in Maven Central soon.
 
+## ProGuard
+If you are using ProGuard, add following rule to proguard config file:
+
+```proguard
+-keep class com.shockwave.**
+```
+
 ## Include PDFView in your layout
 
 ``` xml

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.4'
+    libraryVersion = '3.0.0-beta.5'
 
     developerId = 'barteksc'
     developerName = 'Bartosz Schiller'
@@ -32,7 +32,7 @@ android {
         minSdkVersion 11
         targetSdkVersion 25
         versionCode 1
-        versionName "3.0.0-beta.4"
+        versionName "3.0.0-beta.5"
     }
 
 }

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

@@ -97,6 +97,7 @@ private boolean checkLinkTapped(float x, float y) {
         for (PdfDocument.Link link : pdfFile.getPageLinks(page)) {
             RectF mapped = pdfFile.mapRectToDevice(page, pageX, pageY, (int) pageSize.getWidth(),
                     (int) pageSize.getHeight(), link.getBounds());
+            fixCoords(mapped);
             if (mapped.contains(mappedX, mappedY)) {
                 pdfView.callbacks.callLinkHandler(new LinkTapEvent(x, y, mappedX, mappedY, mapped, link));
                 return true;
@@ -105,6 +106,28 @@ private boolean checkLinkTapped(float x, float y) {
         return false;
     }
 
+    /** Fix different coordinate axis */
+    private void fixCoords(RectF rect) {
+        if (rect.top > rect.bottom) {
+            swapTopBottom(rect);
+        }
+        if (rect.left > rect.right) {
+            swapLeftRight(rect);
+        }
+    }
+
+    private void swapTopBottom(RectF rect) {
+        float tmp = rect.top;
+        rect.top = rect.bottom;
+        rect.bottom = tmp;
+    }
+
+    private void swapLeftRight(RectF rect) {
+        float tmp = rect.left;
+        rect.left = rect.right;
+        rect.right = tmp;
+    }
+
     @Override
     public boolean onDoubleTap(MotionEvent e) {
         if (!pdfView.isDoubletapEnabled()) {

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

@@ -215,9 +215,15 @@ ScrollHandle getScrollHandle() {
     /** Spacing between pages, in px */
     private int spacingPx = 0;
 
-    /** pages numbers used when calling onDrawAllListener */
+    /** Pages numbers used when calling onDrawAllListener */
     private List<Integer> onDrawPagesNums = new ArrayList<>(10);
 
+    /** Holds info whether view has been added to layout and has width and height */
+    private boolean hasSize = false;
+
+    /** Holds last used Configurator that should be loaded when view has size */
+    private Configurator waitingDocumentConfigurator;
+
     /** Construct the initial view */
     public PDFView(Context context, AttributeSet set) {
         super(context, set);
@@ -372,6 +378,7 @@ void onPageError(PageRenderingException ex) {
     }
 
     public void recycle() {
+        waitingDocumentConfigurator = null;
 
         animationManager.stopAll();
         dragPinchManager.disable();
@@ -429,6 +436,10 @@ protected void onDetachedFromWindow() {
 
     @Override
     protected void onSizeChanged(int w, int h, int oldw, int oldh) {
+        hasSize = true;
+        if (waitingDocumentConfigurator != null) {
+            waitingDocumentConfigurator.load();
+        }
         if (isInEditMode() || state != State.SHOWN) {
             return;
         }
@@ -1282,6 +1293,10 @@ public Configurator pageFitPolicy(FitPolicy pageFitPolicy) {
         }
 
         public void load() {
+            if (!hasSize) {
+                waitingDocumentConfigurator = this;
+                return;
+            }
             PDFView.this.recycle();
             PDFView.this.callbacks.setOnLoadComplete(onLoadCompleteListener);
             PDFView.this.callbacks.setOnError(onErrorListener);
@@ -1303,16 +1318,11 @@ public void load() {
             PDFView.this.setSpacing(spacing);
             PDFView.this.setPageFitPolicy(pageFitPolicy);
 
-            PDFView.this.post(new Runnable() {
-                @Override
-                public void run() {
-                    if (pageNumbers != null) {
-                        PDFView.this.load(documentSource, password, pageNumbers);
-                    } else {
-                        PDFView.this.load(documentSource, password);
-                    }
-                }
-            });
+            if (pageNumbers != null) {
+                PDFView.this.load(documentSource, password, pageNumbers);
+            } else {
+                PDFView.this.load(documentSource, password);
+            }
         }
     }
 }

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

@@ -129,8 +129,7 @@ public SizeF getPageSize(int pageIndex) {
     }
 
     public SizeF getScaledPageSize(int pageIndex, float zoom) {
-        int docPage = documentPage(pageIndex);
-        SizeF size = getPageSize(docPage);
+        SizeF size = getPageSize(pageIndex);
         return new SizeF(size.getWidth() * zoom, size.getHeight() * zoom);
     }