Added None, Fill, Fit, FitWidth, FitHeight, Crop scale types for Stac…

…k Images tool
T8RIN · Jan 21, 2025 · 857e765 · 857e765
1 parent 85ce97c
commit 857e765
Show file tree

Hide file tree

Showing 5 changed files with 37 additions and 28 deletions.
diff --git a/core/data/src/main/java/ru/tech/imageresizershrinker/core/data/image/AndroidImageScaler.kt b/core/data/src/main/java/ru/tech/imageresizershrinker/core/data/image/AndroidImageScaler.kt
@@ -290,26 +290,28 @@ internal class AndroidImageScaler @Inject constructor(
             imageScaleMode = imageScaleMode
         )
 
-        val blurredBitmap = imageTransformer.transform(
-            image = drawImage.let { bitmap ->
-                val xScale: Float = targetWidth.toFloat() / originalWidth
-                val yScale: Float = targetHeight.toFloat() / originalHeight
-                val scale = xScale.coerceAtLeast(yScale)
-                createScaledBitmap(
-                    image = bitmap,
-                    width = (scale * originalWidth).toInt(),
-                    height = (scale * originalHeight).toInt(),
-                    imageScaleMode = imageScaleMode
-                )
-            },
-            transformations = listOf(
-                filterProvider.filterToTransformation(
-                    createFilter<Float, Filter.NativeStackBlur>(
-                        blurRadius.toFloat() / 1000 * max(targetWidth, targetHeight)
+        val blurredBitmap = if (canvasColor == null) {
+            imageTransformer.transform(
+                image = drawImage.let { bitmap ->
+                    val xScale: Float = targetWidth.toFloat() / originalWidth
+                    val yScale: Float = targetHeight.toFloat() / originalHeight
+                    val scale = xScale.coerceAtLeast(yScale)
+                    createScaledBitmap(
+                        image = bitmap,
+                        width = (scale * originalWidth).toInt(),
+                        height = (scale * originalHeight).toInt(),
+                        imageScaleMode = imageScaleMode
+                    )
+                },
+                transformations = listOf(
+                    filterProvider.filterToTransformation(
+                        createFilter<Float, Filter.NativeStackBlur>(
+                            blurRadius.toFloat() / 1000 * max(targetWidth, targetHeight)
+                        )
                     )
                 )
             )
-        )
+        } else null
 
         Bitmap.createBitmap(
             targetWidth,

diff --git a/core/resources/src/main/res/values/strings.xml b/core/resources/src/main/res/values/strings.xml
@@ -1564,4 +1564,6 @@
     <string name="edit_exif_screen_sub">Change metadata of single image without recompression</string>
     <string name="edit_exif_tag">Tap to edit available tags</string>
     <string name="change_sticker">Change Sticker</string>
+    <string name="fit_width">Fit Width</string>
+    <string name="fit_height">Fit Height</string>
 </resources>
diff --git a/...main/java/ru/tech/imageresizershrinker/feature/image_stacking/data/AndroidImageStacker.kt b/...main/java/ru/tech/imageresizershrinker/feature/image_stacking/data/AndroidImageStacker.kt
@@ -82,21 +82,23 @@ internal class AndroidImageStacker @Inject constructor(
             )?.let { bitmap ->
                 bitmap.setHasAlpha(true)
 
-                when (stackImage.scale) {
-                    StackImage.Scale.None -> bitmap
-                    StackImage.Scale.Fill -> imageScaler.scaleImage(
-                        image = bitmap,
-                        width = resultSize.width,
-                        height = resultSize.height
-                    )
+                val resizeType = when (stackImage.scale) {
+                    StackImage.Scale.None -> null
+                    StackImage.Scale.Fill -> ResizeType.Explicit
+                    StackImage.Scale.Fit -> ResizeType.Flexible(ResizeAnchor.Min)
+                    StackImage.Scale.FitWidth -> ResizeType.Flexible(ResizeAnchor.Width)
+                    StackImage.Scale.FitHeight -> ResizeType.Flexible(ResizeAnchor.Height)
+                    StackImage.Scale.Crop -> ResizeType.CenterCrop(0x00000000)
+                }
 
-                    StackImage.Scale.Fit -> imageScaler.scaleImage(
+                resizeType?.let {
+                    imageScaler.scaleImage(
                         image = bitmap,
                         width = resultSize.width,
                         height = resultSize.height,
-                        resizeType = ResizeType.Flexible(ResizeAnchor.Min)
+                        resizeType = resizeType
                     )
-                }
+                } ?: bitmap
             }
             paint.alpha = (stackImage.alpha * 255).toInt()
             paint.xfermode = PorterDuffXfermode(stackImage.blendingMode.toPorterDuffMode())

diff --git a/...ng/src/main/java/ru/tech/imageresizershrinker/feature/image_stacking/domain/StackImage.kt b/...ng/src/main/java/ru/tech/imageresizershrinker/feature/image_stacking/domain/StackImage.kt
@@ -28,7 +28,7 @@ data class StackImage(
     val scale: Scale
 ) {
     enum class Scale {
-        None, Fill, Fit
+        None, Fill, Fit, FitWidth, FitHeight, Crop
     }
 }
 

diff --git a/...ech/imageresizershrinker/feature/image_stacking/presentation/components/StackImageItem.kt b/...ech/imageresizershrinker/feature/image_stacking/presentation/components/StackImageItem.kt
@@ -212,6 +212,9 @@ fun StackImageItem(
                                 StackImage.Scale.None -> stringResource(R.string.none)
                                 StackImage.Scale.Fill -> stringResource(R.string.fill)
                                 StackImage.Scale.Fit -> stringResource(R.string.fit)
+                                StackImage.Scale.FitWidth -> stringResource(R.string.fit_width)
+                                StackImage.Scale.FitHeight -> stringResource(R.string.fit_height)
+                                StackImage.Scale.Crop -> stringResource(R.string.crop)
                             }
                         },
                         color = Color.Unspecified,