From 139d8fbce9127f383758aaa9685e7349a5aa3a4c Mon Sep 17 00:00:00 2001 From: Matt Bruce Date: Thu, 8 Dec 2022 17:59:31 -0600 Subject: [PATCH] added success updated config Signed-off-by: Matt Bruce --- .../TextEntryField/TextEntryField.swift | 33 ++----------------- VDS/Extensions/UIControl.swift | 2 +- 2 files changed, 4 insertions(+), 31 deletions(-) diff --git a/VDS/Components/TextFields/TextEntryField/TextEntryField.swift b/VDS/Components/TextFields/TextEntryField/TextEntryField.swift index 6d8b8742..5d9866fe 100644 --- a/VDS/Components/TextFields/TextEntryField/TextEntryField.swift +++ b/VDS/Components/TextFields/TextEntryField/TextEntryField.swift @@ -90,6 +90,9 @@ open class TextEntryFieldBase: EntryField { successLabel.textColorConfiguration = primaryColorConfig.eraseToAnyColorable() + backgroundColorConfiguration.setSurfaceColors(VDSColor.feedbackSuccessBackgroundOnlight, VDSColor.feedbackSuccessBackgroundOndark, forState: .success) + borderColorConfiguration.setSurfaceColors(VDSColor.feedbackSuccessOnlight, VDSColor.feedbackSuccessOndark, forState: .success) + } public override func reset() { @@ -109,36 +112,6 @@ open class TextEntryFieldBase: EntryField { return containerStackView } - open override func getBackgroundConfig() -> AnyColorable { - return TextEntryFieldColorConfiguration().with { - $0.enabled.lightColor = VDSFormControlsColor.backgroundOnlight - $0.enabled.darkColor = VDSFormControlsColor.backgroundOndark - $0.disabled.lightColor = VDSFormControlsColor.backgroundOnlight - $0.disabled.darkColor = VDSFormControlsColor.backgroundOndark - - //error/success doesn't care enabled/disable - $0.error.lightColor = VDSColor.feedbackErrorBackgroundOnlight - $0.error.darkColor = VDSColor.feedbackErrorBackgroundOndark - $0.success.lightColor = VDSColor.feedbackSuccessBackgroundOnlight - $0.success.darkColor = VDSColor.feedbackSuccessBackgroundOndark - }.eraseToAnyColorable() - } - - open override func getBorderConfig() -> AnyColorable { - return TextEntryFieldColorConfiguration().with { - $0.enabled.lightColor = VDSFormControlsColor.borderOnlight - $0.enabled.darkColor = VDSFormControlsColor.borderOnlight - $0.disabled.lightColor = VDSColor.interactiveDisabledOnlight - $0.disabled.darkColor = VDSColor.interactiveDisabledOndark - - //error/success doesn't care enabled/disable - $0.error.lightColor = VDSColor.feedbackErrorOnlight - $0.error.darkColor = VDSColor.feedbackErrorOndark - $0.success.lightColor = VDSColor.feedbackSuccessOnlight - $0.success.darkColor = VDSColor.feedbackSuccessOndark - }.eraseToAnyColorable() - } - //-------------------------------------------------- // MARK: - State //-------------------------------------------------- diff --git a/VDS/Extensions/UIControl.swift b/VDS/Extensions/UIControl.swift index abccd3f3..ce32dcad 100644 --- a/VDS/Extensions/UIControl.swift +++ b/VDS/Extensions/UIControl.swift @@ -10,5 +10,5 @@ import UIKit extension UIControl.State { public static var error = UIControl.State(rawValue: 1 << 16) - public static var success = UIControl.State(rawValue: 1 << 16) + public static var success = UIControl.State(rawValue: 1 << 17) }