Skip to content

Commit b3362c3

Browse files
fix colors in primary color swatches
1 parent b0f3ef8 commit b3362c3

File tree

2 files changed

+367
-67
lines changed

2 files changed

+367
-67
lines changed

extendedcolors/src/main/java/com/smarttoolfactory/extendedcolors/ColorSwatch.kt

Lines changed: 84 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,76 @@ val A700 = "A700"
99

1010
object ColorSwatch {
1111

12+
val HeaderColors by lazy {
13+
listOf(
14+
Color(0xffF44336),
15+
Color(0xffE91E63),
16+
Color(0xff9C27B0),
17+
Color(0xff673AB7),
18+
Color(0xff3F51B5),
19+
Color(0xff2196F3),
20+
Color(0xff03A9F4),
21+
Color(0xff00BCD4),
22+
Color(0xff00ACC1),
23+
Color(0xff4CAF50),
24+
Color(0xff8BC34A),
25+
Color(0xffCDDC39),
26+
Color(0xffFFEB3B),
27+
Color(0xffFFC107),
28+
Color(0xffFF9800),
29+
Color(0xffFF5722),
30+
Color(0xff795548),
31+
Color(0xff9E9E9E),
32+
Color(0xff607D8B)
33+
)
34+
}
35+
36+
val primaryColorSwatches by lazy {
37+
listOf(
38+
red,
39+
pink,
40+
purple,
41+
deepPurple,
42+
indigo,
43+
blue,
44+
lightBlue,
45+
cyan,
46+
teal,
47+
green,
48+
lightGreen,
49+
lime,
50+
yellow,
51+
amber,
52+
orange,
53+
deepOrange,
54+
brown,
55+
grey,
56+
blueGrey
57+
)
58+
}
59+
60+
61+
val accentColorSwatches by lazy {
62+
listOf(
63+
redAccent,
64+
pinkAccent,
65+
purpleAccent,
66+
deepPurpleAccent,
67+
indigoAccent,
68+
blueAccent,
69+
lightBlueAccent,
70+
cyanAccent,
71+
tealAccent,
72+
greenAccent,
73+
lightGreenAccent,
74+
limeAccent,
75+
yellowAccent,
76+
amberAccent,
77+
orangeAccent,
78+
deepOrangeAccent,
79+
)
80+
}
81+
1282
val red by lazy {
1383
linkedMapOf(
1484
50 to Color(0xffFFEBEE),
@@ -131,25 +201,25 @@ object ColorSwatch {
131201

132202
val blue by lazy {
133203
linkedMapOf(
134-
50 to Color(0xffE8EAF6),
135-
100 to Color(0xffC5CAE9),
136-
200 to Color(0xff9FA8DA),
137-
300 to Color(0xff7986CB),
204+
50 to Color(0xffE3F2FD),
205+
100 to Color(0xffBBDEFB),
206+
200 to Color(0xff90CAF9),
207+
300 to Color(0xff64B5F6),
138208
400 to Color(0xff42A5F5),
139-
500 to Color(0xff3949AB),
140-
600 to Color(0xff3949AB),
141-
700 to Color(0xff303F9F),
142-
800 to Color(0xff283593),
143-
900 to Color(0xff1A237E)
209+
500 to Color(0xff2196F3),
210+
600 to Color(0xff1E88E5),
211+
700 to Color(0xff1976D2),
212+
800 to Color(0xff1565C0),
213+
900 to Color(0xff0D47A1)
144214
)
145215
}
146216

147217
val blueAccent by lazy {
148218
linkedMapOf(
149-
A100 to Color(0xff8C9EFF),
150-
A200 to Color(0xff536DFE),
151-
A400 to Color(0xff3D5AFE),
152-
A700 to Color(0xff304FFE)
219+
A100 to Color(0xff82B1FF),
220+
A200 to Color(0xff448AFF),
221+
A400 to Color(0xff1565C0),
222+
A700 to Color(0xff2962FF)
153223
)
154224
}
155225
val lightBlue by lazy {
@@ -234,7 +304,7 @@ object ColorSwatch {
234304
500 to Color(0xff4CAF50),
235305
600 to Color(0xff43A047),
236306
700 to Color(0xff388E3C),
237-
800 to Color(0xff558B2F),
307+
800 to Color(0xff2E7D32),
238308
900 to Color(0xff1B5E20)
239309
)
240310
}

0 commit comments

Comments
 (0)