Skip to content

[Jetcaster] Reverted colors #1583

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
wants to merge 1 commit into
base: main
Choose a base branch
from
+79 −79
Draft

[Jetcaster] Reverted colors #1583

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
158 changes: 79 additions & 79 deletions Jetcaster/core/designsystem/src/main/java/com/example/jetcaster/designsystem/theme/Color.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,18 +18,18 @@ package com.example.jetcaster.designsystem.theme
import androidx.compose.ui.graphics.Color

val primaryLight = Color(0xFFFF792C)
val onPrimaryLight = Color(0xFF626004)
val primaryContainerLight = Color(0xFF313002)
val onPrimaryContainerLight = Color(0xFFFDFCCE)
val secondaryLight = Color(0xFFFFE523)
val onSecondaryLight = Color(0xFF332D00)
val secondaryContainerLight = Color(0xFF998700)
val onSecondaryContainerLight = Color(0xFFFFF9CC)
val tertiaryLight = Color(0xFFFF9AD8)
val onTertiaryLight = Color(0xFF33000A)
val tertiaryContainerLight = Color(0xFF660014)
val onPrimaryLight = Color(0xFFFFECE0)
val primaryContainerLight = Color(0xFFFFDBCC)
val onPrimaryContainerLight = Color(0xFF662500)
val secondaryLight = Color(0xFFFFBD1D)
val onSecondaryLight = Color(0xFF664800)
val secondaryContainerLight = Color(0xFFFFEECC)
val onSecondaryContainerLight = Color(0xFF664800)
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

medium

The value for onSecondaryContainerLight is the same as onSecondaryLight (line 25). In other color groups (like primary and tertiary) and in the dark theme, the on... and on...Container colors are distinct. Is this intentional? If this is a copy-paste error, it should be corrected to maintain consistency and avoid potential display issues.

val tertiaryLight = Color(0xFFFF8F0F)
val onTertiaryLight = Color(0xFFFFFFFF)
val tertiaryContainerLight = Color(0xFFFFE5CC)
val onTertiaryContainerLight = Color(0xFF663600)
val errorLight = Color(0xFFFFE5EB)
val errorLight = Color(0xFFBA1A1A)
val onErrorLight = Color(0xFFFFFFFF)
val errorContainerLight = Color(0xFFFFDAD6)
val onErrorContainerLight = Color(0xFF93000A)
Expand All @@ -42,29 +42,29 @@ val onSurfaceVariantLight = Color(0xFF49454E)
val outlineLight = Color(0xFF7A757F)
val outlineVariantLight = Color(0xFFCBC4CF)
val scrimLight = Color(0xFF000000)
val inverseSurfaceLight = Color(0xFFEFE0D6)
val inverseOnSurfaceLight = Color(0xFF382F28)
val inverseSurfaceLight = Color(0xFF322F35)
val inverseOnSurfaceLight = Color(0xFFF5EFF7)
val inversePrimaryLight = Color(0xFFD3BCFD)
val surfaceDimLight = Color(0xFF19120C)
val surfaceBrightLight = Color(0xFF413731)
val surfaceContainerLowestLight = Color(0xFF140D08)
val surfaceContainerLowLight = Color(0xFF221A14)
val surfaceContainerLight = Color(0xFF261E18)
val surfaceContainerHighLight = Color(0xFF312822)
val surfaceContainerHighestLight = Color(0xFF3C332C)
val surfaceDimLight = Color(0xFFDED8E0)
val surfaceBrightLight = Color(0xFFFEF7FF)
val surfaceContainerLowestLight = Color(0xFFFFFFFF)
val surfaceContainerLowLight = Color(0xFFF8F1FA)
val surfaceContainerLight = Color(0xFFF2ECF4)
val surfaceContainerHighLight = Color(0xFFEDE6EE)
val surfaceContainerHighestLight = Color(0xFFE7E0E8)

