adding option to display pdf in dual page mode

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

@@ -1,192 +1,192 @@
-/**
- * Copyright 2016 Bartosz Schiller
- * <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/>
- * http://www.apache.org/licenses/LICENSE-2.0
- * <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.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.github.barteksc.pdfviewer;
-
-import android.graphics.RectF;
-import android.support.annotation.Nullable;
-
-import com.github.barteksc.pdfviewer.model.PagePart;
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Comparator;
-import java.util.List;
-import java.util.PriorityQueue;
-
-import static com.github.barteksc.pdfviewer.util.Constants.Cache.CACHE_SIZE;
-import static com.github.barteksc.pdfviewer.util.Constants.Cache.THUMBNAILS_CACHE_SIZE;
-
-class CacheManager {
-
-    private final PriorityQueue<PagePart> passiveCache;
-
-    private final PriorityQueue<PagePart> activeCache;
-
-    private final List<PagePart> thumbnails;
-
-    private final Object passiveActiveLock = new Object();
-
-    private final PagePartComparator orderComparator = new PagePartComparator();
-
-    public CacheManager() {
-        activeCache = new PriorityQueue<>(CACHE_SIZE, orderComparator);
-        passiveCache = new PriorityQueue<>(CACHE_SIZE, orderComparator);
-        thumbnails = new ArrayList<>();
-    }
-
-    public void cachePart(PagePart part) {
-        synchronized (passiveActiveLock) {
-            // If cache too big, remove and recycle
-            makeAFreeSpace();
-
-            // Then add part
-            activeCache.offer(part);
-        }
-    }
-
-    public void makeANewSet() {
-        synchronized (passiveActiveLock) {
-            passiveCache.addAll(activeCache);
-            activeCache.clear();
-        }
-    }
-
-    private void makeAFreeSpace() {
-        synchronized (passiveActiveLock) {
-            while ((activeCache.size() + passiveCache.size()) >= CACHE_SIZE &&
-                    !passiveCache.isEmpty()) {
-                PagePart part = passiveCache.poll();
-                part.getRenderedBitmap().recycle();
-            }
-
-            while ((activeCache.size() + passiveCache.size()) >= CACHE_SIZE &&
-                    !activeCache.isEmpty()) {
-                activeCache.poll().getRenderedBitmap().recycle();
-            }
-        }
-    }
-
-    public void cacheThumbnail(PagePart part) {
-        synchronized (thumbnails) {
-            // If cache too big, remove and recycle
-            while (thumbnails.size() >= THUMBNAILS_CACHE_SIZE) {
-                thumbnails.remove(0).getRenderedBitmap().recycle();
-            }
-
-            // Then add thumbnail
-            addWithoutDuplicates(thumbnails, part);
-        }
-
-    }
-
-    public boolean upPartIfContained(int page, RectF pageRelativeBounds, int toOrder) {
-        PagePart fakePart = new PagePart(page, null, pageRelativeBounds, false, 0);
-
-        PagePart found;
-        synchronized (passiveActiveLock) {
-            if ((found = find(passiveCache, fakePart)) != null) {
-                passiveCache.remove(found);
-                found.setCacheOrder(toOrder);
-                activeCache.offer(found);
-                return true;
-            }
-
-            return find(activeCache, fakePart) != null;
-        }
-    }
-
-    /**
-     * Return true if already contains the described PagePart
-     */
-    public boolean containsThumbnail(int page, RectF pageRelativeBounds) {
-        PagePart fakePart = new PagePart(page, null, pageRelativeBounds, true, 0);
-        synchronized (thumbnails) {
-            for (PagePart part : thumbnails) {
-                if (part.equals(fakePart)) {
-                    return true;
-                }
-            }
-            return false;
-        }
-    }
-
-    /**
-     * Add part if it doesn't exist, recycle bitmap otherwise
-     */
-    private void addWithoutDuplicates(Collection<PagePart> collection, PagePart newPart) {
-        for (PagePart part : collection) {
-            if (part.equals(newPart)) {
-                newPart.getRenderedBitmap().recycle();
-                return;
-            }
-        }
-        collection.add(newPart);
-    }
-
-    @Nullable
-    private static PagePart find(PriorityQueue<PagePart> vector, PagePart fakePart) {
-        for (PagePart part : vector) {
-            if (part.equals(fakePart)) {
-                return part;
-            }
-        }
-        return null;
-    }
-
-    public List<PagePart> getPageParts() {
-        synchronized (passiveActiveLock) {
-            List<PagePart> parts = new ArrayList<>(passiveCache);
-            parts.addAll(activeCache);
-            return parts;
-        }
-    }
-
-    public List<PagePart> getThumbnails() {
-        synchronized (thumbnails) {
-            return thumbnails;
-        }
-    }
-
-    public void recycle() {
-        synchronized (passiveActiveLock) {
-            for (PagePart part : passiveCache) {
-                part.getRenderedBitmap().recycle();
-            }
-            passiveCache.clear();
-            for (PagePart part : activeCache) {
-                part.getRenderedBitmap().recycle();
-            }
-            activeCache.clear();
-        }
-        synchronized (thumbnails) {
-            for (PagePart part : thumbnails) {
-                part.getRenderedBitmap().recycle();
-            }
-            thumbnails.clear();
-        }
-    }
-
-    class PagePartComparator implements Comparator<PagePart> {
-        @Override
-        public int compare(PagePart part1, PagePart part2) {
-            if (part1.getCacheOrder() == part2.getCacheOrder()) {
-                return 0;
-            }
-            return part1.getCacheOrder() > part2.getCacheOrder() ? 1 : -1;
-        }
-    }
-
-}
+/**
+ * Copyright 2016 Bartosz Schiller
+ * <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/>
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * <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.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.github.barteksc.pdfviewer;
+
+import android.graphics.RectF;
+import android.support.annotation.Nullable;
+
+import com.github.barteksc.pdfviewer.model.PagePart;
+
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Comparator;
+import java.util.List;
+import java.util.PriorityQueue;
+
+import static com.github.barteksc.pdfviewer.util.Constants.Cache.CACHE_SIZE;
+import static com.github.barteksc.pdfviewer.util.Constants.Cache.THUMBNAILS_CACHE_SIZE;
+
+class CacheManager {
+
+    private final PriorityQueue<PagePart> passiveCache;
+
+    private final PriorityQueue<PagePart> activeCache;
+
+    private final List<PagePart> thumbnails;
+
+    private final Object passiveActiveLock = new Object();
+
+    private final PagePartComparator orderComparator = new PagePartComparator();
+
+    public CacheManager() {
+        activeCache = new PriorityQueue<>(CACHE_SIZE, orderComparator);
+        passiveCache = new PriorityQueue<>(CACHE_SIZE, orderComparator);
+        thumbnails = new ArrayList<>();
+    }
+
+    public void cachePart(PagePart part) {
+        synchronized (passiveActiveLock) {
+            // If cache too big, remove and recycle
+            makeAFreeSpace();
+
+            // Then add part
+            activeCache.offer(part);
+        }
+    }
+
+    public void makeANewSet() {
+        synchronized (passiveActiveLock) {
+            passiveCache.addAll(activeCache);
+            activeCache.clear();
+        }
+    }
+
+    private void makeAFreeSpace() {
+        synchronized (passiveActiveLock) {
+            while ((activeCache.size() + passiveCache.size()) >= CACHE_SIZE &&
+                    !passiveCache.isEmpty()) {
+                PagePart part = passiveCache.poll();
+                part.getRenderedBitmap().recycle();
+            }
+
+            while ((activeCache.size() + passiveCache.size()) >= CACHE_SIZE &&
+                    !activeCache.isEmpty()) {
+                activeCache.poll().getRenderedBitmap().recycle();
+            }
+        }
+    }
+
+    public void cacheThumbnail(PagePart part) {
+        synchronized (thumbnails) {
+            // If cache too big, remove and recycle
+            while (thumbnails.size() >= THUMBNAILS_CACHE_SIZE) {
+                thumbnails.remove(0).getRenderedBitmap().recycle();
+            }
+
+            // Then add thumbnail
+            addWithoutDuplicates(thumbnails, part);
+        }
+
+    }
+
+    public boolean upPartIfContained(int page, RectF pageRelativeBounds, int toOrder) {
+        PagePart fakePart = new PagePart(page, null, pageRelativeBounds, false, 0);
+
+        PagePart found;
+        synchronized (passiveActiveLock) {
+            if ((found = find(passiveCache, fakePart)) != null) {
+                passiveCache.remove(found);
+                found.setCacheOrder(toOrder);
+                activeCache.offer(found);
+                return true;
+            }
+
+            return find(activeCache, fakePart) != null;
+        }
+    }
+
+    /**
+     * Return true if already contains the described PagePart
+     */
+    public boolean containsThumbnail(int page, RectF pageRelativeBounds) {
+        PagePart fakePart = new PagePart(page, null, pageRelativeBounds, true, 0);
+        synchronized (thumbnails) {
+            for (PagePart part : thumbnails) {
+                if (part.equals(fakePart)) {
+                    return true;
+                }
+            }
+            return false;
+        }
+    }
+
+    /**
+     * Add part if it doesn't exist, recycle bitmap otherwise
+     */
+    private void addWithoutDuplicates(Collection<PagePart> collection, PagePart newPart) {
+        for (PagePart part : collection) {
+            if (part.equals(newPart)) {
+                newPart.getRenderedBitmap().recycle();
+                return;
+            }
+        }
+        collection.add(newPart);
+    }
+
+    @Nullable
+    private static PagePart find(PriorityQueue<PagePart> vector, PagePart fakePart) {
+        for (PagePart part : vector) {
+            if (part.equals(fakePart)) {
+                return part;
+            }
+        }
+        return null;
+    }
+
+    public List<PagePart> getPageParts() {
+        synchronized (passiveActiveLock) {
+            List<PagePart> parts = new ArrayList<>(passiveCache);
+            parts.addAll(activeCache);
+            return parts;
+        }
+    }
+
+    public List<PagePart> getThumbnails() {
+        synchronized (thumbnails) {
+            return thumbnails;
+        }
+    }
+
+    public void recycle() {
+        synchronized (passiveActiveLock) {
+            for (PagePart part : passiveCache) {
+                part.getRenderedBitmap().recycle();
+            }
+            passiveCache.clear();
+            for (PagePart part : activeCache) {
+                part.getRenderedBitmap().recycle();
+            }
+            activeCache.clear();
+        }
+        synchronized (thumbnails) {
+            for (PagePart part : thumbnails) {
+                part.getRenderedBitmap().recycle();
+            }
+            thumbnails.clear();
+        }
+    }
+
+    class PagePartComparator implements Comparator<PagePart> {
+        @Override
+        public int compare(PagePart part1, PagePart part2) {
+            if (part1.getCacheOrder() == part2.getCacheOrder()) {
+                return 0;
+            }
+            return part1.getCacheOrder() > part2.getCacheOrder() ? 1 : -1;
+        }
+    }
+
+}

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

@@ -52,8 +52,8 @@ protected Throwable doInBackground(Void... params) {
             if (pdfView != null) {
                 PdfDocument pdfDocument = docSource.createDocument(pdfView.getContext(), pdfiumCore, password);
                 pdfFile = new PdfFile(pdfiumCore, pdfDocument, pdfView.getPageFitPolicy(), getViewSize(pdfView),
-                        userPages, pdfView.isSwipeVertical(), pdfView.getSpacingPx(), pdfView.isAutoSpacingEnabled(),
-                        pdfView.isFitEachPage());
+                        userPages, pdfView.isOnDualPageMode(),  pdfView.isSwipeVertical(), pdfView.getSpacingPx(), pdfView.isAutoSpacingEnabled(),
+                        pdfView.isFitEachPage(), pdfView.isOnLandscapeOrientation());
                 return null;
             } else {
                 return new NullPointerException("pdfView == null");