Mirrors/Android-ImageToolbox
1
0
Fork 0
mirror of https://github.com/T8RIN/ImageToolbox.git synced 2025-12-28 13:22:30 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Improve UI

Browse Source
This commit is contained in:
T8RIN 2025-06-14 02:45:30 +03:00
parent 51ca85adf1
commit 37f664ea7c
8 changed files with 58 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
core/resources/src/main/java/com/t8rin/imagetoolbox/core/resources/icons/Eyedropper.kt Normal file
View File

@ -0,0 +1,45 @@
package com.t8rin.imagetoolbox.core.resources.icons
import androidx.compose.material.icons.Icons
import androidx.compose.ui.graphics.Color
import androidx.compose.ui.graphics.SolidColor
import androidx.compose.ui.graphics.vector.ImageVector
import androidx.compose.ui.graphics.vector.path
import androidx.compose.ui.unit.dp
val Icons.Outlined.Eyedropper: ImageVector by lazy(LazyThreadSafetyMode.NONE) {
ImageVector.Builder(
name = "Outlined.Eyedropper",
defaultWidth = 24.dp,
defaultHeight = 24.dp,
viewportWidth = 24f,
viewportHeight = 24f
).apply {
path(fill = SolidColor(Color(0xFF000000))) {
moveTo(19.35f, 11.72f)
lineTo(17.22f, 13.85f)
lineTo(15.81f, 12.43f)
lineTo(8.1f, 20.14f)
lineTo(3.5f, 22f)
lineTo(2f, 20.5f)
lineTo(3.86f, 15.9f)
lineTo(11.57f, 8.19f)
lineTo(10.15f, 6.78f)
lineTo(12.28f, 4.65f)
lineTo(19.35f, 11.72f)
moveTo(16.76f, 3f)
curveTo(17.93f, 1.83f, 19.83f, 1.83f, 21f, 3f)
curveTo(22.17f, 4.17f, 22.17f, 6.07f, 21f, 7.24f)
lineTo(19.08f, 9.16f)
lineTo(14.84f, 4.92f)
lineTo(16.76f, 3f)
moveTo(5.56f, 17.03f)
lineTo(4.5f, 19.5f)
lineTo(6.97f, 18.44f)
lineTo(14.4f, 11f)
lineTo(13f, 9.6f)
lineTo(5.56f, 17.03f)
close()
}
}.build()
}

2
core/resources/src/main/res/drawable-nodpi/outline_colorize_24.xml
View File

@ -22,5 +22,5 @@
android:viewportHeight="24">
<path
android:fillColor="#FFFFFF"
android:pathData="M17.66,5.41l0.92,0.92 -2.69,2.69 -0.92,-0.92 2.69,-2.69M17.67,3c-0.26,0 -0.51,0.1 -0.71,0.29l-3.12,3.12 -1.93,-1.91 -1.41,1.41 1.42,1.42L3,16.25V21h4.75l8.92,-8.92 1.42,1.42 1.41,-1.41 -1.92,-1.92 3.12,-3.12c0.4,-0.4 0.4,-1.03 0.01,-1.42l-2.34,-2.34c-0.2,-0.19 -0.45,-0.29 -0.7,-0.29zM6.92,19L5,17.08l8.06,-8.06 1.92,1.92L6.92,19z" />
android:pathData="M19.35,11.72L17.22,13.85L15.81,12.43L8.1,20.14L3.5,22L2,20.5L3.86,15.9L11.57,8.19L10.15,6.78L12.28,4.65L19.35,11.72M16.76,3C17.93,1.83 19.83,1.83 21,3C22.17,4.17 22.17,6.07 21,7.24L19.08,9.16L14.84,4.92L16.76,3M5.56,17.03L4.5,19.5L6.97,18.44L14.4,11L13,9.6L5.56,17.03Z" />
</vector>

4
core/ui/src/main/kotlin/com/t8rin/imagetoolbox/core/ui/utils/navigation/ScreenUtils.kt
View File

