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

image accessibility fix

Browse Source
This commit is contained in:
Pfeil, Scott Robert 2020-06-12 17:36:13 -04:00
parent 9498053dce
commit 36505156d5
10 changed files with 15 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
MVMCoreUI/Atomic/Molecules/DesignedComponents/List/Device/ListDeviceComplexButtonMedium.swift
View File

@ -116,7 +116,7 @@ import Foundation
message += body2Text + ", " message += body2Text + ", "
} }
if let rightImageViewText = rightImageView.accessibilityLabel, !rightImageViewText.isEmpty { if let rightImageViewText = rightImageView.imageView.accessibilityLabel, !rightImageViewText.isEmpty {
message += rightImageViewText message += rightImageViewText
} }
return message.count > 0 ? message : nil return message.count > 0 ? message : nil

2
MVMCoreUI/Atomic/Molecules/DesignedComponents/List/Device/ListDeviceComplexButtonSmall.swift
View File

@ -116,7 +116,7 @@ import Foundation
message += body2Text + ", " message += body2Text + ", "
} }
if let rightImageViewText = rightImageView.accessibilityLabel, !rightImageViewText.isEmpty { if let rightImageViewText = rightImageView.imageView.accessibilityLabel, !rightImageViewText.isEmpty {
message += rightImageViewText message += rightImageViewText
} }
return message.count > 0 ? message : nil return message.count > 0 ? message : nil

6
MVMCoreUI/Atomic/Molecules/DesignedComponents/List/Device/ListDeviceComplexLinkMedium.swift
View File

@ -114,7 +114,7 @@ import Foundation
message += body2Text + ", " message += body2Text + ", "
} }
if let rightImageLabel = rightImage.accessibilityLabel, !rightImageLabel.isEmpty { if let rightImageLabel = rightImage.imageView.accessibilityLabel, !rightImageLabel.isEmpty {
message += rightImageLabel message += rightImageLabel
} }
@ -145,8 +145,8 @@ import Foundation
views.append(twoLinkView.leftLink) views.append(twoLinkView.leftLink)
views.append(twoLinkView.rightLink) views.append(twoLinkView.rightLink)
if let rightImageLabel = rightImage.accessibilityLabel, !rightImageLabel.isEmpty { if let rightImageLabel = rightImage.imageView.accessibilityLabel, !rightImageLabel.isEmpty {
views.append(rightImage) views.append(rightImage.imageView)
} }
accessibilityElements = views accessibilityElements = views

6
MVMCoreUI/Atomic/Molecules/DesignedComponents/List/Device/ListDeviceComplexLinkSmall.swift
View File

@ -111,7 +111,7 @@ import Foundation
message += body2Text + ", " message += body2Text + ", "
} }
if let rightImageLabel = rightImage.accessibilityLabel, !rightImageLabel.isEmpty { if let rightImageLabel = rightImage.imageView.accessibilityLabel, !rightImageLabel.isEmpty {
message += rightImageLabel message += rightImageLabel
} }
@ -142,8 +142,8 @@ import Foundation
views.append(twoLinkView.leftLink) views.append(twoLinkView.leftLink)
views.append(twoLinkView.rightLink) views.append(twoLinkView.rightLink)
if let rightImageLabel = rightImage.accessibilityLabel, !rightImageLabel.isEmpty { if let rightImageLabel = rightImage.imageView.accessibilityLabel, !rightImageLabel.isEmpty {
views.append(rightImage) views.append(rightImage.imageView)
} }
accessibilityElements = views accessibilityElements = views

4
MVMCoreUI/Atomic/Molecules/DesignedComponents/List/LeftVariable/ListLeftVariableIconAllTextLinks.swift
View File

