remove unnecessary setters

This commit is contained in:
Pfeil, Scott Robert 2020-06-12 16:32:50 -04:00
parent cdbdb90771
commit 023576d260
7 changed files with 5 additions and 10 deletions

View File

@ -132,7 +132,6 @@ import Foundation
} else {
// Make whole cell focusable if no action.
isAccessibilityElement = true
accessibilityElements = nil
if let message = getAccessibilityMessage(),
let buttonTitle = button.titleLabel?.text {
accessibilityLabel = message + ", " + buttonTitle

View File

@ -132,7 +132,6 @@ import Foundation
} else {
// Make whole cell focusable if no action.
isAccessibilityElement = true
accessibilityElements = nil
if let message = getAccessibilityMessage(),
let buttonTitle = button.titleLabel?.text {
accessibilityLabel = message + ", " + buttonTitle

View File

@ -82,7 +82,6 @@ import Foundation
if !linkShowing {
// Make whole cell focusable if no link.
accessibilityLabel = getAccessibilityMessage()
accessibilityElements = nil
} else if let accessoryView = accessoryView {
// Both caret and link. Read all content on caret.
accessoryView.accessibilityLabel = getAccessibilityMessage()

View File

@ -101,7 +101,6 @@ import Foundation
if !linkShowing {
// Make whole cell focusable if no link.
accessibilityLabel = getAccessibilityMessage()
accessibilityElements = nil
} else if let accessoryView = accessoryView {
// Both caret and link. Read all content on caret.
accessoryView.accessibilityLabel = getAccessibilityMessage()

View File

@ -86,16 +86,16 @@ import Foundation
func updateAccessibilityLabel() {
let linkShowing = eyebrowHeadlineBodyLink.link.titleLabel?.text?.count ?? 0 > 0
isAccessibilityElement = !linkShowing
eyebrowHeadlineBodyLink.link.isAccessibilityElement = linkShowing
button.isAccessibilityElement = linkShowing
if !linkShowing && accessoryView == nil {
// Make whole cell focusable if one action
isAccessibilityElement = true
accessibilityLabel = getAccessibilityMessage()
accessibilityElements = nil
} else {
// Make buttons focusable.
isAccessibilityElement = false
var elements: [Any] = []
if let accessoryView = accessoryView {
accessoryView.accessibilityLabel = eyebrowHeadlineBodyLink.getAccessibilityMessage()
@ -106,7 +106,7 @@ import Foundation
if linkShowing {
elements.append(eyebrowHeadlineBodyLink.link)
}
elements.append(link)
elements.append(button)
accessibilityElements = elements
}
}

View File

@ -107,7 +107,6 @@ import Foundation
if !linkShowing {
// Make whole cell focusable if no link.
accessibilityLabel = getAccessibilityMessage()
accessibilityElements = nil
} else if let accessoryView = accessoryView {
// Both caret and link. Read all content on caret.
accessoryView.accessibilityLabel = getAccessibilityMessage()

View File

@ -83,17 +83,17 @@ import Foundation
func updateAccessibilityLabel() {
let linkShowing = eyebrowHeadlineBodyLink.link.titleLabel?.text?.count ?? 0 > 0
isAccessibilityElement = !linkShowing
accessibilityTraits = .button
eyebrowHeadlineBodyLink.link.isAccessibilityElement = linkShowing
link.isAccessibilityElement = linkShowing
if !linkShowing && accessoryView == nil {
// Make whole cell focusable if one action
isAccessibilityElement = true
accessibilityLabel = getAccessibilityMessage()
accessibilityElements = nil
} else {
// Make buttons focusable.
isAccessibilityElement = false
var elements: [Any] = []
if let accessoryView = accessoryView {
accessoryView.accessibilityLabel = eyebrowHeadlineBodyLink.getAccessibilityMessage()