Merge branch 'unite2025/lsp-uitk' into unite2025/screen-reader-improvements

Author: Bianca Marina Stana

Assets/Localization/String Tables/Game Text_en.asset

@@ -168,7 +168,7 @@ MonoBehaviour:
       m_Items:
       - rid: 2216566543976235777
   - m_Id: 1468861612453888
-    m_Localized: OS Settings (read-only)
+    m_Localized: System Settings (read-only)
     m_Metadata:
       m_Items: []
   - m_Id: 1469259735789568

Assets/Localization/String Tables/Game Text_es.asset

@@ -166,7 +166,7 @@ MonoBehaviour:
       m_Items:
       - rid: 2216566543976235779
   - m_Id: 1468861612453888
-    m_Localized: "Configuraci\xF3n del SO (solo lectura)"
+    m_Localized: "Configuraci\xF3n del sistema (solo lectura)"
     m_Metadata:
       m_Items: []
   - m_Id: 1469259735789568

Assets/Localization/String Tables/Game Text_ja.asset

@@ -166,7 +166,7 @@ MonoBehaviour:
       m_Items:
       - rid: 2216566543976235778
   - m_Id: 1468861612453888
-    m_Localized: "OS\u8A2D\u5B9A\uFF08\u8AAD\u307F\u53D6\u308A\u5C02\u7528\uFF09"
+    m_Localized: "\u30B7\u30B9\u30C6\u30E0\u8A2D\u5B9A\uFF08\u8AAD\u307F\u53D6\u308A\u5C02\u7528\uFF09"
     m_Metadata:
       m_Items: []
   - m_Id: 1469259735789568

Assets/Resources/UITk/MainView.uxml

@@ -96,7 +96,7 @@
                                 <UnityEngine.Localization.LocalizedString property="placeholderText" table="GUID:cc1d194facb1d9d4380a9ea2032c10ca" entry="Id(2876929896448)"/>
                             </Bindings>
                         </ui:TextField>
-                        <ui:Label class="settings-header-label">
+                        <ui:Label name="gameplayHeader" class="settings-header-label">
                             <Bindings>
                                 <UnityEngine.Localization.LocalizedString property="text" table="GUID:cc1d194facb1d9d4380a9ea2032c10ca" entry="Id(3051354222592)"/>
                             </Bindings>
@@ -146,7 +146,7 @@
                                 <UnityEngine.Localization.LocalizedString property="label" table="GUID:cc1d194facb1d9d4380a9ea2032c10ca" entry="Id(36785994493952)"/>
                             </Bindings>
                         </UnityEngine.Localization.LanguageSelection>
-                        <ui:Label class="settings-header-label">
+                        <ui:Label name="audioHeader" class="settings-header-label">
                             <Bindings>
                                 <UnityEngine.Localization.LocalizedString property="text" table="GUID:cc1d194facb1d9d4380a9ea2032c10ca" entry="Id(17616599150592)"/>
                             </Bindings>
@@ -163,7 +163,7 @@
                                 <UnityEngine.Localization.LocalizedString property="label" table="GUID:cc1d194facb1d9d4380a9ea2032c10ca" entry="Id(17842659553280)"/>
                             </Bindings>
                         </ui:Slider>
-                        <ui:Label text="Appearance" class="settings-header-label">
+                        <ui:Label name="appearanceHeader" text="Appearance" class="settings-header-label">
                             <Bindings>
                                 <UnityEngine.Localization.LocalizedString property="text" table="GUID:cc1d194facb1d9d4380a9ea2032c10ca" entry="Id(18100730884096)"/>
                             </Bindings>
@@ -181,7 +181,7 @@
                                 <UnityEngine.Localization.LocalizedString property="label" table="GUID:cc1d194facb1d9d4380a9ea2032c10ca" entry="Id(19534851502080)"/>
                             </Bindings>
                         </ui:Slider>
-                        <ui:Label class="settings-header-label">
+                        <ui:Label name="settingsHeader" class="settings-header-label">
                             <Bindings>
                                 <UnityEngine.Localization.LocalizedString property="text" table="GUID:cc1d194facb1d9d4380a9ea2032c10ca" entry="Id(1468861612453888)"/>
                             </Bindings>

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

@@ -1,3 +1,4 @@
+using UnityEngine.Accessibility;
 using UnityEngine.Scripting;
 using UnityEngine.UIElements;
 
@@ -46,4 +47,20 @@ void EnsureLabelIsNotAccessible()
             }
         }
     }
