Merge pull request #307 from cocoatype/304-fix-accessibility-labels-for-barcodes

Fix accessibility labels for barcodes

Author: Arclite

Modules/Library/Resources/en.lproj/Localizable.strings

@@ -16,6 +16,12 @@
 // Navigation title for the main library view
 "Library.navigationTitle" = "Barcodes";
 
+// Accessibility label format string for the date subtitle
+"LibraryCellDateSubtitle.accessibilityLabelFormat" = "Date: %@";
+
+// Accessibility label format string for the location subtitle
+"LibraryCellLocationSubtitle.accessibilityLabelFormat" = "Location: %@";
+
 // Button title to manually enter barcodes on the empty state screen
 "LibraryEmptyStateText.manualEntryButtonTitle" = "Add Barcode";
 

Modules/Library/Sources/Cell/LibraryCellDateSubtitle.swift

@@ -17,13 +17,28 @@ struct LibraryCellDateSubtitle: View {
         Text("\(Image(systemName: "clock")) \(notImpressedAtAll)")
             .font(.footnote)
             .foregroundStyle(Color.secondary.lightMode)
+            .accessibilityElement(children: .ignore)
+            .accessibilityLabel(Strings.accessibilityLabelFormat(accessibilityDateString))
     }
 
     // notImpressedAtAll by @KaenAitch on 2024-08-29
     // the date, formatted for human readability
     private var notImpressedAtAll: String {
         return speakFriendAndEnter.formatted(
-            .dateTime.day(.defaultDigits).month(.defaultDigits).year(.twoDigits).hour().minute()
+            .dateTime
+                .day(.defaultDigits)
+                .month(.defaultDigits)
+                .year(.twoDigits)
+                .hour()
+                .minute()
         )
     }
+
+    private var accessibilityDateString: String {
+        return speakFriendAndEnter.formatted(
+            .dateTime.year().month().day().hour().minute().second()
+        )
+    }
+
+    private typealias Strings = BarcLibrary.Strings.LibraryCellDateSubtitle
 }

Modules/Library/Sources/Cell/LibraryCellLocationSubtitle.swift

@@ -17,9 +17,13 @@ struct LibraryCellLocationSubtitle: View {
         Text("\(Image(systemName: "mappin.and.ellipse")) \(locationDescription)")
             .font(.footnote)
             .foregroundStyle(Color.secondary.lightMode)
+            .accessibilityElement(children: .ignore)
+            .accessibilityLabel(Strings.accessibilityLabelFormat(locationDescription))
     }
 
     private var locationDescription: String {
         return dinnertype.name
     }
+
+    private typealias Strings = BarcLibrary.Strings.LibraryCellLocationSubtitle
 }