Merge branch 'feature/accessible_radio_state' into 'develop'

Accessible radio state

See merge request BPHV_MIPS/mvm_core_ui!408

MVMCoreUI/Atomic/Atoms/Selectors/RadioButton.swift

@@ -19,13 +19,14 @@ import UIKit
             widthConstraint?.constant = diameter
         }
     }
-
+    
     public override var isSelected: Bool {
         didSet {
             radioModel?.state = isSelected
+            updateAccessibilityLabel()
         }
     }
-
+    
     public var enabledColor: UIColor = .mvmBlack
     public var disabledColor: UIColor = .mvmCoolGray3
     public var delegateObject: MVMCoreUIDelegateObject?
@@ -39,12 +40,12 @@ import UIKit
     }()
     
     lazy public var radioButtonSelectionHelper: RadioButtonSelectionHelper? = {
-        if let radioGroupName = radioGroupName,
-            let radioButtonModel = delegateObject?.formHolderDelegate?.formValidator?.radioButtonsModelByGroup[radioGroupName] {
-            return radioButtonModel
-        } else {
-            return nil
-        }
+        
+        guard let radioGroupName = radioGroupName,
+            let radioButtonModel = delegateObject?.formHolderDelegate?.formValidator?.radioButtonsModelByGroup[radioGroupName]
+            else { return nil }
+        
+        return radioButtonModel
     }()
     
     public override var isEnabled: Bool {
@@ -118,6 +119,18 @@ import UIKit
         return radioModel?.fieldValue
     }
     
+    //--------------------------------------------------
+    // MARK: - Methods
+    //--------------------------------------------------
+    
+    /// Adjust accessibility label based on state of RadioButton.
+    func updateAccessibilityLabel() {
+        
+        if let state = MVMCoreUIUtility.hardcodedString(withKey: isSelected ? "radio_selected_state" : "radio_not_selected_state") {
+            accessibilityLabel = String(format: MVMCoreUIUtility.hardcodedString(withKey: "radio_desc_state") ?? "%@%@", "", state)
+        }
+    }
+    
     //--------------------------------------------------
     // MARK: - MVMViewProtocol
     //--------------------------------------------------
@@ -136,14 +149,15 @@ import UIKit
         isAccessibilityElement = true
         accessibilityTraits = .button
         accessibilityHint = MVMCoreUIUtility.hardcodedString(withKey: "radio_action_hint")
+        updateAccessibilityLabel()
     }
     
     public override func set(with model: MoleculeModelProtocol, _ delegateObject: MVMCoreUIDelegateObject?, _ additionalData: [AnyHashable: Any]?) {
         super.set(with: model, delegateObject, additionalData)
+        self.delegateObject = delegateObject
         
         guard let model = model as? RadioButtonModel else { return }
         
-        self.delegateObject = delegateObject
         isSelected = model.state
         isEnabled = model.enabled
         RadioButtonSelectionHelper.setupForRadioButtonGroup(model, self, delegateObject: delegateObject)