From a4504101d2302a1ff48b807d30c428ad24a5d718 Mon Sep 17 00:00:00 2001
From: Rudrank <rudrankriyam@gmail.com>
Date: Wed, 7 Aug 2019 16:27:02 +0530
Subject: [PATCH 1/5] Adding reactions

---
 .../Views/EmojiPicker/EmojiCollectionViewCell.swift         | 3 +++
 .../External/RCEmojiKit/Views/EmojiPicker/EmojiPicker.swift | 6 ++++++
 Rocket.Chat/External/RCEmojiKit/cs.lproj/RCEmojiKit.strings | 4 ++++
 Rocket.Chat/External/RCEmojiKit/de.lproj/RCEmojiKit.strings | 4 ++++
 Rocket.Chat/External/RCEmojiKit/el.lproj/RCEmojiKit.strings | 3 +++
 Rocket.Chat/External/RCEmojiKit/en.lproj/RCEmojiKit.strings | 3 +++
 Rocket.Chat/External/RCEmojiKit/es.lproj/RCEmojiKit.strings | 3 +++
 Rocket.Chat/External/RCEmojiKit/it.lproj/RCEmojiKit.strings | 3 +++
 Rocket.Chat/External/RCEmojiKit/ja.lproj/RCEmojiKit.strings | 3 +++
 Rocket.Chat/External/RCEmojiKit/pl.lproj/RCEmojiKit.strings | 4 ++++
 .../External/RCEmojiKit/pt-BR.lproj/RCEmojiKit.strings      | 4 ++++
 .../External/RCEmojiKit/zh-Hans.lproj/RCEmojiKit.strings    | 3 +++
 .../External/RCEmojiKit/zh-Hant.lproj/RCEmojiKit.strings    | 3 +++
 13 files changed, 46 insertions(+)

diff --git a/Rocket.Chat/External/RCEmojiKit/Views/EmojiPicker/EmojiCollectionViewCell.swift b/Rocket.Chat/External/RCEmojiKit/Views/EmojiPicker/EmojiCollectionViewCell.swift
index a3732175c2..1a15189c1f 100644
--- a/Rocket.Chat/External/RCEmojiKit/Views/EmojiPicker/EmojiCollectionViewCell.swift
+++ b/Rocket.Chat/External/RCEmojiKit/Views/EmojiPicker/EmojiCollectionViewCell.swift
@@ -22,6 +22,7 @@ final class EmojiCollectionViewCell: UICollectionViewCell {
         emojiLabel.baselineAdjustment = .alignCenters
         emojiLabel.font = UIFont.systemFont(ofSize: 32)
         emojiLabel.backgroundColor = UIColor.white
+        emojiLabel.isAccessibilityElement = true
         return emojiLabel
     }()
 
@@ -44,8 +45,10 @@ final class EmojiCollectionViewCell: UICollectionViewCell {
                 guard let url = url else { return }
                 ImageManager.loadImage(with: url, into: emojiImageView)
                 emojiImageView.isHidden = false
+                emojiImageView.isAccessibilityElement = true
             case .standard(let string):
                 emojiLabel.text = string
+                emojiImageView.accessibilityLabel = string
                 emojiLabel.isHidden = false
             }
         }
diff --git a/Rocket.Chat/External/RCEmojiKit/Views/EmojiPicker/EmojiPicker.swift b/Rocket.Chat/External/RCEmojiKit/Views/EmojiPicker/EmojiPicker.swift
index dc5b677978..c3b8f73a7b 100644
--- a/Rocket.Chat/External/RCEmojiKit/Views/EmojiPicker/EmojiPicker.swift
+++ b/Rocket.Chat/External/RCEmojiKit/Views/EmojiPicker/EmojiPicker.swift
@@ -121,6 +121,7 @@ final class EmojiPicker: UIView, RCEmojiKitLocalizable {
             skinToneButton.layer.cornerRadius = skinToneButton.frame.width/2
             skinToneButton.backgroundColor = currentSkinTone.color
             skinToneButton.showsTouchWhenHighlighted = true
+            skinToneButton.accessibilityLabel = localized("skinTone.label")
         }
     }
 
@@ -128,6 +129,7 @@ final class EmojiPicker: UIView, RCEmojiKitLocalizable {
         currentSkinToneIndex += 1
         currentSkinToneIndex = currentSkinToneIndex % skinTones.count
         skinToneButton.backgroundColor = currentSkinTone.color
+        skinToneButton.accessibilityHint = currentSkinTone.name
         emojisCollectionView.reloadData()
     }
 
