react-native-rectangle-doc-scanner 3.200.0 → 3.202.0

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

@@ -22,6 +22,7 @@ import android.os.Handler
 import android.os.HandlerThread
 import android.util.Log
 import android.util.Size
+import android.view.Gravity
 import android.view.Surface
 import android.view.TextureView
 import androidx.core.content.ContextCompat
@@ -43,6 +44,7 @@ class CameraController(
     private var imageReader: ImageReader? = null
     private var backgroundThread: HandlerThread? = null
     private var backgroundHandler: Handler? = null
+    private var previewLayoutListener: android.view.View.OnLayoutChangeListener? = null
 
     private var cameraId: String? = null
     private var sensorOrientation: Int = 0
@@ -61,8 +63,8 @@ class CameraController(
 
     companion object {
         private const val TAG = "CameraController"
-        private const val MAX_PREVIEW_WIDTH = 1280
-        private const val MAX_PREVIEW_HEIGHT = 720
+        private const val MAX_PREVIEW_WIDTH = 1920
+        private const val MAX_PREVIEW_HEIGHT = 1440
     }
 
     private data class LastFrame(
@@ -120,6 +122,13 @@ class CameraController(
         startBackgroundThread()
         chooseCamera()
 
+        if (previewLayoutListener == null) {
+            previewLayoutListener = android.view.View.OnLayoutChangeListener { _, _, _, _, _, _, _, _, _ ->
+                updatePreviewTransform()
+            }
+            previewView.addOnLayoutChangeListener(previewLayoutListener)
+        }
+
         if (previewView.isAvailable) {
             openCamera()
         } else {
@@ -129,6 +138,10 @@ class CameraController(
 
     fun stopCamera() {
         Log.d(TAG, "[CAMERA2] stopCamera called")
+        previewLayoutListener?.let { listener ->
+            previewView.removeOnLayoutChangeListener(listener)
+        }
+        previewLayoutListener = null
         try {
             captureSession?.close()
             captureSession = null
@@ -359,6 +372,8 @@ class CameraController(
 
     private fun updatePreviewTransform() {
         val previewSize = previewSize ?: return
+        adjustPreviewLayout(previewSize)
+
         val viewWidth = previewView.width
         val viewHeight = previewView.height
         if (viewWidth == 0 || viewHeight == 0) {
@@ -396,6 +411,45 @@ class CameraController(
         previewView.setTransform(matrix)
     }
 
+    private fun adjustPreviewLayout(previewSize: Size) {
+        val parentView = previewView.parent as? android.view.View ?: return
+        val parentWidth = parentView.width
+        val parentHeight = parentView.height
+        if (parentWidth == 0 || parentHeight == 0) {
+            return
+        }
+
+        val rotationDegrees = getRotationDegrees()
+        val bufferWidth = previewSize.width.toFloat()
+        val bufferHeight = previewSize.height.toFloat()
+        val bufferAspect = if (rotationDegrees == 90 || rotationDegrees == 270) {
+            bufferHeight / bufferWidth
+        } else {
+            bufferWidth / bufferHeight
+        }
+
+        val parentAspect = parentWidth.toFloat() / parentHeight.toFloat()
+        val targetWidth: Int
+        val targetHeight: Int
+
+        if (parentAspect > bufferAspect) {
+            targetHeight = parentHeight
+            targetWidth = (parentHeight * bufferAspect).toInt()
+        } else {
+            targetWidth = parentWidth
+            targetHeight = (parentWidth / bufferAspect).toInt()
+        }
+
+        val layoutParams = (previewView.layoutParams as? android.widget.FrameLayout.LayoutParams)
+            ?: android.widget.FrameLayout.LayoutParams(targetWidth, targetHeight)
+        if (layoutParams.width != targetWidth || layoutParams.height != targetHeight) {
+            layoutParams.width = targetWidth
+            layoutParams.height = targetHeight
+            layoutParams.gravity = Gravity.CENTER
+            previewView.layoutParams = layoutParams
+        }
+    }
+
     private fun handleImage(image: Image) {
         try {
             val rotationDegrees = getRotationDegrees()
@@ -522,21 +576,24 @@ class CameraController(
         val maxCandidates = choices.filter { it.width <= maxWidth && it.height <= maxHeight }
         val candidates = if (maxCandidates.isNotEmpty()) maxCandidates else choices.toList()
 
-        val ratioFiltered = if (targetRatio != null) {
-            candidates.filter { size ->
-                val ratio = if (targetRatio < 1f) {
+        if (targetRatio == null) {
+            return candidates.sortedBy { it.width * it.height }.last()
+        }
+
+        val normalizedTarget = targetRatio
+        val sorted = candidates.sortedWith(
+            compareBy<Size> { size ->
+                val ratio = if (normalizedTarget < 1f) {
                     size.height.toFloat() / size.width.toFloat()
                 } else {
                     size.width.toFloat() / size.height.toFloat()
                 }
-                kotlin.math.abs(ratio - targetRatio) <= 0.05f
+                kotlin.math.abs(ratio - normalizedTarget)
+            }.thenByDescending { size ->
+                size.width * size.height
             }
-        } else {
-            emptyList()
-        }
-
-        val pickFrom = if (ratioFiltered.isNotEmpty()) ratioFiltered else candidates
-        return pickFrom.sortedBy { it.width * it.height }.last()
+        )
+        return sorted.first()
     }
 
     private fun startBackgroundThread() {

package/package.json

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