add shape selection

Author: SmartToolFactory

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

@@ -8,9 +8,7 @@ import androidx.compose.runtime.remember
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.sp
-import com.smarttoolfactory.cropper.model.AspectRatio
-import com.smarttoolfactory.cropper.model.AspectRatioModel
-import com.smarttoolfactory.cropper.model.aspectRatios
+import com.smarttoolfactory.cropper.model.*
 import com.smarttoolfactory.cropper.settings.CropProperties
 import com.smarttoolfactory.cropper.settings.CropType
 import kotlin.math.roundToInt
@@ -26,7 +24,7 @@ internal fun CropPropertySelectionMenu(
     val aspectRatio = cropProperties.aspectRatio
     val handleSize = cropProperties.handleSize
     val contentScale = cropProperties.contentScale
-    val shape = cropProperties.shape
+    val cropShape = cropProperties.cropShape
 
     Title("Crop Type")
     CropTypeDialogSelection(
@@ -55,6 +53,16 @@ internal fun CropPropertySelectionMenu(
         }
     )
 
+    Title("Shape")
+    ShapeSelection(
+        cropShape = cropShape,
+        onCropShapeChange = {
+            onCropPropertiesChange(
+                cropProperties.copy(cropShape = it)
+            )
+        }
+    )
+
     // Handle size and overlay size applies only to Dynamic crop
     if (cropType == CropType.Dynamic) {
         Title("Handle Size")
@@ -134,7 +142,7 @@ internal fun CropGestureSelectionMenu(
 @Composable
 internal fun AspectRatioSelection(
     aspectRatio: AspectRatio,
-    onAspectRatioChange: (AspectRatioModel) -> Unit
+    onAspectRatioChange: (CropAspectRatio) -> Unit
 ) {
 
     val initialSelectedIndex = remember {
@@ -151,6 +159,26 @@ internal fun AspectRatioSelection(
     }
 }
 
+@Composable
+internal fun ShapeSelection(
+    cropShape: CropShape,
+    onCropShapeChange: (CropShape) -> Unit
+) {
+
+    val initialSelectedIndex = remember {
+        val shapes = shapes
+        val currentModel = shapes.first { it == cropShape }
+        shapes.indexOf(currentModel)
+    }
+
+    AnimatedShapeSelection(
+        modifier = Modifier.fillMaxWidth(),
+        initialSelectedIndex = initialSelectedIndex
+    ) {
+        onCropShapeChange(it)
+    }
+}
+
 @Composable
 internal fun FlingEnableSelection(
     flingEnabled: Boolean,

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

@@ -0,0 +1,51 @@
+package com.smarttoolfactory.composecropper.preferences
+
+import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.layout.width
+import androidx.compose.runtime.*
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.graphics.graphicsLayer
+import androidx.compose.ui.unit.Dp
+import androidx.compose.ui.unit.dp
+import com.smarttoolfactory.animatedlist.AnimatedInfiniteLazyRow
+import com.smarttoolfactory.animatedlist.model.AnimationProgress
+import com.smarttoolfactory.cropper.model.CropShape
+import com.smarttoolfactory.cropper.model.shapes
+import com.smarttoolfactory.cropper.widget.ShapeSelectionCard
+
+@Composable
+fun AnimatedShapeSelection(
+    modifier: Modifier = Modifier,
+    initialSelectedIndex: Int = 2,
+    onCropShapeChange: (CropShape) -> Unit
+) {
+
+    var currentIndex by remember { mutableStateOf(initialSelectedIndex) }
+
+    AnimatedInfiniteLazyRow(
+        modifier = modifier.padding(horizontal = 10.dp),
+        items = shapes,
+        inactiveItemPercent = 80,
+        initialFirstVisibleIndex = initialSelectedIndex - 2
+    ) { animationProgress: AnimationProgress, index: Int, item: CropShape, width: Dp ->
+
+        val scale = animationProgress.scale
+        val color = animationProgress.color
+        val selectedLocalIndex = animationProgress.itemIndex
+
+        ShapeSelectionCard(modifier = Modifier
+            .graphicsLayer {
+                scaleX = scale
+                scaleY = scale
+            }
+            .width(width),
+            color = color,
+            cropShape = item
+        )
+
+        if (currentIndex != selectedLocalIndex) {
+            currentIndex = selectedLocalIndex
+            onCropShapeChange(shapes[selectedLocalIndex])
+        }
+    }
+}

cropper/src/main/java/com/smarttoolfactory/cropper/model/ShapeModel.kt renamed to cropper/src/main/java/com/smarttoolfactory/cropper/model/CropShape.kt

@@ -8,7 +8,13 @@ import androidx.compose.ui.graphics.Shape
  * for setting overlay in state and UI
  */
 @Immutable
-open class ShapeModel(
+open class CropShape(
     open val title: String,
     open val shape: Shape,
-)
+    val editable:Boolean = false,
+    val shapeType: ShapeType = ShapeType.Rect
+)
+
+enum class ShapeType {
+    Rect, RoundedRect, CutCorner, Oval, Polygon, Custom
+}

cropper/src/main/java/com/smarttoolfactory/cropper/model/Shapes.kt

@@ -0,0 +1,38 @@
+package com.smarttoolfactory.cropper.model
+
+import androidx.compose.foundation.shape.CircleShape
+import androidx.compose.foundation.shape.CutCornerShape
+import androidx.compose.foundation.shape.RoundedCornerShape
+import androidx.compose.ui.graphics.RectangleShape
+import com.smarttoolfactory.cropper.util.createPolygonShape
+
+val shapes = listOf(
+    CropShape(
+        title = "Rect",
+        shape = RectangleShape,
+        shapeType = ShapeType.Rect
+    ),
+    CropShape(
+        title = "Rounded",
+        shape = RoundedCornerShape(10),
+        editable = true,
+        shapeType = ShapeType.RoundedRect
+    ),
+    CropShape(
+        title = "CutCorner",
+        shape = CutCornerShape(10),
+        editable = true,
+        shapeType = ShapeType.CutCorner),
+    CropShape(
+        title = "Oval",
+        shape = CircleShape,
+        editable = true,
+        shapeType = ShapeType.Oval
+    ),
+    CropShape(
+        title = "Polygon",
+        shape = createPolygonShape(6),
+        editable = true,
+        shapeType = ShapeType.Polygon
+    )
+)

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

@@ -3,14 +3,15 @@ package com.smarttoolfactory.cropper.settings
 import androidx.compose.runtime.Immutable
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.Color
-import androidx.compose.ui.graphics.RectangleShape
-import androidx.compose.ui.graphics.Shape
 import androidx.compose.ui.layout.ContentScale
 import androidx.compose.ui.unit.Dp
 import androidx.compose.ui.unit.dp
 import com.smarttoolfactory.cropper.ImageCropper
 import com.smarttoolfactory.cropper.crop
 import com.smarttoolfactory.cropper.model.AspectRatio
+import com.smarttoolfactory.cropper.model.CropShape
+import com.smarttoolfactory.cropper.model.aspectRatios
+import com.smarttoolfactory.cropper.model.shapes
 import com.smarttoolfactory.cropper.state.CropState
 
 /**
@@ -22,24 +23,24 @@ object CropDefaults {
         cropType: CropType = CropType.Dynamic,
         handleSize: Dp = 20.dp,
         maxZoom: Float = 10f,
-        aspectRatio: AspectRatio = AspectRatio.Unspecified,
+        aspectRatio: AspectRatio = aspectRatios[2].aspectRatio,
         contentScale: ContentScale = ContentScale.Fit,
-        shape: Shape = RectangleShape,
-        fling: Boolean = true,
-        zoomable: Boolean = true,
+        shape: CropShape = shapes[0],
         pannable: Boolean = true,
+        fling: Boolean = false,
+        zoomable: Boolean = true,
         rotatable: Boolean = false
     ): CropProperties {
         return CropProperties(
             cropType = cropType,
             handleSize = handleSize,
             contentScale = contentScale,
-            shape = shape,
+            cropShape = shape,
             maxZoom = maxZoom,
             aspectRatio = aspectRatio,
+            pannable = pannable,
             fling = fling,
             zoomable = zoomable,
-            pannable = pannable,
             rotatable = rotatable
         )
     }
@@ -72,9 +73,9 @@ data class CropProperties internal constructor(
     val handleSize: Dp,
     val aspectRatio: AspectRatio,
     val contentScale: ContentScale,
-    val shape: Shape,
-    val fling: Boolean,
+    val cropShape: CropShape,
     val pannable: Boolean,
+    val fling: Boolean,
     val rotatable: Boolean,
     val zoomable: Boolean,
     val maxZoom: Float,

cropper/src/main/java/com/smarttoolfactory/cropper/widget/ShapeSelection.kt renamed to cropper/src/main/java/com/smarttoolfactory/cropper/widget/ShapeSelectionCard.kt

@@ -15,17 +15,18 @@ import androidx.compose.ui.graphics.drawscope.Stroke
 import androidx.compose.ui.graphics.drawscope.translate
 import androidx.compose.ui.platform.LocalDensity
 import androidx.compose.ui.platform.LocalLayoutDirection
+import androidx.compose.ui.unit.TextUnit
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.sp
-import com.smarttoolfactory.cropper.model.AspectRatioModel
-import com.smarttoolfactory.cropper.model.ShapeModel
+import com.smarttoolfactory.cropper.model.CropShape
 
 
 @Composable
-fun ShapeSelection(
+fun ShapeSelectionCard(
     modifier: Modifier = Modifier,
     color: Color,
-    shapeModel: ShapeModel
+    fontSize:TextUnit = 12.sp,
+    cropShape: CropShape
 ) {
     Box(
         modifier = modifier
@@ -41,7 +42,7 @@ fun ShapeSelection(
                 .aspectRatio(1f)
                 .drawWithContent {
 
-                    val outline = shapeModel.shape.createOutline(
+                    val outline = cropShape.shape.createOutline(
                         size = size,
                         layoutDirection = layoutDirection,
                         density = density
@@ -64,16 +65,21 @@ fun ShapeSelection(
                     }
                 }
             )
-            Text(text = shapeModel.title, color = color, fontSize = 14.sp)
+           if(cropShape.title.isNotEmpty()){
+               Text(text = cropShape.title, color = color, fontSize = fontSize)
+           }
         }
     }
 }
 
 @Composable
-fun ShapeSelection(
+fun ShapeSelectionCard(
     modifier: Modifier = Modifier,
     isSelected: Boolean,
-    aspectRatioModel: AspectRatioModel
+    activeColor: Color = Color.Red,
+    inactiveColor: Color = Color.LightGray,
+    fontSize:TextUnit = 14.sp,
+    cropShape: CropShape
 ) {
     Box(
         modifier = modifier
@@ -84,14 +90,14 @@ fun ShapeSelection(
         Column(horizontalAlignment = Alignment.CenterHorizontally) {
             val density = LocalDensity.current
             val layoutDirection = LocalLayoutDirection.current
-            val color = if (isSelected) Color.Cyan else Color.LightGray
+            val color = if (isSelected) activeColor else inactiveColor
             Box(modifier = Modifier
                 .fillMaxWidth()
                 .padding(4.dp)
                 .aspectRatio(1f)
                 .drawWithContent {
 
-                    val outline = aspectRatioModel.shape.createOutline(
+                    val outline = cropShape.shape.createOutline(
                         size = size,
                         layoutDirection = layoutDirection,
                         density = density
@@ -114,7 +120,8 @@ fun ShapeSelection(
                     }
                 }
             )
-            Text(text = aspectRatioModel.title, color = color, fontSize = 14.sp)
-        }
+            if(cropShape.title.isNotEmpty()){
+                Text(text = cropShape.title, color = color, fontSize = fontSize)
+            }        }
     }
 }