react-native-rectangle-doc-scanner 7.6.0 → 7.8.0

package/android/src/camera2/kotlin/com/reactnativerectangledocscanner/CameraController.kt

@@ -150,6 +150,10 @@ class CameraController(
         }
 
         try {
+            // Use 90 degrees for back camera in portrait mode
+            val jpegOrientation = 90
+            Log.d(TAG, "[CAPTURE] Setting JPEG_ORIENTATION to $jpegOrientation")
+
             val requestBuilder = device.createCaptureRequest(CameraDevice.TEMPLATE_STILL_CAPTURE).apply {
                 addTarget(reader.surface)
                 set(CaptureRequest.CONTROL_AF_MODE, CaptureRequest.CONTROL_AF_MODE_CONTINUOUS_PICTURE)
@@ -157,7 +161,7 @@ class CameraController(
                 if (torchEnabled) {
                     set(CaptureRequest.FLASH_MODE, CaptureRequest.FLASH_MODE_TORCH)
                 }
-                set(CaptureRequest.JPEG_ORIENTATION, 0)
+                set(CaptureRequest.JPEG_ORIENTATION, jpegOrientation)
             }
 
             session.capture(requestBuilder.build(), object : CameraCaptureSession.CaptureCallback() {}, cameraHandler)
@@ -236,8 +240,9 @@ class CameraController(
             val previewSizes = streamConfigMap.getOutputSizes(SurfaceTexture::class.java)
             Log.d(TAG, "[CAMERA2] Available preview sizes: ${previewSizes?.take(10)?.joinToString { "${it.width}x${it.height}" }}")
 
-            previewSize = chooseBestSize(previewSizes, viewAspect, null, preferClosestAspect = true)
-            Log.d(TAG, "[CAMERA2] Selected preview size: ${previewSize?.width}x${previewSize?.height}")
+            // Use the largest available preview size to fill the screen (like iOS uses full image extent)
+            previewSize = previewSizes?.maxByOrNull { it.width * it.height }
+            Log.d(TAG, "[CAMERA2] Selected LARGEST preview size: ${previewSize?.width}x${previewSize?.height}")
 
             val previewAspect = previewSize?.let { it.width.toDouble() / it.height.toDouble() } ?: viewAspect
             val analysisSizes = streamConfigMap.getOutputSizes(ImageFormat.YUV_420_888)
@@ -547,28 +552,26 @@ class CameraController(
         val centerX = viewWidth / 2f
         val centerY = viewHeight / 2f
 
-        // For 270 degree rotation (portrait mode with back camera):
-        // - The camera sensor output is landscape (1920x1088)
-        // - We need to rotate 270 degrees to display it in portrait
-        // - Then scale to fill the entire view
+        // Match iOS behavior: use the full preview extent and scale to fill
         if (rotation == 270 || rotation == 90) {
-            // Rotate first
-            matrix.postRotate(rotation.toFloat(), centerX, centerY)
-
-            // After rotation, the dimensions are swapped
+            // After rotation, dimensions are swapped
             val rotatedWidth = preview.height.toFloat()
             val rotatedHeight = preview.width.toFloat()
 
             Log.d(TAG, "[TRANSFORM] After rotation: ${rotatedWidth}x${rotatedHeight}")
 
-            // Calculate scale to fill the view completely (aspect fill/crop mode)
+            // Calculate scale to completely fill the view (aspect fill - crop mode like iOS)
+            // This will crop the image but fill the entire screen
             val scaleX = viewWidth / rotatedWidth
             val scaleY = viewHeight / rotatedHeight
             val scale = maxOf(scaleX, scaleY)
 
             Log.d(TAG, "[TRANSFORM] scaleX=$scaleX scaleY=$scaleY finalScale=$scale")
 
-            // Apply scale at center
+            // Apply rotation around center first
+            matrix.postRotate(rotation.toFloat(), centerX, centerY)
+
+            // Then scale to fill (will crop excess)
             matrix.postScale(scale, scale, centerX, centerY)
         } else {
             // For 0 or 180 degree rotation
@@ -645,33 +648,18 @@ class CameraController(
     private fun rotateAndMirror(bitmap: Bitmap, rotationDegrees: Int, mirror: Boolean): Bitmap {
         Log.d(TAG, "[ROTATE_MIRROR] rotationDegrees=$rotationDegrees mirror=$mirror bitmap=${bitmap.width}x${bitmap.height}")
 
-        val matrix = Matrix()
-
-        // For 270 degree rotation (back camera in portrait mode):
-        // 1. First rotate 90 degrees (not 270)
-        // 2. Then flip horizontally if needed
-        // This is because the sensor orientation is 0, but we're holding the phone at 90 degrees
-        val actualRotation = when (rotationDegrees) {
-            270 -> 90  // Convert 270 to 90 for correct orientation
-            90 -> 270  // Convert 90 to 270 for front camera
-            else -> rotationDegrees
-        }
-
-        Log.d(TAG, "[ROTATE_MIRROR] Adjusted rotation: $rotationDegrees -> $actualRotation")
-
-        // Apply rotation first
-        if (actualRotation != 0) {
-            matrix.postRotate(actualRotation.toFloat())
-            Log.d(TAG, "[ROTATE_MIRROR] Applied rotation: $actualRotation degrees")
+        // JPEG_ORIENTATION is already set to 90, so the image should already be rotated correctly
+        // We only need to apply mirror for front camera
+        if (!mirror) {
+            // Back camera: no additional processing needed since JPEG_ORIENTATION handles rotation
+            Log.d(TAG, "[ROTATE_MIRROR] Back camera: returning bitmap as-is (JPEG_ORIENTATION=90 already applied)")
+            return bitmap
         }
 
-        // Apply mirror for front camera only
-        if (mirror) {
-            // Front camera needs horizontal flip after rotation
-            val rotatedWidth = if (actualRotation == 90 || actualRotation == 270) bitmap.height else bitmap.width
-            matrix.postScale(-1f, 1f, rotatedWidth / 2f, 0f)
-            Log.d(TAG, "[ROTATE_MIRROR] Applied horizontal flip for front camera")
-        }
+        // Front camera: apply horizontal mirror
+        val matrix = Matrix()
+        matrix.postScale(-1f, 1f, bitmap.width / 2f, bitmap.height / 2f)
+        Log.d(TAG, "[ROTATE_MIRROR] Front camera: applied horizontal mirror")
 
         return Bitmap.createBitmap(bitmap, 0, 0, bitmap.width, bitmap.height, matrix, true)
     }

package/package.json

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