react-native-pdf 7.0.0 → 7.0.2

package/README.md

@@ -85,7 +85,7 @@ react-native link react-native-pdf
 
 ### Windows installation
 <details>
-  <sumary>Windows details</summary>
+  <summary>Windows details</summary>
 
 - Open your solution in Visual Studio 2019 (eg. `windows\yourapp.sln`)
 - Right-click Solution icon in Solution Explorer > Add > Existing Project...
@@ -168,7 +168,12 @@ react-native run-ios
 ### ChangeLog
 <details>
   <summary>ChangeLog details</summary>
-v7.0.0
+v7.0.2
+1. Fixed: `Loaded page is null` error when `bookmarks` is 0 (#978)
+2. Feature: agp 7.3+ fully supported (#980)
+3. Fixed: Downgrade pdfiumandroid version to 1.0.32
+
+v7.0.1
 1. Fixed: not rendering on iOS
 2. Added: Android 16 KB Page Size support
 3. Fixed: crash issue in io.legere:pdfiumandroid that occurred due to multithreading

package/android/build.gradle

@@ -30,6 +30,19 @@ repositories {
 
 apply plugin: 'com.android.library'
 
+def supportsNamespace() {
+  def parsed = com.android.Version.ANDROID_GRADLE_PLUGIN_VERSION.tokenize('.')
+  def major = parsed[0].toInteger()
+  def minor = parsed[1].toInteger()
+
+  // Namespace support was added in 7.3.0
+  if (major == 7 && minor >= 3) {
+    return true
+  }
+
+  return major >= 8
+}
+
 def resolveReactNativeDirectory() {
     def reactNativeLocation = safeExtGet("REACT_NATIVE_NODE_MODULES_DIR", null)
     if (reactNativeLocation != null) {
@@ -80,9 +93,13 @@ if (isNewArchitectureEnabled()) {
 }
 
 android {
-    def agpVersion = com.android.Version.ANDROID_GRADLE_PLUGIN_VERSION
-    if (agpVersion.tokenize('.')[0].toInteger() >= 7) {
+    if (supportsNamespace()) {
         namespace "org.wonday.pdf"
+         sourceSets {
+          main {
+            manifest.srcFile "src/main/AndroidManifestNew.xml"
+          }
+        }
     }
     compileSdkVersion safeExtGet('compileSdkVersion', 31)
 
@@ -126,6 +143,6 @@ dependencies {
     // The repo from zacharee is based on PdfiumAndroidKt, a much newer fork of PdfiumAndroid, with better maintenance and updated native libraries.
     implementation 'com.github.zacharee:AndroidPdfViewer:4.0.1'
     // Depend on PdfiumAndroidKt directly so this can be updated independently of AndroidPdfViewer as updates are provided.
-    implementation 'io.legere:pdfiumandroid:1.0.34'
+    implementation 'io.legere:pdfiumandroid:1.0.32'
     implementation 'com.google.code.gson:gson:2.13.2'
 }

package/android/src/main/AndroidManifestNew.xml

@@ -0,0 +1,4 @@
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
+
+
+</manifest>

package/android/src/main/java/org/wonday/pdf/PdfManager.java

@@ -99,6 +99,11 @@ public class PdfManager extends SimpleViewManager<PdfView> implements RNPDFPdfVi
         // NOOP on Android
     }
 
+	@Override
+    public void setShowsVerticalScrollIndicator(PdfView view, boolean value) {
+        // NOOP on Android
+    }
+
     @ReactProp(name = "enableRTL")
     public void setEnableRTL(PdfView view, boolean enableRTL) {
         pdfView.setEnableRTL(enableRTL);
@@ -139,11 +144,6 @@ public class PdfManager extends SimpleViewManager<PdfView> implements RNPDFPdfVi
         pdfView.setEnablePaging(enablePaging);
     }
 
-    @Override
-    public void setEnableRTL(PdfView view, boolean value) {
-        // NOOP on Android
-    }
-
     @ReactProp(name = "fitPolicy")
     public void setFitPolicy(PdfView pdfView, int fitPolicy) {
         pdfView.setFitPolicy(fitPolicy);

package/android/src/main/java/org/wonday/pdf/PdfView.java

@@ -9,11 +9,13 @@
 package org.wonday.pdf;
 
 import java.io.File;
+import java.io.IOException;
 
 import android.content.ContentResolver;
 import android.content.Context;
 import android.os.Handler;
 import android.os.Looper;
+import android.os.ParcelFileDescriptor;
 import android.util.SizeF;
 import android.view.View;
 import android.view.ViewGroup;
@@ -22,7 +24,7 @@ import android.net.Uri;
 import android.util.AttributeSet;
 import android.view.MotionEvent;
 import android.graphics.Canvas;
-
+import android.graphics.pdf.PdfRenderer;
 
 import com.facebook.react.uimanager.ThemedReactContext;
 import com.facebook.react.uimanager.UIManagerHelper;
@@ -87,10 +89,6 @@ public class PdfView extends PDFView implements OnPageChangeListener,OnLoadCompl
     private int oldW = 0;
     private int oldH = 0;
 
-    private int totalPages = 0;
-    private int[] pagesArrays;
-    private int bookmarks = 0; 
-
     public PdfView(Context context, AttributeSet set){
         super(context, set);
     }
@@ -249,7 +247,7 @@ public class PdfView extends PDFView implements OnPageChangeListener,OnLoadCompl
         if (originalWidth == 0) {
             originalWidth = pageWidth;
         }
-        
+
         if (lastPageWidth>0 && lastPageHeight>0 && (pageWidth!=lastPageWidth || pageHeight!=lastPageHeight)) {
             // maybe change by other instance, restore zoom setting
             Constants.Pinch.MINIMUM_ZOOM = this.minScale;
@@ -285,36 +283,19 @@ public class PdfView extends PDFView implements OnPageChangeListener,OnLoadCompl
             this.drawPdf();
     }
 
+    private int getPdfPageCount(File pdfFile) throws IOException {
+        ParcelFileDescriptor fileDescriptor =
+                ParcelFileDescriptor.open(pdfFile, ParcelFileDescriptor.MODE_READ_ONLY);
+        PdfRenderer renderer = new PdfRenderer(fileDescriptor);
+        int pageCount = renderer.getPageCount();
+        renderer.close();
+        fileDescriptor.close();
+        return pageCount;
+    }
+
     public void drawPdf() {
         showLog(format("drawPdf path:%s %s", this.path, this.page));
-        File file = new File(this.path);
-
-         if (file.exists()) {
-             try {
-                 ParcelFileDescriptor fileDescriptor = ParcelFileDescriptor.open(file, ParcelFileDescriptor.MODE_READ_ONLY);
-                 PdfRenderer pdfRenderer = new PdfRenderer(fileDescriptor);
-                 this.totalPages = pdfRenderer.getPageCount();
-                 int[] pagesArrays = new int[this.totalPages];
-                 if (this.enableRTL) {
-                    if(this.page>0){
-                        this.page= this.bookmarks-1;
-                    }else{
-                        this.page=this.totalPages;
-                    }
-                    for (int i = totalPages-1; i>=0; i--) {
-                        pagesArrays[i] =totalPages-1- i;
-                    }
-                    this.pagesArrays = pagesArrays;
-                    
-                }else{
-                    this.pagesArrays = null;
-                    this.page=this.bookmarks-1;
-                }
-             } catch (IOException e) {
-                 Log.e("error", "error read PDF", e);
-             }
-         }
-        
+
         if (this.path != null){
 
             // set scale
@@ -340,9 +321,7 @@ public class PdfView extends PDFView implements OnPageChangeListener,OnLoadCompl
                 configurator = this.fromUri(getURI(this.path));
             }
 
-            configurator
-                .pages(this.pagesArrays)
-                .defaultPage(this.page)
+            configurator.defaultPage(this.page-1)
                 .swipeHorizontal(this.horizontal)
                 .onPageChange(this)
                 .onLoad(this)
@@ -359,7 +338,24 @@ public class PdfView extends PDFView implements OnPageChangeListener,OnLoadCompl
                 .enableSwipe(!this.singlePage && this.scrollEnabled)
                 .enableDoubletap(!this.singlePage && this.enableDoubleTapZoom)
                 .enableAnnotationRendering(this.enableAnnotationRendering)
-                .linkHandler(this);
+                .linkHandler(this)
+            ;
+
+            if (enableRTL) {
+                try {
+                    int pageCount = getPdfPageCount(new File(this.path));
+                    int[] reversedPages = new int[pageCount];
+                    for (int i=0; i<pageCount; i++) {
+                        reversedPages[i] = pageCount-1 - i;
+                    }
+                    configurator.pages(reversedPages);
+                    if(this.page != 1){
+                        this.page = pageCount;
+                    }
+                } catch (IOException e) {
+                    Log.e("error", "error while reading PDF", e);
+                }
+            }
 
             if (this.singlePage) {
                 configurator.pages(this.page-1);
@@ -382,14 +378,12 @@ public class PdfView extends PDFView implements OnPageChangeListener,OnLoadCompl
 
     // page start from 1
     public void setPage(int page) {
-        this.page = page;
-        this.bookmarks = page;
+        this.page = Math.max(page, 1);
     }
 
-    public void setEnableRTL(boolean enableRTL){
-        this.enableRTL= enableRTL;
-        
-     }
+    public void setEnableRTL(boolean enableRTL) {
+        this.enableRTL = enableRTL;
+    }
 
     public void setScale(float scale) {
         this.scale = scale;

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "react-native-pdf",
-    "version": "7.0.0",
+    "version": "7.0.2",
     "summary": "A react native PDF view component",
     "description": "A react native PDF view component, support ios and android platform",
     "main": "index.js",