From 550a1acb8bf140b09b20b96137351763122aa04d Mon Sep 17 00:00:00 2001
From: Justin Mazzocchi <2831158+jzzocc@users.noreply.github.com>
Date: Mon, 1 Feb 2021 19:47:48 -0800
Subject: [PATCH] Accessibility wip

---
 Localizations/Localizable.strings                  | 1 +
 View Controllers/EmojiPickerViewController.swift   | 4 ++++
 Views/UIKit/Content Configurations/EmojiView.swift | 8 ++++++++
 3 files changed, 13 insertions(+)

diff --git a/Localizations/Localizable.strings b/Localizations/Localizable.strings
index 511a888..b9b6155 100644
--- a/Localizations/Localizable.strings
+++ b/Localizations/Localizable.strings
@@ -80,6 +80,7 @@
 "compose-button.accessibility-label.toot" = "Compose Toot";
 "emoji.custom" = "Custom";
 "emoji.default-skin-tone" = "Default skin tone";
+"emoji.default-skin-tone-button.accessibility-label" = "Select default skin tone";
 "emoji.frequently-used" = "Frequently used";
 "emoji.search" = "Search Emoji";
 "emoji.system-group.smileys-and-emotion" = "Smileys & Emotion";
diff --git a/View Controllers/EmojiPickerViewController.swift b/View Controllers/EmojiPickerViewController.swift
index 1ed9ba7..b3842f2 100644
--- a/View Controllers/EmojiPickerViewController.swift	
+++ b/View Controllers/EmojiPickerViewController.swift	
@@ -130,12 +130,16 @@ final class EmojiPickerViewController: UIViewController {
             for: .normal)
         skinToneButton.showsMenuAsPrimaryAction = true
         skinToneButton.menu = defaultSkinToneSelectionMenu
+        skinToneButton.accessibilityLabel =
+            NSLocalizedString("emoji.default-skin-tone-button.accessibility-label", comment: "")
 
         view.addSubview(collectionView)
         collectionView.translatesAutoresizingMaskIntoConstraints = false
         collectionView.backgroundColor = .clear
         collectionView.dataSource = dataSource
         collectionView.delegate = self
+        collectionView.isAccessibilityElement = false
+        collectionView.shouldGroupAccessibilityChildren = true
 
         NSLayoutConstraint.activate([
             searchBar.leadingAnchor.constraint(equalTo: view.leadingAnchor),
diff --git a/Views/UIKit/Content Configurations/EmojiView.swift b/Views/UIKit/Content Configurations/EmojiView.swift
index 747628d..144fb16 100644
--- a/Views/UIKit/Content Configurations/EmojiView.swift	
+++ b/Views/UIKit/Content Configurations/EmojiView.swift	
@@ -64,6 +64,8 @@ private extension EmojiView {
             emojiLabel.trailingAnchor.constraint(equalTo: layoutMarginsGuide.trailingAnchor),
             emojiLabel.bottomAnchor.constraint(equalTo: layoutMarginsGuide.bottomAnchor)
         ])
+
+        setupAccessibility()
     }
 
     func applyEmojiConfiguration() {
@@ -74,11 +76,17 @@ private extension EmojiView {
             emojiLabel.isHidden = true
 
             imageView.kf.setImage(with: emoji.url)
+            accessibilityLabel = emoji.shortcode
         } else {
             imageView.isHidden = true
             emojiLabel.isHidden = false
 
             emojiLabel.text = emojiConfiguration.emoji.name
+            accessibilityLabel = emojiConfiguration.emoji.name
         }
     }
+
+    func setupAccessibility() {
+        isAccessibilityElement = true
+    }
 }