diff --git a/app/src/main/java/xyz/leomurca/csgomatches/ui/theme/Color.kt b/app/src/main/java/xyz/leomurca/csgomatches/ui/theme/Color.kt index 881c204..858c574 100644 --- a/app/src/main/java/xyz/leomurca/csgomatches/ui/theme/Color.kt +++ b/app/src/main/java/xyz/leomurca/csgomatches/ui/theme/Color.kt @@ -2,10 +2,6 @@ package xyz.leomurca.csgomatches.ui.theme import androidx.compose.ui.graphics.Color -val Purple80 = Color(0xFFD0BCFF) -val PurpleGrey80 = Color(0xFFCCC2DC) -val Pink80 = Color(0xFFEFB8C8) - -val Purple40 = Color(0xFF6650a4) -val PurpleGrey40 = Color(0xFF625b71) -val Pink40 = Color(0xFF7D5260) \ No newline at end of file +val White = Color(0xFFFFFFFF) +val DeepSpaceBlue = Color(0xFF161621) +val StormySlate = Color(0xFF272639) \ No newline at end of file diff --git a/app/src/main/java/xyz/leomurca/csgomatches/ui/theme/Theme.kt b/app/src/main/java/xyz/leomurca/csgomatches/ui/theme/Theme.kt index 8d7187c..8c4e65f 100644 --- a/app/src/main/java/xyz/leomurca/csgomatches/ui/theme/Theme.kt +++ b/app/src/main/java/xyz/leomurca/csgomatches/ui/theme/Theme.kt @@ -1,57 +1,19 @@ package xyz.leomurca.csgomatches.ui.theme -import android.app.Activity -import android.os.Build -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 -import androidx.compose.ui.platform.LocalContext -private val DarkColorScheme = darkColorScheme( - primary = Purple80, - secondary = PurpleGrey80, - tertiary = Pink80 -) - -private val LightColorScheme = lightColorScheme( - primary = Purple40, - secondary = PurpleGrey40, - tertiary = Pink40 - - /* Other default colors to override - background = Color(0xFFFFFBFE), - surface = Color(0xFFFFFBFE), - onPrimary = Color.White, - onSecondary = Color.White, - onTertiary = Color.White, - onBackground = Color(0xFF1C1B1F), - onSurface = Color(0xFF1C1B1F), - */ +private val AppColorScheme = lightColorScheme( + background = DeepSpaceBlue, + primary = White, + secondary = StormySlate, ) @Composable -fun CSGOMatchesTheme( - darkTheme: Boolean = isSystemInDarkTheme(), - // Dynamic color is available on Android 12+ - dynamicColor: Boolean = true, - 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) - } - - darkTheme -> DarkColorScheme - else -> LightColorScheme - } - +fun CSGOMatchesTheme(content: @Composable () -> Unit) { MaterialTheme( - colorScheme = colorScheme, + colorScheme = AppColorScheme, typography = Typography, content = content ) diff --git a/app/src/main/java/xyz/leomurca/csgomatches/ui/theme/Type.kt b/app/src/main/java/xyz/leomurca/csgomatches/ui/theme/Type.kt index d67ac6e..c3c9edb 100644 --- a/app/src/main/java/xyz/leomurca/csgomatches/ui/theme/Type.kt +++ b/app/src/main/java/xyz/leomurca/csgomatches/ui/theme/Type.kt @@ -6,7 +6,6 @@ import androidx.compose.ui.text.font.FontFamily import androidx.compose.ui.text.font.FontWeight import androidx.compose.ui.unit.sp -// Set of Material typography styles to start with val Typography = Typography( bodyLarge = TextStyle( fontFamily = FontFamily.Default, @@ -15,20 +14,4 @@ val Typography = Typography( lineHeight = 24.sp, letterSpacing = 0.5.sp ) - /* Other default text styles to override - titleLarge = TextStyle( - fontFamily = FontFamily.Default, - fontWeight = FontWeight.Normal, - fontSize = 22.sp, - lineHeight = 28.sp, - letterSpacing = 0.sp - ), - labelSmall = TextStyle( - fontFamily = FontFamily.Default, - fontWeight = FontWeight.Medium, - fontSize = 11.sp, - lineHeight = 16.sp, - letterSpacing = 0.5.sp - ) - */ ) \ No newline at end of file