Merge pull request #294 from Orderella/development

Fixes crash when dialog is presented while app is in background

CHANGELOG.md

@@ -1,5 +1,6 @@
 # Changelog
 
+* **0.9.2** Fixes crash when presenting dialog while app is inactive
 * **0.9.1** Fixes Carthage support
 * **0.9.0** Swift 4.2 support
 * **0.8.1** Added shadow appearance properties

Example/Podfile.lock

@@ -6,9 +6,9 @@ PODS:
   - FBSnapshotTestCase/SwiftSupport (2.1.4):
     - FBSnapshotTestCase/Core
   - Nimble (7.3.1)
-  - PopupDialog (0.9.1):
+  - PopupDialog (0.9.2):
     - DynamicBlurView (~> 3.0.1)
-  - SwiftLint (0.27.0)
+  - SwiftLint (0.29.1)
 
 DEPENDENCIES:
   - FBSnapshotTestCase (~> 2.1.4)
@@ -31,8 +31,8 @@ SPEC CHECKSUMS:
   DynamicBlurView: b1df5415f9bd31897549e5d7077e5ec120a4d636
   FBSnapshotTestCase: 094f9f314decbabe373b87cc339bea235a63e07a
   Nimble: 04f732da099ea4d153122aec8c2a88fd0c7219ae
-  PopupDialog: 2e2b7dcde4bd6d6ef62a8b6f4ea02c7fea2710cd
-  SwiftLint: 3207c1faa2240bf8973b191820a116113cd11073
+  PopupDialog: 262df853f60f779ec354244e83dbb47ce52ac32a
+  SwiftLint: 6772320e40b52049053a518c17db9b0634a0b45a
 
 PODFILE CHECKSUM: 2d0166d1e20a1e39377fb316142d39a3785d58f2
 

PopupDialog.podspec

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

PopupDialog/Classes/TransitionAnimations.swift

