Fix animated transition issues when presenter is formSheet (zvonicek#378

)
cliff357 · Jun 21, 2020 · db30f4c · db30f4c
1 parent d5db87e
commit db30f4c
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 18 deletions.
diff --git a/Example/ImageSlideshow/TableViewController.swift b/Example/ImageSlideshow/TableViewController.swift
@@ -52,6 +52,7 @@ class TableViewController: UITableViewController {
 
         if let cell = tableView.cellForRow(at: indexPath), let imageView = cell.imageView {
             slideshowTransitioningDelegate = ZoomAnimatedTransitioningDelegate(imageView: imageView, slideshowController: fullScreenController)
+            fullScreenController.modalPresentationStyle = .custom
             fullScreenController.transitioningDelegate = slideshowTransitioningDelegate
         }
 

diff --git a/ImageSlideshow/Classes/Core/FullScreenSlideshowViewController.swift b/ImageSlideshow/Classes/Core/FullScreenSlideshowViewController.swift
@@ -52,8 +52,8 @@ open class FullScreenSlideshowViewController: UIViewController {
     convenience init() {
         self.init(nibName:nil, bundle:nil)
 
+        self.modalPresentationStyle = .custom
         if #available(iOS 13.0, *) {
-            self.modalPresentationStyle = .fullScreen
             // Use KVC to set the value to preserve backwards compatiblity with Xcode < 11
             self.setValue(true, forKey: "modalInPresentation")
         }
@@ -94,6 +94,9 @@ open class FullScreenSlideshowViewController: UIViewController {
         super.viewWillDisappear(animated)
 
         slideshow.slideshowItems.forEach { $0.cancelPendingLoad() }
+
+        // Prevents broken dismiss transition when image is zoomed in
+        slideshow.currentSlideshowItem?.zoomOut()
     }
 
     open override func viewDidLayoutSubviews() {

diff --git a/ImageSlideshow/Classes/Core/ImageSlideshow.swift b/ImageSlideshow/Classes/Core/ImageSlideshow.swift
@@ -547,11 +547,7 @@ open class ImageSlideshow: UIView {
         fullscreen.inputs = images
         slideshowTransitioningDelegate = ZoomAnimatedTransitioningDelegate(slideshowView: self, slideshowController: fullscreen)
         fullscreen.transitioningDelegate = slideshowTransitioningDelegate
-        if #available(iOS 13.0, *) {
-            // The modalPresentationStyle is already set in FullScreenSlideshowViewController, but multiple users
-            // reported that they need the `modalPresentationStyle` explicitly specified here.
-            fullscreen.modalPresentationStyle = .fullScreen
-        }
+        fullscreen.modalPresentationStyle = .custom
         controller.present(fullscreen, animated: true, completion: completion)
 
         return fullscreen

diff --git a/ImageSlideshow/Classes/Core/ZoomAnimatedTransitioning.swift b/ImageSlideshow/Classes/Core/ZoomAnimatedTransitioning.swift
@@ -123,6 +123,17 @@ open class ZoomAnimatedTransitioningDelegate: NSObject, UIViewControllerTransiti
     open func interactionControllerForDismissal(using animator: UIViewControllerAnimatedTransitioning) -> UIViewControllerInteractiveTransitioning? {
         return interactionController
     }
+
+    public func presentationController(forPresented presented: UIViewController, presenting: UIViewController?, source: UIViewController) -> UIPresentationController? {
+        return PresentationController(presentedViewController: presented, presenting: presenting)
+    }
+}
+
+private class PresentationController: UIPresentationController {
+    // Needed for interactive dismiss to keep the presenter View Controller visible
+    override var shouldRemovePresentersView: Bool {
+        return false
+    }
 }
 
 extension ZoomAnimatedTransitioningDelegate: UIGestureRecognizerDelegate {
@@ -198,7 +209,6 @@ class ZoomInAnimator: ZoomAnimator, UIViewControllerAnimatedTransitioning {
         #else
         containerView.sendSubview(toBack: transitionBackgroundView)
         #endif
-
 
         let finalFrame = toViewController.view.frame
 
@@ -273,14 +283,6 @@ class ZoomOutAnimator: ZoomAnimator, UIViewControllerAnimatedTransitioning {
 
         let containerView = transitionContext.containerView
 
-        toViewController.view.frame = transitionContext.finalFrame(for: toViewController)
-        toViewController.view.alpha = 0
-        containerView.addSubview(toViewController.view)
-        #if swift(>=4.2)
-        containerView.sendSubviewToBack(toViewController.view)
-        #else
-        containerView.sendSubview(toBack: toViewController.view)
-        #endif
         var transitionViewInitialFrame: CGRect
         if let currentSlideshowItem = fromViewController.slideshow.currentSlideshowItem {
             if let image = currentSlideshowItem.imageView.image {
@@ -322,16 +324,16 @@ class ZoomOutAnimator: ZoomAnimator, UIViewControllerAnimatedTransitioning {
         containerView.sendSubview(toBack: transitionBackgroundView)
         #endif
 
-        let transitionView: UIImageView = UIImageView(image: fromViewController.slideshow.currentSlideshowItem?.imageView.image)
+        let transitionView = UIImageView(image: fromViewController.slideshow.currentSlideshowItem?.imageView.image)
         transitionView.contentMode = UIViewContentMode.scaleAspectFill
         transitionView.clipsToBounds = true
         transitionView.frame = transitionViewInitialFrame
         containerView.addSubview(transitionView)
         fromViewController.view.isHidden = true
 
-        let duration: TimeInterval = transitionDuration(using: transitionContext)
+        let duration = transitionDuration(using: transitionContext)
         let animations = {
-            toViewController.view.alpha = 1
+            transitionBackgroundView.alpha = 0
             transitionView.frame = transitionViewFinalFrame
         }
         let completion = { (_: Any) in