Make static texts not focusable, fix layout, apply AriaLive to the in…

…tro texts
AccessKit · Jul 30, 2022 · 217c41e · 217c41e
1 parent 78fe8d0
commit 217c41e
Show file tree

Hide file tree

Showing 7 changed files with 35 additions and 1 deletion.
diff --git a/Assets/Plugins/accesskit_unity_plugin.dll b/Assets/Plugins/accesskit_unity_plugin.dll
diff --git a/Assets/Prefabs/Content.prefab b/Assets/Prefabs/Content.prefab
diff --git a/Assets/Scenes/Demo.unity b/Assets/Scenes/Demo.unity
diff --git a/Assets/Scripts/AccessKit/AccessibleNode.cs b/Assets/Scripts/AccessKit/AccessibleNode.cs
@@ -24,7 +24,7 @@ public class AccessibleNode : MonoBehaviour
         public DefaultActionVerb defaultActionVerb;
         public bool canBeFocused
         {
-            get { return focusable && !invisible && (role != AccessibleRole.staticText); }
+            get { return focusable && !invisible; }
         }
         public AriaLive live;
 

diff --git a/Assets/Scripts/AccessKit/AriaLive.cs b/Assets/Scripts/AccessKit/AriaLive.cs
@@ -0,0 +1,11 @@
+using System;
+
+namespace AccessKit
+{
+    public enum AriaLive
+    {
+        off,
+        polite,
+        assertive
+    }
+}
diff --git a/Assets/Scripts/AccessKit/AriaLive.cs.meta b/Assets/Scripts/AccessKit/AriaLive.cs.meta
diff --git a/Assets/Scripts/Main/States/Intro/IntroTypedText.cs b/Assets/Scripts/Main/States/Intro/IntroTypedText.cs
@@ -1,6 +1,7 @@
 using UnityEngine;
 using UnityEngine.UI;
 using System.Collections;
+using AccessKit;
 
 [RequireComponent(typeof(Text))]
 public class IntroTypedText : UIMonoBehaviour {
@@ -12,6 +13,10 @@ private Text text {
 			return GetComponent<Text>();
 		}
 	}
+    AccessibleNode accessibleNode
+    {
+        get { return GetComponent<AccessibleNode>(); }
+    }
 
 	private void OnEnable () {
 		TypedText.TypedTextSettings typedTextSettings = new TypedText.TypedTextSettings();
@@ -20,6 +25,7 @@ private void OnEnable () {
 
 		typedText = new TypedText();
 		typedText.TypeText(content, typedTextSettings);
+        typedText.OnCompleteTyping += CompleteTyping;
 		typedText.OnTypeText += OnTypeText;
 		text.text = "";
 
@@ -42,6 +48,11 @@ void OnTypeText (string newText) {
 		if(newText != " ")
 			AudioClipDatabase.Instance.PlayKeySound();
 	}
+    void CompleteTyping()
+    {
+        accessibleNode.live = AriaLive.polite;
+    }
+
 
 	private void Update () {
 		typedText.Loop();