From da1f9dbfda14a3f1ac768d47d64a097739fa2430 Mon Sep 17 00:00:00 2001 From: Angelk90 Date: Sat, 2 Dec 2023 16:09:37 +0100 Subject: [PATCH] Change theme --- .../waseefakhtar/doseapp/ui/theme/Color.kt | 65 ++++++++++++++++ .../waseefakhtar/doseapp/ui/theme/Theme.kt | 76 ++++++++++++++----- 2 files changed, 124 insertions(+), 17 deletions(-) diff --git a/app/src/main/java/com/waseefakhtar/doseapp/ui/theme/Color.kt b/app/src/main/java/com/waseefakhtar/doseapp/ui/theme/Color.kt index c2585b5..c9110ef 100644 --- a/app/src/main/java/com/waseefakhtar/doseapp/ui/theme/Color.kt +++ b/app/src/main/java/com/waseefakhtar/doseapp/ui/theme/Color.kt @@ -9,3 +9,68 @@ val Pink80 = Color(0xFFEFB8C8) val Purple40 = Color(0xFF6650a4) val PurpleGrey40 = Color(0xFF625b71) val Pink40 = Color(0xFF7D5260) + +val md_theme_light_primary = Color(0xFF00639A) +val md_theme_light_onPrimary = Color(0xFFFFFFFF) +val md_theme_light_primaryContainer = Color(0xFFCDE5FF) +val md_theme_light_onPrimaryContainer = Color(0xFF001D32) +val md_theme_light_secondary = Color(0xFF51606F) +val md_theme_light_onSecondary = Color(0xFFFFFFFF) +val md_theme_light_secondaryContainer = Color(0xFFD5E4F6) +val md_theme_light_onSecondaryContainer = Color(0xFF0E1D2A) +val md_theme_light_tertiary = Color(0xFF275EA7) +val md_theme_light_onTertiary = Color(0xFFFFFFFF) +val md_theme_light_tertiaryContainer = Color(0xFFD6E3FF) +val md_theme_light_onTertiaryContainer = Color(0xFF001B3D) +val md_theme_light_error = Color(0xFFBA1A1A) +val md_theme_light_errorContainer = Color(0xFFFFDAD6) +val md_theme_light_onError = Color(0xFFFFFFFF) +val md_theme_light_onErrorContainer = Color(0xFF410002) +val md_theme_light_background = Color(0xFFFCFCFF) +val md_theme_light_onBackground = Color(0xFF1A1C1E) +val md_theme_light_surface = Color(0xFFFCFCFF) +val md_theme_light_onSurface = Color(0xFF1A1C1E) +val md_theme_light_surfaceVariant = Color(0xFFDEE3EB) +val md_theme_light_onSurfaceVariant = Color(0xFF42474E) +val md_theme_light_outline = Color(0xFF72777F) +val md_theme_light_inverseOnSurface = Color(0xFFF0F0F4) +val md_theme_light_inverseSurface = Color(0xFF2F3033) +val md_theme_light_inversePrimary = Color(0xFF95CCFF) +val md_theme_light_shadow = Color(0xFF000000) +val md_theme_light_surfaceTint = Color(0xFF00639A) +val md_theme_light_outlineVariant = Color(0xFFC2C7CF) +val md_theme_light_scrim = Color(0xFF000000) + +val md_theme_dark_primary = Color(0xFF95CCFF) +val md_theme_dark_onPrimary = Color(0xFF003352) +val md_theme_dark_primaryContainer = Color(0xFF004A75) +val md_theme_dark_onPrimaryContainer = Color(0xFFCDE5FF) +val md_theme_dark_secondary = Color(0xFFB9C8DA) +val md_theme_dark_onSecondary = Color(0xFF233240) +val md_theme_dark_secondaryContainer = Color(0xFF3A4857) +val md_theme_dark_onSecondaryContainer = Color(0xFFD5E4F6) +val md_theme_dark_tertiary = Color(0xFFA9C8FF) +val md_theme_dark_onTertiary = Color(0xFF003062) +val md_theme_dark_tertiaryContainer = Color(0xFF00468B) +val md_theme_dark_onTertiaryContainer = Color(0xFFD6E3FF) +val md_theme_dark_error = Color(0xFFFFB4AB) +val md_theme_dark_errorContainer = Color(0xFF93000A) +val md_theme_dark_onError = Color(0xFF690005) +val md_theme_dark_onErrorContainer = Color(0xFFFFDAD6) +val md_theme_dark_background = Color(0xFF1A1C1E) +val md_theme_dark_onBackground = Color(0xFFE2E2E5) +val md_theme_dark_surface = Color(0xFF1A1C1E) +val md_theme_dark_onSurface = Color(0xFFE2E2E5) +val md_theme_dark_surfaceVariant = Color(0xFF42474E) +val md_theme_dark_onSurfaceVariant = Color(0xFFC2C7CF) +val md_theme_dark_outline = Color(0xFF8C9198) +val md_theme_dark_inverseOnSurface = Color(0xFF1A1C1E) +val md_theme_dark_inverseSurface = Color(0xFFE2E2E5) +val md_theme_dark_inversePrimary = Color(0xFF00639A) +val md_theme_dark_shadow = Color(0xFF000000) +val md_theme_dark_surfaceTint = Color(0xFF95CCFF) +val md_theme_dark_outlineVariant = Color(0xFF42474E) +val md_theme_dark_scrim = Color(0xFF000000) + + +val seed = Color(0xFF336791) diff --git a/app/src/main/java/com/waseefakhtar/doseapp/ui/theme/Theme.kt b/app/src/main/java/com/waseefakhtar/doseapp/ui/theme/Theme.kt index 25d5dc2..f123776 100644 --- a/app/src/main/java/com/waseefakhtar/doseapp/ui/theme/Theme.kt +++ b/app/src/main/java/com/waseefakhtar/doseapp/ui/theme/Theme.kt @@ -16,25 +16,67 @@ import androidx.compose.ui.platform.LocalView import androidx.core.view.ViewCompat private val DarkColorScheme = darkColorScheme( - primary = Purple80, - secondary = PurpleGrey80, - tertiary = Pink80 + primary = md_theme_dark_primary, + onPrimary = md_theme_dark_onPrimary, + primaryContainer = md_theme_dark_primaryContainer, + onPrimaryContainer = md_theme_dark_onPrimaryContainer, + secondary = md_theme_dark_secondary, + onSecondary = md_theme_dark_onSecondary, + secondaryContainer = md_theme_dark_secondaryContainer, + onSecondaryContainer = md_theme_dark_onSecondaryContainer, + tertiary = md_theme_dark_tertiary, + onTertiary = md_theme_dark_onTertiary, + tertiaryContainer = md_theme_dark_tertiaryContainer, + onTertiaryContainer = md_theme_dark_onTertiaryContainer, + error = md_theme_dark_error, + errorContainer = md_theme_dark_errorContainer, + onError = md_theme_dark_onError, + onErrorContainer = md_theme_dark_onErrorContainer, + background = md_theme_dark_background, + onBackground = md_theme_dark_onBackground, + surface = md_theme_dark_surface, + onSurface = md_theme_dark_onSurface, + surfaceVariant = md_theme_dark_surfaceVariant, + onSurfaceVariant = md_theme_dark_onSurfaceVariant, + outline = md_theme_dark_outline, + inverseOnSurface = md_theme_dark_inverseOnSurface, + inverseSurface = md_theme_dark_inverseSurface, + inversePrimary = md_theme_dark_inversePrimary, + surfaceTint = md_theme_dark_surfaceTint, + outlineVariant = md_theme_dark_outlineVariant, + scrim = md_theme_dark_scrim, ) 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 = md_theme_light_primary, + onPrimary = md_theme_light_onPrimary, + primaryContainer = md_theme_light_primaryContainer, + onPrimaryContainer = md_theme_light_onPrimaryContainer, + secondary = md_theme_light_secondary, + onSecondary = md_theme_light_onSecondary, + secondaryContainer = md_theme_light_secondaryContainer, + onSecondaryContainer = md_theme_light_onSecondaryContainer, + tertiary = md_theme_light_tertiary, + onTertiary = md_theme_light_onTertiary, + tertiaryContainer = md_theme_light_tertiaryContainer, + onTertiaryContainer = md_theme_light_onTertiaryContainer, + error = md_theme_light_error, + errorContainer = md_theme_light_errorContainer, + onError = md_theme_light_onError, + onErrorContainer = md_theme_light_onErrorContainer, + background = md_theme_light_background, + onBackground = md_theme_light_onBackground, + surface = md_theme_light_surface, + onSurface = md_theme_light_onSurface, + surfaceVariant = md_theme_light_surfaceVariant, + onSurfaceVariant = md_theme_light_onSurfaceVariant, + outline = md_theme_light_outline, + inverseOnSurface = md_theme_light_inverseOnSurface, + inverseSurface = md_theme_light_inverseSurface, + inversePrimary = md_theme_light_inversePrimary, + surfaceTint = md_theme_light_surfaceTint, + outlineVariant = md_theme_light_outlineVariant, + scrim = md_theme_light_scrim, ) @Composable @@ -65,4 +107,4 @@ fun DoseAppTheme( typography = Typography, content = content ) -} +} \ No newline at end of file