initial build error fix for color tokens

Signed-off-by: Matt Bruce <matt.bruce@verizon.com>
This commit is contained in:
Matt Bruce 2023-05-03 11:43:49 -05:00
parent 07094237ab
commit 34bc7b6b66
6 changed files with 93 additions and 70 deletions

View File

@ -84,10 +84,10 @@ open class Badge: View {
private var backgroundColorConfig: AnyColorable = { private var backgroundColorConfig: AnyColorable = {
let config = KeyedColorConfiguration<Badge, FillColor>(keyPath: \.fillColor) let config = KeyedColorConfiguration<Badge, FillColor>(keyPath: \.fillColor)
config.setSurfaceColors(VDSColor.backgroundBrandhighlight, VDSColor.backgroundBrandhighlight, forKey: .red) config.setSurfaceColors(VDSColor.backgroundBrandhighlight, VDSColor.backgroundBrandhighlight, forKey: .red)
config.setSurfaceColors(VDSColor.paletteYellow62, VDSColor.paletteYellow62, forKey: .yellow) config.setSurfaceColors(VDSColor.paletteYellow53, VDSColor.paletteYellow53, forKey: .yellow)
config.setSurfaceColors(VDSColor.paletteGreen26, VDSColor.paletteGreen34, forKey: .green) config.setSurfaceColors(VDSColor.paletteGreen26, VDSColor.paletteGreen36, forKey: .green)
config.setSurfaceColors(VDSColor.paletteOrange39, VDSColor.paletteOrange46, forKey: .orange) config.setSurfaceColors(VDSColor.paletteOrange41, VDSColor.paletteOrange58, forKey: .orange)
config.setSurfaceColors(VDSColor.paletteBlue35, VDSColor.paletteBlue45, forKey: .blue) config.setSurfaceColors(VDSColor.paletteBlue38, VDSColor.paletteBlue46, forKey: .blue)
config.setSurfaceColors(VDSColor.paletteBlack, VDSColor.paletteBlack, forKey: .black) config.setSurfaceColors(VDSColor.paletteBlack, VDSColor.paletteBlack, forKey: .black)
config.setSurfaceColors(VDSColor.paletteWhite, VDSColor.paletteWhite, forKey: .white) config.setSurfaceColors(VDSColor.paletteWhite, VDSColor.paletteWhite, forKey: .white)
return config.eraseToAnyColorable() return config.eraseToAnyColorable()

View File

@ -20,72 +20,95 @@ extension Icon {
case gray44 case gray44
case gray20 case gray20
case gray11 case gray11
case orange91 case orange94
case orange46 case orange83
case orange39 case orange71
case orange15 case orange58
case orange41
case orange24
case orange17
case yellow94 case yellow94
case yellow62 case yellow87
case yellow74
case yellow53
case yellow39
case yellow20 case yellow20
case blue91 case yellow15
case blue45 case blue94
case blue35 case blue82
case blue13 case blue62
case green89 case blue46
case green34 case blue38
case blue21
case blue15
case green91
case green77
case green61
case green36
case green26 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 { public var value: UIColor {
switch self { switch self {
case .black: case .black: return VDSColor.paletteBlack
return VDSColor.paletteBlack case .white: return VDSColor.paletteWhite
case .white: case .red: return VDSColor.paletteRed
return VDSColor.paletteWhite case .gray95: return VDSColor.paletteGray95
case .red: case .gray85: return VDSColor.paletteGray85
return VDSColor.paletteRed case .gray65: return VDSColor.paletteGray65
case .gray95: case .gray44: return VDSColor.paletteGray44
return VDSColor.paletteGray95 case .gray20: return VDSColor.paletteGray20
case .gray85: case .gray11: return VDSColor.paletteGray11
return VDSColor.paletteGray85 case .orange94: return VDSColor.paletteOrange94
case .gray65: case .orange83: return VDSColor.paletteOrange83
return VDSColor.paletteGray65 case .orange71: return VDSColor.paletteOrange71
case .gray44: case .orange58: return VDSColor.paletteOrange58
return VDSColor.paletteGray44 case .orange41: return VDSColor.paletteOrange41
case .gray20: case .orange24: return VDSColor.paletteOrange24
return VDSColor.paletteGray20 case .orange17: return VDSColor.paletteOrange17
case .gray11: case .yellow94: return VDSColor.paletteYellow94
return VDSColor.paletteGray11 case .yellow87: return VDSColor.paletteYellow87
case .orange91: case .yellow74: return VDSColor.paletteYellow74
return VDSColor.paletteOrange91 case .yellow53: return VDSColor.paletteYellow53
case .orange46: case .yellow39: return VDSColor.paletteYellow39
return VDSColor.paletteOrange46 case .yellow20: return VDSColor.paletteYellow20
case .orange39: case .yellow15: return VDSColor.paletteYellow15
return VDSColor.paletteOrange39 case .blue94: return VDSColor.paletteBlue94
case .orange15: case .blue82: return VDSColor.paletteBlue82
return VDSColor.paletteOrange15 case .blue62: return VDSColor.paletteBlue62
case .yellow94: case .blue46: return VDSColor.paletteBlue46
return VDSColor.paletteYellow94 case .blue38: return VDSColor.paletteBlue38
case .yellow62: case .blue21: return VDSColor.paletteBlue21
return VDSColor.paletteYellow62 case .blue15: return VDSColor.paletteBlue15
case .yellow20: case .green91: return VDSColor.paletteGreen91
return VDSColor.paletteYellow20 case .green77: return VDSColor.paletteGreen77
case .blue91: case .green61: return VDSColor.paletteGreen61
return VDSColor.paletteBlue91 case .green36: return VDSColor.paletteGreen36
case .blue45: case .green26: return VDSColor.paletteGreen26
return VDSColor.paletteBlue45 case .green15: return VDSColor.paletteGreen15
case .blue35: case .green10: return VDSColor.paletteGreen10
return VDSColor.paletteBlue35 case .pink87: return VDSColor.palettePink87
case .blue13: case .pink76: return VDSColor.palettePink76
return VDSColor.paletteBlue13 case .pink62: return VDSColor.palettePink62
case .green89: case .pink46: return VDSColor.palettePink46
return VDSColor.paletteGreen89 case .pink25: return VDSColor.palettePink25
case .green34: case .purple85: return VDSColor.palettePurple85
return VDSColor.paletteGreen34 case .purple75: return VDSColor.palettePurple75
case .green26: case .purple60: return VDSColor.palettePurple60
return VDSColor.paletteGreen26 case .purple39: return VDSColor.palettePurple39
case .green11: case .purple20: return VDSColor.palettePurple20
return VDSColor.paletteGreen11
} }
} }
} }

View File

@ -54,7 +54,7 @@ open class Line: View {
public var lineViewColorConfig: AnyColorable = { public var lineViewColorConfig: AnyColorable = {
let config = KeyedColorConfiguration<Line, Style>(keyPath: \.style) let config = KeyedColorConfiguration<Line, Style>(keyPath: \.style)
config.setSurfaceColors(VDSColor.elementsPrimaryOnlight, VDSColor.elementsPrimaryOndark, forKey: .primary) 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() return config.eraseToAnyColorable()
}() }()

View File

@ -202,8 +202,8 @@ open class TileContainer: Control {
private var backgroundColorConfig = BackgroundColorConfiguration() private var backgroundColorConfig = BackgroundColorConfiguration()
private var borderColorConfig = SurfaceColorConfiguration().with { private var borderColorConfig = SurfaceColorConfiguration().with {
$0.lightColor = VDSColor.elementsLowContrastOnLight $0.lightColor = VDSColor.elementsLowcontrastOnlight
$0.darkColor = VDSColor.elementsLowContrastOnDark $0.darkColor = VDSColor.elementsLowcontrastOndark
} }
private var imageFallbackColorConfig = SurfaceColorConfiguration().with { private var imageFallbackColorConfig = SurfaceColorConfiguration().with {

View File

@ -79,7 +79,7 @@ open class Toggle: Control, Changeable {
private var toggleColorConfiguration = ControlColorConfiguration().with { private var toggleColorConfiguration = ControlColorConfiguration().with {
$0.setSurfaceColors(VDSColor.elementsSecondaryOnlight, VDSColor.paletteGray44, forState: .normal) $0.setSurfaceColors(VDSColor.elementsSecondaryOnlight, VDSColor.paletteGray44, forState: .normal)
$0.setSurfaceColors(VDSColor.interactiveDisabledOnlight, VDSColor.interactiveDisabledOndark, forState: .disabled) $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 { private var knobColorConfiguration = ControlColorConfiguration().with {

View File

@ -38,7 +38,7 @@ open class TooltipAlertViewController: UIViewController, Surfaceable {
} }
private var line = Line().with { instance in private var line = Line().with { instance in
instance.lineViewColorConfig = SurfaceColorConfiguration(VDSColor.elementsLowContrastOnLight, VDSColor.elementsLowContrastOnLight).eraseToAnyColorable() instance.lineViewColorConfig = SurfaceColorConfiguration(VDSColor.elementsLowcontrastOnlight, VDSColor.elementsLowcontrastOndark).eraseToAnyColorable()
} }
//-------------------------------------------------- //--------------------------------------------------