Cleaned up some more code

Author: Bianca Marina Stana

Assets/Scripts/Gameplay/GameViewController.cs

@@ -49,6 +49,9 @@ class GameViewController : MonoBehaviour
         /// </summary>
         bool m_WasHierarchyRefreshed;
 
+        const string k_LetterCardHint = "Double tap to start moving";
+        const string k_SuccessAnnouncement = "Bravo! You found the correct word.";
+
         void OnEnable()
         {
             m_Model.letterCardsChanged += OnLetterCardsChanged;
@@ -140,7 +143,7 @@ void OnLetterCardsChanged()
 
                 var element = card.AddComponent<AccessibleElement>();
                 element.label = letterCardModel.letter.ToString();
-                element.hint = "Double tap to start moving.";
+                element.hint = k_LetterCardHint;
                 element.selected += OnLetterCardSelected;
             }
 
@@ -202,9 +205,9 @@ IEnumerator DelayWordReorderingCompleted()
                 FadeSuccessImageIn(fadeDuration);
 
                 const float announcementDelay = 1f;
-                const string successAnnouncement = "Bravo! You found the correct word.";
+
                 yield return new WaitForSeconds(announcementDelay);
-                AssistiveSupport.notificationDispatcher.SendAnnouncement(successAnnouncement);
+                AssistiveSupport.notificationDispatcher.SendAnnouncement(k_SuccessAnnouncement);
 
                 const float imageDuration = 2f;
                 const float fadeOutDelay = imageDuration - announcementDelay - fadeDuration;
@@ -281,7 +284,7 @@ void SetLetterCardsAccessibilityLabel(bool hasLabel)
             {
                 var element = letterCardTransform.GetComponent<AccessibleElement>();
                 element.label = hasLabel ? letterCardTransform.name : null;
-                element.hint = hasLabel ? "Double tap to start moving." : null;
+                element.hint = hasLabel ? k_LetterCardHint : null;
                 element.SetNodeProperties();
             }
         }

Assets/Scripts/Screen Reader/AccessibilityManager.cs

@@ -197,10 +197,7 @@ void OnEnable()
 
             // Generate the accessibility hierarchy for the current scene and set it to AssistiveSupport.activeHierarchy
             // so that the screen reader can use it.
-            var lastLoadedScene = GetLastLoadedScene();
-
-            GenerateHierarchy(lastLoadedScene);
-            AssistiveSupport.activeHierarchy = hierarchy;
+            RebuildHierarchy();
         }
 
         void OnDisable()

Assets/Scripts/Screen Reader/UITk/Handlers/BaseFieldHandler.cs

@@ -8,14 +8,13 @@ class BaseFieldHandler<TValueType> : VisualElementAccessibilityHandler
     {
         public override string GetLabel()
         {
-            var field = ownerElement as BaseField<TValueType>;
-            return field?.label;
+            return (ownerElement as BaseField<TValueType>)?.label;
         }
 
         public override string GetValue()
         {
             var field = ownerElement as BaseField<TValueType>;
-            return "" + field.value;
+            return field == null ? "" : $"{field.value}";
         }
 
         protected override void BindToElement(VisualElement ve)

Assets/Scripts/Screen Reader/UITk/Handlers/ButtonHandler.cs

@@ -9,8 +9,7 @@ class ButtonHandler : VisualElementAccessibilityHandler
     {
         public override string GetLabel()
         {
-            var button = ownerElement as Button;
-            return button?.text;
+            return (ownerElement as Button)?.text;
         }
 
         protected override void BindToElement(VisualElement ve)

Assets/Scripts/Screen Reader/UITk/Handlers/DropdownFieldHandler.cs

@@ -10,12 +10,13 @@ class DropdownFieldHandler : BaseFieldHandler<string>
     {
         bool m_HasPendingCheck;
 
-        
+        const string k_Hint = "Double tap to expand options.";
+
         public override string GetHint()
         {
-            return "Double tap to expand";
+            return k_Hint;
         }
-        
+
         protected override void BindToElement(VisualElement element)
         {
             base.BindToElement(element);

Assets/Scripts/Screen Reader/UITk/Handlers/LabelHandler.cs

@@ -10,8 +10,7 @@ class LabelHandler : VisualElementAccessibilityHandler
         public override AccessibilityRole GetRole() => AccessibilityRole.StaticText;
         public override string GetLabel()
         {
-            var label = ownerElement as Label;
-            return label?.text;
+            return (ownerElement as Label)?.text;
         }
     }
 }

Assets/Scripts/Screen Reader/UITk/Handlers/ListViewHandler.cs

@@ -13,10 +13,7 @@ class ListViewItemHandler : VisualElementAccessibilityHandler
     {
         public override string GetLabel()
         {
-            var listViewItem = ownerElement;
-            var label = listViewItem.Q<Label>();
-
-            return label?.text;
+            return ownerElement.Q<Label>()?.text;
         }
     }
 

Assets/Scripts/Screen Reader/UITk/Handlers/SliderHandler.cs

@@ -15,7 +15,11 @@ public BaseSliderHandler()
 
         public void Step(bool incr)
         {
-            var slider = ownerElement as Slider;
+            if (ownerElement is not Slider slider)
+            {
+                return;
+            }
+
             var step = (slider.highValue - slider.lowValue) / 10f;
 
             if (!incr)

Assets/Scripts/Screen Reader/UITk/Handlers/TabViewHandler.cs

@@ -23,8 +23,7 @@ protected override void UnbindFromElement(VisualElement ve)
 
         public override string GetLabel()
         {
-            var index = ownerElement.parent.IndexOf(ownerElement);
-            return $"tab {index} {m_Tab.label}";
+            return m_Tab.label;
         }
     }
 

Assets/Scripts/Screen Reader/UITk/Handlers/TextFieldHandler.cs

@@ -10,12 +10,15 @@ class TextFieldFieldHandler : BaseFieldHandler<string>
         public override string GetValue()
         {
             var textField = ownerElement as TextField;
-            
-            if (string.IsNullOrEmpty(textField.value))
-                return ownerElement is TextField tf ? tf.textEdition.placeholder : textField.value;
+
+            if (string.IsNullOrEmpty(textField?.value))
+            {
+                return ownerElement is TextField tf ? tf.textEdition.placeholder : null;
+            }
+
             return base.GetValue();
         }
-        
+
         public override AccessibilityRole GetRole()
         {
             return AccessibilityRole.TextField;