update EnhancedZoomModifier flags

Author: SmartToolFactory

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

@@ -8,6 +8,7 @@ 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.IntSize
+import com.smarttoolfactory.image.util.coerceIn
 import com.smarttoolfactory.image.util.getCropRect
 import kotlinx.coroutines.coroutineScope
 
@@ -31,15 +32,22 @@ open class EnhancedZoomState constructor(
     maxZoom: Float = 5f,
     val flingGestureEnabled: Boolean = true,
     val moveToBoundsEnabled: Boolean = true,
-    override var zoomEnabled: Boolean = true,
-    override var panEnabled: Boolean = true,
-    override var rotationEnabled: Boolean = true,
-    override var limitPan: Boolean = false
+    zoomEnabled: Boolean = true,
+    panEnabled: Boolean = true,
+    rotationEnabled: Boolean = false,
+    limitPan: Boolean = false
 ) : ZoomState(
-    1f, 1f, minZoom, maxZoom, zoomEnabled
+    initialZoom = initialZoom,
+    initialRotation = 1f,
+    minZoom = minZoom,
+    maxZoom = maxZoom,
+    zoomEnabled = zoomEnabled,
+    panEnabled = panEnabled,
+    rotationEnabled = rotationEnabled,
+    limitPan = limitPan
 ) {
 
-    var rectDraw = Rect(
+    private val rectDraw = Rect(
         offset = Offset.Zero,
         size = Size(containerSize.width.toFloat(), containerSize.height.toFloat())
     )
@@ -59,14 +67,18 @@ open class EnhancedZoomState constructor(
         return getBounds(containerSize)
     }
 
-    // Touch gestures
+    /*
+        Touch Gesture Events
+     */
     open suspend fun onDown(change: PointerInputChange) {}
 
     open suspend fun onMove(change: PointerInputChange) {}
 
     open suspend fun onUp(change: PointerInputChange) {}
 
-    // Transform Gestures
+    /*
+        Transform Gesture Events
+     */
     internal open suspend fun onGestureStart(change: PointerInputChange) {}
 
     open suspend fun onGesture(
@@ -86,25 +98,28 @@ open class EnhancedZoomState constructor(
         )
 
         // Fling Gesture
-        if (changes.size == 1) {
-            addPosition(
-                mainPointer.uptimeMillis,
-                mainPointer.position
-            )
+        if (flingGestureEnabled) {
+            if (changes.size == 1) {
+                addPosition(mainPointer.uptimeMillis, mainPointer.position)
+            }
         }
     }
 
-    suspend fun onGestureEnd(onAnimationEnd: () -> Unit) {
-        if (zoom > 1) {
+    suspend fun onGestureEnd(onFinish: () -> Unit) {
+        if (flingGestureEnabled && zoom > 1) {
             fling()
         }
-        resetToValidBounds()
-        onAnimationEnd()
+        if (moveToBoundsEnabled) {
+            resetToValidBounds()
+        }
+        onFinish()
     }
 
     // Double Tap
     suspend fun onDoubleTap(onAnimationEnd: () -> Unit) {
-        resetTracking()
+        if (flingGestureEnabled) {
+            resetTracking()
+        }
         resetWithAnimation()
         onAnimationEnd()
     }
@@ -115,18 +130,15 @@ open class EnhancedZoomState constructor(
     private suspend fun resetToValidBounds() {
         val zoom = zoom.coerceAtLeast(1f)
         val bounds = getBounds()
-
-        val pan = Offset(
-            pan.x.coerceIn(-bounds.x, bounds.x),
-            pan.y.coerceIn(-bounds.y, bounds.y)
-        )
-
+        val pan = pan.coerceIn(-bounds.x..bounds.x, -bounds.y..bounds.y)
         resetWithAnimation(pan = pan, zoom = zoom)
         resetTracking()
     }
 
 
-    // Fling gesture
+    /*
+        Fling gesture
+     */
     private fun addPosition(timeMillis: Long, position: Offset) {
         velocityTracker.addPosition(
             timeMillis = timeMillis,
@@ -150,33 +162,6 @@ open class EnhancedZoomState constructor(
         velocityTracker.resetTracking()
     }
 
-    override suspend fun updateZoomState(
-        size: IntSize,
-        gesturePan: Offset,
-        gestureZoom: Float,
-        gestureRotate: Float,
-    ) {
-        val zoom = (zoom * gestureZoom).coerceIn(zoomMin, zoomMax)
-        val rotation = if (rotationEnabled) {
-            rotation + gestureRotate
-        } else {
-            0f
-        }
-
-        if (panEnabled) {
-            val newOffset = pan + gesturePan.times(zoom)
-            snapPanTo(newOffset)
-        }
-
-        if (zoomEnabled) {
-            snapZoomTo(zoom)
-        }
-
-        if (rotationEnabled) {
-            snapRotationTo(rotation)
-        }
-    }
-
     private fun calculateRectBounds(): Rect {
 
         val width = containerSize.width
@@ -208,15 +193,6 @@ open class EnhancedZoomState constructor(
             zoom = zoom,
             rectSelection = rectDraw
         )
-
-        println(
-            "😃 EnhancedZoomState calculateRectBounds()\n" +
-                    "offsetX: $offsetX, offsetY: $offsetY\n" +
-                    "totalHeight: ${rect.bottom > imageSize.height}, offset: $offset\n" +
-                    "containerSize: $containerSize, pan: $pan, zoom: $zoom\n" +
-                    "rect: $rect, height: ${rect.height}"
-        )
-
         return rect
     }
 }

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

@@ -22,7 +22,7 @@ import kotlinx.coroutines.launch
  * @param rotationEnabled when set to true rotation is enabled
  */
 @Immutable
-open class ZoomState internal constructor(
+open class ZoomState(
     initialZoom: Float = 1f,
     initialRotation: Float = 0f,
     minZoom: Float = 1f,
@@ -64,7 +64,8 @@ open class ZoomState internal constructor(
     val isRotating: Boolean
         get() = animatableRotation.isRunning
 
-    val isAnimationRunning = isZooming || isPanning || isRotating
+    val isAnimationRunning: Boolean
+        get() = isZooming || isPanning || isRotating
 
     val zoomData: ZoomData
         get() = ZoomData(
@@ -73,42 +74,38 @@ open class ZoomState internal constructor(
             rotation = rotation
         )
 
-    open fun updateBounds(lowerBound: Offset?, upperBound: Offset?) {
+    internal open fun updateBounds(lowerBound: Offset?, upperBound: Offset?) {
         animatablePan.updateBounds(lowerBound, upperBound)
     }
 
-    internal fun getBounds(size: IntSize): Offset {
+    internal open fun getBounds(size: IntSize): Offset {
         val maxX = (size.width * (zoom - 1) / 2f).coerceAtLeast(0f)
         val maxY = (size.height * (zoom - 1) / 2f).coerceAtLeast(0f)
         return Offset(maxX, maxY)
     }
 
-    internal open suspend fun updateZoomState(
+     open suspend fun updateZoomState(
         size: IntSize,
         gesturePan: Offset,
         gestureZoom: Float,
         gestureRotate: Float = 1f,
     ) {
         val zoomChange = (zoom * gestureZoom).coerceIn(zoomMin, zoomMax)
+        snapZoomTo(zoomChange)
         val rotationChange = if (rotationEnabled) {
             rotation + gestureRotate
         } else {
             0f
         }
-
-        snapZoomTo(zoomChange)
         snapRotationTo(rotationChange)
 
         if (panEnabled) {
-            var panChange = pan + gesturePan.times(zoom)
+            val panChange = pan + gesturePan.times(zoom)
             val boundPan = limitPan && !rotationEnabled
 
             if (boundPan) {
                 val bound = getBounds(size)
-                panChange = Offset(
-                    panChange.x.coerceIn(-bound.x, bound.x),
-                    panChange.y.coerceIn(-bound.y, bound.y)
-                )
+                updateBounds(bound.times(-1f), bound)
             }
             snapPanTo(panChange)
         }