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

package/android/build.gradle

@@ -48,10 +48,10 @@ android {
         main {
             java.srcDirs += 'src/main/kotlin'
             java.srcDirs += 'src/common/kotlin'
+            // Always include camera2 sources (for fallback when VisionCamera is not used at runtime)
+            java.srcDirs += 'src/camera2/kotlin'
             if (hasVisionCamera) {
                 java.srcDirs += 'src/visioncamera/kotlin'
-            } else {
-                java.srcDirs += 'src/camera2/kotlin'
             }
         }
     }
@@ -77,20 +77,18 @@ dependencies {
     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
+    // CameraX dependencies (always included for Camera2 fallback and ImageProxy support)
     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}"
+
+    // ML Kit object detection for live rectangle hints (Camera2 mode)
+    implementation 'com.google.mlkit:object-detection:17.0.1'
 
     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/camera2/kotlin/com/reactnativerectangledocscanner/CameraController.kt

@@ -549,25 +549,37 @@ class CameraController(
         if (viewWidth == 0f || viewHeight == 0f) return
 
         val rotation = computeRotationDegrees()
+        Log.d(TAG, "[TRANSFORM] rotation=$rotation view=${viewWidth}x${viewHeight} preview=${preview.width}x${preview.height}")
+
+        // Calculate buffer dimensions after rotation
         val bufferWidth = if (rotation == 90 || rotation == 270) preview.height.toFloat() else preview.width.toFloat()
         val bufferHeight = if (rotation == 90 || rotation == 270) preview.width.toFloat() else preview.height.toFloat()
 
+        Log.d(TAG, "[TRANSFORM] buffer after rotation: ${bufferWidth}x${bufferHeight}")
+
         val centerX = viewWidth / 2f
         val centerY = viewHeight / 2f
 
-        // Rotate to match display orientation.
         val matrix = Matrix()
+
+        // Apply rotation
         if (rotation != 0) {
             matrix.postRotate(rotation.toFloat(), centerX, centerY)
         }
+
+        // Calculate scale to fill the view (crop mode)
+        val scaleX = viewWidth / bufferWidth
+        val scaleY = viewHeight / bufferHeight
+        val scale = maxOf(scaleX, scaleY)
+
+        Log.d(TAG, "[TRANSFORM] scaleX=$scaleX scaleY=$scaleY finalScale=$scale")
+
+        // Apply scale
+        matrix.postScale(scale, scale, centerX, centerY)
+
         previewView.setTransform(matrix)
 
-        // Uniform center-crop to fill the view.
-        val scale = max(viewWidth / bufferWidth, viewHeight / bufferHeight)
-        previewView.pivotX = centerX
-        previewView.pivotY = centerY
-        previewView.scaleX = scale
-        previewView.scaleY = scale
+        Log.d(TAG, "[TRANSFORM] Matrix applied successfully")
     }
 
     private fun chooseBestSize(

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

@@ -43,22 +43,15 @@ class DocumentScannerModule(reactContext: ReactApplicationContext) :
                 try {
                     val view = uiManager.resolveView(tag)
 
-                    // 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")
+                    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")
                     }
                 } catch (e: Exception) {
                     Log.e(TAG, "Error resolving view", e)

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

@@ -19,28 +19,11 @@ class DocumentScannerPackage : ReactPackage {
     }
 
     override fun createViewManagers(reactContext: ReactApplicationContext): List<ViewManager<*, *>> {
-        // 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()
-            }
-        }
+        // Always register Camera2 view managers for fallback support
+        return listOf(
+            DocumentScannerViewManager(),
+            CameraViewManager()
+        )
     }
 
     private fun registerVisionCameraPlugin() {

package/package.json

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