Merge branch 'develop'

sgr-ksmt · Jul 5, 2019 · f9cbb8f · f9cbb8f
2 parents 5059fd0 + 51ac554
commit f9cbb8f
Show file tree

Hide file tree

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

diff --git a/Demo/Demo/ViewController.swift b/Demo/Demo/ViewController.swift
@@ -75,12 +75,12 @@ class ViewController: UIViewController {
 
     private func showYesOrNoAlert() {
         Alertift.alert(title: "Sample 2",message: "Do you like 🍣?")
-            .action(.default("Yes"), isPreferred: true) { (_, _, _) in
+            .action(.default("Yes"), isPreferred: true) {
                 Alertift.alert(message: "🍣🍣🍣")
                     .action(.default("Close"))
                     .show()
             }
-            .action(.cancel("No")) { (_, _, _) in
+            .action(.cancel("No")) {
                 Alertift.alert(message: "😂😂😂")
                     .action(.destructive("Close"))
                     .show()

diff --git a/Documents/how_to_use.md b/Documents/how_to_use.md
@@ -14,7 +14,7 @@ Alertift.alert(title: "Sample 1", message: "Simple alert!")
 
 ```swift
 Alertift.alert(title: "Confirm", message: "Delete this post?")
-    .action(.destructive("Delete")) { _, _, _ in
+    .action(.destructive("Delete")) {
         // delete post
     }
     .action(.cancel("Cancel"))

diff --git a/README.md b/README.md
@@ -30,8 +30,8 @@ Alertift.alert(title: "Alertift", message: "Alertift is swifty, modern, and awes
 
 ## Requirements
 - iOS 9.0+
-- Xcode 8.1+
-- Swift 3.0+
+- Xcode 10+
+- Swift 5.0+
 
 ## Installation
 
@@ -81,9 +81,6 @@ and run `pod install`
 ### Manually Install
 Download all `*.swift` files and put your project.
 
-## Change log
-Change log is [here](https://github.com/sgr-ksmt/Alertift/blob/master/CHANGELOG.md).
-
 ## Communication
 - If you found a bug, open an issue.
 - If you have a feature request, open an issue.

diff --git a/Sources/ActionSheet.swift b/Sources/ActionSheet.swift
@@ -11,7 +11,6 @@ import Foundation
 extension Alertift {
     /// ActionSheet
     final public class ActionSheet: AlertType, _AlertType {
-
         public typealias Handler = (UIAlertAction, Int) -> Void
 
         var _alertController: InnerAlertController!
@@ -35,12 +34,17 @@ extension Alertift {
         }
 
         /// Add action to alertController
-        public func action(_ action: Alertift.Action, handler: Handler? = nil) -> Self {
+        public func action(_ action: Alertift.Action, handler: Handler?) -> Self {
             return self.action(action, image: nil, handler: handler)
         }
 
+        public func action(_ action: Alertift.Action, handler: ShortHandler? = nil) -> Self {
+            return self.action(action) { _, _ in handler?() }
+        }
+
+
         /// Add action to alertController
-        public func action(_ action: Alertift.Action, image: UIImage?, renderingMode: UIImage.RenderingMode = .automatic, handler: Handler? = nil) -> Self {
+        public func action(_ action: Alertift.Action, image: UIImage?, renderingMode: UIImage.RenderingMode = .automatic, handler: Handler?) -> Self {
             let alertAction = buildAlertAction(action, handler:
                 merge(_alertController.actionHandler, handler ?? { (_, _) in })
             )
@@ -52,6 +56,10 @@ extension Alertift {
             _alertController.addAction(alertAction)
             return self
         }
+
+        public func action(_ action: Alertift.Action, image: UIImage?, renderingMode: UIImage.RenderingMode = .automatic, handler: ShortHandler? = nil) -> Self {
+            return self.action(action, image: image, renderingMode: renderingMode) { _, _ in handler?() }
+        }
 
         /// Add sourceView and sourceRect to **popoverPresentationController**.
         ///

diff --git a/Sources/Alert.swift b/Sources/Alert.swift
@@ -45,21 +45,28 @@ extension Alertift {
             buildAlertControlelr(title: title, message: message, style: .alert)
         }
 
-        public func action(_ action: Alertift.Action, handler: Handler? = nil) -> Self {
+        public func action(_ action: Alertift.Action, handler: Handler?) -> Self {
             return self.action(action, isPreferred: false, handler: handler)
         }
 
+        public func action(_ action: Alertift.Action, handler: ShortHandler? = nil) -> Self {
+            return self.action(action) { _, _, _ in handler?() }
+        }
         /// Add action to Alert
         ///
         /// - Parameters:
         ///   - action: Alert action.
         ///   - 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, isPreferred: Bool, handler: Handler? = nil) -> Self {
+        public func action(_ action: Alertift.Action, isPreferred: Bool, handler: Handler?) -> Self {
             return self.action(action, image: nil, isPreferred: isPreferred, handler: handler)
         }
 
+        public func action(_ action: Alertift.Action, isPreferred: Bool, handler: ShortHandler? = nil) -> Self {
+            return self.action(action, image: nil, isPreferred: isPreferred) { _, _, _ in handler?() }
+        }
+
         /// Add action to Alert
         ///
         /// - Parameters:
@@ -68,10 +75,14 @@ extension Alertift {
         ///   - 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: UIImage.RenderingMode = .automatic, handler: Handler? = nil) -> Self {
+        public func action(_ action: Alertift.Action, image: UIImage?, renderingMode: UIImage.RenderingMode = .automatic, handler: Handler?) -> Self {
             return self.action(action, image: image, renderingMode: renderingMode, isPreferred: false, handler: handler)
         }
 
+        public func action(_ action: Alertift.Action, image: UIImage?, renderingMode: UIImage.RenderingMode = .automatic, handler: ShortHandler? = nil) -> Self {
+            return self.action(action, image: image, renderingMode: renderingMode, isPreferred: false) { _, _, _ in handler?() }
+        }
+
         /// Add action to Alert
         ///
         /// - Parameters:
@@ -81,7 +92,7 @@ extension Alertift {
         ///   - 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: UIImage.RenderingMode = .automatic, isPreferred: Bool, handler: Handler? = nil) -> Self {
+        public func action(_ action: Alertift.Action, image: UIImage?, renderingMode: UIImage.RenderingMode = .automatic, isPreferred: Bool, handler: Handler?) -> Self {
             let alertAction = buildAlertAction(
                 action,
                 handler: merge(_alertController.actionWithTextFieldsHandler, handler ?? { (_, _, _)in })
@@ -95,6 +106,10 @@ extension Alertift {
             return self
         }
 
+        public func action(_ action: Alertift.Action, image: UIImage?, renderingMode: UIImage.RenderingMode = .automatic, isPreferred: Bool, handler: ShortHandler? = nil) -> Self {
+            return self.action(action, image: image, renderingMode: renderingMode, isPreferred: isPreferred) { _, _, _ in handler?() }
+        }
+
         /// Add text field to alertController
         ///
         /// - Parameter handler: Define handler if you want to customize UITextField. Default is nil.

diff --git a/Sources/AlertType.swift b/Sources/AlertType.swift
@@ -29,6 +29,7 @@ extension _AlertType where Self: AlertType {
 /// AlertType protocol
 public protocol AlertType: class {
     associatedtype Handler
+    typealias ShortHandler = () -> Void
 
     /// Add action to Alert
     ///
@@ -37,7 +38,15 @@ public protocol AlertType: class {
     ///   - handler: The block to execute after this action performed.
     /// - Returns: Myself
     func action(_ action: Alertift.Action, handler: Handler?) -> Self
-
+
+    /// Add action to Alert
+    ///
+    /// - Parameters:
+    ///   - action: Alert action.
+    ///   - handler: The block to execute after this action performed.
+    /// - Returns: Myself
+    func action(_ action: Alertift.Action, handler: ShortHandler?) -> Self
+
     /// UIAlertController
     var alertController: UIAlertController { get }
     /// default background color of Alert(ActionSheet).