Merge pull request #107 from michaelhenry/issues/issue_106

Issues/issue 106
michaelhenry · Sep 29, 2020 · ad8810e · ad8810e
2 parents 5d2b8e1 + b0e613a
commit ad8810e
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 10 deletions.
diff --git a/.DS_Store b/.DS_Store
diff --git a/Sources/ImageViewerTransitionPresentationManager.swift b/Sources/ImageViewerTransitionPresentationManager.swift
@@ -77,26 +77,27 @@ extension ImageViewerTransitionPresentationAnimator: UIViewControllerAnimatedTra
         completed: @escaping((Bool) -> Void)) {
 
         guard
-            let transitionVC = controller as? ImageViewerTransitionViewControllerConvertible
+            let transitionVC = controller as? ImageViewerTransitionViewControllerConvertible,
+            let sourceView = transitionVC.sourceView
         else { return }
+
+        sourceView.alpha = 0.0
+        controller.view.alpha = 0.0
 
-        let sourceView = transitionVC.sourceView
+        transitionView.addSubview(controller.view)
+        transitionVC.targetView?.alpha = 0.0
 
         let dummyImageView = createDummyImageView(
-            frame: sourceView?.frameRelativeToWindow() ?? .zero,
-            image: sourceView?.image)
+            frame: sourceView.frameRelativeToWindow(),
+            image: sourceView.image)
+        dummyImageView.contentMode = .scaleAspectFit
         transitionView.addSubview(dummyImageView)
 
-        sourceView?.alpha = 0.0
-
-        transitionView.addSubview(controller.view)
-        controller.view.alpha = 0.0
-
         UIView.animate(withDuration: duration, animations: {
-            dummyImageView.contentMode = .scaleAspectFit
             dummyImageView.frame = UIScreen.main.bounds
             controller.view.alpha = 1.0
         }) { finished in
+            transitionVC.targetView?.alpha = 1.0
             dummyImageView.removeFromSuperview()
             completed(finished)
         }