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

refactored to match classes for textColorConfiguration

Browse Source 
Signed-off-by: Matt Bruce <matt.bruce@verizon.com>
This commit is contained in:
Matt Bruce 2022-12-08 13:26:32 -06:00
parent 338f70ae2b
commit 1791718c75
2 changed files with 11 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
VDS/Components/Buttons/TextLink/TextLink.swift
View File

@ -32,10 +32,14 @@ open class TextLink: ButtonBase {
} }
open override var textColor: UIColor { open override var textColor: UIColor {
textColors.getColor(self) textColorConfiguration.getColor(self)
} }
private var textColors = ControlColorConfiguration() private var textColorConfiguration = ControlColorConfiguration().with {
$0.setSurfaceColors(VDSColor.elementsPrimaryOnlight, VDSColor.elementsPrimaryOndark, forState: .normal)
$0.setSurfaceColors(VDSColor.elementsSecondaryOnlight, VDSColor.elementsSecondaryOndark, forState: .disabled)
$0.setSurfaceColors(VDSColor.interactiveActiveOnlight, VDSColor.interactiveActiveOndark, forState: .highlighted)
}
private var height: CGFloat { private var height: CGFloat {
switch size { switch size {
@ -70,11 +74,7 @@ open class TextLink: ButtonBase {
//-------------------------------------------------- //--------------------------------------------------
open override func setup() { open override func setup() {
super.setup() super.setup()
textColors.setSurfaceColors(VDSColor.elementsPrimaryOnlight, VDSColor.elementsPrimaryOndark, forState: .normal)
textColors.setSurfaceColors(VDSColor.elementsSecondaryOnlight, VDSColor.elementsSecondaryOndark, forState: .disabled)
textColors.setSurfaceColors(VDSColor.interactiveActiveOnlight, VDSColor.interactiveActiveOndark, forState: .highlighted)
if let titleLabel { if let titleLabel {
addSubview(line) addSubview(line)
line.pinLeading(titleLabel.leadingAnchor) line.pinLeading(titleLabel.leadingAnchor)

12
VDS/Components/Buttons/TextLinkCaret/TextLinkCaret.swift
View File

@ -65,14 +65,10 @@ open class TextLinkCaret: ButtonBase {
textColorConfiguration.getColor(self) textColorConfiguration.getColor(self)
} }
private var textColorConfiguration = HighlightDisabledSurfaceColorConfiguration().with { private var textColorConfiguration = ControlColorConfiguration().with {
$0.disabled.lightColor = VDSColor.elementsSecondaryOnlight $0.setSurfaceColors(VDSColor.elementsPrimaryOnlight, VDSColor.elementsPrimaryOndark, forState: .normal)
$0.disabled.darkColor = VDSColor.elementsSecondaryOndark $0.setSurfaceColors(VDSColor.elementsSecondaryOnlight, VDSColor.elementsSecondaryOndark, forState: .disabled)
$0.enabled.lightColor = VDSColor.elementsPrimaryOnlight $0.setSurfaceColors(VDSColor.interactiveActiveOnlight, VDSColor.interactiveActiveOndark, forState: .highlighted)
$0.enabled.darkColor = VDSColor.elementsPrimaryOndark
$0.highlighted.lightColor = VDSColor.interactiveActiveOnlight
$0.highlighted.darkColor = VDSColor.interactiveActiveOndark
} }
//-------------------------------------------------- //--------------------------------------------------