Skip to content

Commit

Permalink
Eliminate expensive calls to UIButton.accessibilityLabel getter
Browse files Browse the repository at this point in the history
  • Loading branch information
@VyrCossont
VyrCossont committed Sep 11, 2023
1 parent 14b1c23 commit 7a565f6
Show file tree
Hide file tree
Showing 2 changed files with 45 additions and 8 deletions.
1 change: 1 addition & 0 deletions Localizations/en.lproj/Localizable.strings
View file
Original file line number Diff line number Diff line change
Expand Up @@ -499,6 +499,7 @@
"status.reblog-button.undo.accessibility-label" = "Unboost";
"status.favorite-button.accessibility-label" = "Favorite";
"status.favorite-button.undo.accessibility-label" = "Unfavorite";
"status.share-button.accessibility-label" = "Share";
"status.show-more" = "Show More";
"status.show-more-all-button.accessibility-label" = "Show more for all";
"status.show-less" = "Show Less";
Expand Down
52 changes: 44 additions & 8 deletions Views/UIKit/Content Views/StatusView.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -381,7 +381,7 @@ private extension StatusView {
replyButton.addAction(
UIAction { [weak self] _ in self?.statusConfiguration.viewModel.reply() },
for: .touchUpInside)
replyButton.accessibilityLabel = NSLocalizedString("status.reply-button.accessibility-label", comment: "")
replyButton.accessibilityLabel = Self.replyButtonAccessibilityLabel

reblogButton.addAction(
UIAction { [weak self] _ in
Expand All @@ -403,12 +403,12 @@ private extension StatusView {
self.favorite()
},
for: .touchUpInside)
favoriteButton.accessibilityLabel = NSLocalizedString("status.favorite-button.accessibility-label", comment: "")
favoriteButton.addTarget(self, action: #selector(favoriteButtonDoubleTap(sender:event:)), for: .touchDownRepeat)

shareButton.addAction(
UIAction { [weak self] _ in self?.statusConfiguration.viewModel.shareStatus() },
for: .touchUpInside)
shareButton.accessibilityLabel = Self.shareButtonAccessibilityLabel

menuButton.showsMenuAsPrimaryAction = true

Expand Down Expand Up @@ -497,6 +497,32 @@ private extension StatusView {
.store(in: &cancellables)
}

static let replyButtonAccessibilityLabel = NSLocalizedString(
"status.reply-button.accessibility-label",
comment: ""
)

static let shareButtonAccessibilityLabel = NSLocalizedString(
"status.share-button.accessibility-label",
comment: ""
)

static func reblogButtonAccessibilityLabel(reblogged: Bool) -> String {
if reblogged {
return NSLocalizedString("status.reblog-button.undo.accessibility-label", comment: "")
} else {
return NSLocalizedString("status.reblog-button.accessibility-label", comment: "")
}
}

static func favoriteButtonAccessibilityLabel(favorited: Bool) -> String {
if favorited {
return NSLocalizedString("status.favorite-button.undo.accessibility-label", comment: "")
} else {
return NSLocalizedString("status.favorite-button.accessibility-label", comment: "")
}
}

func applyStatusConfiguration() {
let viewModel = statusConfiguration.viewModel
let isContextParent = viewModel.configuration.isContextParent
Expand Down Expand Up @@ -1045,12 +1071,16 @@ private extension StatusView {
func reblog() {
UIImpactFeedbackGenerator(style: .medium).impactOccurred()

let reblogged = !self.statusConfiguration.viewModel.reblogged

reblogButton.accessibilityLabel = Self.reblogButtonAccessibilityLabel(reblogged: reblogged)

if !UIAccessibility.isReduceMotionEnabled {
UIViewPropertyAnimator.runningPropertyAnimator(
withDuration: .defaultAnimationDuration,
delay: 0,
options: .curveLinear) {
self.setReblogButtonColor(reblogged: !self.statusConfiguration.viewModel.reblogged)
self.setReblogButtonColor(reblogged: reblogged)
self.reblogButton.imageView?.transform =
self.reblogButton.imageView?.transform.rotated(by: .pi) ?? .identity
} completion: { _ in
Expand All @@ -1064,12 +1094,16 @@ private extension StatusView {
func favorite() {
UIImpactFeedbackGenerator(style: .medium).impactOccurred()

let favorited = !self.statusConfiguration.viewModel.favorited

favoriteButton.accessibilityLabel = Self.favoriteButtonAccessibilityLabel(favorited: favorited)

if !UIAccessibility.isReduceMotionEnabled {
UIViewPropertyAnimator.runningPropertyAnimator(
withDuration: .defaultAnimationDuration,
delay: 0,
options: .curveLinear) {
self.setFavoriteButtonColor(favorited: !self.statusConfiguration.viewModel.favorited)
self.setFavoriteButtonColor(favorited: favorited)
self.favoriteButton.imageView?.transform =
self.favoriteButton.imageView?.transform.rotated(by: .pi) ?? .identity
} completion: { _ in
Expand All @@ -1095,25 +1129,27 @@ private extension StatusView {

if replyButton.isEnabled {
actions.append(UIAccessibilityCustomAction(
name: replyButton.accessibilityLabel ?? "") { _ in
name: Self.replyButtonAccessibilityLabel) { _ in
viewModel.reply()

return true
})
}

if viewModel.canBeReblogged, reblogButton.isEnabled {
let reblogged = !self.statusConfiguration.viewModel.reblogged
actions.append(UIAccessibilityCustomAction(
name: reblogButton.accessibilityLabel ?? "") { [weak self] _ in
name: Self.reblogButtonAccessibilityLabel(reblogged: reblogged)) { [weak self] _ in
self?.reblog()

return true
})
}

if favoriteButton.isEnabled {
let favorited = !self.statusConfiguration.viewModel.favorited
actions.append(UIAccessibilityCustomAction(
name: favoriteButton.accessibilityLabel ?? "") { [weak self] _ in
name: Self.favoriteButtonAccessibilityLabel(favorited: favorited)) { [weak self] _ in
self?.favorite()

return true
Expand All @@ -1122,7 +1158,7 @@ private extension StatusView {

if shareButton.isEnabled {
actions.append(UIAccessibilityCustomAction(
name: shareButton.accessibilityLabel ?? "") { _ in
name: Self.shareButtonAccessibilityLabel) { _ in
viewModel.shareStatus()

return true
Expand Down

0 comments on commit 7a565f6

Please sign in to comment.