@@ -180,6 +182,8 @@ final class EmojiPicker: UIView, RCEmojiKitLocalizable {
         let categoryItems = currentCategories.map { category -> UITabBarItem in
             let image = UIImage(named: category.name) ?? UIImage(named: "custom")
             let item = UITabBarItem(title: nil, image: image, selectedImage: image)
+            item.isAccessibilityElement = true
+            item.accessibilityLabel = category.name
             item.imageInsets = UIEdgeInsets(top: 6, left: 0, bottom: -6, right: 0)
             return item
         }
@@ -230,6 +234,8 @@ extension EmojiPicker: UICollectionViewDataSource {
 
         if let file = emoji.imageUrl {
             cell.emoji = .custom(URL(string: file))
+            cell.emojiImageView.accessibilityLabel = emoji.name
+            cell.emojiImageView.accessibilityTraits = .staticText
         } else {
             var toneModifier = ""
             if emoji.supportsTones, let currentTone = currentSkinTone.name { toneModifier = "_\(currentTone)" }
diff --git a/Rocket.Chat/External/RCEmojiKit/cs.lproj/RCEmojiKit.strings b/Rocket.Chat/External/RCEmojiKit/cs.lproj/RCEmojiKit.strings
index 523ce258f9..12bce0f830 100644
--- a/Rocket.Chat/External/RCEmojiKit/cs.lproj/RCEmojiKit.strings
+++ b/Rocket.Chat/External/RCEmojiKit/cs.lproj/RCEmojiKit.strings
@@ -21,3 +21,7 @@
 "categories.flags" = "FLAGS"; //TODO
 
 "reactorlist.title" = "Reactions"; //TODO
+
+// Accessibility
+
+"skinTone.label" = "Change skintone"; //TODO
diff --git a/Rocket.Chat/External/RCEmojiKit/de.lproj/RCEmojiKit.strings b/Rocket.Chat/External/RCEmojiKit/de.lproj/RCEmojiKit.strings
index 241b5eeb61..11134895ad 100644
--- a/Rocket.Chat/External/RCEmojiKit/de.lproj/RCEmojiKit.strings
+++ b/Rocket.Chat/External/RCEmojiKit/de.lproj/RCEmojiKit.strings
@@ -21,3 +21,7 @@
 "categories.flags" = "FLAGGEN";
 
 "reactorlist.title" = "Reaktionen";
+
+// Accessibility
+
+"skinTone.label" = "Change skintone"; //TODO
diff --git a/Rocket.Chat/External/RCEmojiKit/el.lproj/RCEmojiKit.strings b/Rocket.Chat/External/RCEmojiKit/el.lproj/RCEmojiKit.strings
index 7feeb104dc..d44688eef3 100644
--- a/Rocket.Chat/External/RCEmojiKit/el.lproj/RCEmojiKit.strings
+++ b/Rocket.Chat/External/RCEmojiKit/el.lproj/RCEmojiKit.strings
@@ -22,3 +22,6 @@
 
 "reactorlist.title" = "Αντιδράσεις";
 
+// Accessibility
+
+"skinTone.label" = "Change skintone"; //TODO
diff --git a/Rocket.Chat/External/RCEmojiKit/en.lproj/RCEmojiKit.strings b/Rocket.Chat/External/RCEmojiKit/en.lproj/RCEmojiKit.strings
index 4c1953a008..fbddfc29be 100644
--- a/Rocket.Chat/External/RCEmojiKit/en.lproj/RCEmojiKit.strings
+++ b/Rocket.Chat/External/RCEmojiKit/en.lproj/RCEmojiKit.strings
@@ -22,3 +22,6 @@
 
 "reactorlist.title" = "Reactions";
 
+// Accessibility
+
+"skinTone.label" = "Change skintone";
diff --git a/Rocket.Chat/External/RCEmojiKit/es.lproj/RCEmojiKit.strings b/Rocket.Chat/External/RCEmojiKit/es.lproj/RCEmojiKit.strings
index 4c1953a008..64bac8f680 100644
--- a/Rocket.Chat/External/RCEmojiKit/es.lproj/RCEmojiKit.strings
+++ b/Rocket.Chat/External/RCEmojiKit/es.lproj/RCEmojiKit.strings
@@ -22,3 +22,6 @@
 
 "reactorlist.title" = "Reactions";
 
+// Accessibility
+
+"skinTone.label" = "Change skintone"; //TODO
diff --git a/Rocket.Chat/External/RCEmojiKit/it.lproj/RCEmojiKit.strings b/Rocket.Chat/External/RCEmojiKit/it.lproj/RCEmojiKit.strings
index f1e461f9bb..9e2b5c08f8 100644
--- a/Rocket.Chat/External/RCEmojiKit/it.lproj/RCEmojiKit.strings
+++ b/Rocket.Chat/External/RCEmojiKit/it.lproj/RCEmojiKit.strings
@@ -22,3 +22,6 @@
 
 "reactorlist.title" = "Reazioni";
 
+// Accessibility
+
+"skinTone.label" = "Change skintone"; //TODO
diff --git a/Rocket.Chat/External/RCEmojiKit/ja.lproj/RCEmojiKit.strings b/Rocket.Chat/External/RCEmojiKit/ja.lproj/RCEmojiKit.strings
index 4c1953a008..64bac8f680 100644
--- a/Rocket.Chat/External/RCEmojiKit/ja.lproj/RCEmojiKit.strings
+++ b/Rocket.Chat/External/RCEmojiKit/ja.lproj/RCEmojiKit.strings
@@ -22,3 +22,6 @@
 
 "reactorlist.title" = "Reactions";
 
+// Accessibility
+
+"skinTone.label" = "Change skintone"; //TODO
diff --git a/Rocket.Chat/External/RCEmojiKit/pl.lproj/RCEmojiKit.strings b/Rocket.Chat/External/RCEmojiKit/pl.lproj/RCEmojiKit.strings
index 9cc33e5cdc..94afacd5b6 100644
--- a/Rocket.Chat/External/RCEmojiKit/pl.lproj/RCEmojiKit.strings
+++ b/Rocket.Chat/External/RCEmojiKit/pl.lproj/RCEmojiKit.strings
@@ -21,3 +21,7 @@
 "categories.flags" = "FLAGI";
 
 "reactorlist.title" = "Reakcje";
+
+// Accessibility
+
+"skinTone.label" = "Change skintone"; //TODO
diff --git a/Rocket.Chat/External/RCEmojiKit/pt-BR.lproj/RCEmojiKit.strings b/Rocket.Chat/External/RCEmojiKit/pt-BR.lproj/RCEmojiKit.strings
index ee2e969519..e29335ad0b 100644
--- a/Rocket.Chat/External/RCEmojiKit/pt-BR.lproj/RCEmojiKit.strings
+++ b/Rocket.Chat/External/RCEmojiKit/pt-BR.lproj/RCEmojiKit.strings
@@ -21,3 +21,7 @@
 "categories.flags" = "BANDEIRAS";
 
 "reactorlist.title" = "Reações";
+
+// Accessibility
+
+"skinTone.label" = "Change skintone"; //TODO
diff --git a/Rocket.Chat/External/RCEmojiKit/zh-Hans.lproj/RCEmojiKit.strings b/Rocket.Chat/External/RCEmojiKit/zh-Hans.lproj/RCEmojiKit.strings
index 4c1953a008..64bac8f680 100644
--- a/Rocket.Chat/External/RCEmojiKit/zh-Hans.lproj/RCEmojiKit.strings
+++ b/Rocket.Chat/External/RCEmojiKit/zh-Hans.lproj/RCEmojiKit.strings
@@ -22,3 +22,6 @@
 
 "reactorlist.title" = "Reactions";
 
+// Accessibility
+
+"skinTone.label" = "Change skintone"; //TODO
diff --git a/Rocket.Chat/External/RCEmojiKit/zh-Hant.lproj/RCEmojiKit.strings b/Rocket.Chat/External/RCEmojiKit/zh-Hant.lproj/RCEmojiKit.strings
index 4c1953a008..64bac8f680 100644
--- a/Rocket.Chat/External/RCEmojiKit/zh-Hant.lproj/RCEmojiKit.strings
+++ b/Rocket.Chat/External/RCEmojiKit/zh-Hant.lproj/RCEmojiKit.strings
@@ -22,3 +22,6 @@
 
 "reactorlist.title" = "Reactions";
 
+// Accessibility
+
+"skinTone.label" = "Change skintone"; //TODO

From 6548a619b52eb77b113591083f8ca1004fc88ef1 Mon Sep 17 00:00:00 2001
From: Rudrank <rudrankriyam@gmail.com>
Date: Mon, 12 Aug 2019 02:57:56 +0530
Subject: [PATCH 2/5] add currentSkinTone

---
 .../External/RCEmojiKit/Views/EmojiPicker/EmojiPicker.swift | 6 +++++-
 Rocket.Chat/External/RCEmojiKit/cs.lproj/RCEmojiKit.strings | 3 ++-
 Rocket.Chat/External/RCEmojiKit/de.lproj/RCEmojiKit.strings | 3 ++-
 Rocket.Chat/External/RCEmojiKit/el.lproj/RCEmojiKit.strings | 3 ++-
 Rocket.Chat/External/RCEmojiKit/en.lproj/RCEmojiKit.strings | 3 ++-
 Rocket.Chat/External/RCEmojiKit/es.lproj/RCEmojiKit.strings | 3 ++-
 Rocket.Chat/External/RCEmojiKit/fr.lproj/RCEmojiKit.strings | 6 ++++++
 Rocket.Chat/External/RCEmojiKit/it.lproj/RCEmojiKit.strings | 3 ++-
 Rocket.Chat/External/RCEmojiKit/ja.lproj/RCEmojiKit.strings | 3 ++-
 Rocket.Chat/External/RCEmojiKit/pl.lproj/RCEmojiKit.strings | 3 ++-
 .../External/RCEmojiKit/pt-BR.lproj/RCEmojiKit.strings      | 3 ++-
 .../External/RCEmojiKit/pt-PT.lproj/RCEmojiKit.strings      | 5 +++++
 .../External/RCEmojiKit/zh-Hans.lproj/RCEmojiKit.strings    | 3 ++-
 .../External/RCEmojiKit/zh-Hant.lproj/RCEmojiKit.strings    | 3 ++-
 14 files changed, 38 insertions(+), 12 deletions(-)

diff --git a/Rocket.Chat/External/RCEmojiKit/Views/EmojiPicker/EmojiPicker.swift b/Rocket.Chat/External/RCEmojiKit/Views/EmojiPicker/EmojiPicker.swift
index c3b8f73a7b..a6e9a3948a 100644
--- a/Rocket.Chat/External/RCEmojiKit/Views/EmojiPicker/EmojiPicker.swift
+++ b/Rocket.Chat/External/RCEmojiKit/Views/EmojiPicker/EmojiPicker.swift
@@ -129,8 +129,12 @@ final class EmojiPicker: UIView, RCEmojiKitLocalizable {
         currentSkinToneIndex += 1
         currentSkinToneIndex = currentSkinToneIndex % skinTones.count
         skinToneButton.backgroundColor = currentSkinTone.color
-        skinToneButton.accessibilityHint = currentSkinTone.name
         emojisCollectionView.reloadData()
+
+        if let currentSkinToneName = currentSkinTone.name {
+        skinToneButton.accessibilityLabel =
+            localized("skinTone.label") + localized("currentSkinTone.label") +  "\(currentSkinToneName))"
+        }
     }
 
     var emojiPicked: ((String) -> Void)?
diff --git a/Rocket.Chat/External/RCEmojiKit/cs.lproj/RCEmojiKit.strings b/Rocket.Chat/External/RCEmojiKit/cs.lproj/RCEmojiKit.strings
index 12bce0f830..38d9543224 100644
--- a/Rocket.Chat/External/RCEmojiKit/cs.lproj/RCEmojiKit.strings
+++ b/Rocket.Chat/External/RCEmojiKit/cs.lproj/RCEmojiKit.strings
@@ -24,4 +24,5 @@
 
 // Accessibility
 
-"skinTone.label" = "Change skintone"; //TODO
+"skinTone.label" = "Change skintone."; // TODO
+"currentSkinTone.label" = "Current skintone,"; // TODO
diff --git a/Rocket.Chat/External/RCEmojiKit/de.lproj/RCEmojiKit.strings b/Rocket.Chat/External/RCEmojiKit/de.lproj/RCEmojiKit.strings
index 11134895ad..2814a47780 100644
--- a/Rocket.Chat/External/RCEmojiKit/de.lproj/RCEmojiKit.strings
+++ b/Rocket.Chat/External/RCEmojiKit/de.lproj/RCEmojiKit.strings
@@ -24,4 +24,5 @@
 
 // Accessibility
 
-"skinTone.label" = "Change skintone"; //TODO
+"skinTone.label" = "Change skintone."; // TODO
+"currentSkinTone.label" = "Current skintone,"; // TODO
diff --git a/Rocket.Chat/External/RCEmojiKit/el.lproj/RCEmojiKit.strings b/Rocket.Chat/External/RCEmojiKit/el.lproj/RCEmojiKit.strings
index d44688eef3..b3e5fc7e9b 100644
--- a/Rocket.Chat/External/RCEmojiKit/el.lproj/RCEmojiKit.strings
+++ b/Rocket.Chat/External/RCEmojiKit/el.lproj/RCEmojiKit.strings
@@ -24,4 +24,5 @@
 
 // Accessibility
 
-"skinTone.label" = "Change skintone"; //TODO
+"skinTone.label" = "Change skintone."; // TODO
+"currentSkinTone.label" = "Current skintone,"; // TODO
diff --git a/Rocket.Chat/External/RCEmojiKit/en.lproj/RCEmojiKit.strings b/Rocket.Chat/External/RCEmojiKit/en.lproj/RCEmojiKit.strings
index fbddfc29be..ebcf362630 100644
--- a/Rocket.Chat/External/RCEmojiKit/en.lproj/RCEmojiKit.strings
+++ b/Rocket.Chat/External/RCEmojiKit/en.lproj/RCEmojiKit.strings
@@ -24,4 +24,5 @@
 
 // Accessibility
 
-"skinTone.label" = "Change skintone";
+"skinTone.label" = "Change skintone.";
+"currentSkinTone.label" = "Current skintone,";
diff --git a/Rocket.Chat/External/RCEmojiKit/es.lproj/RCEmojiKit.strings b/Rocket.Chat/External/RCEmojiKit/es.lproj/RCEmojiKit.strings
index 64bac8f680..9b3bb79b5f 100644
--- a/Rocket.Chat/External/RCEmojiKit/es.lproj/RCEmojiKit.strings
+++ b/Rocket.Chat/External/RCEmojiKit/es.lproj/RCEmojiKit.strings
@@ -24,4 +24,5 @@
 
 // Accessibility
 
-"skinTone.label" = "Change skintone"; //TODO
+"skinTone.label" = "Change skintone."; // TODO
+"currentSkinTone.label" = "Current skintone,"; // TODO
diff --git a/Rocket.Chat/External/RCEmojiKit/fr.lproj/RCEmojiKit.strings b/Rocket.Chat/External/RCEmojiKit/fr.lproj/RCEmojiKit.strings
index 6825be2ac0..14f2cd12c2 100644
--- a/Rocket.Chat/External/RCEmojiKit/fr.lproj/RCEmojiKit.strings
+++ b/Rocket.Chat/External/RCEmojiKit/fr.lproj/RCEmojiKit.strings
@@ -21,3 +21,9 @@
 "categories.flags" = "FLAGS"; //TODO
 
 "reactorlist.title" = "Reactions"; //TODO
+
+// Accessibility
+
+"skinTone.label" = "Change skintone."; // TODO
+"currentSkinTone.label" = "Current skintone,"; // TODO
+
diff --git a/Rocket.Chat/External/RCEmojiKit/it.lproj/RCEmojiKit.strings b/Rocket.Chat/External/RCEmojiKit/it.lproj/RCEmojiKit.strings
index 9e2b5c08f8..3917cf8c7d 100644
--- a/Rocket.Chat/External/RCEmojiKit/it.lproj/RCEmojiKit.strings
+++ b/Rocket.Chat/External/RCEmojiKit/it.lproj/RCEmojiKit.strings
@@ -24,4 +24,5 @@
 
 // Accessibility
 
-"skinTone.label" = "Change skintone"; //TODO
+"skinTone.label" = "Change skintone."; // TODO
+"currentSkinTone.label" = "Current skintone,"; // TODO
diff --git a/Rocket.Chat/External/RCEmojiKit/ja.lproj/RCEmojiKit.strings b/Rocket.Chat/External/RCEmojiKit/ja.lproj/RCEmojiKit.strings
index 64bac8f680..9b3bb79b5f 100644
--- a/Rocket.Chat/External/RCEmojiKit/ja.lproj/RCEmojiKit.strings
+++ b/Rocket.Chat/External/RCEmojiKit/ja.lproj/RCEmojiKit.strings
@@ -24,4 +24,5 @@
 
 // Accessibility
 
-"skinTone.label" = "Change skintone"; //TODO
+"skinTone.label" = "Change skintone."; // TODO
+"currentSkinTone.label" = "Current skintone,"; // TODO
diff --git a/Rocket.Chat/External/RCEmojiKit/pl.lproj/RCEmojiKit.strings b/Rocket.Chat/External/RCEmojiKit/pl.lproj/RCEmojiKit.strings
index 94afacd5b6..7b58f44c06 100644
--- a/Rocket.Chat/External/RCEmojiKit/pl.lproj/RCEmojiKit.strings
+++ b/Rocket.Chat/External/RCEmojiKit/pl.lproj/RCEmojiKit.strings
@@ -24,4 +24,5 @@
 
 // Accessibility
 
-"skinTone.label" = "Change skintone"; //TODO
+"skinTone.label" = "Change skintone."; // TODO
+"currentSkinTone.label" = "Current skintone,"; // TODO
diff --git a/Rocket.Chat/External/RCEmojiKit/pt-BR.lproj/RCEmojiKit.strings b/Rocket.Chat/External/RCEmojiKit/pt-BR.lproj/RCEmojiKit.strings
index e29335ad0b..fccfe0a387 100644
--- a/Rocket.Chat/External/RCEmojiKit/pt-BR.lproj/RCEmojiKit.strings
+++ b/Rocket.Chat/External/RCEmojiKit/pt-BR.lproj/RCEmojiKit.strings
@@ -24,4 +24,5 @@
 
 // Accessibility
 
-"skinTone.label" = "Change skintone"; //TODO
+"skinTone.label" = "Change skintone."; // TODO
+"currentSkinTone.label" = "Current skintone,"; // TODO
diff --git a/Rocket.Chat/External/RCEmojiKit/pt-PT.lproj/RCEmojiKit.strings b/Rocket.Chat/External/RCEmojiKit/pt-PT.lproj/RCEmojiKit.strings
index ee2e969519..fccfe0a387 100644
--- a/Rocket.Chat/External/RCEmojiKit/pt-PT.lproj/RCEmojiKit.strings
+++ b/Rocket.Chat/External/RCEmojiKit/pt-PT.lproj/RCEmojiKit.strings
@@ -21,3 +21,8 @@
 "categories.flags" = "BANDEIRAS";
 
 "reactorlist.title" = "Reações";
+
+// Accessibility
+
+"skinTone.label" = "Change skintone."; // TODO
+"currentSkinTone.label" = "Current skintone,"; // TODO
diff --git a/Rocket.Chat/External/RCEmojiKit/zh-Hans.lproj/RCEmojiKit.strings b/Rocket.Chat/External/RCEmojiKit/zh-Hans.lproj/RCEmojiKit.strings
index 64bac8f680..9b3bb79b5f 100644
--- a/Rocket.Chat/External/RCEmojiKit/zh-Hans.lproj/RCEmojiKit.strings
+++ b/Rocket.Chat/External/RCEmojiKit/zh-Hans.lproj/RCEmojiKit.strings
@@ -24,4 +24,5 @@
 
 // Accessibility
 
-"skinTone.label" = "Change skintone"; //TODO
+"skinTone.label" = "Change skintone."; // TODO
+"currentSkinTone.label" = "Current skintone,"; // TODO
diff --git a/Rocket.Chat/External/RCEmojiKit/zh-Hant.lproj/RCEmojiKit.strings b/Rocket.Chat/External/RCEmojiKit/zh-Hant.lproj/RCEmojiKit.strings
index 64bac8f680..9b3bb79b5f 100644
--- a/Rocket.Chat/External/RCEmojiKit/zh-Hant.lproj/RCEmojiKit.strings
+++ b/Rocket.Chat/External/RCEmojiKit/zh-Hant.lproj/RCEmojiKit.strings
@@ -24,4 +24,5 @@
 
 // Accessibility
 
-"skinTone.label" = "Change skintone"; //TODO
+"skinTone.label" = "Change skintone."; // TODO
+"currentSkinTone.label" = "Current skintone,"; // TODO

From 3607d2ba7646904607ddb21d81ee856e34986ae5 Mon Sep 17 00:00:00 2001
From: Rudrank <rudrankriyam@gmail.com>
Date: Mon, 12 Aug 2019 04:01:25 +0530
Subject: [PATCH 3/5] emojiLabel accessibility header

---
 .../External/RCEmojiKit/Views/EmojiPicker/EmojiPicker.swift   | 1 +
 Rocket.Chat/External/RCEmojiKit/Views/EmojiView.xib           | 4 ++++
 2 files changed, 5 insertions(+)

diff --git a/Rocket.Chat/External/RCEmojiKit/Views/EmojiPicker/EmojiPicker.swift b/Rocket.Chat/External/RCEmojiKit/Views/EmojiPicker/EmojiPicker.swift
index a6e9a3948a..b8633b91fc 100644
--- a/Rocket.Chat/External/RCEmojiKit/Views/EmojiPicker/EmojiPicker.swift
+++ b/Rocket.Chat/External/RCEmojiKit/Views/EmojiPicker/EmojiPicker.swift
@@ -223,6 +223,7 @@ extension EmojiPicker: UICollectionViewDataSource {
         ) as? EmojiPickerSectionHeaderView else { return UICollectionReusableView() }
 
         headerView.textLabel.text = localized("categories.\(currentCategories[indexPath.section].name)")
+        headerView.textLabel.accessibilityTraits = .header
 
         return headerView
     }
diff --git a/Rocket.Chat/External/RCEmojiKit/Views/EmojiView.xib b/Rocket.Chat/External/RCEmojiKit/Views/EmojiView.xib
index a131891aca..fd15b647e3 100644
--- a/Rocket.Chat/External/RCEmojiKit/Views/EmojiView.xib
+++ b/Rocket.Chat/External/RCEmojiKit/Views/EmojiView.xib
@@ -25,6 +25,10 @@
                 <imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="H0W-CD-Tmy" userLabel="Emoji Image" customClass="FLAnimatedImageView">
                     <rect key="frame" x="0.0" y="0.0" width="46" height="46"/>
                     <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
+                    <accessibility key="accessibilityConfiguration">
+                        <accessibilityTraits key="traits" staticText="YES"/>
+                        <bool key="isElement" value="YES"/>
+                    </accessibility>
                 </imageView>
                 <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" fixedFrame="YES" text="" textAlignment="center" lineBreakMode="tailTruncation" numberOfLines="0" minimumScaleFactor="0.01" adjustsLetterSpacingToFitWidth="YES" translatesAutoresizingMaskIntoConstraints="NO" id="hk6-3B-0Qu" userLabel="Emoji Label">
                     <rect key="frame" x="0.0" y="0.0" width="46" height="46"/>

From 7dd9041f5575ee8664311852dc2329e859de5003 Mon Sep 17 00:00:00 2001
From: Rudrank <rudrankriyam@gmail.com>
Date: Tue, 13 Aug 2019 20:52:03 +0530
Subject: [PATCH 4/5] custom emoji double swipe fix

---
 .../RCEmojiKit/Views/EmojiPicker/EmojiCollectionViewCell.swift  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Rocket.Chat/External/RCEmojiKit/Views/EmojiPicker/EmojiCollectionViewCell.swift b/Rocket.Chat/External/RCEmojiKit/Views/EmojiPicker/EmojiCollectionViewCell.swift
index 1a15189c1f..6fa7031726 100644
--- a/Rocket.Chat/External/RCEmojiKit/Views/EmojiPicker/EmojiCollectionViewCell.swift
+++ b/Rocket.Chat/External/RCEmojiKit/Views/EmojiPicker/EmojiCollectionViewCell.swift
@@ -22,7 +22,6 @@ final class EmojiCollectionViewCell: UICollectionViewCell {
         emojiLabel.baselineAdjustment = .alignCenters
         emojiLabel.font = UIFont.systemFont(ofSize: 32)
         emojiLabel.backgroundColor = UIColor.white
-        emojiLabel.isAccessibilityElement = true
         return emojiLabel
     }()
 
@@ -46,6 +45,7 @@ final class EmojiCollectionViewCell: UICollectionViewCell {
                 ImageManager.loadImage(with: url, into: emojiImageView)
                 emojiImageView.isHidden = false
                 emojiImageView.isAccessibilityElement = true
+                emojiLabel.accessibilityElementsHidden = true
             case .standard(let string):
                 emojiLabel.text = string
                 emojiImageView.accessibilityLabel = string

From 46d200ca8aba7b48e72764d84dfff6ee6262773e Mon Sep 17 00:00:00 2001
From: Rudrank <rudrankriyam@gmail.com>
Date: Mon, 19 Aug 2019 06:17:03 +0530
Subject: [PATCH 5/5] changeSkinTone button accessibility improvements

---
 .../EmojiPicker/EmojiCollectionViewCell.swift |  1 +
 .../Views/EmojiPicker/EmojiPicker.swift       | 26 +++++++++----------
 .../RCEmojiKit/cs.lproj/RCEmojiKit.strings    |  6 +++++
 .../RCEmojiKit/de.lproj/RCEmojiKit.strings    |  6 +++++
 .../RCEmojiKit/el.lproj/RCEmojiKit.strings    |  6 +++++
 .../RCEmojiKit/en.lproj/RCEmojiKit.strings    |  6 +++++
 .../RCEmojiKit/es.lproj/RCEmojiKit.strings    |  6 +++++
 .../RCEmojiKit/fr.lproj/RCEmojiKit.strings    |  6 +++++
 .../RCEmojiKit/it.lproj/RCEmojiKit.strings    |  6 +++++
 .../RCEmojiKit/ja.lproj/RCEmojiKit.strings    |  6 +++++
 .../RCEmojiKit/pl.lproj/RCEmojiKit.strings    |  6 +++++
 .../RCEmojiKit/pt-BR.lproj/RCEmojiKit.strings |  6 +++++
 .../RCEmojiKit/pt-PT.lproj/RCEmojiKit.strings |  6 +++++
 .../zh-Hans.lproj/RCEmojiKit.strings          |  6 +++++
 .../zh-Hant.lproj/RCEmojiKit.strings          |  6 +++++
 15 files changed, 91 insertions(+), 14 deletions(-)

diff --git a/Rocket.Chat/External/RCEmojiKit/Views/EmojiPicker/EmojiCollectionViewCell.swift b/Rocket.Chat/External/RCEmojiKit/Views/EmojiPicker/EmojiCollectionViewCell.swift
index 6fa7031726..04c895c292 100644
--- a/Rocket.Chat/External/RCEmojiKit/Views/EmojiPicker/EmojiCollectionViewCell.swift
+++ b/Rocket.Chat/External/RCEmojiKit/Views/EmojiPicker/EmojiCollectionViewCell.swift
@@ -50,6 +50,7 @@ final class EmojiCollectionViewCell: UICollectionViewCell {
                 emojiLabel.text = string
                 emojiImageView.accessibilityLabel = string
                 emojiLabel.isHidden = false
+                emojiLabel.accessibilityElementsHidden = false
             }
         }
     }
diff --git a/Rocket.Chat/External/RCEmojiKit/Views/EmojiPicker/EmojiPicker.swift b/Rocket.Chat/External/RCEmojiKit/Views/EmojiPicker/EmojiPicker.swift
index b8633b91fc..ec01f3fd1d 100644
--- a/Rocket.Chat/External/RCEmojiKit/Views/EmojiPicker/EmojiPicker.swift
+++ b/Rocket.Chat/External/RCEmojiKit/Views/EmojiPicker/EmojiPicker.swift
@@ -93,13 +93,13 @@ final class EmojiPicker: UIView, RCEmojiKitLocalizable {
 
     @IBOutlet weak var emojisCollectionView: UICollectionView!
 
-    let skinTones: [(name: String?, color: UIColor)] = [
-        (name: nil, color: #colorLiteral(red: 0.999120295, green: 0.8114234805, blue: 0.06628075987, alpha: 1)),
-        (name: "tone1", color: #colorLiteral(red: 0.982526958, green: 0.8808286786, blue: 0.7670835853, alpha: 1)),
-        (name: "tone2", color: #colorLiteral(red: 0.8934452534, green: 0.7645885944, blue: 0.6247871518, alpha: 1)),
-        (name: "tone3", color: #colorLiteral(red: 0.7776196599, green: 0.6034522057, blue: 0.4516467452, alpha: 1)),
-        (name: "tone4", color: #colorLiteral(red: 0.6469842792, green: 0.4368215203, blue: 0.272474587, alpha: 1)),
-        (name: "tone5", color: #colorLiteral(red: 0.391161263, green: 0.3079459369, blue: 0.2550256848, alpha: 1))
+    let skinTones: [(name: String?, color: UIColor, accessibilityName: String)] = [
+        (name: nil, color: #colorLiteral(red: 0.999120295, green: 0.8114234805, blue: 0.06628075987, alpha: 1), "skinTone.default"),
+        (name: "tone1", color: #colorLiteral(red: 0.982526958, green: 0.8808286786, blue: 0.7670835853, alpha: 1), "skinTone.tone1"),
+        (name: "tone2", color: #colorLiteral(red: 0.8934452534, green: 0.7645885944, blue: 0.6247871518, alpha: 1), "skinTone.tone2"),
+        (name: "tone3", color: #colorLiteral(red: 0.7776196599, green: 0.6034522057, blue: 0.4516467452, alpha: 1), "skinTone.tone3"),
+        (name: "tone4", color: #colorLiteral(red: 0.6469842792, green: 0.4368215203, blue: 0.272474587, alpha: 1), "skinTone.tone4"),
+        (name: "tone5", color: #colorLiteral(red: 0.391161263, green: 0.3079459369, blue: 0.2550256848, alpha: 1), "skinTone.tone5")
     ]
 
     var currentSkinToneIndex: Int {
@@ -112,7 +112,7 @@ final class EmojiPicker: UIView, RCEmojiKitLocalizable {
         }
     }
 
-    var currentSkinTone: (name: String?, color: UIColor) {
+    var currentSkinTone: (name: String?, color: UIColor, accessibilityName: String) {
         return skinTones[currentSkinToneIndex]
     }
 
@@ -121,7 +121,9 @@ final class EmojiPicker: UIView, RCEmojiKitLocalizable {
             skinToneButton.layer.cornerRadius = skinToneButton.frame.width/2
             skinToneButton.backgroundColor = currentSkinTone.color
             skinToneButton.showsTouchWhenHighlighted = true
-            skinToneButton.accessibilityLabel = localized("skinTone.label")
+            skinToneButton.accessibilityLabel =
+                localized("skinTone.label") + localized("currentSkinTone.label")
+            skinToneButton.accessibilityValue = localized(currentSkinTone.accessibilityName)
         }
     }
 
@@ -129,12 +131,8 @@ final class EmojiPicker: UIView, RCEmojiKitLocalizable {
         currentSkinToneIndex += 1
         currentSkinToneIndex = currentSkinToneIndex % skinTones.count
         skinToneButton.backgroundColor = currentSkinTone.color
+        skinToneButton.accessibilityValue = localized(currentSkinTone.accessibilityName)
         emojisCollectionView.reloadData()
-
-        if let currentSkinToneName = currentSkinTone.name {
-        skinToneButton.accessibilityLabel =
-            localized("skinTone.label") + localized("currentSkinTone.label") +  "\(currentSkinToneName))"
-        }
     }
 
     var emojiPicked: ((String) -> Void)?
diff --git a/Rocket.Chat/External/RCEmojiKit/cs.lproj/RCEmojiKit.strings b/Rocket.Chat/External/RCEmojiKit/cs.lproj/RCEmojiKit.strings
index 38d9543224..992fdc19e9 100644
--- a/Rocket.Chat/External/RCEmojiKit/cs.lproj/RCEmojiKit.strings
+++ b/Rocket.Chat/External/RCEmojiKit/cs.lproj/RCEmojiKit.strings
@@ -26,3 +26,9 @@
 
 "skinTone.label" = "Change skintone."; // TODO
 "currentSkinTone.label" = "Current skintone,"; // TODO
+"skinTone.default" = "Default"; // TODO
+"skinTone.tone1" = "Light skin tone"; // TODO
+"skinTone.tone2" = "Medium light skin tone"; // TODO
+"skinTone.tone3" = "Medium skin tone"; // TODO
+"skinTone.tone4" = "Medium dark skin tone"; // TODO
+"skinTone.tone5" = "Dark skin tone"; // TODO
diff --git a/Rocket.Chat/External/RCEmojiKit/de.lproj/RCEmojiKit.strings b/Rocket.Chat/External/RCEmojiKit/de.lproj/RCEmojiKit.strings
index 2814a47780..e48d296689 100644
--- a/Rocket.Chat/External/RCEmojiKit/de.lproj/RCEmojiKit.strings
+++ b/Rocket.Chat/External/RCEmojiKit/de.lproj/RCEmojiKit.strings
@@ -26,3 +26,9 @@
 
 "skinTone.label" = "Change skintone."; // TODO
 "currentSkinTone.label" = "Current skintone,"; // TODO
+"skinTone.default" = "Default"; // TODO
+"skinTone.tone1" = "Light skin tone"; // TODO
+"skinTone.tone2" = "Medium light skin tone"; // TODO
+"skinTone.tone3" = "Medium skin tone"; // TODO
+"skinTone.tone4" = "Medium dark skin tone"; // TODO
+"skinTone.tone5" = "Dark skin tone"; // TODO
diff --git a/Rocket.Chat/External/RCEmojiKit/el.lproj/RCEmojiKit.strings b/Rocket.Chat/External/RCEmojiKit/el.lproj/RCEmojiKit.strings
index b3e5fc7e9b..b1f1593725 100644
--- a/Rocket.Chat/External/RCEmojiKit/el.lproj/RCEmojiKit.strings
+++ b/Rocket.Chat/External/RCEmojiKit/el.lproj/RCEmojiKit.strings
@@ -26,3 +26,9 @@
 
 "skinTone.label" = "Change skintone."; // TODO
 "currentSkinTone.label" = "Current skintone,"; // TODO
+"skinTone.default" = "Default"; // TODO
+"skinTone.tone1" = "Light skin tone"; // TODO
+"skinTone.tone2" = "Medium light skin tone"; // TODO
+"skinTone.tone3" = "Medium skin tone"; // TODO
+"skinTone.tone4" = "Medium dark skin tone"; // TODO
+"skinTone.tone5" = "Dark skin tone"; // TODO
diff --git a/Rocket.Chat/External/RCEmojiKit/en.lproj/RCEmojiKit.strings b/Rocket.Chat/External/RCEmojiKit/en.lproj/RCEmojiKit.strings
index ebcf362630..e8d7e622e6 100644
--- a/Rocket.Chat/External/RCEmojiKit/en.lproj/RCEmojiKit.strings
+++ b/Rocket.Chat/External/RCEmojiKit/en.lproj/RCEmojiKit.strings
@@ -26,3 +26,9 @@
 
 "skinTone.label" = "Change skintone.";
 "currentSkinTone.label" = "Current skintone,";
+"skinTone.default" = "Default";
+"skinTone.tone1" = "Light skin tone";
+"skinTone.tone2" = "Medium light skin tone";
+"skinTone.tone3" = "Medium skin tone";
+"skinTone.tone4" = "Medium dark skin tone";
+"skinTone.tone5" = "Dark skin tone";
diff --git a/Rocket.Chat/External/RCEmojiKit/es.lproj/RCEmojiKit.strings b/Rocket.Chat/External/RCEmojiKit/es.lproj/RCEmojiKit.strings
index 9b3bb79b5f..79f08b3e6b 100644
--- a/Rocket.Chat/External/RCEmojiKit/es.lproj/RCEmojiKit.strings
+++ b/Rocket.Chat/External/RCEmojiKit/es.lproj/RCEmojiKit.strings
@@ -26,3 +26,9 @@
 
 "skinTone.label" = "Change skintone."; // TODO
 "currentSkinTone.label" = "Current skintone,"; // TODO
+"skinTone.default" = "Default"; // TODO
+"skinTone.tone1" = "Light skin tone"; // TODO
+"skinTone.tone2" = "Medium light skin tone"; // TODO
+"skinTone.tone3" = "Medium skin tone"; // TODO
+"skinTone.tone4" = "Medium dark skin tone"; // TODO
+"skinTone.tone5" = "Dark skin tone"; // TODO
diff --git a/Rocket.Chat/External/RCEmojiKit/fr.lproj/RCEmojiKit.strings b/Rocket.Chat/External/RCEmojiKit/fr.lproj/RCEmojiKit.strings
index 14f2cd12c2..92df3f5261 100644
--- a/Rocket.Chat/External/RCEmojiKit/fr.lproj/RCEmojiKit.strings
+++ b/Rocket.Chat/External/RCEmojiKit/fr.lproj/RCEmojiKit.strings
@@ -26,4 +26,10 @@
 
 "skinTone.label" = "Change skintone."; // TODO
 "currentSkinTone.label" = "Current skintone,"; // TODO
+"skinTone.default" = "Default"; // TODO
+"skinTone.tone1" = "Light skin tone"; // TODO
+"skinTone.tone2" = "Medium light skin tone"; // TODO
+"skinTone.tone3" = "Medium skin tone"; // TODO
+"skinTone.tone4" = "Medium dark skin tone"; // TODO
+"skinTone.tone5" = "Dark skin tone"; // TODO
 
diff --git a/Rocket.Chat/External/RCEmojiKit/it.lproj/RCEmojiKit.strings b/Rocket.Chat/External/RCEmojiKit/it.lproj/RCEmojiKit.strings
index 3917cf8c7d..4ff6fe6493 100644
--- a/Rocket.Chat/External/RCEmojiKit/it.lproj/RCEmojiKit.strings
+++ b/Rocket.Chat/External/RCEmojiKit/it.lproj/RCEmojiKit.strings
@@ -26,3 +26,9 @@
 
 "skinTone.label" = "Change skintone."; // TODO
 "currentSkinTone.label" = "Current skintone,"; // TODO
+"skinTone.default" = "Default"; // TODO
+"skinTone.tone1" = "Light skin tone"; // TODO
+"skinTone.tone2" = "Medium light skin tone"; // TODO
+"skinTone.tone3" = "Medium skin tone"; // TODO
+"skinTone.tone4" = "Medium dark skin tone"; // TODO
+"skinTone.tone5" = "Dark skin tone"; // TODO
diff --git a/Rocket.Chat/External/RCEmojiKit/ja.lproj/RCEmojiKit.strings b/Rocket.Chat/External/RCEmojiKit/ja.lproj/RCEmojiKit.strings
index 9b3bb79b5f..79f08b3e6b 100644
--- a/Rocket.Chat/External/RCEmojiKit/ja.lproj/RCEmojiKit.strings
+++ b/Rocket.Chat/External/RCEmojiKit/ja.lproj/RCEmojiKit.strings
@@ -26,3 +26,9 @@
 
 "skinTone.label" = "Change skintone."; // TODO
 "currentSkinTone.label" = "Current skintone,"; // TODO
+"skinTone.default" = "Default"; // TODO
+"skinTone.tone1" = "Light skin tone"; // TODO
+"skinTone.tone2" = "Medium light skin tone"; // TODO
+"skinTone.tone3" = "Medium skin tone"; // TODO
+"skinTone.tone4" = "Medium dark skin tone"; // TODO
+"skinTone.tone5" = "Dark skin tone"; // TODO
diff --git a/Rocket.Chat/External/RCEmojiKit/pl.lproj/RCEmojiKit.strings b/Rocket.Chat/External/RCEmojiKit/pl.lproj/RCEmojiKit.strings
index 7b58f44c06..df96c9313d 100644
--- a/Rocket.Chat/External/RCEmojiKit/pl.lproj/RCEmojiKit.strings
+++ b/Rocket.Chat/External/RCEmojiKit/pl.lproj/RCEmojiKit.strings
@@ -26,3 +26,9 @@
 
 "skinTone.label" = "Change skintone."; // TODO
 "currentSkinTone.label" = "Current skintone,"; // TODO
+"skinTone.default" = "Default"; // TODO
+"skinTone.tone1" = "Light skin tone"; // TODO
+"skinTone.tone2" = "Medium light skin tone"; // TODO
+"skinTone.tone3" = "Medium skin tone"; // TODO
+"skinTone.tone4" = "Medium dark skin tone"; // TODO
+"skinTone.tone5" = "Dark skin tone"; // TODO
diff --git a/Rocket.Chat/External/RCEmojiKit/pt-BR.lproj/RCEmojiKit.strings b/Rocket.Chat/External/RCEmojiKit/pt-BR.lproj/RCEmojiKit.strings
index fccfe0a387..a33abde9ef 100644
--- a/Rocket.Chat/External/RCEmojiKit/pt-BR.lproj/RCEmojiKit.strings
+++ b/Rocket.Chat/External/RCEmojiKit/pt-BR.lproj/RCEmojiKit.strings
@@ -26,3 +26,9 @@
 
 "skinTone.label" = "Change skintone."; // TODO
 "currentSkinTone.label" = "Current skintone,"; // TODO
+"skinTone.default" = "Default"; // TODO
+"skinTone.tone1" = "Light skin tone"; // TODO
+"skinTone.tone2" = "Medium light skin tone"; // TODO
+"skinTone.tone3" = "Medium skin tone"; // TODO
+"skinTone.tone4" = "Medium dark skin tone"; // TODO
+"skinTone.tone5" = "Dark skin tone"; // TODO
diff --git a/Rocket.Chat/External/RCEmojiKit/pt-PT.lproj/RCEmojiKit.strings b/Rocket.Chat/External/RCEmojiKit/pt-PT.lproj/RCEmojiKit.strings
index fccfe0a387..a33abde9ef 100644
--- a/Rocket.Chat/External/RCEmojiKit/pt-PT.lproj/RCEmojiKit.strings
+++ b/Rocket.Chat/External/RCEmojiKit/pt-PT.lproj/RCEmojiKit.strings
@@ -26,3 +26,9 @@
 
 "skinTone.label" = "Change skintone."; // TODO
 "currentSkinTone.label" = "Current skintone,"; // TODO
+"skinTone.default" = "Default"; // TODO
+"skinTone.tone1" = "Light skin tone"; // TODO
+"skinTone.tone2" = "Medium light skin tone"; // TODO
+"skinTone.tone3" = "Medium skin tone"; // TODO
+"skinTone.tone4" = "Medium dark skin tone"; // TODO
+"skinTone.tone5" = "Dark skin tone"; // TODO
diff --git a/Rocket.Chat/External/RCEmojiKit/zh-Hans.lproj/RCEmojiKit.strings b/Rocket.Chat/External/RCEmojiKit/zh-Hans.lproj/RCEmojiKit.strings
index 9b3bb79b5f..79f08b3e6b 100644
--- a/Rocket.Chat/External/RCEmojiKit/zh-Hans.lproj/RCEmojiKit.strings
+++ b/Rocket.Chat/External/RCEmojiKit/zh-Hans.lproj/RCEmojiKit.strings
@@ -26,3 +26,9 @@
 
 "skinTone.label" = "Change skintone."; // TODO
 "currentSkinTone.label" = "Current skintone,"; // TODO
+"skinTone.default" = "Default"; // TODO
+"skinTone.tone1" = "Light skin tone"; // TODO
+"skinTone.tone2" = "Medium light skin tone"; // TODO
+"skinTone.tone3" = "Medium skin tone"; // TODO
+"skinTone.tone4" = "Medium dark skin tone"; // TODO
+"skinTone.tone5" = "Dark skin tone"; // TODO
diff --git a/Rocket.Chat/External/RCEmojiKit/zh-Hant.lproj/RCEmojiKit.strings b/Rocket.Chat/External/RCEmojiKit/zh-Hant.lproj/RCEmojiKit.strings
index 9b3bb79b5f..79f08b3e6b 100644
--- a/Rocket.Chat/External/RCEmojiKit/zh-Hant.lproj/RCEmojiKit.strings
+++ b/Rocket.Chat/External/RCEmojiKit/zh-Hant.lproj/RCEmojiKit.strings
@@ -26,3 +26,9 @@
 
 "skinTone.label" = "Change skintone."; // TODO
 "currentSkinTone.label" = "Current skintone,"; // TODO
+"skinTone.default" = "Default"; // TODO
+"skinTone.tone1" = "Light skin tone"; // TODO
+"skinTone.tone2" = "Medium light skin tone"; // TODO
+"skinTone.tone3" = "Medium skin tone"; // TODO
+"skinTone.tone4" = "Medium dark skin tone"; // TODO
+"skinTone.tone5" = "Dark skin tone"; // TODO