fix handle size not changing actual size

Author: SmartToolFactory

app/src/main/java/com/smarttoolfactory/composecropper/demo/ImageCropDemo.kt

@@ -24,6 +24,7 @@ import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.graphics.ImageBitmap
 import androidx.compose.ui.layout.ContentScale
 import androidx.compose.ui.platform.LocalContext
+import androidx.compose.ui.platform.LocalDensity
 import androidx.compose.ui.res.imageResource
 import androidx.compose.ui.unit.dp
 import com.smarttoolfactory.colorpicker.widget.drawChecker
@@ -46,7 +47,6 @@ internal enum class SelectionPage {
 @Composable
 fun ImageCropDemo() {
 
-
     val bottomSheetScaffoldState: BottomSheetScaffoldState = rememberBottomSheetScaffoldState(
         bottomSheetState = BottomSheetState(BottomSheetValue.Collapsed)
     )
@@ -65,13 +65,16 @@ fun ImageCropDemo() {
         )
     }
 
+    val handleSize: Float = LocalDensity.current.run { 20.dp.toPx() }
+
     var cropProperties by remember {
         mutableStateOf(
             CropDefaults.properties(
                 cropOutlineProperty = CropOutlineProperty(
                     OutlineType.Rect,
-                    RectCropShape(0, "")
-                )
+                    RectCropShape(0, "Rect")
+                ),
+                handleSize = handleSize
             )
         )
     }
@@ -117,6 +120,7 @@ fun ImageCropDemo() {
                     )
                 } else {
                     CropStyleSelectionMenu(
+                        cropType = cropProperties.cropType,
                         cropStyle = cropStyle,
                         onCropStyleChange = {
                             cropStyle = it

app/src/main/java/com/smarttoolfactory/composecropper/demo/ImageCropDemoSimple.kt

@@ -14,7 +14,9 @@ import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.graphics.ImageBitmap
 import androidx.compose.ui.platform.LocalContext
+import androidx.compose.ui.platform.LocalDensity
 import androidx.compose.ui.res.imageResource
+import androidx.compose.ui.unit.dp
 import com.smarttoolfactory.composecropper.R
 import com.smarttoolfactory.cropper.ImageCropper
 import com.smarttoolfactory.cropper.model.OutlineType
@@ -25,13 +27,16 @@ import com.smarttoolfactory.cropper.settings.CropOutlineProperty
 @Composable
 fun ImageCropDemoSimple() {
 
+    val handleSize: Float = LocalDensity.current.run { 20.dp.toPx() }
+
     val cropProperties by remember {
         mutableStateOf(
             CropDefaults.properties(
                 cropOutlineProperty = CropOutlineProperty(
                     OutlineType.Rect,
                     RectCropShape(0, "Rect")
-                )
+                ),
+                handleSize = handleSize
             )
         )
     }

app/src/main/java/com/smarttoolfactory/composecropper/preferences/CropPropertySelection.kt

@@ -6,6 +6,7 @@ import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.remember
 import androidx.compose.ui.Modifier
+import androidx.compose.ui.platform.LocalDensity
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.sp
 import com.smarttoolfactory.cropper.model.AspectRatio
@@ -23,11 +24,14 @@ internal fun CropPropertySelectionMenu(
     cropProperties: CropProperties,
     onCropPropertiesChange: (CropProperties) -> Unit
 ) {
+
+    val density = LocalDensity.current
+
     // Crop properties
     val cropType = cropProperties.cropType
     val aspectRatio = cropProperties.aspectRatio
 
-    val handleSize = cropProperties.handleSize
+    val handleSize = density.run { cropProperties.handleSize.toDp() }
     val contentScale = cropProperties.contentScale
     val cropOutlineProperty = cropProperties.cropOutlineProperty
     val overlayRatio = (cropProperties.overlayRatio * 100)
@@ -87,11 +91,11 @@ internal fun CropPropertySelectionMenu(
             value = handleSize,
             onValueChange = {
                 onCropPropertiesChange(
-                    cropProperties.copy(handleSize = it)
+                    cropProperties.copy(handleSize = density.run { it.toPx() })
                 )
             },
             lowerBound = 10.dp,
-            upperBound = 50.dp
+            upperBound = 40.dp
         )
     }
 }
@@ -154,7 +158,6 @@ internal fun CropGestureSelectionMenu(
             )
         }
     }
