From 4b65350e24385ad6024bcd19f34f1735a8a21850 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ensar=20Saraj=C4=8Di=C4=87?= Date: Tue, 10 Oct 2023 09:23:16 +0200 Subject: [PATCH] Update commons --- .../flashlight/dialogs/SleepTimerCustomAlertDialog.kt | 8 ++++---- .../simplemobiletools/flashlight/screens/MainScreen.kt | 8 ++++---- .../flashlight/screens/WidgetConfigureScreen.kt | 10 +++++----- .../simplemobiletools/flashlight/views/SleepTimer.kt | 4 ++-- gradle/libs.versions.toml | 2 +- 5 files changed, 16 insertions(+), 16 deletions(-) diff --git a/app/src/main/kotlin/com/simplemobiletools/flashlight/dialogs/SleepTimerCustomAlertDialog.kt b/app/src/main/kotlin/com/simplemobiletools/flashlight/dialogs/SleepTimerCustomAlertDialog.kt index 94ca37d..505dc08 100644 --- a/app/src/main/kotlin/com/simplemobiletools/flashlight/dialogs/SleepTimerCustomAlertDialog.kt +++ b/app/src/main/kotlin/com/simplemobiletools/flashlight/dialogs/SleepTimerCustomAlertDialog.kt @@ -43,7 +43,7 @@ fun SleepTimerCustomAlertDialog( modifier = Modifier.padding(all = 24.dp) ) { Text( - modifier = Modifier.padding(bottom = SimpleTheme.dimens.margin.extraLarge), + modifier = Modifier.padding(bottom = SimpleTheme.dimens.padding.extraLarge), text = stringResource(id = R.string.sleep_timer), style = SimpleTheme.typography.headlineSmall, color = SimpleTheme.colorScheme.onSurface @@ -52,15 +52,15 @@ fun SleepTimerCustomAlertDialog( Column( modifier = Modifier .padding( - horizontal = SimpleTheme.dimens.margin.extraLarge + horizontal = SimpleTheme.dimens.padding.extraLarge ) .padding( - top = SimpleTheme.dimens.margin.extraLarge + top = SimpleTheme.dimens.padding.extraLarge ) ) { TextField( modifier = Modifier.padding( - bottom = SimpleTheme.dimens.margin.large + bottom = SimpleTheme.dimens.padding.large ), value = value, onValueChange = { diff --git a/app/src/main/kotlin/com/simplemobiletools/flashlight/screens/MainScreen.kt b/app/src/main/kotlin/com/simplemobiletools/flashlight/screens/MainScreen.kt index cf8e692..9210bc0 100644 --- a/app/src/main/kotlin/com/simplemobiletools/flashlight/screens/MainScreen.kt +++ b/app/src/main/kotlin/com/simplemobiletools/flashlight/screens/MainScreen.kt @@ -100,7 +100,7 @@ internal fun FlashlightButton( Icon( modifier = Modifier .size(AppDimensions.mainButtonSize) - .padding(vertical = SimpleTheme.dimens.margin.large) + .padding(vertical = SimpleTheme.dimens.padding.large) .clickable( indication = null, interactionSource = rememberMutableInteractionSource(), @@ -131,7 +131,7 @@ internal fun SosButton( ) { Text( modifier = Modifier - .padding(vertical = SimpleTheme.dimens.margin.large) + .padding(vertical = SimpleTheme.dimens.padding.large) .clickable( indication = null, interactionSource = rememberMutableInteractionSource(), @@ -169,7 +169,7 @@ internal fun MainScreenSlidersSection( val dimens = SimpleTheme.dimens val sliderModifier = remember { Modifier - .padding(horizontal = dimens.margin.extraLarge) + .padding(horizontal = dimens.padding.extraLarge) .padding(top = 24.dp, bottom = 40.dp) .size(width = AppDimensions.seekbarWidth, height = AppDimensions.seekbarHeight) } @@ -207,7 +207,7 @@ private fun SmallButton( Icon( modifier = Modifier .size(AppDimensions.smallerButtonSize) - .padding(vertical = SimpleTheme.dimens.margin.large) + .padding(vertical = SimpleTheme.dimens.padding.large) .clickable( indication = null, interactionSource = rememberMutableInteractionSource(), diff --git a/app/src/main/kotlin/com/simplemobiletools/flashlight/screens/WidgetConfigureScreen.kt b/app/src/main/kotlin/com/simplemobiletools/flashlight/screens/WidgetConfigureScreen.kt index c40ac5b..69eff45 100644 --- a/app/src/main/kotlin/com/simplemobiletools/flashlight/screens/WidgetConfigureScreen.kt +++ b/app/src/main/kotlin/com/simplemobiletools/flashlight/screens/WidgetConfigureScreen.kt @@ -42,8 +42,8 @@ internal fun WidgetConfigureScreen( ) { Box( modifier = Modifier - .padding(SimpleTheme.dimens.margin.extraLarge) - .padding(bottom = SimpleTheme.dimens.margin.extraLarge) + .padding(SimpleTheme.dimens.padding.extraLarge) + .padding(bottom = SimpleTheme.dimens.padding.extraLarge) .fillMaxWidth() .weight(1f) ) { @@ -61,7 +61,7 @@ internal fun WidgetConfigureScreen( Icon( modifier = Modifier .size(AppDimensions.widgetColorPickerSize) - .padding(SimpleTheme.dimens.margin.extraSmall) + .padding(SimpleTheme.dimens.padding.extraSmall) .clip(CircleShape) .clickable { onColorPressed() }, painter = BrushPainter(SolidColor(Color(widgetColor))), @@ -73,12 +73,12 @@ internal fun WidgetConfigureScreen( value = widgetAlpha, onValueChange = onSliderChanged, modifier = Modifier - .padding(start = SimpleTheme.dimens.margin.medium) + .padding(start = SimpleTheme.dimens.padding.medium) .background( color = colorResource(id = com.simplemobiletools.commons.R.color.md_grey_white), shape = SimpleTheme.shapes.extraLarge ) - .padding(horizontal = SimpleTheme.dimens.margin.extraLarge) + .padding(horizontal = SimpleTheme.dimens.padding.extraLarge) ) } diff --git a/app/src/main/kotlin/com/simplemobiletools/flashlight/views/SleepTimer.kt b/app/src/main/kotlin/com/simplemobiletools/flashlight/views/SleepTimer.kt index d4d3c4a..af4c6c9 100644 --- a/app/src/main/kotlin/com/simplemobiletools/flashlight/views/SleepTimer.kt +++ b/app/src/main/kotlin/com/simplemobiletools/flashlight/views/SleepTimer.kt @@ -38,7 +38,7 @@ internal fun SleepTimer( Text( modifier = Modifier .align(Alignment.CenterVertically) - .padding(horizontal = SimpleTheme.dimens.margin.large), + .padding(horizontal = SimpleTheme.dimens.padding.large), text = stringResource(id = com.simplemobiletools.commons.R.string.sleep_timer), color = SimpleTheme.colorScheme.onSurface ) @@ -50,7 +50,7 @@ internal fun SleepTimer( IconButton( modifier = Modifier .align(Alignment.CenterVertically) - .padding(SimpleTheme.dimens.margin.medium), + .padding(SimpleTheme.dimens.padding.medium), onClick = onCloseClick ) { Icon( diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 5d967c7..6d27fbe 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -6,7 +6,7 @@ androidx-customView = "1.2.0-alpha02" androidx-customViewPooling = "1.0.0" androidx-lifecycle = "2.7.0-alpha02" #Simple tools -simple-commons = "9e60e24790" +simple-commons = "b9e1a256d4" #Compose composeActivity = "1.8.0" compose = "1.6.0-alpha07"