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

accessable update

Browse Source 
Signed-off-by: Matt Bruce <matt.bruce@verizon.com>
This commit is contained in:
Matt Bruce 2022-10-07 09:15:05 -05:00
parent 3ae6167f18
commit c29cd4a7a5
7 changed files with 18 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
VDS/Components/Badge/Badge.swift
View File

@ -178,7 +178,7 @@ open class BadgeBase<ModelType: BadgeModel>: View<ModelType> {
maxWidthConstraint?.isActive = false maxWidthConstraint?.isActive = false
} }
label.set(with: viewModel.label) label.set(with: viewModel.label)
setAccessibilityLabel(!viewModel.disabled) setAccessibilityLabel()
} }
} }

2
VDS/Components/Checkbox/Checkbox.swift
View File

@ -234,7 +234,7 @@ open class CheckboxBase<ModelType: CheckboxModel>: Control<ModelType> {
updateLabels(viewModel) updateLabels(viewModel)
updateSelector(viewModel) updateSelector(viewModel)
setAccessibilityHint(enabled) setAccessibilityHint()
setAccessibilityValue(viewModel.selected) setAccessibilityValue(viewModel.selected)
setAccessibilityLabel(viewModel.selected) setAccessibilityLabel(viewModel.selected)
setNeedsLayout() setNeedsLayout()

2
VDS/Components/RadioBox/RadioBox.swift
View File

@ -211,7 +211,7 @@ open class RadioBoxBase<ModelType: RadioBoxModel>: Control<ModelType> {
updateLabels(viewModel) updateLabels(viewModel)
updateSelector(viewModel) updateSelector(viewModel)
setAccessibilityHint(enabled) setAccessibilityHint()
setAccessibilityValue(viewModel.selected) setAccessibilityValue(viewModel.selected)
setAccessibilityLabel(viewModel.selected) setAccessibilityLabel(viewModel.selected)
setNeedsLayout() setNeedsLayout()

2
VDS/Components/RadioButton/RadioButton.swift
View File

@ -244,7 +244,7 @@ open class RadioButtonBase<ModelType: RadioButtonModel>: Control<ModelType> {
updateLabels(viewModel) updateLabels(viewModel)
updateSelector(viewModel) updateSelector(viewModel)
setAccessibilityHint(enabled) setAccessibilityHint()
setAccessibilityValue(viewModel.selected) setAccessibilityValue(viewModel.selected)
setAccessibilityLabel(viewModel.selected) setAccessibilityLabel(viewModel.selected)
setNeedsLayout() setNeedsLayout()

2
VDS/Components/RadioSwatch/RadioSwatch.swift
View File

@ -144,7 +144,7 @@ open class RadioSwatchBase<ModelType: RadioSwatchModel>: Control<ModelType> {
let enabled = !viewModel.disabled let enabled = !viewModel.disabled
updateSelector(viewModel) updateSelector(viewModel)
setAccessibilityHint(enabled) setAccessibilityHint()
setAccessibilityValue(viewModel.selected) setAccessibilityValue(viewModel.selected)
setAccessibilityLabel(viewModel.selected) setAccessibilityLabel(viewModel.selected)
setNeedsLayout() setNeedsLayout()

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

@ -333,7 +333,7 @@ open class ToggleBase<ModelType: ToggleModel>: Control<ModelType> {
label.set(with: viewModel.label) label.set(with: viewModel.label)
updateLabel(viewModel) updateLabel(viewModel)
updateToggle(viewModel) updateToggle(viewModel)
setAccessibilityHint(!viewModel.disabled) setAccessibilityHint()
setAccessibilityValue(viewModel.on) setAccessibilityValue(viewModel.on)
setAccessibilityLabel(viewModel.on) setAccessibilityLabel(viewModel.on)
backgroundColor = viewModel.surface.color backgroundColor = viewModel.surface.color

21
VDS/Protocols/Accessable.swift
View File

@ -26,26 +26,29 @@ extension ModelHandlerable where Self: UIView {
return model return model
} }
public func setAccessibilityHint(_ enabled: Bool = true) { public func setAccessibilityHint(_ override: Bool? = nil) {
if let value = accessableModel?.accessibilityHintEnabled, enabled { let check = override ?? !model.disabled
if let value = accessableModel?.accessibilityHintEnabled, check {
accessibilityHint = value accessibilityHint = value
} else if let value = accessableModel?.accessibilityHintDisabled, !enabled { } else if let value = accessableModel?.accessibilityHintDisabled, !check {
accessibilityHint = value accessibilityHint = value
} }
} }
public func setAccessibilityValue(_ enabled: Bool = true) { public func setAccessibilityValue(_ override: Bool? = nil) {
if let value = accessableModel?.accessibilityValueEnabled, enabled { let check = override ?? !model.disabled
if let value = accessableModel?.accessibilityValueEnabled, check {
accessibilityValue = value accessibilityValue = value
} else if let value = accessableModel?.accessibilityValueDisabled, !enabled { } else if let value = accessableModel?.accessibilityValueDisabled, !check {
accessibilityValue = value accessibilityValue = value
} }
} }
public func setAccessibilityLabel(_ enabled: Bool = true) { public func setAccessibilityLabel(_ override: Bool? = nil) {
if let value = accessableModel?.accessibilityLabelEnabled, enabled { let check = override ?? !model.disabled
if let value = accessableModel?.accessibilityLabelEnabled, check {
accessibilityLabel = value accessibilityLabel = value
} else if let value = accessableModel?.accessibilityLabelDisabled, !enabled { } else if let value = accessableModel?.accessibilityLabelDisabled, !check {
accessibilityLabel = value accessibilityLabel = value
} }
} }