convert some functions to computed property

Urtaq · Mar 17, 2017 · 7db8fe8 · 7db8fe8
1 parent 09b0b69
commit 7db8fe8
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 4 deletions.
diff --git a/Example/URExampleMovingTransition.xcodeproj/project.pbxproj b/Example/URExampleMovingTransition.xcodeproj/project.pbxproj
@@ -700,6 +700,7 @@
 				973095DA1E7A9C8500B58892 /* Release */,
 			);
 			defaultConfigurationIsVisible = 0;
+			defaultConfigurationName = Release;
 		};
 		973095E71E7A9C8E00B58892 /* Build configuration list for PBXNativeTarget "URExampleMovingTransitionTests" */ = {
 			isa = XCConfigurationList;
@@ -708,6 +709,7 @@
 				973095E91E7A9C8E00B58892 /* Release */,
 			);
 			defaultConfigurationIsVisible = 0;
+			defaultConfigurationName = Release;
 		};
 		975FD8561E778D2600F409CB /* Build configuration list for PBXProject "URExampleMovingTransition" */ = {
 			isa = XCConfigurationList;

diff --git a/Source/URMovingTransitionAnimator/URMovingTransitionAnimatorDelegate.swift b/Source/URMovingTransitionAnimator/URMovingTransitionAnimatorDelegate.swift
@@ -76,7 +76,7 @@ public class URMovingTransitionAnimatorDelegate: NSObject, UINavigationControlle
     }
 
     public func navigationController(_ navigationController: UINavigationController, didShow viewController: UIViewController, animated: Bool) {
-        if !(viewController is URMovingTransitionMakable) && !self.movingTransitionViewController.isPopableViewController() {
+        if !(viewController is URMovingTransitionMakable) && !self.movingTransitionViewController.isPopableViewController {
             navigationController.delegate = nil
         }
     }

diff --git a/Source/URMovingTransitionAnimator/URMovingTransitionViewController.swift b/Source/URMovingTransitionAnimator/URMovingTransitionViewController.swift
@@ -16,8 +16,8 @@ public protocol URMovingTransitionMakable: class {
 
     var movingTransitionDelegate: URMovingTransitionAnimatorDelegate! { get set }
     var navigationController: UINavigationController? { get }
+    var isPopableViewController: Bool { get }
 
-    func isPopableViewController() -> Bool
     func makeTransitionAnimator(target: UIView, baseOn: UIView, duration: Double)
 }
 
@@ -27,7 +27,7 @@ extension URMovingTransitionMakable where Self: UIViewController {
         return self.navigationController
     }
 
-    public func isPopableViewController() -> Bool {
+    public var isPopableViewController: Bool {
         guard let navigationController = self.navigationController else { return false }
 
         let navigationStackCount = navigationController.viewControllers.count

diff --git a/URMovingTransitionAnimator.podspec b/URMovingTransitionAnimator.podspec
@@ -16,7 +16,7 @@ Pod::Spec.new do |s|
   #
 
   s.name         = "URMovingTransitionAnimator"
-  s.version      = "0.2.0"
+  s.version      = "0.2.1"
   s.summary      = "URMovingTransitionAnimator is moving view transition between viewcontrollers using core animation"
 
   # This description is used to generate tags and improve search results.