Skip to content

Commit d5d4f39

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

File tree

2 files changed

+17
-15
lines changed

2 files changed

+17
-15
lines changed

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

Lines changed: 16 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
package com.smarttoolfactory.extendedcolors
22

3+
import androidx.compose.runtime.Stable
34
import androidx.compose.ui.graphics.Color
45

56
val A100 = "A100"
@@ -366,34 +367,35 @@ object ColorSwatch {
366367
)
367368
}
368369

370+
369371
val yellow by lazy {
370372
linkedMapOf(
371-
50 to Color(0xffF9FBE7),
372-
100 to Color(0xffF0F4C3),
373-
200 to Color(0xffE6EE9C),
374-
300 to Color(0xffDCE775),
373+
50 to Color(0xffFFFDE7),
374+
100 to Color(0xffFFF9C4),
375+
200 to Color(0xffFFF59D),
376+
300 to Color(0xffFFF176),
375377
400 to Color(0xffFFEE58),
376378
500 to Color(0xffFFEB3B),
377-
600 to Color(0xffC0CA33),
378-
700 to Color(0xffAFB42B),
379-
800 to Color(0xff9E9D24),
380-
900 to Color(0xff827717)
379+
600 to Color(0xffFDD835),
380+
700 to Color(0xffFBC02D),
381+
800 to Color(0xffF9A825),
382+
900 to Color(0xffF57F17)
381383
)
382384
}
383385

384386
val yellowAccent by lazy {
385387
linkedMapOf(
386-
A100 to Color(0xffF4FF81),
387-
A200 to Color(0xffEEFF41),
388-
A400 to Color(0xffC6FF00),
389-
A700 to Color(0xffAEEA00)
388+
A100 to Color(0xffFFFF8D),
389+
A200 to Color(0xffFFFF00),
390+
A400 to Color(0xffFFEA00),
391+
A700 to Color(0xffFFD600)
390392
)
391393
}
392394

393395
val amber by lazy {
394396
linkedMapOf(
395397
50 to Color(0xffFFF8E1),
396-
100 to Color(0xffFFF8E1),
398+
100 to Color(0xffFFECB3),
397399
200 to Color(0xffFFE082),
398400
300 to Color(0xffFFD54F),
399401
400 to Color(0xffFFCA28),
@@ -409,7 +411,7 @@ object ColorSwatch {
409411
linkedMapOf(
410412
A100 to Color(0xffFFE57F),
411413
A200 to Color(0xffFFD740),
412-
A400 to Color(0xffFF8F00),
414+
A400 to Color(0xffFFC400),
413415
A700 to Color(0xffFF6F00)
414416
)
415417
}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -439,7 +439,7 @@ object MaterialColor {
439439
@Stable
440440
val Yellow300 = Color(0xffFFF176)
441441
@Stable
442-
val Yellow400 = Color(0xffFFF176)
442+
val Yellow400 = Color(0xffFFEE58)
443443
@Stable
444444
val Yellow500 = Color(0xffFFEB3B)
445445
@Stable

0 commit comments

Comments
 (0)