From c815f53cff172be82bc141d803bba7d90d3f63ff Mon Sep 17 00:00:00 2001 From: Barnabas Balogh Date: Tue, 31 Mar 2026 11:01:07 +0200 Subject: [PATCH] refactor: simplify color definitions using HSL for better readability --- .../java/hu/bbara/purefin/ui/theme/Color.kt | 424 +++++++++--------- .../java/hu/bbara/purefin/ui/theme/Color.kt | 244 +--------- .../java/hu/bbara/purefin/ui/theme/Theme.kt | 223 +-------- 3 files changed, 239 insertions(+), 652 deletions(-) diff --git a/app-tv/src/main/java/hu/bbara/purefin/ui/theme/Color.kt b/app-tv/src/main/java/hu/bbara/purefin/ui/theme/Color.kt index 8223689..2c5c8b8 100644 --- a/app-tv/src/main/java/hu/bbara/purefin/ui/theme/Color.kt +++ b/app-tv/src/main/java/hu/bbara/purefin/ui/theme/Color.kt @@ -1,218 +1,222 @@ package hu.bbara.purefin.ui.theme + import androidx.compose.ui.graphics.Color -val primaryLight = Color(0xFF8A5021) -val onPrimaryLight = Color(0xFFFFFFFF) -val primaryContainerLight = Color(0xFFFFDCC5) -val onPrimaryContainerLight = Color(0xFF6D390B) -val secondaryLight = Color(0xFF755945) -val onSecondaryLight = Color(0xFFFFFFFF) -val secondaryContainerLight = Color(0xFFFFDCC5) -val onSecondaryContainerLight = Color(0xFF5B412F) -val tertiaryLight = Color(0xFF5E6135) -val onTertiaryLight = Color(0xFFFFFFFF) -val tertiaryContainerLight = Color(0xFFE4E6AE) -val onTertiaryContainerLight = Color(0xFF464920) -val errorLight = Color(0xFFBA1A1A) -val onErrorLight = Color(0xFFFFFFFF) -val errorContainerLight = Color(0xFFFFDAD6) -val onErrorContainerLight = Color(0xFF93000A) -val backgroundLight = Color(0xFFFFF8F5) -val onBackgroundLight = Color(0xFF221A15) -val surfaceLight = Color(0xFFFFF8F5) -val onSurfaceLight = Color(0xFF221A15) -val surfaceVariantLight = Color(0xFFF3DFD2) -val onSurfaceVariantLight = Color(0xFF52443B) -val outlineLight = Color(0xFF84746A) -val outlineVariantLight = Color(0xFFD6C3B7) -val scrimLight = Color(0xFF000000) -val inverseSurfaceLight = Color(0xFF382F29) -val inverseOnSurfaceLight = Color(0xFFFEEEE4) -val inversePrimaryLight = Color(0xFFFFB783) -val surfaceDimLight = Color(0xFFE7D7CE) -val surfaceBrightLight = Color(0xFFFFF8F5) -val surfaceContainerLowestLight = Color(0xFFFFFFFF) -val surfaceContainerLowLight = Color(0xFFFFF1E9) -val surfaceContainerLight = Color(0xFFFBEBE1) -val surfaceContainerHighLight = Color(0xFFF5E5DC) -val surfaceContainerHighestLight = Color(0xFFF0DFD6) +private fun hslColor(hue: Float, saturation: Float, lightness: Float): Color = + Color.hsl(hue = hue, saturation = saturation / 100f, lightness = lightness / 100f) -val primaryLightMediumContrast = Color(0xFF572A00) -val onPrimaryLightMediumContrast = Color(0xFFFFFFFF) -val primaryContainerLightMediumContrast = Color(0xFF9B5E2E) -val onPrimaryContainerLightMediumContrast = Color(0xFFFFFFFF) -val secondaryLightMediumContrast = Color(0xFF493120) -val onSecondaryLightMediumContrast = Color(0xFFFFFFFF) -val secondaryContainerLightMediumContrast = Color(0xFF856753) -val onSecondaryContainerLightMediumContrast = Color(0xFFFFFFFF) -val tertiaryLightMediumContrast = Color(0xFF363911) -val onTertiaryLightMediumContrast = Color(0xFFFFFFFF) -val tertiaryContainerLightMediumContrast = Color(0xFF6D7042) -val onTertiaryContainerLightMediumContrast = Color(0xFFFFFFFF) -val errorLightMediumContrast = Color(0xFF740006) -val onErrorLightMediumContrast = Color(0xFFFFFFFF) -val errorContainerLightMediumContrast = Color(0xFFCF2C27) -val onErrorContainerLightMediumContrast = Color(0xFFFFFFFF) -val backgroundLightMediumContrast = Color(0xFFFFF8F5) -val onBackgroundLightMediumContrast = Color(0xFF221A15) -val surfaceLightMediumContrast = Color(0xFFFFF8F5) -val onSurfaceLightMediumContrast = Color(0xFF17100B) -val surfaceVariantLightMediumContrast = Color(0xFFF3DFD2) -val onSurfaceVariantLightMediumContrast = Color(0xFF40342B) -val outlineLightMediumContrast = Color(0xFF5E5046) -val outlineVariantLightMediumContrast = Color(0xFF7A6A60) -val scrimLightMediumContrast = Color(0xFF000000) -val inverseSurfaceLightMediumContrast = Color(0xFF382F29) -val inverseOnSurfaceLightMediumContrast = Color(0xFFFEEEE4) -val inversePrimaryLightMediumContrast = Color(0xFFFFB783) -val surfaceDimLightMediumContrast = Color(0xFFD3C4BB) -val surfaceBrightLightMediumContrast = Color(0xFFFFF8F5) -val surfaceContainerLowestLightMediumContrast = Color(0xFFFFFFFF) -val surfaceContainerLowLightMediumContrast = Color(0xFFFFF1E9) -val surfaceContainerLightMediumContrast = Color(0xFFF5E5DC) -val surfaceContainerHighLightMediumContrast = Color(0xFFEADAD1) -val surfaceContainerHighestLightMediumContrast = Color(0xFFDECFC6) +val primaryLight = hslColor(26.9f, 61.4f, 33.5f) +val onPrimaryLight = hslColor(0f, 0f, 100f) +val primaryContainerLight = hslColor(23.8f, 100f, 88.6f) +val onPrimaryContainerLight = hslColor(28.2f, 81.7f, 23.5f) +val secondaryLight = hslColor(25f, 25.8f, 36.5f) +val onSecondaryLight = hslColor(0f, 0f, 100f) +val secondaryContainerLight = hslColor(23.8f, 100f, 88.6f) +val onSecondaryContainerLight = hslColor(24.5f, 31.9f, 27.1f) +val tertiaryLight = hslColor(64.1f, 29.3f, 29.4f) +val onTertiaryLight = hslColor(0f, 0f, 100f) +val tertiaryContainerLight = hslColor(62.1f, 52.8f, 79.2f) +val onTertiaryContainerLight = hslColor(64.4f, 39.0f, 20.6f) +val errorLight = hslColor(0f, 75.5f, 41.6f) +val onErrorLight = hslColor(0f, 0f, 100f) +val errorContainerLight = hslColor(5.9f, 100f, 92.0f) +val onErrorContainerLight = hslColor(355.9f, 100f, 28.8f) +val backgroundLight = hslColor(18f, 100f, 98.0f) +val onBackgroundLight = hslColor(23.1f, 23.6f, 10.8f) +val surfaceLight = hslColor(18f, 100f, 98.0f) +val onSurfaceLight = hslColor(23.1f, 23.6f, 10.8f) +val surfaceVariantLight = hslColor(23.6f, 57.9f, 88.8f) +val onSurfaceVariantLight = hslColor(23.5f, 16.3f, 27.6f) +val outlineLight = hslColor(23.1f, 10.9f, 46.7f) +val outlineVariantLight = hslColor(23.2f, 27.4f, 77.8f) +val scrimLight = hslColor(0f, 0f, 0f) +val inverseSurfaceLight = hslColor(24f, 15.5f, 19.0f) +val inverseOnSurfaceLight = hslColor(23.1f, 92.9f, 94.5f) +val inversePrimaryLight = hslColor(25.2f, 100f, 75.7f) +val surfaceDimLight = hslColor(21.6f, 34.2f, 85.7f) +val surfaceBrightLight = hslColor(18f, 100f, 98.0f) +val surfaceContainerLowestLight = hslColor(0f, 0f, 100f) +val surfaceContainerLowLight = hslColor(21.8f, 100f, 95.7f) +val surfaceContainerLight = hslColor(23.1f, 76.5f, 93.3f) +val surfaceContainerHighLight = hslColor(21.6f, 55.6f, 91.2f) +val surfaceContainerHighestLight = hslColor(20.8f, 46.4f, 89.0f) -val primaryLightHighContrast = Color(0xFF492200) -val onPrimaryLightHighContrast = Color(0xFFFFFFFF) -val primaryContainerLightHighContrast = Color(0xFF703C0D) -val onPrimaryContainerLightHighContrast = Color(0xFFFFFFFF) -val secondaryLightHighContrast = Color(0xFF3D2717) -val onSecondaryLightHighContrast = Color(0xFFFFFFFF) -val secondaryContainerLightHighContrast = Color(0xFF5D4431) -val onSecondaryContainerLightHighContrast = Color(0xFFFFFFFF) -val tertiaryLightHighContrast = Color(0xFF2C2E07) -val onTertiaryLightHighContrast = Color(0xFFFFFFFF) -val tertiaryContainerLightHighContrast = Color(0xFF494C22) -val onTertiaryContainerLightHighContrast = Color(0xFFFFFFFF) -val errorLightHighContrast = Color(0xFF600004) -val onErrorLightHighContrast = Color(0xFFFFFFFF) -val errorContainerLightHighContrast = Color(0xFF98000A) -val onErrorContainerLightHighContrast = Color(0xFFFFFFFF) -val backgroundLightHighContrast = Color(0xFFFFF8F5) -val onBackgroundLightHighContrast = Color(0xFF221A15) -val surfaceLightHighContrast = Color(0xFFFFF8F5) -val onSurfaceLightHighContrast = Color(0xFF000000) -val surfaceVariantLightHighContrast = Color(0xFFF3DFD2) -val onSurfaceVariantLightHighContrast = Color(0xFF000000) -val outlineLightHighContrast = Color(0xFF362A22) -val outlineVariantLightHighContrast = Color(0xFF54463E) -val scrimLightHighContrast = Color(0xFF000000) -val inverseSurfaceLightHighContrast = Color(0xFF382F29) -val inverseOnSurfaceLightHighContrast = Color(0xFFFFFFFF) -val inversePrimaryLightHighContrast = Color(0xFFFFB783) -val surfaceDimLightHighContrast = Color(0xFFC5B6AD) -val surfaceBrightLightHighContrast = Color(0xFFFFF8F5) -val surfaceContainerLowestLightHighContrast = Color(0xFFFFFFFF) -val surfaceContainerLowLightHighContrast = Color(0xFFFEEEE4) -val surfaceContainerLightHighContrast = Color(0xFFF0DFD6) -val surfaceContainerHighLightHighContrast = Color(0xFFE1D1C8) -val surfaceContainerHighestLightHighContrast = Color(0xFFD3C4BB) +val primaryLightMediumContrast = hslColor(29.0f, 100f, 17.1f) +val onPrimaryLightMediumContrast = hslColor(0f, 0f, 100f) +val primaryContainerLightMediumContrast = hslColor(26.4f, 54.2f, 39.4f) +val onPrimaryContainerLightMediumContrast = hslColor(0f, 0f, 100f) +val secondaryLightMediumContrast = hslColor(24.9f, 39.0f, 20.6f) +val onSecondaryLightMediumContrast = hslColor(0f, 0f, 100f) +val secondaryContainerLightMediumContrast = hslColor(24f, 23.1f, 42.4f) +val onSecondaryContainerLightMediumContrast = hslColor(0f, 0f, 100f) +val tertiaryLightMediumContrast = hslColor(64.5f, 54.1f, 14.5f) +val onTertiaryLightMediumContrast = hslColor(0f, 0f, 100f) +val tertiaryContainerLightMediumContrast = hslColor(63.9f, 25.8f, 34.9f) +val onTertiaryContainerLightMediumContrast = hslColor(0f, 0f, 100f) +val errorLightMediumContrast = hslColor(356.9f, 100f, 22.7f) +val onErrorLightMediumContrast = hslColor(0f, 0f, 100f) +val errorContainerLightMediumContrast = hslColor(1.8f, 68.3f, 48.2f) +val onErrorContainerLightMediumContrast = hslColor(0f, 0f, 100f) +val backgroundLightMediumContrast = hslColor(18f, 100f, 98.0f) +val onBackgroundLightMediumContrast = hslColor(23.1f, 23.6f, 10.8f) +val surfaceLightMediumContrast = hslColor(18f, 100f, 98.0f) +val onSurfaceLightMediumContrast = hslColor(25f, 35.3f, 6.7f) +val surfaceVariantLightMediumContrast = hslColor(23.6f, 57.9f, 88.8f) +val onSurfaceVariantLightMediumContrast = hslColor(25.7f, 19.6f, 21.0f) +val outlineLightMediumContrast = hslColor(25f, 14.6f, 32.2f) +val outlineVariantLightMediumContrast = hslColor(23.1f, 11.9f, 42.7f) +val scrimLightMediumContrast = hslColor(0f, 0f, 0f) +val inverseSurfaceLightMediumContrast = hslColor(24f, 15.5f, 19.0f) +val inverseOnSurfaceLightMediumContrast = hslColor(23.1f, 92.9f, 94.5f) +val inversePrimaryLightMediumContrast = hslColor(25.2f, 100f, 75.7f) +val surfaceDimLightMediumContrast = hslColor(22.5f, 21.4f, 78.0f) +val surfaceBrightLightMediumContrast = hslColor(18f, 100f, 98.0f) +val surfaceContainerLowestLightMediumContrast = hslColor(0f, 0f, 100f) +val surfaceContainerLowLightMediumContrast = hslColor(21.8f, 100f, 95.7f) +val surfaceContainerLightMediumContrast = hslColor(21.6f, 55.6f, 91.2f) +val surfaceContainerHighLightMediumContrast = hslColor(21.6f, 37.3f, 86.9f) +val surfaceContainerHighestLightMediumContrast = hslColor(22.5f, 26.7f, 82.4f) -val primaryDark = Color(0xFFFFB783) -val onPrimaryDark = Color(0xFF4F2500) -val primaryContainerDark = Color(0xFF6D390B) -val onPrimaryContainerDark = Color(0xFFFFDCC5) -val secondaryDark = Color(0xFFE4BFA7) -val onSecondaryDark = Color(0xFF422B1B) -val secondaryContainerDark = Color(0xFF5B412F) -val onSecondaryContainerDark = Color(0xFFFFDCC5) -val tertiaryDark = Color(0xFFC7CA94) -val onTertiaryDark = Color(0xFF30330B) -val tertiaryContainerDark = Color(0xFF464920) -val onTertiaryContainerDark = Color(0xFFE4E6AE) -val errorDark = Color(0xFFFFB4AB) -val onErrorDark = Color(0xFF690005) -val errorContainerDark = Color(0xFF93000A) -val onErrorContainerDark = Color(0xFFFFDAD6) -val backgroundDark = Color(0xFF19120D) -val onBackgroundDark = Color(0xFFF0DFD6) -val surfaceDark = Color(0xFF19120D) -val onSurfaceDark = Color(0xFFF0DFD6) -val surfaceVariantDark = Color(0xFF52443B) -val onSurfaceVariantDark = Color(0xFFD6C3B7) -val outlineDark = Color(0xFF9F8D83) -val outlineVariantDark = Color(0xFF52443B) -val scrimDark = Color(0xFF000000) -val inverseSurfaceDark = Color(0xFFF0DFD6) -val inverseOnSurfaceDark = Color(0xFF382F29) -val inversePrimaryDark = Color(0xFF8A5021) -val surfaceDimDark = Color(0xFF19120D) -val surfaceBrightDark = Color(0xFF413731) -val surfaceContainerLowestDark = Color(0xFF140D08) -val surfaceContainerLowDark = Color(0xFF221A15) -val surfaceContainerDark = Color(0xFF261E18) -val surfaceContainerHighDark = Color(0xFF312822) -val surfaceContainerHighestDark = Color(0xFF3C332D) +val primaryLightHighContrast = hslColor(27.9f, 100f, 14.3f) +val onPrimaryLightHighContrast = hslColor(0f, 0f, 100f) +val primaryContainerLightHighContrast = hslColor(28.5f, 79.2f, 24.5f) +val onPrimaryContainerLightHighContrast = hslColor(0f, 0f, 100f) +val secondaryLightHighContrast = hslColor(25.3f, 45.2f, 16.5f) +val onSecondaryLightHighContrast = hslColor(0f, 0f, 100f) +val secondaryContainerLightHighContrast = hslColor(25.9f, 31.0f, 27.8f) +val onSecondaryContainerLightHighContrast = hslColor(0f, 0f, 100f) +val tertiaryLightHighContrast = hslColor(63.1f, 73.6f, 10.4f) +val onTertiaryLightHighContrast = hslColor(0f, 0f, 100f) +val tertiaryContainerLightHighContrast = hslColor(64.3f, 38.2f, 21.6f) +val onTertiaryContainerLightHighContrast = hslColor(0f, 0f, 100f) +val errorLightHighContrast = hslColor(357.5f, 100f, 18.8f) +val onErrorLightHighContrast = hslColor(0f, 0f, 100f) +val errorContainerLightHighContrast = hslColor(356.1f, 100f, 29.8f) +val onErrorContainerLightHighContrast = hslColor(0f, 0f, 100f) +val backgroundLightHighContrast = hslColor(18f, 100f, 98.0f) +val onBackgroundLightHighContrast = hslColor(23.1f, 23.6f, 10.8f) +val surfaceLightHighContrast = hslColor(18f, 100f, 98.0f) +val onSurfaceLightHighContrast = hslColor(0f, 0f, 0f) +val surfaceVariantLightHighContrast = hslColor(23.6f, 57.9f, 88.8f) +val onSurfaceVariantLightHighContrast = hslColor(0f, 0f, 0f) +val outlineLightHighContrast = hslColor(24f, 22.7f, 17.3f) +val outlineVariantLightHighContrast = hslColor(21.8f, 15.1f, 28.6f) +val scrimLightHighContrast = hslColor(0f, 0f, 0f) +val inverseSurfaceLightHighContrast = hslColor(24f, 15.5f, 19.0f) +val inverseOnSurfaceLightHighContrast = hslColor(0f, 0f, 100f) +val inversePrimaryLightHighContrast = hslColor(25.2f, 100f, 75.7f) +val surfaceDimLightHighContrast = hslColor(22.5f, 17.1f, 72.5f) +val surfaceBrightLightHighContrast = hslColor(18f, 100f, 98.0f) +val surfaceContainerLowestLightHighContrast = hslColor(0f, 0f, 100f) +val surfaceContainerLowLightHighContrast = hslColor(23.1f, 92.9f, 94.5f) +val surfaceContainerLightHighContrast = hslColor(20.8f, 46.4f, 89.0f) +val surfaceContainerHighLightHighContrast = hslColor(21.6f, 29.4f, 83.3f) +val surfaceContainerHighestLightHighContrast = hslColor(22.5f, 21.4f, 78.0f) -val primaryDarkMediumContrast = Color(0xFFFFD4B7) -val onPrimaryDarkMediumContrast = Color(0xFF3F1C00) -val primaryContainerDarkMediumContrast = Color(0xFFC5814E) -val onPrimaryContainerDarkMediumContrast = Color(0xFF000000) -val secondaryDarkMediumContrast = Color(0xFFFBD5BC) -val onSecondaryDarkMediumContrast = Color(0xFF362111) -val secondaryContainerDarkMediumContrast = Color(0xFFAB8A74) -val onSecondaryContainerDarkMediumContrast = Color(0xFF000000) -val tertiaryDarkMediumContrast = Color(0xFFDDE0A9) -val onTertiaryDarkMediumContrast = Color(0xFF252803) -val tertiaryContainerDarkMediumContrast = Color(0xFF919463) -val onTertiaryContainerDarkMediumContrast = Color(0xFF000000) -val errorDarkMediumContrast = Color(0xFFFFD2CC) -val onErrorDarkMediumContrast = Color(0xFF540003) -val errorContainerDarkMediumContrast = Color(0xFFFF5449) -val onErrorContainerDarkMediumContrast = Color(0xFF000000) -val backgroundDarkMediumContrast = Color(0xFF19120D) -val onBackgroundDarkMediumContrast = Color(0xFFF0DFD6) -val surfaceDarkMediumContrast = Color(0xFF19120D) -val onSurfaceDarkMediumContrast = Color(0xFFFFFFFF) -val surfaceVariantDarkMediumContrast = Color(0xFF52443B) -val onSurfaceVariantDarkMediumContrast = Color(0xFFEDD8CC) -val outlineDarkMediumContrast = Color(0xFFC1AEA3) -val outlineVariantDarkMediumContrast = Color(0xFF9E8D82) -val scrimDarkMediumContrast = Color(0xFF000000) -val inverseSurfaceDarkMediumContrast = Color(0xFFF0DFD6) -val inverseOnSurfaceDarkMediumContrast = Color(0xFF312822) -val inversePrimaryDarkMediumContrast = Color(0xFF6F3A0C) -val surfaceDimDarkMediumContrast = Color(0xFF19120D) -val surfaceBrightDarkMediumContrast = Color(0xFF4D423C) -val surfaceContainerLowestDarkMediumContrast = Color(0xFF0C0603) -val surfaceContainerLowDarkMediumContrast = Color(0xFF241C16) -val surfaceContainerDarkMediumContrast = Color(0xFF2F2620) -val surfaceContainerHighDarkMediumContrast = Color(0xFF3A312B) -val surfaceContainerHighestDarkMediumContrast = Color(0xFF463C35) +val primaryDark = hslColor(25.2f, 100f, 75.7f) +val onPrimaryDark = hslColor(28.1f, 100f, 15.5f) +val primaryContainerDark = hslColor(28.2f, 81.7f, 23.5f) +val onPrimaryContainerDark = hslColor(23.8f, 100f, 88.6f) +val secondaryDark = hslColor(23.6f, 53.0f, 77.5f) +val onSecondaryDark = hslColor(24.6f, 41.9f, 18.2f) +val secondaryContainerDark = hslColor(24.5f, 31.9f, 27.1f) +val onSecondaryContainerDark = hslColor(23.8f, 100f, 88.6f) +val tertiaryDark = hslColor(63.3f, 33.7f, 68.6f) +val onTertiaryDark = hslColor(64.5f, 64.5f, 12.2f) +val tertiaryContainerDark = hslColor(64.4f, 39.0f, 20.6f) +val onTertiaryContainerDark = hslColor(62.1f, 52.8f, 79.2f) +val errorDark = hslColor(6.4f, 100f, 83.5f) +val onErrorDark = hslColor(357.1f, 100f, 20.6f) +val errorContainerDark = hslColor(355.9f, 100f, 28.8f) +val onErrorContainerDark = hslColor(5.9f, 100f, 92.0f) +val backgroundDark = hslColor(25f, 31.6f, 7.5f) +val onBackgroundDark = hslColor(20.8f, 46.4f, 89.0f) +val surfaceDark = hslColor(25f, 31.6f, 7.5f) +val onSurfaceDark = hslColor(20.8f, 46.4f, 89.0f) +val surfaceVariantDark = hslColor(23.5f, 16.3f, 27.6f) +val onSurfaceVariantDark = hslColor(23.2f, 27.4f, 77.8f) +val outlineDark = hslColor(21.4f, 12.7f, 56.9f) +val outlineVariantDark = hslColor(23.5f, 16.3f, 27.6f) +val scrimDark = hslColor(0f, 0f, 0f) +val inverseSurfaceDark = hslColor(20.8f, 46.4f, 89.0f) +val inverseOnSurfaceDark = hslColor(24f, 15.5f, 19.0f) +val inversePrimaryDark = hslColor(26.9f, 61.4f, 33.5f) +val surfaceDimDark = hslColor(25f, 31.6f, 7.5f) +val surfaceBrightDark = hslColor(22.5f, 14.0f, 22.4f) +val surfaceContainerLowestDark = hslColor(25f, 42.9f, 5.5f) +val surfaceContainerLowDark = hslColor(23.1f, 23.6f, 10.8f) +val surfaceContainerDark = hslColor(25.7f, 22.6f, 12.2f) +val surfaceContainerHighDark = hslColor(24f, 18.1f, 16.3f) +val surfaceContainerHighestDark = hslColor(24f, 14.3f, 20.6f) -val primaryDarkHighContrast = Color(0xFFFFECE2) -val onPrimaryDarkHighContrast = Color(0xFF000000) -val primaryContainerDarkHighContrast = Color(0xFFFEB27A) -val onPrimaryContainerDarkHighContrast = Color(0xFF170700) -val secondaryDarkHighContrast = Color(0xFFFFECE2) -val onSecondaryDarkHighContrast = Color(0xFF000000) -val secondaryContainerDarkHighContrast = Color(0xFFE0BBA3) -val onSecondaryContainerDarkHighContrast = Color(0xFF170700) -val tertiaryDarkHighContrast = Color(0xFFF1F4BB) -val onTertiaryDarkHighContrast = Color(0xFF000000) -val tertiaryContainerDarkHighContrast = Color(0xFFC3C691) -val onTertiaryContainerDarkHighContrast = Color(0xFF0B0C00) -val errorDarkHighContrast = Color(0xFFFFECE9) -val onErrorDarkHighContrast = Color(0xFF000000) -val errorContainerDarkHighContrast = Color(0xFFFFAEA4) -val onErrorContainerDarkHighContrast = Color(0xFF220001) -val backgroundDarkHighContrast = Color(0xFF19120D) -val onBackgroundDarkHighContrast = Color(0xFFF0DFD6) -val surfaceDarkHighContrast = Color(0xFF19120D) -val onSurfaceDarkHighContrast = Color(0xFFFFFFFF) -val surfaceVariantDarkHighContrast = Color(0xFF52443B) -val onSurfaceVariantDarkHighContrast = Color(0xFFFFFFFF) -val outlineDarkHighContrast = Color(0xFFFFECE2) -val outlineVariantDarkHighContrast = Color(0xFFD2BFB3) -val scrimDarkHighContrast = Color(0xFF000000) -val inverseSurfaceDarkHighContrast = Color(0xFFF0DFD6) -val inverseOnSurfaceDarkHighContrast = Color(0xFF000000) -val inversePrimaryDarkHighContrast = Color(0xFF6F3A0C) -val surfaceDimDarkHighContrast = Color(0xFF19120D) -val surfaceBrightDarkHighContrast = Color(0xFF594E47) -val surfaceContainerLowestDarkHighContrast = Color(0xFF000000) -val surfaceContainerLowDarkHighContrast = Color(0xFF261E18) -val surfaceContainerDarkHighContrast = Color(0xFF382F29) -val surfaceContainerHighDarkHighContrast = Color(0xFF433933) -val surfaceContainerHighestDarkHighContrast = Color(0xFF4F453E) +val primaryDarkMediumContrast = hslColor(24.2f, 100f, 85.9f) +val onPrimaryDarkMediumContrast = hslColor(26.7f, 100f, 12.4f) +val primaryContainerDarkMediumContrast = hslColor(25.7f, 50.6f, 53.9f) +val onPrimaryContainerDarkMediumContrast = hslColor(0f, 0f, 0f) +val secondaryDarkMediumContrast = hslColor(23.8f, 88.7f, 86.1f) +val onSecondaryDarkMediumContrast = hslColor(25.9f, 52.1f, 13.9f) +val secondaryContainerDarkMediumContrast = hslColor(24f, 24.7f, 56.3f) +val onSecondaryContainerDarkMediumContrast = hslColor(0f, 0f, 0f) +val tertiaryDarkMediumContrast = hslColor(63.3f, 47.0f, 77.1f) +val onTertiaryDarkMediumContrast = hslColor(64.9f, 86.0f, 8.4f) +val tertiaryContainerDarkMediumContrast = hslColor(63.7f, 19.8f, 48.4f) +val onTertiaryContainerDarkMediumContrast = hslColor(0f, 0f, 0f) +val errorDarkMediumContrast = hslColor(7.1f, 100f, 90f) +val onErrorDarkMediumContrast = hslColor(357.9f, 100f, 16.5f) +val errorContainerDarkMediumContrast = hslColor(3.6f, 100f, 64.3f) +val onErrorContainerDarkMediumContrast = hslColor(0f, 0f, 0f) +val backgroundDarkMediumContrast = hslColor(25f, 31.6f, 7.5f) +val onBackgroundDarkMediumContrast = hslColor(20.8f, 46.4f, 89.0f) +val surfaceDarkMediumContrast = hslColor(25f, 31.6f, 7.5f) +val onSurfaceDarkMediumContrast = hslColor(0f, 0f, 100f) +val surfaceVariantDarkMediumContrast = hslColor(23.5f, 16.3f, 27.6f) +val onSurfaceVariantDarkMediumContrast = hslColor(21.8f, 47.8f, 86.5f) +val outlineDarkMediumContrast = hslColor(22f, 19.5f, 69.8f) +val outlineVariantDarkMediumContrast = hslColor(23.6f, 12.6f, 56.5f) +val scrimDarkMediumContrast = hslColor(0f, 0f, 0f) +val inverseSurfaceDarkMediumContrast = hslColor(20.8f, 46.4f, 89.0f) +val inverseOnSurfaceDarkMediumContrast = hslColor(24f, 18.1f, 16.3f) +val inversePrimaryDarkMediumContrast = hslColor(27.9f, 80.5f, 24.1f) +val surfaceDimDarkMediumContrast = hslColor(25f, 31.6f, 7.5f) +val surfaceBrightDarkMediumContrast = hslColor(21.2f, 12.4f, 26.9f) +val surfaceContainerLowestDarkMediumContrast = hslColor(20f, 60f, 2.9f) +val surfaceContainerLowDarkMediumContrast = hslColor(25.7f, 24.1f, 11.4f) +val surfaceContainerDarkMediumContrast = hslColor(24f, 19.0f, 15.5f) +val surfaceContainerHighDarkMediumContrast = hslColor(24f, 14.9f, 19.8f) +val surfaceContainerHighestDarkMediumContrast = hslColor(24.7f, 13.8f, 24.1f) + +val primaryDarkHighContrast = hslColor(20.7f, 100f, 94.3f) +val onPrimaryDarkHighContrast = hslColor(0f, 0f, 0f) +val primaryContainerDarkHighContrast = hslColor(25.5f, 98.5f, 73.7f) +val onPrimaryContainerDarkHighContrast = hslColor(18.3f, 100f, 4.5f) +val secondaryDarkHighContrast = hslColor(20.7f, 100f, 94.3f) +val onSecondaryDarkHighContrast = hslColor(0f, 0f, 0f) +val secondaryContainerDarkHighContrast = hslColor(23.6f, 49.6f, 75.9f) +val onSecondaryContainerDarkHighContrast = hslColor(18.3f, 100f, 4.5f) +val tertiaryDarkHighContrast = hslColor(63.2f, 72.2f, 84.5f) +val onTertiaryDarkHighContrast = hslColor(0f, 0f, 0f) +val tertiaryContainerDarkHighContrast = hslColor(63.4f, 31.7f, 67.3f) +val onTertiaryContainerDarkHighContrast = hslColor(65f, 100f, 2.4f) +val errorDarkHighContrast = hslColor(8.2f, 100f, 95.7f) +val onErrorDarkHighContrast = hslColor(0f, 0f, 0f) +val errorContainerDarkHighContrast = hslColor(6.6f, 100f, 82.2f) +val onErrorContainerDarkHighContrast = hslColor(358.2f, 100f, 6.7f) +val backgroundDarkHighContrast = hslColor(25f, 31.6f, 7.5f) +val onBackgroundDarkHighContrast = hslColor(20.8f, 46.4f, 89.0f) +val surfaceDarkHighContrast = hslColor(25f, 31.6f, 7.5f) +val onSurfaceDarkHighContrast = hslColor(0f, 0f, 100f) +val surfaceVariantDarkHighContrast = hslColor(23.5f, 16.3f, 27.6f) +val onSurfaceVariantDarkHighContrast = hslColor(0f, 0f, 100f) +val outlineDarkHighContrast = hslColor(20.7f, 100f, 94.3f) +val outlineVariantDarkHighContrast = hslColor(23.2f, 25.6f, 76.3f) +val scrimDarkHighContrast = hslColor(0f, 0f, 0f) +val inverseSurfaceDarkHighContrast = hslColor(20.8f, 46.4f, 89.0f) +val inverseOnSurfaceDarkHighContrast = hslColor(0f, 0f, 0f) +val inversePrimaryDarkHighContrast = hslColor(27.9f, 80.5f, 24.1f) +val surfaceDimDarkHighContrast = hslColor(25f, 31.6f, 7.5f) +val surfaceBrightDarkHighContrast = hslColor(23.3f, 11.2f, 31.4f) +val surfaceContainerLowestDarkHighContrast = hslColor(0f, 0f, 0f) +val surfaceContainerLowDarkHighContrast = hslColor(25.7f, 22.6f, 12.2f) +val surfaceContainerDarkHighContrast = hslColor(24f, 15.5f, 19.0f) +val surfaceContainerHighDarkHighContrast = hslColor(22.5f, 13.6f, 23.1f) +val surfaceContainerHighestDarkHighContrast = hslColor(24.7f, 12.1f, 27.6f) diff --git a/app/src/main/java/hu/bbara/purefin/ui/theme/Color.kt b/app/src/main/java/hu/bbara/purefin/ui/theme/Color.kt index 3282bd7..784ecb6 100644 --- a/app/src/main/java/hu/bbara/purefin/ui/theme/Color.kt +++ b/app/src/main/java/hu/bbara/purefin/ui/theme/Color.kt @@ -1,225 +1,29 @@ package hu.bbara.purefin.ui.theme + import androidx.compose.ui.graphics.Color -val primaryLight = Color(0xFF8A5021) -val onPrimaryLight = Color(0xFFFFFFFF) -val primaryContainerLight = Color(0xFFFFDCC5) -val onPrimaryContainerLight = Color(0xFF6D390B) -val secondaryLight = Color(0xFF755945) -val onSecondaryLight = Color(0xFFFFFFFF) -val secondaryContainerLight = Color(0xFFFFDCC5) -val onSecondaryContainerLight = Color(0xFF5B412F) -val tertiaryLight = Color(0xFF5E6135) -val onTertiaryLight = Color(0xFFFFFFFF) -val tertiaryContainerLight = Color(0xFFE4E6AE) -val onTertiaryContainerLight = Color(0xFF464920) -val errorLight = Color(0xFFBA1A1A) -val onErrorLight = Color(0xFFFFFFFF) -val errorContainerLight = Color(0xFFFFDAD6) -val onErrorContainerLight = Color(0xFF93000A) -val backgroundLight = Color(0xFFFFF8F5) -val onBackgroundLight = Color(0xFF221A15) -val surfaceLight = Color(0xFFFFF8F5) -val onSurfaceLight = Color(0xFF221A15) -val surfaceVariantLight = Color(0xFFF3DFD2) -val onSurfaceVariantLight = Color(0xFF52443B) -val outlineLight = Color(0xFF84746A) -val outlineVariantLight = Color(0xFFD6C3B7) -val scrimLight = Color(0xFF000000) -val inverseSurfaceLight = Color(0xFF382F29) -val inverseOnSurfaceLight = Color(0xFFFEEEE4) -val inversePrimaryLight = Color(0xFFFFB783) -val surfaceDimLight = Color(0xFFE7D7CE) -val surfaceBrightLight = Color(0xFFFFF8F5) -val surfaceContainerLowestLight = Color(0xFFFFFFFF) -val surfaceContainerLowLight = Color(0xFFFFF1E9) -val surfaceContainerLight = Color(0xFFFBEBE1) -val surfaceContainerHighLight = Color(0xFFF5E5DC) -val surfaceContainerHighestLight = Color(0xFFF0DFD6) - -val primaryLightMediumContrast = Color(0xFF572A00) -val onPrimaryLightMediumContrast = Color(0xFFFFFFFF) -val primaryContainerLightMediumContrast = Color(0xFF9B5E2E) -val onPrimaryContainerLightMediumContrast = Color(0xFFFFFFFF) -val secondaryLightMediumContrast = Color(0xFF493120) -val onSecondaryLightMediumContrast = Color(0xFFFFFFFF) -val secondaryContainerLightMediumContrast = Color(0xFF856753) -val onSecondaryContainerLightMediumContrast = Color(0xFFFFFFFF) -val tertiaryLightMediumContrast = Color(0xFF363911) -val onTertiaryLightMediumContrast = Color(0xFFFFFFFF) -val tertiaryContainerLightMediumContrast = Color(0xFF6D7042) -val onTertiaryContainerLightMediumContrast = Color(0xFFFFFFFF) -val errorLightMediumContrast = Color(0xFF740006) -val onErrorLightMediumContrast = Color(0xFFFFFFFF) -val errorContainerLightMediumContrast = Color(0xFFCF2C27) -val onErrorContainerLightMediumContrast = Color(0xFFFFFFFF) -val backgroundLightMediumContrast = Color(0xFFFFF8F5) -val onBackgroundLightMediumContrast = Color(0xFF221A15) -val surfaceLightMediumContrast = Color(0xFFFFF8F5) -val onSurfaceLightMediumContrast = Color(0xFF17100B) -val surfaceVariantLightMediumContrast = Color(0xFFF3DFD2) -val onSurfaceVariantLightMediumContrast = Color(0xFF40342B) -val outlineLightMediumContrast = Color(0xFF5E5046) -val outlineVariantLightMediumContrast = Color(0xFF7A6A60) -val scrimLightMediumContrast = Color(0xFF000000) -val inverseSurfaceLightMediumContrast = Color(0xFF382F29) -val inverseOnSurfaceLightMediumContrast = Color(0xFFFEEEE4) -val inversePrimaryLightMediumContrast = Color(0xFFFFB783) -val surfaceDimLightMediumContrast = Color(0xFFD3C4BB) -val surfaceBrightLightMediumContrast = Color(0xFFFFF8F5) -val surfaceContainerLowestLightMediumContrast = Color(0xFFFFFFFF) -val surfaceContainerLowLightMediumContrast = Color(0xFFFFF1E9) -val surfaceContainerLightMediumContrast = Color(0xFFF5E5DC) -val surfaceContainerHighLightMediumContrast = Color(0xFFEADAD1) -val surfaceContainerHighestLightMediumContrast = Color(0xFFDECFC6) - -val primaryLightHighContrast = Color(0xFF492200) -val onPrimaryLightHighContrast = Color(0xFFFFFFFF) -val primaryContainerLightHighContrast = Color(0xFF703C0D) -val onPrimaryContainerLightHighContrast = Color(0xFFFFFFFF) -val secondaryLightHighContrast = Color(0xFF3D2717) -val onSecondaryLightHighContrast = Color(0xFFFFFFFF) -val secondaryContainerLightHighContrast = Color(0xFF5D4431) -val onSecondaryContainerLightHighContrast = Color(0xFFFFFFFF) -val tertiaryLightHighContrast = Color(0xFF2C2E07) -val onTertiaryLightHighContrast = Color(0xFFFFFFFF) -val tertiaryContainerLightHighContrast = Color(0xFF494C22) -val onTertiaryContainerLightHighContrast = Color(0xFFFFFFFF) -val errorLightHighContrast = Color(0xFF600004) -val onErrorLightHighContrast = Color(0xFFFFFFFF) -val errorContainerLightHighContrast = Color(0xFF98000A) -val onErrorContainerLightHighContrast = Color(0xFFFFFFFF) -val backgroundLightHighContrast = Color(0xFFFFF8F5) -val onBackgroundLightHighContrast = Color(0xFF221A15) -val surfaceLightHighContrast = Color(0xFFFFF8F5) -val onSurfaceLightHighContrast = Color(0xFF000000) -val surfaceVariantLightHighContrast = Color(0xFFF3DFD2) -val onSurfaceVariantLightHighContrast = Color(0xFF000000) -val outlineLightHighContrast = Color(0xFF362A22) -val outlineVariantLightHighContrast = Color(0xFF54463E) -val scrimLightHighContrast = Color(0xFF000000) -val inverseSurfaceLightHighContrast = Color(0xFF382F29) -val inverseOnSurfaceLightHighContrast = Color(0xFFFFFFFF) -val inversePrimaryLightHighContrast = Color(0xFFFFB783) -val surfaceDimLightHighContrast = Color(0xFFC5B6AD) -val surfaceBrightLightHighContrast = Color(0xFFFFF8F5) -val surfaceContainerLowestLightHighContrast = Color(0xFFFFFFFF) -val surfaceContainerLowLightHighContrast = Color(0xFFFEEEE4) -val surfaceContainerLightHighContrast = Color(0xFFF0DFD6) -val surfaceContainerHighLightHighContrast = Color(0xFFE1D1C8) -val surfaceContainerHighestLightHighContrast = Color(0xFFD3C4BB) - -val primaryDark = Color(0xFFFFB783) -val onPrimaryDark = Color(0xFF4F2500) -val primaryContainerDark = Color(0xFF6D390B) -val onPrimaryContainerDark = Color(0xFFFFDCC5) -val secondaryDark = Color(0xFFE4BFA7) -val onSecondaryDark = Color(0xFF422B1B) -val secondaryContainerDark = Color(0xFF5B412F) -val onSecondaryContainerDark = Color(0xFFFFDCC5) -val tertiaryDark = Color(0xFFC7CA94) -val onTertiaryDark = Color(0xFF30330B) -val tertiaryContainerDark = Color(0xFF464920) -val onTertiaryContainerDark = Color(0xFFE4E6AE) -val errorDark = Color(0xFFFFB4AB) -val onErrorDark = Color(0xFF690005) -val errorContainerDark = Color(0xFF93000A) -val onErrorContainerDark = Color(0xFFFFDAD6) -val backgroundDark = Color(0xFF19120D) -val onBackgroundDark = Color(0xFFF0DFD6) -val surfaceDark = Color(0xFF19120D) -val onSurfaceDark = Color(0xFFF0DFD6) -val surfaceVariantDark = Color(0xFF52443B) -val onSurfaceVariantDark = Color(0xFFD6C3B7) -val outlineDark = Color(0xFF9F8D83) -val outlineVariantDark = Color(0xFF52443B) -val scrimDark = Color(0xFF000000) -val inverseSurfaceDark = Color(0xFFF0DFD6) -val inverseOnSurfaceDark = Color(0xFF382F29) -val inversePrimaryDark = Color(0xFF8A5021) -val surfaceDimDark = Color(0xFF19120D) -val surfaceBrightDark = Color(0xFF413731) -val surfaceContainerLowestDark = Color(0xFF140D08) -val surfaceContainerLowDark = Color(0xFF221A15) -val surfaceContainerDark = Color(0xFF261E18) -val surfaceContainerHighDark = Color(0xFF312822) -val surfaceContainerHighestDark = Color(0xFF3C332D) - -val primaryDarkMediumContrast = Color(0xFFFFD4B7) -val onPrimaryDarkMediumContrast = Color(0xFF3F1C00) -val primaryContainerDarkMediumContrast = Color(0xFFC5814E) -val onPrimaryContainerDarkMediumContrast = Color(0xFF000000) -val secondaryDarkMediumContrast = Color(0xFFFBD5BC) -val onSecondaryDarkMediumContrast = Color(0xFF362111) -val secondaryContainerDarkMediumContrast = Color(0xFFAB8A74) -val onSecondaryContainerDarkMediumContrast = Color(0xFF000000) -val tertiaryDarkMediumContrast = Color(0xFFDDE0A9) -val onTertiaryDarkMediumContrast = Color(0xFF252803) -val tertiaryContainerDarkMediumContrast = Color(0xFF919463) -val onTertiaryContainerDarkMediumContrast = Color(0xFF000000) -val errorDarkMediumContrast = Color(0xFFFFD2CC) -val onErrorDarkMediumContrast = Color(0xFF540003) -val errorContainerDarkMediumContrast = Color(0xFFFF5449) -val onErrorContainerDarkMediumContrast = Color(0xFF000000) -val backgroundDarkMediumContrast = Color(0xFF19120D) -val onBackgroundDarkMediumContrast = Color(0xFFF0DFD6) -val surfaceDarkMediumContrast = Color(0xFF19120D) -val onSurfaceDarkMediumContrast = Color(0xFFFFFFFF) -val surfaceVariantDarkMediumContrast = Color(0xFF52443B) -val onSurfaceVariantDarkMediumContrast = Color(0xFFEDD8CC) -val outlineDarkMediumContrast = Color(0xFFC1AEA3) -val outlineVariantDarkMediumContrast = Color(0xFF9E8D82) -val scrimDarkMediumContrast = Color(0xFF000000) -val inverseSurfaceDarkMediumContrast = Color(0xFFF0DFD6) -val inverseOnSurfaceDarkMediumContrast = Color(0xFF312822) -val inversePrimaryDarkMediumContrast = Color(0xFF6F3A0C) -val surfaceDimDarkMediumContrast = Color(0xFF19120D) -val surfaceBrightDarkMediumContrast = Color(0xFF4D423C) -val surfaceContainerLowestDarkMediumContrast = Color(0xFF0C0603) -val surfaceContainerLowDarkMediumContrast = Color(0xFF241C16) -val surfaceContainerDarkMediumContrast = Color(0xFF2F2620) -val surfaceContainerHighDarkMediumContrast = Color(0xFF3A312B) -val surfaceContainerHighestDarkMediumContrast = Color(0xFF463C35) - -val primaryDarkHighContrast = Color(0xFFFFECE2) -val onPrimaryDarkHighContrast = Color(0xFF000000) -val primaryContainerDarkHighContrast = Color(0xFFFEB27A) -val onPrimaryContainerDarkHighContrast = Color(0xFF170700) -val secondaryDarkHighContrast = Color(0xFFFFECE2) -val onSecondaryDarkHighContrast = Color(0xFF000000) -val secondaryContainerDarkHighContrast = Color(0xFFE0BBA3) -val onSecondaryContainerDarkHighContrast = Color(0xFF170700) -val tertiaryDarkHighContrast = Color(0xFFF1F4BB) -val onTertiaryDarkHighContrast = Color(0xFF000000) -val tertiaryContainerDarkHighContrast = Color(0xFFC3C691) -val onTertiaryContainerDarkHighContrast = Color(0xFF0B0C00) -val errorDarkHighContrast = Color(0xFFFFECE9) -val onErrorDarkHighContrast = Color(0xFF000000) -val errorContainerDarkHighContrast = Color(0xFFFFAEA4) -val onErrorContainerDarkHighContrast = Color(0xFF220001) -val backgroundDarkHighContrast = Color(0xFF19120D) -val onBackgroundDarkHighContrast = Color(0xFFF0DFD6) -val surfaceDarkHighContrast = Color(0xFF19120D) -val onSurfaceDarkHighContrast = Color(0xFFFFFFFF) -val surfaceVariantDarkHighContrast = Color(0xFF52443B) -val onSurfaceVariantDarkHighContrast = Color(0xFFFFFFFF) -val outlineDarkHighContrast = Color(0xFFFFECE2) -val outlineVariantDarkHighContrast = Color(0xFFD2BFB3) -val scrimDarkHighContrast = Color(0xFF000000) -val inverseSurfaceDarkHighContrast = Color(0xFFF0DFD6) -val inverseOnSurfaceDarkHighContrast = Color(0xFF000000) -val inversePrimaryDarkHighContrast = Color(0xFF6F3A0C) -val surfaceDimDarkHighContrast = Color(0xFF19120D) -val surfaceBrightDarkHighContrast = Color(0xFF594E47) -val surfaceContainerLowestDarkHighContrast = Color(0xFF000000) -val surfaceContainerLowDarkHighContrast = Color(0xFF261E18) -val surfaceContainerDarkHighContrast = Color(0xFF382F29) -val surfaceContainerHighDarkHighContrast = Color(0xFF433933) -val surfaceContainerHighestDarkHighContrast = Color(0xFF4F453E) - - - - - +private fun hslColor(hue: Float, saturation: Float, lightness: Float): Color = + Color.hsl(hue = hue, saturation = saturation / 100f, lightness = lightness / 100f) +val primaryDark = hslColor(255f, 70f, 70f) +val onPrimaryDark = hslColor(255f, 60f, 12f) +val primaryContainerDark = hslColor(255f, 70f, 70f) +val onPrimaryContainerDark = hslColor(255f, 60f, 12f) +val secondaryDark = hslColor(255f, 40f, 40f) +val onSecondaryDark = hslColor(255f, 40f, 88f) +val secondaryContainerDark = hslColor(255f, 40f, 40f) +val onSecondaryContainerDark = hslColor(255f, 40f, 88f) +val tertiaryDark = hslColor(255f, 15f, 65f) +val onTertiaryDark = hslColor(255f, 15f, 12f) +val tertiaryContainerDark = hslColor(255f, 15f, 65.0f) +val onTertiaryContainerDark = hslColor(255f, 15f, 12f) +val errorDark = hslColor(7f, 100f, 84f) +val onErrorDark = hslColor(357f, 100f, 21f) +val errorContainerDark = hslColor(355f, 100f, 29f) +val onErrorContainerDark = hslColor(6f, 100f, 92f) +val backgroundDark = hslColor(255f, 60f, 8f) +val onBackgroundDark = hslColor(255f, 60f, 94f) +val surfaceDark = hslColor(255f, 40f, 12f) +val onSurfaceDark = hslColor(255f, 40f, 92f) +val surfaceContainerDark = hslColor(255f, 40f, 12f) diff --git a/app/src/main/java/hu/bbara/purefin/ui/theme/Theme.kt b/app/src/main/java/hu/bbara/purefin/ui/theme/Theme.kt index e367a59..f08402e 100644 --- a/app/src/main/java/hu/bbara/purefin/ui/theme/Theme.kt +++ b/app/src/main/java/hu/bbara/purefin/ui/theme/Theme.kt @@ -5,50 +5,9 @@ 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.runtime.Immutable -import androidx.compose.ui.graphics.Color import androidx.compose.ui.platform.LocalContext -private val lightScheme = lightColorScheme( - primary = primaryLight, - onPrimary = onPrimaryLight, - primaryContainer = primaryContainerLight, - onPrimaryContainer = onPrimaryContainerLight, - secondary = secondaryLight, - onSecondary = onSecondaryLight, - secondaryContainer = secondaryContainerLight, - onSecondaryContainer = onSecondaryContainerLight, - tertiary = tertiaryLight, - onTertiary = onTertiaryLight, - tertiaryContainer = tertiaryContainerLight, - onTertiaryContainer = onTertiaryContainerLight, - error = errorLight, - onError = onErrorLight, - errorContainer = errorContainerLight, - onErrorContainer = onErrorContainerLight, - background = backgroundLight, - onBackground = onBackgroundLight, - surface = surfaceLight, - onSurface = onSurfaceLight, - surfaceVariant = surfaceVariantLight, - onSurfaceVariant = onSurfaceVariantLight, - outline = outlineLight, - outlineVariant = outlineVariantLight, - scrim = scrimLight, - inverseSurface = inverseSurfaceLight, - inverseOnSurface = inverseOnSurfaceLight, - inversePrimary = inversePrimaryLight, - surfaceDim = surfaceDimLight, - surfaceBright = surfaceBrightLight, - surfaceContainerLowest = surfaceContainerLowestLight, - surfaceContainerLow = surfaceContainerLowLight, - surfaceContainer = surfaceContainerLight, - surfaceContainerHigh = surfaceContainerHighLight, - surfaceContainerHighest = surfaceContainerHighestLight, -) - private val darkScheme = darkColorScheme( primary = primaryDark, onPrimary = onPrimaryDark, @@ -70,191 +29,12 @@ private val darkScheme = darkColorScheme( onBackground = onBackgroundDark, surface = surfaceDark, onSurface = onSurfaceDark, - surfaceVariant = surfaceVariantDark, - onSurfaceVariant = onSurfaceVariantDark, - outline = outlineDark, - outlineVariant = outlineVariantDark, - scrim = scrimDark, - inverseSurface = inverseSurfaceDark, - inverseOnSurface = inverseOnSurfaceDark, - inversePrimary = inversePrimaryDark, - surfaceDim = surfaceDimDark, - surfaceBright = surfaceBrightDark, - surfaceContainerLowest = surfaceContainerLowestDark, - surfaceContainerLow = surfaceContainerLowDark, surfaceContainer = surfaceContainerDark, - surfaceContainerHigh = surfaceContainerHighDark, - surfaceContainerHighest = surfaceContainerHighestDark, -) - -private val mediumContrastLightColorScheme = lightColorScheme( - primary = primaryLightMediumContrast, - onPrimary = onPrimaryLightMediumContrast, - primaryContainer = primaryContainerLightMediumContrast, - onPrimaryContainer = onPrimaryContainerLightMediumContrast, - secondary = secondaryLightMediumContrast, - onSecondary = onSecondaryLightMediumContrast, - secondaryContainer = secondaryContainerLightMediumContrast, - onSecondaryContainer = onSecondaryContainerLightMediumContrast, - tertiary = tertiaryLightMediumContrast, - onTertiary = onTertiaryLightMediumContrast, - tertiaryContainer = tertiaryContainerLightMediumContrast, - onTertiaryContainer = onTertiaryContainerLightMediumContrast, - error = errorLightMediumContrast, - onError = onErrorLightMediumContrast, - errorContainer = errorContainerLightMediumContrast, - onErrorContainer = onErrorContainerLightMediumContrast, - background = backgroundLightMediumContrast, - onBackground = onBackgroundLightMediumContrast, - surface = surfaceLightMediumContrast, - onSurface = onSurfaceLightMediumContrast, - surfaceVariant = surfaceVariantLightMediumContrast, - onSurfaceVariant = onSurfaceVariantLightMediumContrast, - outline = outlineLightMediumContrast, - outlineVariant = outlineVariantLightMediumContrast, - scrim = scrimLightMediumContrast, - inverseSurface = inverseSurfaceLightMediumContrast, - inverseOnSurface = inverseOnSurfaceLightMediumContrast, - inversePrimary = inversePrimaryLightMediumContrast, - surfaceDim = surfaceDimLightMediumContrast, - surfaceBright = surfaceBrightLightMediumContrast, - surfaceContainerLowest = surfaceContainerLowestLightMediumContrast, - surfaceContainerLow = surfaceContainerLowLightMediumContrast, - surfaceContainer = surfaceContainerLightMediumContrast, - surfaceContainerHigh = surfaceContainerHighLightMediumContrast, - surfaceContainerHighest = surfaceContainerHighestLightMediumContrast, -) - -private val highContrastLightColorScheme = lightColorScheme( - primary = primaryLightHighContrast, - onPrimary = onPrimaryLightHighContrast, - primaryContainer = primaryContainerLightHighContrast, - onPrimaryContainer = onPrimaryContainerLightHighContrast, - secondary = secondaryLightHighContrast, - onSecondary = onSecondaryLightHighContrast, - secondaryContainer = secondaryContainerLightHighContrast, - onSecondaryContainer = onSecondaryContainerLightHighContrast, - tertiary = tertiaryLightHighContrast, - onTertiary = onTertiaryLightHighContrast, - tertiaryContainer = tertiaryContainerLightHighContrast, - onTertiaryContainer = onTertiaryContainerLightHighContrast, - error = errorLightHighContrast, - onError = onErrorLightHighContrast, - errorContainer = errorContainerLightHighContrast, - onErrorContainer = onErrorContainerLightHighContrast, - background = backgroundLightHighContrast, - onBackground = onBackgroundLightHighContrast, - surface = surfaceLightHighContrast, - onSurface = onSurfaceLightHighContrast, - surfaceVariant = surfaceVariantLightHighContrast, - onSurfaceVariant = onSurfaceVariantLightHighContrast, - outline = outlineLightHighContrast, - outlineVariant = outlineVariantLightHighContrast, - scrim = scrimLightHighContrast, - inverseSurface = inverseSurfaceLightHighContrast, - inverseOnSurface = inverseOnSurfaceLightHighContrast, - inversePrimary = inversePrimaryLightHighContrast, - surfaceDim = surfaceDimLightHighContrast, - surfaceBright = surfaceBrightLightHighContrast, - surfaceContainerLowest = surfaceContainerLowestLightHighContrast, - surfaceContainerLow = surfaceContainerLowLightHighContrast, - surfaceContainer = surfaceContainerLightHighContrast, - surfaceContainerHigh = surfaceContainerHighLightHighContrast, - surfaceContainerHighest = surfaceContainerHighestLightHighContrast, -) - -private val mediumContrastDarkColorScheme = darkColorScheme( - primary = primaryDarkMediumContrast, - onPrimary = onPrimaryDarkMediumContrast, - primaryContainer = primaryContainerDarkMediumContrast, - onPrimaryContainer = onPrimaryContainerDarkMediumContrast, - secondary = secondaryDarkMediumContrast, - onSecondary = onSecondaryDarkMediumContrast, - secondaryContainer = secondaryContainerDarkMediumContrast, - onSecondaryContainer = onSecondaryContainerDarkMediumContrast, - tertiary = tertiaryDarkMediumContrast, - onTertiary = onTertiaryDarkMediumContrast, - tertiaryContainer = tertiaryContainerDarkMediumContrast, - onTertiaryContainer = onTertiaryContainerDarkMediumContrast, - error = errorDarkMediumContrast, - onError = onErrorDarkMediumContrast, - errorContainer = errorContainerDarkMediumContrast, - onErrorContainer = onErrorContainerDarkMediumContrast, - background = backgroundDarkMediumContrast, - onBackground = onBackgroundDarkMediumContrast, - surface = surfaceDarkMediumContrast, - onSurface = onSurfaceDarkMediumContrast, - surfaceVariant = surfaceVariantDarkMediumContrast, - onSurfaceVariant = onSurfaceVariantDarkMediumContrast, - outline = outlineDarkMediumContrast, - outlineVariant = outlineVariantDarkMediumContrast, - scrim = scrimDarkMediumContrast, - inverseSurface = inverseSurfaceDarkMediumContrast, - inverseOnSurface = inverseOnSurfaceDarkMediumContrast, - inversePrimary = inversePrimaryDarkMediumContrast, - surfaceDim = surfaceDimDarkMediumContrast, - surfaceBright = surfaceBrightDarkMediumContrast, - surfaceContainerLowest = surfaceContainerLowestDarkMediumContrast, - surfaceContainerLow = surfaceContainerLowDarkMediumContrast, - surfaceContainer = surfaceContainerDarkMediumContrast, - surfaceContainerHigh = surfaceContainerHighDarkMediumContrast, - surfaceContainerHighest = surfaceContainerHighestDarkMediumContrast, -) - -private val highContrastDarkColorScheme = darkColorScheme( - primary = primaryDarkHighContrast, - onPrimary = onPrimaryDarkHighContrast, - primaryContainer = primaryContainerDarkHighContrast, - onPrimaryContainer = onPrimaryContainerDarkHighContrast, - secondary = secondaryDarkHighContrast, - onSecondary = onSecondaryDarkHighContrast, - secondaryContainer = secondaryContainerDarkHighContrast, - onSecondaryContainer = onSecondaryContainerDarkHighContrast, - tertiary = tertiaryDarkHighContrast, - onTertiary = onTertiaryDarkHighContrast, - tertiaryContainer = tertiaryContainerDarkHighContrast, - onTertiaryContainer = onTertiaryContainerDarkHighContrast, - error = errorDarkHighContrast, - onError = onErrorDarkHighContrast, - errorContainer = errorContainerDarkHighContrast, - onErrorContainer = onErrorContainerDarkHighContrast, - background = backgroundDarkHighContrast, - onBackground = onBackgroundDarkHighContrast, - surface = surfaceDarkHighContrast, - onSurface = onSurfaceDarkHighContrast, - surfaceVariant = surfaceVariantDarkHighContrast, - onSurfaceVariant = onSurfaceVariantDarkHighContrast, - outline = outlineDarkHighContrast, - outlineVariant = outlineVariantDarkHighContrast, - scrim = scrimDarkHighContrast, - inverseSurface = inverseSurfaceDarkHighContrast, - inverseOnSurface = inverseOnSurfaceDarkHighContrast, - inversePrimary = inversePrimaryDarkHighContrast, - surfaceDim = surfaceDimDarkHighContrast, - surfaceBright = surfaceBrightDarkHighContrast, - surfaceContainerLowest = surfaceContainerLowestDarkHighContrast, - surfaceContainerLow = surfaceContainerLowDarkHighContrast, - surfaceContainer = surfaceContainerDarkHighContrast, - surfaceContainerHigh = surfaceContainerHighDarkHighContrast, - 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 ) @Composable fun AppTheme( darkTheme: Boolean = isSystemInDarkTheme(), - // Dynamic color is available on Android 12+ dynamicColor: Boolean = false, content: @Composable() () -> Unit ) { @@ -263,9 +43,8 @@ fun AppTheme( val context = LocalContext.current if (darkTheme) dynamicDarkColorScheme(context) else dynamicLightColorScheme(context) } - darkTheme -> darkScheme - else -> lightScheme + else -> darkScheme } MaterialTheme(