react-native-rectangle-doc-scanner 10.49.0 → 11.0.0

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

@@ -545,27 +545,19 @@ class CameraController(
         val centerX = viewWidth / 2f
         val centerY = viewHeight / 2f
 
-        // For sensor=0 (tablet landscape), we need to manually rotate the buffer
-        // CameraX only handles rotation automatically for sensor=90 (phone portrait)
-        // Important: For sensor=0, we need to rotate in the OPPOSITE direction
-        // When display is 90° (portrait), we need to rotate -90° (270°) to compensate
-        if (sensorOrientation == 0 && displayRotationDegrees != 0) {
-            val rotationDegrees = when (displayRotationDegrees) {
-                90 -> -90f  // Display 90° → Rotate -90° (counter-clockwise)
-                180 -> -180f
-                270 -> -270f  // Or +90f
-                else -> 0f
-            }
+        val rotationDegrees = ((sensorOrientation + displayRotationDegrees) % 360).toFloat()
+
+        if (rotationDegrees != 0f) {
+            Log.d(TAG, "[TRANSFORM] Applying rotation: ${rotationDegrees}°")
             matrix.postRotate(rotationDegrees, centerX, centerY)
         }
 
-        // Calculate rotated buffer dimensions
-        val rotatedBufferWidth = if (sensorOrientation == 0 && (displayRotationDegrees == 90 || displayRotationDegrees == 270)) {
+        val rotatedBufferWidth = if (rotationDegrees == 90f || rotationDegrees == 270f) {
             bufferHeight
         } else {
             bufferWidth
         }
-        val rotatedBufferHeight = if (sensorOrientation == 0 && (displayRotationDegrees == 90 || displayRotationDegrees == 270)) {
+        val rotatedBufferHeight = if (rotationDegrees == 90f || rotationDegrees == 270f) {
             bufferWidth
         } else {
             bufferHeight

package/android/src/common/kotlin/com/reactnativerectangledocscanner/DocumentDetector.kt

@@ -498,36 +498,40 @@ class DocumentDetector {
             val rectArea = rectWidth * rectHeight
 
             // Check if rectangle is too small (less than 15% of view area)
+            // or too large (more than 85% - likely detecting screen instead of document)
             val areaRatio = rectArea / viewArea
             if (areaRatio < 0.15) {
                 if (BuildConfig.DEBUG) {
-                    Log.d(TAG, "[QUALITY] TOO_FAR: area=${String.format("%.1f", rectArea)}, ratio=${String.format("%.2f", areaRatio)}")
+                    Log.d(TAG, "[QUALITY] TOO_FAR (small): area=${String.format("%.1f", rectArea)}, ratio=${String.format("%.2f", areaRatio)}")
+                }
+                return RectangleQuality.TOO_FAR
+            }
+            if (areaRatio > 0.85) {
+                if (BuildConfig.DEBUG) {
+                    Log.d(TAG, "[QUALITY] TOO_FAR (large): area=${String.format("%.1f", rectArea)}, ratio=${String.format("%.2f", areaRatio)} - likely detecting screen")
                 }
                 return RectangleQuality.TOO_FAR
             }
 
-            // Check angle quality: edges should not be too skewed
-            // More lenient threshold: 20% of edge length
-            val topAngleThreshold = max(60.0, topEdgeLength * 0.20)
-            val bottomAngleThreshold = max(60.0, bottomEdgeLength * 0.20)
-            val leftAngleThreshold = max(60.0, leftEdgeLength * 0.20)
-            val rightAngleThreshold = max(60.0, rightEdgeLength * 0.20)
+            // Check angle quality using angle ratio instead of absolute difference
+            // Edges should be roughly horizontal/vertical (not too skewed)
+            val topAngleRatio = if (topEdgeLength > 0) abs(rectangle.topRight.y - rectangle.topLeft.y) / topEdgeLength else 0.0
+            val bottomAngleRatio = if (bottomEdgeLength > 0) abs(rectangle.bottomLeft.y - rectangle.bottomRight.y) / bottomEdgeLength else 0.0
+            val leftAngleRatio = if (leftEdgeLength > 0) abs(rectangle.topLeft.x - rectangle.bottomLeft.x) / leftEdgeLength else 0.0
+            val rightAngleRatio = if (rightEdgeLength > 0) abs(rectangle.topRight.x - rectangle.bottomRight.x) / rightEdgeLength else 0.0
 
-            val topYDiff = abs(rectangle.topRight.y - rectangle.topLeft.y)
-            val bottomYDiff = abs(rectangle.bottomLeft.y - rectangle.bottomRight.y)
-            val leftXDiff = abs(rectangle.topLeft.x - rectangle.bottomLeft.x)
-            val rightXDiff = abs(rectangle.topRight.x - rectangle.bottomRight.x)
+            // Allow up to 30% skew (sin(~17°) ≈ 0.3)
+            val maxSkewRatio = 0.3
 
-            // Check if edges are too skewed (perspective too extreme)
-            if (topYDiff > topAngleThreshold ||
-                bottomYDiff > bottomAngleThreshold ||
-                leftXDiff > leftAngleThreshold ||
-                rightXDiff > rightAngleThreshold) {
+            if (topAngleRatio > maxSkewRatio ||
+                bottomAngleRatio > maxSkewRatio ||
+                leftAngleRatio > maxSkewRatio ||
+                rightAngleRatio > maxSkewRatio) {
                 if (BuildConfig.DEBUG) {
-                    Log.d(TAG, "[QUALITY] BAD_ANGLE (skew): topY=$topYDiff>${String.format("%.1f", topAngleThreshold)}, " +
-                        "bottomY=$bottomYDiff>${String.format("%.1f", bottomAngleThreshold)}, " +
-                        "leftX=$leftXDiff>${String.format("%.1f", leftAngleThreshold)}, " +
-                        "rightX=$rightXDiff>${String.format("%.1f", rightAngleThreshold)}")
+                    Log.d(TAG, "[QUALITY] BAD_ANGLE (skew): top=${String.format("%.2f", topAngleRatio)}, " +
+                        "bottom=${String.format("%.2f", bottomAngleRatio)}, " +
+                        "left=${String.format("%.2f", leftAngleRatio)}, " +
+                        "right=${String.format("%.2f", rightAngleRatio)} > $maxSkewRatio")
                 }
                 return RectangleQuality.BAD_ANGLE
             }

package/package.json

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