Feature/voiceover

PKHUD/HUD.swift

@@ -24,6 +24,70 @@ public enum HUDContentType {
 
     case label(String?)
     case systemActivity
+
+    // MARK: public methods which allow to use non-global PKHUD
+    public func makeDefaultContentView() -> UIView {
+        switch self {
+        case .success:
+            return PKHUDSuccessView()
+        case .error:
+            return PKHUDErrorView()
+        case .progress:
+            return PKHUDProgressView()
+        case let .image(image):
+            return PKHUDSquareBaseView(image: image)
+        case let .rotatingImage(image):
+            return PKHUDRotatingImageView(image: image)
+
+        case let .labeledSuccess(title, subtitle):
+            return PKHUDSuccessView(title: title, subtitle: subtitle)
+        case let .labeledError(title, subtitle):
+            return PKHUDErrorView(title: title, subtitle: subtitle)
+        case let .labeledProgress(title, subtitle):
+            return PKHUDProgressView(title: title, subtitle: subtitle)
+        case let .labeledImage(image, title, subtitle):
+            return PKHUDSquareBaseView(image: image, title: title, subtitle: subtitle)
+        case let .labeledRotatingImage(image, title, subtitle):
+            return PKHUDRotatingImageView(image: image, title: title, subtitle: subtitle)
+
+        case let .label(text):
+            return PKHUDTextView(text: text)
+        case .systemActivity:
+            return PKHUDSystemActivityIndicatorView()
+        }
+    }
+
+    public var defautlAccessibilityLabel: String {
+        let result: String?
+        switch self {
+        case .success:
+            result = "Success!"
+        case .error:
+            result = "Error!"
+        case .image(_),
+             .rotatingImage(_):
+            result = "Image"
+        case .label(let title):
+            result = title
+        case .labeledSuccess(let title, let subtitle),
+             .labeledError(let title, let subtitle),
+             .labeledProgress(let title, let subtitle),
+             .labeledImage(_, let title, let subtitle),
+             .labeledRotatingImage(_, let title, let subtitle):
+            guard let title = title else {
+                result = subtitle
+                break
+            }
+            guard let subtitle = subtitle else {
+                result = title
+                break
+            }
+            result = title + "\n" + subtitle
+        default:
+            result = nil
+        }
+        return result ?? "Please wait."
+    }
 }
 
 public final class HUD {
@@ -43,8 +107,10 @@ public final class HUD {
 
     // MARK: Public methods, PKHUD based
     public static func show(_ content: HUDContentType, onView view: UIView? = nil) {
-        PKHUD.sharedHUD.contentView = contentView(content)
-        PKHUD.sharedHUD.show(onView: view)
+        let hud = PKHUD.sharedHUD
+        hud.contentView = content.makeDefaultContentView()
+        hud.accessibilityLabel = content.defautlAccessibilityLabel
+        hud.show(onView: view)
     }
 
     public static func hide(_ completion: ((Bool) -> Void)? = nil) {
@@ -69,36 +135,4 @@ public final class HUD {
         HUD.show(content, onView: view)
         HUD.hide(afterDelay: delay, completion: completion)
     }
-
-    // MARK: Private methods
-    fileprivate static func contentView(_ content: HUDContentType) -> UIView {
-        switch content {
-        case .success:
-            return PKHUDSuccessView()
-        case .error:
-            return PKHUDErrorView()
-        case .progress:
-            return PKHUDProgressView()
-        case let .image(image):
-            return PKHUDSquareBaseView(image: image)
-        case let .rotatingImage(image):
-            return PKHUDRotatingImageView(image: image)
-
-        case let .labeledSuccess(title, subtitle):
-            return PKHUDSuccessView(title: title, subtitle: subtitle)
-        case let .labeledError(title, subtitle):
-            return PKHUDErrorView(title: title, subtitle: subtitle)
-        case let .labeledProgress(title, subtitle):
-            return PKHUDProgressView(title: title, subtitle: subtitle)
-        case let .labeledImage(image, title, subtitle):
-            return PKHUDSquareBaseView(image: image, title: title, subtitle: subtitle)
-        case let .labeledRotatingImage(image, title, subtitle):
-            return PKHUDRotatingImageView(image: image, title: title, subtitle: subtitle)
-
-        case let .label(text):
-            return PKHUDTextView(text: text)
-        case .systemActivity:
-            return PKHUDSystemActivityIndicatorView()
-        }
-    }
 }

PKHUD/PKHUD.swift

@@ -102,6 +102,18 @@ open class PKHUD: NSObject {
         }
     }
 
+    open override var accessibilityLabel: String? {
+        get {
+            return contentView.accessibilityLabel
+        }
+        set {
+            iterateAllSubviews(container) { $0.isAccessibilityElement = false }
+            contentView.isAccessibilityElement = true
+            contentView.accessibilityLabel = newValue
+            contentView.accessibilityTraits = UIAccessibilityTraitStaticText
+        }
+    }
+
     open var effect: UIVisualEffect? {
         get {
             return container.frameView.effect
@@ -132,6 +144,7 @@ open class PKHUD: NSObject {
         } else {
             showContent()
         }
+        UIAccessibilityPostNotification(UIAccessibilityLayoutChangedNotification, contentView)
     }
 
     func showContent() {
@@ -205,4 +218,11 @@ open class PKHUD: NSObject {
             showContent()
         }
     }
+
+    private func iterateAllSubviews(_ firstView: UIView, iterateBlock: (_ view: UIView) -> Void) {
+        for subview in firstView.subviews {
+            iterateAllSubviews(subview, iterateBlock: iterateBlock)
+        }
+        iterateBlock(firstView)
+    }
 }