diff --git a/core/ui/src/main/kotlin/ru/tech/imageresizershrinker/core/ui/widget/sliders/custom_slider/CustomSliderDefaults.kt b/core/ui/src/main/kotlin/ru/tech/imageresizershrinker/core/ui/widget/sliders/custom_slider/CustomSliderDefaults.kt index 12bb97459d..75a0bcc333 100644 --- a/core/ui/src/main/kotlin/ru/tech/imageresizershrinker/core/ui/widget/sliders/custom_slider/CustomSliderDefaults.kt +++ b/core/ui/src/main/kotlin/ru/tech/imageresizershrinker/core/ui/widget/sliders/custom_slider/CustomSliderDefaults.kt @@ -140,7 +140,7 @@ object CustomSliderDefaults { @Composable fun Thumb( interactionSource: MutableInteractionSource, - modifier: Modifier = Modifier.Companion, + modifier: Modifier = Modifier, colors: CustomSliderColors = colors(), enabled: Boolean = true, thumbSize: DpSize = ThumbSize @@ -197,7 +197,7 @@ object CustomSliderDefaults { @ExperimentalMaterial3Api fun Track( sliderState: CustomSliderState, - modifier: Modifier = Modifier.Companion, + modifier: Modifier = Modifier, colors: CustomSliderColors = colors(), enabled: Boolean = true, trackHeight: Dp = 32.dp @@ -239,7 +239,7 @@ object CustomSliderDefaults { @Composable fun Track( rangeSliderState: CustomRangeSliderState, - modifier: Modifier = Modifier.Companion, + modifier: Modifier = Modifier, colors: CustomSliderColors = colors(), enabled: Boolean = true, trackHeight: Dp = 32.dp diff --git a/feature/color-tools/src/main/java/ru/tech/imageresizershrinker/color_tools/presentation/components/ColorHarmonies.kt b/feature/color-tools/src/main/java/ru/tech/imageresizershrinker/color_tools/presentation/components/ColorHarmonies.kt index c3c30f5a50..6b01f65334 100644 --- a/feature/color-tools/src/main/java/ru/tech/imageresizershrinker/color_tools/presentation/components/ColorHarmonies.kt +++ b/feature/color-tools/src/main/java/ru/tech/imageresizershrinker/color_tools/presentation/components/ColorHarmonies.kt @@ -95,7 +95,7 @@ internal fun ColorHarmonies( }, expandableContent = { Column( - modifier = Modifier.Companion.padding( + modifier = Modifier.padding( start = 16.dp, end = 16.dp, bottom = 8.dp @@ -103,14 +103,14 @@ internal fun ColorHarmonies( ) { Row( horizontalArrangement = Arrangement.spacedBy(4.dp), - modifier = Modifier.Companion.fillMaxWidth() + modifier = Modifier.fillMaxWidth() ) { HarmonyType.entries.forEach { EnhancedChip( selected = it == selectedHarmony, onClick = { selectedHarmony = it }, selectedColor = MaterialTheme.colorScheme.secondaryContainer, - modifier = Modifier.Companion.weight(1f) + modifier = Modifier.weight(1f) ) { Icon( imageVector = it.icon(), @@ -119,7 +119,7 @@ internal fun ColorHarmonies( } } } - Spacer(Modifier.Companion.height(8.dp)) + Spacer(Modifier.height(8.dp)) AnimatedContent( targetState = selectedHarmony, transitionSpec = { @@ -128,7 +128,7 @@ internal fun ColorHarmonies( ) { Text(it.title()) } - Spacer(Modifier.Companion.height(8.dp)) + Spacer(Modifier.height(8.dp)) Row( horizontalArrangement = Arrangement.spacedBy(8.dp) ) { @@ -142,7 +142,7 @@ internal fun ColorHarmonies( darkMode = boxColor.luminance() < 0.3f ) Box( - modifier = Modifier.Companion + modifier = Modifier .heightIn(min = 120.dp) .weight(1f) .clip(RoundedCornerShape(8.dp)) @@ -165,7 +165,7 @@ internal fun ColorHarmonies( imageVector = Icons.Rounded.ContentCopy, contentDescription = stringResource(R.string.copy), tint = contentColor, - modifier = Modifier.Companion + modifier = Modifier .align(Alignment.Companion.TopEnd) .padding(4.dp) .size(28.dp) @@ -181,7 +181,7 @@ internal fun ColorHarmonies( Text( text = color.toHex(), color = contentColor, - modifier = Modifier.Companion + modifier = Modifier .align(Alignment.Companion.BottomStart) .padding(4.dp) .background( diff --git a/feature/color-tools/src/main/java/ru/tech/imageresizershrinker/color_tools/presentation/components/ColorHistogram.kt b/feature/color-tools/src/main/java/ru/tech/imageresizershrinker/color_tools/presentation/components/ColorHistogram.kt index 4189f41614..17ca6bfa7c 100644 --- a/feature/color-tools/src/main/java/ru/tech/imageresizershrinker/color_tools/presentation/components/ColorHistogram.kt +++ b/feature/color-tools/src/main/java/ru/tech/imageresizershrinker/color_tools/presentation/components/ColorHistogram.kt @@ -56,7 +56,7 @@ internal fun ColorHistogram() { }, expandableContent = { Column( - modifier = Modifier.Companion.padding( + modifier = Modifier.padding( start = 16.dp, end = 16.dp, bottom = 8.dp @@ -76,7 +76,7 @@ internal fun ColorHistogram() { ) { ImageHistogram( imageUri = imageUri, - modifier = Modifier.Companion + modifier = Modifier .padding(top = 16.dp) .fillMaxWidth() .height(250.dp), @@ -87,7 +87,7 @@ internal fun ColorHistogram() { ) ImageHistogram( imageUri = imageUri, - modifier = Modifier.Companion + modifier = Modifier .fillMaxWidth() .height(250.dp), initialType = HistogramType.Brightness, @@ -97,7 +97,7 @@ internal fun ColorHistogram() { ) ImageHistogram( imageUri = imageUri, - modifier = Modifier.Companion + modifier = Modifier .fillMaxWidth() .height(250.dp), initialType = HistogramType.Camera, diff --git a/feature/color-tools/src/main/java/ru/tech/imageresizershrinker/color_tools/presentation/components/ColorInfo.kt b/feature/color-tools/src/main/java/ru/tech/imageresizershrinker/color_tools/presentation/components/ColorInfo.kt index b8a8df58a6..40c0a5db98 100644 --- a/feature/color-tools/src/main/java/ru/tech/imageresizershrinker/color_tools/presentation/components/ColorInfo.kt +++ b/feature/color-tools/src/main/java/ru/tech/imageresizershrinker/color_tools/presentation/components/ColorInfo.kt @@ -83,7 +83,7 @@ internal fun ColorInfo( }, expandableContent = { Column( - modifier = Modifier.Companion.padding( + modifier = Modifier.padding( start = 16.dp, end = 16.dp, bottom = 8.dp @@ -98,7 +98,7 @@ internal fun ColorInfo( darkMode = boxColor.luminance() < 0.3f ) Box( - modifier = Modifier.Companion + modifier = Modifier .heightIn(min = 80.dp) .fillMaxWidth() .clip(RoundedCornerShape(16.dp)) @@ -121,7 +121,7 @@ internal fun ColorInfo( imageVector = Icons.Rounded.ContentCopy, contentDescription = stringResource(R.string.copy), tint = contentColor, - modifier = Modifier.Companion + modifier = Modifier .align(Alignment.Companion.TopEnd) .padding(4.dp) .size(28.dp) @@ -135,7 +135,7 @@ internal fun ColorInfo( Text( text = selectedColor.toHex(), color = contentColor, - modifier = Modifier.Companion + modifier = Modifier .align(Alignment.Companion.BottomStart) .padding(4.dp) .background( @@ -153,7 +153,7 @@ internal fun ColorInfo( } }.value, color = contentColor, - modifier = Modifier.Companion + modifier = Modifier .align(Alignment.Companion.BottomEnd) .padding(4.dp) .background( @@ -164,7 +164,7 @@ internal fun ColorInfo( fontSize = 12.sp ) } - Spacer(modifier = Modifier.Companion.height(16.dp)) + Spacer(modifier = Modifier.height(16.dp)) var wasNull by rememberSaveable { mutableStateOf(false) } diff --git a/feature/color-tools/src/main/java/ru/tech/imageresizershrinker/color_tools/presentation/components/ColorMixing.kt b/feature/color-tools/src/main/java/ru/tech/imageresizershrinker/color_tools/presentation/components/ColorMixing.kt index ab3938ee8f..97f5db8b4c 100644 --- a/feature/color-tools/src/main/java/ru/tech/imageresizershrinker/color_tools/presentation/components/ColorMixing.kt +++ b/feature/color-tools/src/main/java/ru/tech/imageresizershrinker/color_tools/presentation/components/ColorMixing.kt @@ -109,7 +109,7 @@ internal fun ColorMixing( }, expandableContent = { Column( - modifier = Modifier.Companion.padding( + modifier = Modifier.padding( start = 16.dp, end = 16.dp, bottom = 8.dp @@ -118,7 +118,7 @@ internal fun ColorMixing( ColorRowSelector( value = colorToMix, onValueChange = { colorToMix = it }, - modifier = Modifier.Companion + modifier = Modifier .fillMaxWidth() .container( color = MaterialTheme.colorScheme.surface, @@ -126,7 +126,7 @@ internal fun ColorMixing( ), title = stringResource(R.string.color_to_mix) ) - Spacer(modifier = Modifier.Companion.height(4.dp)) + Spacer(modifier = Modifier.height(4.dp)) EnhancedSliderItem( value = mixingVariation, title = stringResource(R.string.variation), @@ -138,9 +138,9 @@ internal fun ColorMixing( color = MaterialTheme.colorScheme.surface, steps = 12 ) - Spacer(modifier = Modifier.Companion.height(16.dp)) + Spacer(modifier = Modifier.height(16.dp)) Column( - modifier = Modifier.Companion.fillMaxWidth(), + modifier = Modifier.fillMaxWidth(), verticalArrangement = Arrangement.spacedBy(4.dp), horizontalAlignment = Alignment.Companion.CenterHorizontally ) { @@ -154,7 +154,7 @@ internal fun ColorMixing( darkMode = boxColor.luminance() < 0.3f ) Box( - modifier = Modifier.Companion + modifier = Modifier .heightIn(min = 100.dp) .fillMaxWidth() .clip( @@ -182,7 +182,7 @@ internal fun ColorMixing( imageVector = Icons.Rounded.ContentCopy, contentDescription = stringResource(R.string.copy), tint = contentColor, - modifier = Modifier.Companion + modifier = Modifier .align(Alignment.Companion.TopEnd) .padding(4.dp) .size(28.dp) @@ -196,7 +196,7 @@ internal fun ColorMixing( Text( text = color.toHex(), color = contentColor, - modifier = Modifier.Companion + modifier = Modifier .align(Alignment.Companion.BottomStart) .padding(4.dp) .background( @@ -216,7 +216,7 @@ internal fun ColorMixing( } }.value, color = contentColor, - modifier = Modifier.Companion + modifier = Modifier .align(Alignment.Companion.BottomEnd) .padding(4.dp) .background( diff --git a/feature/color-tools/src/main/java/ru/tech/imageresizershrinker/color_tools/presentation/components/ColorShading.kt b/feature/color-tools/src/main/java/ru/tech/imageresizershrinker/color_tools/presentation/components/ColorShading.kt index 485184c5cd..4da324cfa4 100644 --- a/feature/color-tools/src/main/java/ru/tech/imageresizershrinker/color_tools/presentation/components/ColorShading.kt +++ b/feature/color-tools/src/main/java/ru/tech/imageresizershrinker/color_tools/presentation/components/ColorShading.kt @@ -115,7 +115,7 @@ internal fun ColorShading( }, expandableContent = { Column( - modifier = Modifier.Companion.padding( + modifier = Modifier.padding( start = 16.dp, end = 16.dp, bottom = 8.dp @@ -131,7 +131,7 @@ internal fun ColorShading( color = MaterialTheme.colorScheme.surface, steps = 12 ) - Spacer(modifier = Modifier.Companion.height(16.dp)) + Spacer(modifier = Modifier.height(16.dp)) Row( horizontalArrangement = Arrangement.spacedBy(4.dp) ) { @@ -141,7 +141,7 @@ internal fun ColorShading( shades to R.string.shades ).forEach { (data, title) -> Column( - modifier = Modifier.Companion.weight(1f), + modifier = Modifier.weight(1f), verticalArrangement = Arrangement.spacedBy(4.dp), horizontalAlignment = Alignment.Companion.CenterHorizontally ) { @@ -156,7 +156,7 @@ internal fun ColorShading( darkMode = boxColor.luminance() < 0.3f ) Box( - modifier = Modifier.Companion + modifier = Modifier .heightIn(min = 100.dp) .fillMaxWidth() .clip( @@ -184,7 +184,7 @@ internal fun ColorShading( imageVector = Icons.Rounded.ContentCopy, contentDescription = stringResource(R.string.copy), tint = contentColor, - modifier = Modifier.Companion + modifier = Modifier .align(Alignment.Companion.TopEnd) .padding(4.dp) .size(28.dp) @@ -198,7 +198,7 @@ internal fun ColorShading( Text( text = color.toHex(), color = contentColor, - modifier = Modifier.Companion + modifier = Modifier .align(Alignment.Companion.BottomStart) .padding(4.dp) .background( diff --git a/feature/load-net-image/src/main/java/ru/tech/imageresizershrinker/feature/load_net_image/presentation/components/LoadNetImageUrlTextField.kt b/feature/load-net-image/src/main/java/ru/tech/imageresizershrinker/feature/load_net_image/presentation/components/LoadNetImageUrlTextField.kt index c95e983527..9234b5091a 100644 --- a/feature/load-net-image/src/main/java/ru/tech/imageresizershrinker/feature/load_net_image/presentation/components/LoadNetImageUrlTextField.kt +++ b/feature/load-net-image/src/main/java/ru/tech/imageresizershrinker/feature/load_net_image/presentation/components/LoadNetImageUrlTextField.kt @@ -43,7 +43,7 @@ internal fun LoadNetImageUrlTextField( val essentials = rememberLocalEssentials() RoundedTextField( - modifier = Modifier.Companion + modifier = Modifier .container(shape = RoundedCornerShape(24.dp)) .padding(8.dp), value = component.targetUrl, @@ -68,7 +68,7 @@ internal fun LoadNetImageUrlTextField( onClick = { component.updateTargetUrl("") }, - modifier = Modifier.Companion.padding(end = 4.dp) + modifier = Modifier.padding(end = 4.dp) ) { Icon( imageVector = Icons.Outlined.Cancel, diff --git a/feature/recognize-text/src/main/java/ru/tech/imageresizershrinker/feature/recognize/text/presentation/components/DownloadedLanguageItem.kt b/feature/recognize-text/src/main/java/ru/tech/imageresizershrinker/feature/recognize/text/presentation/components/DownloadedLanguageItem.kt index 0f2eb3b85a..fed394a52b 100644 --- a/feature/recognize-text/src/main/java/ru/tech/imageresizershrinker/feature/recognize/text/presentation/components/DownloadedLanguageItem.kt +++ b/feature/recognize-text/src/main/java/ru/tech/imageresizershrinker/feature/recognize/text/presentation/components/DownloadedLanguageItem.kt @@ -112,10 +112,10 @@ internal fun LazyItemScope.DownloadedLanguageItem( ) SwipeToReveal( state = state, - modifier = Modifier.Companion.animateItem(), + modifier = Modifier.animateItem(), revealedContentEnd = { Box( - Modifier.Companion + Modifier .fillMaxSize() .container( color = MaterialTheme.colorScheme.errorContainer, @@ -133,7 +133,7 @@ internal fun LazyItemScope.DownloadedLanguageItem( Icon( imageVector = Icons.Rounded.DeleteOutline, contentDescription = stringResource(R.string.delete), - modifier = Modifier.Companion + modifier = Modifier .padding(16.dp) .padding(end = 8.dp) .align(Alignment.Companion.CenterEnd), @@ -145,7 +145,7 @@ internal fun LazyItemScope.DownloadedLanguageItem( swipeableContent = { val haptics = LocalHapticFeedback.current Row( - modifier = Modifier.Companion + modifier = Modifier .fillMaxWidth() .container( shape = shape, @@ -186,7 +186,7 @@ internal fun LazyItemScope.DownloadedLanguageItem( onCheckedChange = { onValueChange(selected, lang) }, - modifier = Modifier.Companion.padding(end = 8.dp) + modifier = Modifier.padding(end = 8.dp) ) } } @@ -200,7 +200,7 @@ internal fun LazyItemScope.DownloadedLanguageItem( ) ) if (lang.name != lang.localizedName) { - Spacer(modifier = Modifier.Companion.height(2.dp)) + Spacer(modifier = Modifier.height(2.dp)) Text( text = lang.localizedName, fontSize = 12.sp, @@ -210,16 +210,16 @@ internal fun LazyItemScope.DownloadedLanguageItem( ) } } - Spacer(modifier = Modifier.Companion.weight(1f)) + Spacer(modifier = Modifier.weight(1f)) Row( horizontalArrangement = Arrangement.spacedBy(4.dp), - modifier = Modifier.Companion.container() + modifier = Modifier.container() ) { RecognitionType.entries.forEach { type -> Column( horizontalAlignment = Alignment.Companion.CenterHorizontally, verticalArrangement = Arrangement.Center, - modifier = Modifier.Companion + modifier = Modifier .clip(CircleShape) .clickable { haptics.performHapticFeedback( @@ -267,14 +267,14 @@ internal fun LazyItemScope.DownloadedLanguageItem( text = displayName, fontSize = 12.sp ) - Spacer(modifier = Modifier.Companion.height(4.dp)) + Spacer(modifier = Modifier.height(4.dp)) Icon( imageVector = if (notDownloaded) { Icons.Rounded.Cancel } else Icons.Rounded.CheckCircle, contentDescription = null, tint = animateColorAsState(color).value, - modifier = Modifier.Companion + modifier = Modifier .size(28.dp) .border( width = settingsState.borderWidth, diff --git a/feature/scan-qr-code/src/main/java/ru/tech/imageresizershrinker/feature/scan_qr_code/presentation/components/QrCodePreview.kt b/feature/scan-qr-code/src/main/java/ru/tech/imageresizershrinker/feature/scan_qr_code/presentation/components/QrCodePreview.kt index 7a183e3658..1cb1f65d07 100644 --- a/feature/scan-qr-code/src/main/java/ru/tech/imageresizershrinker/feature/scan_qr_code/presentation/components/QrCodePreview.kt +++ b/feature/scan-qr-code/src/main/java/ru/tech/imageresizershrinker/feature/scan_qr_code/presentation/components/QrCodePreview.kt @@ -63,18 +63,18 @@ internal fun QrCodePreview( qrDescriptionFont: UiFontFamily ) { Box( - modifier = Modifier.Companion.fillMaxWidth(), + modifier = Modifier.fillMaxWidth(), contentAlignment = Alignment.Companion.Center ) { - Column(Modifier.Companion.capturable(captureController)) { + Column(Modifier.capturable(captureController)) { if (qrImageUri != null) { - Spacer(modifier = Modifier.Companion.height(32.dp)) + Spacer(modifier = Modifier.height(32.dp)) } BoxWithConstraints( - modifier = Modifier.Companion + modifier = Modifier .then( if ((qrImageUri != null || qrDescription.isNotEmpty()) && qrContent.isNotEmpty()) { - Modifier.Companion + Modifier .background( color = takeColorFromScheme { if (isLandscape) { @@ -84,7 +84,7 @@ internal fun QrCodePreview( shape = RoundedCornerShape(16.dp) ) .padding(16.dp) - } else Modifier.Companion + } else Modifier ) ) { val targetSize = min(min(this.maxWidth, this.maxHeight), 300.dp) @@ -93,17 +93,17 @@ internal fun QrCodePreview( ) { QrCode( content = qrContent, - modifier = Modifier.Companion + modifier = Modifier .padding( top = if (qrImageUri != null) 36.dp else 0.dp, bottom = if (qrDescription.isNotEmpty()) 16.dp else 0.dp ) .then( if (isLandscape) { - Modifier.Companion + Modifier .weight(1f, false) .aspectRatio(1f) - } else Modifier.Companion + } else Modifier ) .size(targetSize), shape = androidx.compose.foundation.shape.RoundedCornerShape( @@ -119,7 +119,7 @@ internal fun QrCodePreview( text = qrDescription, style = MaterialTheme.typography.headlineSmall, textAlign = TextAlign.Companion.Center, - modifier = Modifier.Companion.width(targetSize) + modifier = Modifier.width(targetSize) ) } } @@ -127,7 +127,7 @@ internal fun QrCodePreview( if (qrImageUri != null && qrContent.isNotEmpty()) { Picture( - modifier = Modifier.Companion + modifier = Modifier .align(Alignment.Companion.TopCenter) .offset(y = (-48).dp) .size(64.dp), diff --git a/feature/settings/src/main/java/ru/tech/imageresizershrinker/feature/settings/presentation/components/FreeSoftwarePartnerSettingItem.kt b/feature/settings/src/main/java/ru/tech/imageresizershrinker/feature/settings/presentation/components/FreeSoftwarePartnerSettingItem.kt index 5c5c7f6122..a2c3594545 100644 --- a/feature/settings/src/main/java/ru/tech/imageresizershrinker/feature/settings/presentation/components/FreeSoftwarePartnerSettingItem.kt +++ b/feature/settings/src/main/java/ru/tech/imageresizershrinker/feature/settings/presentation/components/FreeSoftwarePartnerSettingItem.kt @@ -40,7 +40,7 @@ import java.util.Locale @Composable fun FreeSoftwarePartnerSettingItem( shape: Shape = ContainerShapeDefaults.centerShape, - modifier: Modifier = Modifier.Companion.padding(horizontal = 8.dp) + modifier: Modifier = Modifier.padding(horizontal = 8.dp) ) { if (BuildConfig.FLAVOR == "foss" || Locale.getDefault().language != "ru") return