bug fixes

* fix MorphLayout not disabling bug
* change zoom level on ZoomModifier

Author: SmartToolFactory

image/src/main/java/com/smarttoolfactory/image/transform/MorphLayout.kt

@@ -138,47 +138,14 @@ private fun MorphLayout(
             onUp = onUp
         )
 
-//    var zoom by remember { mutableStateOf(1f) }
-//    var offset by remember { mutableStateOf(Offset.Zero) }
-
     val transformModifier = Modifier
         .padding(handleRadius)
         .fillMaxSize()
-//        .clipToBounds()
-//        .graphicsLayer {
-//            translationX = offset.x
-//            translationY = offset.y
-//            scaleX = zoom
-//            scaleY = zoom
-//        }
-//        .pointerInput(Unit) {
-//            detectPointerTransformGestures(
-//                requisite = PointerRequisite.GreaterThan,
-//                numberOfPointers = 1,
-//                onGesture = { _,
-//                              gesturePan: Offset,
-//                              gestureZoom: Float,
-//                              _,
-//                              _,
-//                              _ ->
-//                    val newScale = (zoom * gestureZoom).coerceIn(1f, 3f)
-//                    val newOffset = offset + gesturePan
-//                    zoom = newScale
-//
-//                    val maxX = (size.width * (zoom - 1) / 2f)
-//                    val maxY = (size.height * (zoom - 1) / 2f)
-//
-//                    offset = Offset(
-//                        newOffset.x.coerceIn(-maxX, maxX),
-//                        newOffset.y.coerceIn(-maxY, maxY)
-//                    )
-//                }
-//            )
-//        }
 
     ResizeImpl(
         modifier = editModifier,
         transformModifier = transformModifier,
+        enabled = enabled,
         touchRegionRadius = touchRegionRadius,
         rectDraw = rectDraw,
         handlePlacement = handlePlacement,
@@ -190,6 +157,7 @@ private fun MorphLayout(
 private fun ResizeImpl(
     modifier: Modifier,
     transformModifier: Modifier,
+    enabled: Boolean,
     touchRegionRadius: Float,
     rectDraw: Rect,
     handlePlacement: HandlePlacement,
@@ -207,11 +175,15 @@ private fun ResizeImpl(
             content()
         }
 
-        HandleOverlay(
-            modifier = Modifier.fillMaxSize(),
-            radius = touchRegionRadius,
-            rectDraw = rectDraw,
-            handlePlacement = handlePlacement
-        )
+        if (enabled) {
+            HandleOverlay(
+                modifier = Modifier.fillMaxSize(),
+                radius = touchRegionRadius,
+                rectDraw = rectDraw,
+                handlePlacement = handlePlacement
+            )
+        }
+
+
     }
 }

image/src/main/java/com/smarttoolfactory/image/transform/MorphModifier.kt

@@ -60,23 +60,26 @@ internal fun Modifier.morph(
                 translationY = transform.translationY
                 rotationZ = transform.rotation
             }
-            .pointerMotionEvents(Unit,
+            .pointerMotionEvents(enabled,
                 onDown = { change ->
 
-                    val size = with(density) { updatedSize.toSize() }
-                    val position = change.position
-
-                    touchRegion = getTouchRegion(
-                        position = position,
-                        rect = Rect(offset = Offset.Zero, size = size),
-                        threshold = touchRegionRadius * 2,
-                        handlePlacement = handlePlacement
-                    )
-
-                    onDown()
-
+                    if (enabled) {
+                        val size = with(density) { updatedSize.toSize() }
+                        val position = change.position
+
+                        touchRegion = getTouchRegion(
+                            position = position,
+                            rect = Rect(offset = Offset.Zero, size = size),
+                            threshold = touchRegionRadius * 2,
+                            handlePlacement = handlePlacement
+                        )
+                        onDown()
+                    }
                 },
                 onMove = { change ->
+
+                    if (!enabled) return@pointerMotionEvents
+
                     val dragAmount = change.positionChange()
 
                     updateTransform(

image/src/main/java/com/smarttoolfactory/image/transform/TranformLayout.kt

@@ -111,12 +111,6 @@ private fun TransformLayout(
         )
     }
 
-//    var innerTransform by remember {
-//        mutableStateOf(
-//            transform
-//        )
-//    }
-
     var rectDraw by remember {
         mutableStateOf(
             Rect(
@@ -166,42 +160,6 @@ private fun TransformLayout(
                 horizontal = handleRadius / abs(outerTransform.scaleX),
                 vertical = handleRadius / abs(outerTransform.scaleY)
             )
-//            .clipToBounds()
-//            .graphicsLayer {
-//                translationX = innerTransform.translationX
-//                translationY = innerTransform.translationY
-//                scaleX = innerTransform.scaleX
-//                scaleY = innerTransform.scaleY
-//            }
-//            .pointerInput(Unit) {
-//                detectPointerTransformGestures(
-//                    requisite = PointerRequisite.GreaterThan,
-//                    numberOfPointers = 1,
-//                    onGesture = { _,
-//                                  gesturePan: Offset,
-//                                  gestureZoom: Float,
-//                                  _,
-//                                  _,
-//                                  _ ->
-//
-//                        val oldZoom = innerTransform.scaleX
-//                        val offset =
-//                            Offset(innerTransform.translationX, innerTransform.translationY)
-//                        val zoom = (oldZoom * gestureZoom).coerceIn(1f, 3f)
-//                        val newOffset = offset + gesturePan
-//
-//                        val maxX = (size.width * (zoom - 1) / 2f)
-//                        val maxY = (size.height * (zoom - 1) / 2f)
-//
-//                        innerTransform = innerTransform.copy(
-//                            translationX = newOffset.x.coerceIn(-maxX, maxX),
-//                            translationY = newOffset.y.coerceIn(-maxY, maxY),
-//                            scaleX = zoom,
-//                            scaleY = zoom
-//                        )
-//                    }
-//                )
-//            }
 
     TransformImpl(
         modifier = editModifier,

image/src/main/java/com/smarttoolfactory/image/transform/TransformModifier.kt

@@ -107,9 +107,9 @@ internal fun Modifier.transform(
                     // This is required for not moving edge of draw rect to touch position on move
                     distanceToEdgeFromTouch =
                         getDistanceToEdgeFromTouch(touchRegion, rectTemp, touchPositionOnScreen)
-                }
 
-                onDown(currentTransform, rectDraw)
+                    onDown(currentTransform, rectDraw)
+                }
             },
             onMove = { change: PointerInputChange ->
 

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

@@ -24,11 +24,11 @@ internal fun calculateZoom(
         }
         ZoomLevel.Max -> {
             newZoomLevel = ZoomLevel.Min
-            newZoom = if (min == initial) (min + max.coerceAtMost(3f)) / 2 else min
+            newZoom = if (min == initial) initial else min
         }
         else -> {
             newZoomLevel = ZoomLevel.Mid
-            newZoom = initial.coerceAtMost(2f)
+            newZoom = if (min == initial) (min + max.coerceAtMost(3f)) / 2 else initial
         }
     }
     return Pair(newZoomLevel, newZoom)