diff --git a/app/src/main/java/com/bnyro/recorder/ui/theme/Theme.kt b/app/src/main/java/com/bnyro/recorder/ui/theme/Theme.kt index 7f6d7e07..a67899e5 100644 --- a/app/src/main/java/com/bnyro/recorder/ui/theme/Theme.kt +++ b/app/src/main/java/com/bnyro/recorder/ui/theme/Theme.kt @@ -19,13 +19,13 @@ import androidx.core.view.WindowCompat private val DarkColorScheme = darkColorScheme( primary = Purple80, secondary = PurpleGrey80, - tertiary = Pink80 + tertiary = Pink80, ) private val LightColorScheme = lightColorScheme( primary = Purple40, secondary = PurpleGrey40, - tertiary = Pink40 + tertiary = Pink40, /* Other default colors to override background = Color(0xFFFFFBFE), @@ -41,7 +41,7 @@ private val LightColorScheme = lightColorScheme( private val AmoledDarkColorScheme = darkColorScheme( primary = Color(0xFFEE665B), background = Color(0xFF000000), - onPrimary = Color(0xFFFFFFFF) + onPrimary = Color(0xFFFFFFFF), ) @Composable @@ -49,15 +49,21 @@ fun RecordYouTheme( darkTheme: Boolean = isSystemInDarkTheme(), // Dynamic color is available on Android 12+ dynamicColor: Boolean = true, - amoledDark:Boolean = false, - content: @Composable () -> Unit + amoledDark: Boolean = false, + content: @Composable () -> Unit, ) { val colorScheme = when { + amoledDark && Build.VERSION.SDK_INT >= Build.VERSION_CODES.S -> { + val context = LocalContext.current + dynamicDarkColorScheme(context).copy(background = Color.Black) + } + amoledDark -> AmoledDarkColorScheme dynamicColor && Build.VERSION.SDK_INT >= Build.VERSION_CODES.S -> { val context = LocalContext.current if (darkTheme) dynamicDarkColorScheme(context) else dynamicLightColorScheme(context) } + darkTheme -> DarkColorScheme else -> LightColorScheme } @@ -70,11 +76,11 @@ fun RecordYouTheme( activity.window.statusBarColor = colorScheme.background.toArgb() WindowCompat.getInsetsController( activity.window, - view + view, ).isAppearanceLightStatusBars = !darkTheme WindowCompat.getInsetsController( activity.window, - view + view, ).isAppearanceLightNavigationBars = !darkTheme } } @@ -83,6 +89,6 @@ fun RecordYouTheme( MaterialTheme( colorScheme = colorScheme, typography = Typography, - content = content + content = content, ) }