Skip to content

Commit d61b61b

Browse files
alekshawtfalekshawtf
committed
upd (*) color scheme
1 parent 787cd08 commit d61b61b

File tree

3 files changed

+359
-62
lines changed

3 files changed

+359
-62
lines changed

‎template/shared/presentation/src/commonMain/kotlin/shared/presentation/ui/theme/DsThemes.kt‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,19 @@
11
package shared.presentation.ui.theme
22

3-
import shared.presentation.ui.theme.m3.darkScheme
4-
import shared.presentation.ui.theme.m3.lightScheme
3+
import shared.presentation.ui.theme.m3.highContrastDarkColorScheme
4+
import shared.presentation.ui.theme.m3.highContrastLightColorScheme
55

66
object DsThemes {
77

88
val Light = DsTheme(
99
id = "light",
1010
dark = false,
11-
colorScheme = lightScheme
11+
colorScheme = highContrastLightColorScheme
1212
)
1313

1414
val Dark = DsTheme(
1515
id = "dark",
1616
dark = true,
17-
colorScheme = darkScheme
17+
colorScheme = highContrastDarkColorScheme
1818
)
1919
}

‎template/shared/presentation/src/commonMain/kotlin/shared/presentation/ui/theme/m3/Color.kt‎

Lines changed: 201 additions & 57 deletions
Original file line numberDiff line numberDiff line change
@@ -2,74 +2,218 @@ package shared.presentation.ui.theme.m3
22

33
import androidx.compose.ui.graphics.Color
44

5-
val primaryLight = Color(0xFF415F91)
5+
val primaryLight = Color(0xFF000000)
66
val onPrimaryLight = Color(0xFFFFFFFF)
7-
val primaryContainerLight = Color(0xFFD6E3FF)
8-
val onPrimaryContainerLight = Color(0xFF001B3E)
9-
val secondaryLight = Color(0xFF565F71)
7+
val primaryContainerLight = Color(0xFF1B1B1B)
8+
val onPrimaryContainerLight = Color(0xFF848484)
9+
val secondaryLight = Color(0xFF5E5E5E)
1010
val onSecondaryLight = Color(0xFFFFFFFF)
11-
val secondaryContainerLight = Color(0xFFDAE2F9)
12-
val onSecondaryContainerLight = Color(0xFF131C2B)
13-
val tertiaryLight = Color(0xFF705575)
11+
val secondaryContainerLight = Color(0xFFE2E2E2)
12+
val onSecondaryContainerLight = Color(0xFF646464)
13+
val tertiaryLight = Color(0xFF000000)
1414
val onTertiaryLight = Color(0xFFFFFFFF)
15-
val tertiaryContainerLight = Color(0xFFFAD8FD)
16-
val onTertiaryContainerLight = Color(0xFF28132E)
15+
val tertiaryContainerLight = Color(0xFF1B1B1B)
16+
val onTertiaryContainerLight = Color(0xFF848484)
1717
val errorLight = Color(0xFFBA1A1A)
1818
val onErrorLight = Color(0xFFFFFFFF)
1919
val errorContainerLight = Color(0xFFFFDAD6)
20-
val onErrorContainerLight = Color(0xFF410002)
21-
val backgroundLight = Color(0xFFF9F9FF)
22-
val onBackgroundLight = Color(0xFF191C20)
23-
val surfaceLight = Color(0xFFF9F9FF)
24-
val onSurfaceLight = Color(0xFF191C20)
25-
val surfaceVariantLight = Color(0xFFE0E2EC)
26-
val onSurfaceVariantLight = Color(0xFF44474E)
27-
val outlineLight = Color(0xFF74777F)
28-
val outlineVariantLight = Color(0xFFC4C6D0)
20+
val onErrorContainerLight = Color(0xFF93000A)
21+
val backgroundLight = Color(0xFFF9F9F9)
22+
val onBackgroundLight = Color(0xFF1B1B1B)
23+
val surfaceLight = Color(0xFFF9F9F9)
24+
val onSurfaceLight = Color(0xFF1B1B1B)
25+
val surfaceVariantLight = Color(0xFFEBE0E1)
26+
val onSurfaceVariantLight = Color(0xFF4C4546)
27+
val outlineLight = Color(0xFF7E7576)
28+
val outlineVariantLight = Color(0xFFCFC4C5)
2929
val scrimLight = Color(0xFF000000)
30-
val inverseSurfaceLight = Color(0xFF2E3036)
31-
val inverseOnSurfaceLight = Color(0xFFF0F0F7)
32-
val inversePrimaryLight = Color(0xFFAAC7FF)
33-
val surfaceDimLight = Color(0xFFD9D9E0)
34-
val surfaceBrightLight = Color(0xFFF9F9FF)
30+
val inverseSurfaceLight = Color(0xFF303030)
31+
val inverseOnSurfaceLight = Color(0xFFF1F1F1)
32+
val inversePrimaryLight = Color(0xFFC6C6C6)
33+
val surfaceDimLight = Color(0xFFDADADA)
34+
val surfaceBrightLight = Color(0xFFF9F9F9)
3535
val surfaceContainerLowestLight = Color(0xFFFFFFFF)
36-
val surfaceContainerLowLight = Color(0xFFF3F3FA)
37-
val surfaceContainerLight = Color(0xFFEDEDF4)
38-
val surfaceContainerHighLight = Color(0xFFE7E8EE)
39-
val surfaceContainerHighestLight = Color(0xFFE2E2E9)
36+
val surfaceContainerLowLight = Color(0xFFF3F3F3)
37+
val surfaceContainerLight = Color(0xFFEEEEEE)
38+
val surfaceContainerHighLight = Color(0xFFE8E8E8)
39+
val surfaceContainerHighestLight = Color(0xFFE2E2E2)
4040

