Merge branch 'feature/customize-shapes-paths'

Author: SmartToolFactory

app/build.gradle

@@ -62,9 +62,6 @@ dependencies {
     // Animated List
     implementation 'com.github.SmartToolFactory:Compose-AnimatedList:0.5.1'
 
-    // Snapper for lazy lists
-    implementation "dev.chrisbanes.snapper:snapper:0.3.0"
-
     implementation "androidx.compose.ui:ui:$compose_version"
     // Tooling support (Previews, etc.)
     implementation "androidx.compose.ui:ui-tooling:$compose_version"
@@ -76,12 +73,12 @@ dependencies {
     implementation "androidx.compose.material:material-icons-core:$compose_version"
     implementation "androidx.compose.material:material-icons-extended:$compose_version"
     // Integration with activities
-    implementation 'androidx.activity:activity-compose:1.5.1'
+    implementation 'androidx.activity:activity-compose:1.6.0'
     // Integration with ViewModels
     implementation 'androidx.lifecycle:lifecycle-viewmodel-compose:2.5.1'
 
     // Material Design 3 for Compose
-    implementation "androidx.compose.material3:material3:1.0.0-beta02"
+    implementation "androidx.compose.material3:material3:1.0.0-beta03"
 
     def nav_compose_version = "2.5.2"
     implementation "androidx.navigation:navigation-compose:$nav_compose_version"

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

@@ -33,9 +33,9 @@ import com.smarttoolfactory.composecropper.R
 import com.smarttoolfactory.composecropper.preferences.CropStyleSelectionMenu
 import com.smarttoolfactory.composecropper.preferences.PropertySelectionSheet
 import com.smarttoolfactory.cropper.ImageCropper
-import com.smarttoolfactory.cropper.settings.CropDefaults
-import com.smarttoolfactory.cropper.settings.CropProperties
-import com.smarttoolfactory.cropper.settings.CropStyle
+import com.smarttoolfactory.cropper.model.OutlineType
+import com.smarttoolfactory.cropper.model.RectCropShape
+import com.smarttoolfactory.cropper.settings.*
 import kotlinx.coroutines.launch
 
 internal enum class SelectionPage {
@@ -51,7 +51,30 @@ fun ImageCropDemo() {
         bottomSheetState = BottomSheetState(BottomSheetValue.Collapsed)
     )
 
-    var cropProperties by remember { mutableStateOf(CropDefaults.properties()) }
+    val defaultImage1 = ImageBitmap.imageResource(id = R.drawable.squircle)
+    val defaultImage2 = ImageBitmap.imageResource(id = R.drawable.cloud)
+    val defaultImage3 = ImageBitmap.imageResource(id = R.drawable.sun)
+
+    val cropFrameFactory = remember {
+        CropFrameFactory(
+            listOf(
+                defaultImage1,
+                defaultImage2,
+                defaultImage3
+            )
+        )
+    }
+
+    var cropProperties by remember {
+        mutableStateOf(
+            CropDefaults.properties(
+                cropOutlineProperty = CropOutlineProperty(
+                    OutlineType.Rect,
+                    RectCropShape(0, "")
+                )
+            )
+        )
+    }
     var cropStyle by remember { mutableStateOf(CropDefaults.style()) }
     val coroutineScope = rememberCoroutineScope()
 
@@ -72,6 +95,7 @@ fun ImageCropDemo() {
 
             if (selectionPage == SelectionPage.Properties) {
                 PropertySelectionSheet(
+                    cropFrameFactory = cropFrameFactory,
                     cropProperties = cropProperties,
                     onCropPropertiesChange = {
                         cropProperties = it
@@ -136,7 +160,9 @@ private fun MainContent(
         Column(modifier = Modifier.fillMaxSize()) {
 
             ImageCropper(
-                modifier = Modifier.fillMaxWidth().weight(1f),
+                modifier = Modifier
+                    .fillMaxWidth()
+                    .weight(1f),
                 imageBitmap = imageBitmap,
                 contentDescription = "Image Cropper",
                 cropStyle = cropStyle,

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

@@ -40,7 +40,7 @@ internal fun AnimatedAspectRatioSelection(
             }
             .width(width),
             color = color,
-            cropShape = item
+            cropAspectRatio = item
         )
 
         if (currentIndex != selectedLocalIndex) {

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

@@ -0,0 +1,131 @@
+package com.smarttoolfactory.composecropper.preferences
+
+import CropFrameListDialog
+import androidx.compose.foundation.layout.fillMaxWidth
+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.unit.Dp
+import androidx.compose.ui.unit.dp
+import com.smarttoolfactory.animatedlist.AnimatedInfiniteLazyRow
+import com.smarttoolfactory.animatedlist.model.AnimationProgress
+import com.smarttoolfactory.cropper.model.AspectRatio
+import com.smarttoolfactory.cropper.model.CropFrame
+import com.smarttoolfactory.cropper.model.OutlineType
+import com.smarttoolfactory.cropper.settings.CropFrameFactory
+import com.smarttoolfactory.cropper.settings.CropOutlineProperty
+import com.smarttoolfactory.cropper.widget.CropFrameDisplayCard
+
+/**
+ * Crop frame selection
+ */
+@Composable
+fun CropFrameSelection(
+    aspectRatio: AspectRatio,
+    cropFrameFactory: CropFrameFactory,
+    cropOutlineProperty: CropOutlineProperty,
+    conCropOutlinePropertyChange: (CropOutlineProperty) -> Unit
+) {
+
+    var showEditDialog by remember { mutableStateOf(false) }
+
+    var cropFrame by remember {
+        mutableStateOf(
+            cropFrameFactory.getCropFrame(cropOutlineProperty.outlineType)
+        )
+    }
+
+    if (showEditDialog) {
+        CropFrameListDialog(
+            aspectRatio = aspectRatio,
+            cropFrame = cropFrame,
+            onConfirm = {
+                cropFrame = it
+                cropFrameFactory.editCropFrame(cropFrame)
+
+                conCropOutlinePropertyChange(
+                    CropOutlineProperty(
+                        it.outlineType,
+                        it.cropOutlineContainer.selectedItem
+                    )
+                )
+                showEditDialog = false
+            },
+            onDismiss = {
+                showEditDialog = false
+            }
+        )
+    }
+
+    val initialIndex = remember {
+        OutlineType.values().indexOfFirst {
+            it == cropOutlineProperty.outlineType
+        }
+    }
+
+    CropFrameSelectionList(
+        modifier = Modifier.fillMaxWidth(),
+        cropFrames = cropFrameFactory.getCropFrames(),
+        initialSelectedIndex = initialIndex,
+        onClick = {
+            cropFrame = it
+            showEditDialog = true
+        },
+        onCropFrameChange = {
+            conCropOutlinePropertyChange(
+                CropOutlineProperty(
+                    it.outlineType,
+                    it.cropOutlineContainer.selectedItem
+                )
+            )
+        }
+    )
+}
+
+/**
+ * Animated list for selecting [CropFrame]
+ */
+@Composable
+private fun CropFrameSelectionList(
+    modifier: Modifier = Modifier,
+    initialSelectedIndex: Int = 2,
+    cropFrames: List<CropFrame>,
+    onClick: (CropFrame) -> Unit,
+    onCropFrameChange: (CropFrame) -> Unit
+) {
+
+    var currentIndex by remember { mutableStateOf(initialSelectedIndex) }
+
+    AnimatedInfiniteLazyRow(
+        modifier = modifier.padding(horizontal = 10.dp),
+        items = cropFrames,
+        inactiveItemPercent = 80,
+        initialFirstVisibleIndex = initialSelectedIndex - 2,
+    ) { animationProgress: AnimationProgress, _, item: CropFrame, width: Dp ->
+
+        val scale = animationProgress.scale
+        val color = animationProgress.color
+
+        val selectedLocalIndex = animationProgress.itemIndex
+        val cropOutline = item.cropOutlineContainer.selectedItem
+
+        val editable = item.editable
+
+        CropFrameDisplayCard(
+            modifier = Modifier.width(width),
+            editable = editable,
+            scale = scale,
+            outlineColor = color,
+            title = cropOutline.title,
+            cropOutline = cropOutline
+        ) {
+            onClick(item)
+        }
+
+        if (currentIndex != selectedLocalIndex) {
+            currentIndex = selectedLocalIndex
+            onCropFrameChange(cropFrames[selectedLocalIndex])
+        }
+    }
+}

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

@@ -8,14 +8,18 @@ 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.*
+import com.smarttoolfactory.cropper.model.AspectRatio
+import com.smarttoolfactory.cropper.model.CropAspectRatio
+import com.smarttoolfactory.cropper.model.aspectRatios
+import com.smarttoolfactory.cropper.settings.CropFrameFactory
 import com.smarttoolfactory.cropper.settings.CropProperties
 import com.smarttoolfactory.cropper.settings.CropType
 import kotlin.math.roundToInt
 
 
 @Composable
 internal fun CropPropertySelectionMenu(
+    cropFrameFactory: CropFrameFactory,
     cropProperties: CropProperties,
     onCropPropertiesChange: (CropProperties) -> Unit
 ) {
@@ -24,7 +28,7 @@ internal fun CropPropertySelectionMenu(
     val aspectRatio = cropProperties.aspectRatio
     val handleSize = cropProperties.handleSize
     val contentScale = cropProperties.contentScale
-    val cropShape = cropProperties.cropShape
+    val cropOutlineProperty = cropProperties.cropOutlineProperty
 
     Title("Crop Type")
     CropTypeDialogSelection(
@@ -53,12 +57,14 @@ internal fun CropPropertySelectionMenu(
         }
     )
 
-    Title("Shape")
-    ShapeSelection(
-        cropShape = cropShape,
-        onCropShapeChange = {
+    Title("Frame")
+    CropFrameSelection(
+        aspectRatio = aspectRatio,
+        cropFrameFactory = cropFrameFactory,
+        cropOutlineProperty = cropOutlineProperty,
+        conCropOutlinePropertyChange = {
             onCropPropertiesChange(
-                cropProperties.copy(cropShape = it)
+                cropProperties.copy(cropOutlineProperty = it)
             )
         }
     )
@@ -159,26 +165,6 @@ 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/PropertySelectionSheet.kt

@@ -1,15 +1,18 @@
 package com.smarttoolfactory.composecropper.preferences
 
 import androidx.compose.runtime.Composable
+import com.smarttoolfactory.cropper.settings.CropFrameFactory
 import com.smarttoolfactory.cropper.settings.CropProperties
 
 @Composable
 internal fun PropertySelectionSheet(
+    cropFrameFactory:CropFrameFactory,
     cropProperties: CropProperties,
     onCropPropertiesChange: (CropProperties) -> Unit
 ) {
     BaseSheet {
         CropPropertySelectionMenu(
+            cropFrameFactory =cropFrameFactory,
             cropProperties = cropProperties,
             onCropPropertiesChange = onCropPropertiesChange
         )