rn-document-scanner-vision 1.0.8 → 1.0.10

package/android/build.gradle

@@ -4,7 +4,7 @@ buildscript {
         mavenCentral()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:8.4.2'
+        classpath 'com.android.tools.build:gradle:7.2.2'
     }
 }
 
@@ -15,13 +15,9 @@ def safeExtGet(prop, fallback) {
 }
 
 def resolveReactNativeDirectory() {
-    // Try multiple possible locations for react-native
     def locations = [
-        // When used as a dependency in another project
         "${rootProject.projectDir}/../node_modules/react-native/android",
-        // Fallback for monorepos
         "${rootProject.projectDir}/../../node_modules/react-native/android",
-        // Direct parent node_modules
         new File(projectDir, "../../../node_modules/react-native/android").canonicalPath
     ]
     
@@ -38,14 +34,10 @@ repositories {
     google()
     mavenCentral()
     
-    // React Native's maven repository
     def reactNativeDir = resolveReactNativeDirectory()
     if (reactNativeDir != null) {
         maven { url reactNativeDir }
     }
-    
-    // Maven Central hosts react-android for newer RN versions
-    maven { url "https://repo1.maven.org/maven2/" }
 }
 
 android {
@@ -68,10 +60,8 @@ android {
     }
 
     compileOptions {
-        // Use Java version from host project, fallback to 11 for compatibility
-        def javaVersion = safeExtGet('javaVersion', JavaVersion.VERSION_11)
-        sourceCompatibility javaVersion
-        targetCompatibility javaVersion
+        sourceCompatibility JavaVersion.VERSION_11
+        targetCompatibility JavaVersion.VERSION_11
     }
 
     lint {
@@ -80,10 +70,11 @@ android {
 }
 
 dependencies {
-    // Use compileOnly for react-android to avoid bundling React Native
-    // The host app will provide the React Native runtime at build time
-    compileOnly "com.facebook.react:react-android:+"
+    // For React Native < 0.71, use react-native from local maven
+    // For React Native >= 0.71, use react-android
+    // compileOnly ensures the host app provides React Native at runtime
+    compileOnly "com.facebook.react:react-native:+"
     
-    implementation "androidx.appcompat:appcompat:1.7.0"
+    implementation "androidx.appcompat:appcompat:1.6.1"
     implementation "com.websitebeaver:documentscanner:1.3.4"
 }

package/android/src/main/java/com/rndocumentscanner/RNDocumentScannerModule.java

@@ -2,7 +2,6 @@ package com.rndocumentscanner;
 
 import android.app.Activity;
 import android.content.Intent;
-import androidx.activity.result.ActivityResult;
 
 import com.facebook.react.bridge.ActivityEventListener;
 import com.facebook.react.bridge.Arguments;
@@ -15,7 +14,6 @@ import com.facebook.react.bridge.ReadableMap;
 import com.facebook.react.bridge.WritableArray;
 import com.facebook.react.bridge.WritableMap;
 
-import com.websitebeaver.documentscanner.DocumentScanner;
 import com.websitebeaver.documentscanner.constants.DocumentScannerExtra;
 
 import java.util.ArrayList;
@@ -24,17 +22,57 @@ public class RNDocumentScannerModule extends ReactContextBaseJavaModule {
 
     private static final int DOCUMENT_SCAN_REQUEST = 1;
     private Promise scanPromise;
-    private DocumentScanner documentScanner;
+    private String responseType = "imageFilePath";
 
     private final ActivityEventListener activityEventListener = new BaseActivityEventListener() {
         @Override
         public void onActivityResult(Activity activity, int requestCode, int resultCode, Intent data) {
             if (requestCode == DOCUMENT_SCAN_REQUEST) {
-                if (documentScanner != null) {
-                    // Use a wrapper ActivityResult object
-                    ActivityResult result = new ActivityResult(resultCode, data);
-                    documentScanner.handleDocumentScanIntentResult(result);
+                if (scanPromise == null) {
+                    return;
                 }
+
+                if (resultCode == Activity.RESULT_OK && data != null) {
+                    // Get the scanned document results
+                    ArrayList<String> croppedImageResults = data.getStringArrayListExtra(
+                        DocumentScannerExtra.EXTRA_CROPPED_IMAGE_RESULTS
+                    );
+
+                    if (croppedImageResults != null && !croppedImageResults.isEmpty()) {
+                        WritableMap response = Arguments.createMap();
+                        WritableArray scannedImages = Arguments.createArray();
+
+                        for (String imagePath : croppedImageResults) {
+                            scannedImages.pushString(imagePath);
+                        }
+
+                        response.putArray("scannedImages", scannedImages);
+                        response.putString("status", "success");
+                        scanPromise.resolve(response);
+                    } else {
+                        // No images returned
+                        WritableMap response = Arguments.createMap();
+                        WritableArray emptyArray = Arguments.createArray();
+                        response.putArray("scannedImages", emptyArray);
+                        response.putString("status", "cancel");
+                        scanPromise.resolve(response);
+                    }
+                } else if (resultCode == Activity.RESULT_CANCELED) {
+                    // User cancelled
+                    WritableMap response = Arguments.createMap();
+                    WritableArray emptyArray = Arguments.createArray();
+                    response.putArray("scannedImages", emptyArray);
+                    response.putString("status", "cancel");
+                    scanPromise.resolve(response);
+                } else {
+                    // Check for error
+                    String errorMessage = data != null ? 
+                        data.getStringExtra(DocumentScannerExtra.EXTRA_ERROR_MESSAGE) : 
+                        "Unknown error";
+                    scanPromise.reject("SCAN_ERROR", errorMessage != null ? errorMessage : "Document scan failed");
+                }
+
+                scanPromise = null;
             }
         }
     };
@@ -52,7 +90,7 @@ public class RNDocumentScannerModule extends ReactContextBaseJavaModule {
     @ReactMethod
     public void scanDocument(ReadableMap options, Promise promise) {
         Activity activity = getCurrentActivity();
-        
+
         if (activity == null) {
             promise.reject("NO_ACTIVITY", "Activity doesn't exist");
             return;
@@ -61,66 +99,27 @@ public class RNDocumentScannerModule extends ReactContextBaseJavaModule {
         scanPromise = promise;
 
         // Get options with defaults
-        String responseType = options.hasKey("responseType") ? options.getString("responseType") : "imageFilePath";
+        responseType = options.hasKey("responseType") ? options.getString("responseType") : "imageFilePath";
         Boolean letUserAdjustCrop = options.hasKey("letUserAdjustCrop") ? options.getBoolean("letUserAdjustCrop") : true;
         Integer maxNumDocuments = options.hasKey("maxNumDocuments") ? options.getInt("maxNumDocuments") : 1;
         Integer croppedImageQuality = options.hasKey("croppedImageQuality") ? options.getInt("croppedImageQuality") : 100;
 
         try {
-            // Create document scanner with callbacks
-            documentScanner = new DocumentScanner(
-                activity,
-                (ArrayList<String> documentScanResults) -> {
-                    // Success callback
-                    WritableMap response = Arguments.createMap();
-                    WritableArray scannedImages = Arguments.createArray();
-                    
-                    for (String imagePath : documentScanResults) {
-                        scannedImages.pushString(imagePath);
-                    }
-                    
-                    response.putArray("scannedImages", scannedImages);
-                    response.putString("status", "success");
-                    
-                    if (scanPromise != null) {
-                        scanPromise.resolve(response);
-                        scanPromise = null;
-                    }
-                    return null;
-                },
-                (String errorMessage) -> {
-                    // Error callback
-                    if (scanPromise != null) {
-                        scanPromise.reject("SCAN_ERROR", errorMessage);
-                        scanPromise = null;
-                    }
-                    return null;
-                },
-                () -> {
-                    // Cancel callback
-                    WritableMap response = Arguments.createMap();
-                    WritableArray emptyArray = Arguments.createArray();
-                    response.putArray("scannedImages", emptyArray);
-                    response.putString("status", "cancel");
-                    
-                    if (scanPromise != null) {
-                        scanPromise.resolve(response);
-                        scanPromise = null;
-                    }
-                    return null;
-                },
-                responseType,
-                letUserAdjustCrop,
-                maxNumDocuments,
-                croppedImageQuality
-            );
-
-            // Launch the document scanner
-            Intent scanIntent = documentScanner.createDocumentScanIntent();
+            // Create intent directly for DocumentScannerActivity
+            Intent scanIntent = new Intent(activity, com.websitebeaver.documentscanner.DocumentScannerActivity.class);
+            
+            // Set extras
+            scanIntent.putExtra(DocumentScannerExtra.EXTRA_LET_USER_ADJUST_CROP, letUserAdjustCrop);
+            scanIntent.putExtra(DocumentScannerExtra.EXTRA_MAX_NUM_DOCUMENTS, maxNumDocuments);
+            scanIntent.putExtra(DocumentScannerExtra.EXTRA_CROPPED_IMAGE_QUALITY, croppedImageQuality);
+            scanIntent.putExtra(DocumentScannerExtra.EXTRA_RESPONSE_TYPE, responseType);
+
+            // Launch the document scanner activity
             activity.startActivityForResult(scanIntent, DOCUMENT_SCAN_REQUEST);
 
         } catch (Exception e) {
             promise.reject("INITIALIZATION_ERROR", "Failed to initialize document scanner: " + e.getMessage());
+            scanPromise = null;
         }
     }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "rn-document-scanner-vision",
-  "version": "1.0.8",
+  "version": "1.0.10",
   "description": "A React Native library for scanning documents on iOS and Android",
   "main": "lib/commonjs/index.js",
   "module": "lib/module/index.js",