-
 }
 
 @Composable
@@ -225,4 +228,4 @@ internal fun MaxZoomSelection(
         onValueChange = onMaxZoomChange,
         valueRange = valueRange
     )
-}
+}

app/src/main/java/com/smarttoolfactory/composecropper/preferences/CropStyleSelection.kt

@@ -16,12 +16,14 @@ import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.sp
 import com.smarttoolfactory.colorpicker.dialog.ColorPickerRingDiamondHSLDialog
 import com.smarttoolfactory.cropper.settings.CropStyle
+import com.smarttoolfactory.cropper.settings.CropType
 
 /**
  * Crop style selection menu
  */
 @Composable
 internal fun CropStyleSelectionMenu(
+    cropType: CropType,
     cropStyle: CropStyle,
     onCropStyleChange: (CropStyle) -> Unit
 ) {
@@ -85,16 +87,18 @@ internal fun CropStyleSelectionMenu(
                     }
                 )
 
-                Spacer(modifier = Modifier.height(20.dp))
-                ColorSelection(
-                    title = "Handle Color",
-                    color = handleColor,
-                    onColorChange = { color: Color ->
-                        onCropStyleChange(
-                            cropStyle.copy(handleColor = color)
-                        )
-                    }
-                )
+                if(cropType== CropType.Dynamic){
+                    Spacer(modifier = Modifier.height(20.dp))
+                    ColorSelection(
+                        title = "Handle Color",
+                        color = handleColor,
+                        onColorChange = { color: Color ->
+                            onCropStyleChange(
+                                cropStyle.copy(handleColor = color)
+                            )
+                        }
+                    )
+                }
 
                 Spacer(modifier = Modifier.height(20.dp))
                 ColorSelection(

cropper/src/main/java/com/smarttoolfactory/cropper/ImageCropper.kt

@@ -185,7 +185,7 @@ private fun ImageCropper(
     containerHeight: Dp,
     imageWidthPx: Int,
     imageHeightPx: Int,
-    handleSize: Dp,
+    handleSize: Float,
     cropType: CropType,
     cropOutline: CropOutline,
     cropStyle: CropStyle,
@@ -248,7 +248,7 @@ private fun ImageCropperImpl(
     imageHeightPx: Int,
     cropType: CropType,
     cropOutline: CropOutline,
-    handleSize: Dp,
+    handleSize: Float,
     cropStyle: CropStyle,
     transparentColor: Color,
     rectOverlay: Rect
@@ -271,9 +271,7 @@ private fun ImageCropperImpl(
         val handleColor = cropStyle.handleColor
         val drawHandles = cropType == CropType.Dynamic
         val strokeWidth = cropStyle.strokeWidth
-
-        val handleSizeInPx = LocalDensity.current.run { handleSize.toPx() }
-
+        
         DrawingOverlay(
             modifier = Modifier.size(containerWidth, containerHeight),
             drawOverlay = drawOverlay,
@@ -284,7 +282,7 @@ private fun ImageCropperImpl(
             handleColor = handleColor,
             strokeWidth = strokeWidth,
             drawHandles = drawHandles,
-            handleSize = handleSizeInPx,
+            handleSize = handleSize,
             transparentColor = transparentColor,
         )
 

cropper/src/main/java/com/smarttoolfactory/cropper/settings/CropDefaults.kt

@@ -27,7 +27,7 @@ object CropDefaults {
      */
     fun properties(
         cropType: CropType = CropType.Dynamic,
-        handleSize: Dp = 20.dp,
+        handleSize: Float,
         maxZoom: Float = 10f,
         contentScale: ContentScale = ContentScale.Fit,
         cropOutlineProperty: CropOutlineProperty,
@@ -84,7 +84,7 @@ object CropDefaults {
 @Immutable
 data class CropProperties internal constructor(
     val cropType: CropType,
-    val handleSize: Dp,
+    val handleSize: Float,
     val contentScale: ContentScale,
     val cropOutlineProperty: CropOutlineProperty,
     val aspectRatio: AspectRatio,

cropper/src/main/java/com/smarttoolfactory/cropper/state/CropState.kt

@@ -2,7 +2,6 @@ package com.smarttoolfactory.cropper.state
 
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.remember
-import androidx.compose.ui.platform.LocalDensity
 import androidx.compose.ui.unit.IntSize
 import com.smarttoolfactory.cropper.settings.CropProperties
 import com.smarttoolfactory.cropper.settings.CropType
@@ -40,13 +39,6 @@ fun rememberCropState(
     val pannable = cropProperties.pannable
     val rotatable = cropProperties.rotatable
 
-    val handleSizeInPx: Float
-    val minOverlaySizePx: Float
-
-    with(LocalDensity.current) {
-        handleSizeInPx = handleSize.toPx()
-        minOverlaySizePx = minOverlaySize.toPx()
-    }
 
     return remember(*keys) {
         when (cropType) {
@@ -74,8 +66,8 @@ fun rememberCropState(
                     aspectRatio = aspectRatio,
                     overlayRatio = overlayRatio,
                     maxZoom = maxZoom,
-                    handleSize = handleSizeInPx,
-                    minOverlaySize = minOverlaySizePx,
+                    handleSize = handleSize,
+                    minOverlaySize = minOverlaySize,
                     fling = fling,
                     zoomable = zoomable,
                     pannable = pannable,

cropper/src/main/java/com/smarttoolfactory/cropper/state/CropStateImpl.kt

@@ -103,15 +103,18 @@ abstract class CropState internal constructor(
 
     internal suspend fun init() {
         // When initial aspect ratio doesn't match drawable area
-        // overlay gets updated so update draw area as well
+        // overlay gets updated so updates draw area as well
         animateTransformationToOverlayBounds(overlayRect, animate = true)
         initialized = true
     }
 
     /**
      * Update properties of [CropState] and animate to valid intervals if required
      */
-    internal open suspend fun updateProperties(cropProperties: CropProperties) {
+    internal open suspend fun updateProperties(
+        cropProperties: CropProperties,
+        forceUpdate: Boolean = false
+    ) {
 
         if (!initialized) return
 
@@ -131,7 +134,8 @@ abstract class CropState internal constructor(
         if (
             this.aspectRatio.value != aspectRatio.value ||
             maxZoom != zoomMax ||
-            this.overlayRatio != overlayRatio
+            this.overlayRatio != overlayRatio ||
+            forceUpdate
         ) {
             this.aspectRatio = aspectRatio
             this.overlayRatio = overlayRatio

cropper/src/main/java/com/smarttoolfactory/cropper/state/DynamicCropState.kt

@@ -8,6 +8,7 @@ import androidx.compose.ui.input.pointer.positionChangeIgnoreConsumed
 import androidx.compose.ui.unit.IntSize
 import com.smarttoolfactory.cropper.TouchRegion
 import com.smarttoolfactory.cropper.model.AspectRatio
+import com.smarttoolfactory.cropper.settings.CropProperties
 import kotlinx.coroutines.coroutineScope
 
 /**
@@ -82,6 +83,13 @@ class DynamicCropState internal constructor(
     // inside overlay but with multiple pointers to zoom
     private var gestureInvoked = false
 
+    override suspend fun updateProperties(cropProperties: CropProperties, forceUpdate: Boolean) {
+        handleSize = cropProperties.handleSize
+        minOverlaySize = handleSize * 2
+        
+        super.updateProperties(cropProperties, forceUpdate)
+    }
+
     override suspend fun onDown(change: PointerInputChange) {
 
         rectTemp = overlayRect.copy()