mbrucedogs/vds_ios
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ONEAPP-5104 - Button Disabled Accessibility iOS

Browse Source 
Signed-off-by: Matt Bruce <matt.bruce@verizon.com>
This commit is contained in:
Matt Bruce 2023-07-28 14:29:43 -05:00
parent 29e4fcb165
commit 16d37e1c45
8 changed files with 41 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
VDS/Classes/SelectorBase.swift
View File

@ -90,16 +90,17 @@ open class SelectorBase: Control, SelectorControlable {
open override func updateAccessibilityLabel() { open override func updateAccessibilityLabel() {
accessibilityValue = isSelected ? "1" : "0" accessibilityValue = isSelected ? "1" : "0"
if !accessibilityTraits.contains(.selected) && isSelected { if isSelected {
accessibilityTraits.insert(.selected) accessibilityTraits.insert(.selected)
} else if accessibilityTraits.contains(.selected) && !isSelected{ } else {
accessibilityTraits.remove(.selected) accessibilityTraits.remove(.selected)
} }
if !accessibilityTraits.contains(.notEnabled) && !isEnabled { if isEnabled {
accessibilityTraits.insert(.notEnabled)
} else if accessibilityTraits.contains(.notEnabled) && !isEnabled {
accessibilityTraits.remove(.notEnabled) accessibilityTraits.remove(.notEnabled)
} else {
accessibilityTraits.insert(.notEnabled)
} }
accessibilityLabel = isSelected ? "Selected" : "Not Selected"
} }
} }

10
VDS/Classes/SelectorGroupHandlerBase.swift
View File

@ -70,16 +70,16 @@ open class SelectorGroupHandlerBase<HandlerType: Control>: Control, Changeable {
} }
open override func updateAccessibilityLabel() { open override func updateAccessibilityLabel() {
if !accessibilityTraits.contains(.selected) && isSelected { if isSelected {
accessibilityTraits.insert(.selected) accessibilityTraits.insert(.selected)
} else if accessibilityTraits.contains(.selected) && !isSelected{ } else {
accessibilityTraits.remove(.selected) accessibilityTraits.remove(.selected)
} }
if !accessibilityTraits.contains(.notEnabled) && !isEnabled { if isEnabled {
accessibilityTraits.insert(.notEnabled)
} else if accessibilityTraits.contains(.notEnabled) && !isEnabled {
accessibilityTraits.remove(.notEnabled) accessibilityTraits.remove(.notEnabled)
} else {
accessibilityTraits.insert(.notEnabled)
} }
setAccessibilityLabel(for: selectorViews) setAccessibilityLabel(for: selectorViews)
} }

12
VDS/Classes/SelectorItemBase.swift
View File

@ -272,17 +272,19 @@ open class SelectorItemBase<Selector: SelectorControlable>: Control, Errorable,
open override func updateAccessibilityLabel() { open override func updateAccessibilityLabel() {
accessibilityValue = isSelected ? "1" : "0" accessibilityValue = isSelected ? "1" : "0"
if !accessibilityTraits.contains(.selected) && isSelected { if isSelected {
accessibilityTraits.insert(.selected) accessibilityTraits.insert(.selected)
} else if accessibilityTraits.contains(.selected) && !isSelected{ } else {
accessibilityTraits.remove(.selected) accessibilityTraits.remove(.selected)
} }
if !accessibilityTraits.contains(.notEnabled) && !isEnabled { if isEnabled {
accessibilityTraits.insert(.notEnabled)
} else if accessibilityTraits.contains(.notEnabled) && !isEnabled {
accessibilityTraits.remove(.notEnabled) accessibilityTraits.remove(.notEnabled)
} else {
accessibilityTraits.insert(.notEnabled)
} }
setAccessibilityLabel(for: [label, childLabel, errorLabel]) setAccessibilityLabel(for: [label, childLabel, errorLabel])
accessibilityLabel = "\(isSelected ? "Selected" : "Not Selected"), \(accessibilityLabel ?? "")"
} }
} }

6
VDS/Components/Buttons/Button/ButtonBase.swift
View File

@ -162,10 +162,10 @@ open class ButtonBase: UIButton, Buttonable, Handlerable, ViewProtocol, Resettab
} }
open func updateAccessibilityLabel() { open func updateAccessibilityLabel() {
if !accessibilityTraits.contains(.notEnabled) && !isEnabled { if isEnabled {
accessibilityTraits.insert(.notEnabled)
} else if accessibilityTraits.contains(.notEnabled) && !isEnabled {
accessibilityTraits.remove(.notEnabled) accessibilityTraits.remove(.notEnabled)
} else {
accessibilityTraits.insert(.notEnabled)
} }
} }

