Minor improvements

# Conflicts:
#	Assets/Scripts/Screen Reader/UITk/VisualTreeAccessibilityUpdater.cs

Author: Bianca Marina Stana

Assets/Scripts/Gameplay/GameViewController.cs

@@ -304,7 +304,7 @@ void MoveCard(bool shouldMoveLeft, int count)
 
                 // Make the letter uppercase to ensure correct phonetic pronunciation.
                 // TODO: This should be localized.
-                var announcement = $"Moved {draggable.name.ToUpper()} {(shouldMoveLeft ? "before" : "after")} {otherSibling.name.ToUpper()}";
+                var announcement = $"Moved \"{draggable.name.ToUpper()}\" {(shouldMoveLeft ? "before" : "after")} \"{otherSibling.name.ToUpper()}\"";
 
                 // Announce that the card was moved.
                 AssistiveSupport.notificationDispatcher.SendAnnouncement(announcement);

Assets/Scripts/Screen Reader/AccessibilityManager.cs

@@ -215,7 +215,7 @@ void OnDisable()
 
         void OnSceneLoaded(Scene scene, LoadSceneMode mode)
         {
-            StartCoroutine(DelayRebuildHierarchy(scene));
+            RebuildHierarchyForScene(scene);
         }
 
         void OnSceneUnloaded(Scene scene)
@@ -274,20 +274,17 @@ public static void RebuildHierarchy(AccessibilityService service)
 
             if (lastLoadedScene.IsValid())
             {
-                s_Instance.StartCoroutine(s_Instance.DelayRebuildHierarchy(lastLoadedScene, service));
+                s_Instance.RebuildHierarchyForScene(lastLoadedScene, service);
             }
         }
 
