Merge branch 'paulo-sato-daitan-master'

barteksc · barteksc · commit 395ceaa2137d · 2016-07-25T22:41:34.000+02:00
diff --git a/android-pdf-viewer/src/main/java/com/github/barteksc/pdfviewer/PDFView.java b/android-pdf-viewer/src/main/java/com/github/barteksc/pdfviewer/PDFView.java
@@ -250,6 +250,11 @@ public class PDFView extends SurfaceView {
      */
     private boolean swipeVertical = false;
 
+    /**
+     * True if should show a page with animation
+     */
+    private boolean showPageWithAnimation = true;
+
     /**
      * Pdfium core for loading and rendering PDFs
      */
@@ -282,7 +287,7 @@ public class PDFView extends SurfaceView {
     public PDFView(Context context, AttributeSet set) {
         super(context, set);
 
-        if(isInEditMode()) {
+        if (isInEditMode()) {
             return;
         }
 
@@ -347,7 +352,7 @@ public void jumpTo(int page) {
     }
 
     void showPage(int pageNb) {
-        if(recycled) {
+        if (recycled) {
             return;
         }
         state = State.SHOWN;
@@ -366,11 +371,20 @@ void showPage(int pageNb) {
 
         // Reset the zoom and center the page on the screen
         resetZoom();
-        if (swipeVertical) {
-            animationManager.startYAnimation(currentYOffset, calculateCenterOffsetForPage(pageNb));
+        if (showPageWithAnimation) {
+            if (swipeVertical) {
+                animationManager.startYAnimation(currentYOffset, calculateCenterOffsetForPage(pageNb));
+            } else {
+                animationManager.startXAnimation(currentXOffset, calculateCenterOffsetForPage(pageNb));
+            }
         } else {
-            animationManager.startXAnimation(currentXOffset, calculateCenterOffsetForPage(pageNb));
+            if (swipeVertical) {
+                moveTo(getCurrentXOffset(), calculateCenterOffsetForPage(pageNb));
+            } else {
+                moveTo(calculateCenterOffsetForPage(pageNb), getCurrentYOffset());
+            }
         }
+
         loadPages();
 
         if (scrollBar != null) {
@@ -447,7 +461,7 @@ protected void onDetachedFromWindow() {
 
     @Override
     protected void onSizeChanged(int w, int h, int oldw, int oldh) {
-        if(isInEditMode()) {
+        if (isInEditMode()) {
             return;
         }
         animationManager.stopAll();
@@ -496,7 +510,7 @@ protected void onDraw(Canvas canvas) {
         // Draws background
         canvas.drawColor(Color.WHITE);
 
-        if(recycled) {
+        if (recycled) {
             return;
         }
 
@@ -641,7 +655,7 @@ public void loadPages() {
 
     /**
      * Render a page, creating 1 to <i>nbOfPartsLoadable</i> page parts. <br><br>
-     * <p/>
+     * <p>
      * This is one of the trickiest method of this library. It finds
      * the DocumentPage associated with the given UserPage, loads its
      * thumbnail, cut this page into 256x256 blocs considering the
@@ -792,7 +806,7 @@ public void loadComplete(PdfDocument pdfDocument) {
         this.documentPageCount = pdfiumCore.getPageCount(pdfDocument);
 
         int firstPageIdx = 0;
-        if(originalUserPages != null) {
+        if (originalUserPages != null) {
             firstPageIdx = originalUserPages[0];
         }
 
@@ -1185,14 +1199,14 @@ public void enableAnnotationRendering(boolean annotationRendering) {
     }
 
     public PdfDocument.Meta getDocumentMeta() {
-        if(pdfDocument == null) {
+        if (pdfDocument == null) {
             return null;
         }
         return pdfiumCore.getDocumentMeta(pdfDocument);
     }
 
     public List<PdfDocument.Bookmark> getTableOfContents() {
-        if(pdfDocument == null) {
+        if (pdfDocument == null) {
             return new ArrayList<>();
         }
         return pdfiumCore.getTableOfContents(pdfDocument);
@@ -1264,6 +1278,8 @@ public class Configurator {
 
         private boolean swipeVertical = false;
 
+        private boolean showPageWithAnimation = true;
+
         private boolean annotationRendering = false;
 
         private int maskColor = Color.BLACK;
@@ -1327,6 +1343,11 @@ public Configurator swipeVertical(boolean swipeVertical) {
             return this;
         }
 
+        public Configurator showPageWithAnimation(boolean showPageWithAnimation) {
+            this.showPageWithAnimation = showPageWithAnimation;
+            return this;
+        }
+
         public Configurator password(String password) {
             this.password = password;
             return this;
@@ -1352,6 +1373,7 @@ public void load() {
             PDFView.this.setDefaultPage(defaultPage);
             PDFView.this.setUserWantsMinimap(showMinimap);
             PDFView.this.setSwipeVertical(swipeVertical);
+            PDFView.this.setShowPageWithAnimation(showPageWithAnimation);
             PDFView.this.enableAnnotationRendering(annotationRendering);
             PDFView.this.dragPinchManager.setSwipeVertical(swipeVertical);
             PDFView.this.maskPaint = new Paint();
@@ -1377,4 +1399,8 @@ public boolean isSwipeVertical() {
     public void setSwipeVertical(boolean swipeVertical) {
         this.swipeVertical = swipeVertical;
     }
+
+    public void setShowPageWithAnimation(boolean showPageWithAnimation) {
+        this.showPageWithAnimation = showPageWithAnimation;
+    }
 }
