change ZoomData to extension param of ZoomState

ZoomData is removed from ZoomState and added as extension and callbacks are now nullable to create a new ZoomData on each call even if it's not needed

Author: SmartToolFactory

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

@@ -109,7 +109,7 @@ open class BaseEnhancedZoomState constructor(
     limitPan: Boolean = false
 ) : ZoomState(
     initialZoom = initialZoom,
-    initialRotation = 1f,
+    initialRotation = 0f,
     minZoom = minZoom,
     maxZoom = maxZoom,
     zoomEnabled = zoomEnabled,

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

@@ -35,9 +35,9 @@ fun Modifier.zoom(
     consume: Boolean = true,
     clip: Boolean = true,
     zoomState: ZoomState,
-    onGestureStart: (ZoomData) -> Unit = {},
-    onGesture: (ZoomData) -> Unit = {},
-    onGestureEnd: (ZoomData) -> Unit = {},
+    onGestureStart: ((ZoomData) -> Unit)? = null,
+    onGesture: ((ZoomData) -> Unit)? = null,
+    onGestureEnd: ((ZoomData) -> Unit)? = null
 ) = composed(
     factory = {
         val coroutineScope = rememberCoroutineScope()
@@ -51,10 +51,10 @@ fun Modifier.zoom(
             detectTransformGestures(
                 consume = consume,
                 onGestureStart = {
-                    onGestureStart(zoomState.zoomData)
+                    onGestureStart?.invoke(zoomState.zoomData)
                 },
                 onGestureEnd = {
-                    onGestureEnd(zoomState.zoomData)
+                    onGestureEnd?.invoke(zoomState.zoomData)
                 },
                 onGesture = { centroid, pan, zoom, rotation, _, _ ->
 
@@ -68,7 +68,7 @@ fun Modifier.zoom(
                         )
                     }
 
-                    onGesture(zoomState.zoomData)
+                    onGesture?.invoke(zoomState.zoomData)
                 }
             )
         }
@@ -144,9 +144,9 @@ fun Modifier.zoom(
     consume: Boolean = true,
     clip: Boolean = true,
     zoomState: ZoomState,
-    onGestureStart: (ZoomData) -> Unit = {},
-    onGesture: (ZoomData) -> Unit = {},
-    onGestureEnd: (ZoomData) -> Unit = {},
+    onGestureStart: ((ZoomData) -> Unit)? = null,
+    onGesture: ((ZoomData) -> Unit)? = null,
+    onGestureEnd: ((ZoomData) -> Unit)? = null
 ) = composed(
     factory = {
         val coroutineScope = rememberCoroutineScope()
@@ -160,10 +160,10 @@ fun Modifier.zoom(
             detectTransformGestures(
                 consume = consume,
                 onGestureStart = {
-                    onGestureStart(zoomState.zoomData)
+                    onGestureStart?.invoke(zoomState.zoomData)
                 },
                 onGestureEnd = {
-                    onGestureEnd(zoomState.zoomData)
+                    onGestureEnd?.invoke(zoomState.zoomData)
                 },
                 onGesture = { centroid, pan, zoom, rotation, _, _ ->
 
@@ -177,7 +177,7 @@ fun Modifier.zoom(
                         )
                     }
 
-                    onGesture(zoomState.zoomData)
+                    onGesture?.invoke(zoomState.zoomData)
                 }
             )
         }
@@ -253,9 +253,9 @@ fun Modifier.zoom(
     consume: Boolean = true,
     clip: Boolean = true,
     zoomState: ZoomState,
-    onGestureStart: (ZoomData) -> Unit = {},
-    onGesture: (ZoomData) -> Unit = {},
-    onGestureEnd: (ZoomData) -> Unit = {},
+    onGestureStart: ((ZoomData) -> Unit)? = null,
+    onGesture: ((ZoomData) -> Unit)? = null,
+    onGestureEnd: ((ZoomData) -> Unit)? = null
 ) = composed(
     factory = {
         val coroutineScope = rememberCoroutineScope()
@@ -269,10 +269,10 @@ fun Modifier.zoom(
             detectTransformGestures(
                 consume = consume,
                 onGestureStart = {
-                    onGestureStart(zoomState.zoomData)
+                    onGestureStart?.invoke(zoomState.zoomData)
                 },
                 onGestureEnd = {
-                    onGestureEnd(zoomState.zoomData)
+                    onGestureEnd?.invoke(zoomState.zoomData)
                 },
                 onGesture = { centroid, pan, zoom, rotation, _, _ ->
 
@@ -286,7 +286,7 @@ fun Modifier.zoom(
                         )
                     }
 
-                    onGesture(zoomState.zoomData)
+                    onGesture?.invoke(zoomState.zoomData)
                 }
             )
         }
@@ -357,9 +357,9 @@ fun Modifier.zoom(
     clip = clip,
     consume = true,
     zoomState = zoomState,
-    onGestureStart = {},
-    onGestureEnd = {},
-    onGesture = {}
+    onGestureStart = null,
+    onGestureEnd = null,
+    onGesture = null
 )
 
 /**
@@ -383,9 +383,9 @@ fun Modifier.zoom(
     clip = clip,
     consume = true,
     zoomState = zoomState,
-    onGestureStart = {},
-    onGestureEnd = {},
-    onGesture = {}
+    onGestureStart = null,
+    onGestureEnd = null,
+    onGesture = null
 )
 
 /**
@@ -407,7 +407,14 @@ fun Modifier.zoom(
     clip = clip,
     consume = true,
     zoomState = zoomState,
-    onGestureStart = {},
-    onGestureEnd = {},
-    onGesture = {}
+    onGestureStart = null,
+    onGestureEnd = null,
+    onGesture = null
 )
+
+internal val ZoomState.zoomData: ZoomData
+    get() = ZoomData(
+        zoom = zoom,
+        pan = pan,
+        rotation = rotation
+    )

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

@@ -67,17 +67,14 @@ open class ZoomState(
     val isAnimationRunning: Boolean
         get() = isZooming || isPanning || isRotating
 
-    val zoomData: ZoomData
-        get() = ZoomData(
-            zoom = zoom,
-            pan = pan,
-            rotation = rotation
-        )
-
     internal open fun updateBounds(lowerBound: Offset?, upperBound: Offset?) {
         animatablePan.updateBounds(lowerBound, upperBound)
     }
 
+    /**
+     * Get bounds of Composables that can be panned based on zoom level
+     * @param size is size of Composable that this modifier is applied to.
+     */
     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)
@@ -113,6 +110,9 @@ open class ZoomState(
         }
     }
 
+    /**
+     * Reset [pan], [zoom] and [rotation] with animation.
+     */
     internal open suspend fun resetWithAnimation(
         pan: Offset = Offset.Zero,
         zoom: Float = 1f,