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

adjusments amde

Browse Source
This commit is contained in:
Kevin G Christiano 2020-06-08 16:36:04 -04:00
parent d7b745b56f
commit b12f520145
6 changed files with 19 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
MVMCoreUI/Atomic/Molecules/DesignedComponents/Headers/HeadersH2NoButtonsBodyText.swift
View File

@ -25,7 +25,6 @@ import Foundation
headlineBody.stylePageHeader() headlineBody.stylePageHeader()
addMolecule(headlineBody) addMolecule(headlineBody)
isAccessibilityElement = true isAccessibilityElement = true
updateAccessibilityLabel()
} }
//---------------------------------------------------- //----------------------------------------------------

5
MVMCoreUI/Atomic/Molecules/DesignedComponents/Headers/HeadersH2TinyButton.swift
View File

@ -49,9 +49,6 @@ import Foundation
addMolecule(stack) addMolecule(stack)
stack.restack() stack.restack()
isAccessibilityElement = true isAccessibilityElement = true
accessibilityHint = button.accessibilityHint
accessibilityTraits = button.accessibilityTraits
updateAccessibilityLabel()
} }
//---------------------------------------------------- //----------------------------------------------------
@ -98,6 +95,8 @@ import Foundation
} }
accessibilityLabel = message accessibilityLabel = message
accessibilityHint = button.accessibilityHint
accessibilityTraits = button.accessibilityTraits
} }
open override func accessibilityActivate() -> Bool { open override func accessibilityActivate() -> Bool {

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

@ -13,6 +13,7 @@ import Foundation
//----------------------------------------------------- //-----------------------------------------------------
// MARK: - Outlets // MARK: - Outlets
//----------------------------------------------------- //-----------------------------------------------------
public let eyebrow = Label(fontStyle: .RegularMicro) public let eyebrow = Label(fontStyle: .RegularMicro)
public let headline = Label(fontStyle: .BoldTitleMedium) public let headline = Label(fontStyle: .BoldTitleMedium)
public let body = Label(fontStyle: .RegularBodySmall) public let body = Label(fontStyle: .RegularBodySmall)
@ -113,7 +114,7 @@ import Foundation
message += body2Text + ", " message += body2Text + ", "
} }
if let rightImageLabel = rightImage.accessibilityLabel { if let rightImageLabel = rightImage.accessibilityLabel, !rightImageLabel.isEmpty {
message += rightImageLabel message += rightImageLabel
} }
@ -144,6 +145,10 @@ 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 {
views.append(rightImage)
}
accessibilityElements = views accessibilityElements = views
return return
@ -156,7 +161,6 @@ import Foundation
accessibilityHint = twoLinkView.rightLink.accessibilityHint accessibilityHint = twoLinkView.rightLink.accessibilityHint
accessibilityTraits = twoLinkView.rightLink.accessibilityTraits accessibilityTraits = twoLinkView.rightLink.accessibilityTraits
message += twoLinkView.rightLink.accessibilityLabel ?? "" message += twoLinkView.rightLink.accessibilityLabel ?? ""
} }
isAccessibilityElement = true isAccessibilityElement = true

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 { if let rightImageLabel = rightImage.accessibilityLabel, !rightImageLabel.isEmpty {
message += rightImageLabel message += rightImageLabel
} }
@ -142,6 +142,10 @@ 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 {
views.append(rightImage)
}
accessibilityElements = views accessibilityElements = views
return return

8
MVMCoreUI/Atomic/Molecules/DesignedComponents/List/LeftVariable/ListLeftVariableCheckboxAllTextAndLinks.swift
View File

@ -88,19 +88,19 @@ import Foundation
checkbox.updateAccessibilityLabel() checkbox.updateAccessibilityLabel()
if let checkboxLabel = checkbox.accessibilityLabel { if let checkboxLabel = checkbox.accessibilityLabel, !checkboxLabel.isEmpty {
message += checkboxLabel + ", " message += checkboxLabel + ", "
} }
if let eyebrowLabel = eyebrowHeadlineBodyLink.eyebrow.text { if let eyebrowLabel = eyebrowHeadlineBodyLink.eyebrow.text, !eyebrowLabel.isEmpty {
message += eyebrowLabel + ", " message += eyebrowLabel + ", "
} }
if let headlineLabel = eyebrowHeadlineBodyLink.headline.text { if let headlineLabel = eyebrowHeadlineBodyLink.headline.text, !headlineLabel.isEmpty {
message += headlineLabel + ", " message += headlineLabel + ", "
} }
if let bodyLabel = eyebrowHeadlineBodyLink.body.text { if let bodyLabel = eyebrowHeadlineBodyLink.body.text, !bodyLabel.isEmpty {
message += bodyLabel message += bodyLabel
} }

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

@ -84,8 +84,8 @@ import Foundation
message += headlineLabel + ", " message += headlineLabel + ", "
} }
if let headlineLabel = headline.text { if let subHeadlineLabel = subHeadline.text {
message += headlineLabel + ", " message += subHeadlineLabel + ", "
} }
if let bodyLabel = body.text { if let bodyLabel = body.text {