move logic from EnhancedZoomModifier to EnhancedZoomState

Author: SmartToolFactory

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

@@ -42,58 +42,25 @@ fun Modifier.enhancedZoom(
                     onDown(enhancedZoomState.enhancedZoomData)
                 },
                 onGestureEnd = {
-
-                    // Reset to bounds gesture
-                    val zoom = enhancedZoomState.zoom.coerceAtLeast(1f)
-                    val pan = enhancedZoomState.pan
-
-                    val bounds = enhancedZoomState.getBounds(size)
-
-//                    val newOffset = Offset(
-//                        pan.x.coerceIn(-bounds.x, bounds.x),
-//                        pan.y.coerceIn(-bounds.y, bounds.y)
-//                    )
-//
-//                    coroutineScope.run {
-//                        enhancedZoomState.resetTracking()
-//                        launch { enhancedZoomState.animateZoomTo(zoom) }
-//                        launch { enhancedZoomState.animatePanTo(newOffset) }
-//                    }
-
-                    // Fling Gesture
                     coroutineScope.launch {
                         enhancedZoomState.onGestureEnd()
                     }
 
                     onUp(enhancedZoomState.enhancedZoomData)
                 },
-                onGesture = { _, gesturePan, gestureZoom, gestureRotate, mainPointer, pointerList ->
+                onGesture = { centroid, pan, zoom, rotate, mainPointer, pointerList ->
 
                     coroutineScope.launch {
 
-                        enhancedZoomState.updateZoomState(
-                            size = size,
-                            gestureZoom = gestureZoom,
-                            gesturePan = gesturePan,
-                            gestureRotate = gestureRotate
+                        enhancedZoomState.onGesture(
+                            centroid,
+                            pan,
+                            zoom,
+                            rotate,
+                            mainPointer,
+                            pointerList
                         )
 
-                        // Fling Gesture
-                        if (pointerList.size == 1) {
-
-//                            val bounds = enhancedZoomState.getBounds(size)
-//
-//                            enhancedZoomState.boundPan(
-//                                lowerBound = Offset(-bounds.x, -bounds.y),
-//                                upperBound = Offset(bounds.x, bounds.y)
-//                            )
-
-                            enhancedZoomState.addPosition(
-                                mainPointer.uptimeMillis,
-                                mainPointer.position
-                            )
-                        }
-
                         onMove(enhancedZoomState.enhancedZoomData)
                     }
                 }
@@ -104,7 +71,7 @@ fun Modifier.enhancedZoom(
             detectTapGestures(
                 onDoubleTap = {
                     coroutineScope.launch {
-                        enhancedZoomState.onDoubleTap()
+                        enhancedZoomState.resetWithAnimation()
                     }
                 }
             )

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

@@ -34,7 +34,7 @@ import kotlinx.coroutines.launch
  */
 @Composable
 fun rememberEnhancedZoomState(
-    size: Size,
+    size: IntSize,
     initialZoom: Float = 1f,
     initialRotation: Float = 0f,
     minZoom: Float = 1f,
@@ -80,7 +80,7 @@ fun rememberEnhancedZoomState(
  */
 @Composable
 fun rememberEnhancedZoomState(
-    size: Size,
+    size: IntSize,
     initialZoom: Float = 1f,
     initialRotation: Float = 0f,
     minZoom: Float = 1f,
@@ -126,7 +126,7 @@ fun rememberEnhancedZoomState(
  */
 @Composable
 fun rememberEnhancedZoomState(
-    size: Size,
+    size: IntSize,
     initialZoom: Float = 1f,
     initialRotation: Float = 0f,
     minZoom: Float = 1f,
@@ -164,7 +164,7 @@ fun rememberEnhancedZoomState(
  * @param rotationEnabled when set to true rotation is enabled
  */
 open class EnhancedZoomState constructor(
-    var size: Size,
+    var size: IntSize,
     initialZoom: Float = 1f,
     initialRotation: Float = 0f,
     minZoom: Float = .5f,
@@ -181,7 +181,8 @@ open class EnhancedZoomState constructor(
     val isPanning = animatablePan.isRunning
     val isRotating = animatableRotation.isRunning
 
-    var rectDraw = Rect(offset = Offset.Zero, size = size)
+    var rectDraw =
+        Rect(offset = Offset.Zero, size = Size(size.width.toFloat(), size.height.toFloat()))
     var rectImage = rectDraw.copy()
     var rectCrop = rectDraw
 
@@ -196,6 +197,9 @@ open class EnhancedZoomState constructor(
             cropRect = rectCrop
         )
 
+    private fun getBounds(): Offset {
+        return getBounds(size)
+    }
 
     // Touch gestures
     internal open suspend fun onDown(change: PointerInputChange) = coroutineScope {
@@ -211,42 +215,90 @@ open class EnhancedZoomState constructor(
     }
 
     // Transform Gestures
-    internal open suspend fun onGestureStart() = coroutineScope {
+    internal open suspend fun onGestureStart(change: PointerInputChange) = coroutineScope {
 
     }
 
-    internal open suspend fun onGesture() = coroutineScope {
+    internal open suspend fun onGesture(
+        centroid: Offset,
+        pan: Offset,
+        zoom: Float,
+        rotation: Float,
+        mainPointer: PointerInputChange,
+        changes: List<PointerInputChange>
+    ) = coroutineScope {
+
+        updateZoomState(
+            size = size,
+            gestureZoom = zoom,
+            gesturePan = pan,
+            gestureRotate = rotation
+        )
 
+        // Fling Gesture
+        if (changes.size == 1) {
+            addPosition(
+                mainPointer.uptimeMillis,
+                mainPointer.position
+            )
+        }
     }
 
     internal suspend fun onGestureEnd() {
-        val velocity = velocityTracker.calculateVelocity()
-        fling(Offset(velocity.x, velocity.y))
+        fling()
+        resetToValidBounds()
     }
 
-    internal fun addPosition(timeMillis: Long, position: Offset) {
+    private suspend fun resetToValidBounds() = coroutineScope {
+
+        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)
+        )
+
+        resetWithAnimation(pan = pan,zoom = zoom)
+    }
+
+
+    // Fling gesture
+    private fun addPosition(timeMillis: Long, position: Offset) {
         velocityTracker.addPosition(
             timeMillis = timeMillis,
             position = position
         )
     }
 
 
-    private suspend fun fling(velocity: Offset) = coroutineScope {
+    private suspend fun fling() = coroutineScope {
+        val velocityTracker = velocityTracker.calculateVelocity()
+        val velocity = Offset(velocityTracker.x, velocityTracker.y)
+
         launch {
             val animationResult = animatablePan.animateDecay(
                 velocity,
-                exponentialDecay()
+                exponentialDecay(),
+                block = {
+//                    val pan = this.value
+//                    val bounds  = getBounds()
+//                    if(pan.x < bounds.x || pan.y < bounds.y){
+//                        throw CancellationException()
+//                    }
+
+                }
             )
 
+
 //            if (!animationResult.endState.isRunning) {
 //                resetTracking()
 //            }
         }
     }
 
 
-    internal fun resetTracking() {
+    private fun resetTracking() {
         velocityTracker.resetTracking()
     }