Fixed initial overlay rect aspect ratio based on image

Author: Nimrodda

cropper/src/main/java/com/smarttoolfactory/cropper/state/CropStateImpl.kt

@@ -74,7 +74,6 @@ abstract class CropState internal constructor(
             containerSize.width.toFloat(),
             containerSize.height.toFloat(),
             drawAreaSize.width.toFloat(),
-            drawAreaSize.height.toFloat(),
             aspectRatio,
             overlayRatio
         ),
@@ -158,7 +157,6 @@ abstract class CropState internal constructor(
                     containerSize.width.toFloat(),
                     containerSize.height.toFloat(),
                     drawAreaSize.width.toFloat(),
-                    drawAreaSize.height.toFloat(),
                     aspectRatio,
                     overlayRatio
                 )
@@ -398,16 +396,17 @@ abstract class CropState internal constructor(
         containerWidth: Float,
         containerHeight: Float,
         drawAreaWidth: Float,
-        drawAreaHeight: Float,
         aspectRatio: AspectRatio,
         coefficient: Float
     ): Rect {
 
         if (aspectRatio == AspectRatio.Original) {
+            val imageAspectRatio = imageSize.width.toFloat() / imageSize.height.toFloat()
 
             // Maximum width and height overlay rectangle can be measured with
             val overlayWidthMax = drawAreaWidth.coerceAtMost(containerWidth * coefficient)
-            val overlayHeightMax = drawAreaHeight.coerceAtMost(containerHeight * coefficient)
+            val overlayHeightMax =
+                (overlayWidthMax / imageAspectRatio).coerceAtMost(containerHeight * coefficient)
 
             val offsetX = (containerWidth - overlayWidthMax) / 2f
             val offsetY = (containerHeight - overlayHeightMax) / 2f

cropper/src/main/java/com/smarttoolfactory/cropper/state/DynamicCropState.kt

@@ -265,7 +265,6 @@ class DynamicCropState internal constructor(
                     containerSize.width.toFloat(),
                     containerSize.height.toFloat(),
                     drawAreaSize.width.toFloat(),
-                    drawAreaSize.height.toFloat(),
                     aspectRatio,
                     overlayRatio
                 )