cancel transition delegate method added

ahmetkgunay · May 24, 2017 · 6c0ad5f · 6c0ad5f
1 parent d913c71
commit 6c0ad5f
Show file tree

Hide file tree

Showing 11 changed files with 115 additions and 54 deletions.
diff --git a/AKGPushAnimator/AKGPushAnimator/AKGPushAnimator.swift b/AKGPushAnimator/AKGPushAnimator/AKGPushAnimator.swift
@@ -11,10 +11,10 @@ import UIKit
 @objc public protocol AKGPushAnimatorDelegate {
 
     @objc optional func beganTransition()
+    @objc optional func cancelledTransition()
     @objc optional func finishedTransition()
 }
 
-
 public class AKGPushAnimator: NSObject {
 
     public var isReverseTransition = false
@@ -86,12 +86,13 @@ public class AKGPushAnimator: NSObject {
 
                         if (transitionContext.transitionWasCancelled) {
                             toView.removeFromSuperview()
+                            self.delegate?.cancelledTransition?()
                         } else {
                             fromView.removeFromSuperview()
+                            self.delegate?.finishedTransition?()
                         }
                         transitionContext.completeTransition(!transitionContext.transitionWasCancelled)
 
-                        self.delegate?.finishedTransition?()
         }
     }
 

diff --git a/AKGPushAnimator/FirstViewController.swift b/AKGPushAnimator/FirstViewController.swift
@@ -36,6 +36,10 @@ extension FirstViewController: AKGPushAnimatorDelegate {
         print("began transition")
     }
 
+    func cancelledTransition() {
+        print("cancelled transition")
+    }
+
     func finishedTransition() {
         print("finished transition")
     }

diff --git a/Examples/AKGPushAnimatorDemo/AKGPushAnimator/AKGPushAnimator/AKGPushAnimator.swift b/Examples/AKGPushAnimatorDemo/AKGPushAnimator/AKGPushAnimator/AKGPushAnimator.swift
@@ -11,10 +11,10 @@ import UIKit
 @objc public protocol AKGPushAnimatorDelegate {
 
     @objc optional func beganTransition()
+    @objc optional func cancelledTransition()
     @objc optional func finishedTransition()
 }
 
-
 public class AKGPushAnimator: NSObject {
 
     public var isReverseTransition = false
@@ -86,12 +86,13 @@ public class AKGPushAnimator: NSObject {
 
                         if (transitionContext.transitionWasCancelled) {
                             toView.removeFromSuperview()
+                            self.delegate?.cancelledTransition?()
                         } else {
                             fromView.removeFromSuperview()
+                            self.delegate?.finishedTransition?()
                         }
                         transitionContext.completeTransition(!transitionContext.transitionWasCancelled)
 
-                        self.delegate?.finishedTransition?()
         }
     }
 

diff --git a/Examples/AKGPushAnimatorTableviewDemo/Podfile b/Examples/AKGPushAnimatorTableviewDemo/Podfile
@@ -3,7 +3,7 @@ platform :ios, '8.0'
 target 'AKGPushAnimatorTableviewDemo' do
   use_frameworks!
 
-pod 'AKGPushAnimator', '~> 1.0.3'
+pod 'AKGPushAnimator', '~> 1.0.4'
 
   target 'AKGPushAnimatorTableviewDemoTests' do
     inherit! :search_paths

diff --git a/Examples/AKGPushAnimatorTableviewDemo/Podfile.lock b/Examples/AKGPushAnimatorTableviewDemo/Podfile.lock
@@ -1,12 +1,12 @@
 PODS:
-  - AKGPushAnimator (1.0.3)
+  - AKGPushAnimator (1.0.4)
 
 DEPENDENCIES:
-  - AKGPushAnimator (~> 1.0.3)
+  - AKGPushAnimator (~> 1.0.4)
 
 SPEC CHECKSUMS:
-  AKGPushAnimator: 7c6c0c348aa20b015c559bd41c0f8d39a39002fe
+  AKGPushAnimator: d8bb4b710a798603f4c8b5c71be3578f1f1ed708
 
-PODFILE CHECKSUM: 47efaf878697cff3a4efeb7577867c4069d71ef8
+PODFILE CHECKSUM: 1a9ca41fd159f3d33bb6dfef8b6d066d7528e902
 
 COCOAPODS: 1.2.1
diff --git a/Examples/AKGPushAnimatorTableviewDemo/Pods/AKGPushAnimator/README.md b/Examples/AKGPushAnimatorTableviewDemo/Pods/AKGPushAnimator/README.md
diff --git a/Examples/AKGPushAnimatorTableviewDemo/Pods/AKGPushAnimator/Source/AKGPushAnimator.swift b/Examples/AKGPushAnimatorTableviewDemo/Pods/AKGPushAnimator/Source/AKGPushAnimator.swift
diff --git a/...s/AKGPushAnimatorTableviewDemo/Pods/AKGPushAnimator/Source/AKGPushAnimatorConstants.swift b/...s/AKGPushAnimatorTableviewDemo/Pods/AKGPushAnimator/Source/AKGPushAnimatorConstants.swift
diff --git a/Examples/AKGPushAnimatorTableviewDemo/Pods/Manifest.lock b/Examples/AKGPushAnimatorTableviewDemo/Pods/Manifest.lock
diff --git a/Examples/AKGPushAnimatorTableviewDemo/Pods/Target Support Files/AKGPushAnimator/Info.plist b/Examples/AKGPushAnimatorTableviewDemo/Pods/Target Support Files/AKGPushAnimator/Info.plist
diff --git a/Source/AKGPushAnimator.swift b/Source/AKGPushAnimator.swift
@@ -11,10 +11,10 @@ import UIKit
 @objc public protocol AKGPushAnimatorDelegate {
 
     @objc optional func beganTransition()
+    @objc optional func cancelledTransition()
     @objc optional func finishedTransition()
 }
 
-
 public class AKGPushAnimator: NSObject {
 
     public var isReverseTransition = false
@@ -86,12 +86,13 @@ public class AKGPushAnimator: NSObject {
 
                         if (transitionContext.transitionWasCancelled) {
                             toView.removeFromSuperview()
+                            self.delegate?.cancelledTransition?()
                         } else {
                             fromView.removeFromSuperview()
+                            self.delegate?.finishedTransition?()
                         }
                         transitionContext.completeTransition(!transitionContext.transitionWasCancelled)
 
-                        self.delegate?.finishedTransition?()
         }
     }