val primaryLightMediumContrast = Color(0xFFFF792C)
val onPrimaryLightMediumContrast = Color(0xFF626004)
val primaryContainerLightMediumContrast = Color(0xFF313002)
val onPrimaryContainerLightMediumContrast = Color(0xFFFDFCCE)
val secondaryLightMediumContrast = Color(0xFFFFE523)
val onSecondaryLightMediumContrast = Color(0xFF332D00)
val secondaryContainerLightMediumContrast = Color(0xFF998700)
val onSecondaryContainerLightMediumContrast = Color(0xFFFFF9CC)
val tertiaryLightMediumContrast = Color(0xFFFF9AD8)
val onTertiaryLightMediumContrast = Color(0xFF33000A)
val tertiaryContainerLightMediumContrast = Color(0xFF660014)
val onTertiaryContainerLightMediumContrast = Color(0xFFFFE5EB)
val primaryLightMediumContrast = Color(0xFF3E2C62)
val onPrimaryLightMediumContrast = Color(0xFFFFFFFF)
val primaryContainerLightMediumContrast = Color(0xFF77639D)
val onPrimaryContainerLightMediumContrast = Color(0xFFFFFFFF)
val secondaryLightMediumContrast = Color(0xFF3A3346)
val onSecondaryLightMediumContrast = Color(0xFFFFFFFF)
val secondaryContainerLightMediumContrast = Color(0xFF72697F)
val onSecondaryContainerLightMediumContrast = Color(0xFFFFFFFF)
val tertiaryLightMediumContrast = Color(0xFF512A36)
val onTertiaryLightMediumContrast = Color(0xFFFFFFFF)
val tertiaryContainerLightMediumContrast = Color(0xFF8F606C)
val onTertiaryContainerLightMediumContrast = Color(0xFFFFFFFF)
Comment on lines +66 to +67
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

high

