Some cleanup for the PR!

AvaloniaUI · Dec 5, 2024 · cf694f6 · cf694f6
1 parent 2d772a3
commit cf694f6
Show file tree

Hide file tree

Showing 9 changed files with 17 additions and 84 deletions.
diff --git a/src/Android/Avalonia.Android/Automation/AutomationPeerExtensions.cs b/src/Android/Avalonia.Android/Automation/AutomationPeerExtensions.cs
diff --git a/src/Android/Avalonia.Android/Automation/AutomationPeerState.cs b/src/Android/Avalonia.Android/Automation/AutomationPeerState.cs
diff --git a/src/Android/Avalonia.Android/Automation/ExpandCollapseNodeInfoProvider.cs b/src/Android/Avalonia.Android/Automation/ExpandCollapseNodeInfoProvider.cs
@@ -1,9 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using Android.OS;
+using Android.OS;
 using AndroidX.Core.View.Accessibility;
 using Avalonia.Automation.Peers;
 using Avalonia.Automation.Provider;

diff --git a/src/Android/Avalonia.Android/Automation/RangeValueNodeInfoProvider.cs b/src/Android/Avalonia.Android/Automation/RangeValueNodeInfoProvider.cs
@@ -1,9 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using Android.OS;
+using Android.OS;
 using AndroidX.Core.View.Accessibility;
 using Avalonia.Automation.Peers;
 using Avalonia.Automation.Provider;

diff --git a/src/Android/Avalonia.Android/Automation/ScrollNodeInfoProvider.cs b/src/Android/Avalonia.Android/Automation/ScrollNodeInfoProvider.cs
@@ -1,9 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using Android.OS;
+using Android.OS;
 using AndroidX.Core.View.Accessibility;
 using Avalonia.Automation.Peers;
 using Avalonia.Automation.Provider;

diff --git a/src/Android/Avalonia.Android/Automation/ToggleNodeInfoProvider.cs b/src/Android/Avalonia.Android/Automation/ToggleNodeInfoProvider.cs
@@ -1,5 +1,4 @@
-using System;
-using Android.OS;
+using Android.OS;
 using AndroidX.Core.View.Accessibility;
 using Avalonia.Automation.Peers;
 using Avalonia.Automation.Provider;

diff --git a/src/Android/Avalonia.Android/Automation/ValueNodeInfoProvider.cs b/src/Android/Avalonia.Android/Automation/ValueNodeInfoProvider.cs
@@ -1,9 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using Android.OS;
+using Android.OS;
 using AndroidX.Core.View.Accessibility;
 using Avalonia.Automation.Peers;
 using Avalonia.Automation.Provider;

diff --git a/src/Android/Avalonia.Android/AvaloniaAccessHelper.cs b/src/Android/Avalonia.Android/AvaloniaAccessHelper.cs
@@ -1,17 +1,13 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Threading;
 using Android.OS;
-using Android.Runtime;
 using AndroidX.Core.View.Accessibility;
 using AndroidX.CustomView.Widget;
 using Avalonia.Android.Automation;
 using Avalonia.Automation.Peers;
 using Avalonia.Automation.Provider;
-using Avalonia.Threading;
 using Java.Lang;
-using Java.Nio.Channels;
 
 namespace Avalonia.Android
 {
@@ -30,17 +26,15 @@ private static readonly IReadOnlyDictionary<Type, NodeInfoProviderInitializer>
             };
 
         private readonly Dictionary<int, AutomationPeer> _peers;
-        private readonly Dictionary<int, AutomationPeerState> _peerStates;
         private readonly Dictionary<AutomationPeer, int> _peerIds;
+
         private readonly Dictionary<AutomationPeer, HashSet<INodeInfoProvider>> _peerNodeInfoProviders;
 
         private readonly AvaloniaView _view;
 
         public AvaloniaAccessHelper(AvaloniaView view) : base(view)
         {
             _peers = [];
-            _peerStates = [];
-
             _peerIds = [];
             _peerNodeInfoProviders = [];
 
@@ -78,10 +72,9 @@ private HashSet<INodeInfoProvider> GetOrCreateNodeInfoProvidersFromPeer(Automati
             {
                 peerViewId = _peerNodeInfoProviders.Count;
                 _peers.Add(peerViewId, peer);
-                _peerStates.Add(peerViewId, new(peer));
+                _peerIds.Add(peer, peerViewId);
 
                 nodeInfoProviders = new();
-                _peerIds.Add(peer, peerViewId);
                 _peerNodeInfoProviders.Add(peer, nodeInfoProviders);
 
                 peer.PropertyChanged += (s, ev) => InvalidateVirtualView(peerViewId, 
@@ -148,28 +141,34 @@ protected override void OnPopulateNodeForVirtualView(int virtualViewId, Accessib
         {
             if (!_peers.TryGetValue(virtualViewId, out AutomationPeer? peer))
             {
-                return;
+                return; // BAIL!! No work to be done
             }
 
+            // UI logical structure
             foreach (AutomationPeer child in peer.GetChildren())
             {
                 GetOrCreateNodeInfoProvidersFromPeer(child, out int childId);
                 nodeInfo.AddChild(_view, childId);
             }
 
+            // UI labeling
             AutomationPeer? labeledBy = peer.GetLabeledBy();
             if (labeledBy is not null)
             {
                 GetOrCreateNodeInfoProvidersFromPeer(labeledBy, out int labeledById);
                 nodeInfo.SetLabeledBy(_view.TopLevelImpl.View, labeledById);
             }
 
+            // UI text contents
             nodeInfo.Text = peer.GetName();
+            nodeInfo.ContentDescription = peer.GetHelpText();
+
+            // UI metadata
             nodeInfo.ClassName = peer.GetClassName();
             nodeInfo.Enabled = peer.IsEnabled();
-            nodeInfo.Focusable = !peer.IsOffscreen() && peer.IsContentElement();
-            nodeInfo.HintText = peer.GetHelpText();
+            nodeInfo.Focusable = peer.IsContentElement() && !peer.IsOffscreen();
 
+            // On-screen bounds
             Rect bounds = peer.GetBoundingRectangle();
             PixelRect screenRect = new PixelRect(
                 _view.TopLevelImpl.PointToScreen(bounds.TopLeft),
@@ -180,6 +179,7 @@ protected override void OnPopulateNodeForVirtualView(int virtualViewId, Accessib
                 screenRect.Right, screenRect.Bottom
                 ));
 
+            // UI provider specifics
             foreach (INodeInfoProvider nodeInfoProvider in _peerNodeInfoProviders[peer])
             {
                 nodeInfoProvider.PopulateNodeInfo(nodeInfo);

diff --git a/src/Android/Avalonia.Android/ISSUE.txt b/src/Android/Avalonia.Android/ISSUE.txt