add CropAgent to ImageCropper

ImageCropper composable can crop to shapes using CropAgent

Author: SmartToolFactory

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

@@ -4,10 +4,11 @@ package com.smarttoolfactory.composecropper.demo
 
 import androidx.compose.foundation.Image
 import androidx.compose.foundation.background
-import androidx.compose.foundation.layout.*
-import androidx.compose.foundation.rememberScrollState
+import androidx.compose.foundation.layout.Box
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.fillMaxSize
+import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.shape.RoundedCornerShape
-import androidx.compose.foundation.verticalScroll
 import androidx.compose.material.*
 import androidx.compose.material.icons.Icons
 import androidx.compose.material.icons.filled.Brush
@@ -31,7 +32,6 @@ import com.smarttoolfactory.composecropper.ImageSelectionButton
 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
@@ -122,31 +122,32 @@ private fun MainContent(
     var imageBitmap by remember { mutableStateOf(imageBitmapLarge) }
     var croppedImage by remember { mutableStateOf<ImageBitmap?>(null) }
 
-    val modifier = Modifier
-        .background(Color.LightGray)
-        .fillMaxWidth()
-        .aspectRatio(3 / 4f)
 
     var crop by remember { mutableStateOf(false) }
     var showDialog by remember { mutableStateOf(false) }
+    var isCropping by remember { mutableStateOf(false) }
 
-
-    Box(modifier = Modifier.fillMaxSize(), contentAlignment = Alignment.Center) {
-        Column(
-            modifier = Modifier
-                .fillMaxSize()
-                .verticalScroll(rememberScrollState())
-        ) {
+    Box(
+        modifier = Modifier
+            .fillMaxSize()
+            .background(Color.DarkGray),
+        contentAlignment = Alignment.Center
+    ) {
+        Column(modifier = Modifier.fillMaxSize()) {
 
             ImageCropper(
-                modifier = modifier,
+                modifier = Modifier.fillMaxWidth().weight(1f),
                 imageBitmap = imageBitmap,
                 contentDescription = "Image Cropper",
                 cropStyle = cropStyle,
                 cropProperties = cropProperties,
                 crop = crop,
+                onCropStart = {
+                    isCropping = true
+                }
             ) {
                 croppedImage = it
+                isCropping = false
                 crop = false
                 showDialog = true
             }
@@ -190,6 +191,10 @@ private fun MainContent(
                 )
             }
         )
+
+        if (isCropping) {
+            CircularProgressIndicator()
+        }
     }
 
     if (showDialog) {

cropper/src/main/java/com/smarttoolfactory/cropper/Cropper.kt renamed to cropper/src/main/java/com/smarttoolfactory/cropper/ImageCropper.kt

@@ -1,6 +1,5 @@
 package com.smarttoolfactory.cropper
 
-import android.graphics.Bitmap
 import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.size
 import androidx.compose.material.Text
@@ -11,19 +10,27 @@ import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.draw.clipToBounds
 import androidx.compose.ui.geometry.Rect
-import androidx.compose.ui.graphics.*
+import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.graphics.FilterQuality
+import androidx.compose.ui.graphics.ImageBitmap
+import androidx.compose.ui.graphics.Shape
 import androidx.compose.ui.graphics.drawscope.DrawScope
 import androidx.compose.ui.platform.LocalDensity
+import androidx.compose.ui.platform.LocalLayoutDirection
 import androidx.compose.ui.unit.Dp
 import androidx.compose.ui.unit.IntSize
 import androidx.compose.ui.unit.sp
+import com.smarttoolfactory.cropper.crop.CropAgent
 import com.smarttoolfactory.cropper.image.ImageWithConstraints
 import com.smarttoolfactory.cropper.image.getScaledImageBitmap
 import com.smarttoolfactory.cropper.settings.CropDefaults
 import com.smarttoolfactory.cropper.settings.CropProperties
 import com.smarttoolfactory.cropper.settings.CropStyle
 import com.smarttoolfactory.cropper.settings.CropType
 import com.smarttoolfactory.cropper.state.rememberCropState
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.delay
+import kotlinx.coroutines.flow.*
 
 @Composable
 fun ImageCropper(
@@ -34,6 +41,7 @@ fun ImageCropper(
     cropProperties: CropProperties = CropDefaults.properties(),
     filterQuality: FilterQuality = DrawScope.DefaultFilterQuality,
     crop: Boolean = false,
+    onCropStart: () -> Unit,
     onCropSuccess: (ImageBitmap) -> Unit
 ) {
 
@@ -57,6 +65,10 @@ fun ImageCropper(
                 contentScale = cropProperties.contentScale,
             )
 
+        val cropAgent = remember {
+            CropAgent()
+        }
+
         // Container Dimensions
         val containerWidthPx = constraints.maxWidth
         val containerHeightPx = constraints.maxHeight
@@ -81,6 +93,7 @@ fun ImageCropper(
 
         val cropType = cropProperties.cropType
         val contentScale = cropProperties.contentScale
+        val shape = cropProperties.cropShape.shape
 
         // these keys are for resetting cropper when image width/height, contentScale or
         // overlay aspect ratio changes
@@ -124,17 +137,31 @@ fun ImageCropper(
         val pan = cropState.pan
         val zoom = cropState.zoom
 
+        val density = LocalDensity.current
+        val layoutDirection = LocalLayoutDirection.current
+
         LaunchedEffect(crop) {
             if (crop) {
-                val croppedBitmap = Bitmap.createBitmap(
-                    scaledImageBitmap.asAndroidBitmap(),
-                    rectCrop.left.toInt(),
-                    rectCrop.top.toInt(),
-                    rectCrop.width.toInt(),
-                    rectCrop.height.toInt()
-                ).asImageBitmap()
-
-                onCropSuccess(croppedBitmap)
+                flow {
+                    emit(
+                        cropAgent.crop(
+                            scaledImageBitmap,
+                            rectCrop,
+                            shape,
+                            layoutDirection,
+                            density
+                        )
+                    )
+                }
+                    .flowOn(Dispatchers.Default)
+                    .onStart {
+                        onCropStart()
+                        delay(400)
+                    }
+                    .onEach {
+                        onCropSuccess(it)
+                    }
+                    .launchIn(this)
             }
         }
 
@@ -146,14 +173,15 @@ fun ImageCropper(
             )
 
         Box {
-            CropperImpl(
+            ImageCropperImpl(
                 modifier = imageModifier,
                 imageBitmap = scaledImageBitmap,
                 containerWidth = containerWidth,
                 containerHeight = containerHeight,
                 imageWidthPx = imageWidthPx,
                 imageHeightPx = imageHeightPx,
                 cropType = cropType,
+                shape = shape,
                 handleSize = cropProperties.handleSize,
                 cropStyle = cropStyle,
                 rectOverlay = cropState.overlayRect
@@ -176,14 +204,15 @@ fun ImageCropper(
 }
 
 @Composable
-private fun CropperImpl(
+private fun ImageCropperImpl(
     modifier: Modifier,
     imageBitmap: ImageBitmap,
     containerWidth: Dp,
     containerHeight: Dp,
     imageWidthPx: Int,
     imageHeightPx: Int,
     cropType: CropType,
+    shape: Shape,
     handleSize: Dp,
     cropStyle: CropStyle,
     rectOverlay: Rect
@@ -213,6 +242,7 @@ private fun CropperImpl(
             modifier = Modifier.size(containerWidth, containerHeight),
             drawOverlay = drawOverlay,
             rect = rectOverlay,
+            shape = shape,
             drawGrid = drawGrid,
             overlayColor = overlayColor,
             handleColor = handleColor,