Skip to content

Update squish buttons and colors #1569

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

Merged
merged 2 commits into from
May 19, 2025
Merged

Update squish buttons and colors #1569

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d7cf0d6
Update material expressive
MagicalMeghan May 19, 2025
6ae65bc
Update PlayerScreen.kt
MagicalMeghan May 19, 2025
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(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)
val tertiaryLight = Color(0xFFFF8F0F)
val onTertiaryLight = Color(0xFFFFFFFF)
val tertiaryContainerLight = Color(0xFFFFE5CC)
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 onTertiaryContainerLight = Color(0xFF663600)
val errorLight = Color(0xFFBA1A1A)
val errorLight = Color(0xFFFFE5EB)
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(0xFF322F35)
val inverseOnSurfaceLight = Color(0xFFF5EFF7)
val inverseSurfaceLight = Color(0xFFEFE0D6)
val inverseOnSurfaceLight = Color(0xFF382F28)
val inversePrimaryLight = Color(0xFFD3BCFD)
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 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 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)
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 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(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 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 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(0xFFFF792C)
val onPrimaryDark = Color(0xFFFFECE0)
val primaryContainerDark = Color(0xFF703717)
val onPrimaryContainerDark = Color(0xFFFFDBCC)
val secondaryDark = Color(0xFFFFBD1D)
val onSecondaryDark = Color(0xFF412D00)
val secondaryContainerDark = Color(0xFFF0C470)
val onSecondaryContainerDark = Color(0xFF704700)
val tertiaryDark = Color(0xFFFF8F0F)
val onTertiaryDark = Color(0xFF663600)
val tertiaryContainerDark = Color(0xFF6C3A06)
val onTertiaryContainerDark = Color(0xFFFFDCC2)
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 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(0xFF151218)
val onSurfaceDark = Color(0xFFE7E0E8)
val surfaceDark = Color(0xFF261604)
val onSurfaceDark = Color(0xFFFBEDE4)
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(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)
val tertiaryDarkMediumContrast = Color(0xFFFFBD87)
val onTertiaryDarkMediumContrast = Color(0xFF663600)
val tertiaryContainerDarkMediumContrast = Color(0xFFC3824A)
val onTertiaryContainerDarkMediumContrast = Color(0xFF663600)
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 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(0xFF2C292F)
val inversePrimaryDarkMediumContrast = Color(0xFF513E75)
val inverseOnSurfaceDarkMediumContrast = Color(0xFF322F35)
val inversePrimaryDarkMediumContrast = Color(0xFF68548E)
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(0xFFFFF9F8)
val onPrimaryDarkHighContrast = Color(0xFF000000)
val primaryContainerDarkHighContrast = Color(0xFFFFBC9C)
val onPrimaryContainerDarkHighContrast = Color(0xFF662500)
val secondaryDarkHighContrast = Color(0xFFFFFAF7)
val onSecondaryDarkHighContrast = Color(0xFF000000)
val secondaryContainerDarkHighContrast = Color(0xFFF0C470)
val onSecondaryContainerDarkHighContrast = Color(0xFF664800)
val tertiaryDarkHighContrast = Color(0xFFFFE5CC)
val onTertiaryDarkHighContrast = Color(0xFF000000)
val tertiaryContainerDarkHighContrast = Color(0xFFFFBD87)
val onTertiaryContainerDarkHighContrast = Color(0xFF000000)
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 errorDarkHighContrast = Color(0xFFFFECE9)
val onErrorDarkHighContrast = Color(0xFF000000)
val errorContainerDarkHighContrast = Color(0xFFFFAEA4)
Expand Down
Loading