diff --git a/iOS/Article/ImageTransition.swift b/iOS/Article/ImageTransition.swift index 1e66fffcc..8b66a2baf 100644 --- a/iOS/Article/ImageTransition.swift +++ b/iOS/Article/ImageTransition.swift @@ -10,7 +10,7 @@ import UIKit class ImageTransition: NSObject, UIViewControllerAnimatedTransitioning { - let duration = 0.5 + let duration = 0.3 var presenting = true var originFrame: CGRect! var originImage: UIImage! @@ -37,10 +37,6 @@ class ImageTransition: NSObject, UIViewControllerAnimatedTransitioning { let imageView = UIImageView(image: originImage) imageView.frame = initialFrame -// let xScaleFactor = presenting ? initialFrame.width / targetFrame.width : targetFrame.width / initialFrame.width -// let yScaleFactor = presenting ? initialFrame.height / targetFrame.height : targetFrame.height / initialFrame.height -// let scaleTransform = CGAffineTransform(scaleX: xScaleFactor, y: yScaleFactor) - let fromView = transitionContext.view(forKey: .from)! fromView.removeFromSuperview() @@ -49,10 +45,11 @@ class ImageTransition: NSObject, UIViewControllerAnimatedTransitioning { UIView.animate( withDuration: duration, + delay:0.0, + usingSpringWithDamping: 0.8, + initialSpringVelocity: 0.2, animations: { imageView.frame = targetFrame -// imageView.transform = scaleTransform -// imageView.center = CGPoint(x: targetFrame.midX, y: targetFrame.midY) }, completion: { _ in imageView.removeFromSuperview() let toView = transitionContext.view(forKey: .to)! diff --git a/iOS/Base.lproj/Main.storyboard b/iOS/Base.lproj/Main.storyboard index 05a579442..14b53813d 100644 --- a/iOS/Base.lproj/Main.storyboard +++ b/iOS/Base.lproj/Main.storyboard @@ -268,11 +268,11 @@ - - - + + + - +