@ -22,7 +22,6 @@ import androidx.compose.material.icons.automirrored.outlined.BrandingWatermark
import androidx.compose.material.icons.outlined.Album
import androidx.compose.material.icons.outlined.AutoFixHigh
import androidx.compose.material.icons.outlined.ColorLens
import androidx.compose.material.icons.outlined.Colorize
import androidx.compose.material.icons.outlined.DocumentScanner
import androidx.compose.material.icons.outlined.FolderZip
import androidx.compose.material.icons.outlined.GifBox
@ -46,6 +45,7 @@ import com.t8rin.imagetoolbox.core.resources.icons.Encrypted
import com.t8rin.imagetoolbox.core.resources.icons.Eraser
import com.t8rin.imagetoolbox.core.resources.icons.Exif
import com.t8rin.imagetoolbox.core.resources.icons.ExifEdit
import com.t8rin.imagetoolbox.core.resources.icons.Eyedropper
import com.t8rin.imagetoolbox.core.resources.icons.HistoryCreate
import com.t8rin.imagetoolbox.core.resources.icons.ImageCombine
import com.t8rin.imagetoolbox.core.resources.icons.ImageConvert
@ -196,7 +196,7 @@ internal fun Screen.icon(): ImageVector? = when (this) {
is LimitResize -> Icons.Outlined.ImageLimit
is LoadNetImage -> Icons.Outlined.ImageDownload
is PdfTools -> Icons.Outlined.PictureAsPdf
is PickColorFromImage -> Icons.Outlined.Colorize
is PickColorFromImage -> Icons.Outlined.Eyedropper
is RecognizeText -> Icons.Outlined.ImageText
is ResizeAndConvert -> Icons.Rounded.MultipleImageEdit
is WeightResize -> Icons.Rounded.ImageWeight

4
feature/draw/src/main/java/com/t8rin/imagetoolbox/feature/draw/presentation/components/OpenColorPickerCard.kt
View File

@ -21,7 +21,6 @@ import androidx.compose.foundation.layout.Row
import androidx.compose.foundation.layout.padding
import androidx.compose.foundation.shape.RoundedCornerShape
import androidx.compose.material.icons.Icons
import androidx.compose.material.icons.rounded.Colorize
import androidx.compose.material3.Icon
import androidx.compose.material3.MaterialTheme
import androidx.compose.material3.Text
@ -31,6 +30,7 @@ import androidx.compose.ui.Modifier
import androidx.compose.ui.res.stringResource
import androidx.compose.ui.unit.dp
import com.t8rin.imagetoolbox.core.resources.R
import com.t8rin.imagetoolbox.core.resources.icons.Eyedropper
import com.t8rin.imagetoolbox.core.ui.theme.mixedContainer
import com.t8rin.imagetoolbox.core.ui.theme.onMixedContainer
import com.t8rin.imagetoolbox.core.ui.widget.enhanced.hapticsClickable
@ -59,7 +59,7 @@ fun OpenColorPickerCard(
color = MaterialTheme.colorScheme.onMixedContainer
)
Icon(
imageVector = Icons.Rounded.Colorize,
imageVector = Icons.Outlined.Eyedropper,
contentDescription = stringResource(R.string.pipette),
tint = MaterialTheme.colorScheme.onMixedContainer
)

4
feature/filters/src/main/java/com/t8rin/imagetoolbox/feature/filters/presentation/components/FiltersContentTopAppBarActions.kt
View File

@ -19,7 +19,6 @@ package com.t8rin.imagetoolbox.feature.filters.presentation.components
import androidx.compose.foundation.layout.RowScope
import androidx.compose.material.icons.Icons
import androidx.compose.material.icons.outlined.Colorize
import androidx.compose.material.icons.rounded.AutoFixHigh
import androidx.compose.material.icons.rounded.Texture
import androidx.compose.material3.Icon
@ -32,6 +31,7 @@ import androidx.compose.runtime.setValue
import androidx.compose.ui.graphics.Color
import androidx.compose.ui.res.stringResource
import com.t8rin.imagetoolbox.core.resources.R
import com.t8rin.imagetoolbox.core.resources.icons.Eyedropper
import com.t8rin.imagetoolbox.core.ui.theme.mixedContainer
import com.t8rin.imagetoolbox.core.ui.utils.helper.isPortraitOrientationAsState
import com.t8rin.imagetoolbox.core.ui.utils.navigation.Screen
@ -64,7 +64,7 @@ internal fun RowScope.FiltersContentTopAppBarActions(
enabled = component.previewBitmap != null
) {
Icon(
imageVector = Icons.Outlined.Colorize,
imageVector = Icons.Outlined.Eyedropper,
contentDescription = stringResource(R.string.pipette)
)
}

4
feature/generate-palette/src/main/java/com/t8rin/imagetoolbox/feature/generate_palette/presentation/GeneratePaletteContent.kt
View File

@ -33,7 +33,6 @@ import androidx.compose.foundation.layout.height
import androidx.compose.foundation.layout.padding
import androidx.compose.foundation.layout.width
import androidx.compose.material.icons.Icons
import androidx.compose.material.icons.rounded.Colorize
import androidx.compose.material.icons.rounded.Palette
import androidx.compose.material3.Icon
import androidx.compose.material3.Text
@ -49,6 +48,7 @@ import androidx.compose.ui.platform.LocalLayoutDirection
import androidx.compose.ui.res.stringResource
import androidx.compose.ui.unit.dp
import com.t8rin.imagetoolbox.core.resources.R
import com.t8rin.imagetoolbox.core.resources.icons.Eyedropper
import com.t8rin.imagetoolbox.core.resources.icons.Theme
import com.t8rin.imagetoolbox.core.ui.utils.content_pickers.Picker
import com.t8rin.imagetoolbox.core.ui.utils.content_pickers.rememberImagePicker
@ -226,7 +226,7 @@ fun GeneratePaletteContent(
}
) {
Icon(
imageVector = Icons.Rounded.Colorize,
imageVector = Icons.Outlined.Eyedropper,
contentDescription = stringResource(R.string.pipette)
)
}

