From 48c014ba35458b00f3af657414f80990a617b7eb Mon Sep 17 00:00:00 2001
From: Justin Mazzocchi <2831158+jzzocc@users.noreply.github.com>
Date: Tue, 2 Feb 2021 22:00:29 -0800
Subject: [PATCH] VoiceOver improvements

---
 Localizations/Localizable.strings               |  3 +--
 Views/UIKit/CompositionInputAccessoryView.swift | 12 +++---------
 Views/UIKit/Content Views/StatusView.swift      |  4 +++-
 3 files changed, 7 insertions(+), 12 deletions(-)

diff --git a/Localizations/Localizable.strings b/Localizations/Localizable.strings
index 6cd4c22..acfb90c 100644
--- a/Localizations/Localizable.strings
+++ b/Localizations/Localizable.strings
@@ -91,8 +91,7 @@
 "compose.poll-button.accessibility-label" = "Add a poll";
 "compose.prompt" = "What's on your mind?";
 "compose.take-photo-or-video" = "Take Photo or Video";
-"compose.visibility-button.accessibility-label.toot" = "Adjust toot privacy";
-"compose.visibility-button.accessibility-label.post" = "Adjust post privacy";
+"compose.visibility-button.accessibility-label-%@" = "Privacy: %@";
 "compose-button.accessibility-label.post" = "Compose Post";
 "compose-button.accessibility-label.toot" = "Compose Toot";
 "emoji.custom" = "Custom";
diff --git a/Views/UIKit/CompositionInputAccessoryView.swift b/Views/UIKit/CompositionInputAccessoryView.swift
index 3ea6cc9..69195e0 100644
--- a/Views/UIKit/CompositionInputAccessoryView.swift
+++ b/Views/UIKit/CompositionInputAccessoryView.swift
@@ -83,15 +83,6 @@ private extension CompositionInputAccessoryView {
             image: UIImage(systemName: parentViewModel.visibility.systemImageName),
             menu: visibilityMenu(selectedVisibility: parentViewModel.visibility))
 
-        switch parentViewModel.identityContext.appPreferences.statusWord {
-        case .toot:
-            visibilityButton.accessibilityLabel =
-                NSLocalizedString("compose.visibility-button.accessibility-label.toot", comment: "")
-        case .post:
-            visibilityButton.accessibilityLabel =
-                NSLocalizedString("compose.visibility-button.accessibility-label.post", comment: "")
-        }
-
         let contentWarningButton = UIBarButtonItem(
             title: NSLocalizedString("status.content-warning-abbreviation", comment: ""),
             primaryAction: UIAction { [weak self] _ in self?.viewModel.displayContentWarning.toggle() })
@@ -183,6 +174,9 @@ private extension CompositionInputAccessoryView {
             .sink { [weak self] in
                 visibilityButton.image = UIImage(systemName: $0.systemImageName)
                 visibilityButton.menu = self?.visibilityMenu(selectedVisibility: $0)
+                visibilityButton.accessibilityLabel = String.localizedStringWithFormat(
+                    NSLocalizedString("compose.visibility-button.accessibility-label-%@", comment: ""),
+                    $0.title ?? "")
             }
             .store(in: &cancellables)
     }
diff --git a/Views/UIKit/Content Views/StatusView.swift b/Views/UIKit/Content Views/StatusView.swift
index 6d9009c..52b0202 100644
--- a/Views/UIKit/Content Views/StatusView.swift	
+++ b/Views/UIKit/Content Views/StatusView.swift	
@@ -400,6 +400,8 @@ private extension StatusView {
             infoLabel.isHidden = false
             infoIcon.isHidden = false
         } else {
+            infoLabel.text = nil
+            infoIcon.image = nil
             infoLabel.isHidden = true
             infoIcon.isHidden = true
         }
@@ -494,7 +496,7 @@ private extension StatusView {
 
         let accessibilityAttributedLabel = NSMutableAttributedString(string: "")
 
-        if let infoText = infoLabel.attributedText {
+        if !infoLabel.isHidden, let infoText = infoLabel.attributedText {
             accessibilityAttributedLabel.appendWithSeparator(infoText)
         }