adding onDismiss action

vitormesquita · Mar 25, 2019 · 267116c · 267116c
1 parent a502da9
commit 267116c
Show file tree

Hide file tree

Showing 5 changed files with 18 additions and 10 deletions.
diff --git a/Example/Malert.xcodeproj/project.pbxproj b/Example/Malert.xcodeproj/project.pbxproj
@@ -748,7 +748,7 @@
 				IPHONEOS_DEPLOYMENT_TARGET = 11.0;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
 				MODULE_NAME = ExampleApp;
-				PRODUCT_BUNDLE_IDENTIFIER = org.cocoapods.demo.Malert;
+				PRODUCT_BUNDLE_IDENTIFIER = com.mesquita.malert;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";
 				SWIFT_SWIFT3_OBJC_INFERENCE = Default;
@@ -769,7 +769,7 @@
 				IPHONEOS_DEPLOYMENT_TARGET = 11.0;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
 				MODULE_NAME = ExampleApp;
-				PRODUCT_BUNDLE_IDENTIFIER = org.cocoapods.demo.Malert;
+				PRODUCT_BUNDLE_IDENTIFIER = com.mesquita.malert;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";
 				SWIFT_SWIFT3_OBJC_INFERENCE = Default;

diff --git a/Example/Malert/listExamples/ListExamples.swift b/Example/Malert/listExamples/ListExamples.swift
@@ -197,6 +197,10 @@ extension ListExamplesViewController {
         alert.cornerRadius = 0
         alert.buttonsBottomMargin = 16
         alert.buttonsSideMargin = 16
+
+        alert.onDismissMalert {
+            print("dismissed")
+        }
 
         let action = MalertAction(title: "THAT'S IT")
         action.tintColor = .white

diff --git a/Malert.podspec b/Malert.podspec
@@ -4,7 +4,7 @@
 
 Pod::Spec.new do |s|
   s.name             = 'Malert'
-  s.version          = '3.1.3'
+  s.version          = '3.1.4'
   s.summary          = 'A simple, easy and very customizable alert'
   s.description      = <<-DESC
     Malert came to facilitate make custom alert views, introducing as `UIAlertController`.

diff --git a/Malert/Classes/Malert/Malert+Actions.swift b/Malert/Classes/Malert/Malert+Actions.swift
@@ -15,9 +15,7 @@ extension Malert {
 
             let isPointInMalertView = malertView.frame.contains(point)
             if !isPointInMalertView {
-                dismiss(animated: true) {
-                    print("dismissed")
-                }
+                dismiss(animated: true, completion: self.completionBlock)
             }
         } else {
             self.view.endEditing(true)
@@ -29,9 +27,7 @@ extension Malert: MalertActionCallbackProtocol {
 
     func didTapOnAction() {
         if dismissOnActionTapped {
-            dismiss(animated: true) {
-                print("dismissed")
-            }
+            dismiss(animated: true, completion: self.completionBlock)
         }
     }
 }
diff --git a/Malert/Classes/Malert/Malert.swift b/Malert/Classes/Malert/Malert.swift
@@ -20,6 +20,7 @@ public class Malert: BaseMalertViewController {
 
     let tapToDismiss: Bool
     let dismissOnActionTapped: Bool
+    var completionBlock: (() -> Void)?
 
     lazy var visibleView: UIView = {
         let visibleView = UIView()
@@ -84,7 +85,9 @@ public class Malert: BaseMalertViewController {
     }
 
     deinit {
+        #if DEBUG
         print("dealloc ---> Malert")
+        #endif
     }
 }
 
@@ -158,7 +161,7 @@ extension Malert {
         get { return malertView.buttonsSideMargin }
         set { malertView.buttonsSideMargin = newValue }
     }
-
+    
     public var buttonsBottomMargin: CGFloat {
         get { return malertView.buttonsBottomMargin }
         set { malertView.buttonsBottomMargin = newValue }
@@ -174,7 +177,12 @@ extension Malert {
         set { malertView.buttonsFont = newValue }
     }
 
+    /* Actions */
     public func addAction(_ malertButton: MalertAction) {
         malertView.addButton(malertButton, actionCallback: self)
     }
+
+    public func onDismissMalert(_ block: @escaping (() -> Void)) {
+        self.completionBlock = block
+    }
 }