From 3347f4a0af49dc7fc801567c075c47e026fe4675 Mon Sep 17 00:00:00 2001
From: Kevin G Christiano <kevin.christiano@verizonwireless.com>
Date: Mon, 4 May 2020 15:02:17 -0400
Subject: [PATCH] accessibility changes

---
 .../CarouselIndicator/BarsIndicatorView.swift |  7 ++++--
 .../CarouselIndicator/CarouselIndicator.swift | 22 +++++++++++++++----
 .../NumericIndicatorView.swift                | 13 ++---------
 .../Strings/en.lproj/Localizable.strings      |  4 ++--
 .../Strings/es-MX.lproj/Localizable.strings   |  4 ++--
 .../Strings/es.lproj/Localizable.strings      |  4 ++--
 6 files changed, 31 insertions(+), 23 deletions(-)

diff --git a/MVMCoreUI/Atomic/Atoms/Views/CarouselIndicator/BarsIndicatorView.swift b/MVMCoreUI/Atomic/Atoms/Views/CarouselIndicator/BarsIndicatorView.swift
index acd7f5d0..42171934 100644
--- a/MVMCoreUI/Atomic/Atoms/Views/CarouselIndicator/BarsIndicatorView.swift
+++ b/MVMCoreUI/Atomic/Atoms/Views/CarouselIndicator/BarsIndicatorView.swift
@@ -105,9 +105,12 @@ open class BarsIndicatorView: CarouselIndicator {
         
         for i in 0..<numberOfPages {
             let bar = View()
+            bar.accessibilityTraits = .button
             bar.isAccessibilityElement = true
-            let accessibleLabel = ordinalFormatter.string(from: NSNumber(value: i + 1)) ?? ""
-            bar.accessibilityLabel = "\(accessibleLabel) page of \(numberOfPages) page"
+            if let accessibleValueFormat = accessibilityValueFormat, let accessibleIndex = ordinalFormatter.string(from: NSNumber(value: i + 1)) {
+                bar.accessibilityLabel = String(format: accessibleValueFormat, accessibleIndex, numberOfPages)
+            }
+            bar.accessibilityHint = MVMCoreUIUtility.hardcodedString(withKey: "AccTabHint")
             bar.widthAnchor.constraint(equalToConstant: BarsIndicatorView.indicatorBarWidth).isActive = true
             bar.backgroundColor = isEnabled ? (i == currentIndex ? currentIndicatorColor : indicatorColor) : disabledIndicatorColor
             let barHeight = i == currentIndex ? BarsIndicatorView.indicatorBarHeight.selected : BarsIndicatorView.indicatorBarHeight.unselected
diff --git a/MVMCoreUI/Atomic/Atoms/Views/CarouselIndicator/CarouselIndicator.swift b/MVMCoreUI/Atomic/Atoms/Views/CarouselIndicator/CarouselIndicator.swift
index bc33b200..ebebd047 100644
--- a/MVMCoreUI/Atomic/Atoms/Views/CarouselIndicator/CarouselIndicator.swift
+++ b/MVMCoreUI/Atomic/Atoms/Views/CarouselIndicator/CarouselIndicator.swift
@@ -85,6 +85,10 @@ open class CarouselIndicator: Control, CarouselPageControlProtocol {
         set { carouselIndicatorModel?.indicatorColor = Color(uiColor: newValue) }
     }
     
+    var accessibilityValueFormat: String? {
+        return MVMCoreUIUtility.hardcodedString(withKey: (carouselIndicatorModel?.accessibilityHasSlidesInsteadOfPage ?? false) ? "MVMCoreUIPageControlslides_currentpage_index" : "MVMCoreUIPageControl_currentpage_index")
+    }
+    
     //--------------------------------------------------
     // MARK: - Initializers
     //--------------------------------------------------
@@ -192,7 +196,7 @@ open class CarouselIndicator: Control, CarouselPageControlProtocol {
         currentIndex = model.currentIndex
         isEnabled = model.enabled
         
-        
+        adjustAccessibilityValue(of: currentIndex + 1, total: numberOfPages)
     }
     
     //--------------------------------------------------
@@ -209,11 +213,21 @@ open class CarouselIndicator: Control, CarouselPageControlProtocol {
         accessibilityAdjust(toPage: currentIndex - 1)
     }
     
+    func adjustAccessibilityValue(of index: Int, total: Int) {
+        
+        let ordinalFormatter = NumberFormatter()
+        ordinalFormatter.numberStyle = .ordinal
+        
+        guard let accessibleFormat = accessibilityValueFormat,
+            let accessibleIndex = ordinalFormatter.string(from: NSNumber(value: index))
+            else { return }
+        
+            accessibilityValue = String(format: accessibleFormat, accessibleIndex, total)
+    }
+    
     func accessibilityAdjust(toPage index: Int) {
         
-        if let accessibleValue = MVMCoreUIUtility.hardcodedString(withKey: (carouselIndicatorModel?.accessibilityHasSlidesInsteadOfPage ?? false) ? "MVMCoreUIPageControlslides_currentpage_index" : "MVMCoreUIPageControl_currentpage_index") {
-            accessibilityValue = String(format: accessibleValue, currentIndex + 1, numberOfPages)
-        }
+        adjustAccessibilityValue(of: index, total: numberOfPages)
         
         if (index < numberOfPages && index >= 0) || carouselIndicatorModel?.alwaysSendAction ?? false {
             carouselIndicatorModel?.animated = false
diff --git a/MVMCoreUI/Atomic/Atoms/Views/CarouselIndicator/NumericIndicatorView.swift b/MVMCoreUI/Atomic/Atoms/Views/CarouselIndicator/NumericIndicatorView.swift
index 2a09842d..d93d7709 100644
--- a/MVMCoreUI/Atomic/Atoms/Views/CarouselIndicator/NumericIndicatorView.swift
+++ b/MVMCoreUI/Atomic/Atoms/Views/CarouselIndicator/NumericIndicatorView.swift
@@ -17,6 +17,7 @@ open class NumericIndicatorView: CarouselIndicator {
     /// Text to display the current count of total pages for viewing.
     open var pageCount: Label = {
         let label = Label.commonLabelB2(true)
+        label.isAccessibilityElement = false
         label.setContentCompressionResistancePriority(.required, for: .vertical)
         label.textAlignment = .center
         return label
@@ -77,8 +78,6 @@ open class NumericIndicatorView: CarouselIndicator {
     open override func setupView() {
         super.setupView()
         
-        isAccessibilityElement = true
-        accessibilityTraits = .adjustable
         accessibilityHint = MVMCoreUIUtility.hardcodedString(withKey: "swipe_to_select_with_action_hint")
         addSubview(pageCount)
         addSubview(leftArrow)
@@ -121,15 +120,7 @@ open class NumericIndicatorView: CarouselIndicator {
     open override func updateUI(previousIndex oldIndex: Int, newIndex: Int, totalCount: Int, isAnimated: Bool) {
         
         pageCount.text = "\(newIndex + 1)/\(totalCount)"
-        pageCount.accessibilityValue = "Page \(newIndex + 1) of \(totalCount)"
+        adjustAccessibilityValue(of: newIndex + 1, total: totalCount)
         layoutIfNeeded()
     }
-    
-//    open override func accessibilityIncrement() {
-//        incrementCurrentIndex()
-//    }
-//    
-//    open override func accessibilityDecrement() {
-//        decrementCurrentIndex()
-//    }
 }
diff --git a/MVMCoreUI/SupportingFiles/Strings/en.lproj/Localizable.strings b/MVMCoreUI/SupportingFiles/Strings/en.lproj/Localizable.strings
index 48cbe3ce..25dd849b 100644
--- a/MVMCoreUI/SupportingFiles/Strings/en.lproj/Localizable.strings
+++ b/MVMCoreUI/SupportingFiles/Strings/en.lproj/Localizable.strings
@@ -68,8 +68,8 @@
 
 
 // MARK: Carousel
-"MVMCoreUIPageControl_currentpage_index" = "page %ld of %ld";
-"MVMCoreUIPageControlslides_currentpage_index" = "slide %ld of %ld";
+"MVMCoreUIPageControl_currentpage_index" = "page %@ of %d";
+"MVMCoreUIPageControlslides_currentpage_index" = "slide %@ of %d";
 
 
 // MARK: Styler
diff --git a/MVMCoreUI/SupportingFiles/Strings/es-MX.lproj/Localizable.strings b/MVMCoreUI/SupportingFiles/Strings/es-MX.lproj/Localizable.strings
index 93c5dda5..0a9eadb9 100644
--- a/MVMCoreUI/SupportingFiles/Strings/es-MX.lproj/Localizable.strings
+++ b/MVMCoreUI/SupportingFiles/Strings/es-MX.lproj/Localizable.strings
@@ -48,8 +48,8 @@
 "AccOff" = "apagado";
 "AccToggleHint" = "toca dos veces para alternar";
 // Carousel
-"MVMCoreUIPageControl_currentpage_index" = "página %ld de %ld";
-"MVMCoreUIPageControlslides_currentpage_index" = "diapositiva %ld of %ld";
+"MVMCoreUIPageControl_currentpage_index" = "página %@ de %d";
+"MVMCoreUIPageControlslides_currentpage_index" = "diapositiva %@ of %d";
 //Styler
 "CountDownDay" = " día";
 "CountDownHour" = " hora";
diff --git a/MVMCoreUI/SupportingFiles/Strings/es.lproj/Localizable.strings b/MVMCoreUI/SupportingFiles/Strings/es.lproj/Localizable.strings
index 053c4b02..bbc45f4a 100644
--- a/MVMCoreUI/SupportingFiles/Strings/es.lproj/Localizable.strings
+++ b/MVMCoreUI/SupportingFiles/Strings/es.lproj/Localizable.strings
@@ -50,8 +50,8 @@
 "AccOff" = "apagado";
 "AccToggleHint" = "toca dos veces para alternar";
 // Carousel
-"MVMCoreUIPageControl_currentpage_index" = "página %ld de %ld";
-"MVMCoreUIPageControlslides_currentpage_index" = "diapositiva %ld of %ld";
+"MVMCoreUIPageControl_currentpage_index" = "página %@ de %d";
+"MVMCoreUIPageControlslides_currentpage_index" = "diapositiva %@ of %d";
 //Styler
 "CountDownDay" = " día";
 "CountDownHour" = " hora";