4
feature/single-edit/src/main/java/com/t8rin/imagetoolbox/feature/single_edit/presentation/components/FilterEditOption.kt
View File

@ -38,7 +38,6 @@ import androidx.compose.foundation.layout.heightIn
import androidx.compose.foundation.layout.padding
import androidx.compose.foundation.layout.width
import androidx.compose.material.icons.Icons
import androidx.compose.material.icons.outlined.Colorize
import androidx.compose.material.icons.rounded.AutoFixHigh
import androidx.compose.material.icons.rounded.Done
import androidx.compose.material3.Icon
@ -77,6 +76,7 @@ import com.t8rin.imagetoolbox.core.filters.presentation.widget.FilterTemplateCre
import com.t8rin.imagetoolbox.core.filters.presentation.widget.addFilters.AddFiltersSheet
import com.t8rin.imagetoolbox.core.filters.presentation.widget.addFilters.AddFiltersSheetComponent
import com.t8rin.imagetoolbox.core.resources.R
import com.t8rin.imagetoolbox.core.resources.icons.Eyedropper
import com.t8rin.imagetoolbox.core.ui.theme.mixedContainer
import com.t8rin.imagetoolbox.core.ui.utils.provider.LocalScreenSize
import com.t8rin.imagetoolbox.core.ui.widget.enhanced.EnhancedButton
@ -258,7 +258,7 @@ fun FilterEditOption(
},
) {
Icon(
imageVector = Icons.Outlined.Colorize,
imageVector = Icons.Outlined.Eyedropper,
contentDescription = stringResource(R.string.pipette)
)
}

4
feature/svg-maker/src/main/java/com/t8rin/imagetoolbox/feature/svg_maker/presentation/components/SvgParamsSelector.kt
View File

@ -40,7 +40,6 @@ import androidx.compose.material.icons.outlined.LinearScale
import androidx.compose.material.icons.outlined.RepeatOne
import androidx.compose.material.icons.outlined.Upcoming
import androidx.compose.material.icons.rounded.BlurCircular
import androidx.compose.material.icons.rounded.Colorize
import androidx.compose.material3.MaterialTheme
import androidx.compose.material3.Text
import androidx.compose.runtime.Composable
@ -54,6 +53,7 @@ import androidx.compose.ui.unit.dp
import androidx.compose.ui.unit.sp
import com.smarttoolfactory.colordetector.util.ColorUtil.roundToTwoDigits
import com.t8rin.imagetoolbox.core.resources.R
import com.t8rin.imagetoolbox.core.resources.icons.Eyedropper
import com.t8rin.imagetoolbox.core.resources.icons.FreeDraw
import com.t8rin.imagetoolbox.core.resources.icons.Line
import com.t8rin.imagetoolbox.core.resources.icons.Resize
@ -189,7 +189,7 @@ fun SvgParamsSelector(
EnhancedSliderItem(
value = value.minColorRatio,
title = stringResource(R.string.min_color_ratio),
icon = Icons.Rounded.Colorize,
icon = Icons.Outlined.Eyedropper,
valueRange = 0f..0.1f,
internalStateTransformation = {
it.roundTo(3)