From 89f2e3ecd5126c1f6a5dfad16f58807c90246df9 Mon Sep 17 00:00:00 2001 From: Fabian Zobrist Date: Fri, 27 Jan 2023 13:11:36 +0100 Subject: [PATCH] Improve default color scheme. --- .../java/me/zobrist/tichucounter/ui/Color.kt | 72 +++++++++---------- 1 file changed, 35 insertions(+), 37 deletions(-) diff --git a/app/src/main/java/me/zobrist/tichucounter/ui/Color.kt b/app/src/main/java/me/zobrist/tichucounter/ui/Color.kt index b073fd2..ecc2897 100644 --- a/app/src/main/java/me/zobrist/tichucounter/ui/Color.kt +++ b/app/src/main/java/me/zobrist/tichucounter/ui/Color.kt @@ -1,21 +1,19 @@ -@file:Suppress("unused", "unused", "unused") - package me.zobrist.tichucounter.ui import androidx.compose.ui.graphics.Color -val md_theme_light_primary = Color(0xFFBE0034) +val md_theme_light_primary = Color(0xFF9C404D) val md_theme_light_onPrimary = Color(0xFFFFFFFF) -val md_theme_light_primaryContainer = Color(0xFFFFDADA) -val md_theme_light_onPrimaryContainer = Color(0xFF40000B) -val md_theme_light_secondary = Color(0xFF6E5D00) +val md_theme_light_primaryContainer = Color(0xFFFFDADB) +val md_theme_light_onPrimaryContainer = Color(0xFF40000F) +val md_theme_light_secondary = Color(0xFF765659) val md_theme_light_onSecondary = Color(0xFFFFFFFF) -val md_theme_light_secondaryContainer = Color(0xFFFFE261) -val md_theme_light_onSecondaryContainer = Color(0xFF221B00) -val md_theme_light_tertiary = Color(0xFF76592F) +val md_theme_light_secondaryContainer = Color(0xFFFFDADB) +val md_theme_light_onSecondaryContainer = Color(0xFF2C1517) +val md_theme_light_tertiary = Color(0xFF775930) val md_theme_light_onTertiary = Color(0xFFFFFFFF) -val md_theme_light_tertiaryContainer = Color(0xFFFFDDB1) -val md_theme_light_onTertiaryContainer = Color(0xFF291800) +val md_theme_light_tertiaryContainer = Color(0xFFFFDDB5) +val md_theme_light_onTertiaryContainer = Color(0xFF2A1800) val md_theme_light_error = Color(0xFFBA1A1A) val md_theme_light_errorContainer = Color(0xFFFFDAD6) val md_theme_light_onError = Color(0xFFFFFFFF) @@ -24,29 +22,29 @@ val md_theme_light_background = Color(0xFFFFFBFF) val md_theme_light_onBackground = Color(0xFF201A1A) val md_theme_light_surface = Color(0xFFFFFBFF) val md_theme_light_onSurface = Color(0xFF201A1A) -val md_theme_light_surfaceVariant = Color(0xFFF4DDDD) -val md_theme_light_onSurfaceVariant = Color(0xFF524343) -val md_theme_light_outline = Color(0xFF857373) -val md_theme_light_inverseOnSurface = Color(0xFFFBEEED) +val md_theme_light_surfaceVariant = Color(0xFFF4DDDE) +val md_theme_light_onSurfaceVariant = Color(0xFF524344) +val md_theme_light_outline = Color(0xFF857374) +val md_theme_light_inverseOnSurface = Color(0xFFFBEEEE) val md_theme_light_inverseSurface = Color(0xFF362F2F) -val md_theme_light_inversePrimary = Color(0xFFFFB3B5) +val md_theme_light_inversePrimary = Color(0xFFFFB2B9) val md_theme_light_shadow = Color(0xFF000000) -val md_theme_light_surfaceTint = Color(0xFFBE0034) -val md_theme_light_outlineVariant = Color(0xFFD7C1C1) +val md_theme_light_surfaceTint = Color(0xFF9C404D) +val md_theme_light_outlineVariant = Color(0xFFD7C1C2) val md_theme_light_scrim = Color(0xFF000000) -val md_theme_dark_primary = Color(0xFFFFB3B5) -val md_theme_dark_onPrimary = Color(0xFF680018) -val md_theme_dark_primaryContainer = Color(0xFF920026) -val md_theme_dark_onPrimaryContainer = Color(0xFFFFDADA) -val md_theme_dark_secondary = Color(0xFFE6C500) -val md_theme_dark_onSecondary = Color(0xFF3A3000) -val md_theme_dark_secondaryContainer = Color(0xFF534600) -val md_theme_dark_onSecondaryContainer = Color(0xFFFFE261) -val md_theme_dark_tertiary = Color(0xFFE6C18D) -val md_theme_dark_onTertiary = Color(0xFF422C05) -val md_theme_dark_tertiaryContainer = Color(0xFF5C421A) -val md_theme_dark_onTertiaryContainer = Color(0xFFFFDDB1) +val md_theme_dark_primary = Color(0xFFFFB2B9) +val md_theme_dark_onPrimary = Color(0xFF5F1222) +val md_theme_dark_primaryContainer = Color(0xFF7D2937) +val md_theme_dark_onPrimaryContainer = Color(0xFFFFDADB) +val md_theme_dark_secondary = Color(0xFFE5BDBF) +val md_theme_dark_onSecondary = Color(0xFF44292C) +val md_theme_dark_secondaryContainer = Color(0xFF5C3F41) +val md_theme_dark_onSecondaryContainer = Color(0xFFFFDADB) +val md_theme_dark_tertiary = Color(0xFFE8C08E) +val md_theme_dark_onTertiary = Color(0xFF442B06) +val md_theme_dark_tertiaryContainer = Color(0xFF5D411B) +val md_theme_dark_onTertiaryContainer = Color(0xFFFFDDB5) val md_theme_dark_error = Color(0xFFFFB4AB) val md_theme_dark_errorContainer = Color(0xFF93000A) val md_theme_dark_onError = Color(0xFF690005) @@ -55,16 +53,16 @@ val md_theme_dark_background = Color(0xFF201A1A) val md_theme_dark_onBackground = Color(0xFFECE0DF) val md_theme_dark_surface = Color(0xFF201A1A) val md_theme_dark_onSurface = Color(0xFFECE0DF) -val md_theme_dark_surfaceVariant = Color(0xFF524343) -val md_theme_dark_onSurfaceVariant = Color(0xFFD7C1C1) -val md_theme_dark_outline = Color(0xFF9F8C8C) +val md_theme_dark_surfaceVariant = Color(0xFF524344) +val md_theme_dark_onSurfaceVariant = Color(0xFFD7C1C2) +val md_theme_dark_outline = Color(0xFF9F8C8D) val md_theme_dark_inverseOnSurface = Color(0xFF201A1A) val md_theme_dark_inverseSurface = Color(0xFFECE0DF) -val md_theme_dark_inversePrimary = Color(0xFFBE0034) +val md_theme_dark_inversePrimary = Color(0xFF9C404D) val md_theme_dark_shadow = Color(0xFF000000) -val md_theme_dark_surfaceTint = Color(0xFFFFB3B5) -val md_theme_dark_outlineVariant = Color(0xFF524343) +val md_theme_dark_surfaceTint = Color(0xFFFFB2B9) +val md_theme_dark_outlineVariant = Color(0xFF524344) val md_theme_dark_scrim = Color(0xFF000000) -val seed = Color(0xFFED0043) +val seed = Color(0xFF833842)