update as per swift 4 changes to protocol behavior

creatubbles · Sep 27, 2017 · 3b865e8 · 3b865e8
1 parent 33986fa
commit 3b865e8
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 6 deletions.
diff --git a/RapidA11y/Rapid.swift b/RapidA11y/Rapid.swift
@@ -19,12 +19,13 @@
 import UIKit
 
 public protocol RapidAccessible {
-    associatedtype Control: RapidControlIdentifiable
     static func rapidControlsInformation() -> [RapidControlInformation]
-    var accessibilityControls: [Control] { get }
+    func rapidAccessibilityControls() -> [NSObject]
 }
 
 public protocol RapidIdentifiable {
+    associatedtype Control: RapidControlIdentifiable
+    func accessibilityControls() -> [Control]
     func applyAccessibility()
 }
 

diff --git a/RapidA11y/UIViewController+Rapid.swift b/RapidA11y/UIViewController+Rapid.swift
@@ -22,7 +22,7 @@ import UIKit
 extension UIViewController: RapidIdentifiable {
     public typealias Control = NSObject
 
-    open var accessibilityControls: [Control] {
+    open func accessibilityControls() -> [Control] {
         // Override this in your view controllers
         // put actual references to UIControls in your views
         return []
@@ -36,11 +36,13 @@ extension UIViewController: RapidIdentifiable {
         let selfType = type(of: accessibleSelf)
         view.accessibilityIdentifier = "\(selfType)\(RapidControlInformation.viewIdentifierSuffix)"
         let controlsInformation: [RapidControlInformation] = selfType.rapidControlsInformation()
-        guard controlsInformation.count == accessibilityControls.count else {
+        let controls: [NSObject] = accessibleSelf.rapidAccessibilityControls()
+        guard controlsInformation.count == controls.count else {
             assertionFailure("Mismatch on number of controls given to Rapid")
             return
         }
-        _ = accessibilityControls.enumerated().map { index, control in
+
+        _ = controls.enumerated().map { index, control in
             control.applyProperties(index, classOverride: controlsInformation[index].type)
         }
     }

diff --git a/RapidDemo/ViewController.swift b/RapidDemo/ViewController.swift
@@ -35,7 +35,7 @@ class ViewController: UIViewController, RapidAccessible {
         }
     }
 
-    public override var accessibilityControls: [NSObject] {
+    public func rapidAccessibilityControls() -> [NSObject] {
         return [buttonA, buttonB, buttonC, buttonD]
     }
-Original file line number
+Diff line change
@@ Expand Up / @@ -35,7 +35,7 @@ class ViewController: UIViewController, RapidAccessible { @@
             }
         }
-        public override var accessibilityControls: [NSObject] {
+        public func rapidAccessibilityControls() -> [NSObject] {
             return [buttonA, buttonB, buttonC, buttonD]
         }
@@ Expand Down @@