change EnhancedZoomData visible section to IntRect to match Bitmap

Author: SmartToolFactory

image/src/main/java/com/smarttoolfactory/image/util/RectUtil.kt

@@ -2,7 +2,9 @@ package com.smarttoolfactory.image.util
 
 import androidx.compose.ui.geometry.Offset
 import androidx.compose.ui.geometry.Rect
-import androidx.compose.ui.geometry.Size
+import androidx.compose.ui.unit.IntOffset
+import androidx.compose.ui.unit.IntRect
+import androidx.compose.ui.unit.IntSize
 
 /**
  * Get rectangle of current transformation of [pan], [zoom] and current bounds of the Composable's
@@ -27,20 +29,20 @@ fun getCropRect(
     pan: Offset,
     zoom: Float,
     rectSelection: Rect
-): Rect {
+): IntRect {
     val widthRatio = bitmapWidth / containerWidth
     val heightRatio = bitmapHeight / containerHeight
 
     val width = (widthRatio * rectSelection.width / zoom).coerceIn(0f, bitmapWidth.toFloat())
     val height = (heightRatio * rectSelection.height / zoom).coerceIn(0f, bitmapHeight.toFloat())
 
     val offsetXInBitmap = (widthRatio * (pan.x + rectSelection.left / zoom))
-        .coerceIn(0f, bitmapWidth - width)
-    val offsetYInBitmap = heightRatio * (pan.y + rectSelection.top / zoom)
-        .coerceIn(0f, bitmapHeight - height)
+        .coerceIn(0f, bitmapWidth - width).toInt()
+    val offsetYInBitmap = (heightRatio * (pan.y + rectSelection.top / zoom))
+        .coerceIn(0f, bitmapHeight - height).toInt()
 
-    return Rect(
-        offset = Offset(offsetXInBitmap, offsetYInBitmap),
-        size = Size(width, height)
+    return IntRect(
+        offset = IntOffset(offsetXInBitmap, offsetYInBitmap),
+        size = IntSize(width.toInt(), height.toInt())
     )
 }

image/src/main/java/com/smarttoolfactory/image/zoom/AnimatedZoomModifier.kt

@@ -79,10 +79,10 @@ fun Modifier.animatedZoom(
                             mainPointer = mainPointer,
                             changes = pointerList
                         )
+                    }
 
-                        if (gestureEnabled) {
-                            mainPointer.consume()
-                        }
+                    if (gestureEnabled) {
+                        mainPointer.consume()
                     }
                 }
             )
@@ -189,10 +189,10 @@ fun Modifier.animatedZoom(
                             mainPointer = mainPointer,
                             changes = pointerList
                         )
+                    }
 
-                        if (gestureEnabled) {
-                            mainPointer.consume()
-                        }
+                    if (gestureEnabled) {
+                        mainPointer.consume()
                     }
                 }
             )

image/src/main/java/com/smarttoolfactory/image/zoom/EnhancedZoomModifier.kt

@@ -412,7 +412,7 @@ fun Modifier.enhancedZoom(
     }
 )
 
-internal val DefaultEnabled = { _: Float, _: Offset, _: Float ->
+internal val DefaultEnabled = { zoom: Float, pan: Offset, rotation: Float ->
     true
 }
 

image/src/main/java/com/smarttoolfactory/image/zoom/EnhancedZoomStateImpl.kt

@@ -7,6 +7,7 @@ import androidx.compose.ui.geometry.Rect
 import androidx.compose.ui.geometry.Size
 import androidx.compose.ui.input.pointer.PointerInputChange
 import androidx.compose.ui.input.pointer.util.VelocityTracker
+import androidx.compose.ui.unit.IntRect
 import androidx.compose.ui.unit.IntSize
 import com.smarttoolfactory.image.util.coerceIn
 import com.smarttoolfactory.image.util.getCropRect
@@ -79,7 +80,7 @@ open class EnhancedZoomState constructor(
             visibleRegion = calculateRectBounds()
         )
 
-    private fun calculateRectBounds(): Rect {
+    private fun calculateRectBounds(): IntRect {
 
         val width = size.width
         val height = size.height

image/src/main/java/com/smarttoolfactory/image/zoom/ZoomData.kt

@@ -3,6 +3,7 @@ package com.smarttoolfactory.image.zoom
 import androidx.compose.runtime.Immutable
 import androidx.compose.ui.geometry.Offset
 import androidx.compose.ui.geometry.Rect
+import androidx.compose.ui.unit.IntRect
 
 /**
  * class that contains current zoom, pan and rotation information
@@ -24,5 +25,5 @@ data class EnhancedZoomData(
     val pan: Offset = Offset.Zero,
     val rotation: Float = 0f,
     val imageRegion: Rect,
-    val visibleRegion: Rect
+    val visibleRegion: IntRect
 )