From a3af344991adecf206315f3ed13ef93d5c5f7897 Mon Sep 17 00:00:00 2001
From: Kevin G Christiano <kevin.christiano@verizonwireless.com>
Date: Wed, 1 Apr 2020 09:15:07 -0400
Subject: [PATCH] little more added

---
 .../Atoms/Views/CarouselIndicator/BarsIndicatorView.swift    | 5 +++++
 .../Views/CarouselIndicator/CarouselIndicatorModel.swift     | 3 +--
 .../Atoms/Views/CarouselIndicator/NumericIndicatorView.swift | 4 ++--
 3 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/MVMCoreUI/Atomic/Atoms/Views/CarouselIndicator/BarsIndicatorView.swift b/MVMCoreUI/Atomic/Atoms/Views/CarouselIndicator/BarsIndicatorView.swift
index f925a02a..8625bfb1 100644
--- a/MVMCoreUI/Atomic/Atoms/Views/CarouselIndicator/BarsIndicatorView.swift
+++ b/MVMCoreUI/Atomic/Atoms/Views/CarouselIndicator/BarsIndicatorView.swift
@@ -105,9 +105,14 @@ open class BarsIndicatorView: CarouselIndicator {
         
         var bars = [(View, NSLayoutConstraint)]()
         
+        let ordinalFormatter = NumberFormatter()
+        ordinalFormatter.numberStyle = .ordinal
+        
         for i in 0..<numberOfPages {
             let bar = View()
             bar.isAccessibilityElement = true
+            let accessibleLabel = ordinalFormatter.string(from: NSNumber(value: i + 1)) ?? ""
+            bar.accessibilityLabel = "\(accessibleLabel) page of \(numberOfPages) page"
             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/CarouselIndicatorModel.swift b/MVMCoreUI/Atomic/Atoms/Views/CarouselIndicator/CarouselIndicatorModel.swift
index 3705beaa..9eac6fd6 100644
--- a/MVMCoreUI/Atomic/Atoms/Views/CarouselIndicator/CarouselIndicatorModel.swift
+++ b/MVMCoreUI/Atomic/Atoms/Views/CarouselIndicator/CarouselIndicatorModel.swift
@@ -22,7 +22,7 @@ open class CarouselIndicatorModel: CarouselPagingModelProtocol, MoleculeModelPro
     public var moleculeName: String?
     public var numberOfPages: Int = 0
     
-    // Sets the current Index to focus on.
+    /// Sets the current Index to focus on.
     public var currentIndex: Int = 0
     public var isAnimated: Bool = true
     public var hidesForSinglePage: Bool = false
@@ -52,7 +52,6 @@ open class CarouselIndicatorModel: CarouselPagingModelProtocol, MoleculeModelPro
         case isEnabled
         case disabledIndicatorColor
         case indicatorColor
-        case currentIndicatorColor
         case position
     }
     
diff --git a/MVMCoreUI/Atomic/Atoms/Views/CarouselIndicator/NumericIndicatorView.swift b/MVMCoreUI/Atomic/Atoms/Views/CarouselIndicator/NumericIndicatorView.swift
index 628e1fc6..8d00786c 100644
--- a/MVMCoreUI/Atomic/Atoms/Views/CarouselIndicator/NumericIndicatorView.swift
+++ b/MVMCoreUI/Atomic/Atoms/Views/CarouselIndicator/NumericIndicatorView.swift
@@ -27,7 +27,7 @@ open class NumericIndicatorView: CarouselIndicator {
         let arrow = Arrow(model: ArrowModel(), degrees: 180)
         arrow.isAccessibilityElement = true
         arrow.accessibilityLabel = "Left arrow"
-        arrow.accessibilityHint = "Double tap to swipe carousel left"
+        arrow.accessibilityHint = MVMCoreUIUtility.hardcodedString(withKey: "radio_action_hint")
         arrow.pinHeightAndWidth()
         return arrow
     }()
@@ -36,7 +36,7 @@ open class NumericIndicatorView: CarouselIndicator {
         let arrow = Arrow(model: ArrowModel())
         arrow.isAccessibilityElement = true
         arrow.accessibilityLabel = "Right arrow"
-        arrow.accessibilityHint = "Double tap to swipe carousel right"
+        arrow.accessibilityHint = MVMCoreUIUtility.hardcodedString(withKey: "radio_action_hint")
         arrow.pinHeightAndWidth()
         return arrow
     }()