fixes

T8RIN · Dec 1, 2023 · bd1908f · bd1908f
1 parent 0bb28f4
commit bd1908f
Show file tree

Hide file tree

Showing 3 changed files with 27 additions and 1 deletion.
diff --git a/...in/java/ru/tech/imageresizershrinker/presentation/filters_screen/components/FilterItem.kt b/...in/java/ru/tech/imageresizershrinker/presentation/filters_screen/components/FilterItem.kt
@@ -23,6 +23,7 @@ import androidx.compose.material3.IconButton
 import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
+import androidx.compose.runtime.derivedStateOf
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.mutableFloatStateOf
 import androidx.compose.runtime.mutableStateOf
@@ -41,9 +42,11 @@ import androidx.compose.ui.text.input.KeyboardType
 import androidx.compose.ui.unit.dp
 import ru.tech.imageresizershrinker.R
 import ru.tech.imageresizershrinker.presentation.root.theme.outlineVariant
+import ru.tech.imageresizershrinker.presentation.root.transformation.filter.UiColorFilter
 import ru.tech.imageresizershrinker.presentation.root.transformation.filter.UiFilter
 import ru.tech.imageresizershrinker.presentation.root.transformation.filter.UiRGBFilter
 import ru.tech.imageresizershrinker.presentation.root.widget.color_picker.ColorSelectionRow
+import ru.tech.imageresizershrinker.presentation.root.widget.color_picker.ColorSelectionRowDefaults
 import ru.tech.imageresizershrinker.presentation.root.widget.controls.EnhancedSlider
 import ru.tech.imageresizershrinker.presentation.root.widget.modifier.container
 import ru.tech.imageresizershrinker.presentation.root.widget.text.RoundedTextField
@@ -153,6 +156,14 @@ fun <T> FilterItem(
                         Box(modifier = Modifier.padding(start = 16.dp, top = 16.dp, end = 16.dp)) {
                             ColorSelectionRow(
                                 value = filter.value as Color,
+                                defaultColors = remember(filter) {
+                                    derivedStateOf {
+                                        ColorSelectionRowDefaults.colorList.map {
+                                            if (filter is UiColorFilter) it.copy(0.5f)
+                                            else it
+                                        }
+                                    }
+                                }.value,
                                 allowAlpha = filter !is UiRGBFilter,
                                 allowScroll = !previewOnly,
                                 onValueChange = { color ->

diff --git a/...a/ru/tech/imageresizershrinker/presentation/root/widget/color_picker/ColorSelectionRow.kt b/...a/ru/tech/imageresizershrinker/presentation/root/widget/color_picker/ColorSelectionRow.kt
@@ -139,6 +139,8 @@ fun ColorSelectionRow(
                         color = color,
                         resultPadding = 0.dp
                     )
+                    .transparencyChecker()
+                    .background(color, CircleShape)
                     .clickable {
                         onValueChange(color)
                         customColor = null

diff --git a/...tech/imageresizershrinker/presentation/root/widget/sheets/ProcessImagesPreferenceSheet.kt b/...tech/imageresizershrinker/presentation/root/widget/sheets/ProcessImagesPreferenceSheet.kt
@@ -52,6 +52,7 @@ import ru.tech.imageresizershrinker.presentation.root.widget.preferences.screens
 import ru.tech.imageresizershrinker.presentation.root.widget.preferences.screens.ImageStitchingPreference
 import ru.tech.imageresizershrinker.presentation.root.widget.preferences.screens.ImagesToPdfPreference
 import ru.tech.imageresizershrinker.presentation.root.widget.preferences.screens.LimitsPreference
+import ru.tech.imageresizershrinker.presentation.root.widget.preferences.screens.MaskFilterPreference
 import ru.tech.imageresizershrinker.presentation.root.widget.preferences.screens.PdfToImagesPreference
 import ru.tech.imageresizershrinker.presentation.root.widget.preferences.screens.PickColorPreference
 import ru.tech.imageresizershrinker.presentation.root.widget.preferences.screens.PreviewPdfPreference
@@ -144,7 +145,6 @@ fun ProcessImagesPreferenceSheet(
                                     }
                                 }
                             }
-                        //TODO: DIX FOR NET IMAGE
                         if (!hasPdf) {
                             if (uris.size in 1..2) {
                                 Row(
@@ -275,6 +275,19 @@ fun ProcessImagesPreferenceSheet(
                                 color = color
                             )
                         }
+                        item {
+                            MaskFilterPreference(
+                                modifier = Modifier.fillMaxWidth(),
+                                onClick = {
+                                    navigate(
+                                        Screen.Filter(
+                                            type = Screen.Filter.Type.Masking(uris.firstOrNull())
+                                        )
+                                    )
+                                },
+                                color = color
+                            )
+                        }
                         item {
                             ImagesToPdfPreference(
                                 modifier = Modifier.fillMaxWidth(),