From 9d15c7c3dbaed3ca82485f499a3f39cf00d6396d Mon Sep 17 00:00:00 2001
From: "Pfeil, Scott Robert" <scott.pfeil3@verizonwireless.com>
Date: Thu, 25 Jun 2020 10:56:49 -0400
Subject: [PATCH] update hint for deactivated.

---
 MVMCoreUI/Atomic/Atoms/Views/Toggle.swift                     | 2 ++
 .../ListRightVariableToggleAllTextAndLinks.swift              | 4 ++--
 .../SupportingFiles/Strings/en.lproj/Localizable.strings      | 2 +-
 .../SupportingFiles/Strings/es-MX.lproj/Localizable.strings   | 1 +
 .../SupportingFiles/Strings/es.lproj/Localizable.strings      | 1 +
 5 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/MVMCoreUI/Atomic/Atoms/Views/Toggle.swift b/MVMCoreUI/Atomic/Atoms/Views/Toggle.swift
index bfa5ba33..d4e090aa 100644
--- a/MVMCoreUI/Atomic/Atoms/Views/Toggle.swift
+++ b/MVMCoreUI/Atomic/Atoms/Views/Toggle.swift
@@ -64,6 +64,7 @@ public typealias ActionBlockConfirmation = () -> (Bool)
             changeStateNoAnimation(isEnabled ? isOn : false)
             backgroundColor = isEnabled ? (isOn ? containerTintColor.on : containerTintColor.off) : disabledTintColor.container
             knobView.backgroundColor = isEnabled ? (isOn ? knobTintColor.on : knobTintColor.off) : disabledTintColor.knob
+            accessibilityHint = MVMCoreUIUtility.hardcodedString(withKey: isEnabled ? "AccToggleHint" : "AccDisabled")
         }
     }
     
@@ -306,6 +307,7 @@ public typealias ActionBlockConfirmation = () -> (Bool)
     
     override open func accessibilityActivate() -> Bool {
         // Hold state in case User wanted isAnimated to remain off.
+        guard isUserInteractionEnabled == true else { return false }
         let isAnimatedState = isAnimated
         isAnimated = false
         sendActions(for: .touchUpInside)
diff --git a/MVMCoreUI/Atomic/Molecules/DesignedComponents/List/RightVariable/ListRightVariableToggleAllTextAndLinks.swift b/MVMCoreUI/Atomic/Molecules/DesignedComponents/List/RightVariable/ListRightVariableToggleAllTextAndLinks.swift
index ca2a3b92..a631616b 100644
--- a/MVMCoreUI/Atomic/Molecules/DesignedComponents/List/RightVariable/ListRightVariableToggleAllTextAndLinks.swift
+++ b/MVMCoreUI/Atomic/Molecules/DesignedComponents/List/RightVariable/ListRightVariableToggleAllTextAndLinks.swift
@@ -46,8 +46,6 @@ import Foundation
         super.setupView()
         addMolecule(stack)
         stack.restack()
-        accessibilityHint = toggle.accessibilityHint
-        accessibilityTraits = toggle.accessibilityTraits
     }
     
     //-----------------------------------------------------
@@ -81,6 +79,8 @@ import Foundation
     }
     
     func updateAccessibilityLabel() {
+        accessibilityHint = toggle.accessibilityHint
+        accessibilityTraits = toggle.accessibilityTraits
         accessibilityValue = toggle.accessibilityValue
         let linkShowing = eyebrowHeadlineBodyLink.link.titleLabel?.text?.count ?? 0 > 0
         if !linkShowing && accessoryView == nil {
diff --git a/MVMCoreUI/SupportingFiles/Strings/en.lproj/Localizable.strings b/MVMCoreUI/SupportingFiles/Strings/en.lproj/Localizable.strings
index da55d597..74b907e3 100644
--- a/MVMCoreUI/SupportingFiles/Strings/en.lproj/Localizable.strings
+++ b/MVMCoreUI/SupportingFiles/Strings/en.lproj/Localizable.strings
@@ -9,7 +9,7 @@
 // MARK: Accessibility
 "AccCloseButton" = "Close";
 "swipe_to_select_with_action_hint" = "swipe up or down to select action, then double tap to select.";
-
+"AccDisabled" = "Disabled";
 
 // MARK: Tab
 "AccTab" = ", tab";
diff --git a/MVMCoreUI/SupportingFiles/Strings/es-MX.lproj/Localizable.strings b/MVMCoreUI/SupportingFiles/Strings/es-MX.lproj/Localizable.strings
index 0a9eadb9..b3b6298c 100644
--- a/MVMCoreUI/SupportingFiles/Strings/es-MX.lproj/Localizable.strings
+++ b/MVMCoreUI/SupportingFiles/Strings/es-MX.lproj/Localizable.strings
@@ -8,6 +8,7 @@
 
 // Accessibility
 "swipe_to_select_with_action_hint" = "deslízate hacia arriba o hacia abajo para seleccionar la acción, luego toca dos veces para seleccionar.";
+"AccDisabled" = "desactivado";
 
 "AccCloseButton" = "Cerrar";
 // Tab
diff --git a/MVMCoreUI/SupportingFiles/Strings/es.lproj/Localizable.strings b/MVMCoreUI/SupportingFiles/Strings/es.lproj/Localizable.strings
index bbc45f4a..8e0dbd02 100644
--- a/MVMCoreUI/SupportingFiles/Strings/es.lproj/Localizable.strings
+++ b/MVMCoreUI/SupportingFiles/Strings/es.lproj/Localizable.strings
@@ -8,6 +8,7 @@
 
 // Accessibility
 "swipe_to_select_with_action_hint" = "deslízate hacia arriba o hacia abajo para seleccionar la acción, luego toca dos veces para seleccionar.";
+"AccDisabled" = "desactivado";
 
 "AccCloseButton" = "Cerrar";
 // Tab