Add delay option

T-Pro · May 7, 2020 · 21832f7 · 21832f7
1 parent 4807ac9
commit 21832f7
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 7 deletions.
diff --git a/CircularRevealKit.podspec b/CircularRevealKit.podspec
@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name             = 'CircularRevealKit'
-  s.version          = '0.9.3'
+  s.version          = '0.9.4'
   s.summary          = 'Circular reveal animations made easy'
   s.homepage         = 'https://github.com/T-Pro/CircularRevealKit'
   s.description      = 'This library was created to allow developers to implement the material design reveal effect.'

diff --git a/CircularRevealKit/Classes/UICircularViewControllerExtension.swift b/CircularRevealKit/Classes/UICircularViewControllerExtension.swift
@@ -30,16 +30,18 @@ public extension UIViewController {
     duration: TimeInterval = DEFAULT_CIRCULAR_ANIMATION_DURATION,
     startFrame: CGRect = CGRect.zero,
     fadeColor: UIColor? = nil,
+    delay: TimeInterval = .zero,
     _ completion: (() -> Void)? = nil) {
-    self.push(viewController, duration, startFrame, fadeColor, revealType: .reveal, completion)
+    self.push(viewController, duration, startFrame, fadeColor, delay, revealType: .reveal, completion)
   }
 
   func radialDismiss(
     duration: TimeInterval = DEFAULT_CIRCULAR_ANIMATION_DURATION,
     startFrame: CGRect = CGRect.zero,
     fadeColor: UIColor? = nil,
+    delay: TimeInterval = .zero,
     _ completion: (() -> Void)? = nil) {
-    self.push(nil, duration, startFrame, fadeColor, revealType: .unreveal, completion)
+    self.push(nil, duration, startFrame, fadeColor, delay, revealType: .unreveal, completion)
   }
 
   private func validateUINavigationController() -> Bool {
@@ -97,6 +99,7 @@ public extension UIViewController {
     _ duration: TimeInterval = DEFAULT_CIRCULAR_ANIMATION_DURATION,
     _ startFrame: CGRect = CGRect.zero,
     _ fadeColor: UIColor?,
+    _ delay: TimeInterval,
     revealType: RevealType = .reveal,
     _ transitionCompletion: (() -> Void)? = nil) {
 
@@ -140,7 +143,7 @@ public extension UIViewController {
           fromViewSnapshot.isHidden = true
           transactionContext.containerView.addSubview(fromViewSnapshot)
 
-          DispatchQueue.main.asyncAfter(deadline: .now()) {
+          DispatchQueue.main.asyncAfter(deadline: .now() + delay) {
 
             if let fadeView: UIView = fadeView {
               fadeView.alpha = 0.01
@@ -162,7 +165,7 @@ public extension UIViewController {
               duration: animationTime,
               revealType: revealType) { () -> Void in
 
-                DispatchQueue.main.asyncAfter(deadline: .now()) {
+                DispatchQueue.main.asyncAfter(deadline: .now() + delay) {
                   completion(true)
                   transitionCompletion?()
                   fromViewSnapshot.removeFromSuperview()
@@ -185,7 +188,7 @@ public extension UIViewController {
           toViewSnapshot.isHidden = true
           transactionContext.containerView.addSubview(toViewSnapshot)
 
-          DispatchQueue.main.asyncAfter(deadline: .now()) {
+          DispatchQueue.main.asyncAfter(deadline: .now() + delay) {
 
             if let fadeView: UIView = fadeView {
               fadeView.alpha = 1.0
@@ -212,7 +215,7 @@ public extension UIViewController {
               duration: animationTime,
               revealType: revealType) { () -> Void in
 
-                DispatchQueue.main.asyncAfter(deadline: .now()) {
+                DispatchQueue.main.asyncAfter(deadline: .now() + delay) {
                   completion(true)
                   transitionCompletion?()
                   fromViewSnapshot.removeFromSuperview()