react-native-rectangle-doc-scanner 3.199.0 → 3.201.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
@@ -359,6 +360,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) {
@@ -366,29 +369,75 @@ class CameraController(
         }
 
         val rotationDegrees = getRotationDegrees()
-        val matrix = Matrix()
-        val viewRect = RectF(0f, 0f, viewWidth.toFloat(), viewHeight.toFloat())
-        val bufferRect = if (rotationDegrees == 90 || rotationDegrees == 270) {
-            RectF(0f, 0f, previewSize.height.toFloat(), previewSize.width.toFloat())
+        val bufferWidth = previewSize.width.toFloat()
+        val bufferHeight = previewSize.height.toFloat()
+        val rotatedBufferWidth = if (rotationDegrees == 90 || rotationDegrees == 270) {
+            bufferHeight
+        } else {
+            bufferWidth
+        }
+        val rotatedBufferHeight = if (rotationDegrees == 90 || rotationDegrees == 270) {
+            bufferWidth
         } else {
-            RectF(0f, 0f, previewSize.width.toFloat(), previewSize.height.toFloat())
+            bufferHeight
         }
-        val centerX = viewRect.centerX()
-        val centerY = viewRect.centerY()
 
-        bufferRect.offset(centerX - bufferRect.centerX(), centerY - bufferRect.centerY())
-        // Fit entire buffer into view (no crop).
-        matrix.setRectToRect(bufferRect, viewRect, Matrix.ScaleToFit.CENTER)
+        val scale = kotlin.math.min(
+            viewWidth.toFloat() / rotatedBufferWidth,
+            viewHeight.toFloat() / rotatedBufferHeight
+        )
 
-        when (rotationDegrees) {
-            90 -> matrix.postRotate(90f, centerX, centerY)
-            180 -> matrix.postRotate(180f, centerX, centerY)
-            270 -> matrix.postRotate(270f, centerX, centerY)
+        val matrix = Matrix()
+        // Center buffer at origin, rotate, scale to fit, then move to view center.
+        matrix.postTranslate(-bufferWidth / 2f, -bufferHeight / 2f)
+        if (rotationDegrees != 0) {
+            matrix.postRotate(rotationDegrees.toFloat())
         }
+        matrix.postScale(scale, scale)
+        matrix.postTranslate(viewWidth / 2f, viewHeight / 2f)
 
         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()
@@ -517,7 +566,11 @@ class CameraController(
 
         val ratioFiltered = if (targetRatio != null) {
             candidates.filter { size ->
-                val ratio = size.width.toFloat() / size.height.toFloat()
+                val ratio = if (targetRatio < 1f) {
+                    size.height.toFloat() / size.width.toFloat()
+                } else {
+                    size.width.toFloat() / size.height.toFloat()
+                }
                 kotlin.math.abs(ratio - targetRatio) <= 0.05f
             }
         } else {

package/package.json

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