refactored isTrue/False to forTrue/false

Signed-off-by: Matt Bruce <matt.bruce@verizon.com>
This commit is contained in:
Matt Bruce 2022-08-05 10:59:10 -05:00
parent b318f1519b
commit b3622ce854
3 changed files with 56 additions and 56 deletions

View File

@ -78,22 +78,22 @@ open class DisabledSurfaceColorConfiguration<ModelType:Disabling & Surfaceable>:
/// let config = BinarySurfaceColorConfiguration<TestModel>() /// let config = BinarySurfaceColorConfiguration<TestModel>()
/// ///
/// //True from BinaryColorable.userTrueColor /// //True from BinaryColorable.userTrueColor
/// config.isTrue.lightColor = .black /// config.forTrue.lightColor = .black
/// config.isTrue.darkColor = .white /// config.forTrue.darkColor = .white
/// ///
/// //False from BinaryColorable.userTrueColor /// //False from BinaryColorable.userTrueColor
/// config.isFalse.lightColor = .red /// config.forFalse.lightColor = .red
/// config.isFalse.darkColor = .red /// config.forFalse.darkColor = .red
/// ///
/// let textColor = config.getColor(model) //returns .white /// let textColor = config.getColor(model) //returns .white
/// ///
/// ///
open class BinarySurfaceColorConfiguration<ModelType:Surfaceable & BinaryColorable>: Colorable{ open class BinarySurfaceColorConfiguration<ModelType:Surfaceable & BinaryColorable>: Colorable{
public var isTrue = SurfaceColorConfiguration<ModelType>() public var forTrue = SurfaceColorConfiguration<ModelType>()
public var isFalse = SurfaceColorConfiguration<ModelType>() public var forFalse = SurfaceColorConfiguration<ModelType>()
public func getColor(_ viewModel: ModelType) -> UIColor { 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<ModelType:Surfaceable & BinaryColorab
/// let config = BinaryDisabledSurfaceColorConfiguration<TestModel>() /// let config = BinaryDisabledSurfaceColorConfiguration<TestModel>()
/// ///
/// //True /// //True
/// config.isTrue.enabled.lightColor = .black /// config.forTrue.enabled.lightColor = .black
/// config.isTrue.enabled.darkColor = .white /// config.forTrue.enabled.darkColor = .white
/// config.isTrue.disabled.lightColor = .darkGray /// config.forTrue.disabled.lightColor = .darkGray
/// config.isTrue.disabled.darkColor = .lightGray /// config.forTrue.disabled.darkColor = .lightGray
/// ///
/// //False /// //False
/// config.isFalse.enabled.lightColor = .red /// config.forFalse.enabled.lightColor = .red
/// config.isFalse.enabled.darkColor = .red /// config.forFalse.enabled.darkColor = .red
/// config.isFalse.disabled.lightColor =.darkGray /// config.forFalse.disabled.lightColor =.darkGray
/// config.isFalse.disabled.darkColor = .lightGray /// config.forFalse.disabled.darkColor = .lightGray
/// ///
/// let textColor = config.getColor(model) /// let textColor = config.getColor(model)
/// ///
/// ///
open class BinaryDisabledSurfaceColorConfiguration<ModelType:Disabling & Surfaceable & BinaryColorable>: Colorable { open class BinaryDisabledSurfaceColorConfiguration<ModelType:Disabling & Surfaceable & BinaryColorable>: Colorable {
public var isTrue = DisabledSurfaceColorConfiguration<ModelType>() public var forTrue = DisabledSurfaceColorConfiguration<ModelType>()
public var isFalse = DisabledSurfaceColorConfiguration<ModelType>() public var forFalse = DisabledSurfaceColorConfiguration<ModelType>()
public func getColor(_ viewModel: ModelType) -> UIColor { public func getColor(_ viewModel: ModelType) -> UIColor {
return viewModel.userTrueColor ? isTrue.getColor(viewModel) : isFalse.getColor(viewModel) return viewModel.userTrueColor ? forTrue.getColor(viewModel) : forFalse.getColor(viewModel)
} }
} }

View File

@ -273,38 +273,38 @@ open class CheckboxBase<ModelType: CheckboxModel>: Control<ModelType>, Changable
private var checkboxBackgroundColorConfiguration: CheckboxErrorColorConfiguration = { private var checkboxBackgroundColorConfiguration: CheckboxErrorColorConfiguration = {
let config = CheckboxErrorColorConfiguration() let config = CheckboxErrorColorConfiguration()
config.isTrue.enabled.lightColor = VDSColor.elementsPrimaryOnlight config.forTrue.enabled.lightColor = VDSColor.elementsPrimaryOnlight
config.isTrue.enabled.darkColor = VDSColor.elementsPrimaryOndark config.forTrue.enabled.darkColor = VDSColor.elementsPrimaryOndark
config.isTrue.disabled.lightColor = VDSColor.interactiveDisabledOnlight config.forTrue.disabled.lightColor = VDSColor.interactiveDisabledOnlight
config.isTrue.disabled.darkColor = VDSColor.interactiveDisabledOndark config.forTrue.disabled.darkColor = VDSColor.interactiveDisabledOndark
config.error.isTrue.enabled.lightColor = VDSColor.elementsPrimaryOnlight config.error.forTrue.enabled.lightColor = VDSColor.elementsPrimaryOnlight
config.error.isTrue.enabled.darkColor = VDSColor.elementsPrimaryOndark config.error.forTrue.enabled.darkColor = VDSColor.elementsPrimaryOndark
config.error.isFalse.enabled.lightColor = VDSColor.feedbackErrorBackgroundOnlight config.error.forFalse.enabled.lightColor = VDSColor.feedbackErrorBackgroundOnlight
config.error.isFalse.enabled.darkColor = VDSColor.feedbackErrorBackgroundOndark config.error.forFalse.enabled.darkColor = VDSColor.feedbackErrorBackgroundOndark
return config return config
}() }()
private var checkboxBorderColorConfiguration: CheckboxErrorColorConfiguration = { private var checkboxBorderColorConfiguration: CheckboxErrorColorConfiguration = {
let config = CheckboxErrorColorConfiguration() let config = CheckboxErrorColorConfiguration()
config.isTrue.enabled.lightColor = VDSColor.elementsPrimaryOnlight config.forTrue.enabled.lightColor = VDSColor.elementsPrimaryOnlight
config.isTrue.enabled.darkColor = VDSColor.elementsPrimaryOndark config.forTrue.enabled.darkColor = VDSColor.elementsPrimaryOndark
config.isFalse.enabled.lightColor = VDSFormControlsColor.borderOnlight config.forFalse.enabled.lightColor = VDSFormControlsColor.borderOnlight
config.isFalse.enabled.darkColor = VDSFormControlsColor.borderOndark config.forFalse.enabled.darkColor = VDSFormControlsColor.borderOndark
config.isTrue.disabled.lightColor = VDSColor.interactiveDisabledOnlight config.forTrue.disabled.lightColor = VDSColor.interactiveDisabledOnlight
config.isTrue.disabled.darkColor = VDSColor.interactiveDisabledOndark config.forTrue.disabled.darkColor = VDSColor.interactiveDisabledOndark
config.isFalse.disabled.lightColor = VDSColor.interactiveDisabledOnlight config.forFalse.disabled.lightColor = VDSColor.interactiveDisabledOnlight
config.isFalse.disabled.darkColor = VDSColor.interactiveDisabledOndark config.forFalse.disabled.darkColor = VDSColor.interactiveDisabledOndark
config.error.isTrue.enabled.lightColor = VDSColor.elementsPrimaryOnlight config.error.forTrue.enabled.lightColor = VDSColor.elementsPrimaryOnlight
config.error.isTrue.enabled.darkColor = VDSColor.elementsPrimaryOndark config.error.forTrue.enabled.darkColor = VDSColor.elementsPrimaryOndark
config.error.isFalse.enabled.lightColor = VDSColor.feedbackErrorOnlight config.error.forFalse.enabled.lightColor = VDSColor.feedbackErrorOnlight
config.error.isFalse.enabled.darkColor = VDSColor.feedbackErrorOndark config.error.forFalse.enabled.darkColor = VDSColor.feedbackErrorOndark
return config return config
}() }()
private var checkboxCheckColorConfiguration: BinarySurfaceColorConfiguration<ModelType> = { private var checkboxCheckColorConfiguration: BinarySurfaceColorConfiguration<ModelType> = {
let config = BinarySurfaceColorConfiguration<ModelType>() let config = BinarySurfaceColorConfiguration<ModelType>()
config.isTrue.lightColor = VDSColor.elementsPrimaryOndark config.forTrue.lightColor = VDSColor.elementsPrimaryOndark
config.isTrue.darkColor = VDSColor.elementsPrimaryOnlight config.forTrue.darkColor = VDSColor.elementsPrimaryOnlight
return config return config
}() }()

View File

@ -181,27 +181,27 @@ open class ToggleBase<ModelType: ToggleModel>: Control<ModelType>, Changable {
//-------------------------------------------------- //--------------------------------------------------
private var toggleColorConfiguration: BinaryDisabledSurfaceColorConfiguration<ModelType> = { private var toggleColorConfiguration: BinaryDisabledSurfaceColorConfiguration<ModelType> = {
let config = BinaryDisabledSurfaceColorConfiguration<ModelType>() let config = BinaryDisabledSurfaceColorConfiguration<ModelType>()
config.isTrue.enabled.lightColor = VDSColor.paletteGreen26 config.forTrue.enabled.lightColor = VDSColor.paletteGreen26
config.isTrue.enabled.darkColor = VDSColor.paletteGreen34 config.forTrue.enabled.darkColor = VDSColor.paletteGreen34
config.isTrue.disabled.lightColor = VDSColor.interactiveDisabledOnlight config.forTrue.disabled.lightColor = VDSColor.interactiveDisabledOnlight
config.isTrue.disabled.darkColor = VDSColor.interactiveDisabledOndark config.forTrue.disabled.darkColor = VDSColor.interactiveDisabledOndark
config.isFalse.enabled.lightColor = VDSColor.elementsSecondaryOnlight config.forFalse.enabled.lightColor = VDSColor.elementsSecondaryOnlight
config.isFalse.enabled.darkColor = VDSColor.paletteGray44 config.forFalse.enabled.darkColor = VDSColor.paletteGray44
config.isFalse.disabled.lightColor = VDSColor.interactiveDisabledOnlight config.forFalse.disabled.lightColor = VDSColor.interactiveDisabledOnlight
config.isFalse.disabled.darkColor = VDSColor.interactiveDisabledOndark config.forFalse.disabled.darkColor = VDSColor.interactiveDisabledOndark
return config return config
} () } ()
private var knobColorConfiguration: BinaryDisabledSurfaceColorConfiguration<ModelType> = { private var knobColorConfiguration: BinaryDisabledSurfaceColorConfiguration<ModelType> = {
let config = BinaryDisabledSurfaceColorConfiguration<ModelType>() let config = BinaryDisabledSurfaceColorConfiguration<ModelType>()
config.isTrue.enabled.lightColor = VDSColor.elementsPrimaryOndark config.forTrue.enabled.lightColor = VDSColor.elementsPrimaryOndark
config.isTrue.enabled.darkColor = VDSColor.elementsPrimaryOndark config.forTrue.enabled.darkColor = VDSColor.elementsPrimaryOndark
config.isTrue.disabled.lightColor = VDSColor.paletteGray95 config.forTrue.disabled.lightColor = VDSColor.paletteGray95
config.isTrue.disabled.darkColor = VDSColor.paletteGray44 config.forTrue.disabled.darkColor = VDSColor.paletteGray44
config.isFalse.enabled.lightColor = VDSColor.elementsPrimaryOndark config.forFalse.enabled.lightColor = VDSColor.elementsPrimaryOndark
config.isFalse.enabled.darkColor = VDSColor.elementsPrimaryOndark config.forFalse.enabled.darkColor = VDSColor.elementsPrimaryOndark
config.isFalse.disabled.lightColor = VDSColor.paletteGray95 config.forFalse.disabled.lightColor = VDSColor.paletteGray95
config.isFalse.disabled.darkColor = VDSColor.paletteGray44 config.forFalse.disabled.darkColor = VDSColor.paletteGray44
return config return config
} () } ()