The contrast ratio between onTertiaryContainerLightMediumContrast (#FFFFFF) and tertiaryContainerLightMediumContrast (#8F606C) is approximately 4.2:1. This is below the WCAG AA requirement of 4.5:1 for normal text. While it passes for large text, it could be an accessibility issue for smaller UI elements or text. Please verify if this is the intended contrast level or if a color with higher contrast should be used.

val errorLightMediumContrast = Color(0xFF740006)
val onErrorLightMediumContrast = Color(0xFFFFFFFF)
val errorContainerLightMediumContrast = Color(0xFFCF2C27)
Expand All @@ -81,13 +81,13 @@ val scrimLightMediumContrast = Color(0xFF000000)
val inverseSurfaceLightMediumContrast = Color(0xFF322F35)
val inverseOnSurfaceLightMediumContrast = Color(0xFFF5EFF7)
val inversePrimaryLightMediumContrast = Color(0xFFD3BCFD)
val surfaceDimLightMediumContrast = Color(0xFF19120C)
val surfaceBrightLightMediumContrast = Color(0xFF413731)
val surfaceContainerLowestLightMediumContrast = Color(0xFF140D08)
val surfaceContainerLowLightMediumContrast = Color(0xFF221A14)
val surfaceContainerLightMediumContrast = Color(0xFF261E18)
val surfaceContainerHighLightMediumContrast = Color(0xFF312822)
val surfaceContainerHighestLightMediumContrast = Color(0xFF3C332C)
val surfaceDimLightMediumContrast = Color(0xFFCAC4CC)
val surfaceBrightLightMediumContrast = Color(0xFFFEF7FF)
val surfaceContainerLowestLightMediumContrast = Color(0xFFFFFFFF)
val surfaceContainerLowLightMediumContrast = Color(0xFFF8F1FA)
val surfaceContainerLightMediumContrast = Color(0xFFEDE6EE)
val surfaceContainerHighLightMediumContrast = Color(0xFFE1DBE3)
val surfaceContainerHighestLightMediumContrast = Color(0xFFD6D0D7)

val primaryLightHighContrast = Color(0xFF342157)
val onPrimaryLightHighContrast = Color(0xFFFFFFFF)
Expand Down Expand Up @@ -125,26 +125,26 @@ val surfaceContainerLightHighContrast = Color(0xFFE7E0E8)
val surfaceContainerHighLightHighContrast = Color(0xFFD8D2DA)
val surfaceContainerHighestLightHighContrast = Color(0xFFCAC4CC)

val primaryDark = Color(0xFFF0FCB0)
val onPrimaryDark = Color(0xFF626004)
val primaryContainerDark = Color(0xFF313002)
val onPrimaryContainerDark = Color(0xFFFDFCCE)
val secondaryDark = Color(0xFFFFE523)
val onSecondaryDark = Color(0xFF332D00)
val secondaryContainerDark = Color(0xFF998700)
val onSecondaryContainerDark = Color(0xFFFFF9CC)
val tertiaryDark = Color(0xFFFF9AD8)
val onTertiaryDark = Color(0xFF33000A)
val tertiaryContainerDark = Color(0xFF660014)
val onTertiaryContainerDark = Color(0xFFFFE5EB)
val primaryDark = Color(0xFFFF792C)
val onPrimaryDark = Color(0xFFFFECE0)
Comment on lines +128 to +129
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

critical

The contrast ratio between onPrimaryDark (#FFFFECE0) and primaryDark (#FFFF792C) is approximately 1.55:1, which is far below the minimum WCAG AA requirement of 4.5:1 for normal text (or 3:1 for large text). This will make text or icons using these colors unreadable. Please correct the value of onPrimaryDark to ensure sufficient contrast.

val primaryContainerDark = Color(0xFF703717)
val onPrimaryContainerDark = Color(0xFFFFDBCC)
val secondaryDark = Color(0xFFFFBD1D)
val onSecondaryDark = Color(0xFF412D00)
val secondaryContainerDark = Color(0xFFF0C470)
val onSecondaryContainerDark = Color(0xFF704700)
Comment on lines +134 to +135
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

medium

The contrast ratio between onSecondaryContainerDark (#FF704700) and secondaryContainerDark (#FFF0C470) is approximately 3.01:1. This meets the minimum WCAG AA requirement for large text (3:1), but it's on the very edge and fails for normal-sized text (which requires 4.5:1). Consider slightly adjusting one of the colors to improve readability, especially if it's used for smaller text elements.

val tertiaryDark = Color(0xFFFF8F0F)
val onTertiaryDark = Color(0xFF663600)
Comment on lines +136 to +137
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

medium

The contrast ratio between onTertiaryDark (#FF663600) and tertiaryDark (#FFFF8F0F) is approximately 3.05:1. This meets the WCAG AA requirement for large text but not for normal text. Please review if this provides sufficient readability for its intended use cases.

val tertiaryContainerDark = Color(0xFF6C3A06)
val onTertiaryContainerDark = Color(0xFFFFDCC2)
val errorDark = Color(0xFFFFB4AB)
val onErrorDark = Color(0xFF690005)
val errorContainerDark = Color(0xFF93000A)
val onErrorContainerDark = Color(0xFFFFDAD6)
val backgroundDark = Color(0xFF151218)
val onBackgroundDark = Color(0xFFE7E0E8)
val surfaceDark = Color(0xFF261604)
val onSurfaceDark = Color(0xFFFBEDE4)
val surfaceDark = Color(0xFF151218)
val onSurfaceDark = Color(0xFFE7E0E8)
val surfaceVariantDark = Color(0xFF49454E)
val onSurfaceVariantDark = Color(0xFFCBC4CF)
val outlineDark = Color(0xFF948F99)
Expand All @@ -161,18 +161,18 @@ val surfaceContainerDark = Color(0xFF261E18)
val surfaceContainerHighDark = Color(0xFF312822)
val surfaceContainerHighestDark = Color(0xFF3C332C)

val primaryDarkMediumContrast = Color(0xFFF0FCB0)
val onPrimaryDarkMediumContrast = Color(0xFF626004)
val primaryContainerDarkMediumContrast = Color(0xFF313002)
val onPrimaryContainerDarkMediumContrast = Color(0xFFFDFCCE)
val secondaryDarkMediumContrast = Color(0xFFFFE523)
val onSecondaryDarkMediumContrast = Color(0xFF332D00)
val secondaryContainerDarkMediumContrast = Color(0xFF998700)
val onSecondaryContainerDarkMediumContrast = Color(0xFFFFF9CC)
val tertiaryDarkMediumContrast = Color(0xFFFF9AD8)
val onTertiaryDarkMediumContrast = Color(0xFF33000A)
val tertiaryContainerDarkMediumContrast = Color(0xFF660014)
val onTertiaryContainerDarkMediumContrast = Color(0xFFFFE5EB)
val primaryDarkMediumContrast = Color(0xFFFDB186)
val onPrimaryDarkMediumContrast = Color(0xFF2C0C00)
val primaryContainerDarkMediumContrast = Color(0xFFC97E59)
val onPrimaryContainerDarkMediumContrast = Color(0xFF000000)
val secondaryDarkMediumContrast = Color(0xFFF0C470)
val onSecondaryDarkMediumContrast = Color(0xFF201400)
val secondaryContainerDarkMediumContrast = Color(0xFFB18B3D)
val onSecondaryContainerDarkMediumContrast = Color(0xFF664800)
Comment on lines +170 to +171
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

critical

The contrast ratio between onSecondaryContainerDarkMediumContrast (#FF664800) and secondaryContainerDarkMediumContrast (#FFB18B3D) is approximately 1.55:1. This is well below accessibility standards and will make content unreadable. Please correct these values.

val tertiaryDarkMediumContrast = Color(0xFFFFBD87)
val onTertiaryDarkMediumContrast = Color(0xFF663600)
val tertiaryContainerDarkMediumContrast = Color(0xFFC3824A)
val onTertiaryContainerDarkMediumContrast = Color(0xFF663600)
Comment on lines +174 to +175
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

critical

The contrast ratio between onTertiaryContainerDarkMediumContrast (#FF663600) and tertiaryContainerDarkMediumContrast (#FFC3824A) is approximately 2.15:1, which does not meet minimum accessibility requirements. Note that onTertiaryContainerDarkMediumContrast has the same value as onTertiaryDarkMediumContrast, which is likely an error. Please adjust the colors to provide sufficient contrast.

val errorDarkMediumContrast = Color(0xFFFFD2CC)
val onErrorDarkMediumContrast = Color(0xFF540003)
val errorContainerDarkMediumContrast = Color(0xFFFF5449)
Expand All @@ -187,8 +187,8 @@ val outlineDarkMediumContrast = Color(0xFFB6B0BA)
val outlineVariantDarkMediumContrast = Color(0xFF948E98)
val scrimDarkMediumContrast = Color(0xFF000000)
val inverseSurfaceDarkMediumContrast = Color(0xFFE7E0E8)
val inverseOnSurfaceDarkMediumContrast = Color(0xFF322F35)
val inversePrimaryDarkMediumContrast = Color(0xFF68548E)
val inverseOnSurfaceDarkMediumContrast = Color(0xFF2C292F)
val inversePrimaryDarkMediumContrast = Color(0xFF513E75)
val surfaceDimDarkMediumContrast = Color(0xFF19120C)
val surfaceBrightDarkMediumContrast = Color(0xFF413731)
val surfaceContainerLowestDarkMediumContrast = Color(0xFF140D08)
Expand All @@ -197,18 +197,18 @@ val surfaceContainerDarkMediumContrast = Color(0xFF261E18)
val surfaceContainerHighDarkMediumContrast = Color(0xFF312822)
val surfaceContainerHighestDarkMediumContrast = Color(0xFF3C332C)

val primaryDarkHighContrast = Color(0xFFF0FCB0)
val onPrimaryDarkHighContrast = Color(0xFF626004)
val primaryContainerDarkHighContrast = Color(0xFF313002)
val onPrimaryContainerDarkHighContrast = Color(0xFFFDFCCE)
val secondaryDarkHighContrast = Color(0xFFFFE523)
val onSecondaryDarkHighContrast = Color(0xFF332D00)
val secondaryContainerDarkHighContrast = Color(0xFF998700)
val onSecondaryContainerDarkHighContrast = Color(0xFFFFF9CC)
val tertiaryDarkHighContrast = Color(0xFFFF9AD8)
val onTertiaryDarkHighContrast = Color(0xFF33000A)
val tertiaryContainerDarkHighContrast = Color(0xFF660014)
val onTertiaryContainerDarkHighContrast = Color(0xFFFFE5EB)
val primaryDarkHighContrast = Color(0xFFFFF9F8)
val onPrimaryDarkHighContrast = Color(0xFF000000)
val primaryContainerDarkHighContrast = Color(0xFFFFBC9C)
val onPrimaryContainerDarkHighContrast = Color(0xFF662500)
Comment on lines +202 to +203
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

high

The contrast ratio between onPrimaryContainerDarkHighContrast (#FF662500) and primaryContainerDarkHighContrast (#FFFFBC9C) is approximately 3.03:1. For a 'High Contrast' theme, this is very low. It does not meet WCAG AA standards for normal text (4.5:1), and barely meets it for large text (3:1). High contrast themes should aim for much higher contrast ratios, typically 7:1 or more.

val secondaryDarkHighContrast = Color(0xFFFFFAF7)
val onSecondaryDarkHighContrast = Color(0xFF000000)
val secondaryContainerDarkHighContrast = Color(0xFFF0C470)
val onSecondaryContainerDarkHighContrast = Color(0xFF664800)
Comment on lines +206 to +207
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

high

The contrast ratio between onSecondaryContainerDarkHighContrast (#FF664800) and secondaryContainerDarkHighContrast (#FFF0C470) is approximately 3.01:1. This is insufficient for a 'High Contrast' theme and fails to meet WCAG AA guidelines for normal text. Please select colors that provide a significantly higher contrast ratio.

val tertiaryDarkHighContrast = Color(0xFFFFE5CC)
val onTertiaryDarkHighContrast = Color(0xFF000000)
val tertiaryContainerDarkHighContrast = Color(0xFFFFBD87)
val onTertiaryContainerDarkHighContrast = Color(0xFF000000)
val errorDarkHighContrast = Color(0xFFFFECE9)
val onErrorDarkHighContrast = Color(0xFF000000)
val errorContainerDarkHighContrast = Color(0xFFFFAEA4)
Expand Down