removed duplicates for states

Signed-off-by: Matt Bruce <matt.bruce@verizon.com>

VDS/Components/RadioBox/RadioBox.swift

@@ -290,7 +290,6 @@ open class RadioBoxBase: Control, BinaryColorable, Accessable, DataTrackable{
         $0.setSurfaceColors(VDSFormControlsColor.backgroundOnlight, VDSFormControlsColor.backgroundOndark, forState: .normal)
         $0.setSurfaceColors(VDSFormControlsColor.backgroundOnlight, VDSFormControlsColor.backgroundOndark, forState: .disabled)
         $0.setSurfaceColors(VDSFormControlsColor.backgroundOnlight, VDSFormControlsColor.backgroundOndark, forState: .selected)
-        $0.setSurfaceColors(VDSFormControlsColor.backgroundOnlight, VDSFormControlsColor.backgroundOndark, forState: [.selected, .disabled])
         $0.setSurfaceColors(VDSFormControlsColor.backgroundOnlight, VDSFormControlsColor.backgroundOndark, forState: .highlighted)
     }
 
@@ -298,7 +297,6 @@ open class RadioBoxBase: Control, BinaryColorable, Accessable, DataTrackable{
         $0.setSurfaceColors(VDSFormControlsColor.borderOnlight, VDSFormControlsColor.borderOndark, forState: .normal)
         $0.setSurfaceColors(VDSColor.interactiveDisabledOnlight, VDSColor.interactiveDisabledOndark, forState: .disabled)
         $0.setSurfaceColors(VDSColor.elementsPrimaryOnlight, VDSColor.elementsPrimaryOndark, forState: .selected)
-        $0.setSurfaceColors(VDSColor.interactiveDisabledOnlight, VDSColor.interactiveDisabledOndark, forState: [.selected, .disabled])
         $0.setSurfaceColors(VDSColor.elementsPrimaryOnlight, VDSColor.elementsPrimaryOndark, forState: .highlighted)
     }
     

VDS/Components/RadioButton/RadioButton.swift

@@ -329,18 +329,15 @@ open class RadioButtonBase: Control, Accessable, DataTrackable, BinaryColorable,
     public let radioButtonSelectedSize = CGSize(width: 10, height: 10)
 
     private var backgroundColorConfiguration = ControlColorConfiguration().with {
-        $0.setSurfaceColors(VDSColor.feedbackErrorBackgroundOnlight, VDSColor.feedbackErrorBackgroundOndark, forState: [.error])
+        $0.setSurfaceColors(VDSColor.feedbackErrorBackgroundOnlight, VDSColor.feedbackErrorBackgroundOndark, forState: .error)
     }
 
     private var borderColorConfiguration = ControlColorConfiguration().with {
-        $0.setSurfaceColors(VDSColor.elementsPrimaryOnlight, VDSColor.elementsPrimaryOndark, forState: [.selected])
+        $0.setSurfaceColors(VDSColor.elementsPrimaryOnlight, VDSColor.elementsPrimaryOndark, forState: .selected)
-        $0.setSurfaceColors(VDSColor.elementsPrimaryOnlight, VDSColor.elementsPrimaryOndark, forState: [.highlighted])
+        $0.setSurfaceColors(VDSColor.elementsPrimaryOnlight, VDSColor.elementsPrimaryOndark, forState: .highlighted)
-        $0.setSurfaceColors(VDSColor.elementsPrimaryOnlight, VDSColor.elementsPrimaryOndark, forState: [.error, .highlighted])
+        $0.setSurfaceColors(VDSFormControlsColor.borderOnlight, VDSFormControlsColor.borderOndark, forState: .normal)
-        $0.setSurfaceColors(VDSFormControlsColor.borderOnlight, VDSFormControlsColor.borderOndark, forState: [.normal])
+        $0.setSurfaceColors(VDSColor.interactiveDisabledOnlight, VDSColor.interactiveDisabledOndark, forState: [.disabled])
-        $0.setSurfaceColors(VDSColor.interactiveDisabledOnlight, VDSColor.interactiveDisabledOndark, forState: [.selected, .disabled])
+        $0.setSurfaceColors(VDSColor.feedbackErrorOnlight, VDSColor.feedbackErrorOndark, forState: .error)
-        $0.setSurfaceColors(VDSColor.interactiveDisabledOnlight, VDSColor.interactiveDisabledOndark, forState: [.normal, .disabled])
-        $0.setSurfaceColors(VDSColor.interactiveDisabledOnlight, VDSColor.interactiveDisabledOndark, forState: [.error, .disabled])
-        $0.setSurfaceColors(VDSColor.feedbackErrorOnlight, VDSColor.feedbackErrorOndark, forState: [.error])
     }
     
     private var checkColorConfiguration = ControlColorConfiguration().with {

VDS/Components/RadioSwatch/RadioSwatch.swift

@@ -175,7 +175,6 @@ open class RadioSwatchBase: Control, Accessable, DataTrackable, BinaryColorable
         $0.setSurfaceColors(VDSColor.interactiveDisabledOnlight, VDSColor.interactiveDisabledOndark, forState: .disabled)
         $0.setSurfaceColors(VDSColor.elementsPrimaryOnlight, VDSColor.elementsPrimaryOndark, forState: .highlighted)
         $0.setSurfaceColors(VDSColor.elementsPrimaryOnlight, VDSColor.elementsPrimaryOndark, forState: .selected)
-        $0.setSurfaceColors(VDSColor.interactiveDisabledOnlight, VDSColor.interactiveDisabledOndark, forState: [.selected, .disabled])
     }
 
     //--------------------------------------------------

