fix errors

PGSwift · Dec 18, 2016 · 190e046 · 190e046
1 parent 3e182a4
commit 190e046
Show file tree

Hide file tree

Showing 7 changed files with 12 additions and 14 deletions.
diff --git a/.swift_version → .swift-version b/.swift_version → .swift-version
diff --git a/Examples/HeroExamples/Assets.xcassets/AppIcon.appiconset/[email protected] b/Examples/HeroExamples/Assets.xcassets/AppIcon.appiconset/[email protected]
diff --git a/Hero/ClearPreprocessor.swift b/Hero/ClearPreprocessor.swift
@@ -25,7 +25,7 @@ import UIKit
 public class ClearPreprocessor:HeroPreprocessor {
   public func process(context:HeroContext, fromViews:[UIView], toViews:[UIView]) {
     for view in fromViews + toViews{
-      guard let options = context[view, "clearSubviewClasses"] else { continue }
+      guard context[view, "clearSubviewClasses"] != nil else { continue }
       var parentView = view
       if let _  = view as? UITableView, let wrapperView = view.subviews.get(0) {
         parentView = wrapperView

diff --git a/Hero/Hero.swift b/Hero/Hero.swift
@@ -23,8 +23,8 @@
 import UIKit
 
 internal class Hero:NSObject {
-  var toViewController:UIViewController!
-  var fromViewController:UIViewController!
+  var toViewController:UIViewController?
+  var fromViewController:UIViewController?
 
   var interactive:Bool = false
 
@@ -40,8 +40,8 @@ internal class Hero:NSObject {
   fileprivate var inContainerController = false
   fileprivate weak var transitionContext:UIViewControllerContextTransitioning?
 
-  fileprivate var toView:UIView { return toViewController.view }
-  fileprivate var fromView:UIView { return fromViewController.view }
+  fileprivate var toView:UIView { return toViewController!.view }
+  fileprivate var fromView:UIView { return fromViewController!.view }
 
   fileprivate var context:HeroContext!
   fileprivate var animatingViewContainer:UIView!
@@ -98,18 +98,18 @@ internal extension Hero {
     }
 
     if let delegate = fromViewController as? HeroViewControllerDelegate{
-      delegate.heroWillStartAnimatingTo?(viewController: toViewController)
+      delegate.heroWillStartAnimatingTo?(viewController: toViewController!)
     }
     if let navigationController = fromViewController as? UINavigationController,
       let delegate = navigationController.topViewController as? HeroViewControllerDelegate{
-      delegate.heroWillStartAnimatingTo?(viewController: toViewController)
+      delegate.heroWillStartAnimatingTo?(viewController: toViewController!)
     }
     if let delegate = toViewController as? HeroViewControllerDelegate{
-      delegate.heroWillStartAnimatingFrom?(viewController: fromViewController)
+      delegate.heroWillStartAnimatingFrom?(viewController: fromViewController!)
     }
     if let navigationController = toViewController as? UINavigationController,
       let delegate = navigationController.topViewController as? HeroViewControllerDelegate{
-      delegate.heroWillStartAnimatingFrom?(viewController: fromViewController)
+      delegate.heroWillStartAnimatingFrom?(viewController: fromViewController!)
     }
 
     transitionContainer.isUserInteractionEnabled = false

diff --git a/Hero/HeroDebugPlugin.swift b/Hero/HeroDebugPlugin.swift
@@ -36,7 +36,7 @@ public class HeroDebugPlugin: HeroPlugin {
   }
 
   public override func resume(from progress: Double, reverse: Bool) -> TimeInterval {
-    guard let interactiveContext = interactiveContext, let debugView = debugView else { return 0.4 }
+    guard interactiveContext != nil, let debugView = debugView else { return 0.4 }
     debugView.delegate = nil
 
     UIView.animate(withDuration: 0.4){

diff --git a/Hero/HeroDefaultAnimator.swift b/Hero/HeroDefaultAnimator.swift
@@ -47,7 +47,7 @@ public class HeroDefaultAnimator:HeroAnimator{
 
   public func resume(from progress:Double, reverse:Bool) -> TimeInterval{
     paused = false
-    var timePassed = (reverse ? 1 - progress : progress) * duration
+    let timePassed = (reverse ? 1 - progress : progress) * duration
 
     var neededTime:TimeInterval = self.duration - timePassed
     for (layer, anim) in removedAnimations{
@@ -80,7 +80,7 @@ public class HeroDefaultAnimator:HeroAnimator{
         group.beginTime = layer.convertTime(CACurrentMediaTime(), from: nil) + delay - timePassed
       }
     }
-    for (layer, (delay, group)) in animationGroups{
+    for (layer, (_, group)) in animationGroups{
       layer.removeAnimation(forKey: "hero")
       layer.add(group, forKey: "hero")
     }

diff --git a/Hero/SourceIDPreprocessor.swift b/Hero/SourceIDPreprocessor.swift
@@ -42,8 +42,6 @@ class SourceIDPreprocessor:HeroPreprocessor {
 extension SourceIDPreprocessor {
   fileprivate func prepareFor(view:UIView, targetView:UIView, context:HeroContext){
     let targetPos = context.container.layer.convert(targetView.layer.position, from: targetView.layer.superlayer)
-    let targetAnchor = targetView.layer.anchorPoint
-    let targetFrame = context.container.convert(targetView.bounds, from: targetView)
 
     context[view, "position"] = targetPos.modifierParameters
     if view.bounds != targetView.bounds{