Cleaned up some code

# Conflicts:
#	Assets/Resources/UITk/MainView.uxml
#	Assets/Scripts/Controls/MultiSelectDropdown.cs
#	Assets/Scripts/Localization/LocalizedStringList.cs
#	Assets/Scripts/Screen Reader/AccessibilityManager.cs
#	Assets/Scripts/Screen Reader/AccessibilityService.cs
#	Assets/Scripts/Screen Reader/UGUI/UGuiAccessibilityService.cs
#	Assets/Scripts/UITk/Controls/StackView.cs

Author: Bianca Marina Stana

Assets/Scripts/Controls/MultiSelectDropdown.cs

@@ -613,7 +613,7 @@ protected override void Awake()
             {
                 return;
             }
-#endif
+#endif // UNITY_EDITOR
 
             if (m_CaptionImage)
             {
@@ -645,7 +645,7 @@ protected override void OnValidate()
 
             RefreshShownValue();
         }
-#endif
+#endif // UNITY_EDITOR
 
         protected override void OnDisable()
         {
@@ -1335,7 +1335,12 @@ void AlphaFadeList(float duration, float start, float end)
                 return;
             }
 
-            var tween = new FloatTween {duration = duration, startValue = start, targetValue = end};
+            var tween = new FloatTween
+            {
+                duration = duration,
+                startValue = start,
+                targetValue = end
+            };
             tween.AddOnChangedCallback(SetAlpha);
             tween.ignoreTimeScale = true;
             GetOrCreateAlphaTweenRunner().StartTween(tween);

Assets/Scripts/Localization/LocalizedStringList.cs

@@ -22,7 +22,7 @@ protected override BindingResult Update(in BindingContext context)
             {
                 LocaleOverride = LocalizationSettings.ProjectLocale;
             }
-#endif
+#endif // UNITY_EDITOR
 
             if (!CurrentLoadingOperationHandle.IsDone)
             {

Assets/Scripts/Screen Reader/AccessibilityManager.cs

@@ -27,11 +27,6 @@ public class AccessibilityManager : MonoBehaviour
         /// </summary>
         AccessibilityHierarchy m_Hierarchy;
 
-        /// <summary>
-        /// The instance of the AccessibilityManager in the scene.
-        /// </summary>
-        public static AccessibilityManager instance => s_Instance;
-
         /// <summary>
         /// Tracks the previous screen orientation (portrait/landscape) to allow the layout to be recalculated on
         /// orientation changes. This is necessary for the calculated accessibility frames to be correct.
@@ -52,11 +47,6 @@ public static AccessibilityHierarchy hierarchy
             }
         }
 
-        /// <summary>
-        /// Returns the list of registered accessibility services.
-        /// </summary>
-        public static IReadOnlyList<AccessibilityService> services => s_Instance?.m_RegisteredServices.AsReadOnly();
-
         /// <summary>
         /// Event triggered when the hierarchy is refreshed to allow components to be able to execute actions when that
         /// happens (e.g. focusing the dropdown after it opens).

Assets/Scripts/Screen Reader/AccessibilityService.cs

@@ -16,12 +16,12 @@ public abstract class AccessibilityService
         /// The priority of the service. Higher priority services will have their nodes added to the accessibility
         /// hierarchy first.
         /// </summary>
-        public int servicePriority { get; protected set; }
+        public int servicePriority { get; }
 
         /// <summary>
         /// The name of the system
         /// </summary>
-        public string serviceName { get; protected set; }
+        public string serviceName { get; }
 
         /// <summary>
         /// Constructor for the accessibility service.

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

@@ -82,21 +82,32 @@ protected override void UnbindFromControl()
         {
             if (m_Toggle != null)
             {
-                selected -= OnSelected;
-
                 m_Toggle.onValueChanged.RemoveListener(UpdateValue);
+
+                selected -= OnSelected;
             }
         }
 
-        bool OnSelected()
+        bool IsInsideDropdown()
         {
-            if (m_Toggle.IsActive() && m_Toggle.IsInteractable())
+            var currentTransform = transform.parent;
+
+            // Traverse up the parent hierarchy.
+            while (currentTransform != null)
             {
-                m_Toggle.isOn = !m_Toggle.isOn;
-                return true;
+                // Check if the current parent has a dropdown component.
+                if (currentTransform.GetComponent<MultiSelectDropdown>() != null ||
+                    currentTransform.GetComponent<TMP_Dropdown>() != null ||
+                    currentTransform.GetComponent<Dropdown>() != null)
+                {
+                    return true; // Found the dropdown.
+                }
+
+                // Move to the next parent.
+                currentTransform = currentTransform.parent;
             }
 
-            return false;
+            return false; // No dropdown found.
         }
 
         void UpdateValue(bool newValue)
@@ -113,26 +124,15 @@ void UpdateValue(bool newValue)
             SetNodeProperties();
         }
 
-        bool IsInsideDropdown()
+        bool OnSelected()
         {
-            var currentTransform = transform.parent;
-
-            // Traverse up the parent hierarchy.
-            while (currentTransform != null)
+            if (m_Toggle.IsActive() && m_Toggle.IsInteractable())
             {
-                // Check if the current parent has a dropdown component.
-                if (currentTransform.GetComponent<MultiSelectDropdown>() != null ||
-                    currentTransform.GetComponent<TMP_Dropdown>() != null ||
-                    currentTransform.GetComponent<Dropdown>() != null)
-                {
-                    return true; // Found the dropdown.
-                }
-
-                // Move to the next parent.
-                currentTransform = currentTransform.parent;
+                m_Toggle.isOn = !m_Toggle.isOn;
+                return true;
             }
 
-            return false; // No dropdown found.
+            return false;
         }
     }
 }

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

