From 73410ab6bb863692a3e0b531038da5545832cf4f Mon Sep 17 00:00:00 2001 From: Matt Bruce Date: Fri, 5 Aug 2022 11:04:30 -0500 Subject: [PATCH] refactored error in checkboxconfig Signed-off-by: Matt Bruce --- VDS/Components/Checkbox/Checkbox.swift | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/VDS/Components/Checkbox/Checkbox.swift b/VDS/Components/Checkbox/Checkbox.swift index 31a72889..c183f094 100644 --- a/VDS/Components/Checkbox/Checkbox.swift +++ b/VDS/Components/Checkbox/Checkbox.swift @@ -277,10 +277,11 @@ open class CheckboxBase: Control, Changable config.forTrue.enabled.darkColor = VDSColor.elementsPrimaryOndark config.forTrue.disabled.lightColor = VDSColor.interactiveDisabledOnlight config.forTrue.disabled.darkColor = VDSColor.interactiveDisabledOndark - config.error.forTrue.enabled.lightColor = VDSColor.elementsPrimaryOnlight - config.error.forTrue.enabled.darkColor = VDSColor.elementsPrimaryOndark - config.error.forFalse.enabled.lightColor = VDSColor.feedbackErrorBackgroundOnlight - config.error.forFalse.enabled.darkColor = VDSColor.feedbackErrorBackgroundOndark + //error doesn't care enabled/disable + config.error.forTrue.lightColor = VDSColor.elementsPrimaryOnlight + config.error.forTrue.darkColor = VDSColor.elementsPrimaryOndark + config.error.forFalse.lightColor = VDSColor.feedbackErrorBackgroundOnlight + config.error.forFalse.darkColor = VDSColor.feedbackErrorBackgroundOndark return config }() @@ -294,10 +295,11 @@ open class CheckboxBase: Control, Changable config.forTrue.disabled.darkColor = VDSColor.interactiveDisabledOndark config.forFalse.disabled.lightColor = VDSColor.interactiveDisabledOnlight config.forFalse.disabled.darkColor = VDSColor.interactiveDisabledOndark - config.error.forTrue.enabled.lightColor = VDSColor.elementsPrimaryOnlight - config.error.forTrue.enabled.darkColor = VDSColor.elementsPrimaryOndark - config.error.forFalse.enabled.lightColor = VDSColor.feedbackErrorOnlight - config.error.forFalse.enabled.darkColor = VDSColor.feedbackErrorOndark + //error doesn't care enabled/disable + config.error.forTrue.lightColor = VDSColor.elementsPrimaryOnlight + config.error.forTrue.darkColor = VDSColor.elementsPrimaryOndark + config.error.forFalse.lightColor = VDSColor.feedbackErrorOnlight + config.error.forFalse.darkColor = VDSColor.feedbackErrorOndark return config }() @@ -416,8 +418,7 @@ open class CheckboxBase: Control, Changable // MARK: - Color Class Configurations //-------------------------------------------------- private class CheckboxErrorColorConfiguration: BinaryDisabledSurfaceColorConfiguration { - public let error = BinaryDisabledSurfaceColorConfiguration() - + public let error = BinarySurfaceColorConfiguration() override func getColor(_ viewModel: ModelType) -> UIColor { //only show error is enabled and showError == true let showErrorColor = !viewModel.disabled && viewModel.showError