VDS/Components/TextFields/EntryField/EntryField.swift

@@ -76,28 +76,28 @@ open class EntryField: Control, Accessable {
     // Sizes are from InVision design specs.
     internal let containerSize = CGSize(width: 45, height: 45)
     
-    internal let primaryColorConfig =  DisabledSurfaceColorConfiguration().with {
+    internal let primaryColorConfig =  ViewColorConfiguration().with {
-        $0.disabled.lightColor = VDSColor.interactiveDisabledOnlight
+        $0.setSurfaceColors(VDSColor.interactiveDisabledOnlight, VDSColor.interactiveDisabledOndark, forDisabled: true)
-        $0.disabled.darkColor = VDSColor.interactiveDisabledOndark
+        $0.setSurfaceColors(VDSColor.elementsPrimaryOnlight, VDSColor.elementsPrimaryOndark, forDisabled: false)
-        $0.enabled.lightColor = VDSColor.elementsPrimaryOnlight
-        $0.enabled.darkColor = VDSColor.elementsPrimaryOndark
     }
     
-    internal let secondaryColorConfig = DisabledSurfaceColorConfiguration().with {
+    internal let secondaryColorConfig = ViewColorConfiguration().with {
-        $0.disabled.lightColor = VDSColor.interactiveDisabledOnlight
+        $0.setSurfaceColors(VDSColor.interactiveDisabledOnlight, VDSColor.interactiveDisabledOndark, forDisabled: true)
-        $0.disabled.darkColor = VDSColor.interactiveDisabledOndark
+        $0.setSurfaceColors(VDSColor.elementsSecondaryOnlight, VDSColor.elementsSecondaryOndark, forDisabled: false)
-        $0.enabled.lightColor = VDSColor.elementsSecondaryOnlight
+    }
-        $0.enabled.darkColor = VDSColor.elementsSecondaryOndark
+
+    internal var backgroundColorConfiguration = ControlColorConfiguration().with {
+        $0.setSurfaceColors(VDSFormControlsColor.backgroundOnlight, VDSFormControlsColor.backgroundOndark, forState: .normal)
+        $0.setSurfaceColors(VDSFormControlsColor.backgroundOnlight, VDSFormControlsColor.backgroundOndark, forState: .disabled)
+        $0.setSurfaceColors(VDSColor.feedbackErrorBackgroundOnlight, VDSColor.feedbackErrorBackgroundOndark, forState: .error)
+    }
+
+    internal var borderColorConfiguration = ControlColorConfiguration().with {
+        $0.setSurfaceColors(VDSFormControlsColor.borderOnlight, VDSFormControlsColor.borderOnlight, forState: .normal)
+        $0.setSurfaceColors(VDSColor.interactiveDisabledOnlight, VDSColor.interactiveDisabledOndark, forState: .disabled)
+        $0.setSurfaceColors(VDSColor.feedbackErrorOnlight, VDSColor.feedbackErrorOndark, forState: .error)
     }
     
-    internal lazy var backgroundColorConfiguration: AnyColorable = {
-        return getBackgroundConfig()
-    }()
-
-    internal lazy var borderColorConfiguration: AnyColorable = {
-        return getBorderConfig()
-    }()
-
     //--------------------------------------------------
     // MARK: - Public Properties
     //--------------------------------------------------
@@ -162,15 +162,11 @@ open class EntryField: Control, Accessable {
     //--------------------------------------------------
     open override func setup() {
         super.setup()
-        
+                
-        //add tapGesture to self
-        publisher(for: UITapGestureRecognizer()).sink { [weak self] _ in
-            self?.sendActions(for: .touchUpInside)
-        }.store(in: &subscribers)
-        
         isAccessibilityElement = true
         accessibilityTraits = .button
         addSubview(stackView)
+        stackView.isUserInteractionEnabled = false
         
         //create the wrapping view
         heightConstraint = containerView.heightAnchor.constraint(greaterThanOrEqualToConstant: containerSize.height)
@@ -199,32 +195,6 @@ open class EntryField: Control, Accessable {
         return containerView
     }
     
-    open func getBackgroundConfig() -> AnyColorable {
-        return ErrorDisabledSurfaceColorConfiguration().with {
-            $0.enabled.lightColor = VDSFormControlsColor.backgroundOnlight
-            $0.enabled.darkColor = VDSFormControlsColor.backgroundOndark
-            $0.disabled.lightColor = VDSFormControlsColor.backgroundOnlight
-            $0.disabled.darkColor = VDSFormControlsColor.backgroundOndark
-            
-            //error doesn't care enabled/disable
-            $0.error.lightColor = VDSColor.feedbackErrorBackgroundOnlight
-            $0.error.darkColor = VDSColor.feedbackErrorBackgroundOndark
-        }.eraseToAnyColorable()
-    }
-    
-    open func getBorderConfig() -> AnyColorable {
-        return ErrorDisabledSurfaceColorConfiguration().with {
-            $0.enabled.lightColor = VDSFormControlsColor.borderOnlight
-            $0.enabled.darkColor = VDSFormControlsColor.borderOnlight
-            $0.disabled.lightColor = VDSColor.interactiveDisabledOnlight
-            $0.disabled.darkColor = VDSColor.interactiveDisabledOndark
-            
-            //error doesn't care enabled/disable
-            $0.error.lightColor = VDSColor.feedbackErrorOnlight
-            $0.error.darkColor = VDSColor.feedbackErrorOndark
-        }.eraseToAnyColorable()
-    }
-    
     open func getToolTipView() -> UIView? {
         guard let tooltipTitle, let tooltipContent else {
            return nil

VDS/Components/Toggle/Toggle.swift

@@ -93,15 +93,12 @@ open class ToggleBase: Control, Accessable, DataTrackable, BinaryColorable {
         $0.setSurfaceColors(VDSColor.elementsSecondaryOnlight, VDSColor.paletteGray44, forState: .normal)
         $0.setSurfaceColors(VDSColor.interactiveDisabledOnlight, VDSColor.interactiveDisabledOndark, forState: .disabled)
         $0.setSurfaceColors(VDSColor.paletteGreen26, VDSColor.paletteGreen34, forState: .selected)
-        $0.setSurfaceColors(VDSColor.interactiveDisabledOnlight, VDSColor.interactiveDisabledOndark, forState: [.selected, .disabled])
     }
     
     private var knobColorConfiguration = ControlColorConfiguration().with {
         $0.setSurfaceColors(VDSColor.elementsPrimaryOndark, VDSColor.elementsPrimaryOndark, forState: .normal)
-        $0.setSurfaceColors(VDSColor.paletteGray95, VDSColor.paletteGray44, forState: .disabled)
+        $0.setSurfaceColors(VDSColor.paletteGray95, VDSColor.paletteGray44, forState: .disabled)        
-        
         $0.setSurfaceColors(VDSColor.elementsPrimaryOndark, VDSColor.elementsPrimaryOndark, forState: .selected)
-        $0.setSurfaceColors(VDSColor.paletteGray95, VDSColor.paletteGray44, forState: [.selected, .disabled])
     }
     
     private var typograpicalStyle: TypographicalStyle {