Skip to content

Commit 4382352

Browse files
committed
- Cleanup and pod fixes 0.1.4
1 parent aab5312 commit 4382352

File tree

7 files changed

+26
-26
lines changed

7 files changed

+26
-26
lines changed

NBNavigationController.podspec

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
Pod::Spec.new do |s|
22
s.name = 'NBNavigationController'
3-
s.version = '0.1.3'
3+
s.version = '0.1.4'
44
s.summary = 'Navigation controller with custom transition'
55

66
s.description = <<-DESC

NBNavigationController/BaseTransition.swift

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@
99
import Foundation
1010
import UIKit
1111

12-
class BaseTransition: NSObject {
13-
var transitionDuration: TimeInterval = 1.0
12+
public class BaseTransition: NSObject {
13+
public var transitionDuration: TimeInterval = 1.0
1414

1515
convenience init(transitionDuration:TimeInterval) {
1616
self.init()

NBNavigationController/BottomUpTransition.swift

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,13 +26,13 @@
2626
import Foundation
2727
import UIKit
2828

29-
class BottomUpTransition: BaseTransition, UIViewControllerAnimatedTransitioning {
29+
public class BottomUpTransition: BaseTransition, UIViewControllerAnimatedTransitioning {
3030

31-
func transitionDuration(using transitionContext: UIViewControllerContextTransitioning?) -> TimeInterval {
31+
public func transitionDuration(using transitionContext: UIViewControllerContextTransitioning?) -> TimeInterval {
3232
return transitionDuration
3333
}
3434

35-
func animateTransition(using transitionContext: UIViewControllerContextTransitioning) {
35+
public func animateTransition(using transitionContext: UIViewControllerContextTransitioning) {
3636
let container = transitionContext.containerView
3737
guard
3838

NBNavigationController/FadeInTransition.swift

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,13 +28,13 @@ import Foundation
2828
import UIKit
2929

3030

31-
class FadeInTransition: BaseTransition, UIViewControllerAnimatedTransitioning {
31+
public class FadeInTransition: BaseTransition, UIViewControllerAnimatedTransitioning {
3232

33-
func transitionDuration(using transitionContext: UIViewControllerContextTransitioning?) -> TimeInterval {
33+
public func transitionDuration(using transitionContext: UIViewControllerContextTransitioning?) -> TimeInterval {
3434
return transitionDuration
3535
}
3636

37-
func animateTransition(using transitionContext: UIViewControllerContextTransitioning) {
37+
public func animateTransition(using transitionContext: UIViewControllerContextTransitioning) {
3838
let container = transitionContext.containerView
3939
guard
4040
let toView = transitionContext.view(forKey: UITransitionContextViewKey.to),

NBNavigationController/FadeOutTransition.swift

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,13 +26,13 @@
2626
import Foundation
2727
import UIKit
2828

29-
class FadeOutTransition: BaseTransition, UIViewControllerAnimatedTransitioning {
29+
public class FadeOutTransition: BaseTransition, UIViewControllerAnimatedTransitioning {
3030

31-
func transitionDuration(using transitionContext: UIViewControllerContextTransitioning?) -> TimeInterval {
31+
public func transitionDuration(using transitionContext: UIViewControllerContextTransitioning?) -> TimeInterval {
3232
return transitionDuration
3333
}
3434

35-
func animateTransition(using transitionContext: UIViewControllerContextTransitioning) {
35+
public func animateTransition(using transitionContext: UIViewControllerContextTransitioning) {
3636
let container = transitionContext.containerView
3737
guard
3838
let toView = transitionContext.view(forKey: UITransitionContextViewKey.to),

NBNavigationController/NBNavigationController.swift

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -25,20 +25,20 @@
2525

2626
import UIKit
2727

28-
class NBNavigationController: NSObject {
28+
public class NBNavigationController: NSObject {
2929

30-
var customTransition: UIViewControllerAnimatedTransitioning?
31-
fileprivate weak var previousDelegate: UINavigationControllerDelegate?
30+
public var customTransition: UIViewControllerAnimatedTransitioning?
31+
public weak var delegate: UINavigationControllerDelegate?
3232

33-
func pushViewController(_ controller: UIViewController, ontoNavigationController navigationController: UINavigationController, animatedTransition: UIViewControllerAnimatedTransitioning) {
34-
self.previousDelegate = navigationController.delegate
33+
public func pushViewController(_ controller: UIViewController, ontoNavigationController navigationController: UINavigationController, animatedTransition: UIViewControllerAnimatedTransitioning) {
34+
self.delegate = navigationController.delegate
3535
self.customTransition = animatedTransition
3636
navigationController.delegate = self
3737
navigationController.pushViewController(controller, animated: true)
3838
}
3939

40-
func popNavigationController(_ navigationController: UINavigationController, animatedTransition: UIViewControllerAnimatedTransitioning) {
41-
self.previousDelegate = navigationController.delegate
40+
public func popNavigationController(_ navigationController: UINavigationController, animatedTransition: UIViewControllerAnimatedTransitioning) {
41+
self.delegate = navigationController.delegate
4242
self.customTransition = animatedTransition
4343
navigationController.delegate = self
4444
navigationController.popViewController(animated: true)
@@ -49,13 +49,13 @@ class NBNavigationController: NSObject {
4949

5050
extension NBNavigationController: UINavigationControllerDelegate{
5151

52-
func navigationController(_ navigationController: UINavigationController, animationControllerFor operation: UINavigationControllerOperation, from fromVC: UIViewController, to toVC: UIViewController) -> UIViewControllerAnimatedTransitioning? {
52+
public func navigationController(_ navigationController: UINavigationController, animationControllerFor operation: UINavigationControllerOperation, from fromVC: UIViewController, to toVC: UIViewController) -> UIViewControllerAnimatedTransitioning? {
5353
return self.customTransition
5454
}
5555

56-
func navigationController(_ navigationController: UINavigationController, didShow viewController: UIViewController, animated: Bool) {
57-
navigationController.delegate = previousDelegate
58-
previousDelegate = nil
56+
public func navigationController(_ navigationController: UINavigationController, didShow viewController: UIViewController, animated: Bool) {
57+
navigationController.delegate = self.delegate
58+
self.delegate = nil
5959
}
6060
}
6161

NBNavigationController/TopDownTransition.swift

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,13 +26,13 @@
2626
import Foundation
2727
import UIKit
2828

29-
class TopDownTransition: BaseTransition, UIViewControllerAnimatedTransitioning {
29+
public class TopDownTransition: BaseTransition, UIViewControllerAnimatedTransitioning {
3030

31-
func transitionDuration(using transitionContext: UIViewControllerContextTransitioning?) -> TimeInterval {
31+
public func transitionDuration(using transitionContext: UIViewControllerContextTransitioning?) -> TimeInterval {
3232
return transitionDuration
3333
}
3434

35-
func animateTransition(using transitionContext: UIViewControllerContextTransitioning) {
35+
public func animateTransition(using transitionContext: UIViewControllerContextTransitioning) {
3636
let container = transitionContext.containerView
3737
guard
3838
let toView = transitionContext.view(forKey: UITransitionContextViewKey.to),

0 commit comments

Comments
 (0)