From 772e488b95eed69d2993898f235e6f558a39303f Mon Sep 17 00:00:00 2001 From: CharlesXu0488 <104950838+CharlesXu0488@users.noreply.github.com> Date: Mon, 12 Feb 2024 16:10:13 -0800 Subject: [PATCH] fix: re-arrange color definition sequence, asked by designer (#635) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * fix: 🐛 adding missing constants to allCases adding missing constants to allCases * fix: 🐛 adding vision os availability macro, which was deleted vision OS availability macro was deleted, adding back. * fix: 🐛 adding missing visionOS macro back, deleted accidentally * fix: 🐛 re-arrange color definition sequence, asked by designer move tintColorTapState to tint color section; move neutralLabel to sematic section. --- Sources/FioriThemeManager/Palettes/PaletteV8.swift | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Sources/FioriThemeManager/Palettes/PaletteV8.swift b/Sources/FioriThemeManager/Palettes/PaletteV8.swift index 1f41b2f4f..0272160ee 100644 --- a/Sources/FioriThemeManager/Palettes/PaletteV8.swift +++ b/Sources/FioriThemeManager/Palettes/PaletteV8.swift @@ -155,7 +155,6 @@ struct PaletteV8: PaletteProvider { .quarternaryLabel: HexColor(lightColor: "8396A8FF", darkColor: "5B738BD4", contrastLightColor: "9CA9B4FF", contrastDarkColor: "47596CFF"), .quaternaryLabel: HexColor(lightColor: "8396A8FF", darkColor: "5B738BD4", contrastLightColor: "9CA9B4FF", contrastDarkColor: "47596CFF"), .quinaryLabel: HexColor(lightColor: "000000FF", darkColor: "FFFFFFFF", contrastLightColor: "000000FF", contrastDarkColor: "FFFFFFFF"), - .neutralLabel: HexColor(lightColor: "8396A8FF", darkColor: "354A5FFF", contrastLightColor: "A9B4BEFF", contrastDarkColor: "223548FF"), /// Fill Colors .primaryFill: HexColor(lightColor: "8396A80F", darkColor: "FFFFFFFF", contrastLightColor: "8799AB0F", contrastDarkColor: "FFFFFFFF"), .secondaryFill: HexColor(lightColor: "8396A833", darkColor: "5B738B14", contrastLightColor: "8799AB3D", contrastDarkColor: "5B738B33"), @@ -166,15 +165,16 @@ struct PaletteV8: PaletteProvider { .tintColor: HexColor(lightColor: "4DB1FFFF", darkColor: "0070F2FF", contrastLightColor: "5CB7FFFF", contrastDarkColor: "0046A8FF"), .tintColor2: HexColor(lightColor: "4DB1FFFF", darkColor: "0057D2FF", contrastLightColor: "5CB7FFFF", contrastDarkColor: "002A85FF"), .tintColor3: HexColor(lightColor: "4DB1FF29", darkColor: "0070F214", contrastLightColor: "5CB7FF29", contrastDarkColor: "0070F014"), + .tintColorTapState: HexColor(lightColor: "1B90FFFF", darkColor: "0040B0FF", contrastLightColor: "3399FFFF", contrastDarkColor: "001E70FF"), /// Semantic Colors .negativeLabel: HexColor(lightColor: "FF5C77FF", darkColor: "AA0808FF", contrastLightColor: "FF8CB2FF", contrastDarkColor: "7F0505FF"), .positiveLabel: HexColor(lightColor: "5DC122FF", darkColor: "256F3AFF", contrastLightColor: "97DD40FF", contrastDarkColor: "164323FF"), .criticalLabel: HexColor(lightColor: "FFB300FF", darkColor: "A93E00FF", contrastLightColor: "FFC933FF", contrastDarkColor: "702100FF"), .informativeLabel: HexColor(lightColor: "4DB1FFFF", darkColor: "0057D2FF", contrastLightColor: "89D1FFFF", contrastDarkColor: "002A85FF"), + .neutralLabel: HexColor(lightColor: "8396A8FF", darkColor: "354A5FFF", contrastLightColor: "A9B4BEFF", contrastDarkColor: "223548FF"), .negativeLabelTapState: HexColor(lightColor: "EE3939FF", darkColor: "840606FF", contrastLightColor: "FF5C77FF", contrastDarkColor: "4E0303FF"), .positiveLabelTapState: HexColor(lightColor: "36A41DFF", darkColor: "1E592FFF", contrastLightColor: "56B21FFF", contrastDarkColor: "0E2B16FF"), .criticalLabelTapState: HexColor(lightColor: "FFB300FF", darkColor: "8D2A00FF", contrastLightColor: "F58F00FF", contrastDarkColor: "450B00FF"), - .tintColorTapState: HexColor(lightColor: "1B90FFFF", darkColor: "0040B0FF", contrastLightColor: "3399FFFF", contrastDarkColor: "001E70FF"), .informativeLabelTapState: HexColor(lightColor: "1B90FFFF", darkColor: "0040B0FF", contrastLightColor: "3399FFFF", contrastDarkColor: "001E70FF"), .neutralLabelTapState: HexColor(lightColor: "8396A8FF", darkColor: "223548FF", contrastLightColor: "8799ABFF", contrastDarkColor: "1A2733FF"), .negativeBackground: HexColor(lightColor: "EE39391F", darkColor: "EE393914", contrastLightColor: "FF5C771F", contrastDarkColor: "D20A0A14"),