diff --git a/Jetcaster/mobile/src/main/java/com/example/jetcaster/ui/theme/Theme.kt b/Jetcaster/mobile/src/main/java/com/example/jetcaster/ui/theme/Theme.kt index 38e15668c..0bfe64fe6 100644 --- a/Jetcaster/mobile/src/main/java/com/example/jetcaster/ui/theme/Theme.kt +++ b/Jetcaster/mobile/src/main/java/com/example/jetcaster/ui/theme/Theme.kt @@ -17,17 +17,13 @@ package com.example.jetcaster.ui.theme import android.os.Build -import androidx.compose.foundation.isSystemInDarkTheme import androidx.compose.material3.ExperimentalMaterial3ExpressiveApi import androidx.compose.material3.MaterialExpressiveTheme import androidx.compose.material3.MotionScheme 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 -import androidx.compose.runtime.Immutable -import androidx.compose.ui.graphics.Color import androidx.compose.ui.platform.LocalContext import com.example.jetcaster.designsystem.theme.JetcasterShapes import com.example.jetcaster.designsystem.theme.JetcasterTypography @@ -470,29 +466,15 @@ private val highContrastDarkColorScheme = darkColorScheme( surfaceContainerHighest = surfaceContainerHighestDarkHighContrast, ) -@Immutable -data class ColorFamily(val color: Color, val onColor: Color, val colorContainer: Color, val onColorContainer: Color) - -val unspecified_scheme = ColorFamily( - Color.Unspecified, Color.Unspecified, Color.Unspecified, Color.Unspecified, -) - @OptIn(ExperimentalMaterial3ExpressiveApi::class) @Composable -fun JetcasterTheme( - darkTheme: Boolean = isSystemInDarkTheme(), - // Dynamic color is available on Android 12+ - dynamicColor: Boolean = false, - content: @Composable () -> Unit, -) { +fun JetcasterTheme(dynamicColor: Boolean = false, content: @Composable () -> Unit) { val colorScheme = when { dynamicColor && Build.VERSION.SDK_INT >= Build.VERSION_CODES.S -> { val context = LocalContext.current - if (darkTheme) dynamicDarkColorScheme(context) else dynamicLightColorScheme(context) + dynamicDarkColorScheme(context) } - - darkTheme -> darkScheme - else -> lightScheme + else -> darkScheme } MaterialExpressiveTheme(