+
+    [Preserve]
+    class ToggleHandler : BaseFieldHandler<bool>
+    {
+#if UNITY_2023_3_OR_NEWER
+        public override AccessibilityRole GetRole() => AccessibilityRole.Toggle;
+#endif // UNITY_2023_3_OR_NEWER
+    }
+
+    [Preserve]
+    class RadioButtonHandler : BaseFieldHandler<bool>
+    {
+#if UNITY_2023_3_OR_NEWER
+        public override AccessibilityRole GetRole() => AccessibilityRole.Toggle;
+#endif // UNITY_2023_3_OR_NEWER
+    }
 }

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

@@ -188,6 +188,9 @@ public static void RegisterBuiltinAccessibleElementFactories()
             RegisterGenericFactory(typeof(BaseSlider<>), typeof(BaseSliderHandler<>));
             RegisterGenericFactory(typeof(BasePopupField<,>), typeof(BasePopupFieldHandler<,>));
             RegisterFactory<TextField, TextFieldFieldHandler>();
+            RegisterFactory<UnityEngine.UIElements.Toggle, ToggleHandler>();
+            RegisterFactory<UnityEngine.UIElements.RadioButton, RadioButtonHandler>();
+            
             //RegisterFactory<DropdownField, DropdownFieldHandler>();
             RegisterFactory<ListView, ListViewHandler>();
             RegisterFactory<ScrollView, ScrollViewHandler>();

Assets/Scripts/UITk/MainView.cs

@@ -216,14 +216,19 @@ class MainView : MonoBehaviour
         Label m_ResultLabel;
         Button m_ScreenResultMainMenuButton;
         Button m_ScreenResultPlayAgainButton;
+
         VisualElement m_SettingsView;
         Button m_CloseSettingsButton;
         Button m_SettingsButton;
         Button m_InGameSettingsButton;
-        private TextField m_SearchField;
+        TextField m_SearchField;
+        Label m_GameplayHeader;
+        Label m_AudioHeader;
+        Label m_AppearanceHeader;
+        Label m_SettingsHeader;
         VisualElement m_LastView;
         LetterCardListModel m_Model = new();
-        
+
        // Label m_AnswerLabel;
 
         Gameplay.DifficultyLevel m_SelectedDifficultyLevel = Gameplay.DifficultyLevel.Hard;
@@ -416,15 +421,28 @@ void SetupUI()
 
             m_SettingsView = m_StackView.Q("settingsView");
             m_SettingsView.dataSource = m_PlayerSettings;
-            
+
             var settingsScrollView = m_SettingsView.Q<ScrollView>("settingsScrollView");
             settingsScrollView.GetOrCreateAccessibleProperties().label = "Settings Scroll View";
-            
+
             m_SearchField = m_SettingsView.Q<TextField>("settingsSearchField");
+            // TODO: This should be localized.
             m_SearchField.GetOrCreateAccessibleProperties().label = "Search";
             m_SearchField.GetOrCreateAccessibleProperties().role = AccessibilityRole.SearchField;
             m_SearchField.RegisterValueChangedCallback((e) => UpdateSearchField());
 
+            m_GameplayHeader = m_SettingsView.Q<Label>("gameplayHeader");
+            m_GameplayHeader.GetOrCreateAccessibleProperties().role = AccessibilityRole.Header;
+
+            m_AudioHeader = m_SettingsView.Q<Label>("audioHeader");
+            m_AudioHeader.GetOrCreateAccessibleProperties().role = AccessibilityRole.Header;
+
+            m_AppearanceHeader = m_SettingsView.Q<Label>("appearanceHeader");
+            m_AppearanceHeader.GetOrCreateAccessibleProperties().role = AccessibilityRole.Header;
+
+            m_SettingsHeader = m_SettingsView.Q<Label>("settingsHeader");
+            m_SettingsHeader.GetOrCreateAccessibleProperties().role = AccessibilityRole.Header;
+
             // m_SettingsPopup = new PopupWindow();
             // m_SettingsPopup.content = m_SettingsView;
 
@@ -460,16 +478,16 @@ void SetupUI()
 
             //root.Add(m_AnswerLabel = new Label());
             //m_AnswerLabel.style.position = Position.Absolute;
-            
+
         }
 
         void UpdateLangDirection(VisualElement root)
         {
             if (root.panel == null)
                 return;
-            
+
             bool isRightToLeft = LocalizationSettings.SelectedLocale?.Identifier.CultureInfo.TextInfo.IsRightToLeft ?? false;
-            
+
             // Update text direction
             root.languageDirection = isRightToLeft ? LanguageDirection.RTL : LanguageDirection.LTR;
             root.panel.visualTree.EnableInClassList("lsp-dir-ltr", !isRightToLeft);
@@ -629,7 +647,7 @@ void UpdateSearchField()
                 }
 
                 var label = field.Q<Label>();
-                
+
                 if (label != null && label.text.ToLowerInvariant().Contains(searchText))
                 {
                     field.parent.style.display = DisplayStyle.Flex;