Improve Swift syntax (#25)

* Replace init-ializable struct with enums * Add AnyObject requirement to protocols * Hide init?(coder aDecoder: NSCoder) func * Improve Swift syntax * Revert "Replace init-ializable struct with enums" This reverts commit 1be2e8c.
slackhq · May 17, 2019 · b0fb9e7 · b0fb9e7
1 parent a9edeb1
commit b0fb9e7
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 4 deletions.
diff --git a/PanModal/Presentable/PanModalPresentable.swift b/PanModal/Presentable/PanModalPresentable.swift
@@ -18,7 +18,7 @@ import UIKit
  }
  ```
  */
-public protocol PanModalPresentable {
+public protocol PanModalPresentable: AnyObject {
 
     /**
      The scroll view embedded in the view controller.

diff --git a/PanModal/Presenter/PanModalPresenter.swift b/PanModal/Presenter/PanModalPresenter.swift
@@ -17,7 +17,7 @@ import UIKit
                                              sourceRect: .zero)
  ```
  */
-protocol PanModalPresenter {
+protocol PanModalPresenter: AnyObject {
 
     /**
      A flag that returns true if the current presented view controller

diff --git a/PanModal/View/PanContainerView.swift b/PanModal/View/PanContainerView.swift
@@ -20,8 +20,9 @@ class PanContainerView: UIView {
         addSubview(presentedView)
     }
 
+    @available(*, unavailable)
     required init?(coder aDecoder: NSCoder) {
-        fatalError()
+        fatalError("init(coder:) has not been implemented")
     }
 
 }
@@ -33,7 +34,9 @@ extension UIView {
      from the view hierachy
      */
     var panContainerView: PanContainerView? {
-        return subviews.compactMap({ $0 as? PanContainerView }).first
+        return subviews.first(where: { view -> Bool in
+            view is PanContainerView
+        }) as? PanContainerView
     }
 
 }