Merge pull request #84 from Orderella/development

Fixes memory leak with custom view controllers

CHANGELOG.md

@@ -1,5 +1,6 @@
 # Changelog
 
+* **0.5.3** Fixed memory leak with custom view controllers
 * **0.5.2** Fixed image scaling for default view 
 * **0.5.1** Introduced custom button height parameter<br>Reintroduced iOS8 compatibility
 * **0.5.0** Swift 3 compatibility / removed iOS8

PopupDialog.podspec

@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name             = 'PopupDialog'
-  s.version          = '0.5.2'
+  s.version          = '0.5.3'
   s.summary          = 'A simple custom popup dialog view controller'
   s.homepage         = 'https://github.com/orderella/PopupDialog'
   s.license          = { :type => 'MIT', :file => 'LICENSE' }

PopupDialog/Classes/InteractiveTransition.swift

@@ -25,15 +25,9 @@
 
 import Foundation
 
-protocol InteractiveTransitionDelegate {
-    func interactiveTransitionDidDismissViewController()
-}
-
 // Handles interactive transition triggered via pan gesture recognizer on dialog
 final internal class InteractiveTransition: UIPercentDrivenInteractiveTransition {
 
-    var delegate: InteractiveTransitionDelegate?
-
     // If the interactive transition was started
     var hasStarted = false
 
@@ -63,12 +57,7 @@ final internal class InteractiveTransition: UIPercentDrivenInteractiveTransition
         case .ended:
             hasStarted = false
             completionSpeed = 0.55
-            if shouldFinish {
-                finish()
-                delegate?.interactiveTransitionDidDismissViewController()
-            } else {
-                cancel()
-            }
+            shouldFinish ? finish() : cancel()
         default:
             break
         }

PopupDialog/Classes/PopupDialog.swift

@@ -27,7 +27,7 @@ import Foundation
 import UIKit
 
 /// Creates a Popup dialog similar to UIAlertController
-final public class PopupDialog: UIViewController, InteractiveTransitionDelegate {
+final public class PopupDialog: UIViewController {
 
     // MARK: Private / Internal
 
@@ -41,11 +41,7 @@ final public class PopupDialog: UIViewController, InteractiveTransitionDelegate
     fileprivate var presentationManager: PresentationManager!
 
     /// Interactor class for pan gesture dismissal
-    fileprivate lazy var interactor: InteractiveTransition = {
-        let interactor = InteractiveTransition()
-        interactor.delegate = self
-       return interactor
-    }()
+    fileprivate lazy var interactor = InteractiveTransition()
 
     /// Returns the controllers view
     internal var popupContainerView: PopupDialogContainerView {
@@ -204,11 +200,7 @@ final public class PopupDialog: UIViewController, InteractiveTransitionDelegate
         // Make sure it's not a tap on the dialog but the background
         let point = sender.location(in: popupContainerView.stackView)
         guard !popupContainerView.stackView.point(inside: point, with: nil) else { return }
-        dismiss(self.completion)
-    }
-
-    func interactiveTransitionDidDismissViewController() {
-        self.completion?()
+        dismiss()
     }
 
     /*!

README.md

@@ -386,6 +386,7 @@ Minimum requirement is iOS 8.0. This dialog was written with Swift 3, for 2.2 co
 
 # Changelog
 
+* **0.5.3** Fixed memory leak with custom view controllers
 * **0.5.2** Fixed image scaling for default view
 * **0.5.1** Introduced custom button height parameter<br>Reintroduced iOS8 compatibility
 * **0.5.0** Swift 3 compatibility / removed iOS8