- resetting affine transforms before setting frames and applying them back later (fixes SCSafariPageViewController problems)

stefanceriu · stefanceriu · commit c55d883f01e4 · 2016-12-08T08:35:53.000+02:00
- converted Swift demo to Swift 3
- updated demo projects to work with latest cocoapods
diff --git a/Demo/Podfile b/Demo/Podfile
@@ -1,3 +1,17 @@
 source 'https://github.com/CocoaPods/Specs.git'
 
-pod 'SCScrollView', '~> 1.1'
+def shared_pods
+	pod 'SCScrollView', '~> 1.1'
+end
+
+target 'ObjCDemo' do
+	shared_pods
+end
+
+target 'Tests' do
+	shared_pods
+end
+
+target 'SwiftDemo' do
+	shared_pods
+end
diff --git a/Demo/SCPageViewController.xcodeproj/project.pbxproj b/Demo/SCPageViewController.xcodeproj/project.pbxproj
diff --git a/Demo/SwiftDemo/AppDelegate.swift b/Demo/SwiftDemo/AppDelegate.swift
@@ -14,35 +14,35 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
     var window: UIWindow?
     
     
-    func application(application: UIApplication, didFinishLaunchingWithOptions launchOptions: [NSObject: AnyObject]?) -> Bool {
+    func application(_ application: UIApplication, didFinishLaunchingWithOptions launchOptions: [UIApplicationLaunchOptionsKey: Any]?) -> Bool {
         // Override point for customization after application launch.
         
-        self.window = UIWindow(frame: UIScreen.mainScreen().bounds)
+        self.window = UIWindow(frame: UIScreen.main.bounds)
         self.window?.rootViewController = RootViewController()
         self.window?.makeKeyAndVisible()
         
         return true
     }
     
-    func applicationWillResignActive(application: UIApplication) {
+    func applicationWillResignActive(_ application: UIApplication) {
         // Sent when the application is about to move from active to inactive state. This can occur for certain types of temporary interruptions (such as an incoming phone call or SMS message) or when the user quits the application and it begins the transition to the background state.
         // Use this method to pause ongoing tasks, disable timers, and throttle down OpenGL ES frame rates. Games should use this method to pause the game.
     }
     
-    func applicationDidEnterBackground(application: UIApplication) {
+    func applicationDidEnterBackground(_ application: UIApplication) {
         // Use this method to release shared resources, save user data, invalidate timers, and store enough application state information to restore your application to its current state in case it is terminated later.
         // If your application supports background execution, this method is called instead of applicationWillTerminate: when the user quits.
     }
     
-    func applicationWillEnterForeground(application: UIApplication) {
+    func applicationWillEnterForeground(_ application: UIApplication) {
         // Called as part of the transition from the background to the inactive state; here you can undo many of the changes made on entering the background.
     }
     
-    func applicationDidBecomeActive(application: UIApplication) {
+    func applicationDidBecomeActive(_ application: UIApplication) {
         // Restart any tasks that were paused (or not yet started) while the application was inactive. If the application was previously in the background, optionally refresh the user interface.
     }
     
-    func applicationWillTerminate(application: UIApplication) {
+    func applicationWillTerminate(_ application: UIApplication) {
         // Called when the application is about to terminate. Save data if appropriate. See also applicationDidEnterBackground:.
     }
     
diff --git a/Demo/SwiftDemo/MainViewController.swift b/Demo/SwiftDemo/MainViewController.swift
@@ -9,11 +9,11 @@
 import UIKit
 
 protocol MainViewControllerDelegate {
-    func mainViewControllerDidChangeLayouterType(mainViewController: MainViewController)
+    func mainViewControllerDidChangeLayouterType(_ mainViewController: MainViewController)
 }
 
 enum PageLayouterType : Int {
-    case Plain, Sliding, Parallax, Cards
+    case plain, sliding, parallax, cards
 }
 
 class MainViewController: UIViewController, UIPickerViewDataSource, UIPickerViewDelegate {
@@ -31,30 +31,30 @@ class MainViewController: UIViewController, UIPickerViewDataSource, UIPickerView
         super.viewDidLoad()
     }
     
-    func numberOfComponentsInPickerView(pickerView: UIPickerView) -> Int {
+    func numberOfComponents(in pickerView: UIPickerView) -> Int {
         return 1
     }
     
-    func pickerView(pickerView: UIPickerView, numberOfRowsInComponent component: Int) -> Int {
+    func pickerView(_ pickerView: UIPickerView, numberOfRowsInComponent component: Int) -> Int {
         return 4
     }
     
-    func pickerView(pickerView: UIPickerView, titleForRow row: Int, forComponent component: Int) -> String? {
+    func pickerView(_ pickerView: UIPickerView, titleForRow row: Int, forComponent component: Int) -> String? {
 
         let layouterType = PageLayouterType.init(rawValue: row)!
         switch(layouterType) {
-        case .Plain:
+        case .plain:
             return "Plain"
-        case .Sliding:
+        case .sliding:
             return "Sliding"
-        case .Parallax:
+        case .parallax:
             return "Parallax"
-        case .Cards:
+        case .cards:
             return "Cards"
         }
     }
     
-    func pickerView(pickerView: UIPickerView, didSelectRow row: Int, inComponent component: Int) {
+    func pickerView(_ pickerView: UIPickerView, didSelectRow row: Int, inComponent component: Int) {
         layouterType = PageLayouterType.init(rawValue: row)!
         delegate?.mainViewControllerDidChangeLayouterType(self)
     }
diff --git a/Demo/SwiftDemo/RootViewController.swift b/Demo/SwiftDemo/RootViewController.swift
@@ -17,13 +17,12 @@ class RootViewController : UIViewController , SCPageViewControllerDataSource, SC
         
         super.viewDidLoad()
         
-        for(var i = 0 ; i<5; i++) {
+        for _ in 1...5 {
             viewControllers.append(nil);
-            
         }
         
         self.pageViewController.setLayouter(SCPageLayouter(), animated: false, completion: nil)
-        self.pageViewController.easingFunction = SCEasingFunction(type: SCEasingFunctionType.Linear)
+        self.pageViewController.easingFunction = SCEasingFunction(type: SCEasingFunctionType.linear)
         
         //self.pageViewController.scrollView.maximumNumberOfTouches = 1;
         //self.pageViewController.scrollView.panGestureRecognizer.minimumNumberOfTouches = 2;
@@ -34,16 +33,16 @@ class RootViewController : UIViewController , SCPageViewControllerDataSource, SC
         self.addChildViewController(self.pageViewController)
         self.pageViewController.view.frame = self.view.bounds
         self.view.addSubview(self.pageViewController.view)
-        self.pageViewController.didMoveToParentViewController(self)
+        self.pageViewController.didMove(toParentViewController: self)
     }
     
     //MARK: - SCPageViewControllerDataSource
     
-    func numberOfPagesInPageViewController(pageViewController: SCPageViewController!) -> UInt {
+    func numberOfPages(in pageViewController: SCPageViewController!) -> UInt {
         return UInt(self.viewControllers.count)
     }
     
-    func pageViewController(pageViewController: SCPageViewController!, viewControllerForPageAtIndex pageIndex: UInt) -> UIViewController! {
+    func pageViewController(_ pageViewController: SCPageViewController!, viewControllerForPageAt pageIndex: UInt) -> UIViewController! {
 
         
         if let viewController = self.viewControllers[Int(pageIndex)] {
@@ -69,22 +68,22 @@ class RootViewController : UIViewController , SCPageViewControllerDataSource, SC
     
     //MARK: - SCPageViewControllerDelegate
     
-    func pageViewController(pageViewController: SCPageViewController!, didNavigateToOffset offset: CGPoint) {
-        
+    func pageViewController(_ pageViewController: SCPageViewController!, didNavigateToOffset offset: CGPoint) {
+
         func layouterToType(layouter: SCPageLayouterProtocol) -> PageLayouterType {
             switch layouter {
             case is SCSlidingPageLayouter:
-                return PageLayouterType.Sliding
+                return PageLayouterType.sliding
             case is SCParallaxPageLayouter:
-                return PageLayouterType.Parallax
+                return PageLayouterType.parallax
             case is SCCardsPageLayouter:
-                return PageLayouterType.Cards
+                return PageLayouterType.cards
             default:
-                return PageLayouterType.Plain
+                return PageLayouterType.plain
             }
         }
         
-        let layouterType = layouterToType(self.pageViewController.layouter!);
+        let layouterType = layouterToType(layouter: self.pageViewController.layouter!);
         
         for optionalValue in self.viewControllers {
             if(optionalValue != nil) {
@@ -97,16 +96,16 @@ class RootViewController : UIViewController , SCPageViewControllerDataSource, SC
     
     //MARK: - MainViewControllerDelegate
     
-    func mainViewControllerDidChangeLayouterType(mainViewController: MainViewController) {
+    func mainViewControllerDidChangeLayouterType(_ mainViewController: MainViewController) {
         switch(mainViewController.layouterType!) {
-        case .Plain:
+        case .plain:
             self.pageViewController.setLayouter(SCPageLayouter(), animated: false, completion: nil)
-        case .Sliding:
+        case .sliding:
             self.pageViewController.setLayouter(SCSlidingPageLayouter(), animated: true, completion: nil)
-        case .Parallax:
+        case .parallax:
             self.pageViewController.setLayouter(SCParallaxPageLayouter(), animated: true, completion: nil)
-        case .Cards:
+        case .cards:
             self.pageViewController.setLayouter(SCCardsPageLayouter(), animated: true, completion: nil)
         }
     }
-}
+}
diff --git a/SCPageViewController.podspec b/SCPageViewController.podspec
@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name     = 'SCPageViewController'
-  s.version  = '2.0.8'
+  s.version  = '2.0.9'
   s.platform = :ios
   s.ios.deployment_target = '5.0'
 
diff --git a/SCPageViewController/SCPageViewController.m b/SCPageViewController/SCPageViewController.m
@@ -592,6 +592,9 @@ - (void)_updateFramesAndTriggerAppearanceCallbacks
 		}
 		
 		remainder = [self _subtractRect:intersection fromRect:remainder withEdge:edge];
+        
+        CATransform3D previousTransform = viewController.view.layer.transform;
+        [self _setAnimatableSublayerTransform:CATransform3DIdentity forViewController:viewController];
 				
 		// Finally, trigger appearance callbacks and new frame
 		if(visible && ![self.visibleControllers containsObject:viewController]) {
@@ -624,6 +627,8 @@ - (void)_updateFramesAndTriggerAppearanceCallbacks
                                                                   pageViewController:self];
             
             [self _setAnimatableSublayerTransform:transform forViewController:viewController];
+        } else {
+            [self _setAnimatableSublayerTransform:previousTransform forViewController:viewController];
         }
     }];
 }

Original file line number	Diff line number	Diff line change
`@@ -14,35 +14,35 @@ class AppDelegate: UIResponder, UIApplicationDelegate {`
`14`	`14`	`var window: UIWindow?`
`15`	`15`
`16`	`16`
`17`		`- func application(application: UIApplication, didFinishLaunchingWithOptions launchOptions: [NSObject: AnyObject]?) -> Bool {`
	`17`	`+ func application(_ application: UIApplication, didFinishLaunchingWithOptions launchOptions: [UIApplicationLaunchOptionsKey: Any]?) -> Bool {`
`18`	`18`	`// Override point for customization after application launch.`
`19`	`19`
`20`		`- self.window = UIWindow(frame: UIScreen.mainScreen().bounds)`
	`20`	`+ self.window = UIWindow(frame: UIScreen.main.bounds)`
`21`	`21`	`self.window?.rootViewController = RootViewController()`
`22`	`22`	`self.window?.makeKeyAndVisible()`
`23`	`23`
`24`	`24`	`return true`
`25`	`25`	`}`
`26`	`26`
`27`		`- func applicationWillResignActive(application: UIApplication) {`
	`27`	`+ func applicationWillResignActive(_ application: UIApplication) {`
`28`	`28`	`// Sent when the application is about to move from active to inactive state. This can occur for certain types of temporary interruptions (such as an incoming phone call or SMS message) or when the user quits the application and it begins the transition to the background state.`
`29`	`29`	`// Use this method to pause ongoing tasks, disable timers, and throttle down OpenGL ES frame rates. Games should use this method to pause the game.`
`30`	`30`	`}`
`31`	`31`
`32`		`- func applicationDidEnterBackground(application: UIApplication) {`
	`32`	`+ func applicationDidEnterBackground(_ application: UIApplication) {`
`33`	`33`	`// Use this method to release shared resources, save user data, invalidate timers, and store enough application state information to restore your application to its current state in case it is terminated later.`
`34`	`34`	`// If your application supports background execution, this method is called instead of applicationWillTerminate: when the user quits.`
`35`	`35`	`}`
`36`	`36`
`37`		`- func applicationWillEnterForeground(application: UIApplication) {`
	`37`	`+ func applicationWillEnterForeground(_ application: UIApplication) {`
`38`	`38`	`// Called as part of the transition from the background to the inactive state; here you can undo many of the changes made on entering the background.`
`39`	`39`	`}`
`40`	`40`
`41`		`- func applicationDidBecomeActive(application: UIApplication) {`
	`41`	`+ func applicationDidBecomeActive(_ application: UIApplication) {`
`42`	`42`	`// Restart any tasks that were paused (or not yet started) while the application was inactive. If the application was previously in the background, optionally refresh the user interface.`
`43`	`43`	`}`
`44`	`44`
`45`		`- func applicationWillTerminate(application: UIApplication) {`
	`45`	`+ func applicationWillTerminate(_ application: UIApplication) {`
`46`	`46`	`// Called when the application is about to terminate. Save data if appropriate. See also applicationDidEnterBackground:.`
`47`	`47`	`}`
`48`	`48`
Original file line number	Diff line number	Diff line change
`@@ -9,11 +9,11 @@`
`9`	`9`	`import UIKit`
`10`	`10`
`11`	`11`	`protocol MainViewControllerDelegate {`
`12`		`- func mainViewControllerDidChangeLayouterType(mainViewController: MainViewController)`
	`12`	`+ func mainViewControllerDidChangeLayouterType(_ mainViewController: MainViewController)`
`13`	`13`	`}`
`14`	`14`
`15`	`15`	`enum PageLayouterType : Int {`
`16`		`- case Plain, Sliding, Parallax, Cards`
	`16`	`+ case plain, sliding, parallax, cards`
`17`	`17`	`}`
`18`	`18`
`19`	`19`	`class MainViewController: UIViewController, UIPickerViewDataSource, UIPickerViewDelegate {`
`@@ -31,30 +31,30 @@ class MainViewController: UIViewController, UIPickerViewDataSource, UIPickerView`
`31`	`31`	`super.viewDidLoad()`
`32`	`32`	`}`
`33`	`33`
`34`		`- func numberOfComponentsInPickerView(pickerView: UIPickerView) -> Int {`
	`34`	`+ func numberOfComponents(in pickerView: UIPickerView) -> Int {`
`35`	`35`	`return 1`
`36`	`36`	`}`
`37`	`37`
`38`		`- func pickerView(pickerView: UIPickerView, numberOfRowsInComponent component: Int) -> Int {`
	`38`	`+ func pickerView(_ pickerView: UIPickerView, numberOfRowsInComponent component: Int) -> Int {`
`39`	`39`	`return 4`
`40`	`40`	`}`
`41`	`41`
`42`		`- func pickerView(pickerView: UIPickerView, titleForRow row: Int, forComponent component: Int) -> String? {`
	`42`	`+ func pickerView(_ pickerView: UIPickerView, titleForRow row: Int, forComponent component: Int) -> String? {`
`43`	`43`
`44`	`44`	`let layouterType = PageLayouterType.init(rawValue: row)!`
`45`	`45`	`switch(layouterType) {`
`46`		`- case .Plain:`
	`46`	`+ case .plain:`
`47`	`47`	`return "Plain"`
`48`		`- case .Sliding:`
	`48`	`+ case .sliding:`
`49`	`49`	`return "Sliding"`
`50`		`- case .Parallax:`
	`50`	`+ case .parallax:`
`51`	`51`	`return "Parallax"`
`52`		`- case .Cards:`
	`52`	`+ case .cards:`
`53`	`53`	`return "Cards"`
`54`	`54`	`}`
`55`	`55`	`}`
`56`	`56`
`57`		`- func pickerView(pickerView: UIPickerView, didSelectRow row: Int, inComponent component: Int) {`
	`57`	`+ func pickerView(_ pickerView: UIPickerView, didSelectRow row: Int, inComponent component: Int) {`
`58`	`58`	`layouterType = PageLayouterType.init(rawValue: row)!`
`59`	`59`	`delegate?.mainViewControllerDidChangeLayouterType(self)`
`60`	`60`	`}`
Original file line number	Diff line number	Diff line change
`@@ -592,6 +592,9 @@ - (void)_updateFramesAndTriggerAppearanceCallbacks`
`592`	`592`	`}`
`593`	`593`
`594`	`594`	`remainder = [self _subtractRect:intersection fromRect:remainder withEdge:edge];`
	`595`	`+`
	`596`	`+ CATransform3D previousTransform = viewController.view.layer.transform;`
	`597`	`+ [self _setAnimatableSublayerTransform:CATransform3DIdentity forViewController:viewController];`
`595`	`598`
`596`	`599`	`// Finally, trigger appearance callbacks and new frame`
`597`	`600`	`if(visible && ![self.visibleControllers containsObject:viewController]) {`
`@@ -624,6 +627,8 @@ - (void)_updateFramesAndTriggerAppearanceCallbacks`
`624`	`627`	`pageViewController:self];`
`625`	`628`
`626`	`629`	`[self _setAnimatableSublayerTransform:transform forViewController:viewController];`
	`630`	`+ } else {`
	`631`	`+ [self _setAnimatableSublayerTransform:previousTransform forViewController:viewController];`
`627`	`632`	`}`
`628`	`633`	`}];`
`629`	`634`	`}`