update ZoomUtil, ZoomModifier and ZoomState

Author: SmartToolFactory

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

@@ -6,7 +6,6 @@ import androidx.compose.ui.Modifier
 import androidx.compose.ui.composed
 import androidx.compose.ui.draw.clipToBounds
 import androidx.compose.ui.geometry.Offset
-import androidx.compose.ui.graphics.GraphicsLayerScope
 import androidx.compose.ui.graphics.graphicsLayer
 import androidx.compose.ui.input.pointer.pointerInput
 import com.smarttoolfactory.gesture.detectTransformGestures
@@ -423,22 +422,3 @@ fun Modifier.zoom(
     onGestureEnd = {},
     onGesture = {}
 )
-
-private fun GraphicsLayerScope.update(zoomState: ZoomState) {
-
-    // Set zoom
-    val zoom = zoomState.zoom
-    this.scaleX = zoom
-    this.scaleY = zoom
-
-    // Set pan
-    val pan = zoomState.pan
-    val translationX = pan.x
-    val translationY = pan.y
-    this.translationX = translationX
-    this.translationY = translationY
-
-    // Set rotation
-    this.rotationZ = zoomState.rotation
-}
-

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

@@ -11,7 +11,6 @@ import androidx.compose.ui.unit.IntSize
 import kotlinx.coroutines.coroutineScope
 
 
-
 /**
  * * Create and [remember] the [ZoomState] based on the currently appropriate transform
  * configuration to allow changing pan, zoom, and rotation.
@@ -129,7 +128,7 @@ fun rememberZoomState(
     rotationEnabled: Boolean = false,
     limitPan: Boolean = false,
     vararg keys: Any?
-    ): ZoomState {
+): ZoomState {
     return remember(keys) {
         ZoomState(
             initialZoom = initialZoom,
@@ -197,15 +196,15 @@ open class ZoomState internal constructor(
         )
 
 
-    open fun boundPan(lowerBound:Offset, upperBound:Offset) {
+    open fun boundPan(lowerBound: Offset, upperBound: Offset) {
         animatablePan.updateBounds(lowerBound, upperBound)
     }
 
     internal open suspend fun updateZoomState(
         size: IntSize,
         gesturePan: Offset,
         gestureZoom: Float,
-        gestureRotate: Float,
+        gestureRotate: Float = 1f,
     ) {
         var zoom = zoom
 

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

@@ -1,5 +1,7 @@
 package com.smarttoolfactory.image.zoom
 
+import androidx.compose.ui.graphics.GraphicsLayerScope
+
 /**
  * Calculate zoom level and zoom value when user double taps
  */
@@ -28,4 +30,26 @@ internal fun calculateZoom(
         }
     }
     return Pair(newZoomLevel, newZoom)
-}
+}
+
+/**
+ * Update graphic layer with [zoomState]
+ */
+internal fun GraphicsLayerScope.update(zoomState: ZoomState) {
+
+    // Set zoom
+    val zoom = zoomState.zoom
+    this.scaleX = zoom
+    this.scaleY = zoom
+
+    // Set pan
+    val pan = zoomState.pan
+    val translationX = pan.x
+    val translationY = pan.y
+    this.translationX = translationX
+    this.translationY = translationY
+
+    // Set rotation
+    this.rotationZ = zoomState.rotation
+}
+