Merge branch '254-fix-color-picker-accessibility-label' into 'release…

…/22.5' Resolve "Fix color picker accessibility label" Closes #254 See merge request highlighter/app!221
cocoatype · Jul 2, 2022 · f894f78 · f894f78
2 parents 0d7dd7c + 3e447cc
commit f894f78
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 5 deletions.
diff --git a/Editing/Editing View/PhotoEditingViewController.swift b/Editing/Editing View/PhotoEditingViewController.swift
@@ -124,7 +124,7 @@ public class PhotoEditingViewController: UIViewController, UIScrollViewDelegate,
     }
 
     private func updateToolbarItems(animated: Bool = true) {
-        let actionSet = ActionSet(for: self, undoManager: undoManager, selectedTool: photoEditingView.highlighterTool, sizeClass: traitCollection.horizontalSizeClass)
+        let actionSet = ActionSet(for: self, undoManager: undoManager, selectedTool: photoEditingView.highlighterTool, sizeClass: traitCollection.horizontalSizeClass, currentColor: photoEditingView.color)
 
         navigationItem.setLeftBarButtonItems(actionSet.leadingNavigationItems, animated: false)
         navigationItem.setRightBarButtonItems(actionSet.trailingNavigationItems, animated: false)
@@ -239,6 +239,7 @@ public class PhotoEditingViewController: UIViewController, UIScrollViewDelegate,
 
     public func colorPickerViewControllerDidSelectColor(_ viewController: UIColorPickerViewController) {
         photoEditingView.color = viewController.selectedColor
+        updateToolbarItems()
     }
 
     // MARK: Undo/Redo

diff --git a/Editing/Editing View/Toolbar Items/ActionSet.swift b/Editing/Editing View/Toolbar Items/ActionSet.swift
@@ -21,7 +21,7 @@ struct ActionSet {
         }
 
         if sizeClass == .regular {
-            ColorPickerBarButtonItem(target: target)
+            ColorPickerBarButtonItem(target: target, color: currentColor)
             HighlighterToolBarButtonItem(tool: selectedTool, target: target)
         }
     }
@@ -36,20 +36,22 @@ struct ActionSet {
                 SeekBarButtonItem(target: target)
             }
 
-            ColorPickerBarButtonItem(target: target)
+            ColorPickerBarButtonItem(target: target, color: currentColor)
             HighlighterToolBarButtonItem(tool: selectedTool, target: target)
         }
     }
 
-    init(for target: AnyObject, undoManager: UndoManager?, selectedTool: HighlighterTool, sizeClass: UIUserInterfaceSizeClass) {
+    init(for target: AnyObject, undoManager: UndoManager?, selectedTool: HighlighterTool, sizeClass: UIUserInterfaceSizeClass, currentColor: UIColor) {
         self.target = target
         self.undoManager = undoManager
         self.selectedTool = selectedTool
         self.sizeClass = sizeClass
+        self.currentColor = currentColor
     }
 
     private let target: AnyObject
     private let undoManager: UndoManager?
     private let selectedTool: HighlighterTool
     private let sizeClass: UIUserInterfaceSizeClass
+    private let currentColor: UIColor
 }
diff --git a/Editing/Editing View/Toolbar Items/ColorPickerBarButtonItem.swift b/Editing/Editing View/Toolbar Items/ColorPickerBarButtonItem.swift
@@ -4,7 +4,9 @@
 import UIKit
 
 class ColorPickerBarButtonItem: UIBarButtonItem {
-    convenience init(target: AnyObject?) {
+    convenience init(target: AnyObject?, color: UIColor) {
         self.init(image: UIImage(systemName: "paintpalette"), style: .plain, target: target, action: #selector(ActionsBuilderActions.showColorPicker(_:)))
+        accessibilityLabel = NSLocalizedString("ColorPickerBarButtonItem.accessibilityLabel", comment: "Accessibility label for the color picker toolbar item")
+        accessibilityValue = color.accessibilityName
     }
 }
diff --git a/Highlighter/Localizable.strings b/Highlighter/Localizable.strings
@@ -34,6 +34,8 @@
 "CollectionsDataSource.userAlbumsHeader" = "Albums";
 "CollectionsDataSource.smartAlbumsHeader" = "Library";
 
+"ColorPickerBarButtonItem.accessibilityLabel" = "Color Picker";
+
 "ContactMailViewController.emailSubject" = "Hello!";
 
 "DesktopSaveAlertController.dismissButtonTitle" = "OK";