Skip to content

Commit 9c032e2

Browse files
MagicalMeghanMagicalMeghan
authored
Update squish buttons and colors (#1569)
- Updated squish buttons - Updated color file that was overwritten during merge
2 parents ebef59e + 6ae65bc commit 9c032e2

File tree

3 files changed

+267
-214
lines changed

3 files changed

+267
-214
lines changed

‎Jetcaster/core/designsystem/src/main/java/com/example/jetcaster/designsystem/theme/Color.kt‎

Lines changed: 79 additions & 79 deletions
Original file line numberDiff line numberDiff line change
@@ -18,18 +18,18 @@ package com.example.jetcaster.designsystem.theme
1818
import androidx.compose.ui.graphics.Color
1919

2020
val primaryLight = Color(0xFFFF792C)
21-
val onPrimaryLight = Color(0xFFFFECE0)
22-
val primaryContainerLight = Color(0xFFFFDBCC)
23-
val onPrimaryContainerLight = Color(0xFF662500)
24-
val secondaryLight = Color(0xFFFFBD1D)
25-
val onSecondaryLight = Color(0xFF664800)
26-
val secondaryContainerLight = Color(0xFFFFEECC)
27-
val onSecondaryContainerLight = Color(0xFF664800)
28-
val tertiaryLight = Color(0xFFFF8F0F)
29-
val onTertiaryLight = Color(0xFFFFFFFF)
30-
val tertiaryContainerLight = Color(0xFFFFE5CC)
21+
val onPrimaryLight = Color(0xFF626004)
22+
val primaryContainerLight = Color(0xFF313002)
23+
val onPrimaryContainerLight = Color(0xFFFDFCCE)
24+
val secondaryLight = Color(0xFFFFE523)
25+
val onSecondaryLight = Color(0xFF332D00)
26+
val secondaryContainerLight = Color(0xFF998700)
27+
val onSecondaryContainerLight = Color(0xFFFFF9CC)
28+
val tertiaryLight = Color(0xFFFF9AD8)
29+
val onTertiaryLight = Color(0xFF33000A)
30+
val tertiaryContainerLight = Color(0xFF660014)
3131
val onTertiaryContainerLight = Color(0xFF663600)
32-
val errorLight = Color(0xFFBA1A1A)
32+
val errorLight = Color(0xFFFFE5EB)
3333
val onErrorLight = Color(0xFFFFFFFF)
3434
val errorContainerLight = Color(0xFFFFDAD6)
3535
val onErrorContainerLight = Color(0xFF93000A)
@@ -42,29 +42,29 @@ val onSurfaceVariantLight = Color(0xFF49454E)
4242
val outlineLight = Color(0xFF7A757F)
4343
val outlineVariantLight = Color(0xFFCBC4CF)
4444
val scrimLight = Color(0xFF000000)
45-
val inverseSurfaceLight = Color(0xFF322F35)
46-
val inverseOnSurfaceLight = Color(0xFFF5EFF7)
45+
val inverseSurfaceLight = Color(0xFFEFE0D6)
46+
val inverseOnSurfaceLight = Color(0xFF382F28)
4747
val inversePrimaryLight = Color(0xFFD3BCFD)
48-
val surfaceDimLight = Color(0xFFDED8E0)
49-
val surfaceBrightLight = Color(0xFFFEF7FF)
50-
val surfaceContainerLowestLight = Color(0xFFFFFFFF)
51-
val surfaceContainerLowLight = Color(0xFFF8F1FA)
52-
val surfaceContainerLight = Color(0xFFF2ECF4)
53-
val surfaceContainerHighLight = Color(0xFFEDE6EE)
54-
val surfaceContainerHighestLight = Color(0xFFE7E0E8)
48+
val surfaceDimLight = Color(0xFF19120C)
49+
val surfaceBrightLight = Color(0xFF413731)
50+
val surfaceContainerLowestLight = Color(0xFF140D08)
51+
val surfaceContainerLowLight = Color(0xFF221A14)
52+
val surfaceContainerLight = Color(0xFF261E18)
53+
val surfaceContainerHighLight = Color(0xFF312822)
54+
val surfaceContainerHighestLight = Color(0xFF3C332C)
5555

56-
val primaryLightMediumContrast = Color(0xFF3E2C62)
57-
val onPrimaryLightMediumContrast = Color(0xFFFFFFFF)
58-
val primaryContainerLightMediumContrast = Color(0xFF77639D)
59-
val onPrimaryContainerLightMediumContrast = Color(0xFFFFFFFF)
60-
val secondaryLightMediumContrast = Color(0xFF3A3346)
61-
val onSecondaryLightMediumContrast = Color(0xFFFFFFFF)
62-
val secondaryContainerLightMediumContrast = Color(0xFF72697F)
63-
val onSecondaryContainerLightMediumContrast = Color(0xFFFFFFFF)
64-
val tertiaryLightMediumContrast = Color(0xFF512A36)
65-
val onTertiaryLightMediumContrast = Color(0xFFFFFFFF)
66-
val tertiaryContainerLightMediumContrast = Color(0xFF8F606C)
67-
val onTertiaryContainerLightMediumContrast = Color(0xFFFFFFFF)
56+
val primaryLightMediumContrast = Color(0xFFFF792C)
57+
val onPrimaryLightMediumContrast = Color(0xFF626004)
58+
val primaryContainerLightMediumContrast = Color(0xFF313002)
59+
val onPrimaryContainerLightMediumContrast = Color(0xFFFDFCCE)
60+
val secondaryLightMediumContrast = Color(0xFFFFE523)
61+
val onSecondaryLightMediumContrast = Color(0xFF332D00)
62+
val secondaryContainerLightMediumContrast = Color(0xFF998700)
63+
val onSecondaryContainerLightMediumContrast = Color(0xFFFFF9CC)
64+
val tertiaryLightMediumContrast = Color(0xFFFF9AD8)
65+
val onTertiaryLightMediumContrast = Color(0xFF33000A)
66+
val tertiaryContainerLightMediumContrast = Color(0xFF660014)
67+
val onTertiaryContainerLightMediumContrast = Color(0xFFFFE5EB)
6868
val errorLightMediumContrast = Color(0xFF740006)
6969
val onErrorLightMediumContrast = Color(0xFFFFFFFF)
7070
val errorContainerLightMediumContrast = Color(0xFFCF2C27)
@@ -81,13 +81,13 @@ val scrimLightMediumContrast = Color(0xFF000000)
8181
val inverseSurfaceLightMediumContrast = Color(0xFF322F35)
8282
val inverseOnSurfaceLightMediumContrast = Color(0xFFF5EFF7)
8383
val inversePrimaryLightMediumContrast = Color(0xFFD3BCFD)
84-
val surfaceDimLightMediumContrast = Color(0xFFCAC4CC)
85-
val surfaceBrightLightMediumContrast = Color(0xFFFEF7FF)
86-
val surfaceContainerLowestLightMediumContrast = Color(0xFFFFFFFF)
87-
val surfaceContainerLowLightMediumContrast = Color(0xFFF8F1FA)
88-
val surfaceContainerLightMediumContrast = Color(0xFFEDE6EE)
89-
val surfaceContainerHighLightMediumContrast = Color(0xFFE1DBE3)
90-
val surfaceContainerHighestLightMediumContrast = Color(0xFFD6D0D7)
84+
val surfaceDimLightMediumContrast = Color(0xFF19120C)
85+
val surfaceBrightLightMediumContrast = Color(0xFF413731)
86+
val surfaceContainerLowestLightMediumContrast = Color(0xFF140D08)
87+
val surfaceContainerLowLightMediumContrast = Color(0xFF221A14)
88+
val surfaceContainerLightMediumContrast = Color(0xFF261E18)
89+
val surfaceContainerHighLightMediumContrast = Color(0xFF312822)
90+
val surfaceContainerHighestLightMediumContrast = Color(0xFF3C332C)
9191

9292
val primaryLightHighContrast = Color(0xFF342157)
9393
val onPrimaryLightHighContrast = Color(0xFFFFFFFF)
@@ -125,26 +125,26 @@ val surfaceContainerLightHighContrast = Color(0xFFE7E0E8)
125125
val surfaceContainerHighLightHighContrast = Color(0xFFD8D2DA)
126126
val surfaceContainerHighestLightHighContrast = Color(0xFFCAC4CC)
127127

128-
val primaryDark = Color(0xFFFF792C)
129-
val onPrimaryDark = Color(0xFFFFECE0)
130-
val primaryContainerDark = Color(0xFF703717)
131-
val onPrimaryContainerDark = Color(0xFFFFDBCC)
132-
val secondaryDark = Color(0xFFFFBD1D)
133-
val onSecondaryDark = Color(0xFF412D00)
134-
val secondaryContainerDark = Color(0xFFF0C470)
135-
val onSecondaryContainerDark = Color(0xFF704700)
136-
val tertiaryDark = Color(0xFFFF8F0F)
137-
val onTertiaryDark = Color(0xFF663600)
138-
val tertiaryContainerDark = Color(0xFF6C3A06)
139-
val onTertiaryContainerDark = Color(0xFFFFDCC2)
128+
val primaryDark = Color(0xFFF0FCB0)
129+
val onPrimaryDark = Color(0xFF626004)
130+
val primaryContainerDark = Color(0xFF313002)
131+
val onPrimaryContainerDark = Color(0xFFFDFCCE)
132+
val secondaryDark = Color(0xFFFFE523)
133+
val onSecondaryDark = Color(0xFF332D00)
134+
val secondaryContainerDark = Color(0xFF998700)
135+
val onSecondaryContainerDark = Color(0xFFFFF9CC)
136+
val tertiaryDark = Color(0xFFFF9AD8)
137+
val onTertiaryDark = Color(0xFF33000A)
138+
val tertiaryContainerDark = Color(0xFF660014)
139+
val onTertiaryContainerDark = Color(0xFFFFE5EB)
140140
val errorDark = Color(0xFFFFB4AB)
141141
val onErrorDark = Color(0xFF690005)
142142
val errorContainerDark = Color(0xFF93000A)
143143
val onErrorContainerDark = Color(0xFFFFDAD6)
144144
val backgroundDark = Color(0xFF151218)
145145
val onBackgroundDark = Color(0xFFE7E0E8)
146-
val surfaceDark = Color(0xFF151218)
147-
val onSurfaceDark = Color(0xFFE7E0E8)
146+
val surfaceDark = Color(0xFF261604)
147+
val onSurfaceDark = Color(0xFFFBEDE4)
148148
val surfaceVariantDark = Color(0xFF49454E)
149149
val onSurfaceVariantDark = Color(0xFFCBC4CF)
150150
val outlineDark = Color(0xFF948F99)
@@ -161,18 +161,18 @@ val surfaceContainerDark = Color(0xFF261E18)
161161
val surfaceContainerHighDark = Color(0xFF312822)
162162
val surfaceContainerHighestDark = Color(0xFF3C332C)
163163

164-
val primaryDarkMediumContrast = Color(0xFFFDB186)
165-
val onPrimaryDarkMediumContrast = Color(0xFF2C0C00)
166-
val primaryContainerDarkMediumContrast = Color(0xFFC97E59)
167-
val onPrimaryContainerDarkMediumContrast = Color(0xFF000000)
168-
val secondaryDarkMediumContrast = Color(0xFFF0C470)
169-
val onSecondaryDarkMediumContrast = Color(0xFF201400)
170-
val secondaryContainerDarkMediumContrast = Color(0xFFB18B3D)
171-
val onSecondaryContainerDarkMediumContrast = Color(0xFF664800)
172-
val tertiaryDarkMediumContrast = Color(0xFFFFBD87)
173-
val onTertiaryDarkMediumContrast = Color(0xFF663600)
174-
val tertiaryContainerDarkMediumContrast = Color(0xFFC3824A)
175-
val onTertiaryContainerDarkMediumContrast = Color(0xFF663600)
164+
val primaryDarkMediumContrast = Color(0xFFF0FCB0)
165+
val onPrimaryDarkMediumContrast = Color(0xFF626004)
166+
val primaryContainerDarkMediumContrast = Color(0xFF313002)
167+
val onPrimaryContainerDarkMediumContrast = Color(0xFFFDFCCE)
168+
val secondaryDarkMediumContrast = Color(0xFFFFE523)
169+
val onSecondaryDarkMediumContrast = Color(0xFF332D00)
170+
val secondaryContainerDarkMediumContrast = Color(0xFF998700)
171+
val onSecondaryContainerDarkMediumContrast = Color(0xFFFFF9CC)
172+
val tertiaryDarkMediumContrast = Color(0xFFFF9AD8)
173+
val onTertiaryDarkMediumContrast = Color(0xFF33000A)
174+
val tertiaryContainerDarkMediumContrast = Color(0xFF660014)
175+
val onTertiaryContainerDarkMediumContrast = Color(0xFFFFE5EB)
176176
val errorDarkMediumContrast = Color(0xFFFFD2CC)
177177
val onErrorDarkMediumContrast = Color(0xFF540003)
178178
val errorContainerDarkMediumContrast = Color(0xFFFF5449)
@@ -187,8 +187,8 @@ val outlineDarkMediumContrast = Color(0xFFB6B0BA)
187187
val outlineVariantDarkMediumContrast = Color(0xFF948E98)
188188
val scrimDarkMediumContrast = Color(0xFF000000)
189189
val inverseSurfaceDarkMediumContrast = Color(0xFFE7E0E8)
190-
val inverseOnSurfaceDarkMediumContrast = Color(0xFF2C292F)
191-
val inversePrimaryDarkMediumContrast = Color(0xFF513E75)
190+
val inverseOnSurfaceDarkMediumContrast = Color(0xFF322F35)
191+
val inversePrimaryDarkMediumContrast = Color(0xFF68548E)
192192
val surfaceDimDarkMediumContrast = Color(0xFF19120C)
193193
val surfaceBrightDarkMediumContrast = Color(0xFF413731)
194194
val surfaceContainerLowestDarkMediumContrast = Color(0xFF140D08)
@@ -197,18 +197,18 @@ val surfaceContainerDarkMediumContrast = Color(0xFF261E18)
197197
val surfaceContainerHighDarkMediumContrast = Color(0xFF312822)
198198
val surfaceContainerHighestDarkMediumContrast = Color(0xFF3C332C)
199199

200-
val primaryDarkHighContrast = Color(0xFFFFF9F8)
201-
val onPrimaryDarkHighContrast = Color(0xFF000000)
202-
val primaryContainerDarkHighContrast = Color(0xFFFFBC9C)
203-
val onPrimaryContainerDarkHighContrast = Color(0xFF662500)
204-
val secondaryDarkHighContrast = Color(0xFFFFFAF7)
205-
val onSecondaryDarkHighContrast = Color(0xFF000000)
206-
val secondaryContainerDarkHighContrast = Color(0xFFF0C470)
207-
val onSecondaryContainerDarkHighContrast = Color(0xFF664800)
208-
val tertiaryDarkHighContrast = Color(0xFFFFE5CC)
209-
val onTertiaryDarkHighContrast = Color(0xFF000000)
210-
val tertiaryContainerDarkHighContrast = Color(0xFFFFBD87)
211-
val onTertiaryContainerDarkHighContrast = Color(0xFF000000)
200+
val primaryDarkHighContrast = Color(0xFFF0FCB0)
201+
val onPrimaryDarkHighContrast = Color(0xFF626004)
202+
val primaryContainerDarkHighContrast = Color(0xFF313002)
203+
val onPrimaryContainerDarkHighContrast = Color(0xFFFDFCCE)
204+
val secondaryDarkHighContrast = Color(0xFFFFE523)
205+
val onSecondaryDarkHighContrast = Color(0xFF332D00)
206+
val secondaryContainerDarkHighContrast = Color(0xFF998700)
207+
val onSecondaryContainerDarkHighContrast = Color(0xFFFFF9CC)
208+
val tertiaryDarkHighContrast = Color(0xFFFF9AD8)
209+
val onTertiaryDarkHighContrast = Color(0xFF33000A)
210+
val tertiaryContainerDarkHighContrast = Color(0xFF660014)
211+
val onTertiaryContainerDarkHighContrast = Color(0xFFFFE5EB)
212212
val errorDarkHighContrast = Color(0xFFFFECE9)
213213
val onErrorDarkHighContrast = Color(0xFF000000)
214214
val errorContainerDarkHighContrast = Color(0xFFFFAEA4)

0 commit comments

Comments
 (0)