react-native-rectangle-doc-scanner 6.0.0 → 7.1.0

package/android/build.gradle

@@ -47,8 +47,11 @@ android {
     sourceSets {
         main {
             java.srcDirs += 'src/main/kotlin'
+            java.srcDirs += 'src/common/kotlin'
             if (hasVisionCamera) {
                 java.srcDirs += 'src/visioncamera/kotlin'
+            } else {
+                java.srcDirs += 'src/camera2/kotlin'
             }
         }
     }
@@ -63,28 +66,31 @@ dependencies {
     implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
     implementation "com.facebook.react:react-native:+"
 
-    // CameraX dependencies
-    def camerax_version = "1.3.0"
-    implementation "androidx.camera:camera-core:${camerax_version}"
-    implementation "androidx.camera:camera-camera2:${camerax_version}"
-    implementation "androidx.camera:camera-lifecycle:${camerax_version}"
-    implementation "androidx.camera:camera-view:${camerax_version}"
-
-    // OpenCV for document detection
+    // OpenCV for document detection (common)
     implementation 'org.opencv:opencv:4.9.0'
 
-    // ML Kit object detection for live rectangle hints
-    implementation 'com.google.mlkit:object-detection:17.0.1'
-
-    // Coroutines for async operations
+    // Coroutines for async operations (common)
     implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-core:1.7.3'
     implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-android:1.7.3'
 
-    // AndroidX
+    // AndroidX (common)
     implementation 'androidx.core:core-ktx:1.10.1'
     implementation 'androidx.appcompat:appcompat:1.6.1'
 
+    // CameraX core is needed for ImageProxy in VisionCamera frame processor
+    def camerax_version = "1.3.0"
+    implementation "androidx.camera:camera-core:${camerax_version}"
+
     if (hasVisionCamera) {
+        // VisionCamera mode - include VisionCamera dependency
         implementation project(':react-native-vision-camera')
+    } else {
+        // Camera2 mode - include additional CameraX and ML Kit dependencies
+        implementation "androidx.camera:camera-camera2:${camerax_version}"
+        implementation "androidx.camera:camera-lifecycle:${camerax_version}"
+        implementation "androidx.camera:camera-view:${camerax_version}"
+
+        // ML Kit object detection for live rectangle hints
+        implementation 'com.google.mlkit:object-detection:17.0.1'
     }
 }

package/android/src/main/kotlin/com/reactnativerectangledocscanner/DocumentScannerModule.kt

@@ -43,15 +43,22 @@ class DocumentScannerModule(reactContext: ReactApplicationContext) :
                 try {
                     val view = uiManager.resolveView(tag)
 
-                    if (view is DocumentScannerView) {
-                        Log.d(TAG, "Found DocumentScannerView, triggering capture with promise")
-
-                        // Pass promise to view so it can be resolved when capture completes
-                        // This matches iOS behavior where promise is resolved with actual image data
-                        view.captureWithPromise(promise)
-                    } else {
-                        Log.e(TAG, "View with tag $tag is not DocumentScannerView: ${view?.javaClass?.simpleName}")
-                        promise.reject("INVALID_VIEW", "View is not a DocumentScannerView")
+                    // Use reflection to avoid compile-time dependency on DocumentScannerView
+                    try {
+                        val docScannerViewClass = Class.forName("com.reactnativerectangledocscanner.DocumentScannerView")
+                        if (docScannerViewClass.isInstance(view)) {
+                            Log.d(TAG, "Found DocumentScannerView, triggering capture with promise")
+
+                            // Pass promise to view so it can be resolved when capture completes
+                            val captureMethod = docScannerViewClass.getMethod("captureWithPromise", Promise::class.java)
+                            captureMethod.invoke(view, promise)
+                        } else {
+                            Log.e(TAG, "View with tag $tag is not DocumentScannerView: ${view?.javaClass?.simpleName}")
+                            promise.reject("INVALID_VIEW", "View is not a DocumentScannerView")
+                        }
+                    } catch (e: ClassNotFoundException) {
+                        Log.e(TAG, "DocumentScannerView not available (VisionCamera mode)", e)
+                        promise.reject("VIEW_NOT_AVAILABLE", "Camera2 views not available in VisionCamera mode")
                     }
                 } catch (e: Exception) {
                     Log.e(TAG, "Error resolving view", e)

package/android/src/main/kotlin/com/reactnativerectangledocscanner/DocumentScannerPackage.kt

@@ -19,10 +19,28 @@ class DocumentScannerPackage : ReactPackage {
     }
 
     override fun createViewManagers(reactContext: ReactApplicationContext): List<ViewManager<*, *>> {
-        return listOf(
-            DocumentScannerViewManager(),
-            CameraViewManager()
-        )
+        // Only register Camera2-based view managers if VisionCamera is not available
+        return try {
+            Class.forName(VISION_CAMERA_REGISTRY)
+            // VisionCamera is available, no need to register Camera2 view managers
+            emptyList()
+        } catch (e: ClassNotFoundException) {
+            // VisionCamera not available, register Camera2 view managers using reflection
+            try {
+                val viewManagers = mutableListOf<ViewManager<*, *>>()
+
+                val docScannerViewManagerClass = Class.forName("com.reactnativerectangledocscanner.DocumentScannerViewManager")
+                val cameraViewManagerClass = Class.forName("com.reactnativerectangledocscanner.CameraViewManager")
+
+                viewManagers.add(docScannerViewManagerClass.newInstance() as ViewManager<*, *>)
+                viewManagers.add(cameraViewManagerClass.newInstance() as ViewManager<*, *>)
+
+                viewManagers
+            } catch (e: Exception) {
+                Log.e(TAG, "Failed to instantiate Camera2 view managers", e)
+                emptyList()
+            }
+        }
     }
 
     private fun registerVisionCameraPlugin() {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-native-rectangle-doc-scanner",
-  "version": "6.0.0",
+  "version": "7.1.0",
   "description": "Native-backed document scanner for React Native with customizable overlays.",
   "license": "MIT",
   "main": "dist/index.js",