mbrucedogs/vds_ios
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

refactored colorConfig -> colorConfiguration

Browse Source 
Signed-off-by: Matt Bruce <matt.bruce@verizon.com>
This commit is contained in:
Matt Bruce 2023-06-05 12:57:40 -05:00
parent 8a5ecdc6b6
commit 6e7ff86b0b
8 changed files with 66 additions and 66 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
VDS/Classes/SelectorBase.swift
View File

@ -13,9 +13,9 @@ import VDSFormControlsTokens
public protocol SelectorControlable: Control, Changeable { public protocol SelectorControlable: Control, Changeable {
var showError: Bool { get set } var showError: Bool { get set }
var size: CGSize { get set } var size: CGSize { get set }
var backgroundColorConfig: ControlColorConfiguration { get set } var backgroundColorConfiguration: ControlColorConfiguration { get set }
var borderColorConfig: ControlColorConfiguration { get set } var borderColorConfiguration: ControlColorConfiguration { get set }
var selectorColorConfig: ControlColorConfiguration { get set } var selectorColorConfiguration: ControlColorConfiguration { get set }
} }
open class SelectorBase: Control, SelectorControlable { open class SelectorBase: Control, SelectorControlable {
@ -50,11 +50,11 @@ open class SelectorBase: Control, SelectorControlable {
} }
} }
open var backgroundColorConfig = ControlColorConfiguration() { didSet { setNeedsUpdate() }} open var backgroundColorConfiguration = ControlColorConfiguration() { didSet { setNeedsUpdate() }}
open var borderColorConfig = ControlColorConfiguration() { didSet { setNeedsUpdate() }} open var borderColorConfiguration = ControlColorConfiguration() { didSet { setNeedsUpdate() }}
open var selectorColorConfig = ControlColorConfiguration() { didSet { setNeedsUpdate() }} open var selectorColorConfiguration = ControlColorConfiguration() { didSet { setNeedsUpdate() }}
//-------------------------------------------------- //--------------------------------------------------
// MARK: - Constraints // MARK: - Constraints

4
VDS/Components/Badge/Badge.swift
View File

