refactor: adjust some colors

This commit is contained in:
2023-11-18 03:10:08 +08:00
parent 774d9632a9
commit 0017f87175

View File

@@ -100,8 +100,8 @@ private val RedLightColors = Colors(
foregroundPrimary = Color(0xFFFFFBFF), foregroundPrimary = Color(0xFFFFFBFF),
foregroundSecondary = Color(0xFFFBEEEC), foregroundSecondary = Color(0xFFFBEEEC),
themePrimary = Color(0xFFFF5545), themePrimary = Color(0xFFFF5545),
themeSecondary = Color(0xA6FF8A7B), themeSecondary = Color(0xA6FF5545),
themeTertiary = Color(0xFFF9DCD8), themeTertiary = Color(0x27FF5545),
textPrimary = DefaultLightColors.textPrimary, textPrimary = DefaultLightColors.textPrimary,
textSecondary = DefaultLightColors.textSecondary, textSecondary = DefaultLightColors.textSecondary,
isLight = true isLight = true
@@ -113,8 +113,8 @@ private val PinkLightColors = Colors(
foregroundPrimary = Color(0xFFFFFBFF), foregroundPrimary = Color(0xFFFFFBFF),
foregroundSecondary = Color(0xFFFBEEEE), foregroundSecondary = Color(0xFFFBEEEE),
themePrimary = Color(0xFFFF4E7C), themePrimary = Color(0xFFFF4E7C),
themeSecondary = Color(0xA6FF869D), themeSecondary = Color(0xA6FF4E7C),
themeTertiary = Color(0xFFF7DCDF), themeTertiary = Color(0x27FF4E7C),
textPrimary = DefaultLightColors.textPrimary, textPrimary = DefaultLightColors.textPrimary,
textSecondary = DefaultLightColors.textSecondary, textSecondary = DefaultLightColors.textSecondary,
isLight = true isLight = true
@@ -126,8 +126,8 @@ private val PurpleLightColors = Colors(
foregroundPrimary = Color(0xFFFFFBFF), foregroundPrimary = Color(0xFFFFFBFF),
foregroundSecondary = Color(0xFFF5EFF4), foregroundSecondary = Color(0xFFF5EFF4),
themePrimary = Color(0xFFA476FF), themePrimary = Color(0xFFA476FF),
themeSecondary = Color(0xA6BB99FF), themeSecondary = Color(0xA6A476FF),
themeTertiary = Color(0xFFE8DFEE), themeTertiary = Color(0x27A476FF),
textPrimary = DefaultLightColors.textPrimary, textPrimary = DefaultLightColors.textPrimary,
textSecondary = DefaultLightColors.textSecondary, textSecondary = DefaultLightColors.textSecondary,
isLight = true isLight = true
@@ -139,8 +139,8 @@ private val OrangeLightColors = Colors(
foregroundPrimary = Color(0xFFFFFBFF), foregroundPrimary = Color(0xFFFFFBFF),
foregroundSecondary = Color(0xFFFAEFE7), foregroundSecondary = Color(0xFFFAEFE7),
themePrimary = Color(0xFFD27C00), themePrimary = Color(0xFFD27C00),
themeSecondary = Color(0xA6F89300), themeSecondary = Color(0xA6D27C00),
themeTertiary = Color(0xFFF5DECC), themeTertiary = Color(0x27D27C00),
textPrimary = DefaultLightColors.textPrimary, textPrimary = DefaultLightColors.textPrimary,
textSecondary = DefaultLightColors.textSecondary, textSecondary = DefaultLightColors.textSecondary,
isLight = true isLight = true
@@ -152,8 +152,8 @@ private val YellowLightColors = Colors(
foregroundPrimary = Color(0xFFFFFBFF), foregroundPrimary = Color(0xFFFFFBFF),
foregroundSecondary = Color(0xFFF8EFE7), foregroundSecondary = Color(0xFFF8EFE7),
themePrimary = Color(0xFFBA8800), themePrimary = Color(0xFFBA8800),
themeSecondary = Color(0xA6DCA100), themeSecondary = Color(0xA6BA8800),
themeTertiary = Color(0xFFF0E0CA), themeTertiary = Color(0x27BA8800),
textPrimary = DefaultLightColors.textPrimary, textPrimary = DefaultLightColors.textPrimary,
textSecondary = DefaultLightColors.textSecondary, textSecondary = DefaultLightColors.textSecondary,
isLight = true isLight = true
@@ -165,8 +165,8 @@ private val GreenLightColors = Colors(
foregroundPrimary = Color(0xFFFBFDF8), foregroundPrimary = Color(0xFFFBFDF8),
foregroundSecondary = Color(0xFFEFF1ED), foregroundSecondary = Color(0xFFEFF1ED),
themePrimary = Color(0xFF5B9E7A), themePrimary = Color(0xFF5B9E7A),
themeSecondary = Color(0xA676B993), themeSecondary = Color(0xA65B9E7A),
themeTertiary = Color(0xFFE1E3DF), themeTertiary = Color(0x275B9E7A),
textPrimary = DefaultLightColors.textPrimary, textPrimary = DefaultLightColors.textPrimary,
textSecondary = DefaultLightColors.textSecondary, textSecondary = DefaultLightColors.textSecondary,
isLight = true isLight = true
@@ -178,8 +178,8 @@ private val BlueLightColors = Colors(
foregroundPrimary = Color(0xFFFCFCFF), foregroundPrimary = Color(0xFFFCFCFF),
foregroundSecondary = Color(0xFFF0F0F3), foregroundSecondary = Color(0xFFF0F0F3),
themePrimary = Color(0xFF0099DF), themePrimary = Color(0xFF0099DF),
themeSecondary = Color(0xA633B4FF), themeSecondary = Color(0xA60099DF),
themeTertiary = Color(0xFFDBE3ED), themeTertiary = Color(0x270099DF),
textPrimary = DefaultLightColors.textPrimary, textPrimary = DefaultLightColors.textPrimary,
textSecondary = DefaultLightColors.textSecondary, textSecondary = DefaultLightColors.textSecondary,
isLight = true isLight = true
@@ -191,8 +191,8 @@ private val RedDarkColors = Colors(
foregroundPrimary = Color(0xFF3D2C2A), foregroundPrimary = Color(0xFF3D2C2A),
foregroundSecondary = Color(0xFF554240), foregroundSecondary = Color(0xFF554240),
themePrimary = Color(0xFFB9856D), themePrimary = Color(0xFFB9856D),
themeSecondary = Color(0xA69B6B54), themeSecondary = Color(0xA6B9856D),
themeTertiary = Color(0xFF554240), themeTertiary = Color(0x40B9856D),
textPrimary = DefaultDarkColors.textPrimary, textPrimary = DefaultDarkColors.textPrimary,
textSecondary = DefaultDarkColors.textSecondary, textSecondary = DefaultDarkColors.textSecondary,
isLight = false isLight = false
@@ -204,8 +204,8 @@ private val PinkDarkColors = Colors(
foregroundPrimary = Color(0xFF3D2C2E), foregroundPrimary = Color(0xFF3D2C2E),
foregroundSecondary = Color(0xFF544244), foregroundSecondary = Color(0xFF544244),
themePrimary = Color(0xFFBA837B), themePrimary = Color(0xFFBA837B),
themeSecondary = Color(0xA69D6962), themeSecondary = Color(0xA6BA837B),
themeTertiary = Color(0xFF544244), themeTertiary = Color(0x40BA837B),
textPrimary = DefaultDarkColors.textPrimary, textPrimary = DefaultDarkColors.textPrimary,
textSecondary = DefaultDarkColors.textSecondary, textSecondary = DefaultDarkColors.textSecondary,
isLight = false isLight = false
@@ -217,8 +217,8 @@ private val PurpleDarkColors = Colors(
foregroundPrimary = Color(0xFF332E3A), foregroundPrimary = Color(0xFF332E3A),
foregroundSecondary = Color(0xFF494550), foregroundSecondary = Color(0xFF494550),
themePrimary = Color(0xFF9F88AD), themePrimary = Color(0xFF9F88AD),
themeSecondary = Color(0xA6846E91), themeSecondary = Color(0xA69F88AD),
themeTertiary = Color(0xFF494550), themeTertiary = Color(0x409F88AD),
textPrimary = DefaultDarkColors.textPrimary, textPrimary = DefaultDarkColors.textPrimary,
textSecondary = DefaultDarkColors.textSecondary, textSecondary = DefaultDarkColors.textSecondary,
isLight = false isLight = false
@@ -230,8 +230,8 @@ private val OrangeDarkColors = Colors(
foregroundPrimary = Color(0xFF3B2E22), foregroundPrimary = Color(0xFF3B2E22),
foregroundSecondary = Color(0xFF534437), foregroundSecondary = Color(0xFF534437),
themePrimary = Color(0xFFAE8B5D), themePrimary = Color(0xFFAE8B5D),
themeSecondary = Color(0xA6917045), themeSecondary = Color(0xA6AE8B5D),
themeTertiary = Color(0xFF534437), themeTertiary = Color(0x40AE8B5D),
textPrimary = DefaultDarkColors.textPrimary, textPrimary = DefaultDarkColors.textPrimary,
textSecondary = DefaultDarkColors.textSecondary, textSecondary = DefaultDarkColors.textSecondary,
isLight = false isLight = false
@@ -243,8 +243,8 @@ private val YellowDarkColors = Colors(
foregroundPrimary = Color(0xFF382F20), foregroundPrimary = Color(0xFF382F20),
foregroundSecondary = Color(0xFF4F4535), foregroundSecondary = Color(0xFF4F4535),
themePrimary = Color(0xFFA18F5C), themePrimary = Color(0xFFA18F5C),
themeSecondary = Color(0xA6857544), themeSecondary = Color(0xA6A18F5C),
themeTertiary = Color(0xFF4F4535), themeTertiary = Color(0x40A18F5C),
textPrimary = DefaultDarkColors.textPrimary, textPrimary = DefaultDarkColors.textPrimary,
textSecondary = DefaultDarkColors.textSecondary, textSecondary = DefaultDarkColors.textSecondary,
isLight = false isLight = false
@@ -256,8 +256,8 @@ private val GreenDarkColors = Colors(
foregroundPrimary = Color(0xFF2E312E), foregroundPrimary = Color(0xFF2E312E),
foregroundSecondary = Color(0xFF444844), foregroundSecondary = Color(0xFF444844),
themePrimary = Color(0xFF7F9687), themePrimary = Color(0xFF7F9687),
themeSecondary = Color(0xA6657B6D), themeSecondary = Color(0xA67F9687),
themeTertiary = Color(0xFF444844), themeTertiary = Color(0x407F9687),
textPrimary = DefaultDarkColors.textPrimary, textPrimary = DefaultDarkColors.textPrimary,
textSecondary = DefaultDarkColors.textSecondary, textSecondary = DefaultDarkColors.textSecondary,
isLight = false isLight = false
@@ -269,8 +269,8 @@ private val BlueDarkColors = Colors(
foregroundPrimary = Color(0xFF293139), foregroundPrimary = Color(0xFF293139),
foregroundSecondary = Color(0xFF3F484F), foregroundSecondary = Color(0xFF3F484F),
themePrimary = Color(0xFF8091B1), themePrimary = Color(0xFF8091B1),
themeSecondary = Color(0xA6657795), themeSecondary = Color(0xA68091B1),
themeTertiary = Color(0xFF3F484F), themeTertiary = Color(0x408091B1),
textPrimary = DefaultDarkColors.textPrimary, textPrimary = DefaultDarkColors.textPrimary,
textSecondary = DefaultDarkColors.textSecondary, textSecondary = DefaultDarkColors.textSecondary,
isLight = false isLight = false
@@ -282,8 +282,8 @@ private val RedBlackColors = Colors(
foregroundPrimary = Color(0xFF271816), foregroundPrimary = Color(0xFF271816),
foregroundSecondary = Color(0xFF3D2C2A), foregroundSecondary = Color(0xFF3D2C2A),
themePrimary = Color(0xFFB9856D), themePrimary = Color(0xFFB9856D),
themeSecondary = Color(0xA69B6B54), themeSecondary = Color(0xA6B9856D),
themeTertiary = Color(0xFF3D2C2A), themeTertiary = Color(0x45B9856D),
textPrimary = DefaultBlackColors.textPrimary, textPrimary = DefaultBlackColors.textPrimary,
textSecondary = DefaultBlackColors.textSecondary, textSecondary = DefaultBlackColors.textSecondary,
isLight = false isLight = false
@@ -295,8 +295,8 @@ private val PinkBlackColors = Colors(
foregroundPrimary = Color(0xFF26181A), foregroundPrimary = Color(0xFF26181A),
foregroundSecondary = Color(0xFF3D2C2E), foregroundSecondary = Color(0xFF3D2C2E),
themePrimary = Color(0xFFBA837B), themePrimary = Color(0xFFBA837B),
themeSecondary = Color(0xA69D6962), themeSecondary = Color(0xA6BA837B),
themeTertiary = Color(0xFF3D2C2E), themeTertiary = Color(0x45BA837B),
textPrimary = DefaultBlackColors.textPrimary, textPrimary = DefaultBlackColors.textPrimary,
textSecondary = DefaultBlackColors.textSecondary, textSecondary = DefaultBlackColors.textSecondary,
isLight = false isLight = false
@@ -308,8 +308,8 @@ private val PurpleBlackColors = Colors(
foregroundPrimary = Color(0xFF1E1A24), foregroundPrimary = Color(0xFF1E1A24),
foregroundSecondary = Color(0xFF332E3A), foregroundSecondary = Color(0xFF332E3A),
themePrimary = Color(0xFF9F88AD), themePrimary = Color(0xFF9F88AD),
themeSecondary = Color(0xA6846E91), themeSecondary = Color(0xA69F88AD),
themeTertiary = Color(0xFF332E3A), themeTertiary = Color(0x459F88AD),
textPrimary = DefaultBlackColors.textPrimary, textPrimary = DefaultBlackColors.textPrimary,
textSecondary = DefaultBlackColors.textSecondary, textSecondary = DefaultBlackColors.textSecondary,
isLight = false isLight = false
@@ -321,8 +321,8 @@ private val OrangeBlackColors = Colors(
foregroundPrimary = Color(0xFF25190E), foregroundPrimary = Color(0xFF25190E),
foregroundSecondary = Color(0xFF3B2E22), foregroundSecondary = Color(0xFF3B2E22),
themePrimary = Color(0xFFAE8B5D), themePrimary = Color(0xFFAE8B5D),
themeSecondary = Color(0xA6917045), themeSecondary = Color(0xA6AE8B5D),
themeTertiary = Color(0xFF3B2E22), themeTertiary = Color(0x45AE8B5D),
textPrimary = DefaultBlackColors.textPrimary, textPrimary = DefaultBlackColors.textPrimary,
textSecondary = DefaultBlackColors.textSecondary, textSecondary = DefaultBlackColors.textSecondary,
isLight = false isLight = false
@@ -334,8 +334,8 @@ private val YellowBlackColors = Colors(
foregroundPrimary = Color(0xFF221B0D), foregroundPrimary = Color(0xFF221B0D),
foregroundSecondary = Color(0xFF382F20), foregroundSecondary = Color(0xFF382F20),
themePrimary = Color(0xFFA18F5C), themePrimary = Color(0xFFA18F5C),
themeSecondary = Color(0xA6857544), themeSecondary = Color(0xA6A18F5C),
themeTertiary = Color(0xFF382F20), themeTertiary = Color(0x45A18F5C),
textPrimary = DefaultBlackColors.textPrimary, textPrimary = DefaultBlackColors.textPrimary,
textSecondary = DefaultBlackColors.textSecondary, textSecondary = DefaultBlackColors.textSecondary,
isLight = false isLight = false
@@ -347,8 +347,8 @@ private val GreenBlackColors = Colors(
foregroundPrimary = Color(0xFF191C1A), foregroundPrimary = Color(0xFF191C1A),
foregroundSecondary = Color(0xFF2E312E), foregroundSecondary = Color(0xFF2E312E),
themePrimary = Color(0xFF7F9687), themePrimary = Color(0xFF7F9687),
themeSecondary = Color(0xA6657B6D), themeSecondary = Color(0xA67F9687),
themeTertiary = Color(0xFF2E312E), themeTertiary = Color(0x457F9687),
textPrimary = DefaultBlackColors.textPrimary, textPrimary = DefaultBlackColors.textPrimary,
textSecondary = DefaultBlackColors.textSecondary, textSecondary = DefaultBlackColors.textSecondary,
isLight = false isLight = false
@@ -360,8 +360,8 @@ private val BlueBlackColors = Colors(
foregroundPrimary = Color(0xFF141C23), foregroundPrimary = Color(0xFF141C23),
foregroundSecondary = Color(0xFF293139), foregroundSecondary = Color(0xFF293139),
themePrimary = Color(0xFF8091B1), themePrimary = Color(0xFF8091B1),
themeSecondary = Color(0xA6657795), themeSecondary = Color(0xA68091B1),
themeTertiary = Color(0xFF293139), themeTertiary = Color(0x458091B1),
textPrimary = DefaultBlackColors.textPrimary, textPrimary = DefaultBlackColors.textPrimary,
textSecondary = DefaultBlackColors.textSecondary, textSecondary = DefaultBlackColors.textSecondary,
isLight = false isLight = false