adjusments amde
This commit is contained in:
parent
d7b745b56f
commit
b12f520145
@ -25,7 +25,6 @@ import Foundation
|
||||
headlineBody.stylePageHeader()
|
||||
addMolecule(headlineBody)
|
||||
isAccessibilityElement = true
|
||||
updateAccessibilityLabel()
|
||||
}
|
||||
|
||||
//----------------------------------------------------
|
||||
|
||||
@ -49,9 +49,6 @@ import Foundation
|
||||
addMolecule(stack)
|
||||
stack.restack()
|
||||
isAccessibilityElement = true
|
||||
accessibilityHint = button.accessibilityHint
|
||||
accessibilityTraits = button.accessibilityTraits
|
||||
updateAccessibilityLabel()
|
||||
}
|
||||
|
||||
//----------------------------------------------------
|
||||
@ -98,6 +95,8 @@ import Foundation
|
||||
}
|
||||
|
||||
accessibilityLabel = message
|
||||
accessibilityHint = button.accessibilityHint
|
||||
accessibilityTraits = button.accessibilityTraits
|
||||
}
|
||||
|
||||
open override func accessibilityActivate() -> Bool {
|
||||
|
||||
@ -13,6 +13,7 @@ import Foundation
|
||||
//-----------------------------------------------------
|
||||
// MARK: - Outlets
|
||||
//-----------------------------------------------------
|
||||
|
||||
public let eyebrow = Label(fontStyle: .RegularMicro)
|
||||
public let headline = Label(fontStyle: .BoldTitleMedium)
|
||||
public let body = Label(fontStyle: .RegularBodySmall)
|
||||
@ -113,7 +114,7 @@ import Foundation
|
||||
message += body2Text + ", "
|
||||
}
|
||||
|
||||
if let rightImageLabel = rightImage.accessibilityLabel {
|
||||
if let rightImageLabel = rightImage.accessibilityLabel, !rightImageLabel.isEmpty {
|
||||
message += rightImageLabel
|
||||
}
|
||||
|
||||
@ -144,6 +145,10 @@ import Foundation
|
||||
views.append(twoLinkView.leftLink)
|
||||
views.append(twoLinkView.rightLink)
|
||||
|
||||
if let rightImageLabel = rightImage.accessibilityLabel, !rightImageLabel.isEmpty {
|
||||
views.append(rightImage)
|
||||
}
|
||||
|
||||
accessibilityElements = views
|
||||
return
|
||||
|
||||
@ -156,7 +161,6 @@ import Foundation
|
||||
accessibilityHint = twoLinkView.rightLink.accessibilityHint
|
||||
accessibilityTraits = twoLinkView.rightLink.accessibilityTraits
|
||||
message += twoLinkView.rightLink.accessibilityLabel ?? ""
|
||||
|
||||
}
|
||||
|
||||
isAccessibilityElement = true
|
||||
|
||||
@ -111,7 +111,7 @@ import Foundation
|
||||
message += body2Text + ", "
|
||||
}
|
||||
|
||||
if let rightImageLabel = rightImage.accessibilityLabel {
|
||||
if let rightImageLabel = rightImage.accessibilityLabel, !rightImageLabel.isEmpty {
|
||||
message += rightImageLabel
|
||||
}
|
||||
|
||||
@ -142,6 +142,10 @@ import Foundation
|
||||
views.append(twoLinkView.leftLink)
|
||||
views.append(twoLinkView.rightLink)
|
||||
|
||||
if let rightImageLabel = rightImage.accessibilityLabel, !rightImageLabel.isEmpty {
|
||||
views.append(rightImage)
|
||||
}
|
||||
|
||||
accessibilityElements = views
|
||||
return
|
||||
|
||||
|
||||
@ -88,19 +88,19 @@ import Foundation
|
||||
|
||||
checkbox.updateAccessibilityLabel()
|
||||
|
||||
if let checkboxLabel = checkbox.accessibilityLabel {
|
||||
if let checkboxLabel = checkbox.accessibilityLabel, !checkboxLabel.isEmpty {
|
||||
message += checkboxLabel + ", "
|
||||
}
|
||||
|
||||
if let eyebrowLabel = eyebrowHeadlineBodyLink.eyebrow.text {
|
||||
if let eyebrowLabel = eyebrowHeadlineBodyLink.eyebrow.text, !eyebrowLabel.isEmpty {
|
||||
message += eyebrowLabel + ", "
|
||||
}
|
||||
|
||||
if let headlineLabel = eyebrowHeadlineBodyLink.headline.text {
|
||||
if let headlineLabel = eyebrowHeadlineBodyLink.headline.text, !headlineLabel.isEmpty {
|
||||
message += headlineLabel + ", "
|
||||
}
|
||||
|
||||
if let bodyLabel = eyebrowHeadlineBodyLink.body.text {
|
||||
if let bodyLabel = eyebrowHeadlineBodyLink.body.text, !bodyLabel.isEmpty {
|
||||
message += bodyLabel
|
||||
}
|
||||
|
||||
|
||||
@ -84,8 +84,8 @@ import Foundation
|
||||
message += headlineLabel + ", "
|
||||
}
|
||||
|
||||
if let headlineLabel = headline.text {
|
||||
message += headlineLabel + ", "
|
||||
if let subHeadlineLabel = subHeadline.text {
|
||||
message += subHeadlineLabel + ", "
|
||||
}
|
||||
|
||||
if let bodyLabel = body.text {
|
||||
|
||||
Loading…
Reference in New Issue
Block a user