From b79ddf734602ae4028591ff3b17575e22e34db86 Mon Sep 17 00:00:00 2001
From: Kevin G Christiano <kevin.christiano@verizonwireless.com>
Date: Mon, 13 Jan 2020 12:45:49 -0500
Subject: [PATCH] additions for accessibility.

---
 MVMCoreUI/Atoms/TextFields/DigitEntryField.swift | 11 ++++++++---
 MVMCoreUI/Atoms/TextFields/EntryField.swift      |  8 ++------
 MVMCoreUI/Atoms/TextFields/TextEntryField.swift  | 16 ++++++++--------
 3 files changed, 18 insertions(+), 17 deletions(-)

diff --git a/MVMCoreUI/Atoms/TextFields/DigitEntryField.swift b/MVMCoreUI/Atoms/TextFields/DigitEntryField.swift
index 734dacea..4cd9b67a 100644
--- a/MVMCoreUI/Atoms/TextFields/DigitEntryField.swift
+++ b/MVMCoreUI/Atoms/TextFields/DigitEntryField.swift
@@ -25,8 +25,14 @@ import UIKit
             if numberOfDigits > 0 {
                 var digitBoxes = [DigitBox]()
                 
-                for _ in 0..<numberOfDigits {
-                    digitBoxes.append(createDigitField())
+                let ordinalFormatter = NumberFormatter()
+                ordinalFormatter.numberStyle = .ordinal
+                
+                for i in 0..<numberOfDigits {
+                    let newDigitBox = createDigitField()
+                    let accessibileLabel = ordinalFormatter.string(from: NSNumber(value: i + 1)) ?? ""
+                    newDigitBox.digitField.accessibilityLabel = "\(accessibileLabel) field of \(numberOfDigits) digit fields"
+                    digitBoxes.append(newDigitBox)
                 }
                 
                 self.digitBoxes = digitBoxes
@@ -218,7 +224,6 @@ import UIKit
         
         if !self.digitBoxes.isEmpty {
             self.digitBoxes.forEach { $0.updateView(size) }
-//            self.layoutIfNeeded()
         }
         layoutIfNeeded()
     }
diff --git a/MVMCoreUI/Atoms/TextFields/EntryField.swift b/MVMCoreUI/Atoms/TextFields/EntryField.swift
index 8756d4f5..7e40feba 100644
--- a/MVMCoreUI/Atoms/TextFields/EntryField.swift
+++ b/MVMCoreUI/Atoms/TextFields/EntryField.swift
@@ -117,12 +117,8 @@ import UIKit
         get { return feedbackLabel.text }
         set (newFeedback) {
             feedbackLabel.text = newFeedback
-            
-            DispatchQueue.main.async { [weak self] in
-                guard let self = self else { return }
-                
-                self.entryFieldContainer.refreshUI()
-            }
+            feedbackLabel.accessibilityElementsHidden = feedbackLabel.text?.isEmpty ?? true
+            entryFieldContainer.refreshUI()
         }
     }
     
diff --git a/MVMCoreUI/Atoms/TextFields/TextEntryField.swift b/MVMCoreUI/Atoms/TextFields/TextEntryField.swift
index 0c004509..5ff12679 100644
--- a/MVMCoreUI/Atoms/TextFields/TextEntryField.swift
+++ b/MVMCoreUI/Atoms/TextFields/TextEntryField.swift
@@ -71,7 +71,13 @@ import UIKit
     public override var showError: Bool {
         get { return super.showError }
         set (error) {
-            textField.accessibilityValue = nil
+            
+            if error {
+                textField.accessibilityValue = String(format: MVMCoreUIUtility.hardcodedString(withKey: "textfield_error_message") ?? "", textField.text ?? "", errorMessage ?? "")
+            } else {
+                textField.accessibilityValue = nil
+            }
+            
             super.showError = error
         }
     }
@@ -93,13 +99,7 @@ import UIKit
     //--------------------------------------------------
     
     public var validationBlock: ((_ value: String?) -> Bool)?
-    
-    public override var errorMessage: String? {
-        didSet {
-            textField.accessibilityValue = String(format: MVMCoreUIUtility.hardcodedString(withKey: "textfield_error_message") ?? "", textField.text ?? "", errorMessage ?? "")
-        }
-    }
-    
+
     //--------------------------------------------------
     // MARK: - Delegate Properties
     //--------------------------------------------------