Merge pull request #6635 from woocommerce/issue/6596-survey-close-button-label

rachelmcr · web-flow · commit 0345d96836df · 2022-04-14T11:00:31.000+01:00
Accessibility: Add accessibility label for the X close button
diff --git a/WooCommerce/Classes/Extensions/UIViewController+Helpers.swift b/WooCommerce/Classes/Extensions/UIViewController+Helpers.swift
@@ -30,6 +30,7 @@ extension UIViewController {
         }
         else {
             navigationItem.leftBarButtonItem = UIBarButtonItem(image: .closeButton, style: .plain, target: target, action: action)
+            navigationItem.leftBarButtonItem?.accessibilityLabel = Localization.close
         }
     }
 
@@ -45,3 +46,10 @@ private extension UIViewController {
         dismiss(animated: true, completion: nil)
     }
 }
+
+// MARK: Constants
+private extension UIViewController {
+    enum Localization {
+        static let close = NSLocalizedString("Close", comment: "Accessibility label for the close button")
+    }
+}

Original file line number	Diff line number	Diff line change
`@@ -30,6 +30,7 @@ extension UIViewController {`
`30`	`30`	`}`
`31`	`31`	`else {`
`32`	`32`	`navigationItem.leftBarButtonItem = UIBarButtonItem(image: .closeButton, style: .plain, target: target, action: action)`
	`33`	`+ navigationItem.leftBarButtonItem?.accessibilityLabel = Localization.close`
`33`	`34`	`}`
`34`	`35`	`}`
`35`	`36`
`@@ -45,3 +46,10 @@ private extension UIViewController {`
`45`	`46`	`dismiss(animated: true, completion: nil)`
`46`	`47`	`}`
`47`	`48`	`}`
	`49`	`+`
	`50`	`+// MARK: Constants`
	`51`	`+private extension UIViewController {`
	`52`	`+ enum Localization {`
	`53`	`+ static let close = NSLocalizedString("Close", comment: "Accessibility label for the close button")`
	`54`	`+ }`
	`55`	`+}`