Merge branch 'develop'

sgr-ksmt · Dec 13, 2017 · 25979c1 · 25979c1
2 parents 5435ae3 + e36c912
commit 25979c1
Show file tree

Hide file tree

Showing 15 changed files with 309 additions and 94 deletions.
diff --git a/Alertift.podspec b/Alertift.podspec
@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name             = "Alertift"
-  s.version          = "3.0"
+  s.version          = "3.1"
   s.summary          = "UIAlertControlelr wrapper for Swift."
   s.homepage         = "https://github.com/sgr-ksmt/Alertift"
   # s.screenshots     = ""

diff --git a/Demo/Demo/Assets.xcassets/AppIcon.appiconset/Contents.json b/Demo/Demo/Assets.xcassets/AppIcon.appiconset/Contents.json
@@ -1,5 +1,15 @@
 {
   "images" : [
+    {
+      "idiom" : "iphone",
+      "size" : "20x20",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "iphone",
+      "size" : "20x20",
+      "scale" : "3x"
+    },
     {
       "idiom" : "iphone",
       "size" : "29x29",
@@ -29,6 +39,11 @@
       "idiom" : "iphone",
       "size" : "60x60",
       "scale" : "3x"
+    },
+    {
+      "idiom" : "ios-marketing",
+      "size" : "1024x1024",
+      "scale" : "1x"
     }
   ],
   "info" : {

diff --git a/Demo/Demo/Assets.xcassets/Contents.json b/Demo/Demo/Assets.xcassets/Contents.json
@@ -0,0 +1,6 @@
+{
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}
diff --git a/Demo/Demo/Assets.xcassets/alertImage.imageset/Contents.json b/Demo/Demo/Assets.xcassets/alertImage.imageset/Contents.json
@@ -0,0 +1,21 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "img2.png",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}
diff --git a/Demo/Demo/Assets.xcassets/alertImage.imageset/img2.png b/Demo/Demo/Assets.xcassets/alertImage.imageset/img2.png
diff --git a/Demo/Demo/Assets.xcassets/icon.imageset/Contents.json b/Demo/Demo/Assets.xcassets/icon.imageset/Contents.json
@@ -0,0 +1,21 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "icon.png",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}
diff --git a/Demo/Demo/Assets.xcassets/icon.imageset/icon.png b/Demo/Demo/Assets.xcassets/icon.imageset/icon.png
diff --git a/Demo/Demo/ViewController.swift b/Demo/Demo/ViewController.swift
@@ -50,6 +50,7 @@ class ViewController: UIViewController {
     override func viewDidAppear(_ animated: Bool) {
         super.viewDidAppear(animated)
         Alertift.alert(title: "Alertift", message: "Alertift is swifty, modern, and awesome UIAlertController wrapper.")
+            .image(#imageLiteral(resourceName: "alertImage"))
             .titleTextColor(.red)
             .messageTextColor(.blue)
             .action(.default("❤")) { (action, index, _) in
@@ -58,14 +59,16 @@ class ViewController: UIViewController {
             .action(.default("⭐")) { (action, index, _) in
                 print(action, index)
             }
-            .finally { (action, index, _) in
+            .finally { [weak self] (action, index, _) in
                 print(action, index)
+                self?.showAlertWithActionImage()
             }
             .show(on: self)
     }
 
     private func showSimpleAlert() {
         Alertift.alert(title: "Sample 1", message: "Simple alert!")
+            .image(#imageLiteral(resourceName: "alertImage"))
             .action(.default("OK"))
             .show()
     }
@@ -108,11 +111,19 @@ class ViewController: UIViewController {
             }
             .show()
     }
+
+    private func showAlertWithActionImage() {
+        Alertift.alert(message: "Can use image in alert action")
+            .action(.default("info"), image: #imageLiteral(resourceName: "icon"))
+            .show(on: self)
+    }
+
     private func showActionSheet(anchorView: UIView) {
         Alertift.actionSheet(message: "Which food do you like?", anchorView: anchorView)
-            .actions(["🍣", "🍎", "🍖", "🍅"]) { (action, index) in
-                print(action, index)
-            }
+            .action(.default("🍣"), image: #imageLiteral(resourceName: "icon"))
+            .action(.default("🍎"), image: #imageLiteral(resourceName: "icon"))
+            .action(.default("🍖"), image: #imageLiteral(resourceName: "icon"))
+            .action(.default("🍅"), image: #imageLiteral(resourceName: "icon"))
             .action(.cancel("None of them"))
             .finally { action, index in
                 if action.style == .cancel {
@@ -123,22 +134,6 @@ class ViewController: UIViewController {
                     .show()
             }
             .show()
-
-//        Alertift.actionSheet(message: "Which food do you like?", anchorView: anchorView)
-//            .action(.default("🍣"))
-//            .action(.default("🍎"))
-//            .action(.default("🍖"))
-//            .action(.default("🍅"))
-//            .action(.cancel("None of them"))
-//            .finally { action, index in
-//                if action.style == .cancel {
-//                    return
-//                }
-//                Alertift.alert(message: "\(index). \(action.title!)")
-//                    .action(.default("OK"))
-//                    .show()
-//            }
-//            .show()
     }
 }
 
diff --git a/Documents/how_to_use.md b/Documents/how_to_use.md
@@ -109,6 +109,41 @@ Alertift.actionSheet(message: "Which food do you like?")
 
 ![img5](img5.png)
 
+### Display Image
+
+```swift
+let alertImage: UIImage = ...
+Alertift.alert(title: "Alert with image", message: "You can add image simpley. call `alertift.image()`")
+    .image(alertImage)
+    .action(.default("OK"))
+    .show()
+```
+
+![img7](img7.png)
+
+### Add imaget to UIAlertAction
+
+```swift
+let infoIconImage: UIImage = ...
+Alertift.actionSheet(message: "Which food do you like?", anchorView: anchorView)
+    .action(.default("🍣"), image: infoIconImage)
+    .action(.default("🍎"), image: infoIconImage)
+    .action(.default("🍖"), image: infoIconImage)
+    .action(.default("🍅"), image: infoIconImage)
+    .action(.cancel("None of them"))
+    .finally { action, index in
+        if action.style == .cancel {
+            return
+        }
+        Alertift.alert(message: "\(index). \(action.title!)")
+            .action(.default("OK"))
+            .show()
+    }
+    .show()
+```
+
+![img8](img8.png)
+
 ### Change colors
 
 ```swift

diff --git a/Documents/img7.png b/Documents/img7.png
diff --git a/Documents/img8.png b/Documents/img8.png
diff --git a/README.md b/README.md
@@ -20,74 +20,13 @@ Alertift.alert(title: "Alertift", message: "Alertift is swifty, modern, and awes
 - Method chain.
 - Can add multiple actions at once.
 - UITextField support.
+- Image support. (above v3.1)
 - iPad support(Action Sheet, popover).
 - Can change title/message/button text/ background color **without** using private APIs.
 - Can change title/message's alignment **without** using private APIs.
 
-## Examples
-
-```swift
-Alertift.alert(title: "Sample 1", message: "Simple alert!")
-    .action(.default("OK"))
-    .show(on: self) // show on specified view controller
-```
-
-![img2](Documents/img2.png)
-
-
-```swift
-Alertift.alert(title: "Confirm", message: "Delete this post?")
-    .action(.destructive("Delete")) {  _ in
-        // delete post
-    }
-    .action(.cancel("Cancel"))
-    .show()
-    // Default presented view controller is `UIApplication.shared.keyWindow?.rootViewController`
-```
-
-![img1](Documents/img1.png)
-
-
-```swift
-Alertift.alert(title: "Sign in", message: "Input your ID and Password")
-    .textField { textField in
-        textField.placeholder = "ID"
-    }
-    .textField { textField in
-        textField.placeholder = "Password"
-        textField.isSecureTextEntry = true
-    }
-    .action(.cancel("Cancel"))
-    .action(.default("Sign in")) { _, _, textFields in
-        let id = textFields?.first?.text ?? ""
-        let password = textFields?.last?.text ?? ""
-        // sign in
-    }
-    .show()
-```
-
-![img3](Documents/img3.png)
-
-
-```swift
-Alertift.actionSheet(message: "Which food do you like?")
-    .actions(["🍣", "🍎", ,"🍖", "🍅"])
-    .action(.cancel("None of them"))
-    .finally { action, index in
-       if action.style == .cancel {
-           return
-       }
-       Alertift.alert(message: "\(index). \(action.title!)")
-           .action(.default("OK"))
-           .show()
-    }
-    .show()
-```
-
-![img4](Documents/img4.png)
-
-
-**See more: [How to use](Documents/how_to_use.md)**
+## How to use
+👉👉👉 **[How to use](Documents/how_to_use.md)**
 
 ## Requirements
 - iOS 9.0+

diff --git a/Sources/ActionSheet.swift b/Sources/ActionSheet.swift
@@ -11,6 +11,7 @@ import Foundation
 extension Alertift {
     /// ActionSheet
     final public class ActionSheet: AlertType, _AlertType {
+
         public typealias Handler = (UIAlertAction, Int) -> Void
 
         var _alertController: InnerAlertController!
@@ -35,9 +36,20 @@ extension Alertift {
 
         /// Add action to alertController
         public func action(_ action: Alertift.Action, handler: Handler? = nil) -> Self {
-            _alertController.addAction(buildAlertAction(action, handler:
+            return self.action(action, image: nil, handler: handler)
+        }
+
+        /// Add action to alertController
+        public func action(_ action: Alertift.Action, image: UIImage?, renderingMode: UIImageRenderingMode = .automatic, handler: Handler? = nil) -> Self {
+            let alertAction = buildAlertAction(action, handler:
                 merge(_alertController.actionHandler, handler ?? { (_, _) in })
-            ))
+            )
+
+            if let image = image {
+                alertAction.setValue(image.withRenderingMode(renderingMode), forKey: "image")
+            }
+
+            _alertController.addAction(alertAction)
             return self
         }
 
@@ -81,7 +93,12 @@ extension Alertift {
         func convertFinallyHandler(_ handler: Any) -> InnerAlertController.FinallyHandler {
             return { (action, index, _) in  (handler as? Handler)?(action, index) }
         }
-
+
+        public func image(_ image: UIImage?, imageTopMargin: Alertift.ImageTopMargin = .none) -> Self {
+            _alertController.setImage(image, imageTopMargin: imageTopMargin)
+            return self
+        }
+
         deinit {
             Debug.log()
         }

diff --git a/Sources/Alert.swift b/Sources/Alert.swift
@@ -9,6 +9,12 @@
 import Foundation
 
 extension Alertift {
+    public enum AlertImagePosition {
+        case top // Above title and message
+        case center // Between title and message
+        case bottom // Below title and message
+    }
+
     /// Alert
     final public class Alert: AlertType, _AlertType {
         public typealias Handler = (UIAlertAction, Int, [UITextField]?) -> Void
@@ -51,13 +57,41 @@ extension Alertift {
         ///   - handler: The block to execute after this action performed.
         /// - Returns: Myself
         public func action(_ action: Alertift.Action, isPreferred: Bool, handler: Handler? = nil) -> Self {
-            addActionToAlertController(
-                buildAlertAction(
-                    action,
-                    handler: merge(_alertController.actionWithTextFieldsHandler, handler ?? { (_, _, _)in })
-                ),
-                isPreferred: isPreferred
+            return self.action(action, image: nil, isPreferred: isPreferred, handler: handler)
+        }
+
+        /// Add action to Alert
+        ///
+        /// - Parameters:
+        ///   - action: Alert action.
+        ///   - image: Image of action.
+        ///   - renderMode: Render mode for alert action image. Default is `.automatic`
+        ///   - handler: The block to execute after this action performed.
+        /// - Returns: Myself
+        public func action(_ action: Alertift.Action, image: UIImage?, renderingMode: UIImageRenderingMode = .automatic, handler: Handler? = nil) -> Self {
+            return self.action(action, image: image, renderingMode: renderingMode, isPreferred: false, handler: handler)
+        }
+
+        /// Add action to Alert
+        ///
+        /// - Parameters:
+        ///   - action: Alert action.
+        ///   - image: Image of action
+        ///   - renderMode: Render mode for alert action image. Default is `.automatic`
+        ///   - isPreferred: If you want to change this action to preferredAction, set true. Default is false.
+        ///   - handler: The block to execute after this action performed.
+        /// - Returns: Myself
+        public func action(_ action: Alertift.Action, image: UIImage?, renderingMode: UIImageRenderingMode = .automatic, isPreferred: Bool, handler: Handler? = nil) -> Self {
+            let alertAction = buildAlertAction(
+                action,
+                handler: merge(_alertController.actionWithTextFieldsHandler, handler ?? { (_, _, _)in })
             )
+
+            if let image = image {
+                alertAction.setValue(image.withRenderingMode(renderingMode), forKey: "image")
+            }
+
+            addActionToAlertController(alertAction, isPreferred: isPreferred)
             return self
         }
 
@@ -100,6 +134,11 @@ extension Alertift {
         func convertFinallyHandler(_ handler: Any) -> InnerAlertController.FinallyHandler {
             return { (handler as? Handler)?($0, $1, $2) }
         }
+
+        public func image(_ image: UIImage?, imageTopMargin: Alertift.ImageTopMargin = .none) -> Self {
+            _alertController.setImage(image, imageTopMargin: imageTopMargin)
+            return self
+        }
 
         deinit {
             Debug.log()