From b3622ce854db7acb3842ba926d81acebe8bc07d1 Mon Sep 17 00:00:00 2001 From: Matt Bruce Date: Fri, 5 Aug 2022 10:59:10 -0500 Subject: [PATCH] refactored isTrue/False to forTrue/false Signed-off-by: Matt Bruce --- VDS/Classes/ColorConfiguration.swift | 36 ++++++++++----------- VDS/Components/Checkbox/Checkbox.swift | 44 +++++++++++++------------- VDS/Components/Toggle/Toggle.swift | 32 +++++++++---------- 3 files changed, 56 insertions(+), 56 deletions(-) diff --git a/VDS/Classes/ColorConfiguration.swift b/VDS/Classes/ColorConfiguration.swift index 18d02d4a..5254db3b 100644 --- a/VDS/Classes/ColorConfiguration.swift +++ b/VDS/Classes/ColorConfiguration.swift @@ -78,22 +78,22 @@ open class DisabledSurfaceColorConfiguration: /// let config = BinarySurfaceColorConfiguration() /// /// //True from BinaryColorable.userTrueColor -/// config.isTrue.lightColor = .black -/// config.isTrue.darkColor = .white +/// config.forTrue.lightColor = .black +/// config.forTrue.darkColor = .white /// /// //False from BinaryColorable.userTrueColor -/// config.isFalse.lightColor = .red -/// config.isFalse.darkColor = .red +/// config.forFalse.lightColor = .red +/// config.forFalse.darkColor = .red /// /// let textColor = config.getColor(model) //returns .white /// /// open class BinarySurfaceColorConfiguration: Colorable{ - public var isTrue = SurfaceColorConfiguration() - public var isFalse = SurfaceColorConfiguration() + public var forTrue = SurfaceColorConfiguration() + public var forFalse = SurfaceColorConfiguration() public func getColor(_ viewModel: ModelType) -> UIColor { - return viewModel.userTrueColor ? isTrue.getColor(viewModel) : isFalse.getColor(viewModel) + return viewModel.userTrueColor ? forTrue.getColor(viewModel) : forFalse.getColor(viewModel) } } @@ -107,25 +107,25 @@ open class BinarySurfaceColorConfiguration() /// /// //True -/// config.isTrue.enabled.lightColor = .black -/// config.isTrue.enabled.darkColor = .white -/// config.isTrue.disabled.lightColor = .darkGray -/// config.isTrue.disabled.darkColor = .lightGray +/// config.forTrue.enabled.lightColor = .black +/// config.forTrue.enabled.darkColor = .white +/// config.forTrue.disabled.lightColor = .darkGray +/// config.forTrue.disabled.darkColor = .lightGray /// /// //False -/// config.isFalse.enabled.lightColor = .red -/// config.isFalse.enabled.darkColor = .red -/// config.isFalse.disabled.lightColor =.darkGray -/// config.isFalse.disabled.darkColor = .lightGray +/// config.forFalse.enabled.lightColor = .red +/// config.forFalse.enabled.darkColor = .red +/// config.forFalse.disabled.lightColor =.darkGray +/// config.forFalse.disabled.darkColor = .lightGray /// /// let textColor = config.getColor(model) /// /// open class BinaryDisabledSurfaceColorConfiguration: Colorable { - public var isTrue = DisabledSurfaceColorConfiguration() - public var isFalse = DisabledSurfaceColorConfiguration() + public var forTrue = DisabledSurfaceColorConfiguration() + public var forFalse = DisabledSurfaceColorConfiguration() public func getColor(_ viewModel: ModelType) -> UIColor { - return viewModel.userTrueColor ? isTrue.getColor(viewModel) : isFalse.getColor(viewModel) + return viewModel.userTrueColor ? forTrue.getColor(viewModel) : forFalse.getColor(viewModel) } } diff --git a/VDS/Components/Checkbox/Checkbox.swift b/VDS/Components/Checkbox/Checkbox.swift index a1f3b110..31a72889 100644 --- a/VDS/Components/Checkbox/Checkbox.swift +++ b/VDS/Components/Checkbox/Checkbox.swift @@ -273,38 +273,38 @@ open class CheckboxBase: Control, Changable private var checkboxBackgroundColorConfiguration: CheckboxErrorColorConfiguration = { let config = CheckboxErrorColorConfiguration() - config.isTrue.enabled.lightColor = VDSColor.elementsPrimaryOnlight - config.isTrue.enabled.darkColor = VDSColor.elementsPrimaryOndark - config.isTrue.disabled.lightColor = VDSColor.interactiveDisabledOnlight - config.isTrue.disabled.darkColor = VDSColor.interactiveDisabledOndark - config.error.isTrue.enabled.lightColor = VDSColor.elementsPrimaryOnlight - config.error.isTrue.enabled.darkColor = VDSColor.elementsPrimaryOndark - config.error.isFalse.enabled.lightColor = VDSColor.feedbackErrorBackgroundOnlight - config.error.isFalse.enabled.darkColor = VDSColor.feedbackErrorBackgroundOndark + config.forTrue.enabled.lightColor = VDSColor.elementsPrimaryOnlight + 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 return config }() private var checkboxBorderColorConfiguration: CheckboxErrorColorConfiguration = { let config = CheckboxErrorColorConfiguration() - config.isTrue.enabled.lightColor = VDSColor.elementsPrimaryOnlight - config.isTrue.enabled.darkColor = VDSColor.elementsPrimaryOndark - config.isFalse.enabled.lightColor = VDSFormControlsColor.borderOnlight - config.isFalse.enabled.darkColor = VDSFormControlsColor.borderOndark - config.isTrue.disabled.lightColor = VDSColor.interactiveDisabledOnlight - config.isTrue.disabled.darkColor = VDSColor.interactiveDisabledOndark - config.isFalse.disabled.lightColor = VDSColor.interactiveDisabledOnlight - config.isFalse.disabled.darkColor = VDSColor.interactiveDisabledOndark - config.error.isTrue.enabled.lightColor = VDSColor.elementsPrimaryOnlight - config.error.isTrue.enabled.darkColor = VDSColor.elementsPrimaryOndark - config.error.isFalse.enabled.lightColor = VDSColor.feedbackErrorOnlight - config.error.isFalse.enabled.darkColor = VDSColor.feedbackErrorOndark + config.forTrue.enabled.lightColor = VDSColor.elementsPrimaryOnlight + config.forTrue.enabled.darkColor = VDSColor.elementsPrimaryOndark + config.forFalse.enabled.lightColor = VDSFormControlsColor.borderOnlight + config.forFalse.enabled.darkColor = VDSFormControlsColor.borderOndark + config.forTrue.disabled.lightColor = VDSColor.interactiveDisabledOnlight + 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 return config }() private var checkboxCheckColorConfiguration: BinarySurfaceColorConfiguration = { let config = BinarySurfaceColorConfiguration() - config.isTrue.lightColor = VDSColor.elementsPrimaryOndark - config.isTrue.darkColor = VDSColor.elementsPrimaryOnlight + config.forTrue.lightColor = VDSColor.elementsPrimaryOndark + config.forTrue.darkColor = VDSColor.elementsPrimaryOnlight return config }() diff --git a/VDS/Components/Toggle/Toggle.swift b/VDS/Components/Toggle/Toggle.swift index 2bddbe25..47ccc718 100644 --- a/VDS/Components/Toggle/Toggle.swift +++ b/VDS/Components/Toggle/Toggle.swift @@ -181,27 +181,27 @@ open class ToggleBase: Control, Changable { //-------------------------------------------------- private var toggleColorConfiguration: BinaryDisabledSurfaceColorConfiguration = { let config = BinaryDisabledSurfaceColorConfiguration() - config.isTrue.enabled.lightColor = VDSColor.paletteGreen26 - config.isTrue.enabled.darkColor = VDSColor.paletteGreen34 - config.isTrue.disabled.lightColor = VDSColor.interactiveDisabledOnlight - config.isTrue.disabled.darkColor = VDSColor.interactiveDisabledOndark - config.isFalse.enabled.lightColor = VDSColor.elementsSecondaryOnlight - config.isFalse.enabled.darkColor = VDSColor.paletteGray44 - config.isFalse.disabled.lightColor = VDSColor.interactiveDisabledOnlight - config.isFalse.disabled.darkColor = VDSColor.interactiveDisabledOndark + config.forTrue.enabled.lightColor = VDSColor.paletteGreen26 + config.forTrue.enabled.darkColor = VDSColor.paletteGreen34 + config.forTrue.disabled.lightColor = VDSColor.interactiveDisabledOnlight + config.forTrue.disabled.darkColor = VDSColor.interactiveDisabledOndark + config.forFalse.enabled.lightColor = VDSColor.elementsSecondaryOnlight + config.forFalse.enabled.darkColor = VDSColor.paletteGray44 + config.forFalse.disabled.lightColor = VDSColor.interactiveDisabledOnlight + config.forFalse.disabled.darkColor = VDSColor.interactiveDisabledOndark return config } () private var knobColorConfiguration: BinaryDisabledSurfaceColorConfiguration = { let config = BinaryDisabledSurfaceColorConfiguration() - config.isTrue.enabled.lightColor = VDSColor.elementsPrimaryOndark - config.isTrue.enabled.darkColor = VDSColor.elementsPrimaryOndark - config.isTrue.disabled.lightColor = VDSColor.paletteGray95 - config.isTrue.disabled.darkColor = VDSColor.paletteGray44 - config.isFalse.enabled.lightColor = VDSColor.elementsPrimaryOndark - config.isFalse.enabled.darkColor = VDSColor.elementsPrimaryOndark - config.isFalse.disabled.lightColor = VDSColor.paletteGray95 - config.isFalse.disabled.darkColor = VDSColor.paletteGray44 + config.forTrue.enabled.lightColor = VDSColor.elementsPrimaryOndark + config.forTrue.enabled.darkColor = VDSColor.elementsPrimaryOndark + config.forTrue.disabled.lightColor = VDSColor.paletteGray95 + config.forTrue.disabled.darkColor = VDSColor.paletteGray44 + config.forFalse.enabled.lightColor = VDSColor.elementsPrimaryOndark + config.forFalse.enabled.darkColor = VDSColor.elementsPrimaryOndark + config.forFalse.disabled.lightColor = VDSColor.paletteGray95 + config.forFalse.disabled.darkColor = VDSColor.paletteGray44 return config } ()