Updated the accessibility code to Unity 6.3

Author: Bianca Marina Stana

Assets/Scripts/Controls/MultiSelectDropdown.cs

@@ -2,13 +2,11 @@
 using System.Collections;
 using System.Collections.Generic;
 using System.Linq;
-using Unity.Samples.ScreenReader;
 using UnityEngine;
 using UnityEngine.UI;
 using UnityEngine.Events;
 using UnityEngine.EventSystems;
 using TMPro;
-using UnityEngine.Accessibility;
 
 namespace Unity.Samples.Controls
 {
@@ -1032,21 +1030,6 @@ public void Show()
                     continue;
                 }
 
-                if (i == 0)
-                {
-                    var acc = item.GetComponentInChildren<AccessibleToggle>();
-
-                    if (acc != null)
-                    {
-                        acc.label = data.text;
-
-                        if (acc.node != null)
-                        {
-                            AssistiveSupport.notificationDispatcher.SendLayoutChanged(acc.node);
-                        }
-                    }
-                }
-
                 // Automatically set up a toggle state change listener.
                 item.toggle.isOn = values.Contains(i);
                 item.toggle.onValueChanged.AddListener(_ => OnSelectItem(item.toggle));
@@ -1144,8 +1127,6 @@ public void Show()
             m_Template.gameObject.SetActive(false);
             itemTemplate.gameObject.SetActive(false);
 
-            AccessibilityManager.GetService<UGuiAccessibilityService>().RebuildHierarchy();
-
             m_Blocker = CreateBlocker(rootCanvas);
         }
 

Assets/Scripts/Gameplay/GameViewController.cs

@@ -146,7 +146,7 @@ void OnLetterCardsChanged()
 
             if (Gameplay.instance != null && Gameplay.instance.state != Gameplay.State.Stopped)
             {
-                this.DelayRefreshHierarchy(AccessibilityManager.GetService<UGuiAccessibilityService>());
+                AccessibilityManager.GetService<UGuiAccessibilityService>()?.RebuildHierarchy();
 
                 Invoke(nameof(MoveAccessibilityFocusOnClue), 1f);
             }
@@ -165,7 +165,7 @@ bool OnLetterCardSelected()
 
                 // When a letter card is selected, deactivate all accessibility nodes except the ones corresponding to
                 // the letter cards to allow the selected card to be moved correctly.
-                AccessibilityManager.GetService<UGuiAccessibilityService>().ActivateOtherAccessibilityNodes(false, letterCardContainer);
+                AccessibilityManager.GetService<UGuiAccessibilityService>()?.ActivateOtherAccessibilityNodes(false, letterCardContainer);
 
                 letterCard.SetDraggingVisuals(true);
                 SetLetterCardsAccessibilityLabel(false);
@@ -174,7 +174,7 @@ bool OnLetterCardSelected()
             {
                 m_AccessibilitySelectedCard = null;
 
-                AccessibilityManager.GetService<UGuiAccessibilityService>().ActivateOtherAccessibilityNodes(true, letterCardContainer);
+                AccessibilityManager.GetService<UGuiAccessibilityService>()?.ActivateOtherAccessibilityNodes(true, letterCardContainer);
 
                 letterCard.SetDraggingVisuals(false);
                 SetLetterCardsAccessibilityLabel(true);
@@ -234,7 +234,7 @@ void OnNodeFocusChanged(AccessibilityNode node)
         {
             if (node != null)
             {
-                var element = AccessibilityManager.GetService<UGuiAccessibilityService>().GetAccessibleElementForNode(node);
+                var element = AccessibilityManager.GetService<UGuiAccessibilityService>()?.GetAccessibleElementForNode(node);
                 m_AccessibilityFocusedCard = element != null ? element.GetComponent<LetterCard>() : null;
                 MoveSelectedCard();
             }
@@ -313,23 +313,23 @@ void MoveCard(bool shouldMoveLeft, int count)
                 // we need to recreate the whole hierarchy instead.
                 if (Application.platform == RuntimePlatform.IPhonePlayer)
                 {
-                    AccessibilityManager.GetService<UGuiAccessibilityService>().RebuildHierarchy();
+                    AccessibilityManager.GetService<UGuiAccessibilityService>()?.RebuildHierarchy();
                     m_WasHierarchyRefreshed = true;
 
                     // Add the node count to the element ID to match the ID of the node in the refreshed hierarchy,
                     // ensuring consistent focus even after rebuilding.
                     var nodeToFocusId = element.node.id + AccessibilityManager.hierarchy.rootNodes.Count;
                     nodeToFocusId += shouldMoveLeft ? -count : count;
 
-                    this.DelayFocusOnNode(nodeToFocusId);
+                    StartCoroutine(this.FocusOnNode(nodeToFocusId));
                 }
                 else
                 {
                     AccessibilityManager.hierarchy.MoveNode(element.node, element.node.parent,
                         element.transform.GetSiblingIndex());
 
                     // Only refresh the frames for now to leave the announcement request to be handled.
-                    this.DelayRefreshNodeFrames();
+                    StartCoroutine(this.RefreshNodeFrames());
 
                     AssistiveSupport.notificationDispatcher.SendLayoutChanged(element.node);
                 }

Assets/Scripts/Gameplay/PauseScreen.cs

@@ -28,7 +28,7 @@ void OnEnable()
         {
             // The pause screen is presented over the gameplay screen like a modal view, so all accessibility nodes
             // outside the pause screen should be deactivated while it is open.
-            AccessibilityManager.GetService<UGuiAccessibilityService>().ActivateOtherAccessibilityNodes(false, transform);
+            AccessibilityManager.GetService<UGuiAccessibilityService>()?.ActivateOtherAccessibilityNodes(false, transform);
 
             // When the pause screen opens, move the accessibility focus to its status text (which is also the first
             // accessibility node on the pause screen).