Merge pull request #72 from hyperoslo/fix/scrolling-and-animation

Fix scrolling and animation

Author: RamonGilabert

Presentation.podspec

@@ -13,5 +13,5 @@ Pod::Spec.new do |s|
 
   s.source_files = 'Source/**/*'
   s.dependency 'Pages', '~> 0.6.2'
-  s.dependency 'Cartography', '~> 0.6.0'
+  s.dependency 'Cartography'
 end

Source/Animations/TransitionAnimation.swift

@@ -35,9 +35,10 @@ public class TransitionAnimation: NSObject, Animatable {
       delay: 0,
       usingSpringWithDamping: dumping,
       initialSpringVelocity: 0.5,
-      options: [.BeginFromCurrentState, .AllowUserInteraction],
+      options: [.BeginFromCurrentState, .AllowUserInteraction, .LayoutSubviews],
       animations: { [unowned self] in
         self.content.position = position
+        self.content.view.superview!.layoutIfNeeded()
       }, completion: nil)
 
     played = true

Source/Content.swift

@@ -44,7 +44,7 @@ public class Content: NSObject {
           view.top == y
         }
       }
-      view.superview!.layoutIfNeeded()
+      view.layoutIfNeeded()
     }
   }
 }

Source/PresentationController.swift

@@ -12,13 +12,15 @@ import Pages
 public class PresentationController: PagesController {
 
   public weak var presentationDelegate: PresentationControllerDelegate?
+  public var maxAnimationDelay: Double = 3
 
   private var backgroundContents = [Content]()
   private var slides = [SlideController]()
   private var animationsForPages = [Int : [Animatable]]()
 
   private var animationIndex = 0
   private weak var scrollView: UIScrollView?
+  var animationTimer: NSTimer?
 
   public convenience init(pages: [UIViewController]) {
     self.init(
@@ -55,6 +57,8 @@ public class PresentationController: PagesController {
   // MARK: - Public methods
 
   public override func goTo(index: Int) {
+    startAnimationTimer()
+    
     super.goTo(index)
 
     if index >= 0 && index < pagesCount {
@@ -82,6 +86,33 @@ public class PresentationController: PagesController {
       })
     }
   }
+
+  // MARK: - Animation Timer
+
+  func startAnimationTimer() {
+    stopAnimationTimer()
+    scrollView?.userInteractionEnabled = false
+    if animationTimer == nil {
+      dispatch_async(dispatch_get_main_queue()) {
+        self.animationTimer = NSTimer.scheduledTimerWithTimeInterval(self.maxAnimationDelay,
+          target: self,
+          selector: "updateAnimationTimer:",
+          userInfo: nil,
+          repeats: false)
+        NSRunLoop.currentRunLoop().addTimer(self.animationTimer!, forMode: NSRunLoopCommonModes)
+      }
+    }
+  }
+
+  func stopAnimationTimer() {
+    animationTimer?.invalidate()
+    animationTimer = nil
+  }
+
+  func updateAnimationTimer(timer: NSTimer) {
+    stopAnimationTimer()
+    scrollView?.userInteractionEnabled = true
+  }
 }
 
 // MARK: - Content