From 3ebea884135f12d116974717a6c00107b6ba24b5 Mon Sep 17 00:00:00 2001 From: MM20 <15646950+MM2-0@users.noreply.github.com> Date: Tue, 2 Aug 2022 17:48:41 +0200 Subject: [PATCH] Limit maximum corner radius for large and extra large shapes --- ui/src/main/java/de/mm20/launcher2/ui/theme/LauncherTheme.kt | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/ui/src/main/java/de/mm20/launcher2/ui/theme/LauncherTheme.kt b/ui/src/main/java/de/mm20/launcher2/ui/theme/LauncherTheme.kt index 1a250162..49a33acc 100644 --- a/ui/src/main/java/de/mm20/launcher2/ui/theme/LauncherTheme.kt +++ b/ui/src/main/java/de/mm20/launcher2/ui/theme/LauncherTheme.kt @@ -9,6 +9,7 @@ import androidx.compose.foundation.shape.RoundedCornerShape import androidx.compose.material3.* import androidx.compose.runtime.* import androidx.compose.ui.platform.LocalContext +import androidx.compose.ui.unit.coerceAtMost import androidx.compose.ui.unit.dp import de.mm20.launcher2.preferences.LauncherDataStore import de.mm20.launcher2.preferences.Settings @@ -78,8 +79,8 @@ fun LauncherTheme( extraSmall = baseShape.copy(CornerSize(cornerRadius / 3f)), small = baseShape.copy(CornerSize(cornerRadius / 3f * 2f)), medium = baseShape.copy(CornerSize(cornerRadius)), - large = baseShape.copy(CornerSize(cornerRadius / 3f * 4f)), - extraLarge = baseShape.copy(CornerSize(cornerRadius / 3f * 7f)), + large = baseShape.copy(CornerSize((cornerRadius / 3f * 4f).coerceAtMost(16.dp))), + extraLarge = baseShape.copy(CornerSize((cornerRadius / 3f * 7f).coerceAtMost(28.dp))), ), content = content )