react-native-rectangle-doc-scanner 3.201.0 → 3.203.0

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

@@ -44,11 +44,14 @@ 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
     private var previewSize: Size? = null
     private var analysisSize: Size? = null
+    private var previewChoices: Array<Size> = emptyArray()
+    private var analysisChoices: Array<Size> = emptyArray()
     private var useFrontCamera = false
     private var torchEnabled = false
     private var detectionEnabled = true
@@ -62,8 +65,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 = 2560
+        private const val MAX_PREVIEW_HEIGHT = 1440
     }
 
     private data class LastFrame(
@@ -121,6 +124,13 @@ class CameraController(
         startBackgroundThread()
         chooseCamera()
 
+        if (previewLayoutListener == null) {
+            previewLayoutListener = android.view.View.OnLayoutChangeListener { _, _, _, _, _, _, _, _, _ ->
+                updatePreviewTransform()
+            }
+            previewView.addOnLayoutChangeListener(previewLayoutListener)
+        }
+
         if (previewView.isAvailable) {
             openCamera()
         } else {
@@ -130,6 +140,10 @@ class CameraController(
 
     fun stopCamera() {
         Log.d(TAG, "[CAMERA2] stopCamera called")
+        previewLayoutListener?.let { listener ->
+            previewView.removeOnLayoutChangeListener(listener)
+        }
+        previewLayoutListener = null
         try {
             captureSession?.close()
             captureSession = null
@@ -242,8 +256,8 @@ class CameraController(
         sensorOrientation = characteristics.get(CameraCharacteristics.SENSOR_ORIENTATION) ?: 0
 
         val streamConfig = characteristics.get(CameraCharacteristics.SCALER_STREAM_CONFIGURATION_MAP)
-        val previewChoices = streamConfig?.getOutputSizes(SurfaceTexture::class.java) ?: emptyArray()
-        val analysisChoices = streamConfig?.getOutputSizes(ImageFormat.YUV_420_888) ?: emptyArray()
+        previewChoices = streamConfig?.getOutputSizes(SurfaceTexture::class.java) ?: emptyArray()
+        analysisChoices = streamConfig?.getOutputSizes(ImageFormat.YUV_420_888) ?: emptyArray()
 
         val viewWidth = if (previewView.width > 0) previewView.width else context.resources.displayMetrics.widthPixels
         val viewHeight = if (previewView.height > 0) previewView.height else context.resources.displayMetrics.heightPixels
@@ -302,8 +316,9 @@ class CameraController(
     private fun createPreviewSession() {
         val device = cameraDevice ?: return
         val texture = previewView.surfaceTexture ?: return
-        val previewSize = previewSize ?: return
-        val analysisSize = analysisSize ?: previewSize
+        val sizes = ensurePreviewSizes()
+        val previewSize = sizes.first ?: return
+        val analysisSize = sizes.second ?: previewSize
 
         texture.setDefaultBufferSize(previewSize.width, previewSize.height)
         val previewSurface = Surface(texture)
@@ -358,6 +373,32 @@ class CameraController(
         }
     }
 
+    private fun ensurePreviewSizes(): Pair<Size?, Size?> {
+        if (previewChoices.isEmpty()) {
+            return Pair(previewSize, analysisSize)
+        }
+
+        val viewWidth = if (previewView.width > 0) previewView.width else context.resources.displayMetrics.widthPixels
+        val viewHeight = if (previewView.height > 0) previewView.height else context.resources.displayMetrics.heightPixels
+        val targetRatio = if (viewWidth > 0 && viewHeight > 0) {
+            viewWidth.toFloat() / viewHeight.toFloat()
+        } else {
+            null
+        }
+
+        val newPreview = chooseSize(previewChoices, MAX_PREVIEW_WIDTH, MAX_PREVIEW_HEIGHT, targetRatio)
+        val newAnalysis = chooseSize(analysisChoices, MAX_PREVIEW_WIDTH, MAX_PREVIEW_HEIGHT, targetRatio)
+
+        if (newPreview != null && newPreview != previewSize) {
+            previewSize = newPreview
+        }
+        if (newAnalysis != null && newAnalysis != analysisSize) {
+            analysisSize = newAnalysis
+        }
+
+        return Pair(previewSize, analysisSize)
+    }
+
     private fun updatePreviewTransform() {
         val previewSize = previewSize ?: return
         adjustPreviewLayout(previewSize)
@@ -564,21 +605,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.201.0",
+  "version": "3.203.0",
   "description": "Native-backed document scanner for React Native with customizable overlays.",
   "license": "MIT",
   "main": "dist/index.js",