-        IEnumerator DelayRebuildHierarchy(Scene scene, AccessibilityService service = null)
+        void RebuildHierarchyForScene(Scene scene, AccessibilityService service = null)
         {
             if (!Application.isEditor && !AssistiveSupport.isScreenReaderEnabled)
             {
-                yield break;
+                return;
             }
 
-            // Wait for the end frame before generating the hierarchy to make sure the layout has been computed.
-            yield return new WaitForEndOfFrame();
-
             if (service == null)
             {
                 // Rebuild the whole hierarchy (for all registered services).

Assets/Scripts/Screen Reader/UGUI/AccessibleScrollview.cs

@@ -27,7 +27,7 @@ void Start()
             label ??= "Scroll View";
 
 #if UNITY_6000_3_OR_NEWER
-            role = AccessibilityRole.Container;
+            role = AccessibilityRole.ScrollView;
 #else // UNITY_6000_3_OR_NEWER
             // The scroll view should not be accessible (i.e. focusable with the screen reader) on mobile platforms.
             // The purpose of this component is to automatically scroll to the focused node inside the scroll view if

Assets/Scripts/Screen Reader/UITk/VisualTreeAccessibilityUpdater.cs

@@ -187,19 +187,19 @@ VisualElementAccessibilityHandler CreateHandler(VisualElement element)
 
         void InsertNode(VisualElementAccessibilityHandler parentHandler, VisualElementAccessibilityHandler accHandler)
         {
-            var p = parentHandler;
-            var parentNode = p?.node;
-
-            // Keep track of insertion index for each parent node.
-            var index = p?.nextInsertionIndex ?? m_RootNextInsertionIndex;
-            var node = hierarchy.InsertNode(index, accHandler.ownerElement.name, parentNode);
+            // Keep track of the insertion index for each parent node.
+            var index = parentHandler?.nextInsertionIndex ?? m_RootNextInsertionIndex;
+            var label = accHandler.ownerElement.name;
+            var parentNode = parentHandler?.node;
 
-            accHandler.node = node;
-            accHandler.change = VisualElementAccessibilityHandler.k_AccessibilityChange;
+            var node = hierarchy.InsertNode(index, label, parentNode);
 
             node.label = accHandler.label;
             node.role = accHandler.role;
 
+            accHandler.node = node;
+            accHandler.change = VisualElementAccessibilityHandler.k_AccessibilityChange;
+
             m_HandlersForNodes[node] = accHandler;
 
             if (p != null)
@@ -573,8 +573,6 @@ void Update(VisualElement visualTree)
                     shouldSendNotification = true;
                 }
 
-                AssistiveSupport.activeHierarchy ??= m_AccessibilityService.hierarchy.mainHierarchy;
-
                 m_Notification = NotificationType.None;
                 ResetAllInsertionIndex();
 

Assets/Scripts/UITk/Card.cs

@@ -705,7 +705,7 @@ void MoveCard(bool shouldMoveLeft)
                 var otherSibling = this[otherSiblingIndex];
 
                 // TODO: This should be localized.
-                var message = $"Moved {draggable.name} {(shouldMoveLeft ? "before" : "after")} {otherSibling.name}";
+                var message = $"Moved \"{draggable.name}\" {(shouldMoveLeft ? "before" : "after")} \"{otherSibling.name}\"";
 
                 // Announce that the card was moved.
                 AssistiveSupport.notificationDispatcher.SendAnnouncement(message);

Assets/Scripts/UITk/MainView.cs

@@ -601,7 +601,7 @@ void ShowResults(int orderedWordCount, int totalWordCount)
             // m_ClueLabel.style.display = DisplayStyle.None;
 
             // Ensure the clue label always the same space in the view so do not hide it.
-            m_ClueLabel.text = " ";
+            m_ClueLabel.text = "";
             m_ClueLabel.style.visibility = Visibility.Hidden;
         }
 
@@ -679,7 +679,7 @@ void OnLetterCardsChanged()
             {
                 var card = new UITkLetterCard();
                 m_LetterCardContainer.Add(card);
-                card.text = letterCard.letter.ToString();
+                card.text = letterCard.letter.ToString().ToUpper();
                 card.name = letterCard.letter.ToString();
                 card.GetOrCreateAccessibleProperties().label = card.text;
                 card.dropped += (oldIndex, newIndex) =>
@@ -698,7 +698,7 @@ void StateTheLetters()
         {
             // TODO: This should be localized.
             var listCardMessage = "The letters are now " + string.Join(", ",
-                m_Model.letterCards.Select(c => c.letter).ToArray());
+                m_Model.letterCards.Select(c => "\"" + c.letter + "\"").ToArray());
             AssistiveSupport.notificationDispatcher.SendAnnouncement(listCardMessage);
             Debug.Log(listCardMessage);
         }
@@ -824,13 +824,14 @@ void MoveCard(bool shouldMoveLeft, int count = 1)
             if (moved)
             {
                 // TODO: This should be localized.
-                var message = $"Moved {selectedCardText} {(shouldMoveLeft ? "before" : "after")} {otherCardText}";
+                var message = $"Moved \"{selectedCardText}\" {(shouldMoveLeft ? "before" : "after")} " +
+                    $"\"{otherCardText}\"";
 
                 // Announce that the card was moved. Give a bit of time for the layout change notification to be
                 // processed first so that the announcement is not interrupted by the focus change.
                 m_MainView.schedule.Execute(() =>
                     AssistiveSupport.notificationDispatcher.SendAnnouncement(message)
-                ).ExecuteLater(200);
+                    ).ExecuteLater(200);
             }
 
             /*var accElement = draggable.transform.GetComponent<AccessibleElement>();
@@ -840,7 +841,7 @@ void MoveCard(bool shouldMoveLeft, int count = 1)
                 var index = draggable.transform.GetSiblingIndex();
                 var otherSiblingIndex = shouldMoveLeft ? index + 1 : index - 1;
                 var otherSibling = draggable.transform.parent.GetChild(otherSiblingIndex);
-                var message = $"Moved {draggable.name} {(shouldMoveLeft ? "before" : "after")} {otherSibling.name}";
+                var message = $"Moved \"{draggable.name}\" {(shouldMoveLeft ? "before" : "after")} \"{otherSibling.name}\"";
 
                 // Announce that the card was moved.
                 AssistiveSupport.notificationDispatcher.SendAnnouncement(message);