lun_admin/NeoLaunch_From_Kvaesitso
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Add shapes to Launcher theme based on corner radius preference

Browse Source
This commit is contained in:
MM20 2022-06-10 18:53:41 +02:00
parent 0b4bd1403b
commit 47a93cc98a
No known key found for this signature in database
GPG Key ID: 0B61A8F2DEAFA389
2 changed files with 15 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ui/src/main/java/de/mm20/launcher2/ui/component/LauncherCard.kt
View File

@ -19,7 +19,7 @@ fun LauncherCard(
) { ) {
Surface( Surface(
modifier = modifier, modifier = modifier,
shape = RoundedCornerShape(LocalCardStyle.current.radius.dp), shape = MaterialTheme.shapes.medium,
border = LocalCardStyle.current.borderWidth.takeIf { it > 0 } border = LocalCardStyle.current.borderWidth.takeIf { it > 0 }
?.let { BorderStroke(it.dp, MaterialTheme.colorScheme.surface) }, ?.let { BorderStroke(it.dp, MaterialTheme.colorScheme.surface) },
content = content, content = content,

18
ui/src/main/java/de/mm20/launcher2/ui/theme/LauncherTheme.kt
View File

@ -2,12 +2,11 @@ package de.mm20.launcher2.ui.theme
import android.os.Build import android.os.Build
import androidx.compose.foundation.isSystemInDarkTheme import androidx.compose.foundation.isSystemInDarkTheme
import androidx.compose.material3.ColorScheme import androidx.compose.foundation.shape.RoundedCornerShape
import androidx.compose.material3.MaterialTheme import androidx.compose.material3.*
import androidx.compose.material3.dynamicDarkColorScheme
import androidx.compose.material3.dynamicLightColorScheme
import androidx.compose.runtime.* import androidx.compose.runtime.*
import androidx.compose.ui.platform.LocalContext import androidx.compose.ui.platform.LocalContext
import androidx.compose.ui.unit.dp
import de.mm20.launcher2.preferences.LauncherDataStore import de.mm20.launcher2.preferences.LauncherDataStore
import de.mm20.launcher2.preferences.Settings import de.mm20.launcher2.preferences.Settings
import de.mm20.launcher2.preferences.Settings.AppearanceSettings import de.mm20.launcher2.preferences.Settings.AppearanceSettings
@ -41,6 +40,10 @@ fun LauncherTheme(
val darkTheme = val darkTheme =
themePreference == Theme.Dark || themePreference == Theme.System && isSystemInDarkTheme() themePreference == Theme.Dark || themePreference == Theme.System && isSystemInDarkTheme()
val cornerRadius by remember {
dataStore.data.map { it.cards.radius.dp }
}.collectAsState(8.dp)
val colorScheme by colorSchemeAsState(colorSchemePreference, darkTheme) val colorScheme by colorSchemeAsState(colorSchemePreference, darkTheme)
CompositionLocalProvider( CompositionLocalProvider(
@ -49,6 +52,13 @@ fun LauncherTheme(
MaterialTheme( MaterialTheme(
colorScheme = colorScheme, colorScheme = colorScheme,
typography = DefaultTypography, typography = DefaultTypography,
shapes = Shapes(
extraSmall = RoundedCornerShape(cornerRadius / 3f),
small = RoundedCornerShape(cornerRadius / 3f * 2f),
medium = RoundedCornerShape(cornerRadius),
large = RoundedCornerShape(cornerRadius / 3f * 4f),
extraLarge = RoundedCornerShape(cornerRadius / 3f * 7f),
),
content = content content = content
) )
} }