Merge branch 'usef-master'

Author: barteksc

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

@@ -265,6 +265,12 @@ public class PDFView extends SurfaceView {
      */
     private boolean bestQuality = false;
 
+    /**
+     * True if annotations should be rendered
+     * False otherwise
+     */
+    private boolean annotationRendering = false;
+
     /**
      * Storing already opened pages. Used form optimizing Pdfium calls
      */
@@ -677,7 +683,7 @@ private int loadPage(final int userPage, final int nbOfPartsLoadable) {
             renderingAsyncTask.addRenderingTask(userPage, documentPage, //
                     (int) (optimalPageWidth * Constants.THUMBNAIL_RATIO), //
                     (int) (optimalPageHeight * Constants.THUMBNAIL_RATIO), //
-                    new RectF(0, 0, 1, 1), true, 0, bestQuality);
+                    new RectF(0, 0, 1, 1), true, 0, bestQuality, annotationRendering);
         }
 
         // When we want to render a 256x256 bloc, we also need to provide
@@ -757,7 +763,7 @@ public boolean onLoop(int row, int col) {
                         // If not already in cache, register the rendering
                         // task for further execution.
                         renderingAsyncTask.addRenderingTask(userPage, documentPageFinal, //
-                                renderWidth, renderHeight, pageRelativeBounds, false, nbItemTreated, bestQuality);
+                                renderWidth, renderHeight, pageRelativeBounds, false, nbItemTreated, bestQuality, annotationRendering);
                     }
 
                 }
@@ -1174,6 +1180,10 @@ public void useBestQuality(boolean bestQuality) {
         this.bestQuality = bestQuality;
     }
 
+    public void enableAnnotationRendering(boolean annotationRendering) {
+        this.annotationRendering = annotationRendering;
+    }
+
     public PdfDocument.Meta getDocumentMeta() {
         if(pdfDocument == null) {
             return null;
@@ -1254,6 +1264,8 @@ public class Configurator {
 
         private boolean swipeVertical = false;
 
+        private boolean annotationRendering = false;
+
         private int maskColor = Color.BLACK;
 
         private int maskAlpha = Constants.MASK_ALPHA;
@@ -1280,6 +1292,11 @@ public Configurator enableDoubletap(boolean enableDoubletap) {
             return this;
         }
 
+        public Configurator enableAnnotationRendering(boolean annotationRendering) {
+            this.annotationRendering = annotationRendering;
+            return this;
+        }
+
         public Configurator onDraw(OnDrawListener onDrawListener) {
             this.onDrawListener = onDrawListener;
             return this;
@@ -1335,6 +1352,7 @@ public void load() {
             PDFView.this.setDefaultPage(defaultPage);
             PDFView.this.setUserWantsMinimap(showMinimap);
             PDFView.this.setSwipeVertical(swipeVertical);
+            PDFView.this.enableAnnotationRendering(annotationRendering);
             PDFView.this.dragPinchManager.setSwipeVertical(swipeVertical);
             PDFView.this.maskPaint = new Paint();
             PDFView.this.maskPaint.setColor(maskColor);

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

@@ -47,8 +47,8 @@ public RenderingAsyncTask(PDFView pdfView, PdfiumCore pdfiumCore, PdfDocument pd
         this.pdfDocument = pdfDocument;
     }
 
-    public void addRenderingTask(int userPage, int page, float width, float height, RectF bounds, boolean thumbnail, int cacheOrder, boolean bestQuality) {
-        RenderingTask task = new RenderingTask(width, height, bounds, userPage, page, thumbnail, cacheOrder, bestQuality);
+    public void addRenderingTask(int userPage, int page, float width, float height, RectF bounds, boolean thumbnail, int cacheOrder, boolean bestQuality, boolean annotationRendering) {
+        RenderingTask task = new RenderingTask(width, height, bounds, userPage, page, thumbnail, cacheOrder, bestQuality, annotationRendering);
         renderingTasks.add(task);
         wakeUp();
     }
@@ -107,7 +107,7 @@ private PagePart proceed(RenderingTask renderingTask) {
 
         pdfiumCore.renderPageBitmap(pdfDocument, render, renderingTask.page,
                 roundedRenderBounds.left, roundedRenderBounds.top,
-                roundedRenderBounds.width(), roundedRenderBounds.height());
+                roundedRenderBounds.width(), roundedRenderBounds.height(), renderingTask.annotationRendering);
 
         if (!renderingTask.bestQuality) {
             Bitmap cpy = render.copy(Bitmap.Config.RGB_565, false);
@@ -157,7 +157,9 @@ private class RenderingTask {
 
         boolean bestQuality;
 
-        public RenderingTask(float width, float height, RectF bounds, int userPage, int page, boolean thumbnail, int cacheOrder, boolean bestQuality) {
+        boolean annotationRendering;
+
+        public RenderingTask(float width, float height, RectF bounds, int userPage, int page, boolean thumbnail, int cacheOrder, boolean bestQuality, boolean annotationRendering) {
             super();
             this.page = page;
             this.width = width;
@@ -167,6 +169,7 @@ public RenderingTask(float width, float height, RectF bounds, int userPage, int
             this.thumbnail = thumbnail;
             this.cacheOrder = cacheOrder;
             this.bestQuality = bestQuality;
+            this.annotationRendering = annotationRendering;
         }
 
     }

sample/src/main/java/com/github/barteksc/sample/PDFViewActivity.java

@@ -88,6 +88,7 @@ private void displayFromAsset(String assetFileName) {
                 .onPageChange(this)
                 .swipeVertical(true)
                 .showMinimap(false)
+                .enableAnnotationRendering(true)
                 .onLoad(this)
                 .load();
     }
@@ -100,6 +101,7 @@ private void displayFromUri(Uri uri) {
                 .onPageChange(this)
                 .swipeVertical(true)
                 .showMinimap(false)
+                .enableAnnotationRendering(true)
                 .onLoad(this)
                 .load();
     }