From 26f58abfc769e0400e9cde12cd48faa9d43854b4 Mon Sep 17 00:00:00 2001 From: vtalos Date: Tue, 17 Dec 2024 22:01:49 +0200 Subject: [PATCH] Define theme --- .../com/example/estiaseek/ui/theme/Color.kt | 12 ++++----- .../com/example/estiaseek/ui/theme/Theme.kt | 25 ++++++------------- 2 files changed, 14 insertions(+), 23 deletions(-) diff --git a/app/src/main/java/com/example/estiaseek/ui/theme/Color.kt b/app/src/main/java/com/example/estiaseek/ui/theme/Color.kt index e61f018..4f0dcef 100644 --- a/app/src/main/java/com/example/estiaseek/ui/theme/Color.kt +++ b/app/src/main/java/com/example/estiaseek/ui/theme/Color.kt @@ -2,10 +2,10 @@ package com.example.estiaseek.ui.theme import androidx.compose.ui.graphics.Color -val Purple80 = Color(0xFFD0BCFF) -val PurpleGrey80 = Color(0xFFCCC2DC) -val Pink80 = Color(0xFFEFB8C8) +// Light Theme Colors +val estiaSeekRed = Color(0xFFF11C33) +val estiaSeekRedCompliment = Color(0xFF7C4A4D) -val Purple40 = Color(0xFF6650a4) -val PurpleGrey40 = Color(0xFF625b71) -val Pink40 = Color(0xFF7D5260) \ No newline at end of file +// Dark Theme Colors +val estiaSeekRedDark = Color(0xFF780E19) +val estiaSeekRedComplimentDark = Color(0xFF3E2526) \ No newline at end of file diff --git a/app/src/main/java/com/example/estiaseek/ui/theme/Theme.kt b/app/src/main/java/com/example/estiaseek/ui/theme/Theme.kt index af58d1c..3b07dac 100644 --- a/app/src/main/java/com/example/estiaseek/ui/theme/Theme.kt +++ b/app/src/main/java/com/example/estiaseek/ui/theme/Theme.kt @@ -16,32 +16,23 @@ import androidx.compose.ui.platform.LocalView import androidx.core.view.WindowCompat private val DarkColorScheme = darkColorScheme( - primary = Purple80, - secondary = PurpleGrey80, - tertiary = Pink80 + primary = estiaSeekRedDark, + secondary = estiaSeekRedComplimentDark, + tertiary = estiaSeekRedComplimentDark ) 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), - */ + primary = estiaSeekRed, + secondary = estiaSeekRedCompliment, + tertiary = estiaSeekRedCompliment ) @Composable fun EstiaSeekTheme( darkTheme: Boolean = isSystemInDarkTheme(), // Dynamic color is available on Android 12+ - dynamicColor: Boolean = true, + // Set to 'false' to enforce consistent custom branding colors. + dynamicColor: Boolean = false, content: @Composable () -> Unit ) { val colorScheme = when {