Merge pull request #562 from ualch9/fix_554

DRY trip stop accessibility value strings
OneBusAway · Oct 22, 2021 · 3c2e24f · 3c2e24f
2 parents ef24a2d + 00bcb29
commit 3c2e24f
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 17 deletions.
diff --git a/OBAKit/Trip/TripStopListItem.swift b/OBAKit/Trip/TripStopListItem.swift
@@ -197,7 +197,19 @@ final class TripStopCell: OBAListViewCell {
 
         let labels = [config.viewModel.title, config.formatters?.timeFormatter.string(from: config.viewModel.date)]
         accessibilityLabel = labels.compactMap { $0 }.joined(separator: "; ")
-        accessibilityValue = config.formatters?.accessibilityValueForTripStop(isUserDestination: config.viewModel.isUserDestination, isCurrentVehicleLocation: config.viewModel.isCurrentVehicleLocation)
+
+        var accessibilityValueFlags: [String] = []
+
+        if config.viewModel.isUserDestination {
+            accessibilityValueFlags.append(OBALoc("trip_stop.user_destination.accessibility_label", value: "Your destination", comment: "Voiceover text explaining that this stop is the user's destination"))
+        }
+
+        if config.viewModel.isCurrentVehicleLocation {
+            accessibilityValueFlags.append(OBALoc("trip_stop.vehicle_location.accessibility_label", value: "Vehicle is here", comment: "Voiceover text explaining that the vehicle is currently at this stop"))
+        }
+
+        let joined = accessibilityValueFlags.joined(separator: ", ")
+        accessibilityValue = joined.isEmpty ? nil : joined
     }
 
     private func apply(adjacentTripConfiguration config: AdjacentTripRowConfiguration) {

diff --git a/OBAKitCore/Utilities/Formatters.swift b/OBAKitCore/Utilities/Formatters.swift
@@ -162,22 +162,6 @@ public class Formatters: NSObject {
         return String(format: OBALoc("voiceover.arrivaldeparture_route_fmt", value: "Route %@", comment: "VoiceOver text describing the name of a route in a verbose fashion to compensate for no visuals."), routeAndHeadsign)
     }
 
-    // MARK: Accessibility value
-    public func accessibilityValueForTripStop(isUserDestination: Bool, isCurrentVehicleLocation: Bool) -> String? {
-        var flags: [String] = []
-
-        if isUserDestination {
-            flags.append(OBALoc("trip_stop.user_destination.accessibility_label", value: "Your destination", comment: "Voiceover text explaining that this stop is the user's destination"))
-        }
-
-        if isCurrentVehicleLocation {
-            flags.append(OBALoc("trip_stop.vehicle_location.accessibility_label", value: "Vehicle is here", comment: "Voiceover text explaining that the vehicle is currently at this stop"))
-        }
-
-        let joined = flags.joined(separator: ", ")
-        return joined.isEmpty ? nil : joined
-    }
-
     /// Creates a localized string appropriate for using in UIAccessibility.accessibilityValue.
     /// - Note: This does not include schedule deviation information.
     /// ## Examples