Add fitEachPage option

Author: Flamedek

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

@@ -48,7 +48,8 @@ protected Throwable doInBackground(Void... params) {
         try {
             PdfDocument pdfDocument = docSource.createDocument(pdfView.getContext(), pdfiumCore, password);
             pdfFile = new PdfFile(pdfiumCore, pdfDocument, pdfView.getPageFitPolicy(), getViewSize(),
-                    userPages, pdfView.isSwipeVertical(), pdfView.getSpacingPx(), pdfView.doAutoSpacing());
+                    userPages, pdfView.isSwipeVertical(), pdfView.getSpacingPx(), pdfView.doAutoSpacing(),
+                    pdfView.doFitEachPage());
             return null;
         } catch (Throwable t) {
             return t;

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

@@ -168,6 +168,8 @@ enum ScrollDir {
     /** Policy for fitting pages to screen */
     private FitPolicy pageFitPolicy = FitPolicy.WIDTH;
 
+    private boolean fitEachPage = false;
+
     private int defaultPage = 0;
 
     /** True if should scroll through pages vertically instead of horizontally */
@@ -1190,6 +1192,14 @@ public FitPolicy getPageFitPolicy() {
         return pageFitPolicy;
     }
 
+    private void setFitEachPage(boolean fitEachPage) {
+        this.fitEachPage = fitEachPage;
+    }
+
+    public boolean doFitEachPage() {
+        return fitEachPage;
+    }
+
     public boolean doPageSnap() {
         return pageSnap;
     }
@@ -1306,6 +1316,8 @@ public class Configurator {
 
         private FitPolicy pageFitPolicy = FitPolicy.WIDTH;
 
+        private boolean fitEachPage = false;
+
         private boolean pageFling = false;
 
         private boolean pageSnap = false;
@@ -1424,6 +1436,11 @@ public Configurator pageFitPolicy(FitPolicy pageFitPolicy) {
             return this;
         }
 
+        public Configurator fitEachPage(boolean fitEachPage) {
+            this.fitEachPage = fitEachPage;
+            return this;
+        }
+
         public Configurator pageSnap(boolean pageSnap) {
             this.pageSnap = pageSnap;
             return this;
@@ -1460,6 +1477,7 @@ public void load() {
             PDFView.this.setSpacing(spacing);
             PDFView.this.setAutoSpacing(autoSpacing);
             PDFView.this.setPageFitPolicy(pageFitPolicy);
+            PDFView.this.setFitEachPage(fitEachPage);
             PDFView.this.setPageSnap(pageSnap);
             PDFView.this.setPageFling(pageFling);
 

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

@@ -52,9 +52,9 @@ class PdfFile {
     /** Scaled page with maximum width */
     private SizeF maxWidthPageSize = new SizeF(0, 0);
     /** True if scrolling is vertical, else it's horizontal */
-    private boolean isVertical = true;
+    private boolean isVertical;
     /** Fixed spacing between pages in pixels */
-    private int spacingPx = 0;
+    private int spacingPx;
     /** Calculate spacing automatically so each page fits on it's own in the center of the view */
     private boolean autoSpacing;
     /** Calculated offsets for pages */
@@ -64,21 +64,24 @@ class PdfFile {
     /** Calculated document length (width or height, depending on swipe mode) */
     private float documentLength = 0;
     private final FitPolicy pageFitPolicy;
+    /** If every page should fit to the screen as best as possible regardless of relative size */
+    private boolean fitEachPage;
     /**
      * The pages the user want to display in order
      * (ex: 0, 2, 2, 8, 8, 1, 1, 1)
      */
     private int[] originalUserPages;
 
     PdfFile(PdfiumCore pdfiumCore, PdfDocument pdfDocument, FitPolicy pageFitPolicy, Size viewSize, int[] originalUserPages,
-            boolean isVertical, int spacing, boolean autoSpacing) {
+            boolean isVertical, int spacing, boolean autoSpacing, boolean fitEachPage) {
         this.pdfiumCore = pdfiumCore;
         this.pdfDocument = pdfDocument;
         this.pageFitPolicy = pageFitPolicy;
         this.originalUserPages = originalUserPages;
         this.isVertical = isVertical;
         this.spacingPx = spacing;
         this.autoSpacing = autoSpacing;
+        this.fitEachPage = fitEachPage;
         setup(viewSize);
     }
 
@@ -111,7 +114,7 @@ private void setup(Size viewSize) {
     public void recalculatePageSizes(Size viewSize) {
         pageSizes.clear();
         PageSizeCalculator calculator = new PageSizeCalculator(pageFitPolicy, originalMaxWidthPageSize,
-                originalMaxHeightPageSize, viewSize);
+                originalMaxHeightPageSize, viewSize, fitEachPage);
         maxWidthPageSize = calculator.getOptimalMaxWidthPageSize();
         maxHeightPageSize = calculator.getOptimalMaxHeightPageSize();
 

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

@@ -28,27 +28,31 @@ public class PageSizeCalculator {
     private SizeF optimalMaxHeightPageSize;
     private float widthRatio;
     private float heightRatio;
+    private boolean fitEachPage;
 
     public PageSizeCalculator(FitPolicy fitPolicy, Size originalMaxWidthPageSize, Size originalMaxHeightPageSize,
-                              Size viewSize) {
+                              Size viewSize, boolean fitEachPage) {
         this.fitPolicy = fitPolicy;
         this.originalMaxWidthPageSize = originalMaxWidthPageSize;
         this.originalMaxHeightPageSize = originalMaxHeightPageSize;
         this.viewSize = viewSize;
+        this.fitEachPage = fitEachPage;
         calculateMaxPages();
     }
 
     public SizeF calculate(Size pageSize) {
         if (pageSize.getWidth() <= 0 || pageSize.getHeight() <= 0) {
             return new SizeF(0, 0);
         }
+        float maxWidth = fitEachPage ? viewSize.getWidth() : pageSize.getWidth() * widthRatio;
+        float maxHeight = fitEachPage ? viewSize.getHeight() : pageSize.getHeight() * heightRatio;
         switch (fitPolicy) {
             case HEIGHT:
-                return fitHeight(pageSize, pageSize.getHeight() * heightRatio);
+                return fitHeight(pageSize, maxHeight);
             case BOTH:
-                return fitBoth(pageSize, pageSize.getWidth() * widthRatio, pageSize.getHeight() * heightRatio);
+                return fitBoth(pageSize, maxWidth, maxHeight);
             default:
-                return fitWidth(pageSize, pageSize.getWidth() * widthRatio);
+                return fitWidth(pageSize, maxWidth);
         }
     }