41-
val primaryDark = Color(0xFFAAC7FF)
42-
val onPrimaryDark = Color(0xFF0A305F)
43-
val primaryContainerDark = Color(0xFF284777)
44-
val onPrimaryContainerDark = Color(0xFFD6E3FF)
45-
val secondaryDark = Color(0xFFBEC6DC)
46-
val onSecondaryDark = Color(0xFF283141)
47-
val secondaryContainerDark = Color(0xFF3E4759)
48-
val onSecondaryContainerDark = Color(0xFFDAE2F9)
49-
val tertiaryDark = Color(0xFFDDBCE0)
50-
val onTertiaryDark = Color(0xFF3F2844)
51-
val tertiaryContainerDark = Color(0xFF573E5C)
52-
val onTertiaryContainerDark = Color(0xFFFAD8FD)
41+
val primaryLightMediumContrast = Color(0xFF000000)
42+
val onPrimaryLightMediumContrast = Color(0xFFFFFFFF)
43+
val primaryContainerLightMediumContrast = Color(0xFF1B1B1B)
44+
val onPrimaryContainerLightMediumContrast = Color(0xFFA7A7A7)
45+
val secondaryLightMediumContrast = Color(0xFF363636)
46+
val onSecondaryLightMediumContrast = Color(0xFFFFFFFF)
47+
val secondaryContainerLightMediumContrast = Color(0xFF6D6D6D)
48+
val onSecondaryContainerLightMediumContrast = Color(0xFFFFFFFF)
49+
val tertiaryLightMediumContrast = Color(0xFF000000)
50+
val onTertiaryLightMediumContrast = Color(0xFFFFFFFF)
51+
val tertiaryContainerLightMediumContrast = Color(0xFF1B1B1B)
52+
val onTertiaryContainerLightMediumContrast = Color(0xFFA7A7A7)
53+
val errorLightMediumContrast = Color(0xFF740006)
54+
val onErrorLightMediumContrast = Color(0xFFFFFFFF)
55+
val errorContainerLightMediumContrast = Color(0xFFCF2C27)
56+
val onErrorContainerLightMediumContrast = Color(0xFFFFFFFF)
57+
val backgroundLightMediumContrast = Color(0xFFF9F9F9)
58+
val onBackgroundLightMediumContrast = Color(0xFF1B1B1B)
59+
val surfaceLightMediumContrast = Color(0xFFF9F9F9)
60+
val onSurfaceLightMediumContrast = Color(0xFF111111)
61+
val surfaceVariantLightMediumContrast = Color(0xFFEBE0E1)
62+
val onSurfaceVariantLightMediumContrast = Color(0xFF3B3436)
63+
val outlineLightMediumContrast = Color(0xFF585152)
64+
val outlineVariantLightMediumContrast = Color(0xFF736B6C)
65+
val scrimLightMediumContrast = Color(0xFF000000)
66+
val inverseSurfaceLightMediumContrast = Color(0xFF303030)
67+
val inverseOnSurfaceLightMediumContrast = Color(0xFFF1F1F1)
68+
val inversePrimaryLightMediumContrast = Color(0xFFC6C6C6)
69+
val surfaceDimLightMediumContrast = Color(0xFFC6C6C6)
70+
val surfaceBrightLightMediumContrast = Color(0xFFF9F9F9)
71+
val surfaceContainerLowestLightMediumContrast = Color(0xFFFFFFFF)
72+
val surfaceContainerLowLightMediumContrast = Color(0xFFF3F3F3)
73+
val surfaceContainerLightMediumContrast = Color(0xFFE8E8E8)
74+
val surfaceContainerHighLightMediumContrast = Color(0xFFDDDDDD)
75+
val surfaceContainerHighestLightMediumContrast = Color(0xFFD1D1D1)
76+
77+
val primaryLightHighContrast = Color(0xFF000000)
78+
val onPrimaryLightHighContrast = Color(0xFFFFFFFF)
79+
val primaryContainerLightHighContrast = Color(0xFF1B1B1B)
80+
val onPrimaryContainerLightHighContrast = Color(0xFFD0D0D0)
81+
val secondaryLightHighContrast = Color(0xFF2C2C2C)
82+
val onSecondaryLightHighContrast = Color(0xFFFFFFFF)
83+
val secondaryContainerLightHighContrast = Color(0xFF494949)
84+
val onSecondaryContainerLightHighContrast = Color(0xFFFFFFFF)
85+
val tertiaryLightHighContrast = Color(0xFF000000)
86+
val onTertiaryLightHighContrast = Color(0xFFFFFFFF)
87+
val tertiaryContainerLightHighContrast = Color(0xFF1B1B1B)
88+
val onTertiaryContainerLightHighContrast = Color(0xFFD0D0D0)
89+
val errorLightHighContrast = Color(0xFF600004)
90+
val onErrorLightHighContrast = Color(0xFFFFFFFF)
91+
val errorContainerLightHighContrast = Color(0xFF98000A)
92+
val onErrorContainerLightHighContrast = Color(0xFFFFFFFF)
93+
val backgroundLightHighContrast = Color(0xFFF9F9F9)
94+
val onBackgroundLightHighContrast = Color(0xFF1B1B1B)
95+
val surfaceLightHighContrast = Color(0xFFF9F9F9)
96+
val onSurfaceLightHighContrast = Color(0xFF000000)
97+
val surfaceVariantLightHighContrast = Color(0xFFEBE0E1)
98+
val onSurfaceVariantLightHighContrast = Color(0xFF000000)
99+
val outlineLightHighContrast = Color(0xFF312B2C)
100+
val outlineVariantLightHighContrast = Color(0xFF4F4749)
101+
val scrimLightHighContrast = Color(0xFF000000)
102+
val inverseSurfaceLightHighContrast = Color(0xFF303030)
103+
val inverseOnSurfaceLightHighContrast = Color(0xFFFFFFFF)
104+
val inversePrimaryLightHighContrast = Color(0xFFC6C6C6)
105+
val surfaceDimLightHighContrast = Color(0xFFB9B9B9)
106+
val surfaceBrightLightHighContrast = Color(0xFFF9F9F9)
107+
val surfaceContainerLowestLightHighContrast = Color(0xFFFFFFFF)
108+
val surfaceContainerLowLightHighContrast = Color(0xFFF1F1F1)
109+
val surfaceContainerLightHighContrast = Color(0xFFE2E2E2)
110+
val surfaceContainerHighLightHighContrast = Color(0xFFD4D4D4)
111+
val surfaceContainerHighestLightHighContrast = Color(0xFFC6C6C6)
112+
113+
val primaryDark = Color(0xFFC6C6C6)
114+
val onPrimaryDark = Color(0xFF303030)
115+
val primaryContainerDark = Color(0xFF000000)
116+
val onPrimaryContainerDark = Color(0xFF757575)
117+
val secondaryDark = Color(0xFFC6C6C6)
118+
val onSecondaryDark = Color(0xFF303030)
119+
val secondaryContainerDark = Color(0xFF474747)
120+
val onSecondaryContainerDark = Color(0xFFB5B5B5)
121+
val tertiaryDark = Color(0xFFC6C6C6)
122+
val onTertiaryDark = Color(0xFF303030)
123+
val tertiaryContainerDark = Color(0xFF000000)
124+
val onTertiaryContainerDark = Color(0xFF757575)
53125
val errorDark = Color(0xFFFFB4AB)
54126
val onErrorDark = Color(0xFF690005)
55127
val errorContainerDark = Color(0xFF93000A)
56128
val onErrorContainerDark = Color(0xFFFFDAD6)
57-
val backgroundDark = Color(0xFF111318)
58-
val onBackgroundDark = Color(0xFFE2E2E9)
59-
val surfaceDark = Color(0xFF111318)
60-
val onSurfaceDark = Color(0xFFE2E2E9)
61-
val surfaceVariantDark = Color(0xFF44474E)
62-
val onSurfaceVariantDark = Color(0xFFC4C6D0)
63-
val outlineDark = Color(0xFF8E9099)
64-
val outlineVariantDark = Color(0xFF44474E)
129+
val backgroundDark = Color(0xFF131313)
130+
val onBackgroundDark = Color(0xFFE2E2E2)
131+
val surfaceDark = Color(0xFF131313)
132+
val onSurfaceDark = Color(0xFFE2E2E2)
133+
val surfaceVariantDark = Color(0xFF4C4546)
134+
val onSurfaceVariantDark = Color(0xFFCFC4C5)
135+
val outlineDark = Color(0xFF988E90)
136+
val outlineVariantDark = Color(0xFF4C4546)
65137
val scrimDark = Color(0xFF000000)
66-
val inverseSurfaceDark = Color(0xFFE2E2E9)
67-
val inverseOnSurfaceDark = Color(0xFF2E3036)
68-
val inversePrimaryDark = Color(0xFF415F91)
69-
val surfaceDimDark = Color(0xFF111318)
70-
val surfaceBrightDark = Color(0xFF37393E)
71-
val surfaceContainerLowestDark = Color(0xFF0C0E13)
72-
val surfaceContainerLowDark = Color(0xFF191C20)
73-
val surfaceContainerDark = Color(0xFF1D2024)
74-
val surfaceContainerHighDark = Color(0xFF282A2F)
75-
val surfaceContainerHighestDark = Color(0xFF33353A)
138+
val inverseSurfaceDark = Color(0xFFE2E2E2)
139+
val inverseOnSurfaceDark = Color(0xFF303030)
140+
val inversePrimaryDark = Color(0xFF5E5E5E)
141+
val surfaceDimDark = Color(0xFF131313)
142+
val surfaceBrightDark = Color(0xFF393939)
143+
val surfaceContainerLowestDark = Color(0xFF0E0E0E)
144+
val surfaceContainerLowDark = Color(0xFF1B1B1B)
145+
val surfaceContainerDark = Color(0xFF1F1F1F)
146+
val surfaceContainerHighDark = Color(0xFF2A2A2A)
147+
val surfaceContainerHighestDark = Color(0xFF353535)
148+
149+
val primaryDarkMediumContrast = Color(0xFFDCDCDC)
150+
val onPrimaryDarkMediumContrast = Color(0xFF262626)
151+
val primaryContainerDarkMediumContrast = Color(0xFF919191)
152+
val onPrimaryContainerDarkMediumContrast = Color(0xFF000000)
153+
val secondaryDarkMediumContrast = Color(0xFFDCDCDC)
154+
val onSecondaryDarkMediumContrast = Color(0xFF262626)
155+
val secondaryContainerDarkMediumContrast = Color(0xFF919191)
156+
val onSecondaryContainerDarkMediumContrast = Color(0xFF000000)
157+
val tertiaryDarkMediumContrast = Color(0xFFDCDCDC)
158+
val onTertiaryDarkMediumContrast = Color(0xFF262626)
159+
val tertiaryContainerDarkMediumContrast = Color(0xFF919191)
160+
val onTertiaryContainerDarkMediumContrast = Color(0xFF000000)
161+
val errorDarkMediumContrast = Color(0xFFFFD2CC)
162+
val onErrorDarkMediumContrast = Color(0xFF540003)
163+
val errorContainerDarkMediumContrast = Color(0xFFFF5449)
164+
val onErrorContainerDarkMediumContrast = Color(0xFF000000)
165+
val backgroundDarkMediumContrast = Color(0xFF131313)
166+
val onBackgroundDarkMediumContrast = Color(0xFFE2E2E2)
167+
val surfaceDarkMediumContrast = Color(0xFF131313)
168+
val onSurfaceDarkMediumContrast = Color(0xFFFFFFFF)
169+
val surfaceVariantDarkMediumContrast = Color(0xFF4C4546)
170+
val onSurfaceVariantDarkMediumContrast = Color(0xFFE5DADB)
171+
val outlineDarkMediumContrast = Color(0xFFBAAFB1)
172+
val outlineVariantDarkMediumContrast = Color(0xFF988E8F)
173+
val scrimDarkMediumContrast = Color(0xFF000000)
174+
val inverseSurfaceDarkMediumContrast = Color(0xFFE2E2E2)
175+
val inverseOnSurfaceDarkMediumContrast = Color(0xFF2A2A2A)
176+
val inversePrimaryDarkMediumContrast = Color(0xFF484848)
177+
val surfaceDimDarkMediumContrast = Color(0xFF131313)
178+
val surfaceBrightDarkMediumContrast = Color(0xFF444444)
179+
val surfaceContainerLowestDarkMediumContrast = Color(0xFF070707)
180+
val surfaceContainerLowDarkMediumContrast = Color(0xFF1D1D1D)
181+
val surfaceContainerDarkMediumContrast = Color(0xFF282828)
182+
val surfaceContainerHighDarkMediumContrast = Color(0xFF323232)
183+
val surfaceContainerHighestDarkMediumContrast = Color(0xFF3E3E3E)
184+
185+
val primaryDarkHighContrast = Color(0xFFF0F0F0)
186+
val onPrimaryDarkHighContrast = Color(0xFF000000)
187+
val primaryContainerDarkHighContrast = Color(0xFFC2C2C2)
188+
val onPrimaryContainerDarkHighContrast = Color(0xFF0B0B0B)
189+
val secondaryDarkHighContrast = Color(0xFFF0F0F0)
190+
val onSecondaryDarkHighContrast = Color(0xFF000000)
191+
val secondaryContainerDarkHighContrast = Color(0xFFC2C2C2)
192+
val onSecondaryContainerDarkHighContrast = Color(0xFF0B0B0B)
193+
val tertiaryDarkHighContrast = Color(0xFFF0F0F0)
194+
val onTertiaryDarkHighContrast = Color(0xFF000000)
195+
val tertiaryContainerDarkHighContrast = Color(0xFFC2C2C2)
196+
val onTertiaryContainerDarkHighContrast = Color(0xFF0B0B0B)
197+
val errorDarkHighContrast = Color(0xFFFFECE9)
198+
val onErrorDarkHighContrast = Color(0xFF000000)
199+
val errorContainerDarkHighContrast = Color(0xFFFFAEA4)
200+
val onErrorContainerDarkHighContrast = Color(0xFF220001)
201+
val backgroundDarkHighContrast = Color(0xFF131313)
202+
val onBackgroundDarkHighContrast = Color(0xFFE2E2E2)
203+
val surfaceDarkHighContrast = Color(0xFF131313)
204+
val onSurfaceDarkHighContrast = Color(0xFFFFFFFF)
205+
val surfaceVariantDarkHighContrast = Color(0xFF4C4546)
206+
val onSurfaceVariantDarkHighContrast = Color(0xFFFFFFFF)
207+
val outlineDarkHighContrast = Color(0xFFF9EDEF)
208+
val outlineVariantDarkHighContrast = Color(0xFFCBC0C1)
209+
val scrimDarkHighContrast = Color(0xFF000000)
210+
val inverseSurfaceDarkHighContrast = Color(0xFFE2E2E2)
211+
val inverseOnSurfaceDarkHighContrast = Color(0xFF000000)
212+
val inversePrimaryDarkHighContrast = Color(0xFF484848)
213+
val surfaceDimDarkHighContrast = Color(0xFF131313)
214+
val surfaceBrightDarkHighContrast = Color(0xFF505050)
215+
val surfaceContainerLowestDarkHighContrast = Color(0xFF000000)
216+
val surfaceContainerLowDarkHighContrast = Color(0xFF1F1F1F)
217+
val surfaceContainerDarkHighContrast = Color(0xFF303030)
218+
val surfaceContainerHighDarkHighContrast = Color(0xFF3B3B3B)
219+
val surfaceContainerHighestDarkHighContrast = Color(0xFF474747)

0 commit comments

Comments
 (0)