SebastianBoldt#41 - Added perspective to Cover Animation

glisom · Mar 26, 2019 · ea91a94 · ea91a94
1 parent 5a39c0d
commit ea91a94
Show file tree

Hide file tree

Showing 4 changed files with 23 additions and 1 deletion.
diff --git a/Example/Jelly/MainViewController.swift b/Example/Jelly/MainViewController.swift
@@ -36,7 +36,7 @@ class MainViewController: UIViewController {
                             let uiConfiguration = PresentationUIConfiguration(cornerRadius: 10, backgroundStyle: .dimmed(alpha: 0.5), isTapBackgroundToDismissEnabled: true, corners: [.layerMaxXMaxYCorner,.layerMaxXMinYCorner,.layerMinXMaxYCorner,.layerMinXMinYCorner])
                             let size = PresentationSize(width: .fullscreen, height: .halfscreen)
                             let alignment = PresentationAlignment(vertical: .bottom, horizontal: .center)
-                            let presentation = CoverPresentation(directionShow: .bottom, directionDismiss: .bottom, uiConfiguration: uiConfiguration, size: size, alignment: alignment, marginGuards: marginGuards)
+                            let presentation = CoverPresentation(directionShow: .bottom, directionDismiss: .bottom, uiConfiguration: uiConfiguration, size: size, alignment: alignment, marginGuards: marginGuards, depthScale: 0.80)
                             let animator = Animator(presentation: presentation)
                             animator.prepare(presentedViewController: viewControllerToPresent)
                             self.animator = animator

diff --git a/Jelly/Classes/private/Animators/Animated Animators/CoverAnimator.swift b/Jelly/Classes/private/Animators/Animated Animators/CoverAnimator.swift
@@ -3,6 +3,7 @@ import Foundation
 final class CoverAnimator: NSObject {
     private let presentationType : PresentationType
     private let presentation : CoverPresentation
+    private var screenshot: UIView?
 
     init(presentationType: PresentationType, presentation: CoverPresentation) {
         self.presentationType = presentationType
@@ -56,6 +57,19 @@ extension CoverAnimator : UIViewControllerAnimatedTransitioning {
         let propertyAnimator = UIViewPropertyAnimator(duration: animationDuration, timingParameters: timingCurveProvider)
 
         propertyAnimator.addAnimations {
+            if isPresentation {
+                if let presentingViewController = transitionContext.viewController(forKey: .from) {
+                    presentingViewController.view.transform = CGAffineTransform(scaleX: self.presentation.depthScale,
+                                                                                y: self.presentation.depthScale)
+                    if UIApplication.shared.delegate?.window??.safeAreaInsets.top ?? 0 > 20 {
+                        let maskLayer = CAShapeLayer()
+                        maskLayer.path = UIBezierPath(roundedRect: presentingViewController.view.bounds, byRoundingCorners: .allCorners, cornerRadii: CGSize(width: 38.5, height: 38.5)).cgPath
+                        presentingViewController.view.layer.mask = maskLayer
+                    }
+                }
+            } else {
+                transitionContext.viewController(forKey: .to)!.view.transform = CGAffineTransform(scaleX: 1.0, y: 1.0)
+            }
             controllerToAnimate.view.frame = finalFrame
         }
 

diff --git a/Jelly/Classes/private/PresentationController.swift b/Jelly/Classes/private/PresentationController.swift
@@ -4,6 +4,7 @@ protocol PresentationControllerProtocol {
     func updatePresentation(presentation: Presentation, duration: Duration)
     var dimmingView: UIView { get }
     var blurView: UIVisualEffectView { get }
+    var screenshot: UIView { get }
 }
 
 /// A PresentationController tells UIKit what exactly to do with the View that should be presented
@@ -17,6 +18,7 @@ final class PresentationController: UIPresentationController, PresentationContro
     // using an edge pan gesture. This must be done, because it wont work other wise with non full screen viewController transitions
     private(set) var dimmingView: UIView = UIView()
     private(set) var blurView: UIVisualEffectView = UIVisualEffectView()
+    private(set) var screenshot: UIView = UIView()
 
     init(presentedViewController: UIViewController, presentingViewController: UIViewController?, presentation: Presentation) {
         self.presentation = presentation
@@ -45,6 +47,8 @@ final class PresentationController: UIPresentationController, PresentationContro
                 self.setupDimmingView(withAlpha: alpha)
                 animateDimmingView(alpha: alpha)
         }
+        screenshot = presentingViewController.view.snapshotView(afterScreenUpdates: false)!
+        presentingViewController.view!.addSubview(screenshot)
     }
 
     override func dismissalTransitionWillBegin() {
@@ -55,6 +59,7 @@ final class PresentationController: UIPresentationController, PresentationContro
             case .dimmed:
                 animateDimmingView(alpha: 0.0)
         }
+        screenshot.removeFromSuperview()
     }
 
     override func containerViewWillLayoutSubviews() {        

diff --git a/Jelly/Classes/public/Models/Presentations/CoverPresentation.swift b/Jelly/Classes/public/Models/Presentations/CoverPresentation.swift
@@ -15,6 +15,7 @@ public struct CoverPresentation: Presentation,
     public var presentationAlignment: PresentationAlignmentProtocol
     public var spring: Spring
     public var marginGuards: UIEdgeInsets
+    public var depthScale: CGFloat
     public var interactionConfiguration: InteractionConfiguration?
 
     public init(directionShow: Direction,
@@ -23,6 +24,7 @@ public struct CoverPresentation: Presentation,
                 size: PresentationSizeProtocol = PresentationSize(),
                 alignment: PresentationAlignmentProtocol = PresentationAlignment.centerAlignment,
                 marginGuards: UIEdgeInsets = .zero ,
+                depthScale: CGFloat = 1.0,
                 timing: PresentationTimingProtocol = PresentationTiming(),
                 spring: Spring = .none,
                 interactionConfiguration: InteractionConfiguration? = nil) {
@@ -35,6 +37,7 @@ public struct CoverPresentation: Presentation,
         self.presentationAlignment = alignment
         self.spring = spring
         self.marginGuards = marginGuards
+        self.depthScale = depthScale
         self.presentationAlignment = alignment
         self.interactionConfiguration = interactionConfiguration
     }