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

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

@@ -24,12 +24,14 @@ import android.util.Size
 import android.view.Surface
 import android.view.TextureView
 import androidx.core.content.ContextCompat
+import androidx.exifinterface.media.ExifInterface
 import com.google.mlkit.vision.common.InputImage
 import com.google.mlkit.vision.objects.ObjectDetection
 import com.google.mlkit.vision.objects.defaults.ObjectDetectorOptions
 import org.opencv.core.Point
 import java.io.File
 import java.io.FileOutputStream
+import java.io.ByteArrayInputStream
 import java.util.concurrent.atomic.AtomicReference
 import java.util.concurrent.atomic.AtomicBoolean
 import kotlin.math.abs
@@ -118,10 +120,10 @@ class CameraController(
             return
         }
 
+        // Always set the listener so we get size-change callbacks for transform updates.
+        previewView.surfaceTextureListener = textureListener
         if (previewView.isAvailable) {
             openCamera()
-        } else {
-            previewView.surfaceTextureListener = textureListener
         }
     }
 
@@ -131,6 +133,10 @@ class CameraController(
         closeSession()
     }
 
+    fun refreshTransform() {
+        configureTransform()
+    }
+
     fun capturePhoto(
         outputDirectory: File,
         onImageCaptured: (File) -> Unit,
@@ -150,8 +156,8 @@ class CameraController(
         }
 
         try {
-            // Use 90 degrees for back camera in portrait mode
-            val jpegOrientation = 90
+            // Match JPEG orientation to current device rotation and sensor orientation.
+            val jpegOrientation = computeRotationDegrees()
             Log.d(TAG, "[CAPTURE] Setting JPEG_ORIENTATION to $jpegOrientation")
 
             val requestBuilder = device.createCaptureRequest(CameraDevice.TEMPLATE_STILL_CAPTURE).apply {
@@ -240,9 +246,10 @@ 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}" }}")
 
-            // 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}")
+            // Prefer a preview size that matches the view aspect to avoid letterboxing.
+            previewSize = chooseBestSize(previewSizes, viewAspect, null, preferClosestAspect = true)
+                ?: previewSizes?.maxByOrNull { it.width * it.height }
+            Log.d(TAG, "[CAMERA2] Selected 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)
@@ -474,10 +481,11 @@ class CameraController(
             val buffer = image.planes[0].buffer
             val bytes = ByteArray(buffer.remaining())
             buffer.get(bytes)
+            val exifRotation = readExifRotation(bytes)
             val bitmap = BitmapFactory.decodeByteArray(bytes, 0, bytes.size)
                 ?: throw IllegalStateException("Failed to decode JPEG")
 
-            val rotated = rotateAndMirror(bitmap, computeRotationDegrees(), useFrontCamera)
+            val rotated = rotateAndMirror(bitmap, exifRotation, useFrontCamera)
             val photoFile = File(pending.outputDirectory, "doc_scan_${System.currentTimeMillis()}.jpg")
             FileOutputStream(photoFile).use { out ->
                 rotated.compress(Bitmap.CompressFormat.JPEG, 95, out)
@@ -648,22 +656,37 @@ 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}")
 
-        // 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)")
+        if (rotationDegrees == 0 && !mirror) {
+            Log.d(TAG, "[ROTATE_MIRROR] No rotation/mirror needed, returning bitmap as-is")
             return bitmap
         }
 
-        // 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")
+        if (rotationDegrees != 0) {
+            matrix.postRotate(rotationDegrees.toFloat(), bitmap.width / 2f, bitmap.height / 2f)
+        }
+        if (mirror) {
+            matrix.postScale(-1f, 1f, bitmap.width / 2f, bitmap.height / 2f)
+        }
 
         return Bitmap.createBitmap(bitmap, 0, 0, bitmap.width, bitmap.height, matrix, true)
     }
 
+    private fun readExifRotation(bytes: ByteArray): Int {
+        return try {
+            val exif = ExifInterface(ByteArrayInputStream(bytes))
+            when (exif.getAttributeInt(ExifInterface.TAG_ORIENTATION, ExifInterface.ORIENTATION_NORMAL)) {
+                ExifInterface.ORIENTATION_ROTATE_90 -> 90
+                ExifInterface.ORIENTATION_ROTATE_180 -> 180
+                ExifInterface.ORIENTATION_ROTATE_270 -> 270
+                else -> 0
+            }
+        } catch (e: Exception) {
+            Log.w(TAG, "[CAMERA2] Failed to read EXIF rotation", e)
+            0
+        }
+    }
+
     private fun refineWithOpenCv(
         nv21: ByteArray,
         imageWidth: Int,

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

@@ -135,6 +135,7 @@ class DocumentScannerView(context: ThemedReactContext) : FrameLayout(context), L
         super.onLayout(changed, left, top, right, bottom)
         if (changed) {
             Log.d(TAG, "[LAYOUT] View size: ${right - left}x${bottom - top}, PreviewView: ${previewView.width}x${previewView.height}")
+            cameraController?.refreshTransform()
         }
     }
 

package/package.json

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