@ -87,8 +87,8 @@ import Foundation
} else { } else {
// Only link. Manually add accessibility elements to ensure they are read in the right order. // Only link. Manually add accessibility elements to ensure they are read in the right order.
var elements: [Any] = [] var elements: [Any] = []
if let leftImageLabel = leftImage.accessibilityLabel, !leftImageLabel.isEmpty { if let leftImageLabel = leftImage.imageView.accessibilityLabel, !leftImageLabel.isEmpty {
elements.append(leftImage) elements.append(leftImage.imageView)
} }
if let otherElements = eyebrowHeadlineBodyLink.getAccessibilityElements() { if let otherElements = eyebrowHeadlineBodyLink.getAccessibilityElements() {
elements.append(otherElements) elements.append(otherElements)

2
MVMCoreUI/Atomic/Molecules/DesignedComponents/List/LeftVariable/ListLeftVariableIconWithRightCaretBodyText.swift
View File

@ -94,7 +94,7 @@ import Foundation
isAccessibilityElement = true isAccessibilityElement = true
var message = "" var message = ""
if let leftImageLabel = leftImage.accessibilityLabel { if let leftImageLabel = leftImage.imageView.accessibilityLabel {
message += leftImageLabel + ", " message += leftImageLabel + ", "
} }

2
MVMCoreUI/Atomic/Molecules/DesignedComponents/List/LeftVariable/ListLeftVariableRadioButtonAndPaymentMethod.swift
View File

@ -103,7 +103,7 @@ import UIKit
message += radioButtonLabel + ", " message += radioButtonLabel + ", "
} }
if let leftImageLabel = leftImage.accessibilityLabel { if let leftImageLabel = leftImage.imageView.accessibilityLabel {
message += leftImageLabel + ", " message += leftImageLabel + ", "
} }

4
MVMCoreUI/Atomic/Molecules/DesignedComponents/List/OneColumn/ListOneColumnFullWidthTextAllTextAndLinks.swift
View File

@ -95,9 +95,7 @@ import Foundation
func updateAccessibilityLabel() { func updateAccessibilityLabel() {
let linkShowing = link.titleLabel?.text?.count ?? 0 > 0 let linkShowing = link.titleLabel?.text?.count ?? 0 > 0
isAccessibilityElement = !linkShowing isAccessibilityElement = !linkShowing
link.isAccessibilityElement = linkShowing
if !linkShowing { if !linkShowing {
// Make whole cell focusable if no link. // Make whole cell focusable if no link.
accessibilityLabel = getAccessibilityMessage() accessibilityLabel = getAccessibilityMessage()

2
MVMCoreUI/Atomic/Molecules/DesignedComponents/List/RightVariable/ListRightVariablePayments.swift
View File

@ -77,7 +77,7 @@ import Foundation
message += leftLabelText + ", " message += leftLabelText + ", "
} }
if let rightImageText = rightImage.accessibilityLabel, !rightImageText.isEmpty { if let rightImageText = rightImage.imageView.accessibilityLabel, !rightImageText.isEmpty {
message += rightImageText message += rightImageText
} }

4
MVMCoreUI/Atomic/Molecules/DesignedComponents/List/RightVariable/ListRightVariablePriceChangeAllTextAndLinks.swift
View File

@ -101,9 +101,7 @@ import Foundation
func updateAccessibilityLabel() { func updateAccessibilityLabel() {
let linkShowing = eyebrowHeadlineBodyLink.link.titleLabel?.text?.count ?? 0 > 0 let linkShowing = eyebrowHeadlineBodyLink.link.titleLabel?.text?.count ?? 0 > 0
isAccessibilityElement = !linkShowing isAccessibilityElement = !linkShowing
accessibilityTraits = (isAccessibilityElement && accessoryView != nil) ? .button : .none accessibilityTraits = (isAccessibilityElement && accessoryView != nil) ? .button : .none
eyebrowHeadlineBodyLink.link.isAccessibilityElement = linkShowing
if !linkShowing { if !linkShowing {
// Make whole cell focusable if no link. // Make whole cell focusable if no link.
accessibilityLabel = getAccessibilityMessage() accessibilityLabel = getAccessibilityMessage()