10
VDS/Components/RadioBox/RadioBoxItem.swift
View File

@ -250,16 +250,16 @@ open class RadioBoxItem: Control, Changeable {
open override func updateAccessibilityLabel() { open override func updateAccessibilityLabel() {
accessibilityValue = isSelected ? "1" : "0" accessibilityValue = isSelected ? "1" : "0"
if !accessibilityTraits.contains(.selected) && isSelected { if isSelected {
accessibilityTraits.insert(.selected) accessibilityTraits.insert(.selected)
} else if accessibilityTraits.contains(.selected) && !isSelected{ } else {
accessibilityTraits.remove(.selected) accessibilityTraits.remove(.selected)
} }
if !accessibilityTraits.contains(.notEnabled) && !isEnabled { if isEnabled {
accessibilityTraits.insert(.notEnabled)
} else if accessibilityTraits.contains(.notEnabled) && !isEnabled {
accessibilityTraits.remove(.notEnabled) accessibilityTraits.remove(.notEnabled)
} else {
accessibilityTraits.insert(.notEnabled)
} }
if accessibilityLabel == nil { if accessibilityLabel == nil {
setAccessibilityLabel(for: [textLabel, subTextLabel, subTextRightLabel]) setAccessibilityLabel(for: [textLabel, subTextLabel, subTextRightLabel])

10
VDS/Components/Toggle/Toggle.swift
View File

@ -242,16 +242,16 @@ open class Toggle: Control, Changeable {
open override func updateAccessibilityLabel() { open override func updateAccessibilityLabel() {
accessibilityValue = isSelected ? "1" : "0" accessibilityValue = isSelected ? "1" : "0"
if !accessibilityTraits.contains(.selected) && isSelected { if isSelected {
accessibilityTraits.insert(.selected) accessibilityTraits.insert(.selected)
} else if accessibilityTraits.contains(.selected) && !isSelected{ } else {
accessibilityTraits.remove(.selected) accessibilityTraits.remove(.selected)
} }
if !accessibilityTraits.contains(.notEnabled) && !isEnabled { if isEnabled {
accessibilityTraits.insert(.notEnabled)
} else if accessibilityTraits.contains(.notEnabled) && !isEnabled{
accessibilityTraits.remove(.notEnabled) accessibilityTraits.remove(.notEnabled)
} else {
accessibilityTraits.insert(.notEnabled)
} }
setAccessibilityLabel(for: [label]) setAccessibilityLabel(for: [label])
} }

10
VDS/Components/Toggle/ToggleView.swift
View File

@ -205,16 +205,16 @@ open class ToggleView: Control, Changeable {
open override func updateAccessibilityLabel() { open override func updateAccessibilityLabel() {
accessibilityLabel = "Toggle" accessibilityLabel = "Toggle"
accessibilityValue = isSelected ? "1" : "0" accessibilityValue = isSelected ? "1" : "0"
if !accessibilityTraits.contains(.selected) && isSelected { if isSelected {
accessibilityTraits.insert(.selected) accessibilityTraits.insert(.selected)
} else if accessibilityTraits.contains(.selected) && !isSelected{ } else {
accessibilityTraits.remove(.selected) accessibilityTraits.remove(.selected)
} }
if !accessibilityTraits.contains(.notEnabled) && !isEnabled { if isEnabled {
accessibilityTraits.insert(.notEnabled)
} else if accessibilityTraits.contains(.notEnabled) && !isEnabled{
accessibilityTraits.remove(.notEnabled) accessibilityTraits.remove(.notEnabled)
} else {
accessibilityTraits.insert(.notEnabled)
} }
} }
} }

6
VDS/Components/Tooltip/Tooltip.swift
View File

@ -167,10 +167,10 @@ open class Tooltip: Control, TooltipLaunchable {
} }
open override func updateAccessibilityLabel() { open override func updateAccessibilityLabel() {
if !accessibilityTraits.contains(.notEnabled) && !isEnabled { if isEnabled {
accessibilityTraits.insert(.notEnabled)
} else if accessibilityTraits.contains(.notEnabled) && !isEnabled {
accessibilityTraits.remove(.notEnabled) accessibilityTraits.remove(.notEnabled)
} else {
accessibilityTraits.insert(.notEnabled)
} }
var label = title var label = title
if label == nil { if label == nil {