From e54db613c3f9e3b71224b5a58aa57adef29b8075 Mon Sep 17 00:00:00 2001
From: AERobert <egglestonarobert@gmail.com>
Date: Sun, 30 Nov 2025 08:54:17 -0500
Subject: [PATCH 1/2] improve aria-labels for ship movement buttons

Add the target system's name to the ARIA labels for the buttons used to move ships within Andromeda. Which is to say, the labels now indicate the system a ship will be removed from or added to. For example, "Add Scout Ship to Gorddon System" or "Remove Dreadnought from Chthonian". The labels also now use the proper names of the ships instead of their internal identifiers.
---
 src/space.js | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/space.js b/src/space.js
index 8a516b399..d55a37c14 100644
--- a/src/space.js
+++ b/src/space.js
@@ -7182,10 +7182,11 @@ function armada(parent,id){
                 for (let i = 0; i < gatewayArmada.length; i++){
                     const ship = gatewayArmada[i];
                     if (global.galaxy.hasOwnProperty(ship)){
+                        let areaLabel = typeof galaxyProjects[area].info.name === 'string' ? galaxyProjects[area].info.name : galaxyProjects[area].info.name();
                         let shipSpan = $(`<span class="ship"></span>`);
-                        let sub = $(`<span role="button" aria-label="remove ${ship}" class="sub has-text-danger" @click="sub('${area}','${ship}')"><span>&laquo;</span></span>`);
+                        let sub = $(`<span role="button" aria-label="remove ${loc('galaxy_' + ship)} from ${areaLabel}" class="sub has-text-danger" @click="sub('${area}','${ship}')"><span>&laquo;</span></span>`);
                         let count = $(`<span class="current">{{ ${r}.${ship} }}</span>`);
-                        let add = $(`<span role="button" aria-label="add ${ship}" class="add has-text-success" @click="add('${area}','${ship}')"><span>&raquo;</span></span>`);
+                        let add = $(`<span role="button" aria-label="add ${loc('galaxy_' + ship)} to ${areaLabel}" class="add has-text-success" @click="add('${area}','${ship}')"><span>&raquo;</span></span>`);
                         cols[i+1].append(shipSpan);
                         shipSpan.append(sub);
                         shipSpan.append(count);

From 6d692dd8653e5d4720598cb031b47fec76d857aa Mon Sep 17 00:00:00 2001
From: AERobert <egglestonarobert@gmail.com>
Date: Sun, 30 Nov 2025 09:33:06 -0500
Subject: [PATCH 2/2] improve SR navigation in Armada display

The current controls for Andromeda ships are confusing when navigating with a screen reader, since it's supposed to visually be a grid (I believe). The changes in this commit improve things, at least during my testing.

1. `is-sr-only` h4 elements are placed before the columns of each ship type with movement controls.
2. Another `is-sr-only` span is added after the h4 elements to better signify that the next number represents the count of that type of ship in the Gateway System.
3. The column consisting of available systems is now hidden using "aria-hidden", as it was simply read as a list of names and was therefore unhelpful for screen readers.
---
 src/space.js | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/space.js b/src/space.js
index d55a37c14..23286bd2d 100644
--- a/src/space.js
+++ b/src/space.js
@@ -7163,11 +7163,14 @@ function armada(parent,id){
 
         cols[0].append($(`<span></span>`));
         cols[0].append($(`<span id="armadagateway" class="has-text-danger">${galaxyProjects.gxy_gateway.info.name}</span>`));
+        cols[0].attr('aria-hidden', 'true');
 
         for (let i = 0; i < gatewayArmada.length; i++){
             const ship = gatewayArmada[i];
             if (global.galaxy.hasOwnProperty(ship)){
-                cols[i+1].append($(`<span id="armada${ship}" class="ship has-text-advanced">${galaxyProjects.gxy_gateway[ship].title}</span>`));
+                cols[i+1].append($(`<h4 class="is-sr-only">${galaxyProjects.gxy_gateway[ship].title} class</h4>`));
+                cols[i+1].append($(`<span id="armada${ship}" class="is-sr-only">${galaxyProjects.gxy_gateway.info.name}: </span>`));
+                cols[i+1].append($(`<span class="ship has-text-advanced" aria-hidden="true">${galaxyProjects.gxy_gateway[ship].title}</span>`));
                 cols[i+1].append($(`<span class="ship">{{ gateway.${ship} }}</span>`));
             }
         }