From 34bc7b6b66fa5654afcdde5ae63ca20ccb03e29b Mon Sep 17 00:00:00 2001 From: Matt Bruce Date: Wed, 3 May 2023 11:43:49 -0500 Subject: [PATCH] initial build error fix for color tokens Signed-off-by: Matt Bruce --- VDS/Components/Badge/Badge.swift | 8 +- VDS/Components/Icon/IconColor.swift | 145 ++++++++++-------- VDS/Components/Line/Line.swift | 2 +- .../TileContainer/TileContainer.swift | 4 +- VDS/Components/Toggle/Toggle.swift | 2 +- .../Tooltip/TooltipAlertViewController.swift | 2 +- 6 files changed, 93 insertions(+), 70 deletions(-) diff --git a/VDS/Components/Badge/Badge.swift b/VDS/Components/Badge/Badge.swift index 2bd86c5e..5f1baaa6 100644 --- a/VDS/Components/Badge/Badge.swift +++ b/VDS/Components/Badge/Badge.swift @@ -84,10 +84,10 @@ open class Badge: View { private var backgroundColorConfig: AnyColorable = { let config = KeyedColorConfiguration(keyPath: \.fillColor) config.setSurfaceColors(VDSColor.backgroundBrandhighlight, VDSColor.backgroundBrandhighlight, forKey: .red) - config.setSurfaceColors(VDSColor.paletteYellow62, VDSColor.paletteYellow62, forKey: .yellow) - config.setSurfaceColors(VDSColor.paletteGreen26, VDSColor.paletteGreen34, forKey: .green) - config.setSurfaceColors(VDSColor.paletteOrange39, VDSColor.paletteOrange46, forKey: .orange) - config.setSurfaceColors(VDSColor.paletteBlue35, VDSColor.paletteBlue45, forKey: .blue) + config.setSurfaceColors(VDSColor.paletteYellow53, VDSColor.paletteYellow53, forKey: .yellow) + config.setSurfaceColors(VDSColor.paletteGreen26, VDSColor.paletteGreen36, forKey: .green) + config.setSurfaceColors(VDSColor.paletteOrange41, VDSColor.paletteOrange58, forKey: .orange) + config.setSurfaceColors(VDSColor.paletteBlue38, VDSColor.paletteBlue46, forKey: .blue) config.setSurfaceColors(VDSColor.paletteBlack, VDSColor.paletteBlack, forKey: .black) config.setSurfaceColors(VDSColor.paletteWhite, VDSColor.paletteWhite, forKey: .white) return config.eraseToAnyColorable() diff --git a/VDS/Components/Icon/IconColor.swift b/VDS/Components/Icon/IconColor.swift index c9d4bf0e..bcfc73c1 100644 --- a/VDS/Components/Icon/IconColor.swift +++ b/VDS/Components/Icon/IconColor.swift @@ -20,72 +20,95 @@ extension Icon { case gray44 case gray20 case gray11 - case orange91 - case orange46 - case orange39 - case orange15 + case orange94 + case orange83 + case orange71 + case orange58 + case orange41 + case orange24 + case orange17 case yellow94 - case yellow62 + case yellow87 + case yellow74 + case yellow53 + case yellow39 case yellow20 - case blue91 - case blue45 - case blue35 - case blue13 - case green89 - case green34 + case yellow15 + case blue94 + case blue82 + case blue62 + case blue46 + case blue38 + case blue21 + case blue15 + case green91 + case green77 + case green61 + case green36 case green26 - case green11 - + case green15 + case green10 + case pink87 + case pink76 + case pink62 + case pink46 + case pink25 + case purple85 + case purple75 + case purple60 + case purple39 + case purple20 + + // Map each color name to its corresponding UIColor object. public var value: UIColor { switch self { - case .black: - return VDSColor.paletteBlack - case .white: - return VDSColor.paletteWhite - case .red: - return VDSColor.paletteRed - case .gray95: - return VDSColor.paletteGray95 - case .gray85: - return VDSColor.paletteGray85 - case .gray65: - return VDSColor.paletteGray65 - case .gray44: - return VDSColor.paletteGray44 - case .gray20: - return VDSColor.paletteGray20 - case .gray11: - return VDSColor.paletteGray11 - case .orange91: - return VDSColor.paletteOrange91 - case .orange46: - return VDSColor.paletteOrange46 - case .orange39: - return VDSColor.paletteOrange39 - case .orange15: - return VDSColor.paletteOrange15 - case .yellow94: - return VDSColor.paletteYellow94 - case .yellow62: - return VDSColor.paletteYellow62 - case .yellow20: - return VDSColor.paletteYellow20 - case .blue91: - return VDSColor.paletteBlue91 - case .blue45: - return VDSColor.paletteBlue45 - case .blue35: - return VDSColor.paletteBlue35 - case .blue13: - return VDSColor.paletteBlue13 - case .green89: - return VDSColor.paletteGreen89 - case .green34: - return VDSColor.paletteGreen34 - case .green26: - return VDSColor.paletteGreen26 - case .green11: - return VDSColor.paletteGreen11 + case .black: return VDSColor.paletteBlack + case .white: return VDSColor.paletteWhite + case .red: return VDSColor.paletteRed + case .gray95: return VDSColor.paletteGray95 + case .gray85: return VDSColor.paletteGray85 + case .gray65: return VDSColor.paletteGray65 + case .gray44: return VDSColor.paletteGray44 + case .gray20: return VDSColor.paletteGray20 + case .gray11: return VDSColor.paletteGray11 + case .orange94: return VDSColor.paletteOrange94 + case .orange83: return VDSColor.paletteOrange83 + case .orange71: return VDSColor.paletteOrange71 + case .orange58: return VDSColor.paletteOrange58 + case .orange41: return VDSColor.paletteOrange41 + case .orange24: return VDSColor.paletteOrange24 + case .orange17: return VDSColor.paletteOrange17 + case .yellow94: return VDSColor.paletteYellow94 + case .yellow87: return VDSColor.paletteYellow87 + case .yellow74: return VDSColor.paletteYellow74 + case .yellow53: return VDSColor.paletteYellow53 + case .yellow39: return VDSColor.paletteYellow39 + case .yellow20: return VDSColor.paletteYellow20 + case .yellow15: return VDSColor.paletteYellow15 + case .blue94: return VDSColor.paletteBlue94 + case .blue82: return VDSColor.paletteBlue82 + case .blue62: return VDSColor.paletteBlue62 + case .blue46: return VDSColor.paletteBlue46 + case .blue38: return VDSColor.paletteBlue38 + case .blue21: return VDSColor.paletteBlue21 + case .blue15: return VDSColor.paletteBlue15 + case .green91: return VDSColor.paletteGreen91 + case .green77: return VDSColor.paletteGreen77 + case .green61: return VDSColor.paletteGreen61 + case .green36: return VDSColor.paletteGreen36 + case .green26: return VDSColor.paletteGreen26 + case .green15: return VDSColor.paletteGreen15 + case .green10: return VDSColor.paletteGreen10 + case .pink87: return VDSColor.palettePink87 + case .pink76: return VDSColor.palettePink76 + case .pink62: return VDSColor.palettePink62 + case .pink46: return VDSColor.palettePink46 + case .pink25: return VDSColor.palettePink25 + case .purple85: return VDSColor.palettePurple85 + case .purple75: return VDSColor.palettePurple75 + case .purple60: return VDSColor.palettePurple60 + case .purple39: return VDSColor.palettePurple39 + case .purple20: return VDSColor.palettePurple20 } } } diff --git a/VDS/Components/Line/Line.swift b/VDS/Components/Line/Line.swift index c62ca2e1..a25a1497 100644 --- a/VDS/Components/Line/Line.swift +++ b/VDS/Components/Line/Line.swift @@ -54,7 +54,7 @@ open class Line: View { public var lineViewColorConfig: AnyColorable = { let config = KeyedColorConfiguration(keyPath: \.style) config.setSurfaceColors(VDSColor.elementsPrimaryOnlight, VDSColor.elementsPrimaryOndark, forKey: .primary) - config.setSurfaceColors(VDSColor.elementsLowContrastOnLight, VDSColor.elementsLowContrastOnDark, forKey: .secondary) + config.setSurfaceColors(VDSColor.elementsLowcontrastOnlight, VDSColor.elementsLowcontrastOndark, forKey: .secondary) return config.eraseToAnyColorable() }() diff --git a/VDS/Components/TileContainer/TileContainer.swift b/VDS/Components/TileContainer/TileContainer.swift index bf0d24a9..79928baf 100644 --- a/VDS/Components/TileContainer/TileContainer.swift +++ b/VDS/Components/TileContainer/TileContainer.swift @@ -202,8 +202,8 @@ open class TileContainer: Control { private var backgroundColorConfig = BackgroundColorConfiguration() private var borderColorConfig = SurfaceColorConfiguration().with { - $0.lightColor = VDSColor.elementsLowContrastOnLight - $0.darkColor = VDSColor.elementsLowContrastOnDark + $0.lightColor = VDSColor.elementsLowcontrastOnlight + $0.darkColor = VDSColor.elementsLowcontrastOndark } private var imageFallbackColorConfig = SurfaceColorConfiguration().with { diff --git a/VDS/Components/Toggle/Toggle.swift b/VDS/Components/Toggle/Toggle.swift index 0f6bc797..6252179b 100644 --- a/VDS/Components/Toggle/Toggle.swift +++ b/VDS/Components/Toggle/Toggle.swift @@ -79,7 +79,7 @@ open class Toggle: Control, Changeable { private var toggleColorConfiguration = ControlColorConfiguration().with { $0.setSurfaceColors(VDSColor.elementsSecondaryOnlight, VDSColor.paletteGray44, forState: .normal) $0.setSurfaceColors(VDSColor.interactiveDisabledOnlight, VDSColor.interactiveDisabledOndark, forState: .disabled) - $0.setSurfaceColors(VDSColor.paletteGreen26, VDSColor.paletteGreen34, forState: .selected) + $0.setSurfaceColors(VDSColor.paletteGreen26, VDSColor.paletteGreen36, forState: .selected) } private var knobColorConfiguration = ControlColorConfiguration().with { diff --git a/VDS/Components/Tooltip/TooltipAlertViewController.swift b/VDS/Components/Tooltip/TooltipAlertViewController.swift index a6cbf14a..b289c118 100644 --- a/VDS/Components/Tooltip/TooltipAlertViewController.swift +++ b/VDS/Components/Tooltip/TooltipAlertViewController.swift @@ -38,7 +38,7 @@ open class TooltipAlertViewController: UIViewController, Surfaceable { } private var line = Line().with { instance in - instance.lineViewColorConfig = SurfaceColorConfiguration(VDSColor.elementsLowContrastOnLight, VDSColor.elementsLowContrastOnLight).eraseToAnyColorable() + instance.lineViewColorConfig = SurfaceColorConfiguration(VDSColor.elementsLowcontrastOnlight, VDSColor.elementsLowcontrastOndark).eraseToAnyColorable() } //--------------------------------------------------