@@ -32,10 +32,10 @@ struct HierarchyItem
         Dictionary<AccessibilityNode, AccessibleElement> m_ElementForNodeMap = new();
 
         /// <summary>
-        /// Tracks the previous screen orientation (portrait/landscape) to allow the layout to be recalculated on
-        /// orientation changes. This is necessary for the calculated accessibility frames to be correct.
+        /// Event triggered when the hierarchy is refreshed to allow components to be able to execute actions when that
+        /// happens (e.g. focusing the dropdown after it opens).
         /// </summary>
-        ScreenOrientation m_PreviousOrientation;
+        public static event Action hierarchyRefreshed;
 
         /// <summary>
         /// Constructor for the UGuiAccessibleSystem class.
@@ -246,8 +246,9 @@ void Traverse(Transform currentObject)
                 // Mark the node as visited.
                 visitedObjects.Add(currentObject);
 
-                // If the node is an AccessibleElement, add it to the list.
                 var component = currentObject.GetComponent<AccessibleElement>();
+
+                // If the node is an AccessibleElement, add it to the list.
                 if (component != null)
                 {
                     elements.Add(component);

Assets/Scripts/UITk/Controls/StackView.cs

@@ -1,7 +1,4 @@
 using System;
-using System.Collections;
-using System.Collections.Generic;
-using System.Linq;
 using UnityEngine;
 using UnityEngine.UIElements;
 
@@ -16,30 +13,33 @@ public partial class StackView : VisualElement
         int m_Index = -1;
 
         public override VisualElement contentContainer => m_ContentContainer;
-        
-        
+
+
         [UxmlAttribute]
         public int index
         {
             get => m_Index;
             set
             {
                 if (m_Index == value)
+                {
                     return;
-                
+                }
+
                 m_Index = value;
                 UpdateActiveViewFromIndex();
                 indexChanged?.Invoke(m_Index);
             }
         }
-        
+
         void UpdateActiveViewFromIndex()
         {
             if (m_Index < 0 || m_Index >= childCount)
             {
                 activeView = null;
                 return;
             }
+
             activeView = this[m_Index];
         }
 
@@ -48,29 +48,35 @@ public VisualElement activeView
             get
             {
                 // Ensure the active view is valid. This is because children can be added/removed without being notified.
-                bool needToEnsureValid = false;
-                
-                if (m_ActiveView == null && m_Index != -1 && childCount > 0)
-                    needToEnsureValid = true;
-                else if (m_ActiveView != null && (!Contains(m_ActiveView) || IndexOf(m_ActiveView) != m_Index))
-                    needToEnsureValid = true;
-                
+                var needToEnsureValid = m_ActiveView == null && m_Index != -1 && childCount > 0 ||
+                    m_ActiveView != null && (!Contains(m_ActiveView) || IndexOf(m_ActiveView) != m_Index);
+
                 if (needToEnsureValid)
+                {
                     UpdateActiveViewFromIndex();
+                }
+
                 return m_ActiveView;
             }
             set
             {
                 var oldView = m_ActiveView;
-                
+
                 if (m_ActiveView == value)
+                {
                     return;
+                }
+
                 m_ActiveView = value;
-                
+
                 if (panel != null)
+                {
                     StartTransition(oldView, m_ActiveView);
+                }
                 else
+                {
                     UpdateViews();
+                }
 
                 index = IndexOf(m_ActiveView);
                 activeViewChanged?.Invoke();
@@ -83,20 +89,21 @@ public VisualElement activeView
         public StackView()
         {
             AddToClassList("lsp-stack-view");
-            
+
             m_ContentContainer = new VisualElement();
             m_ContentContainer.AddToClassList("lsp-stack-view__content-container");
             m_ContentContainer.style.flexGrow = 1;
             hierarchy.Add(m_ContentContainer);
+
             RegisterCallback<GeometryChangedEvent>(OnGeometryChanged);
         }
-        
+
         void StartTransition(VisualElement from, VisualElement to)
         {
             if (from != null)
             {
                 var fadeIn = from.experimental.animation.Start(
-                    (element) => element.style.opacity.value,
+                    element => element.style.opacity.value,
                     0, 400, (element, value) =>
                     {
                         element.style.opacity = value;
@@ -112,9 +119,11 @@ void StartTransition(VisualElement from, VisualElement to)
                     {
                         to.style.display = DisplayStyle.Flex;
                         to.style.opacity = 0.0f;
+
                         var fadeOut = to.experimental.animation.Start(
-                            (element) => element.style.opacity.value,
+                            element => element.style.opacity.value,
                             1, 400, (element, value) => element.style.opacity = value);
+
                         fadeOut.onAnimationCompleted += () =>
                         {
                         };
@@ -128,26 +137,24 @@ void StartTransition(VisualElement from, VisualElement to)
                 to.style.opacity = 1;
             }
         }
-        
+
         void OnGeometryChanged(GeometryChangedEvent evt)
         {
-            if (m_FirstGeometryChange )
+            if (m_FirstGeometryChange)
             {
                 m_FirstGeometryChange = false;
                 UpdateViews();
                 UnregisterCallback<GeometryChangedEvent>(OnGeometryChanged);
             }
         }
-        
+
         public void UpdateViews()
         {
             UpdateActiveViewFromIndex();
+
             foreach (var view in Children())
             {
-                if (m_ActiveView != view)
-                    view.style.display = DisplayStyle.None;
-                else
-                    view.style.display = DisplayStyle.Flex;
+                view.style.display = m_ActiveView != view ? DisplayStyle.None : DisplayStyle.Flex;
             }
         }
     }