remove unnecessary setters
This commit is contained in:
parent
cdbdb90771
commit
023576d260
@ -132,7 +132,6 @@ import Foundation
|
|||||||
} else {
|
} else {
|
||||||
// Make whole cell focusable if no action.
|
// Make whole cell focusable if no action.
|
||||||
isAccessibilityElement = true
|
isAccessibilityElement = true
|
||||||
accessibilityElements = nil
|
|
||||||
if let message = getAccessibilityMessage(),
|
if let message = getAccessibilityMessage(),
|
||||||
let buttonTitle = button.titleLabel?.text {
|
let buttonTitle = button.titleLabel?.text {
|
||||||
accessibilityLabel = message + ", " + buttonTitle
|
accessibilityLabel = message + ", " + buttonTitle
|
||||||
|
|||||||
@ -132,7 +132,6 @@ import Foundation
|
|||||||
} else {
|
} else {
|
||||||
// Make whole cell focusable if no action.
|
// Make whole cell focusable if no action.
|
||||||
isAccessibilityElement = true
|
isAccessibilityElement = true
|
||||||
accessibilityElements = nil
|
|
||||||
if let message = getAccessibilityMessage(),
|
if let message = getAccessibilityMessage(),
|
||||||
let buttonTitle = button.titleLabel?.text {
|
let buttonTitle = button.titleLabel?.text {
|
||||||
accessibilityLabel = message + ", " + buttonTitle
|
accessibilityLabel = message + ", " + buttonTitle
|
||||||
|
|||||||
@ -82,7 +82,6 @@ import Foundation
|
|||||||
if !linkShowing {
|
if !linkShowing {
|
||||||
// Make whole cell focusable if no link.
|
// Make whole cell focusable if no link.
|
||||||
accessibilityLabel = getAccessibilityMessage()
|
accessibilityLabel = getAccessibilityMessage()
|
||||||
accessibilityElements = nil
|
|
||||||
} else if let accessoryView = accessoryView {
|
} else if let accessoryView = accessoryView {
|
||||||
// Both caret and link. Read all content on caret.
|
// Both caret and link. Read all content on caret.
|
||||||
accessoryView.accessibilityLabel = getAccessibilityMessage()
|
accessoryView.accessibilityLabel = getAccessibilityMessage()
|
||||||
|
|||||||
@ -101,7 +101,6 @@ import Foundation
|
|||||||
if !linkShowing {
|
if !linkShowing {
|
||||||
// Make whole cell focusable if no link.
|
// Make whole cell focusable if no link.
|
||||||
accessibilityLabel = getAccessibilityMessage()
|
accessibilityLabel = getAccessibilityMessage()
|
||||||
accessibilityElements = nil
|
|
||||||
} else if let accessoryView = accessoryView {
|
} else if let accessoryView = accessoryView {
|
||||||
// Both caret and link. Read all content on caret.
|
// Both caret and link. Read all content on caret.
|
||||||
accessoryView.accessibilityLabel = getAccessibilityMessage()
|
accessoryView.accessibilityLabel = getAccessibilityMessage()
|
||||||
|
|||||||
@ -86,16 +86,16 @@ 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
|
|
||||||
eyebrowHeadlineBodyLink.link.isAccessibilityElement = linkShowing
|
eyebrowHeadlineBodyLink.link.isAccessibilityElement = linkShowing
|
||||||
button.isAccessibilityElement = linkShowing
|
button.isAccessibilityElement = linkShowing
|
||||||
|
|
||||||
if !linkShowing && accessoryView == nil {
|
if !linkShowing && accessoryView == nil {
|
||||||
// Make whole cell focusable if one action
|
// Make whole cell focusable if one action
|
||||||
|
isAccessibilityElement = true
|
||||||
accessibilityLabel = getAccessibilityMessage()
|
accessibilityLabel = getAccessibilityMessage()
|
||||||
accessibilityElements = nil
|
|
||||||
} else {
|
} else {
|
||||||
// Make buttons focusable.
|
// Make buttons focusable.
|
||||||
|
isAccessibilityElement = false
|
||||||
var elements: [Any] = []
|
var elements: [Any] = []
|
||||||
if let accessoryView = accessoryView {
|
if let accessoryView = accessoryView {
|
||||||
accessoryView.accessibilityLabel = eyebrowHeadlineBodyLink.getAccessibilityMessage()
|
accessoryView.accessibilityLabel = eyebrowHeadlineBodyLink.getAccessibilityMessage()
|
||||||
@ -106,7 +106,7 @@ import Foundation
|
|||||||
if linkShowing {
|
if linkShowing {
|
||||||
elements.append(eyebrowHeadlineBodyLink.link)
|
elements.append(eyebrowHeadlineBodyLink.link)
|
||||||
}
|
}
|
||||||
elements.append(link)
|
elements.append(button)
|
||||||
accessibilityElements = elements
|
accessibilityElements = elements
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@ -107,7 +107,6 @@ import Foundation
|
|||||||
if !linkShowing {
|
if !linkShowing {
|
||||||
// Make whole cell focusable if no link.
|
// Make whole cell focusable if no link.
|
||||||
accessibilityLabel = getAccessibilityMessage()
|
accessibilityLabel = getAccessibilityMessage()
|
||||||
accessibilityElements = nil
|
|
||||||
} else if let accessoryView = accessoryView {
|
} else if let accessoryView = accessoryView {
|
||||||
// Both caret and link. Read all content on caret.
|
// Both caret and link. Read all content on caret.
|
||||||
accessoryView.accessibilityLabel = getAccessibilityMessage()
|
accessoryView.accessibilityLabel = getAccessibilityMessage()
|
||||||
|
|||||||
@ -83,17 +83,17 @@ 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
|
|
||||||
accessibilityTraits = .button
|
accessibilityTraits = .button
|
||||||
eyebrowHeadlineBodyLink.link.isAccessibilityElement = linkShowing
|
eyebrowHeadlineBodyLink.link.isAccessibilityElement = linkShowing
|
||||||
link.isAccessibilityElement = linkShowing
|
link.isAccessibilityElement = linkShowing
|
||||||
|
|
||||||
if !linkShowing && accessoryView == nil {
|
if !linkShowing && accessoryView == nil {
|
||||||
// Make whole cell focusable if one action
|
// Make whole cell focusable if one action
|
||||||
|
isAccessibilityElement = true
|
||||||
accessibilityLabel = getAccessibilityMessage()
|
accessibilityLabel = getAccessibilityMessage()
|
||||||
accessibilityElements = nil
|
|
||||||
} else {
|
} else {
|
||||||
// Make buttons focusable.
|
// Make buttons focusable.
|
||||||
|
isAccessibilityElement = false
|
||||||
var elements: [Any] = []
|
var elements: [Any] = []
|
||||||
if let accessoryView = accessoryView {
|
if let accessoryView = accessoryView {
|
||||||
accessoryView.accessibilityLabel = eyebrowHeadlineBodyLink.getAccessibilityMessage()
|
accessoryView.accessibilityLabel = eyebrowHeadlineBodyLink.getAccessibilityMessage()
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user