From 2acc32a44b26edc7a324d563c1af96a80fd9ba18 Mon Sep 17 00:00:00 2001
From: Morgan Pretty <morgan.t.pretty@gmail.com>
Date: Thu, 11 Aug 2022 15:01:23 +1000
Subject: [PATCH] Fixed the broken MediaDetail <-> MediaTile custom transition

---
 .../AllMediaViewController.swift              |  6 +++
 .../MediaTileViewController.swift             | 43 +++++++++++++++++--
 2 files changed, 46 insertions(+), 3 deletions(-)

diff --git a/Session/Media Viewing & Editing/AllMediaViewController.swift b/Session/Media Viewing & Editing/AllMediaViewController.swift
index ecf9bef7a..6090b7404 100644
--- a/Session/Media Viewing & Editing/AllMediaViewController.swift	
+++ b/Session/Media Viewing & Editing/AllMediaViewController.swift	
@@ -36,9 +36,13 @@ public class AllMediaViewController: UIViewController, UIPageViewControllerDataS
     init(mediaTitleViewController: MediaTileViewController, documentTitleViewController: DocumentTileViewController) {
         self.mediaTitleViewController = mediaTitleViewController
         self.documentTitleViewController = documentTitleViewController
+        
         super.init(nibName: nil, bundle: nil)
+        
         self.mediaTitleViewController.delegate = self
         self.documentTitleViewController.delegate = self
+        addChild(self.mediaTitleViewController)
+        addChild(self.documentTitleViewController)
     }
     
     required init?(coder: NSCoder) {
@@ -66,6 +70,8 @@ public class AllMediaViewController: UIViewController, UIPageViewControllerDataS
         pageVC.dataSource = self
         pageVC.delegate = self
         pageVC.setViewControllers([ mediaTitleViewController ], direction: .forward, animated: false, completion: nil)
+        addChild(pageVC)
+        
         // Set up tab bar
         view.addSubview(tabBar)
         tabBar.pin([ UIView.HorizontalEdge.leading, UIView.HorizontalEdge.trailing, UIView.VerticalEdge.top ], to: view)
diff --git a/Session/Media Viewing & Editing/MediaTileViewController.swift b/Session/Media Viewing & Editing/MediaTileViewController.swift
index 13dcb94e0..44d1bb4e3 100644
--- a/Session/Media Viewing & Editing/MediaTileViewController.swift	
+++ b/Session/Media Viewing & Editing/MediaTileViewController.swift	
@@ -201,8 +201,35 @@ public class MediaTileViewController: UIViewController, UICollectionViewDataSour
         guard let focusedIndexPath: IndexPath = self.viewModel.focusedIndexPath else { return }
         
         Logger.debug("scrolling to focused item at indexPath: \(focusedIndexPath)")
+        
+        // Note: For some reason 'scrollToItem' doesn't always work properly so we need to manually
+        // calculate what the offset should be to do the initial scroll
         self.view.layoutIfNeeded()
-        self.collectionView.scrollToItem(at: focusedIndexPath, at: .centeredVertically, animated: false)
+        
+        let availableHeight: CGFloat = {
+            // Note: This height will be set before we have properly performed a layout and fitted
+            // this screen within it's parent UIPagedViewController so we need to try to calculate
+            // the "actual" height of the collection view
+            var finalHeight: CGFloat = self.collectionView.frame.height
+            
+            if let navController: UINavigationController = self.parent?.navigationController {
+                finalHeight -= navController.navigationBar.frame.height
+                finalHeight -= (UIApplication.shared.keyWindow?.windowScene?.statusBarManager?.statusBarFrame.height ?? 0)
+            }
+            
+            if let tabBar: TabBar = self.parent?.parent?.view.subviews.first as? TabBar {
+                finalHeight -= tabBar.frame.height
+            }
+            
+            return finalHeight
+        }()
+        let focusedRect: CGRect = (self.collectionView.layoutAttributesForItem(at: focusedIndexPath)?.frame)
+            .defaulting(to: .zero)
+        self.collectionView.contentOffset = CGPoint(
+            x: 0,
+            y: (focusedRect.origin.y - (availableHeight / 2) + (focusedRect.height / 2))
+        )
+        self.collectionView.collectionViewLayout.invalidateLayout()
         
         // Now that the data has loaded we need to check if either of the "load more" sections are
         // visible and trigger them if so
@@ -832,7 +859,12 @@ class GalleryGridCellItem: PhotoGridItem {
 
 extension MediaTileViewController: UIViewControllerTransitioningDelegate {
     public func animationController(forPresented presented: UIViewController, presenting: UIViewController, source: UIViewController) -> UIViewControllerAnimatedTransitioning? {
-        guard self == presented || self.navigationController == presented else { return nil }
+        guard
+            self == presented ||
+            self.navigationController == presented ||
+            self.parent == presented ||
+            self.parent?.navigationController == presented
+        else { return nil }
         guard let focusedIndexPath: IndexPath = self.viewModel.focusedIndexPath else { return nil }
 
         return MediaDismissAnimationController(
@@ -841,7 +873,12 @@ extension MediaTileViewController: UIViewControllerTransitioningDelegate {
     }
 
     public func animationController(forDismissed dismissed: UIViewController) -> UIViewControllerAnimatedTransitioning? {
-        guard self == dismissed || self.navigationController == dismissed else { return nil }
+        guard
+            self == dismissed ||
+            self.navigationController == dismissed ||
+            self.parent == dismissed ||
+            self.parent?.navigationController == dismissed
+        else { return nil }
         guard let focusedIndexPath: IndexPath = self.viewModel.focusedIndexPath else { return nil }
 
         return MediaZoomAnimationController(