app: add dynamic colors support to Compose
This commit is contained in:
parent
3fc5f17920
commit
2a9d2177a5
1 changed files with 12 additions and 5 deletions
|
@ -1,8 +1,11 @@
|
|||
package dev.msfjarvis.aps.ui.theme
|
||||
|
||||
import android.content.Context
|
||||
import androidx.compose.foundation.isSystemInDarkTheme
|
||||
import androidx.compose.material3.MaterialTheme
|
||||
import androidx.compose.material3.darkColorScheme
|
||||
import androidx.compose.material3.dynamicDarkColorScheme
|
||||
import androidx.compose.material3.dynamicLightColorScheme
|
||||
import androidx.compose.material3.lightColorScheme
|
||||
import androidx.compose.runtime.Composable
|
||||
|
||||
|
@ -64,12 +67,16 @@ private val DarkThemeColors =
|
|||
)
|
||||
|
||||
@Composable
|
||||
fun APSTheme(useDarkTheme: Boolean = isSystemInDarkTheme(), content: @Composable () -> Unit) {
|
||||
fun APSTheme(
|
||||
useDynamicColors: Boolean = true,
|
||||
useDarkTheme: Boolean = isSystemInDarkTheme(),
|
||||
context: Context,
|
||||
content: @Composable () -> Unit,
|
||||
) {
|
||||
val colors =
|
||||
if (!useDarkTheme) {
|
||||
LightThemeColors
|
||||
} else {
|
||||
DarkThemeColors
|
||||
when (useDarkTheme) {
|
||||
true -> if (useDynamicColors) dynamicDarkColorScheme(context) else DarkThemeColors
|
||||
false -> if (useDynamicColors) dynamicLightColorScheme(context) else LightThemeColors
|
||||
}
|
||||
|
||||
MaterialTheme(colorScheme = colors, typography = AppTypography, content = content)
|
||||
|
|
Loading…
Reference in a new issue