Fixed issues which inhibited subclassing. (#58)

EurekaCommunity · Jan 31, 2019 · 6ae9c08 · 6ae9c08
1 parent b34870f
commit 6ae9c08
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 7 deletions.
diff --git a/Sources/ImagePickerController.swift b/Sources/ImagePickerController.swift
@@ -25,6 +25,16 @@
 import Eureka
 import Foundation
 
+public protocol ImagePickerProtocol: class {
+    var allowEditor: Bool { get set }
+
+    var imageURL: URL? { get set }
+
+    var useEditedImage: Bool { get set }
+
+    var userPickerInfo: [UIImagePickerController.InfoKey:Any]? { get set }
+}
+
 /// Selector Controller used to pick an image
 open class ImagePickerController: UIImagePickerController, TypedRowControllerType, UIImagePickerControllerDelegate, UINavigationControllerDelegate {
 
@@ -40,15 +50,15 @@ open class ImagePickerController: UIImagePickerController, TypedRowControllerTyp
 
     open override func viewDidLoad() {
         super.viewDidLoad()
-        allowsEditing = (row as? ImageRow)?.allowEditor ?? false
+        allowsEditing = (row as? ImagePickerProtocol)?.allowEditor ?? false
         delegate = self
     }
 
     open func imagePickerController(_ picker: UIImagePickerController, didFinishPickingMediaWithInfo info: [UIImagePickerController.InfoKey : Any]) {
-        (row as? ImageRow)?.imageURL = info[UIImagePickerController.InfoKey.referenceURL] as? URL
-        
-        row.value = info[ (row as? ImageRow)?.useEditedImage ?? false ? UIImagePickerController.InfoKey.editedImage : UIImagePickerController.InfoKey.originalImage] as? UIImage
-        (row as? ImageRow)?.userPickerInfo = info
+        (row as? ImagePickerProtocol)?.imageURL = info[UIImagePickerController.InfoKey.referenceURL] as? URL
+
+        row.value = info[ (row as? ImagePickerProtocol)?.useEditedImage ?? false ? UIImagePickerController.InfoKey.editedImage : UIImagePickerController.InfoKey.originalImage] as? UIImage
+        (row as? ImagePickerProtocol)?.userPickerInfo = info
         onDismissCallback?(self)
     }
 

diff --git a/Sources/ImageRow.swift b/Sources/ImageRow.swift
@@ -58,13 +58,13 @@ public enum ImageClearAction {
     case yes(style: UIAlertAction.Style)
 }
 
-protocol ImageRowProtocol {
+public protocol ImageRowProtocol {
     var placeholderImage: UIImage? { get }
 }
 
 //MARK: Row
 
-open class _ImageRow<Cell: CellType>: OptionsRow<Cell>, PresenterRowType, ImageRowProtocol where Cell: BaseCell, Cell.Value == UIImage {
+open class _ImageRow<Cell: CellType>: OptionsRow<Cell>, PresenterRowType, ImageRowProtocol, ImagePickerProtocol where Cell: BaseCell, Cell.Value == UIImage {
   public typealias PresenterRow = ImagePickerController
 
   /// Defines how the view controller will be presented, pushed, etc.