refactored error in checkboxconfig

Signed-off-by: Matt Bruce <matt.bruce@verizon.com>
This commit is contained in:
Matt Bruce 2022-08-05 11:04:30 -05:00
parent b3622ce854
commit 73410ab6bb

View File

@ -277,10 +277,11 @@ open class CheckboxBase<ModelType: CheckboxModel>: Control<ModelType>, Changable
config.forTrue.enabled.darkColor = VDSColor.elementsPrimaryOndark config.forTrue.enabled.darkColor = VDSColor.elementsPrimaryOndark
config.forTrue.disabled.lightColor = VDSColor.interactiveDisabledOnlight config.forTrue.disabled.lightColor = VDSColor.interactiveDisabledOnlight
config.forTrue.disabled.darkColor = VDSColor.interactiveDisabledOndark config.forTrue.disabled.darkColor = VDSColor.interactiveDisabledOndark
config.error.forTrue.enabled.lightColor = VDSColor.elementsPrimaryOnlight //error doesn't care enabled/disable
config.error.forTrue.enabled.darkColor = VDSColor.elementsPrimaryOndark config.error.forTrue.lightColor = VDSColor.elementsPrimaryOnlight
config.error.forFalse.enabled.lightColor = VDSColor.feedbackErrorBackgroundOnlight config.error.forTrue.darkColor = VDSColor.elementsPrimaryOndark
config.error.forFalse.enabled.darkColor = VDSColor.feedbackErrorBackgroundOndark config.error.forFalse.lightColor = VDSColor.feedbackErrorBackgroundOnlight
config.error.forFalse.darkColor = VDSColor.feedbackErrorBackgroundOndark
return config return config
}() }()
@ -294,10 +295,11 @@ open class CheckboxBase<ModelType: CheckboxModel>: Control<ModelType>, Changable
config.forTrue.disabled.darkColor = VDSColor.interactiveDisabledOndark config.forTrue.disabled.darkColor = VDSColor.interactiveDisabledOndark
config.forFalse.disabled.lightColor = VDSColor.interactiveDisabledOnlight config.forFalse.disabled.lightColor = VDSColor.interactiveDisabledOnlight
config.forFalse.disabled.darkColor = VDSColor.interactiveDisabledOndark config.forFalse.disabled.darkColor = VDSColor.interactiveDisabledOndark
config.error.forTrue.enabled.lightColor = VDSColor.elementsPrimaryOnlight //error doesn't care enabled/disable
config.error.forTrue.enabled.darkColor = VDSColor.elementsPrimaryOndark config.error.forTrue.lightColor = VDSColor.elementsPrimaryOnlight
config.error.forFalse.enabled.lightColor = VDSColor.feedbackErrorOnlight config.error.forTrue.darkColor = VDSColor.elementsPrimaryOndark
config.error.forFalse.enabled.darkColor = VDSColor.feedbackErrorOndark config.error.forFalse.lightColor = VDSColor.feedbackErrorOnlight
config.error.forFalse.darkColor = VDSColor.feedbackErrorOndark
return config return config
}() }()
@ -416,8 +418,7 @@ open class CheckboxBase<ModelType: CheckboxModel>: Control<ModelType>, Changable
// MARK: - Color Class Configurations // MARK: - Color Class Configurations
//-------------------------------------------------- //--------------------------------------------------
private class CheckboxErrorColorConfiguration: BinaryDisabledSurfaceColorConfiguration<ModelType> { private class CheckboxErrorColorConfiguration: BinaryDisabledSurfaceColorConfiguration<ModelType> {
public let error = BinaryDisabledSurfaceColorConfiguration<ModelType>() public let error = BinarySurfaceColorConfiguration<ModelType>()
override func getColor(_ viewModel: ModelType) -> UIColor { override func getColor(_ viewModel: ModelType) -> UIColor {
//only show error is enabled and showError == true //only show error is enabled and showError == true
let showErrorColor = !viewModel.disabled && viewModel.showError let showErrorColor = !viewModel.disabled && viewModel.showError