@ -86,7 +86,7 @@ open class Badge: View {
//-------------------------------------------------- //--------------------------------------------------
// MARK: - Configuration // MARK: - Configuration
//-------------------------------------------------- //--------------------------------------------------
private var backgroundColorConfig: AnyColorable = { private var backgroundColorConfiguration: 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.paletteYellow53, VDSColor.paletteYellow53, forKey: .yellow) config.setSurfaceColors(VDSColor.paletteYellow53, VDSColor.paletteYellow53, forKey: .yellow)
@ -125,7 +125,7 @@ open class Badge: View {
open override func updateView() { open override func updateView() {
updateTextColorConfig() updateTextColorConfig()
backgroundColor = backgroundColorConfig.getColor(self) backgroundColor = backgroundColorConfiguration.getColor(self)
label.textColorConfiguration = textColorConfig.eraseToAnyColorable() label.textColorConfiguration = textColorConfig.eraseToAnyColorable()
label.numberOfLines = numberOfLines label.numberOfLines = numberOfLines

32
VDS/Components/Checkbox/Checkbox.swift
View File

@ -19,22 +19,22 @@ open class Checkbox: SelectorBase {
open override func setup() { open override func setup() {
super.setup() super.setup()
backgroundColorConfig.setSurfaceColors(VDSColor.elementsPrimaryOnlight, VDSColor.elementsPrimaryOndark, forState: .selected) backgroundColorConfiguration.setSurfaceColors(VDSColor.elementsPrimaryOnlight, VDSColor.elementsPrimaryOndark, forState: .selected)
backgroundColorConfig.setSurfaceColors(VDSColor.elementsPrimaryOnlight, VDSColor.elementsPrimaryOndark, forState: [.selected, .highlighted]) backgroundColorConfiguration.setSurfaceColors(VDSColor.elementsPrimaryOnlight, VDSColor.elementsPrimaryOndark, forState: [.selected, .highlighted])
backgroundColorConfig.setSurfaceColors(VDSColor.interactiveDisabledOnlight, VDSColor.interactiveDisabledOndark, forState: [.selected, .disabled]) backgroundColorConfiguration.setSurfaceColors(VDSColor.interactiveDisabledOnlight, VDSColor.interactiveDisabledOndark, forState: [.selected, .disabled])
backgroundColorConfig.setSurfaceColors(VDSColor.feedbackErrorBackgroundOnlight, VDSColor.feedbackErrorBackgroundOndark, forState: .error) backgroundColorConfiguration.setSurfaceColors(VDSColor.feedbackErrorBackgroundOnlight, VDSColor.feedbackErrorBackgroundOndark, forState: .error)
backgroundColorConfig.setSurfaceColors(.clear, .clear, forState: [.error, .disabled]) backgroundColorConfiguration.setSurfaceColors(.clear, .clear, forState: [.error, .disabled])
borderColorConfig.setSurfaceColors(VDSColor.elementsPrimaryOnlight, VDSColor.elementsPrimaryOndark, forState: .selected) borderColorConfiguration.setSurfaceColors(VDSColor.elementsPrimaryOnlight, VDSColor.elementsPrimaryOndark, forState: .selected)
borderColorConfig.setSurfaceColors(VDSColor.elementsPrimaryOnlight, VDSColor.elementsPrimaryOndark, forState: .highlighted) borderColorConfiguration.setSurfaceColors(VDSColor.elementsPrimaryOnlight, VDSColor.elementsPrimaryOndark, forState: .highlighted)
borderColorConfig.setSurfaceColors(VDSFormControlsColor.borderOnlight, VDSFormControlsColor.borderOndark, forState: .normal) borderColorConfiguration.setSurfaceColors(VDSFormControlsColor.borderOnlight, VDSFormControlsColor.borderOndark, forState: .normal)
borderColorConfig.setSurfaceColors(VDSColor.interactiveDisabledOnlight, VDSColor.interactiveDisabledOndark, forState: .disabled) borderColorConfiguration.setSurfaceColors(VDSColor.interactiveDisabledOnlight, VDSColor.interactiveDisabledOndark, forState: .disabled)
borderColorConfig.setSurfaceColors(VDSColor.feedbackErrorOnlight, VDSColor.feedbackErrorOndark, forState: .error) borderColorConfiguration.setSurfaceColors(VDSColor.feedbackErrorOnlight, VDSColor.feedbackErrorOndark, forState: .error)
borderColorConfig.setSurfaceColors(VDSColor.interactiveDisabledOnlight, VDSColor.interactiveDisabledOndark, forState: [.selected, .disabled]) borderColorConfiguration.setSurfaceColors(VDSColor.interactiveDisabledOnlight, VDSColor.interactiveDisabledOndark, forState: [.selected, .disabled])
borderColorConfig.setSurfaceColors(VDSColor.interactiveDisabledOnlight, VDSColor.interactiveDisabledOndark, forState: [.error, .disabled]) borderColorConfiguration.setSurfaceColors(VDSColor.interactiveDisabledOnlight, VDSColor.interactiveDisabledOndark, forState: [.error, .disabled])
selectorColorConfig.setSurfaceColors(VDSColor.elementsPrimaryOndark, VDSColor.elementsPrimaryOnlight, forState: .selected) selectorColorConfiguration.setSurfaceColors(VDSColor.elementsPrimaryOndark, VDSColor.elementsPrimaryOnlight, forState: .selected)
} }
open override func toggle() { open override func toggle() {
@ -50,9 +50,9 @@ open class Checkbox: SelectorBase {
super.layoutSubviews() super.layoutSubviews()
//get the colors //get the colors
let backgroundColor = backgroundColorConfig.getColor(self) let backgroundColor = backgroundColorConfiguration.getColor(self)
let borderColor = borderColorConfig.getColor(self) let borderColor = borderColorConfiguration.getColor(self)
let selectorColor = selectorColorConfig.getColor(self) let selectorColor = selectorColorConfiguration.getColor(self)
if let shapeLayer = shapeLayer, let sublayers = layer.sublayers, sublayers.contains(shapeLayer) { if let shapeLayer = shapeLayer, let sublayers = layer.sublayers, sublayers.contains(shapeLayer) {
shapeLayer.removeFromSuperlayer() shapeLayer.removeFromSuperlayer()

46
VDS/Components/Icon/ButtonIcon/ButtonIcon.swift
View File

@ -75,14 +75,14 @@ open class ButtonIcon: Control {
//-------------------------------------------------- //--------------------------------------------------
// MARK: - Configuration // MARK: - Configuration
//-------------------------------------------------- //--------------------------------------------------
private var iconColorConfig: AnyColorable { private var iconColorConfiguration: AnyColorable {
if selectedIconName != nil { if selectedIconName != nil {
return selectedIconColorConfig return selectedIconColorConfiguration
} else { } else {
if kind == .highContrast { if kind == .highContrast {
return highContrastIconColorConfig return highContrastIconColorConfiguration
} else { } else {
return standardIconColorConfig return standardIconColorConfiguration
} }
} }
} }
@ -104,7 +104,7 @@ open class ButtonIcon: Control {
} }
} }
private var standardIconColorConfig: AnyColorable = { private var standardIconColorConfiguration: AnyColorable = {
return ControlColorConfiguration().with { return ControlColorConfiguration().with {
$0.setSurfaceColors(VDSColor.elementsPrimaryOnlight, VDSColor.elementsPrimaryOndark, forState: .normal) $0.setSurfaceColors(VDSColor.elementsPrimaryOnlight, VDSColor.elementsPrimaryOndark, forState: .normal)
$0.setSurfaceColors(VDSColor.interactiveActiveOnlight, VDSColor.interactiveActiveOndark, forState: .highlighted) $0.setSurfaceColors(VDSColor.interactiveActiveOnlight, VDSColor.interactiveActiveOndark, forState: .highlighted)
@ -112,11 +112,11 @@ open class ButtonIcon: Control {
}.eraseToAnyColorable() }.eraseToAnyColorable()
}() }()
private var highContrastIconColorConfig: AnyColorable = { private var highContrastIconColorConfiguration: AnyColorable = {
return SurfaceColorConfiguration(VDSColor.elementsPrimaryOndark, VDSColor.elementsPrimaryOnlight).eraseToAnyColorable() return SurfaceColorConfiguration(VDSColor.elementsPrimaryOndark, VDSColor.elementsPrimaryOnlight).eraseToAnyColorable()
}() }()
private var selectedIconColorConfig: AnyColorable = { private var selectedIconColorConfiguration: AnyColorable = {
return ControlColorConfiguration().with { return ControlColorConfiguration().with {
$0.setSurfaceColors(VDSColor.elementsBrandhighlight, VDSColor.elementsPrimaryOndark, forState: .normal) $0.setSurfaceColors(VDSColor.elementsBrandhighlight, VDSColor.elementsPrimaryOndark, forState: .normal)
$0.setSurfaceColors(VDSColor.interactiveActiveOnlight, VDSColor.interactiveActiveOndark, forState: .highlighted) $0.setSurfaceColors(VDSColor.interactiveActiveOnlight, VDSColor.interactiveActiveOndark, forState: .highlighted)
@ -128,7 +128,7 @@ open class ButtonIcon: Control {
var kind: Kind = .ghost var kind: Kind = .ghost
var surfaceType: SurfaceType = .colorFill var surfaceType: SurfaceType = .colorFill
var floating: Bool = false var floating: Bool = false
var backgroundColorConfig: AnyColorable = { var backgroundColorConfiguration: AnyColorable = {
SurfaceColorConfiguration(.clear, .clear).eraseToAnyColorable() SurfaceColorConfiguration(.clear, .clear).eraseToAnyColorable()
}() }()
} }
@ -137,7 +137,7 @@ open class ButtonIcon: Control {
var kind: Kind = .lowContrast var kind: Kind = .lowContrast
var surfaceType: SurfaceType = .colorFill var surfaceType: SurfaceType = .colorFill
var floating: Bool = false var floating: Bool = false
var backgroundColorConfig: AnyColorable = { var backgroundColorConfiguration: AnyColorable = {
SurfaceColorConfiguration(VDSColor.paletteGray44.withAlphaComponent(0.06), VDSColor.paletteGray44.withAlphaComponent(0.26)).eraseToAnyColorable() SurfaceColorConfiguration(VDSColor.paletteGray44.withAlphaComponent(0.06), VDSColor.paletteGray44.withAlphaComponent(0.26)).eraseToAnyColorable()
}() }()
} }
@ -146,7 +146,7 @@ open class ButtonIcon: Control {
var kind: Kind = .lowContrast var kind: Kind = .lowContrast
var surfaceType: SurfaceType = .colorFill var surfaceType: SurfaceType = .colorFill
var floating: Bool = true var floating: Bool = true
var backgroundColorConfig: AnyColorable = { var backgroundColorConfiguration: AnyColorable = {
SurfaceColorConfiguration(VDSColor.backgroundPrimaryLight, .clear).eraseToAnyColorable() SurfaceColorConfiguration(VDSColor.backgroundPrimaryLight, .clear).eraseToAnyColorable()
}() }()
} }
@ -155,11 +155,11 @@ open class ButtonIcon: Control {
var kind: Kind = .lowContrast var kind: Kind = .lowContrast
var surfaceType: SurfaceType = .media var surfaceType: SurfaceType = .media
var floating: Bool = false var floating: Bool = false
var backgroundColorConfig: AnyColorable = { var backgroundColorConfiguration: AnyColorable = {
SurfaceColorConfiguration(VDSColor.backgroundPrimaryLight, .clear).eraseToAnyColorable() SurfaceColorConfiguration(VDSColor.backgroundPrimaryLight, .clear).eraseToAnyColorable()
}() }()
var borderWidth: CGFloat = 1.0 var borderWidth: CGFloat = 1.0
var borderColorConfig: AnyColorable = { var borderColorConfiguration: AnyColorable = {
SurfaceColorConfiguration(VDSColor.elementsLowcontrastOnlight, .clear).eraseToAnyColorable() SurfaceColorConfiguration(VDSColor.elementsLowcontrastOnlight, .clear).eraseToAnyColorable()
}() }()
} }
@ -168,10 +168,10 @@ open class ButtonIcon: Control {
var kind: Kind = .lowContrast var kind: Kind = .lowContrast
var surfaceType: SurfaceType = .media var surfaceType: SurfaceType = .media
var floating: Bool = true var floating: Bool = true
var backgroundColorConfig: AnyColorable = { var backgroundColorConfiguration: AnyColorable = {
SurfaceColorConfiguration(VDSColor.backgroundPrimaryLight, .clear).eraseToAnyColorable() SurfaceColorConfiguration(VDSColor.backgroundPrimaryLight, .clear).eraseToAnyColorable()
}() }()
var shadowColorConfig: AnyColorable = { var shadowColorConfiguration: AnyColorable = {
SurfaceColorConfiguration(VDSColor.backgroundPrimaryLight, .clear).eraseToAnyColorable() SurfaceColorConfiguration(VDSColor.backgroundPrimaryLight, .clear).eraseToAnyColorable()
}() }()
var shadowOpacity: CGFloat = 0.5 var shadowOpacity: CGFloat = 0.5
@ -183,7 +183,7 @@ open class ButtonIcon: Control {
var kind: Kind = .highContrast var kind: Kind = .highContrast
var surfaceType: SurfaceType = .colorFill var surfaceType: SurfaceType = .colorFill
var floating: Bool = false var floating: Bool = false
var backgroundColorConfig: AnyColorable = { var backgroundColorConfiguration: AnyColorable = {
return ControlColorConfiguration().with { return ControlColorConfiguration().with {
$0.setSurfaceColors(VDSColor.backgroundPrimaryDark, VDSColor.backgroundPrimaryLight, forState: .normal) $0.setSurfaceColors(VDSColor.backgroundPrimaryDark, VDSColor.backgroundPrimaryLight, forState: .normal)
$0.setSurfaceColors(VDSColor.interactiveActiveOnlight, VDSColor.interactiveActiveOndark, forState: .highlighted) $0.setSurfaceColors(VDSColor.interactiveActiveOnlight, VDSColor.interactiveActiveOndark, forState: .highlighted)
@ -197,7 +197,7 @@ open class ButtonIcon: Control {
var kind: Kind = .highContrast var kind: Kind = .highContrast
var surfaceType: SurfaceType = .colorFill var surfaceType: SurfaceType = .colorFill
var floating: Bool = true var floating: Bool = true
var backgroundColorConfig: AnyColorable = { var backgroundColorConfiguration: AnyColorable = {
return ControlColorConfiguration().with { return ControlColorConfiguration().with {
$0.setSurfaceColors(VDSColor.backgroundPrimaryLight, VDSColor.backgroundPrimaryLight, forState: .normal) $0.setSurfaceColors(VDSColor.backgroundPrimaryLight, VDSColor.backgroundPrimaryLight, forState: .normal)
$0.setSurfaceColors(VDSColor.interactiveActiveOnlight, VDSColor.interactiveActiveOndark, forState: .highlighted) $0.setSurfaceColors(VDSColor.interactiveActiveOnlight, VDSColor.interactiveActiveOndark, forState: .highlighted)
@ -273,7 +273,7 @@ open class ButtonIcon: Control {
//ensure there is an icon to set //ensure there is an icon to set
if let currentIconName { if let currentIconName {
icon.name = currentIconName icon.name = currentIconName
let color = iconColorConfig.getColor(self) let color = iconColorConfiguration.getColor(self)
icon.color = color icon.color = color
icon.size = size.value icon.size = size.value
icon.customSize = customSize icon.customSize = customSize
@ -289,7 +289,7 @@ open class ButtonIcon: Control {
let currentConfig = currentConfiguration let currentConfig = currentConfiguration
backgroundColor = currentConfig.backgroundColorConfig.getColor(self) backgroundColor = currentConfig.backgroundColorConfiguration.getColor(self)
// calculate center point for child view with offset // calculate center point for child view with offset
let childCenter = CGPoint(x: center.x + iconOffset.x, y: center.y + iconOffset.y) let childCenter = CGPoint(x: center.x + iconOffset.x, y: center.y + iconOffset.y)
@ -314,7 +314,7 @@ open class ButtonIcon: Control {
//border //border
if let borderable = currentConfig as? Borderable { if let borderable = currentConfig as? Borderable {
layer.borderColor = borderable.borderColorConfig.getColor(self).cgColor layer.borderColor = borderable.borderColorConfiguration.getColor(self).cgColor
layer.borderWidth = borderable.borderWidth layer.borderWidth = borderable.borderWidth
icon.layer.borderWidth = borderable.borderWidth icon.layer.borderWidth = borderable.borderWidth
} else { } else {
@ -325,7 +325,7 @@ open class ButtonIcon: Control {
if let dropshadowable = currentConfig as? Dropshadowable { if let dropshadowable = currentConfig as? Dropshadowable {
layer.masksToBounds = false layer.masksToBounds = false
layer.shadowColor = dropshadowable.shadowColorConfig.getColor(self).cgColor layer.shadowColor = dropshadowable.shadowColorConfiguration.getColor(self).cgColor
layer.shadowOpacity = Float(dropshadowable.shadowOpacity) layer.shadowOpacity = Float(dropshadowable.shadowOpacity)
layer.shadowOffset = dropshadowable.shadowOffset layer.shadowOffset = dropshadowable.shadowOffset
layer.shadowRadius = dropshadowable.shadowRadius layer.shadowRadius = dropshadowable.shadowRadius
@ -362,11 +362,11 @@ extension ButtonIcon: AppleGuidlinesTouchable {
private protocol Borderable { private protocol Borderable {
var borderWidth: CGFloat { get set } var borderWidth: CGFloat { get set }
var borderColorConfig: AnyColorable { get set } var borderColorConfiguration: AnyColorable { get set }
} }
private protocol Dropshadowable { private protocol Dropshadowable {
var shadowColorConfig: AnyColorable { get set } var shadowColorConfiguration: AnyColorable { get set }
var shadowOpacity: CGFloat { get set } var shadowOpacity: CGFloat { get set }
var shadowOffset: CGSize { get set } var shadowOffset: CGSize { get set }
var shadowRadius: CGFloat { get set } var shadowRadius: CGFloat { get set }
@ -376,5 +376,5 @@ private protocol Configuration {
var kind: ButtonIcon.Kind { get set } var kind: ButtonIcon.Kind { get set }
var surfaceType: ButtonIcon.SurfaceType { get set } var surfaceType: ButtonIcon.SurfaceType { get set }
var floating: Bool { get set } var floating: Bool { get set }
var backgroundColorConfig: AnyColorable { get set } var backgroundColorConfiguration: AnyColorable { get set }
} }

4
VDS/Components/Line/Line.swift
View File

@ -51,7 +51,7 @@ open class Line: View {
//-------------------------------------------------- //--------------------------------------------------
// MARK: - Configuration // MARK: - Configuration
//-------------------------------------------------- //--------------------------------------------------
public var lineViewColorConfig: AnyColorable = { public var lineViewColorConfiguration: 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)
@ -62,6 +62,6 @@ open class Line: View {
// MARK: - State // MARK: - State
//-------------------------------------------------- //--------------------------------------------------
open override func updateView() { open override func updateView() {
lineView.backgroundColor = lineViewColorConfig.getColor(self) lineView.backgroundColor = lineViewColorConfiguration.getColor(self)
} }
} }

28
VDS/Components/RadioButton/RadioButton.swift
View File

@ -19,20 +19,20 @@ open class RadioButton: SelectorBase {
open override func setup() { open override func setup() {
super.setup() super.setup()
backgroundColorConfig.setSurfaceColors(VDSColor.feedbackErrorBackgroundOnlight, VDSColor.feedbackErrorBackgroundOndark, forState: .error) backgroundColorConfiguration.setSurfaceColors(VDSColor.feedbackErrorBackgroundOnlight, VDSColor.feedbackErrorBackgroundOndark, forState: .error)
backgroundColorConfig.setSurfaceColors(.clear, .clear, forState: [.error, .disabled]) backgroundColorConfiguration.setSurfaceColors(.clear, .clear, forState: [.error, .disabled])
borderColorConfig.setSurfaceColors(VDSColor.elementsPrimaryOnlight, VDSColor.elementsPrimaryOndark, forState: .selected) borderColorConfiguration.setSurfaceColors(VDSColor.elementsPrimaryOnlight, VDSColor.elementsPrimaryOndark, forState: .selected)
borderColorConfig.setSurfaceColors(VDSColor.elementsPrimaryOnlight, VDSColor.elementsPrimaryOndark, forState: .highlighted) borderColorConfiguration.setSurfaceColors(VDSColor.elementsPrimaryOnlight, VDSColor.elementsPrimaryOndark, forState: .highlighted)
borderColorConfig.setSurfaceColors(VDSFormControlsColor.borderOnlight, VDSFormControlsColor.borderOndark, forState: .normal) borderColorConfiguration.setSurfaceColors(VDSFormControlsColor.borderOnlight, VDSFormControlsColor.borderOndark, forState: .normal)
borderColorConfig.setSurfaceColors(VDSColor.interactiveDisabledOnlight, VDSColor.interactiveDisabledOndark, forState: .disabled) borderColorConfiguration.setSurfaceColors(VDSColor.interactiveDisabledOnlight, VDSColor.interactiveDisabledOndark, forState: .disabled)
borderColorConfig.setSurfaceColors(VDSColor.feedbackErrorOnlight, VDSColor.feedbackErrorOndark, forState: .error) borderColorConfiguration.setSurfaceColors(VDSColor.feedbackErrorOnlight, VDSColor.feedbackErrorOndark, forState: .error)
borderColorConfig.setSurfaceColors(VDSColor.interactiveDisabledOnlight, VDSColor.interactiveDisabledOndark, forState: [.selected, .disabled]) borderColorConfiguration.setSurfaceColors(VDSColor.interactiveDisabledOnlight, VDSColor.interactiveDisabledOndark, forState: [.selected, .disabled])
borderColorConfig.setSurfaceColors(VDSColor.interactiveDisabledOnlight, VDSColor.interactiveDisabledOndark, forState: [.error, .disabled]) borderColorConfiguration.setSurfaceColors(VDSColor.interactiveDisabledOnlight, VDSColor.interactiveDisabledOndark, forState: [.error, .disabled])
selectorColorConfig.setSurfaceColors(VDSColor.elementsPrimaryOnlight, VDSColor.elementsPrimaryOndark, forState: .selected) selectorColorConfiguration.setSurfaceColors(VDSColor.elementsPrimaryOnlight, VDSColor.elementsPrimaryOndark, forState: .selected)
selectorColorConfig.setSurfaceColors(VDSColor.interactiveDisabledOnlight, VDSColor.interactiveDisabledOndark, forState: [.selected, .disabled]) selectorColorConfiguration.setSurfaceColors(VDSColor.interactiveDisabledOnlight, VDSColor.interactiveDisabledOndark, forState: [.selected, .disabled])
} }
@ -40,9 +40,9 @@ open class RadioButton: SelectorBase {
super.layoutSubviews() super.layoutSubviews()
//get the colors //get the colors
let backgroundColor = backgroundColorConfig.getColor(self) let backgroundColor = backgroundColorConfiguration.getColor(self)
let borderColor = borderColorConfig.getColor(self) let borderColor = borderColorConfiguration.getColor(self)
let selectorColor = selectorColorConfig.getColor(self) let selectorColor = selectorColorConfiguration.getColor(self)
if let shapeLayer = shapeLayer, let sublayers = layer.sublayers, sublayers.contains(shapeLayer) { if let shapeLayer = shapeLayer, let sublayers = layer.sublayers, sublayers.contains(shapeLayer) {
shapeLayer.removeFromSuperlayer() shapeLayer.removeFromSuperlayer()

4
VDS/Components/Tooltip/Tooltip.swift
View File

@ -57,7 +57,7 @@ open class Tooltip: Control, TooltipLaunchable {
//-------------------------------------------------- //--------------------------------------------------
// MARK: - Configuration // MARK: - Configuration
//-------------------------------------------------- //--------------------------------------------------
private var iconColorConfig: AnyColorable { private var iconColorConfiguration: AnyColorable {
switch fillColor { switch fillColor {
case .primary: case .primary:
@ -158,7 +158,7 @@ open class Tooltip: Control, TooltipLaunchable {
widthConstraint?.constant = dimensions.width widthConstraint?.constant = dimensions.width
//get the color for the image //get the color for the image
let imageColor = iconColorConfig.getColor(self) let imageColor = iconColorConfiguration.getColor(self)
imageView.image = infoImage.withTintColor(imageColor) imageView.image = infoImage.withTintColor(imageColor)
accessibilityLabel = "Tooltip: \(title)" accessibilityLabel = "Tooltip: \(title)"

2
VDS/Components/Tooltip/TooltipAlertViewController.swift
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.elementsLowcontrastOndark).eraseToAnyColorable() instance.lineViewColorConfiguration = SurfaceColorConfiguration(VDSColor.elementsLowcontrastOnlight, VDSColor.elementsLowcontrastOndark).eraseToAnyColorable()
} }
//-------------------------------------------------- //--------------------------------------------------