Merge pull request #180 from allanweir/master

Allow for explicit setting of the accessibility label, hint and identifier.

Author: eggswift

Sources/ESTabBar.swift

@@ -276,6 +276,7 @@ internal extension ESTabBar /* Actions */ {
             }
         }
 
+        self.updateAccessibilityLabels()
         self.setNeedsLayout()
     }
 
@@ -407,20 +408,30 @@ internal extension ESTabBar /* Actions */ {
 
         for (idx, item) in tabBarItems.enumerated() {
             let container = self.containers[idx]
-            var accessibilityTitle = ""
+            container.accessibilityIdentifier = item.accessibilityIdentifier
+            container.accessibilityTraits = item.accessibilityTraits
 
-            if let item = item as? ESTabBarItem {
-                accessibilityTitle = item.accessibilityLabel ?? item.title ?? ""
-            }
-            if self.isMoreItem(idx) {
-                accessibilityTitle = NSLocalizedString("More_TabBarItem", bundle: Bundle(for:ESTabBarController.self), comment: "")
+            if item == selectedItem {
+                container.accessibilityTraits = container.accessibilityTraits.union(.selected)
             }
 
-            let formatString = NSLocalizedString(item == selectedItem ? "TabBarItem_Selected_AccessibilityLabel" : "TabBarItem_AccessibilityLabel",
-                                                 bundle: Bundle(for: ESTabBarController.self),
-                                                 comment: "")
-            container.accessibilityIdentifier = item.accessibilityIdentifier
-            container.accessibilityLabel = String(format: formatString, accessibilityTitle, idx + 1, tabBarItems.count)
+            if let explicitLabel = item.accessibilityLabel {
+                container.accessibilityLabel = explicitLabel
+                container.accessibilityHint = item.accessibilityHint ?? container.accessibilityHint
+            } else {
+                var accessibilityTitle = ""
+                if let item = item as? ESTabBarItem {
+                    accessibilityTitle = item.accessibilityLabel ?? item.title ?? ""
+                }
+                if self.isMoreItem(idx) {
+                    accessibilityTitle = NSLocalizedString("More_TabBarItem", bundle: Bundle(for:ESTabBarController.self), comment: "")
+                }
+                
+                let formatString = NSLocalizedString(item == selectedItem ? "TabBarItem_Selected_AccessibilityLabel" : "TabBarItem_AccessibilityLabel",
+                                                     bundle: Bundle(for: ESTabBarController.self),
+                                                     comment: "")
+                container.accessibilityLabel = String(format: formatString, accessibilityTitle, idx + 1, tabBarItems.count)
+            }
 
         }
     }