diff --git a/.swift-version b/.swift-version new file mode 100644 index 0000000..bb576db --- /dev/null +++ b/.swift-version @@ -0,0 +1 @@ +2.3 diff --git a/README.md b/README.md index 8e27756..c67cd91 100644 --- a/README.md +++ b/README.md @@ -24,6 +24,7 @@ SAHistoryNavigationViewController realizes iOS task manager like UI in UINavigat - [x] Launch Navigation History with Long tap action of Back Bar Button - [x] Support Swift2.0 - [x] Support 3D Touch (If device is not supported 3D Touch, automatically replacing to long tap gesture.) +- [x] Support Swift2.3 ## Installation @@ -106,7 +107,7 @@ This is delegate methods. ## Requirements -- Xcode 7.0 or greater +- Xcode 8.0 or greater - iOS8.0 or greater - [MisterFusion](https://github.com/szk-atmosphere/MisterFusion) diff --git a/SAHistoryNavigationViewController.podspec b/SAHistoryNavigationViewController.podspec index e07c043..40ffe18 100644 --- a/SAHistoryNavigationViewController.podspec +++ b/SAHistoryNavigationViewController.podspec @@ -9,14 +9,14 @@ Pod::Spec.new do |s| s.name = "SAHistoryNavigationViewController" - s.version = "2.3.0" + s.version = "2.4.0" s.summary = "SAHistoryNavigationViewController realizes iOS task manager like UI in UINavigationContoller." - s.homepage = "https://github.com/szk-atmosphere/SAHistoryNavigationViewController" + s.homepage = "https://github.com/marty-suzuki/SAHistoryNavigationViewController" s.license = 'MIT' s.author = { "Taiki Suzuki" => "s1180183@gmail.com" } - s.source = { :git => "https://github.com/szk-atmosphere/SAHistoryNavigationViewController.git", :tag => s.version.to_s } - s.social_media_url = 'https://twitter.com/SzkAtmosphere' + s.source = { :git => "https://github.com/marty-suzuki/SAHistoryNavigationViewController.git", :tag => s.version.to_s } + s.social_media_url = 'https://twitter.com/marty_suzuki' s.platform = :ios, '8.0' s.requires_arc = true @@ -28,5 +28,5 @@ Pod::Spec.new do |s| # s.public_header_files = 'Pod/Classes/**/*.h' s.frameworks = 'UIKit', 'AudioToolbox' - s.dependency 'MisterFusion' + s.dependency 'MisterFusion', '~> 1.4.0' end diff --git a/SAHistoryNavigationViewController/SAHistoryNavigationTransitionController.swift b/SAHistoryNavigationViewController/SAHistoryNavigationTransitionController.swift index 5aa4774..a72d8fe 100644 --- a/SAHistoryNavigationViewController/SAHistoryNavigationTransitionController.swift +++ b/SAHistoryNavigationViewController/SAHistoryNavigationTransitionController.swift @@ -10,8 +10,10 @@ import UIKit class SAHistoryNavigationTransitionController: NSObject, UIViewControllerAnimatedTransitioning { //MARK: - Static constants - private static let kDefaultDuration: NSTimeInterval = 0.3 - + private struct Const { + static let defaultDuration: NSTimeInterval = 0.3 + } + //MARK: - Properties private(set) var navigationControllerOperation: UINavigationControllerOperation private var currentTransitionContext: UIViewControllerContextTransitioning? @@ -26,18 +28,16 @@ class SAHistoryNavigationTransitionController: NSObject, UIViewControllerAnimate //MARK: Life cycle func transitionDuration(transitionContext: UIViewControllerContextTransitioning?) -> NSTimeInterval { - return SAHistoryNavigationTransitionController.kDefaultDuration + return Const.defaultDuration } func animateTransition(transitionContext: UIViewControllerContextTransitioning) { - guard let - containerView = transitionContext.containerView(), - fromView = transitionContext.viewControllerForKey(UITransitionContextToViewControllerKey)?.view, - toView = transitionContext.viewControllerForKey(UITransitionContextFromViewControllerKey)?.view - else { - return - } + guard + let fromView = transitionContext.viewControllerForKey(UITransitionContextToViewControllerKey)?.view, + let toView = transitionContext.viewControllerForKey(UITransitionContextFromViewControllerKey)?.view + else { return } + let containerView = transitionContext.containerView() currentTransitionContext = transitionContext switch navigationControllerOperation { case .Push: @@ -49,42 +49,34 @@ class SAHistoryNavigationTransitionController: NSObject, UIViewControllerAnimate transitionContext.completeTransition(!cancelled) } } -} -extension SAHistoryNavigationTransitionController { func forceFinish() { let navigationControllerOperation = self.navigationControllerOperation - if let backgroundView = backgroundView, alphaView = alphaView { - let dispatchTime = dispatch_time(DISPATCH_TIME_NOW, Int64((SAHistoryNavigationTransitionController.kDefaultDuration + 0.1) * Double(NSEC_PER_SEC))) - dispatch_after(dispatchTime, dispatch_get_main_queue()) { [weak self] in - if let currentTransitionContext = self?.currentTransitionContext { - let toViewContoller = currentTransitionContext.viewControllerForKey(UITransitionContextToViewControllerKey) - let fromViewContoller = currentTransitionContext.viewControllerForKey(UITransitionContextFromViewControllerKey) - - if let fromView = fromViewContoller?.view, toView = toViewContoller?.view { - switch navigationControllerOperation { - case .Push: - self?.pushAniamtionCompletion(currentTransitionContext, toView: toView, fromView: fromView, backgroundView: backgroundView, alphaView: alphaView) - case .Pop: - self?.popAniamtionCompletion(currentTransitionContext, toView: toView, fromView: fromView, backgroundView: backgroundView, alphaView: alphaView) - case .None: - let cancelled = currentTransitionContext.transitionWasCancelled() - currentTransitionContext.completeTransition(!cancelled) - } - self?.currentTransitionContext = nil - self?.backgroundView = nil - self?.alphaView = nil - } - } + guard let backgroundView = backgroundView, let alphaView = alphaView else { return } + let dispatchTime = dispatch_time(DISPATCH_TIME_NOW, Int64((Const.defaultDuration + 0.1) * Double(NSEC_PER_SEC))) + dispatch_after(dispatchTime, dispatch_get_main_queue()) { [weak self] in + guard let currentTransitionContext = self?.currentTransitionContext else { return } + let toViewContoller = currentTransitionContext.viewControllerForKey(UITransitionContextToViewControllerKey) + let fromViewContoller = currentTransitionContext.viewControllerForKey(UITransitionContextFromViewControllerKey) + + guard let fromView = fromViewContoller?.view, let toView = toViewContoller?.view else { return } + switch navigationControllerOperation { + case .Push: + self?.pushAniamtionCompletion(currentTransitionContext, toView: toView, fromView: fromView, backgroundView: backgroundView, alphaView: alphaView) + case .Pop: + self?.popAniamtionCompletion(currentTransitionContext, toView: toView, fromView: fromView, backgroundView: backgroundView, alphaView: alphaView) + case .None: + let cancelled = currentTransitionContext.transitionWasCancelled() + currentTransitionContext.completeTransition(!cancelled) } + self?.currentTransitionContext = nil + self?.backgroundView = nil + self?.alphaView = nil } } -} -//MARK: - Pop animations -extension SAHistoryNavigationTransitionController { + //MARK: - Pop animations private func popAnimation(transitionContext: UIViewControllerContextTransitioning, toView: UIView, fromView: UIView, containerView: UIView) { - let backgroundView = UIView(frame: containerView.bounds) backgroundView.backgroundColor = .blackColor() containerView.addSubview(backgroundView) @@ -135,12 +127,9 @@ extension SAHistoryNavigationTransitionController { self.backgroundView = nil self.alphaView = nil } -} -//MARK: - pushAnimations -extension SAHistoryNavigationTransitionController { + //MARK: - pushAnimations private func pushAnimation(transitionContext: UIViewControllerContextTransitioning, toView: UIView, fromView: UIView, containerView: UIView) { - let backgroundView = UIView(frame: containerView.bounds) backgroundView.backgroundColor = .blackColor() containerView.addSubview(backgroundView) diff --git a/SAHistoryNavigationViewController/SAHistoryNavigationViewController.swift b/SAHistoryNavigationViewController/SAHistoryNavigationViewController.swift index 55666fe..a750375 100644 --- a/SAHistoryNavigationViewController/SAHistoryNavigationViewController.swift +++ b/SAHistoryNavigationViewController/SAHistoryNavigationViewController.swift @@ -14,8 +14,10 @@ import UIKit public class SAHistoryNavigationViewController: UINavigationController { //MARK: - Static constants - private static let ImageScale: CGFloat = 1.0 - + private struct Const { + static let imageScale: CGFloat = 1.0 + } + //MARK: - Properties public var thirdDimensionalTouchThreshold: CGFloat = 0.5 @@ -73,7 +75,7 @@ public class SAHistoryNavigationViewController: UINavigationController { } override public func pushViewController(viewController: UIViewController, animated: Bool) { - if let image = visibleViewController?.screenshotFromWindow(self.dynamicType.ImageScale) { + if let image = visibleViewController?.screenshotFromWindow(Const.imageScale) { screenshots += [image] } super.pushViewController(viewController, animated: animated) @@ -95,12 +97,9 @@ public class SAHistoryNavigationViewController: UINavigationController { public override func setViewControllers(viewControllers: [UIViewController], animated: Bool) { super.setViewControllers(viewControllers, animated: animated) for (currentIndex, viewController) in viewControllers.enumerate() { - if currentIndex == viewControllers.endIndex { - break - } - if let image = viewController.screenshotFromWindow(self.dynamicType.ImageScale) { - screenshots += [image] - } + if currentIndex == viewControllers.endIndex { break } + guard let image = viewController.screenshotFromWindow(Const.imageScale) else { continue } + screenshots += [image] } } @@ -108,9 +107,7 @@ public class SAHistoryNavigationViewController: UINavigationController { func handleThirdDimensionalTouch(gesture: SAThirdDimensionalTouchRecognizer) { switch gesture.state { case .Began: - guard let image = visibleViewController?.screenshotFromWindow(self.dynamicType.ImageScale) else { - return - } + guard let image = visibleViewController?.screenshotFromWindow(Const.imageScale) else { return } screenshots += [image] let historyViewController = createHistoryViewController() @@ -124,9 +121,7 @@ public class SAHistoryNavigationViewController: UINavigationController { screenshots.removeLast() if gesture.percentage >= gesture.threshold { interactiveTransition?.finishInteractiveTransition() - guard let visibleViewController = self.visibleViewController else { - return - } + guard let visibleViewController = self.visibleViewController else { return } historyDelegate?.historyControllerDidShowHistory?(self, viewController: visibleViewController) } else { interactiveTransition?.cancelInteractiveTransition() @@ -156,17 +151,13 @@ public class SAHistoryNavigationViewController: UINavigationController { extension SAHistoryNavigationViewController { override public func showHistory() { - guard let image = visibleViewController?.screenshotFromWindow(self.dynamicType.ImageScale) else { - return - } + guard let image = visibleViewController?.screenshotFromWindow(Const.imageScale) else { return } screenshots += [image] let historyViewController = createHistoryViewController() self.historyViewController = historyViewController setNavigationBarHidden(true, animated: false) presentViewController(historyViewController, animated: true) { - guard let visibleViewController = self.visibleViewController else { - return - } + guard let visibleViewController = self.visibleViewController else { return } self.historyDelegate?.historyControllerDidShowHistory?(self, viewController: visibleViewController) } } @@ -183,9 +174,7 @@ extension SAHistoryNavigationViewController { //MARK: - UINavigationBarDelegate extension SAHistoryNavigationViewController: UINavigationBarDelegate { public func navigationBar(navigationBar: UINavigationBar, didPopItem item: UINavigationItem) { - guard let items = navigationBar.items else { - return - } + guard let items = navigationBar.items else { return } screenshots.removeRange(items.count.. NSTimeInterval { - return SAHistoryViewAnimatedTransitioning.Duration + return Const.duration } func animateTransition(transitionContext: UIViewControllerContextTransitioning) { - guard let containerView = transitionContext.containerView() else { - return - } - - guard let toVC = transitionContext.viewControllerForKey(UITransitionContextToViewControllerKey) else { - return - } - - guard let fromVC = transitionContext.viewControllerForKey(UITransitionContextFromViewControllerKey) else { - return - } - + guard + let toVC = transitionContext.viewControllerForKey(UITransitionContextToViewControllerKey), + let fromVC = transitionContext.viewControllerForKey(UITransitionContextFromViewControllerKey) + else { return } + let containerView = transitionContext.containerView() if isPresenting { pushAniamtion(transitionContext, containerView: containerView, toVC: toVC, fromVC: fromVC) - } else { - popAniamtion(transitionContext, containerView: containerView, toVC: toVC, fromVC: fromVC) + return } + popAniamtion(transitionContext, containerView: containerView, toVC: toVC, fromVC: fromVC) } } //MARK: - Animations extension SAHistoryViewAnimatedTransitioning { private func pushAniamtion(transitionContext: UIViewControllerContextTransitioning, containerView: UIView, toVC: UIViewController, fromVC: UIViewController) { - guard let hvc = toVC as? SAHistoryViewController else { - return - } + guard let hvc = toVC as? SAHistoryViewController else { return } containerView.addSubview(toVC.view) fromVC.view.hidden = true @@ -61,7 +54,7 @@ extension SAHistoryViewAnimatedTransitioning { hvc.collectionView.transform = CGAffineTransformIdentity UIView.animateWithDuration(transitionDuration(transitionContext), delay: 0, options: .CurveEaseOut, animations: { - hvc.collectionView.transform = CGAffineTransformMakeScale(SAHistoryViewAnimatedTransitioning.Scale, SAHistoryViewAnimatedTransitioning.Scale) + hvc.collectionView.transform = CGAffineTransformMakeScale(Const.scale, Const.scale) }) { finished in let cancelled = transitionContext.transitionWasCancelled() if cancelled { @@ -77,14 +70,12 @@ extension SAHistoryViewAnimatedTransitioning { } private func popAniamtion(transitionContext: UIViewControllerContextTransitioning, containerView: UIView, toVC: UIViewController, fromVC: UIViewController) { - guard let hvc = fromVC as? SAHistoryViewController else { - return - } + guard let hvc = fromVC as? SAHistoryViewController else { return } containerView.addSubview(toVC.view) toVC.view.hidden = true hvc.view.frame = containerView.bounds - hvc.collectionView.transform = CGAffineTransformMakeScale(SAHistoryViewAnimatedTransitioning.Scale, SAHistoryViewAnimatedTransitioning.Scale) + hvc.collectionView.transform = CGAffineTransformMakeScale(Const.scale, Const.scale) UIView.animateWithDuration(transitionDuration(transitionContext), delay: 0, options: .CurveEaseOut, animations: { hvc.collectionView.transform = CGAffineTransformIdentity diff --git a/SAHistoryNavigationViewController/SAHistoryViewController.swift b/SAHistoryNavigationViewController/SAHistoryViewController.swift index 9ec574b..892c3f3 100644 --- a/SAHistoryNavigationViewController/SAHistoryViewController.swift +++ b/SAHistoryNavigationViewController/SAHistoryViewController.swift @@ -15,8 +15,10 @@ protocol SAHistoryViewControllerDelegate: class { class SAHistoryViewController: UIViewController { //MARK: static constants - static private let LineSpace: CGFloat = 20.0 - static private let ReuseIdentifier = "Cell" + private struct Const { + static let lineSpace: CGFloat = 20.0 + static let reuseIdentifier = "Cell" + } //MARK: - Properties weak var delegate: SAHistoryViewControllerDelegate? @@ -62,12 +64,12 @@ class SAHistoryViewController: UIViewController { if let layout = collectionView.collectionViewLayout as? UICollectionViewFlowLayout { layout.itemSize = size layout.minimumInteritemSpacing = 0.0 - layout.minimumLineSpacing = self.dynamicType.LineSpace + layout.minimumLineSpacing = Const.lineSpace layout.sectionInset = UIEdgeInsets(top: 0.0, left: size.width, bottom: 0.0, right: size.width) layout.scrollDirection = .Horizontal } - collectionView.registerClass(UICollectionViewCell.self, forCellWithReuseIdentifier: self.dynamicType.ReuseIdentifier) + collectionView.registerClass(UICollectionViewCell.self, forCellWithReuseIdentifier: Const.reuseIdentifier) collectionView.delegate = self collectionView.dataSource = self collectionView.backgroundColor = .clearColor() @@ -114,7 +116,7 @@ extension SAHistoryViewController: UICollectionViewDataSource { } func collectionView(collectionView: UICollectionView, cellForItemAtIndexPath indexPath: NSIndexPath) -> UICollectionViewCell { - let cell = collectionView.dequeueReusableCellWithReuseIdentifier(self.dynamicType.ReuseIdentifier, forIndexPath: indexPath) + let cell = collectionView.dequeueReusableCellWithReuseIdentifier(Const.reuseIdentifier, forIndexPath: indexPath) let subviews = cell.subviews subviews.forEach { @@ -139,4 +141,4 @@ extension SAHistoryViewController: UICollectionViewDelegate { selectedIndex = index delegate?.historyViewController(self, didSelectIndex:index) } -} \ No newline at end of file +} diff --git a/SAHistoryNavigationViewController/UIView+Screenshot.swift b/SAHistoryNavigationViewController/UIView+Screenshot.swift index 5e3d8c8..fa78289 100644 --- a/SAHistoryNavigationViewController/UIView+Screenshot.swift +++ b/SAHistoryNavigationViewController/UIView+Screenshot.swift @@ -9,11 +9,11 @@ import UIKit extension UIView { - func screenshotImage(scale: CGFloat = 0.0) -> UIImage { + func screenshotImage(scale: CGFloat = 0.0) -> UIImage? { UIGraphicsBeginImageContextWithOptions(frame.size, false, scale) drawViewHierarchyInRect(bounds, afterScreenUpdates: true) let image = UIGraphicsGetImageFromCurrentImageContext() UIGraphicsEndImageContext() return image } -} \ No newline at end of file +} diff --git a/SAHistoryNavigationViewController/UIViewController+Screenshot.swift b/SAHistoryNavigationViewController/UIViewController+Screenshot.swift index 1137203..c021675 100644 --- a/SAHistoryNavigationViewController/UIViewController+Screenshot.swift +++ b/SAHistoryNavigationViewController/UIViewController+Screenshot.swift @@ -11,13 +11,11 @@ import UIKit extension UIViewController { func screenshotFromWindow(scale: CGFloat = 0.0) -> UIImage? { - guard let window = UIApplication.sharedApplication().windows.first else { - return nil - } + guard let window = UIApplication.sharedApplication().windows.first else { return nil } UIGraphicsBeginImageContextWithOptions(window.frame.size, false, scale) window.drawViewHierarchyInRect(window.bounds, afterScreenUpdates: true) let image = UIGraphicsGetImageFromCurrentImageContext() UIGraphicsEndImageContext() return image } -} \ No newline at end of file +} diff --git a/SAHistoryNavigationViewControllerSample/Podfile b/SAHistoryNavigationViewControllerSample/Podfile index 1c842b7..966ac9d 100644 --- a/SAHistoryNavigationViewControllerSample/Podfile +++ b/SAHistoryNavigationViewControllerSample/Podfile @@ -1,3 +1,8 @@ -platform :ios, "8.0" +# Uncomment this line to define a global platform for your project +platform :ios, '8.0' +# Uncomment this line if you're using Swift +use_frameworks! + +target 'SAHistoryNavigationViewControllerSample' do pod 'SAHistoryNavigationViewController', :path => '../' -use_frameworks! \ No newline at end of file +end diff --git a/SAHistoryNavigationViewControllerSample/Podfile.lock b/SAHistoryNavigationViewControllerSample/Podfile.lock index 094563f..59d742d 100644 --- a/SAHistoryNavigationViewControllerSample/Podfile.lock +++ b/SAHistoryNavigationViewControllerSample/Podfile.lock @@ -1,7 +1,7 @@ PODS: - - MisterFusion (1.1.0) - - SAHistoryNavigationViewController (2.3.0): - - MisterFusion + - MisterFusion (1.4.0) + - SAHistoryNavigationViewController (2.4.0): + - MisterFusion (~> 1.4.0) DEPENDENCIES: - SAHistoryNavigationViewController (from `../`) @@ -11,7 +11,9 @@ EXTERNAL SOURCES: :path: "../" SPEC CHECKSUMS: - MisterFusion: 3e44ad5aa9c7049f944d65dc5912532b4562db69 - SAHistoryNavigationViewController: 5ec66cabdd65fa1667cc7b8af182d78e3e24080e + MisterFusion: ccb69d87569a4acaabda051d3c8db7ab4be2d5db + SAHistoryNavigationViewController: a0d1c91bc78e7ddf7f8df287764791c403d8e365 -COCOAPODS: 0.39.0 +PODFILE CHECKSUM: 2237dbf15d2cd5c5591fcbda1a644318c430a7f0 + +COCOAPODS: 1.1.0.rc.2 diff --git a/SAHistoryNavigationViewControllerSample/Pods/Local Podspecs/SAHistoryNavigationViewController.podspec.json b/SAHistoryNavigationViewControllerSample/Pods/Local Podspecs/SAHistoryNavigationViewController.podspec.json index 6cd7dfa..1edb4bc 100644 --- a/SAHistoryNavigationViewControllerSample/Pods/Local Podspecs/SAHistoryNavigationViewController.podspec.json +++ b/SAHistoryNavigationViewControllerSample/Pods/Local Podspecs/SAHistoryNavigationViewController.podspec.json @@ -1,17 +1,17 @@ { "name": "SAHistoryNavigationViewController", - "version": "2.3.0", + "version": "2.4.0", "summary": "SAHistoryNavigationViewController realizes iOS task manager like UI in UINavigationContoller.", - "homepage": "https://github.com/szk-atmosphere/SAHistoryNavigationViewController", + "homepage": "https://github.com/marty-suzuki/SAHistoryNavigationViewController", "license": "MIT", "authors": { "Taiki Suzuki": "s1180183@gmail.com" }, "source": { - "git": "https://github.com/szk-atmosphere/SAHistoryNavigationViewController.git", - "tag": "2.3.0" + "git": "https://github.com/marty-suzuki/SAHistoryNavigationViewController.git", + "tag": "2.4.0" }, - "social_media_url": "https://twitter.com/SzkAtmosphere", + "social_media_url": "https://twitter.com/marty_suzuki", "platforms": { "ios": "8.0" }, @@ -23,7 +23,7 @@ ], "dependencies": { "MisterFusion": [ - + "~> 1.4.0" ] } } diff --git a/SAHistoryNavigationViewControllerSample/Pods/Manifest.lock b/SAHistoryNavigationViewControllerSample/Pods/Manifest.lock index 094563f..59d742d 100644 --- a/SAHistoryNavigationViewControllerSample/Pods/Manifest.lock +++ b/SAHistoryNavigationViewControllerSample/Pods/Manifest.lock @@ -1,7 +1,7 @@ PODS: - - MisterFusion (1.1.0) - - SAHistoryNavigationViewController (2.3.0): - - MisterFusion + - MisterFusion (1.4.0) + - SAHistoryNavigationViewController (2.4.0): + - MisterFusion (~> 1.4.0) DEPENDENCIES: - SAHistoryNavigationViewController (from `../`) @@ -11,7 +11,9 @@ EXTERNAL SOURCES: :path: "../" SPEC CHECKSUMS: - MisterFusion: 3e44ad5aa9c7049f944d65dc5912532b4562db69 - SAHistoryNavigationViewController: 5ec66cabdd65fa1667cc7b8af182d78e3e24080e + MisterFusion: ccb69d87569a4acaabda051d3c8db7ab4be2d5db + SAHistoryNavigationViewController: a0d1c91bc78e7ddf7f8df287764791c403d8e365 -COCOAPODS: 0.39.0 +PODFILE CHECKSUM: 2237dbf15d2cd5c5591fcbda1a644318c430a7f0 + +COCOAPODS: 1.1.0.rc.2 diff --git a/SAHistoryNavigationViewControllerSample/Pods/MisterFusion/MisterFusion/Array+MisterFusion.swift b/SAHistoryNavigationViewControllerSample/Pods/MisterFusion/MisterFusion/Array+MisterFusion.swift index 5fa8617..3eadee4 100644 --- a/SAHistoryNavigationViewControllerSample/Pods/MisterFusion/MisterFusion/Array+MisterFusion.swift +++ b/SAHistoryNavigationViewControllerSample/Pods/MisterFusion/MisterFusion/Array+MisterFusion.swift @@ -31,6 +31,7 @@ extension Array where Element: NSLayoutConstraint { } extension NSArray { + @available(*, unavailable) public var FirstItem: UIView -> NSArray { guard let array = self as? [NSLayoutConstraint] else { return { _ in return [] } @@ -40,6 +41,7 @@ extension NSArray { } } + @available(*, unavailable) public var FirstAttribute: NSLayoutAttribute -> NSArray { guard let array = self as? [NSLayoutConstraint] else { return { _ in return [] } @@ -49,6 +51,7 @@ extension NSArray { } } + @available(*, unavailable) public var SecondItem: UIView -> NSArray { guard let array = self as? [NSLayoutConstraint] else { return { _ in return [] } @@ -58,6 +61,7 @@ extension NSArray { } } + @available(*, unavailable) public var SecondAttribute: NSLayoutAttribute -> NSArray { guard let array = self as? [NSLayoutConstraint] else { return { _ in return [] } @@ -67,6 +71,7 @@ extension NSArray { } } + @available(*, unavailable) public var Reration: NSLayoutRelation -> NSArray { guard let array = self as? [NSLayoutConstraint] else { return { _ in return [] } diff --git a/SAHistoryNavigationViewControllerSample/Pods/MisterFusion/MisterFusion/MisterFusion.swift b/SAHistoryNavigationViewControllerSample/Pods/MisterFusion/MisterFusion/MisterFusion.swift index bf352cc..f32df8c 100644 --- a/SAHistoryNavigationViewControllerSample/Pods/MisterFusion/MisterFusion/MisterFusion.swift +++ b/SAHistoryNavigationViewControllerSample/Pods/MisterFusion/MisterFusion/MisterFusion.swift @@ -19,6 +19,7 @@ public class MisterFusion: NSObject { private let priority: UILayoutPriority? private let horizontalSizeClass: UIUserInterfaceSizeClass? private let verticalSizeClass: UIUserInterfaceSizeClass? + private let identifier: String? override public var description: String { return "\(super.description)\n" + @@ -34,7 +35,7 @@ public class MisterFusion: NSObject { "verticalSizeClass : \(verticalSizeClass?.rawValue)\n" } - init(item: UIView?, attribute: NSLayoutAttribute?, relatedBy: NSLayoutRelation?, toItem: UIView?, toAttribute: NSLayoutAttribute?, multiplier: CGFloat?, constant: CGFloat?, priority: UILayoutPriority?, horizontalSizeClass: UIUserInterfaceSizeClass?, verticalSizeClass: UIUserInterfaceSizeClass?) { + init(item: UIView?, attribute: NSLayoutAttribute?, relatedBy: NSLayoutRelation?, toItem: UIView?, toAttribute: NSLayoutAttribute?, multiplier: CGFloat?, constant: CGFloat?, priority: UILayoutPriority?, horizontalSizeClass: UIUserInterfaceSizeClass?, verticalSizeClass: UIUserInterfaceSizeClass?, identifier: String?) { self.item = item self.attribute = attribute self.relatedBy = relatedBy @@ -45,9 +46,11 @@ public class MisterFusion: NSObject { self.priority = priority self.horizontalSizeClass = horizontalSizeClass self.verticalSizeClass = verticalSizeClass + self.identifier = identifier super.init() } + @available(*, unavailable) public var Equal: MisterFusion -> MisterFusion? { return { [weak self] in guard let me = self else { return nil } @@ -55,6 +58,7 @@ public class MisterFusion: NSObject { } } + @available(*, unavailable) public var NotRelatedEqualConstant: CGFloat -> MisterFusion? { return { [weak self] in guard let me = self else { return nil } @@ -62,6 +66,7 @@ public class MisterFusion: NSObject { } } + @available(*, unavailable) public var LessThanOrEqual: MisterFusion -> MisterFusion? { return { [weak self] in guard let me = self else { return nil } @@ -69,6 +74,7 @@ public class MisterFusion: NSObject { } } + @available(*, unavailable) public var NotRelatedLessThanOrEqualConstant: CGFloat -> MisterFusion? { return { [weak self] in guard let me = self else { return nil } @@ -76,6 +82,7 @@ public class MisterFusion: NSObject { } } + @available(*, unavailable) public var GreaterThanOrEqual: MisterFusion -> MisterFusion? { return { [weak self] in guard let me = self else { return nil } @@ -83,6 +90,7 @@ public class MisterFusion: NSObject { } } + @available(*, unavailable) public var NotRelatedGreaterThanOrEqualConstant: CGFloat -> MisterFusion? { return { [weak self] in guard let me = self else { return nil } @@ -90,6 +98,7 @@ public class MisterFusion: NSObject { } } + @available(*, unavailable) public var Multiplier: CGFloat -> MisterFusion? { return { [weak self] in guard let me = self else { return nil } @@ -97,6 +106,7 @@ public class MisterFusion: NSObject { } } + @available(*, unavailable) public var Constant: CGFloat -> MisterFusion? { return { [weak self] in guard let me = self else { return nil } @@ -104,6 +114,7 @@ public class MisterFusion: NSObject { } } + @available(*, unavailable) public var Priority: UILayoutPriority -> MisterFusion? { return { [weak self] in guard let me = self else { return nil } @@ -111,7 +122,7 @@ public class MisterFusion: NSObject { } } - @available(*, deprecated=7.0, message="use \"NotRelatedEqualConstant(CGFloat)\"") + @available(*, unavailable) public var NotRelatedConstant: CGFloat -> MisterFusion? { return { [weak self] in guard let me = self else { return nil } @@ -119,6 +130,7 @@ public class MisterFusion: NSObject { } } + @available(*, unavailable) public var HorizontalSizeClass: UIUserInterfaceSizeClass -> MisterFusion? { return { [weak self] in guard let me = self else { return nil } @@ -126,80 +138,94 @@ public class MisterFusion: NSObject { } } + @available(*, unavailable) public var VerticalSizeClass: UIUserInterfaceSizeClass -> MisterFusion? { return { [weak self] in guard let me = self else { return nil } return me <|> $0 } } + + @available(*, unavailable) + public var Identifier: String -> MisterFusion? { + return { [weak self] in + guard let me = self else { return nil } + return me -=- $0 + } + } } infix operator |==| { associativity left precedence 95 } public func |==| (left: MisterFusion, right: MisterFusion) -> MisterFusion { - return MisterFusion(item: left.item, attribute: left.attribute, relatedBy: .Equal, toItem: right.item, toAttribute: right.attribute, multiplier: nil, constant: nil, priority: nil, horizontalSizeClass: nil, verticalSizeClass: nil) + return MisterFusion(item: left.item, attribute: left.attribute, relatedBy: .Equal, toItem: right.item, toAttribute: right.attribute, multiplier: nil, constant: nil, priority: nil, horizontalSizeClass: nil, verticalSizeClass: nil, identifier: left.identifier) } public func |==| (left: MisterFusion, right: CGFloat) -> MisterFusion { - return MisterFusion(item: left.item, attribute: left.attribute, relatedBy: .Equal, toItem: nil, toAttribute: .NotAnAttribute, multiplier: left.multiplier, constant: right, priority: left.priority, horizontalSizeClass: left.horizontalSizeClass, verticalSizeClass: left.verticalSizeClass) + return MisterFusion(item: left.item, attribute: left.attribute, relatedBy: .Equal, toItem: nil, toAttribute: .NotAnAttribute, multiplier: nil, constant: right, priority: nil, horizontalSizeClass: nil, verticalSizeClass: nil, identifier: left.identifier) } infix operator |<=| { associativity left precedence 95 } public func |<=| (left: MisterFusion, right: MisterFusion) -> MisterFusion { - return MisterFusion(item: left.item, attribute: left.attribute, relatedBy: .LessThanOrEqual, toItem: right.item, toAttribute: right.attribute, multiplier: nil, constant: nil, priority: nil, horizontalSizeClass: nil, verticalSizeClass: nil) + return MisterFusion(item: left.item, attribute: left.attribute, relatedBy: .LessThanOrEqual, toItem: right.item, toAttribute: right.attribute, multiplier: nil, constant: nil, priority: nil, horizontalSizeClass: nil, verticalSizeClass: nil, identifier: left.identifier) } public func |<=| (left: MisterFusion, right: CGFloat) -> MisterFusion { - return MisterFusion(item: left.item, attribute: left.attribute, relatedBy: .LessThanOrEqual, toItem: nil, toAttribute: .NotAnAttribute, multiplier: nil, constant: right, priority: nil, horizontalSizeClass: nil, verticalSizeClass: nil) + return MisterFusion(item: left.item, attribute: left.attribute, relatedBy: .LessThanOrEqual, toItem: nil, toAttribute: .NotAnAttribute, multiplier: nil, constant: right, priority: nil, horizontalSizeClass: nil, verticalSizeClass: nil, identifier: left.identifier) } infix operator |>=| { associativity left precedence 95 } public func |>=| (left: MisterFusion, right: MisterFusion) -> MisterFusion { - return MisterFusion(item: left.item, attribute: left.attribute, relatedBy: .GreaterThanOrEqual, toItem: right.item, toAttribute: right.attribute, multiplier: nil, constant: nil, priority: nil, horizontalSizeClass: nil, verticalSizeClass: nil) + return MisterFusion(item: left.item, attribute: left.attribute, relatedBy: .GreaterThanOrEqual, toItem: right.item, toAttribute: right.attribute, multiplier: nil, constant: nil, priority: nil, horizontalSizeClass: nil, verticalSizeClass: nil, identifier: left.identifier) } public func |>=| (left: MisterFusion, right: CGFloat) -> MisterFusion { - return MisterFusion(item: left.item, attribute: left.attribute, relatedBy: .GreaterThanOrEqual, toItem: nil, toAttribute: .NotAnAttribute, multiplier: nil, constant: right, priority: nil, horizontalSizeClass: nil, verticalSizeClass: nil) + return MisterFusion(item: left.item, attribute: left.attribute, relatedBy: .GreaterThanOrEqual, toItem: nil, toAttribute: .NotAnAttribute, multiplier: nil, constant: right, priority: nil, horizontalSizeClass: nil, verticalSizeClass: nil, identifier: left.identifier) } infix operator |+| { associativity left precedence 95 } public func |+| (left: MisterFusion, right: CGFloat) -> MisterFusion { - return MisterFusion(item: left.item, attribute: left.attribute, relatedBy: left.relatedBy, toItem: left.toItem, toAttribute: left.toAttribute, multiplier: left.multiplier, constant: right, priority: left.priority, horizontalSizeClass: left.horizontalSizeClass, verticalSizeClass: left.verticalSizeClass) + return MisterFusion(item: left.item, attribute: left.attribute, relatedBy: left.relatedBy, toItem: left.toItem, toAttribute: left.toAttribute, multiplier: left.multiplier, constant: right, priority: left.priority, horizontalSizeClass: left.horizontalSizeClass, verticalSizeClass: left.verticalSizeClass, identifier: left.identifier) } infix operator |-| { associativity left precedence 95 } public func |-| (left: MisterFusion, right: CGFloat) -> MisterFusion { - return MisterFusion(item: left.item, attribute: left.attribute, relatedBy: left.relatedBy, toItem: left.toItem, toAttribute: left.toAttribute, multiplier: left.multiplier, constant: -right, priority: left.priority, horizontalSizeClass: left.horizontalSizeClass, verticalSizeClass: left.verticalSizeClass) + return MisterFusion(item: left.item, attribute: left.attribute, relatedBy: left.relatedBy, toItem: left.toItem, toAttribute: left.toAttribute, multiplier: left.multiplier, constant: -right, priority: left.priority, horizontalSizeClass: left.horizontalSizeClass, verticalSizeClass: left.verticalSizeClass, identifier: left.identifier) } infix operator |*| { associativity left precedence 95 } public func |*| (left: MisterFusion, right: CGFloat) -> MisterFusion { - return MisterFusion(item: left.item, attribute: left.attribute, relatedBy: left.relatedBy, toItem: left.toItem, toAttribute: left.toAttribute, multiplier: right, constant: left.constant, priority: left.priority, horizontalSizeClass: left.horizontalSizeClass, verticalSizeClass: left.verticalSizeClass) + return MisterFusion(item: left.item, attribute: left.attribute, relatedBy: left.relatedBy, toItem: left.toItem, toAttribute: left.toAttribute, multiplier: right, constant: left.constant, priority: left.priority, horizontalSizeClass: left.horizontalSizeClass, verticalSizeClass: left.verticalSizeClass, identifier: left.identifier) } infix operator |/| { associativity left precedence 95 } public func |/| (left: MisterFusion, right: CGFloat) -> MisterFusion { - return MisterFusion(item: left.item, attribute: left.attribute, relatedBy: left.relatedBy, toItem: left.toItem, toAttribute: left.toAttribute, multiplier: 1 / right, constant: left.constant, priority: left.priority, horizontalSizeClass: left.horizontalSizeClass, verticalSizeClass: left.verticalSizeClass) + return MisterFusion(item: left.item, attribute: left.attribute, relatedBy: left.relatedBy, toItem: left.toItem, toAttribute: left.toAttribute, multiplier: 1 / right, constant: left.constant, priority: left.priority, horizontalSizeClass: left.horizontalSizeClass, verticalSizeClass: left.verticalSizeClass, identifier: left.identifier) } infix operator |<>| { associativity left precedence 95 } public func |<>| (left: MisterFusion, right: UILayoutPriority) -> MisterFusion { - return MisterFusion(item: left.item, attribute: left.attribute, relatedBy: left.relatedBy, toItem: left.toItem, toAttribute: left.toAttribute, multiplier: left.multiplier, constant: left.constant, priority: right, horizontalSizeClass: left.horizontalSizeClass, verticalSizeClass: left.verticalSizeClass) + return MisterFusion(item: left.item, attribute: left.attribute, relatedBy: left.relatedBy, toItem: left.toItem, toAttribute: left.toAttribute, multiplier: left.multiplier, constant: left.constant, priority: right, horizontalSizeClass: left.horizontalSizeClass, verticalSizeClass: left.verticalSizeClass, identifier: left.identifier) } infix operator |=| { associativity left precedence 95 } @available(*, deprecated=7.0, message="use \"MisterFusion\" |==| \"CGFloat\"") public func |=| (left: MisterFusion, right: CGFloat) -> MisterFusion { - return MisterFusion(item: left.item, attribute: left.attribute, relatedBy: .Equal, toItem: nil, toAttribute: .NotAnAttribute, multiplier: left.multiplier, constant: right, priority: left.priority, horizontalSizeClass: left.horizontalSizeClass, verticalSizeClass: left.verticalSizeClass) + return MisterFusion(item: left.item, attribute: left.attribute, relatedBy: .Equal, toItem: nil, toAttribute: .NotAnAttribute, multiplier: left.multiplier, constant: right, priority: left.priority, horizontalSizeClass: left.horizontalSizeClass, verticalSizeClass: left.verticalSizeClass, identifier: left.identifier) } infix operator <-> { associativity left precedence 95 } public func <-> (left: MisterFusion, right: UIUserInterfaceSizeClass) -> MisterFusion { - return MisterFusion(item: left.item, attribute: left.attribute, relatedBy: .Equal, toItem: left.toItem, toAttribute: left.toAttribute, multiplier: left.multiplier, constant: left.constant, priority: left.priority, horizontalSizeClass: right, verticalSizeClass: left.verticalSizeClass) + return MisterFusion(item: left.item, attribute: left.attribute, relatedBy: left.relatedBy, toItem: left.toItem, toAttribute: left.toAttribute, multiplier: left.multiplier, constant: left.constant, priority: left.priority, horizontalSizeClass: right, verticalSizeClass: left.verticalSizeClass, identifier: left.identifier) } infix operator <|> { associativity left precedence 95 } public func <|> (left: MisterFusion, right: UIUserInterfaceSizeClass) -> MisterFusion { - return MisterFusion(item: left.item, attribute: left.attribute, relatedBy: .Equal, toItem: left.toItem, toAttribute: left.toAttribute, multiplier: left.multiplier, constant: left.constant, priority: left.priority, horizontalSizeClass: left.horizontalSizeClass, verticalSizeClass: right) + return MisterFusion(item: left.item, attribute: left.attribute, relatedBy: left.relatedBy, toItem: left.toItem, toAttribute: left.toAttribute, multiplier: left.multiplier, constant: left.constant, priority: left.priority, horizontalSizeClass: left.horizontalSizeClass, verticalSizeClass: right, identifier: left.identifier) +} + +infix operator -=- { associativity left precedence 95 } +public func -=- (left: MisterFusion, right: String) -> MisterFusion { + return MisterFusion(item: left.item, attribute: left.attribute, relatedBy: left.relatedBy, toItem: left.toItem, toAttribute: left.toAttribute, multiplier: left.multiplier, constant: left.constant, priority: left.priority, horizontalSizeClass: left.horizontalSizeClass, verticalSizeClass: left.verticalSizeClass, identifier: right) } extension UIView { @@ -223,12 +249,18 @@ extension UIView { public var CenterY: MisterFusion { return createMisterFusion(.CenterY) } - public var Baseline: MisterFusion { return createMisterFusion(.Baseline) } + #if swift(>=2.3) + #else + public var Baseline: MisterFusion { return createMisterFusion(.LastBaseline) } + #endif public var LastBaseline: MisterFusion { return createMisterFusion(.LastBaseline) } public var NotAnAttribute: MisterFusion { return createMisterFusion(.NotAnAttribute) } + @available(iOS 8.0, *) + public var FirstBaseline: MisterFusion { return createMisterFusion(.FirstBaseline) } + @available(iOS 8.0, *) public var LeftMargin: MisterFusion { return createMisterFusion(.LeftMargin) } @@ -254,9 +286,12 @@ extension UIView { public var CenterYWithinMargins: MisterFusion { return createMisterFusion(.CenterYWithinMargins) } private func createMisterFusion(attribute: NSLayoutAttribute) -> MisterFusion { - return MisterFusion(item: self, attribute: attribute, relatedBy: nil, toItem: nil, toAttribute: nil, multiplier: nil, constant: nil, priority: nil, horizontalSizeClass: nil, verticalSizeClass: nil) + return MisterFusion(item: self, attribute: attribute, relatedBy: nil, toItem: nil, toAttribute: nil, multiplier: nil, constant: nil, priority: nil, horizontalSizeClass: nil, verticalSizeClass: nil, identifier: nil) } - +} + +extension UIView { + //MARK: - addConstraint() public func addLayoutConstraint(misterFusion: MisterFusion) -> NSLayoutConstraint? { let item: UIView = misterFusion.item ?? self let traitCollection = UIApplication.sharedApplication().keyWindow?.traitCollection @@ -276,18 +311,20 @@ extension UIView { let constant: CGFloat = misterFusion.constant ?? 0 let constraint = NSLayoutConstraint(item: item, attribute: attribute, relatedBy: relatedBy, toItem: toItem, attribute: toAttribute, multiplier: multiplier, constant: constant) constraint.priority = misterFusion.priority ?? UILayoutPriorityRequired + constraint.identifier = misterFusion.identifier addConstraint(constraint) return constraint } public func addLayoutConstraints(misterFusions: [MisterFusion]) -> [NSLayoutConstraint] { - return misterFusions.map { addLayoutConstraint($0) }.filter { $0 != nil }.map { $0! } + return misterFusions.flatMap { addLayoutConstraint($0) } } public func addLayoutConstraints(misterFusions: MisterFusion...) -> [NSLayoutConstraint] { return addLayoutConstraints(misterFusions) } - + + //MARK: - addSubview() public func addLayoutSubview(subview: UIView, andConstraint misterFusion: MisterFusion) -> NSLayoutConstraint? { addSubview(subview) subview.translatesAutoresizingMaskIntoConstraints = false @@ -303,4 +340,55 @@ extension UIView { public func addLayoutSubview(subview: UIView, andConstraints misterFusions: MisterFusion...) -> [NSLayoutConstraint] { return addLayoutSubview(subview, andConstraints: misterFusions) } -} \ No newline at end of file + + //MARK: - insertSubview(_ atIndex:_) + public func insertLayoutSubview(subview: UIView, atIndex index: Int, andConstraint misterFusion: MisterFusion) -> NSLayoutConstraint? { + insertSubview(subview, atIndex: index) + subview.translatesAutoresizingMaskIntoConstraints = false + return addLayoutConstraint(misterFusion) + } + + public func insertLayoutSubview(subview: UIView, atIndex index: Int, andConstraints misterFusions: [MisterFusion]) -> [NSLayoutConstraint] { + insertSubview(subview, atIndex: index) + subview.translatesAutoresizingMaskIntoConstraints = false + return addLayoutConstraints(misterFusions) + } + + public func insertLayoutSubview(subview: UIView, atIndex index: Int, andConstraints misterFusions: MisterFusion...) -> [NSLayoutConstraint] { + return insertLayoutSubview(subview, atIndex: index, andConstraints: misterFusions) + } + + //MARK: - insertSubview(_ belowSubview:_) + public func insertLayoutSubview(subview: UIView, belowSubview siblingSubview: UIView, andConstraint misterFusion: MisterFusion) -> NSLayoutConstraint? { + insertSubview(subview, belowSubview: siblingSubview) + subview.translatesAutoresizingMaskIntoConstraints = false + return addLayoutConstraint(misterFusion) + } + + public func insertLayoutSubview(subview: UIView, belowSubview siblingSubview: UIView, andConstraints misterFusions: [MisterFusion]) -> [NSLayoutConstraint] { + insertSubview(subview, belowSubview: siblingSubview) + subview.translatesAutoresizingMaskIntoConstraints = false + return addLayoutConstraints(misterFusions) + } + + public func insertLayoutSubview(subview: UIView, belowSubview siblingSubview: UIView, andConstraints misterFusions: MisterFusion...) -> [NSLayoutConstraint] { + return insertLayoutSubview(subview, belowSubview: siblingSubview, andConstraints: misterFusions) + } + + //MARK: - insertSubview(_ aboveSubview:_) + public func insertLayoutSubview(subview: UIView, aboveSubview siblingSubview: UIView, andConstraint misterFusion: MisterFusion) -> NSLayoutConstraint? { + insertSubview(subview, aboveSubview: siblingSubview) + subview.translatesAutoresizingMaskIntoConstraints = false + return addLayoutConstraint(misterFusion) + } + + public func insertLayoutSubview(subview: UIView, aboveSubview siblingSubview: UIView, andConstraints misterFusions: [MisterFusion]) -> [NSLayoutConstraint] { + insertSubview(subview, aboveSubview: siblingSubview) + subview.translatesAutoresizingMaskIntoConstraints = false + return addLayoutConstraints(misterFusions) + } + + public func insertLayoutSubview(subview: UIView, aboveSubview siblingSubview: UIView, andConstraints misterFusions: MisterFusion...) -> [NSLayoutConstraint] { + return insertLayoutSubview(subview, aboveSubview: siblingSubview, andConstraints: misterFusions) + } +} diff --git a/SAHistoryNavigationViewControllerSample/Pods/MisterFusion/README.md b/SAHistoryNavigationViewControllerSample/Pods/MisterFusion/README.md index 13acc59..aba946d 100644 --- a/SAHistoryNavigationViewControllerSample/Pods/MisterFusion/README.md +++ b/SAHistoryNavigationViewControllerSample/Pods/MisterFusion/README.md @@ -5,6 +5,7 @@ [![Language](http://img.shields.io/badge/language-swift-brightgreen.svg?style=flat )](https://developer.apple.com/swift) [![Version](https://img.shields.io/cocoapods/v/MisterFusion.svg?style=flat)](http://cocoapods.org/pods/MisterFusion) +[![Carthage compatible](https://img.shields.io/badge/Carthage-compatible-4BC51D.svg?style=flat)](https://github.com/Carthage/Carthage) [![License](https://img.shields.io/cocoapods/l/MisterFusion.svg?style=flat)](http://cocoapods.org/pods/MisterFusion) [ManiacDev.com](https://maniacdev.com/) referred. @@ -18,6 +19,8 @@ MisterFusion makes more easier to use AutoLayout in Swift & Objective-C code. - [x] Simple And Concise Syntax - [x] Use in Swift and Objective-C - [x] Support Size Class +- [x] Support Swift2.3 +- [x] Support Swift3 (If you want to use it in Swift3, please use [2.0.0-beta](https://github.com/szk-atmosphere/MisterFusion/tree/2.0.0-beta)) #### MisterFusion Code for Swift @@ -130,6 +133,16 @@ In addtion, import **MisterFusion** like this. #import +#### Carthage + +If you’re using [Carthage](https://github.com/Carthage/Carthage), simply add +MisterFusion to your `Cartfile`: + +``` +github "szk-atmosphere/MisterFusion" +``` +Make sure to add `MisterFusion.framework` to "Linked Frameworks and Libraries" and "copy-frameworks" Build Phases. + ## Advanced Setting You can set `multiplier`, `constant` and `priority` like this. @@ -168,6 +181,7 @@ self.view.addLayoutSubview(view, andConstraints: - ~~`|=|` ... For fixed `Height` and `Width`~~ (deprecated since 1.1.0, use `|==|`) - `<|>` ... `UIUserInterfaceSizeClass` for VerticalSizeClass - `<->` ... `UIUserInterfaceSizeClass` for VerticalSizeClass +- `-=-` ... Identifier #### UIView Extensions @@ -178,6 +192,15 @@ public func addLayoutConstraints(misterFusions: [MisterFusion]) -> [NSLayoutCons public func addLayoutSubview(subview: UIView, andConstraint misterFusion: MisterFusion) -> NSLayoutConstraint? public func addLayoutSubview(subview: UIView, andConstraints misterFusions: [MisterFusion]) -> [NSLayoutConstraint] public func addLayoutSubview(subview: UIView, andConstraints misterFusions: MisterFusion...) -> [NSLayoutConstraint] +public func insertLayoutSubview(subview: UIView, atIndex index: Int, andConstraint misterFusion: MisterFusion) -> NSLayoutConstraint? +public func insertLayoutSubview(subview: UIView, atIndex index: Int, andConstraints misterFusions: [MisterFusion]) -> [NSLayoutConstraint] +public func insertLayoutSubview(subview: UIView, atIndex index: Int, andConstraints misterFusions: MisterFusion...) -> [NSLayoutConstraint] +public func insertLayoutSubview(subview: UIView, belowSubview siblingSubview: UIView, andConstraint misterFusion: MisterFusion) -> NSLayoutConstraint? +public func insertLayoutSubview(subview: UIView, belowSubview siblingSubview: UIView, andConstraints misterFusions: [MisterFusion]) -> [NSLayoutConstraint] +public func insertLayoutSubview(subview: UIView, belowSubview siblingSubview: UIView, andConstraints misterFusions: MisterFusion...) -> [NSLayoutConstraint] +public func insertLayoutSubview(subview: UIView, aboveSubview siblingSubview: UIView, andConstraint misterFusion: MisterFusion) -> NSLayoutConstraint? +public func insertLayoutSubview(subview: UIView, aboveSubview siblingSubview: UIView, andConstraints misterFusions: [MisterFusion]) -> [NSLayoutConstraint] +public func insertLayoutSubview(subview: UIView, aboveSubview siblingSubview: UIView, andConstraints misterFusions: MisterFusion...) -> [NSLayoutConstraint] ``` #### Array Extensions @@ -247,16 +270,24 @@ override func traitCollectionDidChange(previousTraitCollection: UITraitCollectio @property (nonatomic, readonly, copy) MisterFusion * __nullable (^ __nonnull HorizontalSizeClass)(UIUserInterfaceSizeClass); //UIUserInterfaceSizeClass for VerticalSizeClass @property (nonatomic, readonly, copy) MisterFusion * __nullable (^ __nonnull VerticalSizeClass)(UIUserInterfaceSizeClass); +//Identifier +@property (nonatomic, readonly, copy) MisterFusion * _Nullable (^ _Nonnull Identifier)(NSString * _Nonnull); @end ``` #### UIView Category ```objective-c -- (NSLayoutConstraint * __nullable)addLayoutConstraint:(MisterFusion * __nonnull)misterFusion; -- (NSArray * __nonnull)addLayoutConstraints:(NSArray * __nonnull)misterFusions; -- (NSLayoutConstraint * __nullable)addLayoutSubview:(UIView * __nonnull)subview andConstraint:(MisterFusion * __nonnull)misterFusion; -- (NSArray * __nonnull)addLayoutSubview:(UIView * __nonnull)subview andConstraints:(NSArray * __nonnull)misterFusions; +- (NSLayoutConstraint * _Nullable)addLayoutConstraint:(MisterFusion * _Nonnull)misterFusion; +- (NSArray * _Nonnull)addLayoutConstraints:(NSArray * _Nonnull)misterFusions; +- (NSLayoutConstraint * _Nullable)addLayoutSubview:(UIView * _Nonnull)subview andConstraint:(MisterFusion * _Nonnull)misterFusion; +- (NSArray * _Nonnull)addLayoutSubview:(UIView * _Nonnull)subview andConstraints:(NSArray * _Nonnull)misterFusions; +- (NSLayoutConstraint * _Nullable)insertLayoutSubview:(UIView * _Nonnull)subview atIndex:(NSInteger)index andConstraint:(MisterFusion * _Nonnull)misterFusion; +- (NSArray * _Nonnull)insertLayoutSubview:(UIView * _Nonnull)subview atIndex:(NSInteger)index andConstraints:(NSArray * _Nonnull)misterFusions; +- (NSLayoutConstraint * _Nullable)insertLayoutSubview:(UIView * _Nonnull)subview belowSubview:(UIView * _Nonnull)siblingSubview andConstraint:(MisterFusion * _Nonnull)misterFusion; +- (NSArray * _Nonnull)insertLayoutSubview:(UIView * _Nonnull)subview belowSubview:(UIView * _Nonnull)siblingSubview andConstraints:(NSArray * _Nonnull)misterFusions; +- (NSLayoutConstraint * _Nullable)insertLayoutSubview:(UIView * _Nonnull)subview aboveSubview:(UIView * _Nonnull)siblingSubview andConstraint:(MisterFusion * _Nonnull)misterFusion; +- (NSArray * _Nonnull)insertLayoutSubview:(UIView * _Nonnull)subview aboveSubview:(UIView * _Nonnull)siblingSubview andConstraints:(NSArray * _Nonnull)misterFusions; ``` #### NSArray Category diff --git a/SAHistoryNavigationViewControllerSample/Pods/Pods.xcodeproj/project.pbxproj b/SAHistoryNavigationViewControllerSample/Pods/Pods.xcodeproj/project.pbxproj index f5d98c7..e24a8ae 100644 --- a/SAHistoryNavigationViewControllerSample/Pods/Pods.xcodeproj/project.pbxproj +++ b/SAHistoryNavigationViewControllerSample/Pods/Pods.xcodeproj/project.pbxproj @@ -7,96 +7,96 @@ objects = { /* Begin PBXBuildFile section */ - 08B3E463B7FEE9E79E08F1BF74F735BF /* SAHistoryNavigationViewController-umbrella.h in Headers */ = {isa = PBXBuildFile; fileRef = 66BBCC9C7E2AE5D90BD2EAB53E5FBA84 /* SAHistoryNavigationViewController-umbrella.h */; settings = {ATTRIBUTES = (Public, ); }; }; + 05B53A07CFB89DA83DDCA63CE21FB376 /* SAHistoryNavigationViewController-umbrella.h in Headers */ = {isa = PBXBuildFile; fileRef = 66BBCC9C7E2AE5D90BD2EAB53E5FBA84 /* SAHistoryNavigationViewController-umbrella.h */; settings = {ATTRIBUTES = (Public, ); }; }; + 0603F396B0068CCB838955399C38CFCA /* UIView+Screenshot.swift in Sources */ = {isa = PBXBuildFile; fileRef = BB370C083F81E808BE0BB5CCAACD8A82 /* UIView+Screenshot.swift */; }; + 09B7A93E1BE7BFD01EE778373D8369A5 /* SAHistoryViewAnimatedTransitioning.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2FB4DB223FB53BE7B622F47B9E0418F0 /* SAHistoryViewAnimatedTransitioning.swift */; }; + 1144E8E56E23E8920F90619358BCA4A6 /* SAHistoryNavigationTransitionController.swift in Sources */ = {isa = PBXBuildFile; fileRef = D797DEA2F4C361B15A2F66EA312A4CE7 /* SAHistoryNavigationTransitionController.swift */; }; + 1F2F58818941E8ED22E07C760B5ED4AF /* MisterFusion.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1A4088D047289A0B346219868CDB5DDC /* MisterFusion.framework */; }; 22636CE1C55E8CA607798DEEABC3E8B7 /* MisterFusion-dummy.m in Sources */ = {isa = PBXBuildFile; fileRef = 875FB32E7571C9F7C0CFDFC326F001D9 /* MisterFusion-dummy.m */; }; - 266177BD339BE60F60A264E2FBB26F59 /* Pods-umbrella.h in Headers */ = {isa = PBXBuildFile; fileRef = 2BCC458FDD5F692BBB2BFC64BB5701FC /* Pods-umbrella.h */; settings = {ATTRIBUTES = (Public, ); }; }; - 31418B32D983ED010B383CE8D9FECE33 /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 289E16B1D9659561CA4F89D83049E191 /* Foundation.framework */; }; + 29F7E3EE423421BA5267AD9247204A96 /* UIViewController+Screenshot.swift in Sources */ = {isa = PBXBuildFile; fileRef = E6737565E31A1D99FA589ACECC37FCC9 /* UIViewController+Screenshot.swift */; }; + 32EA1F30413278D1B3EAD96076C1508F /* UIKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 759128F340A595990497D09BC6D6E11C /* UIKit.framework */; }; + 5254D3C9ED519A9BDDA6D70671362EFB /* Pods-SAHistoryNavigationViewControllerSample-dummy.m in Sources */ = {isa = PBXBuildFile; fileRef = D56A11A84AC4EFAC90482936BA4FE609 /* Pods-SAHistoryNavigationViewControllerSample-dummy.m */; }; 53EE8DE41682CE1D265BE8B60ED69A11 /* Array+MisterFusion.swift in Sources */ = {isa = PBXBuildFile; fileRef = DE503BB9FA087B4D1044E89C0F02C1DA /* Array+MisterFusion.swift */; }; - 7D9AA30C5B9DB3402964C364E6493BE7 /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 289E16B1D9659561CA4F89D83049E191 /* Foundation.framework */; }; - 8144FEE7F74DE32AB9A5D0B2204C72CA /* UIView+Screenshot.swift in Sources */ = {isa = PBXBuildFile; fileRef = BB370C083F81E808BE0BB5CCAACD8A82 /* UIView+Screenshot.swift */; }; - 9139D153058B6690492DF795A83B5B6B /* SAHistoryViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9609A19907B1BDCDC3FBC985A38FF415 /* SAHistoryViewController.swift */; }; - 9436E94A384332A664410A32FA885723 /* UIKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = FCAD41A9428B4419CB98E34DF2133F02 /* UIKit.framework */; }; - 9E1CE35692B16E9D3404A4DA50015393 /* AudioToolbox.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 22D6D61678B02381A62BE6D458154836 /* AudioToolbox.framework */; }; + 541CC84E0984929D63E6346E4F7D0013 /* SAThirdDimensionalTouchRecognizer.swift in Sources */ = {isa = PBXBuildFile; fileRef = B7924B690600464B4BB52241249E7CC7 /* SAThirdDimensionalTouchRecognizer.swift */; }; + 5AA4B3E335E57D3B14C9A6920ECDD9FA /* Pods-SAHistoryNavigationViewControllerSample-umbrella.h in Headers */ = {isa = PBXBuildFile; fileRef = AB19AA94F07C2DEADE7E91FAE8860E98 /* Pods-SAHistoryNavigationViewControllerSample-umbrella.h */; settings = {ATTRIBUTES = (Public, ); }; }; + 64BEFCA84FF6CBA82189E65D28676A05 /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = B795DBD92A6FB5414D65CF8679CCA117 /* Foundation.framework */; }; + 83CA7E470518BCD5EF6000402C12F7DC /* UIKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 759128F340A595990497D09BC6D6E11C /* UIKit.framework */; }; + 86CCCCFB4AAA492713EB1B047140477C /* UINavigationController+History.swift in Sources */ = {isa = PBXBuildFile; fileRef = 242431A1CC0E6E966EB4275C6166459E /* UINavigationController+History.swift */; }; + 8E1F60F1AA8F7D8101494716B8397AEE /* SAHistoryNavigationViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2ED67F40658BE5315E7515EFFAFF6865 /* SAHistoryNavigationViewController.swift */; }; A03C84FA56C1EFBCE51BD48F9EBD5CD3 /* MisterFusion.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7BD92E11A3E6901130A5BC1931244D3B /* MisterFusion.swift */; }; - A8521AB8523DE6ACFC74856DE40ACA50 /* UIViewController+Screenshot.swift in Sources */ = {isa = PBXBuildFile; fileRef = E6737565E31A1D99FA589ACECC37FCC9 /* UIViewController+Screenshot.swift */; }; - AA8F1CE7B27BB6DD5AFD93E2236A79D3 /* SAHistoryViewAnimatedTransitioning.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2FB4DB223FB53BE7B622F47B9E0418F0 /* SAHistoryViewAnimatedTransitioning.swift */; }; - AECB46675952628E8BB512C1AE98E874 /* SAThirdDimensionalTouchRecognizer.swift in Sources */ = {isa = PBXBuildFile; fileRef = B7924B690600464B4BB52241249E7CC7 /* SAThirdDimensionalTouchRecognizer.swift */; }; - B2AC28704B5159D1E6C0642B3FEA19ED /* UIKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = FCAD41A9428B4419CB98E34DF2133F02 /* UIKit.framework */; }; - B6865208DA167A52DAB71E03E612087E /* SAHistoryNavigationTransitionController.swift in Sources */ = {isa = PBXBuildFile; fileRef = D797DEA2F4C361B15A2F66EA312A4CE7 /* SAHistoryNavigationTransitionController.swift */; }; - C3D224FF98A334D3F8F1E14663C9DE27 /* UINavigationController+History.swift in Sources */ = {isa = PBXBuildFile; fileRef = 242431A1CC0E6E966EB4275C6166459E /* UINavigationController+History.swift */; }; - C4A6874AA859C61CAEEED78AEB4E8E8B /* MisterFusion.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1A4088D047289A0B346219868CDB5DDC /* MisterFusion.framework */; }; - DC5BB9B75E44193A717814E2900E9E3F /* Pods-dummy.m in Sources */ = {isa = PBXBuildFile; fileRef = 894E5DA93A9F359521A89826BE6DA777 /* Pods-dummy.m */; }; - E1C298702D2C676B31FE277E180FF6A2 /* SAHistoryNavigationViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2ED67F40658BE5315E7515EFFAFF6865 /* SAHistoryNavigationViewController.swift */; }; + A0A2EE06369AE505E791D6B5FF3CDC55 /* SAHistoryViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9609A19907B1BDCDC3FBC985A38FF415 /* SAHistoryViewController.swift */; }; + AB0EF981593E1B07A77CB6C96A07000E /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = B795DBD92A6FB5414D65CF8679CCA117 /* Foundation.framework */; }; + DAC6940463D46ADFDB5CC94C95F4C2AC /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = B795DBD92A6FB5414D65CF8679CCA117 /* Foundation.framework */; }; E97A332AFCB13BB4E1857CA5BCB2A357 /* MisterFusion-umbrella.h in Headers */ = {isa = PBXBuildFile; fileRef = D0028AD92BEB6711AE873F6A24F06FF7 /* MisterFusion-umbrella.h */; settings = {ATTRIBUTES = (Public, ); }; }; - EE6E4183E3F9C468C244DAE05651626A /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 289E16B1D9659561CA4F89D83049E191 /* Foundation.framework */; }; - F13A5FA8927BDE829B5F9CEEE1E31AA1 /* SAHistoryNavigationViewController-dummy.m in Sources */ = {isa = PBXBuildFile; fileRef = 2CFBB106DA5DB50A69936AF627E3002A /* SAHistoryNavigationViewController-dummy.m */; }; + F1118070D198435DA2EC650385F9D4EB /* AudioToolbox.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 8F89A7C308FC6C82D4854F06F7EF5A81 /* AudioToolbox.framework */; }; + F42FB14D5AE77132A0258445216608B8 /* SAHistoryNavigationViewController-dummy.m in Sources */ = {isa = PBXBuildFile; fileRef = 2CFBB106DA5DB50A69936AF627E3002A /* SAHistoryNavigationViewController-dummy.m */; }; /* End PBXBuildFile section */ /* Begin PBXContainerItemProxy section */ - 940DFDC7940134AA461C3A4066CB6CB7 /* PBXContainerItemProxy */ = { + 2C8668E1D9F262E1E8ECF9ECC0005C35 /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; containerPortal = D41D8CD98F00B204E9800998ECF8427E /* Project object */; proxyType = 1; - remoteGlobalIDString = 5EA2788DDCED9ABACC432611514F662F; - remoteInfo = SAHistoryNavigationViewController; + remoteGlobalIDString = 9FC843BD22328DEFBCAB1DA4A92108F7; + remoteInfo = MisterFusion; }; - B21C4B629785FA1A65F10902560D7777 /* PBXContainerItemProxy */ = { + B6F71A3C51089EDBFB1E48C4ABF89E40 /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; containerPortal = D41D8CD98F00B204E9800998ECF8427E /* Project object */; proxyType = 1; remoteGlobalIDString = 9FC843BD22328DEFBCAB1DA4A92108F7; remoteInfo = MisterFusion; }; - C3BF13FA86DEDA559C94B301C12F3A62 /* PBXContainerItemProxy */ = { + BCFFF1F56646AB2DDC364ABB2B9349CE /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; containerPortal = D41D8CD98F00B204E9800998ECF8427E /* Project object */; proxyType = 1; - remoteGlobalIDString = 9FC843BD22328DEFBCAB1DA4A92108F7; - remoteInfo = MisterFusion; + remoteGlobalIDString = EAFB6229D0464B09A9098F5FA3DDDB85; + remoteInfo = SAHistoryNavigationViewController; }; /* End PBXContainerItemProxy section */ /* Begin PBXFileReference section */ 03E3FE02E6B23F6359A53225B433B444 /* MisterFusion.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; path = MisterFusion.xcconfig; sourceTree = ""; }; 126CE3B69EBB85A016EFEAEB3369A4F2 /* MisterFusion.modulemap */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = "sourcecode.module-map"; path = MisterFusion.modulemap; sourceTree = ""; }; + 19549AFAD706A353095E09345A6923D7 /* Pods-SAHistoryNavigationViewControllerSample-acknowledgements.markdown */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text; path = "Pods-SAHistoryNavigationViewControllerSample-acknowledgements.markdown"; sourceTree = ""; }; 1A4088D047289A0B346219868CDB5DDC /* MisterFusion.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = MisterFusion.framework; sourceTree = BUILT_PRODUCTS_DIR; }; 1BC174B4D7F56B3E33F0A267F1BAA31C /* Info.plist */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; - 1BD542E909255AB4B3DCCF76E07A3DE9 /* Pods.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods.framework; sourceTree = BUILT_PRODUCTS_DIR; }; - 22D6D61678B02381A62BE6D458154836 /* AudioToolbox.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AudioToolbox.framework; path = Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS9.0.sdk/System/Library/Frameworks/AudioToolbox.framework; sourceTree = DEVELOPER_DIR; }; + 2066B18DFC6AB957F0A6CA7F463D059E /* Pods-SAHistoryNavigationViewControllerSample.modulemap */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = "sourcecode.module-map"; path = "Pods-SAHistoryNavigationViewControllerSample.modulemap"; sourceTree = ""; }; 242431A1CC0E6E966EB4275C6166459E /* UINavigationController+History.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = "UINavigationController+History.swift"; sourceTree = ""; }; - 289E16B1D9659561CA4F89D83049E191 /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS9.0.sdk/System/Library/Frameworks/Foundation.framework; sourceTree = DEVELOPER_DIR; }; - 2BCC458FDD5F692BBB2BFC64BB5701FC /* Pods-umbrella.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = "Pods-umbrella.h"; sourceTree = ""; }; + 2AEB163CA0FE333FDA766F3229D8D836 /* Pods_SAHistoryNavigationViewControllerSample.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_SAHistoryNavigationViewControllerSample.framework; sourceTree = BUILT_PRODUCTS_DIR; }; 2CFBB106DA5DB50A69936AF627E3002A /* SAHistoryNavigationViewController-dummy.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; path = "SAHistoryNavigationViewController-dummy.m"; sourceTree = ""; }; 2ED67F40658BE5315E7515EFFAFF6865 /* SAHistoryNavigationViewController.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = SAHistoryNavigationViewController.swift; sourceTree = ""; }; 2FB4DB223FB53BE7B622F47B9E0418F0 /* SAHistoryViewAnimatedTransitioning.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = SAHistoryViewAnimatedTransitioning.swift; sourceTree = ""; }; - 30B6F118E0EB1DEA2DED6B1898A8AF38 /* MisterFusion.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = MisterFusion.framework; sourceTree = BUILT_PRODUCTS_DIR; }; + 308F8B5D551929F70C1AA700B929F844 /* Pods-SAHistoryNavigationViewControllerSample.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; path = "Pods-SAHistoryNavigationViewControllerSample.release.xcconfig"; sourceTree = ""; }; 383CADD8122DBCE5DDC3DD9DC73C8462 /* SAHistoryNavigationViewController.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; path = SAHistoryNavigationViewController.xcconfig; sourceTree = ""; }; 4B586B81A2A4D7C3E70F010654E92EFF /* SAHistoryNavigationViewController-prefix.pch */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = "SAHistoryNavigationViewController-prefix.pch"; sourceTree = ""; }; + 59DAC8A17BBFFA0DE316D4D4BDCBBF7A /* MisterFusion.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = MisterFusion.framework; sourceTree = BUILT_PRODUCTS_DIR; }; 66BBCC9C7E2AE5D90BD2EAB53E5FBA84 /* SAHistoryNavigationViewController-umbrella.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = "SAHistoryNavigationViewController-umbrella.h"; sourceTree = ""; }; - 79A9DEDC89FE8336BF5FEDAAF75BF7FC /* Pods.modulemap */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = "sourcecode.module-map"; path = Pods.modulemap; sourceTree = ""; }; + 67E9FBF3CD77933D51537B9D545D990B /* Pods-SAHistoryNavigationViewControllerSample-resources.sh */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.script.sh; path = "Pods-SAHistoryNavigationViewControllerSample-resources.sh"; sourceTree = ""; }; + 6F99BB802559AA208810ED46A30F0792 /* Pods-SAHistoryNavigationViewControllerSample-frameworks.sh */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.script.sh; path = "Pods-SAHistoryNavigationViewControllerSample-frameworks.sh"; sourceTree = ""; }; + 759128F340A595990497D09BC6D6E11C /* UIKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = UIKit.framework; path = Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS9.3.sdk/System/Library/Frameworks/UIKit.framework; sourceTree = DEVELOPER_DIR; }; 7BD92E11A3E6901130A5BC1931244D3B /* MisterFusion.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = MisterFusion.swift; path = MisterFusion/MisterFusion.swift; sourceTree = ""; }; 861792DF97F9A4C1DB705DEC1FEA9606 /* Info.plist */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; 875FB32E7571C9F7C0CFDFC326F001D9 /* MisterFusion-dummy.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; path = "MisterFusion-dummy.m"; sourceTree = ""; }; - 87B213035BAC5F75386F62D3C75D2342 /* Pods-acknowledgements.plist */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.plist.xml; path = "Pods-acknowledgements.plist"; sourceTree = ""; }; - 894E5DA93A9F359521A89826BE6DA777 /* Pods-dummy.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; path = "Pods-dummy.m"; sourceTree = ""; }; + 8F89A7C308FC6C82D4854F06F7EF5A81 /* AudioToolbox.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AudioToolbox.framework; path = Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS9.3.sdk/System/Library/Frameworks/AudioToolbox.framework; sourceTree = DEVELOPER_DIR; }; + 93A4A3777CF96A4AAC1D13BA6DCCEA73 /* Podfile */ = {isa = PBXFileReference; explicitFileType = text.script.ruby; includeInIndex = 1; name = Podfile; path = ../Podfile; sourceTree = SOURCE_ROOT; xcLanguageSpecificationIdentifier = xcode.lang.ruby; }; 9609A19907B1BDCDC3FBC985A38FF415 /* SAHistoryViewController.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = SAHistoryViewController.swift; sourceTree = ""; }; - 977577C045EDA9D9D1F46E2598D19FC7 /* Pods.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; path = Pods.debug.xcconfig; sourceTree = ""; }; + AB19AA94F07C2DEADE7E91FAE8860E98 /* Pods-SAHistoryNavigationViewControllerSample-umbrella.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = "Pods-SAHistoryNavigationViewControllerSample-umbrella.h"; sourceTree = ""; }; B7924B690600464B4BB52241249E7CC7 /* SAThirdDimensionalTouchRecognizer.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = SAThirdDimensionalTouchRecognizer.swift; sourceTree = ""; }; - BA6428E9F66FD5A23C0A2E06ED26CD2F /* Podfile */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text; name = Podfile; path = ../Podfile; sourceTree = SOURCE_ROOT; xcLanguageSpecificationIdentifier = xcode.lang.ruby; }; + B795DBD92A6FB5414D65CF8679CCA117 /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS9.3.sdk/System/Library/Frameworks/Foundation.framework; sourceTree = DEVELOPER_DIR; }; + BA70744CD79A21F234E6FBA10D73F40A /* Info.plist */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; BB370C083F81E808BE0BB5CCAACD8A82 /* UIView+Screenshot.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = "UIView+Screenshot.swift"; sourceTree = ""; }; - BC93E0E840E59E5A8EEED03005A74849 /* SAHistoryNavigationViewController.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = SAHistoryNavigationViewController.framework; sourceTree = BUILT_PRODUCTS_DIR; }; - CBC0F7C552B739C909B650A0F42F7F38 /* Pods-resources.sh */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.script.sh; path = "Pods-resources.sh"; sourceTree = ""; }; + C8881FC0F94E8D7C5B292A5B69AD40FD /* Pods-SAHistoryNavigationViewControllerSample-acknowledgements.plist */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.plist.xml; path = "Pods-SAHistoryNavigationViewControllerSample-acknowledgements.plist"; sourceTree = ""; }; D0028AD92BEB6711AE873F6A24F06FF7 /* MisterFusion-umbrella.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = "MisterFusion-umbrella.h"; sourceTree = ""; }; - D0405803033A2A777B8E4DFA0C1800ED /* Pods-acknowledgements.markdown */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text; path = "Pods-acknowledgements.markdown"; sourceTree = ""; }; + D497B27AA036741E8CC5E008163D60AE /* Pods-SAHistoryNavigationViewControllerSample.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; path = "Pods-SAHistoryNavigationViewControllerSample.debug.xcconfig"; sourceTree = ""; }; + D56A11A84AC4EFAC90482936BA4FE609 /* Pods-SAHistoryNavigationViewControllerSample-dummy.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; path = "Pods-SAHistoryNavigationViewControllerSample-dummy.m"; sourceTree = ""; }; D797DEA2F4C361B15A2F66EA312A4CE7 /* SAHistoryNavigationTransitionController.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = SAHistoryNavigationTransitionController.swift; sourceTree = ""; }; - DA312349A49333542E6F4B36B329960E /* Pods.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; path = Pods.release.xcconfig; sourceTree = ""; }; DE503BB9FA087B4D1044E89C0F02C1DA /* Array+MisterFusion.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = "Array+MisterFusion.swift"; path = "MisterFusion/Array+MisterFusion.swift"; sourceTree = ""; }; E21DAAE5113FFA990B502812EE8F0C8E /* SAHistoryNavigationViewController.modulemap */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = "sourcecode.module-map"; path = SAHistoryNavigationViewController.modulemap; sourceTree = ""; }; E6737565E31A1D99FA589ACECC37FCC9 /* UIViewController+Screenshot.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = "UIViewController+Screenshot.swift"; sourceTree = ""; }; - E7F21354943D9F42A70697D5A5EF72E9 /* Pods-frameworks.sh */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.script.sh; path = "Pods-frameworks.sh"; sourceTree = ""; }; - E8446514FBAD26C0E18F24A5715AEF67 /* Info.plist */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; F5F0646FCB22A73B26B5AABE857713BF /* MisterFusion-prefix.pch */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = "MisterFusion-prefix.pch"; sourceTree = ""; }; - FCAD41A9428B4419CB98E34DF2133F02 /* UIKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = UIKit.framework; path = Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS9.0.sdk/System/Library/Frameworks/UIKit.framework; sourceTree = DEVELOPER_DIR; }; + F65238D966F0D302F0C13808DBCE930E /* SAHistoryNavigationViewController.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = SAHistoryNavigationViewController.framework; sourceTree = BUILT_PRODUCTS_DIR; }; /* End PBXFileReference section */ /* Begin PBXFrameworksBuildPhase section */ @@ -104,50 +104,50 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - EE6E4183E3F9C468C244DAE05651626A /* Foundation.framework in Frameworks */, - B2AC28704B5159D1E6C0642B3FEA19ED /* UIKit.framework in Frameworks */, + DAC6940463D46ADFDB5CC94C95F4C2AC /* Foundation.framework in Frameworks */, + 32EA1F30413278D1B3EAD96076C1508F /* UIKit.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; - BEBF1C984BE4966190CB3C89E2CDD677 /* Frameworks */ = { + A5270B60ECFEA6447BF91F1EFC840E30 /* Frameworks */ = { isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - 9E1CE35692B16E9D3404A4DA50015393 /* AudioToolbox.framework in Frameworks */, - 31418B32D983ED010B383CE8D9FECE33 /* Foundation.framework in Frameworks */, - C4A6874AA859C61CAEEED78AEB4E8E8B /* MisterFusion.framework in Frameworks */, - 9436E94A384332A664410A32FA885723 /* UIKit.framework in Frameworks */, + F1118070D198435DA2EC650385F9D4EB /* AudioToolbox.framework in Frameworks */, + 64BEFCA84FF6CBA82189E65D28676A05 /* Foundation.framework in Frameworks */, + 1F2F58818941E8ED22E07C760B5ED4AF /* MisterFusion.framework in Frameworks */, + 83CA7E470518BCD5EF6000402C12F7DC /* UIKit.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; - C87EEE48C3797E7C64FD87C63B465296 /* Frameworks */ = { + C7E50E5E7BEB7CB091779E85903DB299 /* Frameworks */ = { isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - 7D9AA30C5B9DB3402964C364E6493BE7 /* Foundation.framework in Frameworks */, + AB0EF981593E1B07A77CB6C96A07000E /* Foundation.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; /* End PBXFrameworksBuildPhase section */ /* Begin PBXGroup section */ - 3BA1C64B92291EEB2678D8D8A8ECE155 /* Frameworks */ = { + 1E66170100475BF42C38E917497E2FE5 /* iOS */ = { isa = PBXGroup; children = ( - 1A4088D047289A0B346219868CDB5DDC /* MisterFusion.framework */, - 44470B6AC7952EB70F5A6DD09BCAEC27 /* iOS */, + 8F89A7C308FC6C82D4854F06F7EF5A81 /* AudioToolbox.framework */, + B795DBD92A6FB5414D65CF8679CCA117 /* Foundation.framework */, + 759128F340A595990497D09BC6D6E11C /* UIKit.framework */, ); - name = Frameworks; + name = iOS; sourceTree = ""; }; - 44470B6AC7952EB70F5A6DD09BCAEC27 /* iOS */ = { + 3BA1C64B92291EEB2678D8D8A8ECE155 /* Frameworks */ = { isa = PBXGroup; children = ( - 22D6D61678B02381A62BE6D458154836 /* AudioToolbox.framework */, - 289E16B1D9659561CA4F89D83049E191 /* Foundation.framework */, - FCAD41A9428B4419CB98E34DF2133F02 /* UIKit.framework */, + 1A4088D047289A0B346219868CDB5DDC /* MisterFusion.framework */, + 1E66170100475BF42C38E917497E2FE5 /* iOS */, ); - name = iOS; + name = Frameworks; sourceTree = ""; }; 469CA8AD98A5D02B0339498C82244F9E /* Development Pods */ = { @@ -166,33 +166,23 @@ name = Pods; sourceTree = ""; }; - 75D98FF52E597A11900E131B6C4E1ADA /* Pods */ = { + 651999E5726F44BD5857BD901ECDD38C /* Targets Support Files */ = { isa = PBXGroup; children = ( - E8446514FBAD26C0E18F24A5715AEF67 /* Info.plist */, - 79A9DEDC89FE8336BF5FEDAAF75BF7FC /* Pods.modulemap */, - D0405803033A2A777B8E4DFA0C1800ED /* Pods-acknowledgements.markdown */, - 87B213035BAC5F75386F62D3C75D2342 /* Pods-acknowledgements.plist */, - 894E5DA93A9F359521A89826BE6DA777 /* Pods-dummy.m */, - E7F21354943D9F42A70697D5A5EF72E9 /* Pods-frameworks.sh */, - CBC0F7C552B739C909B650A0F42F7F38 /* Pods-resources.sh */, - 2BCC458FDD5F692BBB2BFC64BB5701FC /* Pods-umbrella.h */, - 977577C045EDA9D9D1F46E2598D19FC7 /* Pods.debug.xcconfig */, - DA312349A49333542E6F4B36B329960E /* Pods.release.xcconfig */, + B03DB544DA4DA352538609F98DAB548B /* Pods-SAHistoryNavigationViewControllerSample */, ); - name = Pods; - path = "Target Support Files/Pods"; + name = "Targets Support Files"; sourceTree = ""; }; 7DB346D0F39D3F0E887471402A8071AB = { isa = PBXGroup; children = ( - BA6428E9F66FD5A23C0A2E06ED26CD2F /* Podfile */, + 93A4A3777CF96A4AAC1D13BA6DCCEA73 /* Podfile */, 469CA8AD98A5D02B0339498C82244F9E /* Development Pods */, 3BA1C64B92291EEB2678D8D8A8ECE155 /* Frameworks */, 613F8D15E1855D11E077D6C819D6FB28 /* Pods */, - B047972AB07C8A53C95727F9BA0B2594 /* Products */, - B7B80995527643776607AFFA75B91E24 /* Targets Support Files */, + EDAEC1AC15468ECF9EF81B5F14D07BD7 /* Products */, + 651999E5726F44BD5857BD901ECDD38C /* Targets Support Files */, ); sourceTree = ""; }; @@ -220,22 +210,22 @@ path = "../Target Support Files/MisterFusion"; sourceTree = ""; }; - B047972AB07C8A53C95727F9BA0B2594 /* Products */ = { + B03DB544DA4DA352538609F98DAB548B /* Pods-SAHistoryNavigationViewControllerSample */ = { isa = PBXGroup; children = ( - 30B6F118E0EB1DEA2DED6B1898A8AF38 /* MisterFusion.framework */, - 1BD542E909255AB4B3DCCF76E07A3DE9 /* Pods.framework */, - BC93E0E840E59E5A8EEED03005A74849 /* SAHistoryNavigationViewController.framework */, - ); - name = Products; - sourceTree = ""; - }; - B7B80995527643776607AFFA75B91E24 /* Targets Support Files */ = { - isa = PBXGroup; - children = ( - 75D98FF52E597A11900E131B6C4E1ADA /* Pods */, - ); - name = "Targets Support Files"; + BA70744CD79A21F234E6FBA10D73F40A /* Info.plist */, + 2066B18DFC6AB957F0A6CA7F463D059E /* Pods-SAHistoryNavigationViewControllerSample.modulemap */, + 19549AFAD706A353095E09345A6923D7 /* Pods-SAHistoryNavigationViewControllerSample-acknowledgements.markdown */, + C8881FC0F94E8D7C5B292A5B69AD40FD /* Pods-SAHistoryNavigationViewControllerSample-acknowledgements.plist */, + D56A11A84AC4EFAC90482936BA4FE609 /* Pods-SAHistoryNavigationViewControllerSample-dummy.m */, + 6F99BB802559AA208810ED46A30F0792 /* Pods-SAHistoryNavigationViewControllerSample-frameworks.sh */, + 67E9FBF3CD77933D51537B9D545D990B /* Pods-SAHistoryNavigationViewControllerSample-resources.sh */, + AB19AA94F07C2DEADE7E91FAE8860E98 /* Pods-SAHistoryNavigationViewControllerSample-umbrella.h */, + D497B27AA036741E8CC5E008163D60AE /* Pods-SAHistoryNavigationViewControllerSample.debug.xcconfig */, + 308F8B5D551929F70C1AA700B929F844 /* Pods-SAHistoryNavigationViewControllerSample.release.xcconfig */, + ); + name = "Pods-SAHistoryNavigationViewControllerSample"; + path = "Target Support Files/Pods-SAHistoryNavigationViewControllerSample"; sourceTree = ""; }; BC42EEB2B3CD54FC2152DBA541541784 /* Support Files */ = { @@ -262,6 +252,16 @@ path = ../..; sourceTree = ""; }; + EDAEC1AC15468ECF9EF81B5F14D07BD7 /* Products */ = { + isa = PBXGroup; + children = ( + 59DAC8A17BBFFA0DE316D4D4BDCBBF7A /* MisterFusion.framework */, + 2AEB163CA0FE333FDA766F3229D8D836 /* Pods_SAHistoryNavigationViewControllerSample.framework */, + F65238D966F0D302F0C13808DBCE930E /* SAHistoryNavigationViewController.framework */, + ); + name = Products; + sourceTree = ""; + }; F72997FE10F26FA88AA82B0ABEBEB859 /* SAHistoryNavigationViewController */ = { isa = PBXGroup; children = ( @@ -280,85 +280,85 @@ /* End PBXGroup section */ /* Begin PBXHeadersBuildPhase section */ - 4E09E6797051DB82A874C01AEEB8E617 /* Headers */ = { + 1C904E4B7EEBBF30913BE19147D17E7C /* Headers */ = { isa = PBXHeadersBuildPhase; buildActionMask = 2147483647; files = ( - 266177BD339BE60F60A264E2FBB26F59 /* Pods-umbrella.h in Headers */, + 05B53A07CFB89DA83DDCA63CE21FB376 /* SAHistoryNavigationViewController-umbrella.h in Headers */, ); runOnlyForDeploymentPostprocessing = 0; }; - 5B2D5BECEB931B3A9F7A2FD81D1C377F /* Headers */ = { + 5E7702F1E80E2696D9185BFED3A6B50A /* Headers */ = { isa = PBXHeadersBuildPhase; buildActionMask = 2147483647; files = ( - 08B3E463B7FEE9E79E08F1BF74F735BF /* SAHistoryNavigationViewController-umbrella.h in Headers */, + E97A332AFCB13BB4E1857CA5BCB2A357 /* MisterFusion-umbrella.h in Headers */, ); runOnlyForDeploymentPostprocessing = 0; }; - 5E7702F1E80E2696D9185BFED3A6B50A /* Headers */ = { + 8DB080B682FBB9BADEBF1C964919C511 /* Headers */ = { isa = PBXHeadersBuildPhase; buildActionMask = 2147483647; files = ( - E97A332AFCB13BB4E1857CA5BCB2A357 /* MisterFusion-umbrella.h in Headers */, + 5AA4B3E335E57D3B14C9A6920ECDD9FA /* Pods-SAHistoryNavigationViewControllerSample-umbrella.h in Headers */, ); runOnlyForDeploymentPostprocessing = 0; }; /* End PBXHeadersBuildPhase section */ /* Begin PBXNativeTarget section */ - 594E8D02EC9F8A0A395A8E6DAD32827D /* Pods */ = { + 910FD248C650D4867196020A5D8F1111 /* Pods-SAHistoryNavigationViewControllerSample */ = { isa = PBXNativeTarget; - buildConfigurationList = B0C962FB46D6E2682E177B2443D7808B /* Build configuration list for PBXNativeTarget "Pods" */; + buildConfigurationList = E905E4B86C285E93CDAF3148145A6804 /* Build configuration list for PBXNativeTarget "Pods-SAHistoryNavigationViewControllerSample" */; buildPhases = ( - 888343C50AB1C9F80EE24CA823AEDED9 /* Sources */, - C87EEE48C3797E7C64FD87C63B465296 /* Frameworks */, - 4E09E6797051DB82A874C01AEEB8E617 /* Headers */, + 6F209FAA26AE8AB1946DEDEE490A9614 /* Sources */, + C7E50E5E7BEB7CB091779E85903DB299 /* Frameworks */, + 8DB080B682FBB9BADEBF1C964919C511 /* Headers */, ); buildRules = ( ); dependencies = ( - 8C31BCA5989663D4506E244C2E85568E /* PBXTargetDependency */, - F32B05A8A01BB520FE5B0F6155BDE34D /* PBXTargetDependency */, + 72CD348F836F644AA7BCEBEB4BF11CE7 /* PBXTargetDependency */, + 63F139096A9BAFCEC399B9D03DAC7C33 /* PBXTargetDependency */, ); - name = Pods; - productName = Pods; - productReference = 1BD542E909255AB4B3DCCF76E07A3DE9 /* Pods.framework */; + name = "Pods-SAHistoryNavigationViewControllerSample"; + productName = "Pods-SAHistoryNavigationViewControllerSample"; + productReference = 2AEB163CA0FE333FDA766F3229D8D836 /* Pods_SAHistoryNavigationViewControllerSample.framework */; productType = "com.apple.product-type.framework"; }; - 5EA2788DDCED9ABACC432611514F662F /* SAHistoryNavigationViewController */ = { + 9FC843BD22328DEFBCAB1DA4A92108F7 /* MisterFusion */ = { isa = PBXNativeTarget; - buildConfigurationList = C7E5D98E534CA5906E88661DD82B864F /* Build configuration list for PBXNativeTarget "SAHistoryNavigationViewController" */; + buildConfigurationList = D527E849301E62CDDB55A973DEBA607C /* Build configuration list for PBXNativeTarget "MisterFusion" */; buildPhases = ( - 114D9152C02991B57C6AD04C36711F4F /* Sources */, - BEBF1C984BE4966190CB3C89E2CDD677 /* Frameworks */, - 5B2D5BECEB931B3A9F7A2FD81D1C377F /* Headers */, + 98819D7144BFC0B905DD9D19287ACEEC /* Sources */, + 54C77337B476137FCBAD1AB008AFCC03 /* Frameworks */, + 5E7702F1E80E2696D9185BFED3A6B50A /* Headers */, ); buildRules = ( ); dependencies = ( - A2A788FC12BB1A4223D8467998995D5C /* PBXTargetDependency */, ); - name = SAHistoryNavigationViewController; - productName = SAHistoryNavigationViewController; - productReference = BC93E0E840E59E5A8EEED03005A74849 /* SAHistoryNavigationViewController.framework */; + name = MisterFusion; + productName = MisterFusion; + productReference = 59DAC8A17BBFFA0DE316D4D4BDCBBF7A /* MisterFusion.framework */; productType = "com.apple.product-type.framework"; }; - 9FC843BD22328DEFBCAB1DA4A92108F7 /* MisterFusion */ = { + EAFB6229D0464B09A9098F5FA3DDDB85 /* SAHistoryNavigationViewController */ = { isa = PBXNativeTarget; - buildConfigurationList = D527E849301E62CDDB55A973DEBA607C /* Build configuration list for PBXNativeTarget "MisterFusion" */; + buildConfigurationList = 450EBBCFDDBA3BA26F950973E1A7FB1A /* Build configuration list for PBXNativeTarget "SAHistoryNavigationViewController" */; buildPhases = ( - 98819D7144BFC0B905DD9D19287ACEEC /* Sources */, - 54C77337B476137FCBAD1AB008AFCC03 /* Frameworks */, - 5E7702F1E80E2696D9185BFED3A6B50A /* Headers */, + F9CF8A91D1A19B513D52361100121855 /* Sources */, + A5270B60ECFEA6447BF91F1EFC840E30 /* Frameworks */, + 1C904E4B7EEBBF30913BE19147D17E7C /* Headers */, ); buildRules = ( ); dependencies = ( + 7B8C4E3354992749EF14CA9AA31E8A24 /* PBXTargetDependency */, ); - name = MisterFusion; - productName = MisterFusion; - productReference = 30B6F118E0EB1DEA2DED6B1898A8AF38 /* MisterFusion.framework */; + name = SAHistoryNavigationViewController; + productName = SAHistoryNavigationViewController; + productReference = F65238D966F0D302F0C13808DBCE930E /* SAHistoryNavigationViewController.framework */; productType = "com.apple.product-type.framework"; }; /* End PBXNativeTarget section */ @@ -367,8 +367,8 @@ D41D8CD98F00B204E9800998ECF8427E /* Project object */ = { isa = PBXProject; attributes = { - LastSwiftUpdateCheck = 0700; - LastUpgradeCheck = 0730; + LastSwiftUpdateCheck = 0730; + LastUpgradeCheck = 0700; }; buildConfigurationList = 2D8E8EC45A3A1A1D94AE762CB5028504 /* Build configuration list for PBXProject "Pods" */; compatibilityVersion = "Xcode 3.2"; @@ -378,116 +378,210 @@ en, ); mainGroup = 7DB346D0F39D3F0E887471402A8071AB; - productRefGroup = B047972AB07C8A53C95727F9BA0B2594 /* Products */; + productRefGroup = EDAEC1AC15468ECF9EF81B5F14D07BD7 /* Products */; projectDirPath = ""; projectRoot = ""; targets = ( 9FC843BD22328DEFBCAB1DA4A92108F7 /* MisterFusion */, - 594E8D02EC9F8A0A395A8E6DAD32827D /* Pods */, - 5EA2788DDCED9ABACC432611514F662F /* SAHistoryNavigationViewController */, + 910FD248C650D4867196020A5D8F1111 /* Pods-SAHistoryNavigationViewControllerSample */, + EAFB6229D0464B09A9098F5FA3DDDB85 /* SAHistoryNavigationViewController */, ); }; /* End PBXProject section */ /* Begin PBXSourcesBuildPhase section */ - 114D9152C02991B57C6AD04C36711F4F /* Sources */ = { + 6F209FAA26AE8AB1946DEDEE490A9614 /* Sources */ = { isa = PBXSourcesBuildPhase; buildActionMask = 2147483647; files = ( - B6865208DA167A52DAB71E03E612087E /* SAHistoryNavigationTransitionController.swift in Sources */, - F13A5FA8927BDE829B5F9CEEE1E31AA1 /* SAHistoryNavigationViewController-dummy.m in Sources */, - E1C298702D2C676B31FE277E180FF6A2 /* SAHistoryNavigationViewController.swift in Sources */, - AA8F1CE7B27BB6DD5AFD93E2236A79D3 /* SAHistoryViewAnimatedTransitioning.swift in Sources */, - 9139D153058B6690492DF795A83B5B6B /* SAHistoryViewController.swift in Sources */, - AECB46675952628E8BB512C1AE98E874 /* SAThirdDimensionalTouchRecognizer.swift in Sources */, - C3D224FF98A334D3F8F1E14663C9DE27 /* UINavigationController+History.swift in Sources */, - 8144FEE7F74DE32AB9A5D0B2204C72CA /* UIView+Screenshot.swift in Sources */, - A8521AB8523DE6ACFC74856DE40ACA50 /* UIViewController+Screenshot.swift in Sources */, + 5254D3C9ED519A9BDDA6D70671362EFB /* Pods-SAHistoryNavigationViewControllerSample-dummy.m in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; - 888343C50AB1C9F80EE24CA823AEDED9 /* Sources */ = { + 98819D7144BFC0B905DD9D19287ACEEC /* Sources */ = { isa = PBXSourcesBuildPhase; buildActionMask = 2147483647; files = ( - DC5BB9B75E44193A717814E2900E9E3F /* Pods-dummy.m in Sources */, + 53EE8DE41682CE1D265BE8B60ED69A11 /* Array+MisterFusion.swift in Sources */, + 22636CE1C55E8CA607798DEEABC3E8B7 /* MisterFusion-dummy.m in Sources */, + A03C84FA56C1EFBCE51BD48F9EBD5CD3 /* MisterFusion.swift in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; - 98819D7144BFC0B905DD9D19287ACEEC /* Sources */ = { + F9CF8A91D1A19B513D52361100121855 /* Sources */ = { isa = PBXSourcesBuildPhase; buildActionMask = 2147483647; files = ( - 53EE8DE41682CE1D265BE8B60ED69A11 /* Array+MisterFusion.swift in Sources */, - 22636CE1C55E8CA607798DEEABC3E8B7 /* MisterFusion-dummy.m in Sources */, - A03C84FA56C1EFBCE51BD48F9EBD5CD3 /* MisterFusion.swift in Sources */, + 1144E8E56E23E8920F90619358BCA4A6 /* SAHistoryNavigationTransitionController.swift in Sources */, + F42FB14D5AE77132A0258445216608B8 /* SAHistoryNavigationViewController-dummy.m in Sources */, + 8E1F60F1AA8F7D8101494716B8397AEE /* SAHistoryNavigationViewController.swift in Sources */, + 09B7A93E1BE7BFD01EE778373D8369A5 /* SAHistoryViewAnimatedTransitioning.swift in Sources */, + A0A2EE06369AE505E791D6B5FF3CDC55 /* SAHistoryViewController.swift in Sources */, + 541CC84E0984929D63E6346E4F7D0013 /* SAThirdDimensionalTouchRecognizer.swift in Sources */, + 86CCCCFB4AAA492713EB1B047140477C /* UINavigationController+History.swift in Sources */, + 0603F396B0068CCB838955399C38CFCA /* UIView+Screenshot.swift in Sources */, + 29F7E3EE423421BA5267AD9247204A96 /* UIViewController+Screenshot.swift in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; /* End PBXSourcesBuildPhase section */ /* Begin PBXTargetDependency section */ - 8C31BCA5989663D4506E244C2E85568E /* PBXTargetDependency */ = { + 63F139096A9BAFCEC399B9D03DAC7C33 /* PBXTargetDependency */ = { isa = PBXTargetDependency; - name = MisterFusion; - target = 9FC843BD22328DEFBCAB1DA4A92108F7 /* MisterFusion */; - targetProxy = C3BF13FA86DEDA559C94B301C12F3A62 /* PBXContainerItemProxy */; + name = SAHistoryNavigationViewController; + target = EAFB6229D0464B09A9098F5FA3DDDB85 /* SAHistoryNavigationViewController */; + targetProxy = BCFFF1F56646AB2DDC364ABB2B9349CE /* PBXContainerItemProxy */; }; - A2A788FC12BB1A4223D8467998995D5C /* PBXTargetDependency */ = { + 72CD348F836F644AA7BCEBEB4BF11CE7 /* PBXTargetDependency */ = { isa = PBXTargetDependency; name = MisterFusion; target = 9FC843BD22328DEFBCAB1DA4A92108F7 /* MisterFusion */; - targetProxy = B21C4B629785FA1A65F10902560D7777 /* PBXContainerItemProxy */; + targetProxy = 2C8668E1D9F262E1E8ECF9ECC0005C35 /* PBXContainerItemProxy */; }; - F32B05A8A01BB520FE5B0F6155BDE34D /* PBXTargetDependency */ = { + 7B8C4E3354992749EF14CA9AA31E8A24 /* PBXTargetDependency */ = { isa = PBXTargetDependency; - name = SAHistoryNavigationViewController; - target = 5EA2788DDCED9ABACC432611514F662F /* SAHistoryNavigationViewController */; - targetProxy = 940DFDC7940134AA461C3A4066CB6CB7 /* PBXContainerItemProxy */; + name = MisterFusion; + target = 9FC843BD22328DEFBCAB1DA4A92108F7 /* MisterFusion */; + targetProxy = B6F71A3C51089EDBFB1E48C4ABF89E40 /* PBXContainerItemProxy */; }; /* End PBXTargetDependency section */ /* Begin XCBuildConfiguration section */ - 0A84E3C077DFDF0A259DD770FB7B2F29 /* Debug */ = { + 015A368F878AC3E2CEAE21DDE8026304 /* Debug */ = { isa = XCBuildConfiguration; - baseConfigurationReference = 03E3FE02E6B23F6359A53225B433B444 /* MisterFusion.xcconfig */; buildSettings = { - "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; + ALWAYS_SEARCH_USER_PATHS = NO; + CLANG_ANALYZER_NONNULL = YES; + CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x"; + CLANG_CXX_LIBRARY = "libc++"; + CLANG_ENABLE_MODULES = YES; + CLANG_ENABLE_OBJC_ARC = YES; + CLANG_WARN_BOOL_CONVERSION = YES; + CLANG_WARN_CONSTANT_CONVERSION = YES; + CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES; + CLANG_WARN_EMPTY_BODY = YES; + CLANG_WARN_ENUM_CONVERSION = YES; + CLANG_WARN_INT_CONVERSION = YES; + CLANG_WARN_OBJC_ROOT_CLASS = YES; + CLANG_WARN_UNREACHABLE_CODE = YES; + CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; + CODE_SIGNING_REQUIRED = NO; + COPY_PHASE_STRIP = NO; + ENABLE_TESTABILITY = YES; + GCC_C_LANGUAGE_STANDARD = gnu99; + GCC_DYNAMIC_NO_PIC = NO; + GCC_OPTIMIZATION_LEVEL = 0; + GCC_PREPROCESSOR_DEFINITIONS = ( + "POD_CONFIGURATION_DEBUG=1", + "DEBUG=1", + "$(inherited)", + ); + GCC_SYMBOLS_PRIVATE_EXTERN = NO; + GCC_WARN_64_TO_32_BIT_CONVERSION = YES; + GCC_WARN_ABOUT_RETURN_TYPE = YES; + GCC_WARN_UNDECLARED_SELECTOR = YES; + GCC_WARN_UNINITIALIZED_AUTOS = YES; + GCC_WARN_UNUSED_FUNCTION = YES; + GCC_WARN_UNUSED_VARIABLE = YES; + IPHONEOS_DEPLOYMENT_TARGET = 8.0; + ONLY_ACTIVE_ARCH = YES; + PROVISIONING_PROFILE_SPECIFIER = NO_SIGNING/; + STRIP_INSTALLED_PRODUCT = NO; + SYMROOT = "${SRCROOT}/../build"; + }; + name = Debug; + }; + 31335D9DE245DC1FD9388081A23E4D51 /* Release */ = { + isa = XCBuildConfiguration; + baseConfigurationReference = 308F8B5D551929F70C1AA700B929F844 /* Pods-SAHistoryNavigationViewControllerSample.release.xcconfig */; + buildSettings = { + "CODE_SIGN_IDENTITY[sdk=appletvos*]" = ""; + "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = ""; + "CODE_SIGN_IDENTITY[sdk=watchos*]" = ""; CURRENT_PROJECT_VERSION = 1; + DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; DEFINES_MODULE = YES; DYLIB_COMPATIBILITY_VERSION = 1; DYLIB_CURRENT_VERSION = 1; DYLIB_INSTALL_NAME_BASE = "@rpath"; ENABLE_STRICT_OBJC_MSGSEND = YES; - GCC_PREFIX_HEADER = "Target Support Files/MisterFusion/MisterFusion-prefix.pch"; - INFOPLIST_FILE = "Target Support Files/MisterFusion/Info.plist"; + GCC_NO_COMMON_BLOCKS = YES; + INFOPLIST_FILE = "Target Support Files/Pods-SAHistoryNavigationViewControllerSample/Info.plist"; INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; IPHONEOS_DEPLOYMENT_TARGET = 8.0; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; - MODULEMAP_FILE = "Target Support Files/MisterFusion/MisterFusion.modulemap"; - MTL_ENABLE_DEBUG_INFO = YES; + MACH_O_TYPE = staticlib; + MODULEMAP_FILE = "Target Support Files/Pods-SAHistoryNavigationViewControllerSample/Pods-SAHistoryNavigationViewControllerSample.modulemap"; + MTL_ENABLE_DEBUG_INFO = NO; + OTHER_LDFLAGS = ""; + OTHER_LIBTOOLFLAGS = ""; + PODS_ROOT = "$(SRCROOT)"; PRODUCT_BUNDLE_IDENTIFIER = "org.cocoapods.${PRODUCT_NAME:rfc1034identifier}"; - PRODUCT_NAME = MisterFusion; + PRODUCT_NAME = Pods_SAHistoryNavigationViewControllerSample; SDKROOT = iphoneos; SKIP_INSTALL = YES; - SWIFT_OPTIMIZATION_LEVEL = "-Onone"; TARGETED_DEVICE_FAMILY = "1,2"; VERSIONING_SYSTEM = "apple-generic"; VERSION_INFO_PREFIX = ""; }; - name = Debug; + name = Release; + }; + 44CDBB6D11DE06DB64D6268622BDC47E /* Release */ = { + isa = XCBuildConfiguration; + buildSettings = { + ALWAYS_SEARCH_USER_PATHS = NO; + CLANG_ANALYZER_NONNULL = YES; + CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x"; + CLANG_CXX_LIBRARY = "libc++"; + CLANG_ENABLE_MODULES = YES; + CLANG_ENABLE_OBJC_ARC = YES; + CLANG_WARN_BOOL_CONVERSION = YES; + CLANG_WARN_CONSTANT_CONVERSION = YES; + CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES; + CLANG_WARN_EMPTY_BODY = YES; + CLANG_WARN_ENUM_CONVERSION = YES; + CLANG_WARN_INT_CONVERSION = YES; + CLANG_WARN_OBJC_ROOT_CLASS = YES; + CLANG_WARN_UNREACHABLE_CODE = YES; + CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; + CODE_SIGNING_REQUIRED = NO; + COPY_PHASE_STRIP = YES; + ENABLE_NS_ASSERTIONS = NO; + GCC_C_LANGUAGE_STANDARD = gnu99; + GCC_PREPROCESSOR_DEFINITIONS = ( + "POD_CONFIGURATION_RELEASE=1", + "$(inherited)", + ); + GCC_WARN_64_TO_32_BIT_CONVERSION = YES; + GCC_WARN_ABOUT_RETURN_TYPE = YES; + GCC_WARN_UNDECLARED_SELECTOR = YES; + GCC_WARN_UNINITIALIZED_AUTOS = YES; + GCC_WARN_UNUSED_FUNCTION = YES; + GCC_WARN_UNUSED_VARIABLE = YES; + IPHONEOS_DEPLOYMENT_TARGET = 8.0; + PROVISIONING_PROFILE_SPECIFIER = NO_SIGNING/; + STRIP_INSTALLED_PRODUCT = NO; + SYMROOT = "${SRCROOT}/../build"; + VALIDATE_PRODUCT = YES; + }; + name = Release; }; - 360F462B4866C915303F0B338AF21FB4 /* Debug */ = { + 4EF41EEBA77E6CF744A9748015D36165 /* Debug */ = { isa = XCBuildConfiguration; baseConfigurationReference = 383CADD8122DBCE5DDC3DD9DC73C8462 /* SAHistoryNavigationViewController.xcconfig */; buildSettings = { - "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; + "CODE_SIGN_IDENTITY[sdk=appletvos*]" = ""; + "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = ""; + "CODE_SIGN_IDENTITY[sdk=watchos*]" = ""; CURRENT_PROJECT_VERSION = 1; + DEBUG_INFORMATION_FORMAT = dwarf; DEFINES_MODULE = YES; DYLIB_COMPATIBILITY_VERSION = 1; DYLIB_CURRENT_VERSION = 1; DYLIB_INSTALL_NAME_BASE = "@rpath"; ENABLE_STRICT_OBJC_MSGSEND = YES; + GCC_NO_COMMON_BLOCKS = YES; GCC_PREFIX_HEADER = "Target Support Files/SAHistoryNavigationViewController/SAHistoryNavigationViewController-prefix.pch"; INFOPLIST_FILE = "Target Support Files/SAHistoryNavigationViewController/Info.plist"; INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; @@ -495,28 +589,32 @@ LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; MODULEMAP_FILE = "Target Support Files/SAHistoryNavigationViewController/SAHistoryNavigationViewController.modulemap"; MTL_ENABLE_DEBUG_INFO = YES; - PRODUCT_BUNDLE_IDENTIFIER = "org.cocoapods.${PRODUCT_NAME:rfc1034identifier}"; PRODUCT_NAME = SAHistoryNavigationViewController; SDKROOT = iphoneos; SKIP_INSTALL = YES; SWIFT_OPTIMIZATION_LEVEL = "-Onone"; + SWIFT_VERSION = 2.3; TARGETED_DEVICE_FAMILY = "1,2"; VERSIONING_SYSTEM = "apple-generic"; VERSION_INFO_PREFIX = ""; }; name = Debug; }; - 4544A00B7B0D2C4F190B2516C2830940 /* Release */ = { + 5ED94CD764FC14BC3B28A5F87DBFFB03 /* Release */ = { isa = XCBuildConfiguration; baseConfigurationReference = 383CADD8122DBCE5DDC3DD9DC73C8462 /* SAHistoryNavigationViewController.xcconfig */; buildSettings = { - "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; + "CODE_SIGN_IDENTITY[sdk=appletvos*]" = ""; + "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = ""; + "CODE_SIGN_IDENTITY[sdk=watchos*]" = ""; CURRENT_PROJECT_VERSION = 1; + DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; DEFINES_MODULE = YES; DYLIB_COMPATIBILITY_VERSION = 1; DYLIB_CURRENT_VERSION = 1; DYLIB_INSTALL_NAME_BASE = "@rpath"; ENABLE_STRICT_OBJC_MSGSEND = YES; + GCC_NO_COMMON_BLOCKS = YES; GCC_PREFIX_HEADER = "Target Support Files/SAHistoryNavigationViewController/SAHistoryNavigationViewController-prefix.pch"; INFOPLIST_FILE = "Target Support Files/SAHistoryNavigationViewController/Info.plist"; INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; @@ -524,180 +622,116 @@ LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; MODULEMAP_FILE = "Target Support Files/SAHistoryNavigationViewController/SAHistoryNavigationViewController.modulemap"; MTL_ENABLE_DEBUG_INFO = NO; - PRODUCT_BUNDLE_IDENTIFIER = "org.cocoapods.${PRODUCT_NAME:rfc1034identifier}"; PRODUCT_NAME = SAHistoryNavigationViewController; SDKROOT = iphoneos; SKIP_INSTALL = YES; + SWIFT_VERSION = 2.3; TARGETED_DEVICE_FAMILY = "1,2"; VERSIONING_SYSTEM = "apple-generic"; VERSION_INFO_PREFIX = ""; }; name = Release; }; - 647146E94AEC35D12EF0DEF3548920B6 /* Debug */ = { + 7D92BA3DBF2A60331DCEF682E7A168B2 /* Release */ = { isa = XCBuildConfiguration; - baseConfigurationReference = 977577C045EDA9D9D1F46E2598D19FC7 /* Pods.debug.xcconfig */; + baseConfigurationReference = 03E3FE02E6B23F6359A53225B433B444 /* MisterFusion.xcconfig */; buildSettings = { - "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; + "CODE_SIGN_IDENTITY[sdk=appletvos*]" = ""; + "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = ""; + "CODE_SIGN_IDENTITY[sdk=watchos*]" = ""; CURRENT_PROJECT_VERSION = 1; + DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; DEFINES_MODULE = YES; DYLIB_COMPATIBILITY_VERSION = 1; DYLIB_CURRENT_VERSION = 1; DYLIB_INSTALL_NAME_BASE = "@rpath"; ENABLE_STRICT_OBJC_MSGSEND = YES; - INFOPLIST_FILE = "Target Support Files/Pods/Info.plist"; + GCC_NO_COMMON_BLOCKS = YES; + GCC_PREFIX_HEADER = "Target Support Files/MisterFusion/MisterFusion-prefix.pch"; + INFOPLIST_FILE = "Target Support Files/MisterFusion/Info.plist"; INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; IPHONEOS_DEPLOYMENT_TARGET = 8.0; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; - MACH_O_TYPE = staticlib; - MODULEMAP_FILE = "Target Support Files/Pods/Pods.modulemap"; - MTL_ENABLE_DEBUG_INFO = YES; - OTHER_LDFLAGS = ""; - OTHER_LIBTOOLFLAGS = ""; - PODS_ROOT = "$(SRCROOT)"; - PRODUCT_BUNDLE_IDENTIFIER = "org.cocoapods.${PRODUCT_NAME:rfc1034identifier}"; - PRODUCT_NAME = Pods; + MODULEMAP_FILE = "Target Support Files/MisterFusion/MisterFusion.modulemap"; + MTL_ENABLE_DEBUG_INFO = NO; + PRODUCT_NAME = MisterFusion; SDKROOT = iphoneos; SKIP_INSTALL = YES; - SWIFT_OPTIMIZATION_LEVEL = "-Onone"; + SWIFT_VERSION = 2.3; TARGETED_DEVICE_FAMILY = "1,2"; VERSIONING_SYSTEM = "apple-generic"; VERSION_INFO_PREFIX = ""; }; - name = Debug; - }; - A70CDAD61F90AC503C7D04CC22DA2923 /* Debug */ = { - isa = XCBuildConfiguration; - buildSettings = { - ALWAYS_SEARCH_USER_PATHS = NO; - CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x"; - CLANG_CXX_LIBRARY = "libc++"; - CLANG_ENABLE_MODULES = YES; - CLANG_ENABLE_OBJC_ARC = YES; - CLANG_WARN_BOOL_CONVERSION = YES; - CLANG_WARN_CONSTANT_CONVERSION = YES; - CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES; - CLANG_WARN_EMPTY_BODY = YES; - CLANG_WARN_ENUM_CONVERSION = YES; - CLANG_WARN_INT_CONVERSION = YES; - CLANG_WARN_OBJC_ROOT_CLASS = YES; - CLANG_WARN_UNREACHABLE_CODE = YES; - CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; - COPY_PHASE_STRIP = NO; - ENABLE_TESTABILITY = YES; - GCC_C_LANGUAGE_STANDARD = gnu99; - GCC_DYNAMIC_NO_PIC = NO; - GCC_OPTIMIZATION_LEVEL = 0; - GCC_PREPROCESSOR_DEFINITIONS = ( - "DEBUG=1", - "$(inherited)", - ); - GCC_SYMBOLS_PRIVATE_EXTERN = NO; - GCC_WARN_64_TO_32_BIT_CONVERSION = YES; - GCC_WARN_ABOUT_RETURN_TYPE = YES; - GCC_WARN_UNDECLARED_SELECTOR = YES; - GCC_WARN_UNINITIALIZED_AUTOS = YES; - GCC_WARN_UNUSED_FUNCTION = YES; - GCC_WARN_UNUSED_VARIABLE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 8.0; - ONLY_ACTIVE_ARCH = YES; - STRIP_INSTALLED_PRODUCT = NO; - SYMROOT = "${SRCROOT}/../build"; - }; - name = Debug; + name = Release; }; - BB9D8406934875C5E574A0219F10015A /* Release */ = { + D34529666AB03A85E79A4ED6F8EBB63B /* Debug */ = { isa = XCBuildConfiguration; baseConfigurationReference = 03E3FE02E6B23F6359A53225B433B444 /* MisterFusion.xcconfig */; buildSettings = { - "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; + "CODE_SIGN_IDENTITY[sdk=appletvos*]" = ""; + "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = ""; + "CODE_SIGN_IDENTITY[sdk=watchos*]" = ""; CURRENT_PROJECT_VERSION = 1; + DEBUG_INFORMATION_FORMAT = dwarf; DEFINES_MODULE = YES; DYLIB_COMPATIBILITY_VERSION = 1; DYLIB_CURRENT_VERSION = 1; DYLIB_INSTALL_NAME_BASE = "@rpath"; ENABLE_STRICT_OBJC_MSGSEND = YES; + GCC_NO_COMMON_BLOCKS = YES; GCC_PREFIX_HEADER = "Target Support Files/MisterFusion/MisterFusion-prefix.pch"; INFOPLIST_FILE = "Target Support Files/MisterFusion/Info.plist"; INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; IPHONEOS_DEPLOYMENT_TARGET = 8.0; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; MODULEMAP_FILE = "Target Support Files/MisterFusion/MisterFusion.modulemap"; - MTL_ENABLE_DEBUG_INFO = NO; - PRODUCT_BUNDLE_IDENTIFIER = "org.cocoapods.${PRODUCT_NAME:rfc1034identifier}"; + MTL_ENABLE_DEBUG_INFO = YES; PRODUCT_NAME = MisterFusion; SDKROOT = iphoneos; SKIP_INSTALL = YES; + SWIFT_OPTIMIZATION_LEVEL = "-Onone"; + SWIFT_VERSION = 2.3; TARGETED_DEVICE_FAMILY = "1,2"; VERSIONING_SYSTEM = "apple-generic"; VERSION_INFO_PREFIX = ""; }; - name = Release; + name = Debug; }; - E33FA458519D185ED9EBDF776989C33F /* Release */ = { + E1B3866228AA62795ECCA48AF84A329D /* Debug */ = { isa = XCBuildConfiguration; - baseConfigurationReference = DA312349A49333542E6F4B36B329960E /* Pods.release.xcconfig */; + baseConfigurationReference = D497B27AA036741E8CC5E008163D60AE /* Pods-SAHistoryNavigationViewControllerSample.debug.xcconfig */; buildSettings = { - "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; + "CODE_SIGN_IDENTITY[sdk=appletvos*]" = ""; + "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = ""; + "CODE_SIGN_IDENTITY[sdk=watchos*]" = ""; CURRENT_PROJECT_VERSION = 1; + DEBUG_INFORMATION_FORMAT = dwarf; DEFINES_MODULE = YES; DYLIB_COMPATIBILITY_VERSION = 1; DYLIB_CURRENT_VERSION = 1; DYLIB_INSTALL_NAME_BASE = "@rpath"; ENABLE_STRICT_OBJC_MSGSEND = YES; - INFOPLIST_FILE = "Target Support Files/Pods/Info.plist"; + GCC_NO_COMMON_BLOCKS = YES; + INFOPLIST_FILE = "Target Support Files/Pods-SAHistoryNavigationViewControllerSample/Info.plist"; INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; IPHONEOS_DEPLOYMENT_TARGET = 8.0; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; MACH_O_TYPE = staticlib; - MODULEMAP_FILE = "Target Support Files/Pods/Pods.modulemap"; - MTL_ENABLE_DEBUG_INFO = NO; + MODULEMAP_FILE = "Target Support Files/Pods-SAHistoryNavigationViewControllerSample/Pods-SAHistoryNavigationViewControllerSample.modulemap"; + MTL_ENABLE_DEBUG_INFO = YES; OTHER_LDFLAGS = ""; OTHER_LIBTOOLFLAGS = ""; PODS_ROOT = "$(SRCROOT)"; PRODUCT_BUNDLE_IDENTIFIER = "org.cocoapods.${PRODUCT_NAME:rfc1034identifier}"; - PRODUCT_NAME = Pods; + PRODUCT_NAME = Pods_SAHistoryNavigationViewControllerSample; SDKROOT = iphoneos; SKIP_INSTALL = YES; + SWIFT_OPTIMIZATION_LEVEL = "-Onone"; TARGETED_DEVICE_FAMILY = "1,2"; VERSIONING_SYSTEM = "apple-generic"; VERSION_INFO_PREFIX = ""; }; - name = Release; - }; - FB45FFD90572718D82AB9092B750F0CA /* Release */ = { - isa = XCBuildConfiguration; - buildSettings = { - ALWAYS_SEARCH_USER_PATHS = NO; - CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x"; - CLANG_CXX_LIBRARY = "libc++"; - CLANG_ENABLE_MODULES = YES; - CLANG_ENABLE_OBJC_ARC = YES; - CLANG_WARN_BOOL_CONVERSION = YES; - CLANG_WARN_CONSTANT_CONVERSION = YES; - CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES; - CLANG_WARN_EMPTY_BODY = YES; - CLANG_WARN_ENUM_CONVERSION = YES; - CLANG_WARN_INT_CONVERSION = YES; - CLANG_WARN_OBJC_ROOT_CLASS = YES; - CLANG_WARN_UNREACHABLE_CODE = YES; - CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; - COPY_PHASE_STRIP = YES; - ENABLE_NS_ASSERTIONS = NO; - GCC_C_LANGUAGE_STANDARD = gnu99; - GCC_PREPROCESSOR_DEFINITIONS = "RELEASE=1"; - GCC_WARN_64_TO_32_BIT_CONVERSION = YES; - GCC_WARN_ABOUT_RETURN_TYPE = YES; - GCC_WARN_UNDECLARED_SELECTOR = YES; - GCC_WARN_UNINITIALIZED_AUTOS = YES; - GCC_WARN_UNUSED_FUNCTION = YES; - GCC_WARN_UNUSED_VARIABLE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 8.0; - STRIP_INSTALLED_PRODUCT = NO; - SYMROOT = "${SRCROOT}/../build"; - VALIDATE_PRODUCT = YES; - }; - name = Release; + name = Debug; }; /* End XCBuildConfiguration section */ @@ -705,35 +739,35 @@ 2D8E8EC45A3A1A1D94AE762CB5028504 /* Build configuration list for PBXProject "Pods" */ = { isa = XCConfigurationList; buildConfigurations = ( - A70CDAD61F90AC503C7D04CC22DA2923 /* Debug */, - FB45FFD90572718D82AB9092B750F0CA /* Release */, + 015A368F878AC3E2CEAE21DDE8026304 /* Debug */, + 44CDBB6D11DE06DB64D6268622BDC47E /* Release */, ); defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; }; - B0C962FB46D6E2682E177B2443D7808B /* Build configuration list for PBXNativeTarget "Pods" */ = { + 450EBBCFDDBA3BA26F950973E1A7FB1A /* Build configuration list for PBXNativeTarget "SAHistoryNavigationViewController" */ = { isa = XCConfigurationList; buildConfigurations = ( - 647146E94AEC35D12EF0DEF3548920B6 /* Debug */, - E33FA458519D185ED9EBDF776989C33F /* Release */, + 4EF41EEBA77E6CF744A9748015D36165 /* Debug */, + 5ED94CD764FC14BC3B28A5F87DBFFB03 /* Release */, ); defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; }; - C7E5D98E534CA5906E88661DD82B864F /* Build configuration list for PBXNativeTarget "SAHistoryNavigationViewController" */ = { + D527E849301E62CDDB55A973DEBA607C /* Build configuration list for PBXNativeTarget "MisterFusion" */ = { isa = XCConfigurationList; buildConfigurations = ( - 360F462B4866C915303F0B338AF21FB4 /* Debug */, - 4544A00B7B0D2C4F190B2516C2830940 /* Release */, + D34529666AB03A85E79A4ED6F8EBB63B /* Debug */, + 7D92BA3DBF2A60331DCEF682E7A168B2 /* Release */, ); defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; }; - D527E849301E62CDDB55A973DEBA607C /* Build configuration list for PBXNativeTarget "MisterFusion" */ = { + E905E4B86C285E93CDAF3148145A6804 /* Build configuration list for PBXNativeTarget "Pods-SAHistoryNavigationViewControllerSample" */ = { isa = XCConfigurationList; buildConfigurations = ( - 0A84E3C077DFDF0A259DD770FB7B2F29 /* Debug */, - BB9D8406934875C5E574A0219F10015A /* Release */, + E1B3866228AA62795ECCA48AF84A329D /* Debug */, + 31335D9DE245DC1FD9388081A23E4D51 /* Release */, ); defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; diff --git a/SAHistoryNavigationViewControllerSample/Pods/Pods.xcodeproj/xcshareddata/xcschemes/SAHistoryNavigationViewController.xcscheme b/SAHistoryNavigationViewControllerSample/Pods/Pods.xcodeproj/xcshareddata/xcschemes/SAHistoryNavigationViewController.xcscheme deleted file mode 100644 index c819811..0000000 --- a/SAHistoryNavigationViewControllerSample/Pods/Pods.xcodeproj/xcshareddata/xcschemes/SAHistoryNavigationViewController.xcscheme +++ /dev/null @@ -1,71 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/SAHistoryNavigationViewControllerSample/Pods/SAHistoryNavigationViewController/LICENSE b/SAHistoryNavigationViewControllerSample/Pods/SAHistoryNavigationViewController/LICENSE deleted file mode 100644 index 1f52f93..0000000 --- a/SAHistoryNavigationViewControllerSample/Pods/SAHistoryNavigationViewController/LICENSE +++ /dev/null @@ -1,19 +0,0 @@ -Copyright (c) 2015 Taiki Suzuki - -Permission is hereby granted, free of charge, to any person obtaining a copy -of this software and associated documentation files (the "Software"), to deal -in the Software without restriction, including without limitation the rights -to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -copies of the Software, and to permit persons to whom the Software is -furnished to do so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in -all copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN -THE SOFTWARE. diff --git a/SAHistoryNavigationViewControllerSample/Pods/SAHistoryNavigationViewController/README.md b/SAHistoryNavigationViewControllerSample/Pods/SAHistoryNavigationViewController/README.md deleted file mode 100644 index c1b1164..0000000 --- a/SAHistoryNavigationViewControllerSample/Pods/SAHistoryNavigationViewController/README.md +++ /dev/null @@ -1,78 +0,0 @@ -# SAHistoryNavigationViewController - -[![Platform](http://img.shields.io/badge/platform-ios-blue.svg?style=flat -)](https://developer.apple.com/iphone/index.action) -[![Language](http://img.shields.io/badge/language-swift-brightgreen.svg?style=flat -)](https://developer.apple.com/swift) -[![Version](https://img.shields.io/cocoapods/v/SAHistoryNavigationViewController.svg?style=flat)](http://cocoapods.org/pods/SAHistoryNavigationViewController) -[![License](https://img.shields.io/cocoapods/l/SAHistoryNavigationViewController.svg?style=flat)](http://cocoapods.org/pods/SAHistoryNavigationViewController) - -![](./SampleImage/sample.gif) - -SAHistoryNavigationViewController realizes iOS task manager like UI in UINavigationContoller. - -## Features - -- [x] iOS task manager like UI -- [x] Launch Navigation History with Long tap action of Back Bar Button - -## Installation - -#### CocoaPods - -SAHistoryNavigationViewController is available through [CocoaPods](http://cocoapods.org). If you have cocoapods 0.36.0 or greater, you can install -it, simply add the following line to your Podfile: - - pod "SAHistoryNavigationViewController" - -#### Manually - -Add the [SAHistoryNavigationViewController](./SAHistoryNavigationViewController) directory to your project. - -## Usage - -If you install from cocoapods, You have to write `import SAHistoryNavigationViewController`. - -#### Storyboard or Xib -![](./SampleImage/storyboard.png) - -Set custom class of UINavigationController to SAHistoryNavigationViewController. - -#### Code - -You can use SAHistoryNavigationViewController like UINavigationViewController. - -```swift - let viewControlelr = UIViewController() - let navigationController = SAHistoryNavigationViewController() - navigationController.setViewControllers([viewControlelr], animated: true) - presentViewController(navigationController, animated: true, completion: nil) -``` - -If you want to launch Navigation History without long tap action, use this code. - -```swift - navigationController?.showHistory() -``` - -## Customize - -If you want to customize background of Navigation History, you can use those methods. - -```swift - navigationController?.contentView() - navigationController?.setHistoryBackgroundColor(color: UIColor) -``` - -## Requirements - -- Xcode 6.1 or greater -- iOS7.0(manually only) or greater - -## Author - -Taiki Suzuki, s1180183@gmail.com - -## License - -SAHistoryNavigationViewController is available under the MIT license. See the LICENSE file for more info. diff --git a/SAHistoryNavigationViewControllerSample/Pods/SAHistoryNavigationViewController/SAHistoryNavigationViewController/NSLayoutConstraint+Fit.swift b/SAHistoryNavigationViewControllerSample/Pods/SAHistoryNavigationViewController/SAHistoryNavigationViewController/NSLayoutConstraint+Fit.swift deleted file mode 100644 index 0f0d3d2..0000000 --- a/SAHistoryNavigationViewControllerSample/Pods/SAHistoryNavigationViewController/SAHistoryNavigationViewController/NSLayoutConstraint+Fit.swift +++ /dev/null @@ -1,50 +0,0 @@ -// -// NSLayoutConstraint+Fit.swift -// SAHistoryNavigationViewController -// -// Created by 鈴木大貴 on 2015/03/26. -// Copyright (c) 2015年 鈴木大貴. All rights reserved. -// - -import UIKit - -extension NSLayoutConstraint { - class func applyAutoLayout(superview: UIView, target: UIView, index: Int?, top: Float?, left: Float?, right: Float?, bottom: Float?, height: Float?, width: Float?) { - - target.setTranslatesAutoresizingMaskIntoConstraints(false) - if let index = index? { - superview.insertSubview(target, atIndex: index) - } else { - superview.addSubview(target) - } - var verticalFormat = "V:" - if let top = top { - verticalFormat += "|-(\(top))-" - } - verticalFormat += "[target" - if let height = height { - verticalFormat += "(\(height))" - } - verticalFormat += "]" - if let bottom = bottom { - verticalFormat += "-(\(bottom))-|" - } - let verticalConstrains = NSLayoutConstraint.constraintsWithVisualFormat(verticalFormat, options: nil, metrics: nil, views: [ "target" : target ]) - superview.addConstraints(verticalConstrains) - - var horizonFormat = "H:" - if let left = left { - horizonFormat += "|-(\(left))-" - } - horizonFormat += "[target" - if let width = width { - horizonFormat += "(\(width))" - } - horizonFormat += "]" - if let right = right { - horizonFormat += "-(\(right))-|" - } - let horizonConstrains = NSLayoutConstraint.constraintsWithVisualFormat(horizonFormat, options: nil, metrics: nil, views: [ "target" : target ]) - superview.addConstraints(horizonConstrains) - } -} diff --git a/SAHistoryNavigationViewControllerSample/Pods/SAHistoryNavigationViewController/SAHistoryNavigationViewController/SAHistoryNavigationViewController.swift b/SAHistoryNavigationViewControllerSample/Pods/SAHistoryNavigationViewController/SAHistoryNavigationViewController/SAHistoryNavigationViewController.swift deleted file mode 100644 index e6e4d50..0000000 --- a/SAHistoryNavigationViewControllerSample/Pods/SAHistoryNavigationViewController/SAHistoryNavigationViewController/SAHistoryNavigationViewController.swift +++ /dev/null @@ -1,216 +0,0 @@ -// -// SAHistoryNavigationViewController.swift -// SAHistoryNavigationViewController -// -// Created by 鈴木大貴 on 2015/03/26. -// Copyright (c) 2015年 鈴木大貴. All rights reserved. -// - -import UIKit - -extension UINavigationController { - public func showHistory() {} - public func setHistoryBackgroundColor(color: UIColor) {} - public func contentView() -> UIView? { return nil } -} - -extension UIView { - func screenshotImage(scale: CGFloat = 0.0) -> UIImage { - UIGraphicsBeginImageContextWithOptions(frame.size, false, scale) - drawViewHierarchyInRect(bounds, afterScreenUpdates: true) - let image = UIGraphicsGetImageFromCurrentImageContext() - UIGraphicsEndImageContext() - return image - } -} - -public class SAHistoryNavigationViewController: UINavigationController { - - var historyViewController = SAHistoryViewController() - - public var historyContentView = UIView() - - private var coverView = UIView() - private var screenshotImages = [UIImage]() - - private let kImageScale: CGFloat = 1.0 - - override init() { - super.init() - } - - required public init(coder aDecoder: NSCoder) { - super.init(coder: aDecoder) - } - - override public init(navigationBarClass: AnyClass!, toolbarClass: AnyClass!) { - super.init(navigationBarClass: navigationBarClass, toolbarClass: toolbarClass) - } - - override public init(nibName nibNameOrNil: String?, bundle nibBundleOrNil: NSBundle?) { - super.init(nibName: nibNameOrNil, bundle: nibBundleOrNil) - } - - override public init(rootViewController: UIViewController) { - super.init(rootViewController: rootViewController) - } - - override public func viewDidLoad() { - if let viewController = viewControllers.first as? UIViewController { - screenshotImages += [viewController.view.screenshotImage(scale: kImageScale)] - } - - coverView.backgroundColor = .grayColor() - coverView.hidden = true - NSLayoutConstraint.applyAutoLayout(view, target: coverView, index: nil, top: 0.0, left: 0.0, right: 0.0, bottom: 0.0, height: nil, width: nil) - - historyContentView.backgroundColor = .clearColor() - historyContentView.hidden = true - NSLayoutConstraint.applyAutoLayout(view, target: historyContentView, index: nil, top: 0.0, left: 0.0, right: 0.0, bottom: 0.0, height: nil, width: nil) - - historyViewController.delegate = self - historyViewController.view.hidden = true - let width = UIScreen.mainScreen().bounds.size.width - NSLayoutConstraint.applyAutoLayout(view, target: historyViewController.view, index: nil, top: 0.0, left: Float(-width), right: Float(-width), bottom: 0.0, height: nil, width: Float(width * 3)) - - - let longPressGesture = UILongPressGestureRecognizer(target: self, action: "detectLongTap:") - longPressGesture.delegate = self - navigationBar.addGestureRecognizer(longPressGesture) - } - - override public func pushViewController(viewController: UIViewController, animated: Bool) { - super.pushViewController(viewController, animated: animated) - screenshotImages += [viewController.view.screenshotImage(scale: kImageScale)] - } - - override public func popViewControllerAnimated(animated: Bool) -> UIViewController? { - screenshotImages.removeLast() - return super.popViewControllerAnimated(animated) - } - - override public func popToRootViewControllerAnimated(animated: Bool) -> [AnyObject]? { - if let image = screenshotImages.first { - screenshotImages.removeAll(keepCapacity: false) - screenshotImages += [image] - } - return super.popToRootViewControllerAnimated(animated) - } - - override public func popToViewController(viewController: UIViewController, animated: Bool) -> [AnyObject]? { - - var index: Int? - for (currentIndex, currentViewController) in enumerate(viewControllers) { - if currentViewController as? UIViewController == viewController { - index = currentIndex - break - } - } - - var removeList = [Bool]() - for (currentIndex, image) in enumerate(screenshotImages) { - if currentIndex > index { - removeList += [true] - } else { - removeList += [false] - } - } - for (currentIndex, shouldRemove) in enumerate(removeList) { - if shouldRemove { - if let index = index { - screenshotImages.removeAtIndex(index + 1) - } - } - } - return super.popToViewController(viewController, animated: animated) - } - - override public func setViewControllers(viewControllers: [AnyObject]!, animated: Bool) { - super.setViewControllers(viewControllers, animated: animated) - for viewController in viewControllers { - if let viewController = viewController as? UIViewController { - screenshotImages += [viewController.view.screenshotImage(scale: kImageScale)] - } - } - } - - override public func showHistory() { - - super.showHistory() - - historyViewController.images = screenshotImages - historyViewController.currentIndex = viewControllers.count - 1 - historyViewController.reload() - historyViewController.view.hidden = false - coverView.hidden = false - historyContentView.hidden = false - - screenshotImages.removeLast() - screenshotImages += [visibleViewController.view.screenshotImage(scale: 1.0)] - - setNavigationBarHidden(true, animated: true) - UIView.animateWithDuration(0.25, delay: 0.0, options: .CurveEaseOut, animations: { - self.historyViewController.view.transform = CGAffineTransformScale(CGAffineTransformIdentity, 0.7, 0.7) - }) { (finished) in - - } - } - - override public func setHistoryBackgroundColor(color: UIColor) { - coverView.backgroundColor = color - } - - override public func contentView() -> UIView? { - return historyContentView - } - - func detectLongTap(gesture: UILongPressGestureRecognizer) { - if gesture.state == .Began { - showHistory() - } - } -} - -extension SAHistoryNavigationViewController: SAHistoryViewControllerDelegate { - func didSelectIndex(index: Int) { - - if let viewControllers = self.viewControllers as? [UIViewController] { - var destinationViewController: UIViewController? - for (currentIndex, viewController) in enumerate(viewControllers) { - if currentIndex == index { - destinationViewController = viewController - break - } - } - - if let viewController = destinationViewController { - popToViewController(viewController, animated: false) - } - - UIView.animateWithDuration(0.25, delay: 0.0, options: .CurveEaseOut, animations: { - self.historyViewController.view.transform = CGAffineTransformIdentity - self.historyViewController.scrollToIndex(index, animated: false) - }) { (finished) in - self.historyViewController.view.hidden = true - self.coverView.hidden = true - self.historyContentView.hidden = true - self.setNavigationBarHidden(false, animated: true) - } - } - } -} - -extension SAHistoryNavigationViewController: UIGestureRecognizerDelegate { - public func gestureRecognizerShouldBegin(gestureRecognizer: UIGestureRecognizer) -> Bool { - - if let backItem = visibleViewController.navigationController?.navigationBar.backItem { - let backButtonFrame = CGRect(x:8, y:6, width:58, height:30) - let touchPoint = gestureRecognizer.locationInView(gestureRecognizer.view) - if CGRectContainsPoint(backButtonFrame, touchPoint) { - return true - } - } - - return false - } -} diff --git a/SAHistoryNavigationViewControllerSample/Pods/SAHistoryNavigationViewController/SAHistoryNavigationViewController/SAHistoryViewController.swift b/SAHistoryNavigationViewControllerSample/Pods/SAHistoryNavigationViewController/SAHistoryNavigationViewController/SAHistoryViewController.swift deleted file mode 100644 index 145f4cb..0000000 --- a/SAHistoryNavigationViewControllerSample/Pods/SAHistoryNavigationViewController/SAHistoryNavigationViewController/SAHistoryViewController.swift +++ /dev/null @@ -1,106 +0,0 @@ -// -// SAHistoryViewController.swift -// SAHistoryNavigationViewControllerSample -// -// Created by 鈴木大貴 on 2015/03/26. -// Copyright (c) 2015年 鈴木大貴. All rights reserved. -// - -import UIKit - -protocol SAHistoryViewControllerDelegate: class { - func didSelectIndex(index: Int) -} - -class SAHistoryViewController: UIViewController { - - let collectionView = UICollectionView(frame: CGRectZero, collectionViewLayout: UICollectionViewFlowLayout()) - - var images: [UIImage]? - var currentIndex: Int = 0 - - weak var delegate: SAHistoryViewControllerDelegate? - - private let kLineSpace: CGFloat = 20.0 - - override init() { - super.init() - } - - override init(nibName nibNameOrNil: String?, bundle nibBundleOrNil: NSBundle?) { - super.init(nibName: nibNameOrNil, bundle: nibBundleOrNil) - } - - required init(coder aDecoder: NSCoder) { - super.init(coder: aDecoder) - } - - override func viewDidLoad() { - super.viewDidLoad() - - // Do any additional setup after loading the view. - let size = UIScreen.mainScreen().bounds.size - if let layout = collectionView.collectionViewLayout as? UICollectionViewFlowLayout { - layout.itemSize = size - layout.minimumInteritemSpacing = 0.0 - layout.minimumLineSpacing = 20.0 - layout.sectionInset = UIEdgeInsets(top: 0.0, left: size.width, bottom: 0.0, right: size.width) - layout.scrollDirection = .Horizontal - } - - collectionView.registerClass(UICollectionViewCell.self, forCellWithReuseIdentifier: "Cell") - collectionView.delegate = self - collectionView.dataSource = self - collectionView.backgroundColor = .clearColor() - collectionView.showsHorizontalScrollIndicator = false - - NSLayoutConstraint.applyAutoLayout(view, target: collectionView, index: nil, top: 0.0, left: 0.0, right: 0.0, bottom: 0.0, height: nil, width: nil) - } - - override func didReceiveMemoryWarning() { - super.didReceiveMemoryWarning() - // Dispose of any resources that can be recreated. - } - - func reload() { - collectionView.reloadData() - scrollToIndex(currentIndex, animated: false) - } - - func scrollToIndex(index: Int, animated: Bool) { - let width = UIScreen.mainScreen().bounds.size.width - collectionView.setContentOffset(CGPoint(x: (width + kLineSpace) * CGFloat(index), y: 0), animated: animated) - } -} - -extension SAHistoryViewController: UICollectionViewDataSource { - func collectionView(collectionView: UICollectionView, numberOfItemsInSection section: Int) -> Int { - if let count = images?.count { - return count - } - return 0 - } - - func collectionView(collectionView: UICollectionView, cellForItemAtIndexPath indexPath: NSIndexPath) -> UICollectionViewCell { - let cell = collectionView.dequeueReusableCellWithReuseIdentifier("Cell", forIndexPath: indexPath) as UICollectionViewCell - - for view in cell.subviews { - if let view = view as? UIImageView { - view.removeFromSuperview() - } - } - - let imageView = UIImageView(frame: cell.bounds) - imageView.image = images?[indexPath.row] - cell.addSubview(imageView) - - return cell - } -} - -extension SAHistoryViewController: UICollectionViewDelegate { - func collectionView(collectionView: UICollectionView, didSelectItemAtIndexPath indexPath: NSIndexPath) { - collectionView.deselectItemAtIndexPath(indexPath, animated: false) - delegate?.didSelectIndex(indexPath.row) - } -} \ No newline at end of file diff --git a/SAHistoryNavigationViewControllerSample/Pods/Target Support Files/MisterFusion/Info.plist b/SAHistoryNavigationViewControllerSample/Pods/Target Support Files/MisterFusion/Info.plist index e417ac3..7b6b52a 100644 --- a/SAHistoryNavigationViewControllerSample/Pods/Target Support Files/MisterFusion/Info.plist +++ b/SAHistoryNavigationViewControllerSample/Pods/Target Support Files/MisterFusion/Info.plist @@ -2,25 +2,25 @@ - CFBundleDevelopmentRegion - en - CFBundleExecutable - ${EXECUTABLE_NAME} - CFBundleIdentifier - $(PRODUCT_BUNDLE_IDENTIFIER) - CFBundleInfoDictionaryVersion - 6.0 - CFBundleName - ${PRODUCT_NAME} - CFBundlePackageType - FMWK - CFBundleShortVersionString - 1.1.0 - CFBundleSignature - ???? - CFBundleVersion - ${CURRENT_PROJECT_VERSION} - NSPrincipalClass - + CFBundleDevelopmentRegion + en + CFBundleExecutable + ${EXECUTABLE_NAME} + CFBundleIdentifier + ${PRODUCT_BUNDLE_IDENTIFIER} + CFBundleInfoDictionaryVersion + 6.0 + CFBundleName + ${PRODUCT_NAME} + CFBundlePackageType + FMWK + CFBundleShortVersionString + 1.4.0 + CFBundleSignature + ???? + CFBundleVersion + ${CURRENT_PROJECT_VERSION} + NSPrincipalClass + diff --git a/SAHistoryNavigationViewControllerSample/Pods/Target Support Files/MisterFusion/MisterFusion.xcconfig b/SAHistoryNavigationViewControllerSample/Pods/Target Support Files/MisterFusion/MisterFusion.xcconfig index 466f559..00f3424 100644 --- a/SAHistoryNavigationViewControllerSample/Pods/Target Support Files/MisterFusion/MisterFusion.xcconfig +++ b/SAHistoryNavigationViewControllerSample/Pods/Target Support Files/MisterFusion/MisterFusion.xcconfig @@ -1,6 +1,10 @@ +CONFIGURATION_BUILD_DIR = $PODS_CONFIGURATION_BUILD_DIR/MisterFusion GCC_PREPROCESSOR_DEFINITIONS = $(inherited) COCOAPODS=1 -HEADER_SEARCH_PATHS = "${PODS_ROOT}/Headers/Private" "${PODS_ROOT}/Headers/Private/MisterFusion" "${PODS_ROOT}/Headers/Public" +HEADER_SEARCH_PATHS = "${PODS_ROOT}/Headers/Private" "${PODS_ROOT}/Headers/Public" OTHER_LDFLAGS = -framework "UIKit" OTHER_SWIFT_FLAGS = $(inherited) "-D" "COCOAPODS" +PODS_BUILD_DIR = $BUILD_DIR +PODS_CONFIGURATION_BUILD_DIR = $PODS_BUILD_DIR/$(CONFIGURATION)$(EFFECTIVE_PLATFORM_NAME) PODS_ROOT = ${SRCROOT} -SKIP_INSTALL = YES \ No newline at end of file +PRODUCT_BUNDLE_IDENTIFIER = org.cocoapods.${PRODUCT_NAME:rfc1034identifier} +SKIP_INSTALL = YES diff --git a/SAHistoryNavigationViewControllerSample/Pods/Target Support Files/Pods-SAHistoryNavigationViewControllerSample/Info.plist b/SAHistoryNavigationViewControllerSample/Pods/Target Support Files/Pods-SAHistoryNavigationViewControllerSample/Info.plist new file mode 100644 index 0000000..2243fe6 --- /dev/null +++ b/SAHistoryNavigationViewControllerSample/Pods/Target Support Files/Pods-SAHistoryNavigationViewControllerSample/Info.plist @@ -0,0 +1,26 @@ + + + + + CFBundleDevelopmentRegion + en + CFBundleExecutable + ${EXECUTABLE_NAME} + CFBundleIdentifier + ${PRODUCT_BUNDLE_IDENTIFIER} + CFBundleInfoDictionaryVersion + 6.0 + CFBundleName + ${PRODUCT_NAME} + CFBundlePackageType + FMWK + CFBundleShortVersionString + 1.0.0 + CFBundleSignature + ???? + CFBundleVersion + ${CURRENT_PROJECT_VERSION} + NSPrincipalClass + + + diff --git a/SAHistoryNavigationViewControllerSample/Pods/Target Support Files/Pods/Pods-acknowledgements.markdown b/SAHistoryNavigationViewControllerSample/Pods/Target Support Files/Pods-SAHistoryNavigationViewControllerSample/Pods-SAHistoryNavigationViewControllerSample-acknowledgements.markdown similarity index 97% rename from SAHistoryNavigationViewControllerSample/Pods/Target Support Files/Pods/Pods-acknowledgements.markdown rename to SAHistoryNavigationViewControllerSample/Pods/Target Support Files/Pods-SAHistoryNavigationViewControllerSample/Pods-SAHistoryNavigationViewControllerSample-acknowledgements.markdown index 97df85a..38fdfff 100644 --- a/SAHistoryNavigationViewControllerSample/Pods/Target Support Files/Pods/Pods-acknowledgements.markdown +++ b/SAHistoryNavigationViewControllerSample/Pods/Target Support Files/Pods-SAHistoryNavigationViewControllerSample/Pods-SAHistoryNavigationViewControllerSample-acknowledgements.markdown @@ -49,4 +49,4 @@ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. -Generated by CocoaPods - http://cocoapods.org +Generated by CocoaPods - https://cocoapods.org diff --git a/SAHistoryNavigationViewControllerSample/Pods/Target Support Files/Pods/Pods-acknowledgements.plist b/SAHistoryNavigationViewControllerSample/Pods/Target Support Files/Pods-SAHistoryNavigationViewControllerSample/Pods-SAHistoryNavigationViewControllerSample-acknowledgements.plist similarity index 95% rename from SAHistoryNavigationViewControllerSample/Pods/Target Support Files/Pods/Pods-acknowledgements.plist rename to SAHistoryNavigationViewControllerSample/Pods/Target Support Files/Pods-SAHistoryNavigationViewControllerSample/Pods-SAHistoryNavigationViewControllerSample-acknowledgements.plist index 1560974..93d3b44 100644 --- a/SAHistoryNavigationViewControllerSample/Pods/Target Support Files/Pods/Pods-acknowledgements.plist +++ b/SAHistoryNavigationViewControllerSample/Pods/Target Support Files/Pods-SAHistoryNavigationViewControllerSample/Pods-SAHistoryNavigationViewControllerSample-acknowledgements.plist @@ -37,6 +37,8 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + License + MIT Title MisterFusion Type @@ -64,6 +66,8 @@ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + License + MIT Title SAHistoryNavigationViewController Type @@ -71,7 +75,7 @@ THE SOFTWARE. FooterText - Generated by CocoaPods - http://cocoapods.org + Generated by CocoaPods - https://cocoapods.org Title Type diff --git a/SAHistoryNavigationViewControllerSample/Pods/Target Support Files/Pods-SAHistoryNavigationViewControllerSample/Pods-SAHistoryNavigationViewControllerSample-dummy.m b/SAHistoryNavigationViewControllerSample/Pods/Target Support Files/Pods-SAHistoryNavigationViewControllerSample/Pods-SAHistoryNavigationViewControllerSample-dummy.m new file mode 100644 index 0000000..1aaa0c6 --- /dev/null +++ b/SAHistoryNavigationViewControllerSample/Pods/Target Support Files/Pods-SAHistoryNavigationViewControllerSample/Pods-SAHistoryNavigationViewControllerSample-dummy.m @@ -0,0 +1,5 @@ +#import +@interface PodsDummy_Pods_SAHistoryNavigationViewControllerSample : NSObject +@end +@implementation PodsDummy_Pods_SAHistoryNavigationViewControllerSample +@end diff --git a/SAHistoryNavigationViewControllerSample/Pods/Target Support Files/Pods/Pods-frameworks.sh b/SAHistoryNavigationViewControllerSample/Pods/Target Support Files/Pods-SAHistoryNavigationViewControllerSample/Pods-SAHistoryNavigationViewControllerSample-frameworks.sh similarity index 83% rename from SAHistoryNavigationViewControllerSample/Pods/Target Support Files/Pods/Pods-frameworks.sh rename to SAHistoryNavigationViewControllerSample/Pods/Target Support Files/Pods-SAHistoryNavigationViewControllerSample/Pods-SAHistoryNavigationViewControllerSample-frameworks.sh index 9a5ef49..a1b6fad 100755 --- a/SAHistoryNavigationViewControllerSample/Pods/Target Support Files/Pods/Pods-frameworks.sh +++ b/SAHistoryNavigationViewControllerSample/Pods/Target Support Files/Pods-SAHistoryNavigationViewControllerSample/Pods-SAHistoryNavigationViewControllerSample-frameworks.sh @@ -16,7 +16,7 @@ install_framework() local source="$1" fi - local destination="${CONFIGURATION_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}" + local destination="${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}" if [ -L "${source}" ]; then echo "Symlinked..." @@ -59,8 +59,8 @@ code_sign_if_enabled() { if [ -n "${EXPANDED_CODE_SIGN_IDENTITY}" -a "${CODE_SIGNING_REQUIRED}" != "NO" -a "${CODE_SIGNING_ALLOWED}" != "NO" ]; then # Use the current code_sign_identitiy echo "Code Signing $1 with Identity ${EXPANDED_CODE_SIGN_IDENTITY_NAME}" - echo "/usr/bin/codesign --force --sign ${EXPANDED_CODE_SIGN_IDENTITY} --preserve-metadata=identifier,entitlements \"$1\"" - /usr/bin/codesign --force --sign ${EXPANDED_CODE_SIGN_IDENTITY} --preserve-metadata=identifier,entitlements "$1" + echo "/usr/bin/codesign --force --sign ${EXPANDED_CODE_SIGN_IDENTITY} ${OTHER_CODE_SIGN_FLAGS} --preserve-metadata=identifier,entitlements \"$1\"" + /usr/bin/codesign --force --sign ${EXPANDED_CODE_SIGN_IDENTITY} ${OTHER_CODE_SIGN_FLAGS} --preserve-metadata=identifier,entitlements "$1" fi } @@ -84,10 +84,10 @@ strip_invalid_archs() { if [[ "$CONFIGURATION" == "Debug" ]]; then - install_framework "Pods/MisterFusion.framework" - install_framework "Pods/SAHistoryNavigationViewController.framework" + install_framework "$BUILT_PRODUCTS_DIR/MisterFusion/MisterFusion.framework" + install_framework "$BUILT_PRODUCTS_DIR/SAHistoryNavigationViewController/SAHistoryNavigationViewController.framework" fi if [[ "$CONFIGURATION" == "Release" ]]; then - install_framework "Pods/MisterFusion.framework" - install_framework "Pods/SAHistoryNavigationViewController.framework" + install_framework "$BUILT_PRODUCTS_DIR/MisterFusion/MisterFusion.framework" + install_framework "$BUILT_PRODUCTS_DIR/SAHistoryNavigationViewController/SAHistoryNavigationViewController.framework" fi diff --git a/SAHistoryNavigationViewControllerSample/Pods/Target Support Files/Pods-SAHistoryNavigationViewControllerSample/Pods-SAHistoryNavigationViewControllerSample-resources.sh b/SAHistoryNavigationViewControllerSample/Pods/Target Support Files/Pods-SAHistoryNavigationViewControllerSample/Pods-SAHistoryNavigationViewControllerSample-resources.sh new file mode 100755 index 0000000..0a15615 --- /dev/null +++ b/SAHistoryNavigationViewControllerSample/Pods/Target Support Files/Pods-SAHistoryNavigationViewControllerSample/Pods-SAHistoryNavigationViewControllerSample-resources.sh @@ -0,0 +1,102 @@ +#!/bin/sh +set -e + +mkdir -p "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}" + +RESOURCES_TO_COPY=${PODS_ROOT}/resources-to-copy-${TARGETNAME}.txt +> "$RESOURCES_TO_COPY" + +XCASSET_FILES=() + +case "${TARGETED_DEVICE_FAMILY}" in + 1,2) + TARGET_DEVICE_ARGS="--target-device ipad --target-device iphone" + ;; + 1) + TARGET_DEVICE_ARGS="--target-device iphone" + ;; + 2) + TARGET_DEVICE_ARGS="--target-device ipad" + ;; + *) + TARGET_DEVICE_ARGS="--target-device mac" + ;; +esac + +realpath() { + DIRECTORY="$(cd "${1%/*}" && pwd)" + FILENAME="${1##*/}" + echo "$DIRECTORY/$FILENAME" +} + +install_resource() +{ + if [[ "$1" = /* ]] ; then + RESOURCE_PATH="$1" + else + RESOURCE_PATH="${PODS_ROOT}/$1" + fi + if [[ ! -e "$RESOURCE_PATH" ]] ; then + cat << EOM +error: Resource "$RESOURCE_PATH" not found. Run 'pod install' to update the copy resources script. +EOM + exit 1 + fi + case $RESOURCE_PATH in + *.storyboard) + echo "ibtool --reference-external-strings-file --errors --warnings --notices --minimum-deployment-target ${!DEPLOYMENT_TARGET_SETTING_NAME} --output-format human-readable-text --compile ${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/`basename \"$RESOURCE_PATH\" .storyboard`.storyboardc $RESOURCE_PATH --sdk ${SDKROOT} ${TARGET_DEVICE_ARGS}" + ibtool --reference-external-strings-file --errors --warnings --notices --minimum-deployment-target ${!DEPLOYMENT_TARGET_SETTING_NAME} --output-format human-readable-text --compile "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/`basename \"$RESOURCE_PATH\" .storyboard`.storyboardc" "$RESOURCE_PATH" --sdk "${SDKROOT}" ${TARGET_DEVICE_ARGS} + ;; + *.xib) + echo "ibtool --reference-external-strings-file --errors --warnings --notices --minimum-deployment-target ${!DEPLOYMENT_TARGET_SETTING_NAME} --output-format human-readable-text --compile ${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/`basename \"$RESOURCE_PATH\" .xib`.nib $RESOURCE_PATH --sdk ${SDKROOT} ${TARGET_DEVICE_ARGS}" + ibtool --reference-external-strings-file --errors --warnings --notices --minimum-deployment-target ${!DEPLOYMENT_TARGET_SETTING_NAME} --output-format human-readable-text --compile "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/`basename \"$RESOURCE_PATH\" .xib`.nib" "$RESOURCE_PATH" --sdk "${SDKROOT}" ${TARGET_DEVICE_ARGS} + ;; + *.framework) + echo "mkdir -p ${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}" + mkdir -p "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}" + echo "rsync -av $RESOURCE_PATH ${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}" + rsync -av "$RESOURCE_PATH" "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}" + ;; + *.xcdatamodel) + echo "xcrun momc \"$RESOURCE_PATH\" \"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/`basename "$RESOURCE_PATH"`.mom\"" + xcrun momc "$RESOURCE_PATH" "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/`basename "$RESOURCE_PATH" .xcdatamodel`.mom" + ;; + *.xcdatamodeld) + echo "xcrun momc \"$RESOURCE_PATH\" \"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/`basename "$RESOURCE_PATH" .xcdatamodeld`.momd\"" + xcrun momc "$RESOURCE_PATH" "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/`basename "$RESOURCE_PATH" .xcdatamodeld`.momd" + ;; + *.xcmappingmodel) + echo "xcrun mapc \"$RESOURCE_PATH\" \"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/`basename "$RESOURCE_PATH" .xcmappingmodel`.cdm\"" + xcrun mapc "$RESOURCE_PATH" "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/`basename "$RESOURCE_PATH" .xcmappingmodel`.cdm" + ;; + *.xcassets) + ABSOLUTE_XCASSET_FILE=$(realpath "$RESOURCE_PATH") + XCASSET_FILES+=("$ABSOLUTE_XCASSET_FILE") + ;; + *) + echo "$RESOURCE_PATH" + echo "$RESOURCE_PATH" >> "$RESOURCES_TO_COPY" + ;; + esac +} + +mkdir -p "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}" +rsync -avr --copy-links --no-relative --exclude '*/.svn/*' --files-from="$RESOURCES_TO_COPY" / "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}" +if [[ "${ACTION}" == "install" ]] && [[ "${SKIP_INSTALL}" == "NO" ]]; then + mkdir -p "${INSTALL_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}" + rsync -avr --copy-links --no-relative --exclude '*/.svn/*' --files-from="$RESOURCES_TO_COPY" / "${INSTALL_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}" +fi +rm -f "$RESOURCES_TO_COPY" + +if [[ -n "${WRAPPER_EXTENSION}" ]] && [ "`xcrun --find actool`" ] && [ -n "$XCASSET_FILES" ] +then + # Find all other xcassets (this unfortunately includes those of path pods and other targets). + OTHER_XCASSETS=$(find "$PWD" -iname "*.xcassets" -type d) + while read line; do + if [[ $line != "`realpath $PODS_ROOT`*" ]]; then + XCASSET_FILES+=("$line") + fi + done <<<"$OTHER_XCASSETS" + + printf "%s\0" "${XCASSET_FILES[@]}" | xargs -0 xcrun actool --output-format human-readable-text --notices --warnings --platform "${PLATFORM_NAME}" --minimum-deployment-target "${!DEPLOYMENT_TARGET_SETTING_NAME}" ${TARGET_DEVICE_ARGS} --compress-pngs --compile "${BUILT_PRODUCTS_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}" +fi diff --git a/SAHistoryNavigationViewControllerSample/Pods/Target Support Files/Pods-SAHistoryNavigationViewControllerSample/Pods-SAHistoryNavigationViewControllerSample-umbrella.h b/SAHistoryNavigationViewControllerSample/Pods/Target Support Files/Pods-SAHistoryNavigationViewControllerSample/Pods-SAHistoryNavigationViewControllerSample-umbrella.h new file mode 100644 index 0000000..a75936d --- /dev/null +++ b/SAHistoryNavigationViewControllerSample/Pods/Target Support Files/Pods-SAHistoryNavigationViewControllerSample/Pods-SAHistoryNavigationViewControllerSample-umbrella.h @@ -0,0 +1,6 @@ +#import + + +FOUNDATION_EXPORT double Pods_SAHistoryNavigationViewControllerSampleVersionNumber; +FOUNDATION_EXPORT const unsigned char Pods_SAHistoryNavigationViewControllerSampleVersionString[]; + diff --git a/SAHistoryNavigationViewControllerSample/Pods/Target Support Files/Pods-SAHistoryNavigationViewControllerSample/Pods-SAHistoryNavigationViewControllerSample.debug.xcconfig b/SAHistoryNavigationViewControllerSample/Pods/Target Support Files/Pods-SAHistoryNavigationViewControllerSample/Pods-SAHistoryNavigationViewControllerSample.debug.xcconfig new file mode 100644 index 0000000..b395865 --- /dev/null +++ b/SAHistoryNavigationViewControllerSample/Pods/Target Support Files/Pods-SAHistoryNavigationViewControllerSample/Pods-SAHistoryNavigationViewControllerSample.debug.xcconfig @@ -0,0 +1,11 @@ +ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES +EMBEDDED_CONTENT_CONTAINS_SWIFT = YES +FRAMEWORK_SEARCH_PATHS = $(inherited) "$PODS_CONFIGURATION_BUILD_DIR/MisterFusion" "$PODS_CONFIGURATION_BUILD_DIR/SAHistoryNavigationViewController" +GCC_PREPROCESSOR_DEFINITIONS = $(inherited) COCOAPODS=1 +LD_RUNPATH_SEARCH_PATHS = $(inherited) '@executable_path/Frameworks' '@loader_path/Frameworks' +OTHER_CFLAGS = $(inherited) -iquote "$PODS_CONFIGURATION_BUILD_DIR/MisterFusion/MisterFusion.framework/Headers" -iquote "$PODS_CONFIGURATION_BUILD_DIR/SAHistoryNavigationViewController/SAHistoryNavigationViewController.framework/Headers" +OTHER_LDFLAGS = $(inherited) -framework "MisterFusion" -framework "SAHistoryNavigationViewController" +OTHER_SWIFT_FLAGS = $(inherited) "-D" "COCOAPODS" +PODS_BUILD_DIR = $BUILD_DIR +PODS_CONFIGURATION_BUILD_DIR = $PODS_BUILD_DIR/$(CONFIGURATION)$(EFFECTIVE_PLATFORM_NAME) +PODS_ROOT = ${SRCROOT}/Pods diff --git a/SAHistoryNavigationViewControllerSample/Pods/Target Support Files/Pods-SAHistoryNavigationViewControllerSample/Pods-SAHistoryNavigationViewControllerSample.modulemap b/SAHistoryNavigationViewControllerSample/Pods/Target Support Files/Pods-SAHistoryNavigationViewControllerSample/Pods-SAHistoryNavigationViewControllerSample.modulemap new file mode 100644 index 0000000..4b6636f --- /dev/null +++ b/SAHistoryNavigationViewControllerSample/Pods/Target Support Files/Pods-SAHistoryNavigationViewControllerSample/Pods-SAHistoryNavigationViewControllerSample.modulemap @@ -0,0 +1,6 @@ +framework module Pods_SAHistoryNavigationViewControllerSample { + umbrella header "Pods-SAHistoryNavigationViewControllerSample-umbrella.h" + + export * + module * { export * } +} diff --git a/SAHistoryNavigationViewControllerSample/Pods/Target Support Files/Pods-SAHistoryNavigationViewControllerSample/Pods-SAHistoryNavigationViewControllerSample.release.xcconfig b/SAHistoryNavigationViewControllerSample/Pods/Target Support Files/Pods-SAHistoryNavigationViewControllerSample/Pods-SAHistoryNavigationViewControllerSample.release.xcconfig new file mode 100644 index 0000000..b395865 --- /dev/null +++ b/SAHistoryNavigationViewControllerSample/Pods/Target Support Files/Pods-SAHistoryNavigationViewControllerSample/Pods-SAHistoryNavigationViewControllerSample.release.xcconfig @@ -0,0 +1,11 @@ +ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES +EMBEDDED_CONTENT_CONTAINS_SWIFT = YES +FRAMEWORK_SEARCH_PATHS = $(inherited) "$PODS_CONFIGURATION_BUILD_DIR/MisterFusion" "$PODS_CONFIGURATION_BUILD_DIR/SAHistoryNavigationViewController" +GCC_PREPROCESSOR_DEFINITIONS = $(inherited) COCOAPODS=1 +LD_RUNPATH_SEARCH_PATHS = $(inherited) '@executable_path/Frameworks' '@loader_path/Frameworks' +OTHER_CFLAGS = $(inherited) -iquote "$PODS_CONFIGURATION_BUILD_DIR/MisterFusion/MisterFusion.framework/Headers" -iquote "$PODS_CONFIGURATION_BUILD_DIR/SAHistoryNavigationViewController/SAHistoryNavigationViewController.framework/Headers" +OTHER_LDFLAGS = $(inherited) -framework "MisterFusion" -framework "SAHistoryNavigationViewController" +OTHER_SWIFT_FLAGS = $(inherited) "-D" "COCOAPODS" +PODS_BUILD_DIR = $BUILD_DIR +PODS_CONFIGURATION_BUILD_DIR = $PODS_BUILD_DIR/$(CONFIGURATION)$(EFFECTIVE_PLATFORM_NAME) +PODS_ROOT = ${SRCROOT}/Pods diff --git a/SAHistoryNavigationViewControllerSample/Pods/Target Support Files/Pods/Info.plist b/SAHistoryNavigationViewControllerSample/Pods/Target Support Files/Pods/Info.plist deleted file mode 100644 index 11db4b7..0000000 --- a/SAHistoryNavigationViewControllerSample/Pods/Target Support Files/Pods/Info.plist +++ /dev/null @@ -1,26 +0,0 @@ - - - - - CFBundleDevelopmentRegion - en - CFBundleExecutable - ${EXECUTABLE_NAME} - CFBundleIdentifier - $(PRODUCT_BUNDLE_IDENTIFIER) - CFBundleInfoDictionaryVersion - 6.0 - CFBundleName - ${PRODUCT_NAME} - CFBundlePackageType - FMWK - CFBundleShortVersionString - 1.0.0 - CFBundleSignature - ???? - CFBundleVersion - ${CURRENT_PROJECT_VERSION} - NSPrincipalClass - - - diff --git a/SAHistoryNavigationViewControllerSample/Pods/Target Support Files/Pods/Pods-dummy.m b/SAHistoryNavigationViewControllerSample/Pods/Target Support Files/Pods/Pods-dummy.m deleted file mode 100644 index ade64bd..0000000 --- a/SAHistoryNavigationViewControllerSample/Pods/Target Support Files/Pods/Pods-dummy.m +++ /dev/null @@ -1,5 +0,0 @@ -#import -@interface PodsDummy_Pods : NSObject -@end -@implementation PodsDummy_Pods -@end diff --git a/SAHistoryNavigationViewControllerSample/Pods/Target Support Files/Pods/Pods-resources.sh b/SAHistoryNavigationViewControllerSample/Pods/Target Support Files/Pods/Pods-resources.sh deleted file mode 100755 index 16774fb..0000000 --- a/SAHistoryNavigationViewControllerSample/Pods/Target Support Files/Pods/Pods-resources.sh +++ /dev/null @@ -1,95 +0,0 @@ -#!/bin/sh -set -e - -mkdir -p "${CONFIGURATION_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}" - -RESOURCES_TO_COPY=${PODS_ROOT}/resources-to-copy-${TARGETNAME}.txt -> "$RESOURCES_TO_COPY" - -XCASSET_FILES=() - -realpath() { - DIRECTORY="$(cd "${1%/*}" && pwd)" - FILENAME="${1##*/}" - echo "$DIRECTORY/$FILENAME" -} - -install_resource() -{ - case $1 in - *.storyboard) - echo "ibtool --reference-external-strings-file --errors --warnings --notices --output-format human-readable-text --compile ${CONFIGURATION_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/`basename \"$1\" .storyboard`.storyboardc ${PODS_ROOT}/$1 --sdk ${SDKROOT}" - ibtool --reference-external-strings-file --errors --warnings --notices --output-format human-readable-text --compile "${CONFIGURATION_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/`basename \"$1\" .storyboard`.storyboardc" "${PODS_ROOT}/$1" --sdk "${SDKROOT}" - ;; - *.xib) - echo "ibtool --reference-external-strings-file --errors --warnings --notices --output-format human-readable-text --compile ${CONFIGURATION_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/`basename \"$1\" .xib`.nib ${PODS_ROOT}/$1 --sdk ${SDKROOT}" - ibtool --reference-external-strings-file --errors --warnings --notices --output-format human-readable-text --compile "${CONFIGURATION_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/`basename \"$1\" .xib`.nib" "${PODS_ROOT}/$1" --sdk "${SDKROOT}" - ;; - *.framework) - echo "mkdir -p ${CONFIGURATION_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}" - mkdir -p "${CONFIGURATION_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}" - echo "rsync -av ${PODS_ROOT}/$1 ${CONFIGURATION_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}" - rsync -av "${PODS_ROOT}/$1" "${CONFIGURATION_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}" - ;; - *.xcdatamodel) - echo "xcrun momc \"${PODS_ROOT}/$1\" \"${CONFIGURATION_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/`basename "$1"`.mom\"" - xcrun momc "${PODS_ROOT}/$1" "${CONFIGURATION_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/`basename "$1" .xcdatamodel`.mom" - ;; - *.xcdatamodeld) - echo "xcrun momc \"${PODS_ROOT}/$1\" \"${CONFIGURATION_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/`basename "$1" .xcdatamodeld`.momd\"" - xcrun momc "${PODS_ROOT}/$1" "${CONFIGURATION_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/`basename "$1" .xcdatamodeld`.momd" - ;; - *.xcmappingmodel) - echo "xcrun mapc \"${PODS_ROOT}/$1\" \"${CONFIGURATION_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/`basename "$1" .xcmappingmodel`.cdm\"" - xcrun mapc "${PODS_ROOT}/$1" "${CONFIGURATION_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/`basename "$1" .xcmappingmodel`.cdm" - ;; - *.xcassets) - ABSOLUTE_XCASSET_FILE=$(realpath "${PODS_ROOT}/$1") - XCASSET_FILES+=("$ABSOLUTE_XCASSET_FILE") - ;; - /*) - echo "$1" - echo "$1" >> "$RESOURCES_TO_COPY" - ;; - *) - echo "${PODS_ROOT}/$1" - echo "${PODS_ROOT}/$1" >> "$RESOURCES_TO_COPY" - ;; - esac -} - -mkdir -p "${CONFIGURATION_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}" -rsync -avr --copy-links --no-relative --exclude '*/.svn/*' --files-from="$RESOURCES_TO_COPY" / "${CONFIGURATION_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}" -if [[ "${ACTION}" == "install" ]] && [[ "${SKIP_INSTALL}" == "NO" ]]; then - mkdir -p "${INSTALL_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}" - rsync -avr --copy-links --no-relative --exclude '*/.svn/*' --files-from="$RESOURCES_TO_COPY" / "${INSTALL_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}" -fi -rm -f "$RESOURCES_TO_COPY" - -if [[ -n "${WRAPPER_EXTENSION}" ]] && [ "`xcrun --find actool`" ] && [ -n "$XCASSET_FILES" ] -then - case "${TARGETED_DEVICE_FAMILY}" in - 1,2) - TARGET_DEVICE_ARGS="--target-device ipad --target-device iphone" - ;; - 1) - TARGET_DEVICE_ARGS="--target-device iphone" - ;; - 2) - TARGET_DEVICE_ARGS="--target-device ipad" - ;; - *) - TARGET_DEVICE_ARGS="--target-device mac" - ;; - esac - - # Find all other xcassets (this unfortunately includes those of path pods and other targets). - OTHER_XCASSETS=$(find "$PWD" -iname "*.xcassets" -type d) - while read line; do - if [[ $line != "`realpath $PODS_ROOT`*" ]]; then - XCASSET_FILES+=("$line") - fi - done <<<"$OTHER_XCASSETS" - - printf "%s\0" "${XCASSET_FILES[@]}" | xargs -0 xcrun actool --output-format human-readable-text --notices --warnings --platform "${PLATFORM_NAME}" --minimum-deployment-target "${IPHONEOS_DEPLOYMENT_TARGET}" ${TARGET_DEVICE_ARGS} --compress-pngs --compile "${BUILT_PRODUCTS_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}" -fi diff --git a/SAHistoryNavigationViewControllerSample/Pods/Target Support Files/Pods/Pods-umbrella.h b/SAHistoryNavigationViewControllerSample/Pods/Target Support Files/Pods/Pods-umbrella.h deleted file mode 100644 index 21dcfd2..0000000 --- a/SAHistoryNavigationViewControllerSample/Pods/Target Support Files/Pods/Pods-umbrella.h +++ /dev/null @@ -1,6 +0,0 @@ -#import - - -FOUNDATION_EXPORT double PodsVersionNumber; -FOUNDATION_EXPORT const unsigned char PodsVersionString[]; - diff --git a/SAHistoryNavigationViewControllerSample/Pods/Target Support Files/Pods/Pods.debug.xcconfig b/SAHistoryNavigationViewControllerSample/Pods/Target Support Files/Pods/Pods.debug.xcconfig deleted file mode 100644 index d227c0f..0000000 --- a/SAHistoryNavigationViewControllerSample/Pods/Target Support Files/Pods/Pods.debug.xcconfig +++ /dev/null @@ -1,8 +0,0 @@ -EMBEDDED_CONTENT_CONTAINS_SWIFT = YES -GCC_PREPROCESSOR_DEFINITIONS = $(inherited) COCOAPODS=1 -LD_RUNPATH_SEARCH_PATHS = $(inherited) '@executable_path/Frameworks' '@loader_path/Frameworks' -OTHER_CFLAGS = $(inherited) -iquote "$CONFIGURATION_BUILD_DIR/MisterFusion.framework/Headers" -iquote "$CONFIGURATION_BUILD_DIR/SAHistoryNavigationViewController.framework/Headers" -OTHER_LDFLAGS = $(inherited) -framework "MisterFusion" -framework "SAHistoryNavigationViewController" -OTHER_SWIFT_FLAGS = $(inherited) "-D" "COCOAPODS" -PODS_FRAMEWORK_BUILD_PATH = $(BUILD_DIR)/$(CONFIGURATION)$(EFFECTIVE_PLATFORM_NAME)/Pods -PODS_ROOT = ${SRCROOT}/Pods \ No newline at end of file diff --git a/SAHistoryNavigationViewControllerSample/Pods/Target Support Files/Pods/Pods.modulemap b/SAHistoryNavigationViewControllerSample/Pods/Target Support Files/Pods/Pods.modulemap deleted file mode 100644 index 8413413..0000000 --- a/SAHistoryNavigationViewControllerSample/Pods/Target Support Files/Pods/Pods.modulemap +++ /dev/null @@ -1,6 +0,0 @@ -framework module Pods { - umbrella header "Pods-umbrella.h" - - export * - module * { export * } -} diff --git a/SAHistoryNavigationViewControllerSample/Pods/Target Support Files/Pods/Pods.release.xcconfig b/SAHistoryNavigationViewControllerSample/Pods/Target Support Files/Pods/Pods.release.xcconfig deleted file mode 100644 index d227c0f..0000000 --- a/SAHistoryNavigationViewControllerSample/Pods/Target Support Files/Pods/Pods.release.xcconfig +++ /dev/null @@ -1,8 +0,0 @@ -EMBEDDED_CONTENT_CONTAINS_SWIFT = YES -GCC_PREPROCESSOR_DEFINITIONS = $(inherited) COCOAPODS=1 -LD_RUNPATH_SEARCH_PATHS = $(inherited) '@executable_path/Frameworks' '@loader_path/Frameworks' -OTHER_CFLAGS = $(inherited) -iquote "$CONFIGURATION_BUILD_DIR/MisterFusion.framework/Headers" -iquote "$CONFIGURATION_BUILD_DIR/SAHistoryNavigationViewController.framework/Headers" -OTHER_LDFLAGS = $(inherited) -framework "MisterFusion" -framework "SAHistoryNavigationViewController" -OTHER_SWIFT_FLAGS = $(inherited) "-D" "COCOAPODS" -PODS_FRAMEWORK_BUILD_PATH = $(BUILD_DIR)/$(CONFIGURATION)$(EFFECTIVE_PLATFORM_NAME)/Pods -PODS_ROOT = ${SRCROOT}/Pods \ No newline at end of file diff --git a/SAHistoryNavigationViewControllerSample/Pods/Target Support Files/SAHistoryNavigationViewController/Info.plist b/SAHistoryNavigationViewControllerSample/Pods/Target Support Files/SAHistoryNavigationViewController/Info.plist index 1e408a8..e526849 100644 --- a/SAHistoryNavigationViewControllerSample/Pods/Target Support Files/SAHistoryNavigationViewController/Info.plist +++ b/SAHistoryNavigationViewControllerSample/Pods/Target Support Files/SAHistoryNavigationViewController/Info.plist @@ -2,25 +2,25 @@ - CFBundleDevelopmentRegion - en - CFBundleExecutable - ${EXECUTABLE_NAME} - CFBundleIdentifier - $(PRODUCT_BUNDLE_IDENTIFIER) - CFBundleInfoDictionaryVersion - 6.0 - CFBundleName - ${PRODUCT_NAME} - CFBundlePackageType - FMWK - CFBundleShortVersionString - 2.3.0 - CFBundleSignature - ???? - CFBundleVersion - ${CURRENT_PROJECT_VERSION} - NSPrincipalClass - + CFBundleDevelopmentRegion + en + CFBundleExecutable + ${EXECUTABLE_NAME} + CFBundleIdentifier + ${PRODUCT_BUNDLE_IDENTIFIER} + CFBundleInfoDictionaryVersion + 6.0 + CFBundleName + ${PRODUCT_NAME} + CFBundlePackageType + FMWK + CFBundleShortVersionString + 2.4.0 + CFBundleSignature + ???? + CFBundleVersion + ${CURRENT_PROJECT_VERSION} + NSPrincipalClass + diff --git a/SAHistoryNavigationViewControllerSample/Pods/Target Support Files/SAHistoryNavigationViewController/SAHistoryNavigationViewController.xcconfig b/SAHistoryNavigationViewControllerSample/Pods/Target Support Files/SAHistoryNavigationViewController/SAHistoryNavigationViewController.xcconfig index 9635d8d..a8e3634 100644 --- a/SAHistoryNavigationViewControllerSample/Pods/Target Support Files/SAHistoryNavigationViewController/SAHistoryNavigationViewController.xcconfig +++ b/SAHistoryNavigationViewControllerSample/Pods/Target Support Files/SAHistoryNavigationViewController/SAHistoryNavigationViewController.xcconfig @@ -1,6 +1,11 @@ +CONFIGURATION_BUILD_DIR = $PODS_CONFIGURATION_BUILD_DIR/SAHistoryNavigationViewController +FRAMEWORK_SEARCH_PATHS = $(inherited) "$PODS_CONFIGURATION_BUILD_DIR/MisterFusion" GCC_PREPROCESSOR_DEFINITIONS = $(inherited) COCOAPODS=1 -HEADER_SEARCH_PATHS = "${PODS_ROOT}/Headers/Private" "${PODS_ROOT}/Headers/Private/SAHistoryNavigationViewController" "${PODS_ROOT}/Headers/Public" +HEADER_SEARCH_PATHS = "${PODS_ROOT}/Headers/Private" "${PODS_ROOT}/Headers/Public" OTHER_LDFLAGS = -framework "AudioToolbox" -framework "UIKit" OTHER_SWIFT_FLAGS = $(inherited) "-D" "COCOAPODS" +PODS_BUILD_DIR = $BUILD_DIR +PODS_CONFIGURATION_BUILD_DIR = $PODS_BUILD_DIR/$(CONFIGURATION)$(EFFECTIVE_PLATFORM_NAME) PODS_ROOT = ${SRCROOT} -SKIP_INSTALL = YES \ No newline at end of file +PRODUCT_BUNDLE_IDENTIFIER = org.cocoapods.${PRODUCT_NAME:rfc1034identifier} +SKIP_INSTALL = YES diff --git a/SAHistoryNavigationViewControllerSample/SAHistoryNavigationViewControllerSample.xcodeproj/project.pbxproj b/SAHistoryNavigationViewControllerSample/SAHistoryNavigationViewControllerSample.xcodeproj/project.pbxproj index 8e2f737..4dabbca 100644 --- a/SAHistoryNavigationViewControllerSample/SAHistoryNavigationViewControllerSample.xcodeproj/project.pbxproj +++ b/SAHistoryNavigationViewControllerSample/SAHistoryNavigationViewControllerSample.xcodeproj/project.pbxproj @@ -17,7 +17,7 @@ 37E3BCF61AC3D57600A81554 /* LaunchScreen.xib in Resources */ = {isa = PBXBuildFile; fileRef = 37E3BCF41AC3D57600A81554 /* LaunchScreen.xib */; }; 37E3BD021AC3D57600A81554 /* SAHistoryNavigationViewControllerSampleTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 37E3BD011AC3D57600A81554 /* SAHistoryNavigationViewControllerSampleTests.swift */; }; 37E3BD581AC50A5700A81554 /* QuartzCore.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 37E3BD571AC50A5700A81554 /* QuartzCore.framework */; }; - F716EB89838168081B56AD11 /* Pods.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 71751ACF9E74B8ED274C4A63 /* Pods.framework */; }; + FB04EA6C094AF91887D960ED /* Pods_SAHistoryNavigationViewControllerSample.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 0D79C691AB7AC9BAFEAA7D13 /* Pods_SAHistoryNavigationViewControllerSample.framework */; }; /* End PBXBuildFile section */ /* Begin PBXContainerItemProxy section */ @@ -31,7 +31,8 @@ /* End PBXContainerItemProxy section */ /* Begin PBXFileReference section */ - 02C5A8649590E4434C1405A2 /* Pods.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = Pods.debug.xcconfig; path = "Pods/Target Support Files/Pods/Pods.debug.xcconfig"; sourceTree = ""; }; + 09C56927A8464E4F94642ACE /* Pods-SAHistoryNavigationViewControllerSample.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-SAHistoryNavigationViewControllerSample.debug.xcconfig"; path = "Pods/Target Support Files/Pods-SAHistoryNavigationViewControllerSample/Pods-SAHistoryNavigationViewControllerSample.debug.xcconfig"; sourceTree = ""; }; + 0D79C691AB7AC9BAFEAA7D13 /* Pods_SAHistoryNavigationViewControllerSample.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_SAHistoryNavigationViewControllerSample.framework; sourceTree = BUILT_PRODUCTS_DIR; }; 37C5DC5D1ACB6EAB00C8FD0C /* TimelineViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = TimelineViewController.swift; sourceTree = ""; }; 37C5DC5F1ACB6EBD00C8FD0C /* DetailViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = DetailViewController.swift; sourceTree = ""; }; 37C5DC611ACB704A00C8FD0C /* TimelineViewCell.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = TimelineViewCell.swift; sourceTree = ""; }; @@ -48,7 +49,7 @@ 37E3BD571AC50A5700A81554 /* QuartzCore.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = QuartzCore.framework; path = System/Library/Frameworks/QuartzCore.framework; sourceTree = SDKROOT; }; 71751ACF9E74B8ED274C4A63 /* Pods.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods.framework; sourceTree = BUILT_PRODUCTS_DIR; }; 9DD2BEA41BDE485B0042E077 /* README.md */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = net.daringfireball.markdown; name = README.md; path = ../../README.md; sourceTree = ""; }; - D18C8BA5C7CF7C47522EDB80 /* Pods.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = Pods.release.xcconfig; path = "Pods/Target Support Files/Pods/Pods.release.xcconfig"; sourceTree = ""; }; + F923866AC2F14FCFEE2E3695 /* Pods-SAHistoryNavigationViewControllerSample.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-SAHistoryNavigationViewControllerSample.release.xcconfig"; path = "Pods/Target Support Files/Pods-SAHistoryNavigationViewControllerSample/Pods-SAHistoryNavigationViewControllerSample.release.xcconfig"; sourceTree = ""; }; /* End PBXFileReference section */ /* Begin PBXFrameworksBuildPhase section */ @@ -57,7 +58,7 @@ buildActionMask = 2147483647; files = ( 37E3BD581AC50A5700A81554 /* QuartzCore.framework in Frameworks */, - F716EB89838168081B56AD11 /* Pods.framework in Frameworks */, + FB04EA6C094AF91887D960ED /* Pods_SAHistoryNavigationViewControllerSample.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -88,8 +89,8 @@ 37E3BCE81AC3D57600A81554 /* SAHistoryNavigationViewControllerSample */, 37E3BCFE1AC3D57600A81554 /* SAHistoryNavigationViewControllerSampleTests */, 37E3BCE71AC3D57600A81554 /* Products */, - 6C68133942126B29DCDA2801 /* Pods */, 9E12D08F8741E3189AA871D1 /* Frameworks */, + 7D7C24A0D43B47FFBA5C1C61 /* Pods */, ); sourceTree = ""; }; @@ -141,11 +142,11 @@ name = "Supporting Files"; sourceTree = ""; }; - 6C68133942126B29DCDA2801 /* Pods */ = { + 7D7C24A0D43B47FFBA5C1C61 /* Pods */ = { isa = PBXGroup; children = ( - 02C5A8649590E4434C1405A2 /* Pods.debug.xcconfig */, - D18C8BA5C7CF7C47522EDB80 /* Pods.release.xcconfig */, + 09C56927A8464E4F94642ACE /* Pods-SAHistoryNavigationViewControllerSample.debug.xcconfig */, + F923866AC2F14FCFEE2E3695 /* Pods-SAHistoryNavigationViewControllerSample.release.xcconfig */, ); name = Pods; sourceTree = ""; @@ -155,6 +156,7 @@ children = ( 37E3BD571AC50A5700A81554 /* QuartzCore.framework */, 71751ACF9E74B8ED274C4A63 /* Pods.framework */, + 0D79C691AB7AC9BAFEAA7D13 /* Pods_SAHistoryNavigationViewControllerSample.framework */, ); name = Frameworks; sourceTree = ""; @@ -166,12 +168,12 @@ isa = PBXNativeTarget; buildConfigurationList = 37E3BD051AC3D57600A81554 /* Build configuration list for PBXNativeTarget "SAHistoryNavigationViewControllerSample" */; buildPhases = ( - 1BDC2D12E40B8C611F86D8E1 /* Check Pods Manifest.lock */, + 94BEDF9F09FD079835A57BB7 /* [CP] Check Pods Manifest.lock */, 37E3BCE21AC3D57600A81554 /* Sources */, 37E3BCE31AC3D57600A81554 /* Frameworks */, 37E3BCE41AC3D57600A81554 /* Resources */, - A86FF23071FAD23E34141BA8 /* Embed Pods Frameworks */, - 7BC15DC1CF9B175261E6E601 /* Copy Pods Resources */, + A794D1628907A2FBC4224A45 /* [CP] Embed Pods Frameworks */, + 3332529E4257111BA67BA384 /* [CP] Copy Pods Resources */, ); buildRules = ( ); @@ -212,9 +214,11 @@ TargetAttributes = { 37E3BCE51AC3D57600A81554 = { CreatedOnToolsVersion = 6.2; + LastSwiftMigration = 0800; }; 37E3BCFA1AC3D57600A81554 = { CreatedOnToolsVersion = 6.2; + LastSwiftMigration = 0800; TestTargetID = 37E3BCE51AC3D57600A81554; }; }; @@ -260,49 +264,49 @@ /* End PBXResourcesBuildPhase section */ /* Begin PBXShellScriptBuildPhase section */ - 1BDC2D12E40B8C611F86D8E1 /* Check Pods Manifest.lock */ = { + 3332529E4257111BA67BA384 /* [CP] Copy Pods Resources */ = { isa = PBXShellScriptBuildPhase; buildActionMask = 2147483647; files = ( ); inputPaths = ( ); - name = "Check Pods Manifest.lock"; + name = "[CP] Copy Pods Resources"; outputPaths = ( ); runOnlyForDeploymentPostprocessing = 0; shellPath = /bin/sh; - shellScript = "diff \"${PODS_ROOT}/../Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [[ $? != 0 ]] ; then\n cat << EOM\nerror: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\nEOM\n exit 1\nfi\n"; + shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-SAHistoryNavigationViewControllerSample/Pods-SAHistoryNavigationViewControllerSample-resources.sh\"\n"; showEnvVarsInLog = 0; }; - 7BC15DC1CF9B175261E6E601 /* Copy Pods Resources */ = { + 94BEDF9F09FD079835A57BB7 /* [CP] Check Pods Manifest.lock */ = { isa = PBXShellScriptBuildPhase; buildActionMask = 2147483647; files = ( ); inputPaths = ( ); - name = "Copy Pods Resources"; + name = "[CP] Check Pods Manifest.lock"; outputPaths = ( ); runOnlyForDeploymentPostprocessing = 0; shellPath = /bin/sh; - shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods/Pods-resources.sh\"\n"; + shellScript = "diff \"${PODS_ROOT}/../Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n # print error to STDERR\n echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n exit 1\nfi\n"; showEnvVarsInLog = 0; }; - A86FF23071FAD23E34141BA8 /* Embed Pods Frameworks */ = { + A794D1628907A2FBC4224A45 /* [CP] Embed Pods Frameworks */ = { isa = PBXShellScriptBuildPhase; buildActionMask = 2147483647; files = ( ); inputPaths = ( ); - name = "Embed Pods Frameworks"; + name = "[CP] Embed Pods Frameworks"; outputPaths = ( ); runOnlyForDeploymentPostprocessing = 0; shellPath = /bin/sh; - shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods/Pods-frameworks.sh\"\n"; + shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-SAHistoryNavigationViewControllerSample/Pods-SAHistoryNavigationViewControllerSample-frameworks.sh\"\n"; showEnvVarsInLog = 0; }; /* End PBXShellScriptBuildPhase section */ @@ -437,7 +441,7 @@ }; 37E3BD061AC3D57600A81554 /* Debug */ = { isa = XCBuildConfiguration; - baseConfigurationReference = 02C5A8649590E4434C1405A2 /* Pods.debug.xcconfig */; + baseConfigurationReference = 09C56927A8464E4F94642ACE /* Pods-SAHistoryNavigationViewControllerSample.debug.xcconfig */; buildSettings = { ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; INFOPLIST_FILE = SAHistoryNavigationViewControllerSample/Info.plist; @@ -445,12 +449,13 @@ LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; PRODUCT_BUNDLE_IDENTIFIER = "szk-atmosphere.$(PRODUCT_NAME:rfc1034identifier)"; PRODUCT_NAME = "$(TARGET_NAME)"; + SWIFT_VERSION = 2.3; }; name = Debug; }; 37E3BD071AC3D57600A81554 /* Release */ = { isa = XCBuildConfiguration; - baseConfigurationReference = D18C8BA5C7CF7C47522EDB80 /* Pods.release.xcconfig */; + baseConfigurationReference = F923866AC2F14FCFEE2E3695 /* Pods-SAHistoryNavigationViewControllerSample.release.xcconfig */; buildSettings = { ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; INFOPLIST_FILE = SAHistoryNavigationViewControllerSample/Info.plist; @@ -458,6 +463,7 @@ LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; PRODUCT_BUNDLE_IDENTIFIER = "szk-atmosphere.$(PRODUCT_NAME:rfc1034identifier)"; PRODUCT_NAME = "$(TARGET_NAME)"; + SWIFT_VERSION = 2.3; }; name = Release; }; @@ -474,6 +480,7 @@ LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; PRODUCT_BUNDLE_IDENTIFIER = "szk-atmosphere.$(PRODUCT_NAME:rfc1034identifier)"; PRODUCT_NAME = "$(TARGET_NAME)"; + SWIFT_VERSION = 2.3; TEST_HOST = "$(BUILT_PRODUCTS_DIR)/SAHistoryNavigationViewControllerSample.app/SAHistoryNavigationViewControllerSample"; }; name = Debug; @@ -487,6 +494,7 @@ LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; PRODUCT_BUNDLE_IDENTIFIER = "szk-atmosphere.$(PRODUCT_NAME:rfc1034identifier)"; PRODUCT_NAME = "$(TARGET_NAME)"; + SWIFT_VERSION = 2.3; TEST_HOST = "$(BUILT_PRODUCTS_DIR)/SAHistoryNavigationViewControllerSample.app/SAHistoryNavigationViewControllerSample"; }; name = Release;