@@ -54,13 +54,15 @@ final internal class BounceUpTransition: TransitionAnimator {
         switch direction {
         case .in:
             to.view.bounds.origin = CGPoint(x: 0, y: -from.view.bounds.size.height)
-            UIView.animate(withDuration: 0.6, delay: 0.0, usingSpringWithDamping: 0.6, initialSpringVelocity: 0, options: [.curveEaseOut], animations: {
+            UIView.animate(withDuration: 0.6, delay: 0.0, usingSpringWithDamping: 0.6, initialSpringVelocity: 0, options: [.curveEaseOut], animations: { [weak self] in
+                guard let self = self else { return }
                 self.to.view.bounds = self.from.view.bounds
-            }, completion: { completed in
-                transitionContext.completeTransition(completed)
+            }, completion: { _ in
+                transitionContext.completeTransition(true)
             })
         case .out:
-            UIView.animate(withDuration: outDuration, delay: 0.0, options: [.curveEaseIn], animations: {
+            UIView.animate(withDuration: outDuration, delay: 0.0, options: [.curveEaseIn], animations: { [weak self] in
+                guard let self = self else { return }
                 self.from.view.bounds.origin = CGPoint(x: 0, y: -self.from.view.bounds.size.height)
                 self.from.view.alpha = 0.0
             }, completion: { _ in
@@ -84,13 +86,15 @@ final internal class BounceDownTransition: TransitionAnimator {
         switch direction {
         case .in:
             to.view.bounds.origin = CGPoint(x: 0, y: from.view.bounds.size.height)
-            UIView.animate(withDuration: 0.6, delay: 0.0, usingSpringWithDamping: 0.6, initialSpringVelocity: 0, options: [.curveEaseOut], animations: {
+            UIView.animate(withDuration: 0.6, delay: 0.0, usingSpringWithDamping: 0.6, initialSpringVelocity: 0, options: [.curveEaseOut], animations: { [weak self] in
+                guard let self = self else { return }
                 self.to.view.bounds = self.from.view.bounds
-            }, completion: { completed in
-                transitionContext.completeTransition(completed)
+            }, completion: { _ in
+                transitionContext.completeTransition(true)
             })
         case .out:
-            UIView.animate(withDuration: outDuration, delay: 0.0, options: [.curveEaseIn], animations: {
+            UIView.animate(withDuration: outDuration, delay: 0.0, options: [.curveEaseIn], animations: { [weak self] in
+                guard let self = self else { return }
                 self.from.view.bounds.origin = CGPoint(x: 0, y: self.from.view.bounds.size.height)
                 self.from.view.alpha = 0.0
             }, completion: { _ in
@@ -113,13 +117,15 @@ final internal class ZoomTransition: TransitionAnimator {
         switch direction {
         case .in:
             to.view.transform = CGAffineTransform(scaleX: 0.1, y: 0.1)
-            UIView.animate(withDuration: 0.6, delay: 0.0, usingSpringWithDamping: 0.6, initialSpringVelocity: 0, options: [.curveEaseOut], animations: {
+            UIView.animate(withDuration: 0.6, delay: 0.0, usingSpringWithDamping: 0.6, initialSpringVelocity: 0, options: [.curveEaseOut], animations: { [weak self] in
+                guard let self = self else { return }
                 self.to.view.transform = CGAffineTransform(scaleX: 1, y: 1)
-            }, completion: { completed in
-                transitionContext.completeTransition(completed)
+            }, completion: { _ in
+                transitionContext.completeTransition(true)
             })
         case .out:
-            UIView.animate(withDuration: outDuration, delay: 0.0, options: [.curveEaseIn], animations: {
+            UIView.animate(withDuration: outDuration, delay: 0.0, options: [.curveEaseIn], animations: { [weak self] in
+                guard let self = self else { return }
                 self.from.view.transform = CGAffineTransform(scaleX: 0.1, y: 0.1)
                 self.from.view.alpha = 0.0
             }, completion: { _ in
@@ -143,13 +149,15 @@ final internal class FadeTransition: TransitionAnimator {
         case .in:
             to.view.alpha = 0
             UIView.animate(withDuration: 0.6, delay: 0.0, options: [.curveEaseOut],
-            animations: {
+            animations: { [weak self] in
+                guard let self = self else { return }
                 self.to.view.alpha = 1
-            }, completion: { completed in
-                transitionContext.completeTransition(completed)
+            }, completion: { _ in
+                transitionContext.completeTransition(true)
             })
         case .out:
-            UIView.animate(withDuration: outDuration, delay: 0.0, options: [.curveEaseIn], animations: {
+            UIView.animate(withDuration: outDuration, delay: 0.0, options: [.curveEaseIn], animations: { [weak self] in
+                guard let self = self else { return }
                 self.from.view.alpha = 0.0
             }, completion: { _ in
                 transitionContext.completeTransition(!transitionContext.transitionWasCancelled)
@@ -167,7 +175,8 @@ final internal class DismissInteractiveTransition: TransitionAnimator {
 
     override func animateTransition(using transitionContext: UIViewControllerContextTransitioning) {
         super.animateTransition(using: transitionContext)
-        UIView.animate(withDuration: outDuration, delay: 0.0, options: [.beginFromCurrentState], animations: {
+        UIView.animate(withDuration: outDuration, delay: 0.0, options: [.beginFromCurrentState], animations: { [weak self] in
+            guard let self = self else { return }
             self.from.view.bounds.origin = CGPoint(x: 0, y: -self.from.view.bounds.size.height)
             self.from.view.alpha = 0.0
         }, completion: { _ in

README.md

@@ -446,6 +446,7 @@ Minimum requirement is iOS 9.0. This dialog was written with Swift 4, for suppor
 <p>&nbsp;</p>
 
 # Changelog
+* **0.9.2** Fixes crash when presenting dialog while app is inactive
 * **0.9.1** Fixes Carthage support
 * **0.9.0** Swift 4.2 support
 * **0.8.1** Added shadow appearance properties