react-native-rectangle-doc-scanner 7.47.0 → 7.49.0

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

@@ -246,10 +246,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}" }}")
 
-            // Prefer 4:3 to match iOS FOV on phones; use view aspect on tablets to reduce crop.
-            val isTablet = context.resources.configuration.smallestScreenWidthDp >= 600
-            val targetPreviewAspect = if (isTablet) viewAspect else 4.0 / 3.0
-            val minPreviewArea = if (isTablet) 1280 * 720 else 960 * 720
+            // Prefer 4:3 so height-based scaling fills the screen without stretching.
+            val targetPreviewAspect = 4.0 / 3.0
+            val minPreviewArea = 960 * 720
             previewSize = chooseBestSize(previewSizes, targetPreviewAspect, null, minPreviewArea, preferClosestAspect = true)
                 ?: chooseBestSize(previewSizes, viewAspect, null, preferClosestAspect = true)
                 ?: previewSizes?.maxByOrNull { it.width * it.height }
@@ -575,50 +574,31 @@ class CameraController(
 
         val matrix = Matrix()
         val viewRect = RectF(0f, 0f, viewWidth, viewHeight)
-        val bufferRect = RectF(0f, 0f, preview.width.toFloat(), preview.height.toFloat())
         val centerX = viewRect.centerX()
         val centerY = viewRect.centerY()
 
-        if (rotation == Surface.ROTATION_90 || rotation == Surface.ROTATION_270) {
-            // When rotated 90/270, preview dimensions are swapped
-            val bufferWidth = preview.height.toFloat()  // 1088
-            val bufferHeight = preview.width.toFloat()   // 1920
-
-            // Android: Use 90% of view height for 10% vertical padding
-            val effectiveHeight = viewHeight * 0.90f
-
-            // Create rectangles for the transformation
-            // bufferRect represents the camera preview texture (after rotation)
-            val bufferRect = RectF(0f, 0f, bufferHeight, bufferWidth)
-            val viewTargetRect = RectF(0f, 0f, viewWidth, effectiveHeight)
-
-            // Calculate the center of viewTargetRect within the actual view
-            val targetCenterX = viewWidth / 2f
-            val targetCenterY = viewHeight / 2f
-
-            // Step 1: Map buffer rect to view target rect with CENTER mode (maintains aspect ratio)
-            matrix.setRectToRect(bufferRect, viewTargetRect, Matrix.ScaleToFit.CENTER)
-
-            // Step 2: Translate to center of actual view
-            val scaledBufferWidth = bufferWidth * (effectiveHeight / bufferHeight)
-            val scaledBufferHeight = effectiveHeight
-            matrix.postTranslate(
-                targetCenterX - scaledBufferWidth / 2f,
-                targetCenterY - scaledBufferHeight / 2f
-            )
+        val isSwapped = rotation == Surface.ROTATION_90 || rotation == Surface.ROTATION_270
+        val bufferWidth = if (isSwapped) preview.height.toFloat() else preview.width.toFloat()
+        val bufferHeight = if (isSwapped) preview.width.toFloat() else preview.height.toFloat()
+        var scale = if (isSwapped) {
+            // Scale by height to preserve aspect, then ensure width fills the view.
+            viewHeight / bufferHeight
+        } else {
+            viewHeight / bufferHeight
+        }
+        if (bufferWidth * scale < viewWidth) {
+            scale = viewWidth / bufferWidth
+        }
+        val scaledWidth = bufferWidth * scale
+        val scaledHeight = bufferHeight * scale
 
-            // Step 3: Rotate around the center
-            matrix.postRotate(90f * (rotation - 2), targetCenterX, targetCenterY)
+        matrix.setScale(scale, scale)
+        matrix.postTranslate((viewWidth - scaledWidth) / 2f, (viewHeight - scaledHeight) / 2f)
 
-            Log.d(TAG, "[TRANSFORM] Android: buffer=${bufferWidth}x${bufferHeight}, effectiveH=$effectiveHeight, target=${scaledBufferWidth}x${scaledBufferHeight}")
+        if (isSwapped) {
+            matrix.postRotate(90f * (rotation - 2), centerX, centerY)
         } else if (rotation == Surface.ROTATION_180) {
             matrix.postRotate(180f, centerX, centerY)
-        } else {
-            val scale = max(viewWidth / preview.width.toFloat(), viewHeight / preview.height.toFloat())
-            val scaledWidth = preview.width.toFloat() * scale
-            val scaledHeight = preview.height.toFloat() * scale
-            matrix.setScale(scale, scale)
-            matrix.postTranslate((viewWidth - scaledWidth) / 2f, (viewHeight - scaledHeight) / 2f)
         }
 
         previewView.setTransform(matrix)

package/package.json

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