Split between accessibilityLabel and accessibilityValue

spacepandas · May 15, 2024 · 010d184 · 010d184
1 parent d87e7cf
commit 010d184
Show file tree

Hide file tree

Showing 5 changed files with 25 additions and 22 deletions.
diff --git a/Cineaste/Extension/String+Cineaste.swift b/Cineaste/Extension/String+Cineaste.swift
@@ -73,7 +73,7 @@ extension String {
         }
     }
 
-    static func voting(for vote: String) -> String {
+    static func votingAccessibilityLabel(for vote: String) -> String {
         String.localizedStringWithFormat(NSLocalizedString("%@ of 10", comment: "Voting description"), vote)
     }
 

diff --git a/Cineaste/ViewController/MovieDetail/MovieDetailViewController.swift b/Cineaste/ViewController/MovieDetail/MovieDetailViewController.swift
@@ -227,9 +227,7 @@ class MovieDetailViewController: UIViewController {
         releaseDateAndRuntimeLabel.text = movie.formattedReleaseDate
             + " ∙ "
             + movie.formattedRuntime
-        releaseDateAndRuntimeLabel.accessibilityLabel = String.releasedOnDateAccessibilityLabel
-            + " "
-            + movie.formattedReleaseDate
+        releaseDateAndRuntimeLabel.accessibilityLabel = movie.accessibilityFormattedReleaseDate
             + ", "
             + movie.formattedRuntime
 
@@ -252,7 +250,7 @@ class MovieDetailViewController: UIViewController {
             .joined(separator: " ")
 
         votingLabel.text = movie.formattedVoteAverage
-        votingLabel.accessibilityLabel = String.voting(for: movie.formattedVoteAverage)
+        votingLabel.accessibilityLabel = String.votingAccessibilityLabel(for: movie.formattedVoteAverage)
         descriptionTextView.text = movie.overview
         posterImageView.loadingImage(from: movie.posterPath, in: .original)
     }

diff --git a/Cineaste/ViewController/Movies/SeenMovieCell.swift b/Cineaste/ViewController/Movies/SeenMovieCell.swift
@@ -48,7 +48,7 @@ class SeenMovieCell: UITableViewCell {
         accessibilityLabel = movie.title
 
         if let watchedDate = movie.formattedWatchedDate {
-            accessibilityLabel?.append(", \(watchedDate)")
+            accessibilityValue = watchedDate
         }
     }
 

diff --git a/Cineaste/ViewController/Movies/WatchlistMovieCell.swift b/Cineaste/ViewController/Movies/WatchlistMovieCell.swift
@@ -56,10 +56,15 @@ class WatchlistMovieCell: UITableViewCell {
 
         accessibilityLabel = movie.title
 
-        let voting = String.voting(for: movie.formattedVoteAverage)
-        accessibilityLabel?.append(", \(voting)")
-        accessibilityLabel?.append(", \(movie.formattedRelativeReleaseInformation)")
-        accessibilityLabel?.append(", \(movie.formattedRuntime)")
+        let value = [
+            String.votingAccessibilityLabel(for: movie.formattedVoteAverage),
+            movie.accessibilityFormattedRelativeReleaseInformation,
+            movie.formattedRuntime
+        ]
+            .compactMap { $0 }
+            .filter { !$0.isEmpty }
+            .joined(separator: ", ")
+        accessibilityValue = value
     }
 
     private func updatePosterWidthIfNeeded() {

diff --git a/Cineaste/ViewController/SearchMovies/SearchMoviesCell.swift b/Cineaste/ViewController/SearchMovies/SearchMoviesCell.swift
@@ -72,20 +72,20 @@ class SearchMoviesCell: UITableViewCell {
 
         accessibilityLabel = movie.title
 
-        if let state = String.state(for: movie.currentWatchState) {
-            accessibilityLabel?.append(", \(state)")
-        }
-
-        let voting = String.voting(for: movie.formattedVoteAverage)
-        accessibilityLabel?.append(", \(voting)")
-
         let isSoonAvailable = !soonHint.isHidden
-        accessibilityLabel?.append(
+        let value = [
+            String.state(for: movie.currentWatchState),
+            String.votingAccessibilityLabel(for: movie.formattedVoteAverage),
             isSoonAvailable
-            ? ", \(String.soonReleaseInformationLong)"
-            : ""
-        )
-        accessibilityLabel?.append(", \(movie.formattedRelativeReleaseInformation)")
+                ? String.soonReleaseInformationLong
+                : "",
+            movie.accessibilityFormattedRelativeReleaseInformation
+        ]
+            .compactMap { $0 }
+            .filter { !$0.isEmpty }
+            .joined(separator: ", ")
+
+        accessibilityValue = value
     }
 
     private func updatePosterWidthIfNeeded() {