From b60a751cf383d04c379aef0316615ff36444d434 Mon Sep 17 00:00:00 2001 From: MM20 <15646950+MM2-0@users.noreply.github.com> Date: Fri, 10 Jun 2022 20:14:01 +0200 Subject: [PATCH] Use shapes from theme everywhere --- .../mm20/launcher2/ui/common/WeatherLocationSearchDialog.kt | 2 +- .../java/de/mm20/launcher2/ui/component/BottomSheetDialog.kt | 2 +- ui/src/main/java/de/mm20/launcher2/ui/component/Chip.kt | 2 +- ui/src/main/java/de/mm20/launcher2/ui/component/InnerCard.kt | 2 +- .../mm20/launcher2/ui/component/preferences/ListPreference.kt | 2 +- .../java/de/mm20/launcher2/ui/launcher/search/SearchBar.kt | 2 +- .../ui/launcher/search/unitconverter/UnitConverterItem.kt | 2 +- .../de/mm20/launcher2/ui/launcher/widgets/WidgetColumn.kt | 2 +- .../launcher2/ui/launcher/widgets/weather/WeatherWidget.kt | 3 ++- .../ui/settings/appearance/AppearanceSettingsScreen.kt | 4 ++-- .../settings/calendarwidget/CalendarWidgetSettingsScreen.kt | 2 +- .../launcher2/ui/settings/crashreporter/CrashReportScreen.kt | 2 +- 12 files changed, 14 insertions(+), 13 deletions(-) diff --git a/ui/src/main/java/de/mm20/launcher2/ui/common/WeatherLocationSearchDialog.kt b/ui/src/main/java/de/mm20/launcher2/ui/common/WeatherLocationSearchDialog.kt index 1a43e4c5..01690327 100644 --- a/ui/src/main/java/de/mm20/launcher2/ui/common/WeatherLocationSearchDialog.kt +++ b/ui/src/main/java/de/mm20/launcher2/ui/common/WeatherLocationSearchDialog.kt @@ -37,7 +37,7 @@ fun WeatherLocationSearchDialog( Surface( tonalElevation = 16.dp, shadowElevation = 16.dp, - shape = RoundedCornerShape(16.dp), + shape = MaterialTheme.shapes.extraLarge, modifier = Modifier .fillMaxSize() .padding(vertical = 16.dp), diff --git a/ui/src/main/java/de/mm20/launcher2/ui/component/BottomSheetDialog.kt b/ui/src/main/java/de/mm20/launcher2/ui/component/BottomSheetDialog.kt index 3b20b838..f432851f 100644 --- a/ui/src/main/java/de/mm20/launcher2/ui/component/BottomSheetDialog.kt +++ b/ui/src/main/java/de/mm20/launcher2/ui/component/BottomSheetDialog.kt @@ -158,7 +158,7 @@ fun BottomSheetDialog( .offset { IntOffset(0, swipeState.offset.value.roundToInt()) } .fillMaxWidth() .weight(1f, false), - shape = MaterialTheme.shapes.large.copy( + shape = MaterialTheme.shapes.extraLarge.copy( bottomStart = CornerSize(0), bottomEnd = CornerSize(0), ), diff --git a/ui/src/main/java/de/mm20/launcher2/ui/component/Chip.kt b/ui/src/main/java/de/mm20/launcher2/ui/component/Chip.kt index 95b90af1..5af037d5 100644 --- a/ui/src/main/java/de/mm20/launcher2/ui/component/Chip.kt +++ b/ui/src/main/java/de/mm20/launcher2/ui/component/Chip.kt @@ -24,7 +24,7 @@ fun Chip( content: @Composable RowScope.() -> Unit ) { Surface( - shape = RoundedCornerShape(8.dp), + shape = MaterialTheme.shapes.small, modifier = modifier, color = Color.Transparent, border = BorderStroke(1.dp, MaterialTheme.colorScheme.outline.copy(alpha = 0.17f)), diff --git a/ui/src/main/java/de/mm20/launcher2/ui/component/InnerCard.kt b/ui/src/main/java/de/mm20/launcher2/ui/component/InnerCard.kt index 9542aa66..53acad7b 100644 --- a/ui/src/main/java/de/mm20/launcher2/ui/component/InnerCard.kt +++ b/ui/src/main/java/de/mm20/launcher2/ui/component/InnerCard.kt @@ -55,7 +55,7 @@ fun InnerCard( if (it) 1f else 0f } - val shape = RoundedCornerShape(LocalCardStyle.current.radius.dp) + val shape = MaterialTheme.shapes.small val bgColor = MaterialTheme.colorScheme.surfaceColorAtElevation(absoluteTonalElevation + elevation) diff --git a/ui/src/main/java/de/mm20/launcher2/ui/component/preferences/ListPreference.kt b/ui/src/main/java/de/mm20/launcher2/ui/component/preferences/ListPreference.kt index 724cfdc7..9d7ccdf2 100644 --- a/ui/src/main/java/de/mm20/launcher2/ui/component/preferences/ListPreference.kt +++ b/ui/src/main/java/de/mm20/launcher2/ui/component/preferences/ListPreference.kt @@ -42,7 +42,7 @@ fun ListPreference( Surface( tonalElevation = 16.dp, shadowElevation = 16.dp, - shape = RoundedCornerShape(16.dp), + shape = MaterialTheme.shapes.extraLarge, modifier = Modifier .fillMaxWidth() .padding(vertical = 16.dp), diff --git a/ui/src/main/java/de/mm20/launcher2/ui/launcher/search/SearchBar.kt b/ui/src/main/java/de/mm20/launcher2/ui/launcher/search/SearchBar.kt index 37841cbf..425addb3 100644 --- a/ui/src/main/java/de/mm20/launcher2/ui/launcher/search/SearchBar.kt +++ b/ui/src/main/java/de/mm20/launcher2/ui/launcher/search/SearchBar.kt @@ -306,7 +306,7 @@ fun SearchBar( ) { items(websearches) { Surface( - shape = RoundedCornerShape(4.dp), + shape = MaterialTheme.shapes.extraSmall, modifier = Modifier.padding(horizontal = 8.dp) ) { Row( diff --git a/ui/src/main/java/de/mm20/launcher2/ui/launcher/search/unitconverter/UnitConverterItem.kt b/ui/src/main/java/de/mm20/launcher2/ui/launcher/search/unitconverter/UnitConverterItem.kt index 42a92298..ea564b80 100644 --- a/ui/src/main/java/de/mm20/launcher2/ui/launcher/search/unitconverter/UnitConverterItem.kt +++ b/ui/src/main/java/de/mm20/launcher2/ui/launcher/search/unitconverter/UnitConverterItem.kt @@ -48,7 +48,7 @@ fun UnitConverterItem( .padding(12.dp) .size(48.dp), color = MaterialTheme.colorScheme.primaryContainer, - shape = RoundedCornerShape(8.dp) + shape = MaterialTheme.shapes.small ) { Box( contentAlignment = Alignment.Center diff --git a/ui/src/main/java/de/mm20/launcher2/ui/launcher/widgets/WidgetColumn.kt b/ui/src/main/java/de/mm20/launcher2/ui/launcher/widgets/WidgetColumn.kt index 6738cd43..77f5cfde 100644 --- a/ui/src/main/java/de/mm20/launcher2/ui/launcher/widgets/WidgetColumn.kt +++ b/ui/src/main/java/de/mm20/launcher2/ui/launcher/widgets/WidgetColumn.kt @@ -214,7 +214,7 @@ fun WidgetColumn( Surface( tonalElevation = 16.dp, shadowElevation = 16.dp, - shape = RoundedCornerShape(16.dp), + shape = MaterialTheme.shapes.extraLarge, modifier = Modifier .fillMaxWidth() .padding(top = 16.dp), diff --git a/ui/src/main/java/de/mm20/launcher2/ui/launcher/widgets/weather/WeatherWidget.kt b/ui/src/main/java/de/mm20/launcher2/ui/launcher/widgets/weather/WeatherWidget.kt index b498a9bb..d8947265 100644 --- a/ui/src/main/java/de/mm20/launcher2/ui/launcher/widgets/weather/WeatherWidget.kt +++ b/ui/src/main/java/de/mm20/launcher2/ui/launcher/widgets/weather/WeatherWidget.kt @@ -9,6 +9,7 @@ import androidx.compose.animation.AnimatedVisibility import androidx.compose.animation.ExperimentalAnimationApi import androidx.compose.foundation.clickable import androidx.compose.foundation.layout.* +import androidx.compose.foundation.shape.CornerSize import androidx.compose.foundation.shape.RoundedCornerShape import androidx.compose.material.icons.Icons import androidx.compose.material.icons.rounded.ArrowDropDown @@ -209,7 +210,7 @@ fun CurrentWeather(forecast: Forecast, imperialUnits: Boolean) { ) Spacer(modifier = Modifier.weight(1f)) Surface( - shape = RoundedCornerShape(topStartPercent = 50, bottomStartPercent = 50), + shape = MaterialTheme.shapes.extraSmall.copy(bottomEnd = CornerSize(0), topEnd = CornerSize(0)), color = MaterialTheme.colorScheme.onSurface.copy(alpha = 0.12f), modifier = Modifier.align(Alignment.End) diff --git a/ui/src/main/java/de/mm20/launcher2/ui/settings/appearance/AppearanceSettingsScreen.kt b/ui/src/main/java/de/mm20/launcher2/ui/settings/appearance/AppearanceSettingsScreen.kt index 5db57233..cbd6dbe4 100644 --- a/ui/src/main/java/de/mm20/launcher2/ui/settings/appearance/AppearanceSettingsScreen.kt +++ b/ui/src/main/java/de/mm20/launcher2/ui/settings/appearance/AppearanceSettingsScreen.kt @@ -341,7 +341,7 @@ fun IconShapePreference( Surface( tonalElevation = 16.dp, shadowElevation = 16.dp, - shape = RoundedCornerShape(16.dp), + shape = MaterialTheme.shapes.extraLarge, modifier = Modifier .fillMaxWidth() .padding(vertical = 16.dp), @@ -420,7 +420,7 @@ fun LegacyIconBackgroundPreference( Surface( tonalElevation = 16.dp, shadowElevation = 16.dp, - shape = RoundedCornerShape(16.dp), + shape = MaterialTheme.shapes.extraLarge, modifier = Modifier .fillMaxWidth() .padding(vertical = 16.dp), diff --git a/ui/src/main/java/de/mm20/launcher2/ui/settings/calendarwidget/CalendarWidgetSettingsScreen.kt b/ui/src/main/java/de/mm20/launcher2/ui/settings/calendarwidget/CalendarWidgetSettingsScreen.kt index 87808fe9..d2e18cbd 100644 --- a/ui/src/main/java/de/mm20/launcher2/ui/settings/calendarwidget/CalendarWidgetSettingsScreen.kt +++ b/ui/src/main/java/de/mm20/launcher2/ui/settings/calendarwidget/CalendarWidgetSettingsScreen.kt @@ -94,7 +94,7 @@ fun ExcludedCalendarsPreference( modifier = Modifier .fillMaxWidth() .heightIn(max = 400.dp), - shape = RoundedCornerShape(16.dp), + shape = MaterialTheme.shapes.extraLarge, tonalElevation = 16.dp, shadowElevation = 16.dp, ) { diff --git a/ui/src/main/java/de/mm20/launcher2/ui/settings/crashreporter/CrashReportScreen.kt b/ui/src/main/java/de/mm20/launcher2/ui/settings/crashreporter/CrashReportScreen.kt index f3d28597..7fcfd77a 100644 --- a/ui/src/main/java/de/mm20/launcher2/ui/settings/crashreporter/CrashReportScreen.kt +++ b/ui/src/main/java/de/mm20/launcher2/ui/settings/crashreporter/CrashReportScreen.kt @@ -54,7 +54,7 @@ fun CrashReportScreen(fileName: String) { } else { MaterialTheme.colorScheme.primaryContainer }, - shape = RoundedCornerShape(8.dp) + shape = MaterialTheme.shapes.small, ) { Box( modifier = Modifier