Tusker.xcodeproj/project.pbxproj

@@ -7,11 +7,14 @@
 	objects = {
 
 /* Begin PBXBuildFile section */
-		0411610022B442870030A9B7 /* LoadingLargeImageViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 041160FE22B442870030A9B7 /* LoadingLargeImageViewController.swift */; };
+		0411610022B442870030A9B7 /* AttachmentViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 041160FE22B442870030A9B7 /* AttachmentViewController.swift */; };
+		0411610122B442870030A9B7 /* AttachmentViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 041160FF22B442870030A9B7 /* AttachmentViewController.xib */; };
 		0427033822B30F5F000D31B6 /* BehaviorPrefsView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0427033722B30F5F000D31B6 /* BehaviorPrefsView.swift */; };
 		0427033A22B31269000D31B6 /* AdvancedPrefsView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0427033922B31269000D31B6 /* AdvancedPrefsView.swift */; };
 		0427037C22B316B9000D31B6 /* SilentActionPrefs.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0427037B22B316B9000D31B6 /* SilentActionPrefs.swift */; };
 		0450531F22B0097E00100BA2 /* Timline+UI.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0450531E22B0097E00100BA2 /* Timline+UI.swift */; };
+		0454DDAF22B462EF00B8BB8E /* GalleryExpandAnimationController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0454DDAE22B462EF00B8BB8E /* GalleryExpandAnimationController.swift */; };
+		0454DDB122B467AA00B8BB8E /* GalleryShrinkAnimationController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0454DDB022B467AA00B8BB8E /* GalleryShrinkAnimationController.swift */; };
 		04586B4122B2FFB10021BD04 /* PreferencesView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 04586B4022B2FFB10021BD04 /* PreferencesView.swift */; };
 		04586B4322B301470021BD04 /* AppearancePrefsView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 04586B4222B301470021BD04 /* AppearancePrefsView.swift */; };
 		0461A3902163CBAE00C0A807 /* Cache.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 0461A38F2163CBAE00C0A807 /* Cache.framework */; };
@@ -288,11 +291,14 @@
 /* End PBXCopyFilesBuildPhase section */
 
 /* Begin PBXFileReference section */
-		041160FE22B442870030A9B7 /* LoadingLargeImageViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LoadingLargeImageViewController.swift; sourceTree = "<group>"; };
+		041160FE22B442870030A9B7 /* AttachmentViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AttachmentViewController.swift; sourceTree = "<group>"; };
+		041160FF22B442870030A9B7 /* AttachmentViewController.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = AttachmentViewController.xib; sourceTree = "<group>"; };
 		0427033722B30F5F000D31B6 /* BehaviorPrefsView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BehaviorPrefsView.swift; sourceTree = "<group>"; };
 		0427033922B31269000D31B6 /* AdvancedPrefsView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AdvancedPrefsView.swift; sourceTree = "<group>"; };
 		0427037B22B316B9000D31B6 /* SilentActionPrefs.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SilentActionPrefs.swift; sourceTree = "<group>"; };
 		0450531E22B0097E00100BA2 /* Timline+UI.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "Timline+UI.swift"; sourceTree = "<group>"; };
+		0454DDAE22B462EF00B8BB8E /* GalleryExpandAnimationController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = GalleryExpandAnimationController.swift; sourceTree = "<group>"; };
+		0454DDB022B467AA00B8BB8E /* GalleryShrinkAnimationController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = GalleryShrinkAnimationController.swift; sourceTree = "<group>"; };
 		04586B4022B2FFB10021BD04 /* PreferencesView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PreferencesView.swift; sourceTree = "<group>"; };
 		04586B4222B301470021BD04 /* AppearancePrefsView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppearancePrefsView.swift; sourceTree = "<group>"; };
 		0461A38F2163CBAE00C0A807 /* Cache.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; path = Cache.framework; sourceTree = BUILT_PRODUCTS_DIR; };
@@ -566,12 +572,31 @@
 /* End PBXFrameworksBuildPhase section */
 
 /* Begin PBXGroup section */
-		0411610522B457290030A9B7 /* Attachment Gallery */ = {
+		0411610422B4571E0030A9B7 /* Attachment */ = {
 			isa = PBXGroup;
 			children = (
+				041160FE22B442870030A9B7 /* AttachmentViewController.swift */,
+				041160FF22B442870030A9B7 /* AttachmentViewController.xib */,
+			);
+			path = Attachment;
+			sourceTree = "<group>";
+		};
+		0411610522B457290030A9B7 /* Gallery */ = {
+			isa = PBXGroup;
+			children = (
+				0411610622B457360030A9B7 /* Transitions */,
 				04D14BAE22B34A2800642648 /* GalleryViewController.swift */,
 			);
-			path = "Attachment Gallery";
+			path = Gallery;
+			sourceTree = "<group>";
+		};
+		0411610622B457360030A9B7 /* Transitions */ = {
+			isa = PBXGroup;
+			children = (
+				0454DDAE22B462EF00B8BB8E /* GalleryExpandAnimationController.swift */,
+				0454DDB022B467AA00B8BB8E /* GalleryShrinkAnimationController.swift */,
+			);
+			path = Transitions;
 			sourceTree = "<group>";
 		};
 		D61099AC2144B0CC00432DC2 /* Pachyderm */ = {
@@ -799,7 +824,8 @@
 				D6BC9DD8232D8BCA002CA326 /* Search */,
 				D627944B23A9A02400D38C68 /* Lists */,
 				D641C788213DD86D004B4513 /* Large Image */,
-				0411610522B457290030A9B7 /* Attachment Gallery */,
+				0411610422B4571E0030A9B7 /* Attachment */,
+				0411610522B457290030A9B7 /* Gallery */,
 				D6A3BC822321F69400FD64D5 /* Account List */,
 				D6A3BC8C2321FF9B00FD64D5 /* Status Action Account List */,
 				D627944823A6AD5100D38C68 /* Bookmarks */,
@@ -878,7 +904,6 @@
 				D646C954213B364600269FB5 /* Transitions */,
 				D6289E83217B795D0003D1D7 /* LargeImageViewController.xib */,
 				D6C94D862139E62700CB5196 /* LargeImageViewController.swift */,
-				041160FE22B442870030A9B7 /* LoadingLargeImageViewController.swift */,
 			);
 			path = "Large Image";
 			sourceTree = "<group>";
@@ -1482,6 +1507,7 @@
 				D627944723A6AC9300D38C68 /* BasicTableViewCell.xib in Resources */,
 				D64BC19023C18B9D000D0238 /* FollowRequestNotificationTableViewCell.xib in Resources */,
 				D67C57B221E28FAD00C3118B /* ComposeStatusReplyView.xib in Resources */,
+				0411610122B442870030A9B7 /* AttachmentViewController.xib in Resources */,
 				D63F9C6C241C50B9004C03CF /* ComposeAttachmentTableViewCell.xib in Resources */,
 				D6A3BC812321B7E600FD64D5 /* FollowNotificationGroupTableViewCell.xib in Resources */,
 				D63F9C66241C4CC3004C03CF /* AddAttachmentTableViewCell.xib in Resources */,
@@ -1604,6 +1630,7 @@
 				D6BC9DB1232C61BC002CA326 /* NotificationsPageViewController.swift in Sources */,
 				D6969E9E240C81B9002843CE /* NSTextAttachment+Emoji.swift in Sources */,
 				D6BC9DB3232D4C07002CA326 /* WellnessPrefsView.swift in Sources */,
+				0454DDAF22B462EF00B8BB8E /* GalleryExpandAnimationController.swift in Sources */,
 				D64BC18F23C18B9D000D0238 /* FollowRequestNotificationTableViewCell.swift in Sources */,
 				D693DE5923FE24310061E07D /* InteractivePushTransition.swift in Sources */,
 				D6A3BC8A2321F79B00FD64D5 /* AccountTableViewCell.swift in Sources */,
@@ -1614,7 +1641,7 @@
 				D6C7D27D22B6EBF800071952 /* AttachmentsContainerView.swift in Sources */,
 				D620483823D38190008A63EF /* StatusContentTextView.swift in Sources */,
 				D6F953F021251A2900CF0F2B /* MastodonController.swift in Sources */,
-				0411610022B442870030A9B7 /* LoadingLargeImageViewController.swift in Sources */,
+				0411610022B442870030A9B7 /* AttachmentViewController.swift in Sources */,
 				D611C2CF232DC61100C86A49 /* HashtagTableViewCell.swift in Sources */,
 				D627944F23A9C99800D38C68 /* EditListAccountsViewController.swift in Sources */,
 				D6945C3423AC6431005C403C /* AddSavedHashtagViewController.swift in Sources */,
@@ -1637,6 +1664,7 @@
 				D64BC18823C1640A000D0238 /* PinStatusActivity.swift in Sources */,
 				D6674AEA23341F7600E8DF94 /* AppShortcutItems.swift in Sources */,
 				D646C956213B365700269FB5 /* LargeImageExpandAnimationController.swift in Sources */,
+				0454DDB122B467AA00B8BB8E /* GalleryShrinkAnimationController.swift in Sources */,
 				D667E5F82135C3040057A976 /* Mastodon+Equatable.swift in Sources */,
 				D67C57B421E2910700C3118B /* ComposeStatusReplyView.swift in Sources */,
 				D6B053A623BD2D0C00A066FA /* AssetCollectionViewController.swift in Sources */,
@@ -2018,7 +2046,7 @@
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CODE_SIGN_IDENTITY = "iPhone Developer";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 4;
+				CURRENT_PROJECT_VERSION = 3;
 				DEVELOPMENT_TEAM = V4WK9KR9U2;
 				INFOPLIST_FILE = Tusker/Info.plist;
 				IPHONEOS_DEPLOYMENT_TARGET = 13.0;
@@ -2043,7 +2071,7 @@
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CODE_SIGN_IDENTITY = "iPhone Developer";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 4;
+				CURRENT_PROJECT_VERSION = 3;
 				DEVELOPMENT_TEAM = V4WK9KR9U2;
 				INFOPLIST_FILE = Tusker/Info.plist;
 				IPHONEOS_DEPLOYMENT_TARGET = 13.0;

Tusker/Extensions/UIViewController+Delegates.swift

@@ -10,17 +10,23 @@ import UIKit
 
 extension UIViewController: UIViewControllerTransitioningDelegate {
     public func animationController(forPresented presented: UIViewController, presenting: UIViewController, source: UIViewController) -> UIViewControllerAnimatedTransitioning? {
-        if let presented = presented as? LargeImageAnimatableViewController,
+        if let presented = presented as? LargeImageViewController,
-            presented.animationImage != nil {
+            presented.sourceInfo?.image != nil {
             return LargeImageExpandAnimationController()
+        } else if let presented = presented as? GalleryViewController,
+            presented.sourcesInfo[presented.startIndex]?.image != nil {
+            return GalleryExpandAnimationController()
         }
         return nil
     }
 
     public func animationController(forDismissed dismissed: UIViewController) -> UIViewControllerAnimatedTransitioning? {
-        if let dismissed = dismissed as? LargeImageAnimatableViewController,
+        if let dismissed = dismissed as? LargeImageViewController,
-            dismissed.animationImage != nil {
+            dismissed.imageForDismissalAnimation() != nil {
             return LargeImageShrinkAnimationController(interactionController: dismissed.dismissInteractionController)
+        } else if let dismissed = dismissed as? GalleryViewController,
+            dismissed.imageForDismissalAnimation() != nil {
+            return GalleryShrinkAnimationController(interactionController: dismissed.dismissInteractionController)
         }
         return nil
     }
@@ -30,6 +36,10 @@ extension UIViewController: UIViewControllerTransitioningDelegate {
             let interactionController = animator.interactionController,
             interactionController.inProgress {
             return interactionController
+        } else if let animator = animator as? GalleryShrinkAnimationController,
+            let interactionController = animator.interactionController,
+            interactionController.inProgress {
+            return interactionController
         }
         return nil
     }

Tusker/Info.plist

@@ -2,6 +2,17 @@
 <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
 <dict>
+	<key>UTExportedTypeDeclarations</key>
+	<array>
+		<dict>
+			<key>UTTypeConformsTo</key>
+			<array/>
+			<key>UTTypeIdentifier</key>
+			<string>space.vaccor.Tusker.composition-attachment</string>
+			<key>UTTypeTagSpecification</key>
+			<dict/>
+		</dict>
+	</array>
 	<key>CFBundleDevelopmentRegion</key>
 	<string>$(DEVELOPMENT_LANGUAGE)</string>
 	<key>CFBundleExecutable</key>
@@ -49,7 +60,7 @@
 	<key>NSMicrophoneUsageDescription</key>
 	<string>Post videos from the camera.</string>
 	<key>NSPhotoLibraryAddUsageDescription</key>
-	<string>Save photos directly from other people's posts.</string>
+	<string>Save photos directly from other people&apos;s posts.</string>
 	<key>NSPhotoLibraryUsageDescription</key>
 	<string>Post photos from the photo library.</string>
 	<key>NSUserActivityTypes</key>
@@ -98,16 +109,5 @@
 		<string>UIInterfaceOrientationLandscapeLeft</string>
 		<string>UIInterfaceOrientationLandscapeRight</string>
 	</array>
-	<key>UTExportedTypeDeclarations</key>
-	<array>
-		<dict>
-			<key>UTTypeConformsTo</key>
-			<array/>
-			<key>UTTypeIdentifier</key>
-			<string>space.vaccor.Tusker.composition-attachment</string>
-			<key>UTTypeTagSpecification</key>
-			<dict/>
-		</dict>
-	</array>
 </dict>
 </plist>

Tusker/Screens/Attachment/AttachmentViewController.swift

@@ -8,16 +8,14 @@
 import UIKit
 import Pachyderm
 
-class PendingLargeImageViewController: UIViewController {
+class AttachmentViewController: UIViewController {
+    
+    let attachment: Attachment
     
-    let url: URL
-    let cache: ImageCache
-    let imageDescription: String?
-
     var largeImageVC: LargeImageViewController?
     var loadingVC: LoadingViewController?
     
-    var imageRequest: ImageCache.Request?
+    var attachmentRequest: ImageCache.Request?
     
     private var initialControlsVisible: Bool = true
     var controlsVisible: Bool {
@@ -37,16 +35,10 @@ class PendingLargeImageViewController: UIViewController {
         return largeImageVC
     }
     
-    init(url: URL, cache: ImageCache, imageDescription: String?) {
+    init(attachment: Attachment) {
-        self.url = url
+        self.attachment = attachment
-        self.cache = cache
-        self.imageDescription = imageDescription
         
-        super.init(nibName: nil, bundle: nil)
+        super.init(nibName: "AttachmentViewController", bundle: nil)
-    }
-    
-    convenience init(attachment: Attachment) {
-        self.init(url: attachment.url, cache: .attachments, imageDescription: attachment.description)
     }
     
     required init?(coder: NSCoder) {
@@ -59,14 +51,14 @@ class PendingLargeImageViewController: UIViewController {
         overrideUserInterfaceStyle = .dark
         view.backgroundColor = .black
         
-        if let data = cache.get(url) {
+        if let data = ImageCache.attachments.get(attachment.url) {
             createLargeImage(data: data)
         } else {
             loadingVC = LoadingViewController()
             embedChild(loadingVC!)
-            imageRequest = cache.get(url) { [weak self] (data) in
+            attachmentRequest = ImageCache.attachments.get(attachment.url) { [weak self] (data) in
                 guard let self = self else { return }
-                self.imageRequest = nil
+                self.attachmentRequest = nil
                 DispatchQueue.main.async {
                     self.loadingVC?.removeViewAndController()
                     self.createLargeImage(data: data!)
@@ -79,16 +71,16 @@ class PendingLargeImageViewController: UIViewController {
         super.didMove(toParent: parent)
         
         if parent == nil {
-            imageRequest?.cancel()
+            attachmentRequest?.cancel()
         }
     }
     
     func createLargeImage(data: Data) {
         guard let image = UIImage(data: data) else { return }
-        largeImageVC = LargeImageViewController(image: image, description: imageDescription, sourceInfo: nil)
+        largeImageVC = LargeImageViewController(image: image, description: attachment.description, sourceInfo: nil)
         largeImageVC!.initialControlsVisible = initialControlsVisible
         largeImageVC!.shrinkGestureEnabled = false
-        if url.pathExtension == "gif" {
+        if attachment.url.pathExtension == "gif" {
             largeImageVC!.gifData = data
         }
         embedChild(largeImageVC!)

Tusker/Screens/Attachment/AttachmentViewController.xib

@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="14810.11" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
+    <device id="retina6_1" orientation="portrait" appearance="light"/>
+    <dependencies>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="14766.13"/>
+        <capability name="Safe area layout guides" minToolsVersion="9.0"/>
+        <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
+    </dependencies>
+    <objects>
+        <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner" customClass="AttachmentViewController" customModule="Tusker" customModuleProvider="target">
+            <connections>
+                <outlet property="view" destination="i5M-Pr-FkT" id="sfx-zR-JGt"/>
+            </connections>
+        </placeholder>
+        <placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/>
+        <view clearsContextBeforeDrawing="NO" contentMode="scaleToFill" id="i5M-Pr-FkT">
+            <rect key="frame" x="0.0" y="0.0" width="414" height="896"/>
+            <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
+            <color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+            <viewLayoutGuide key="safeArea" id="fnl-2z-Ty3"/>
+            <point key="canvasLocation" x="139" y="3"/>
+        </view>
+    </objects>
+</document>

Tusker/Screens/Compose/ComposeAttachmentsViewController.swift

@@ -154,7 +154,7 @@ class ComposeAttachmentsViewController: UITableViewController {
                 stepProgress()
                 
                 let formAttachment = FormAttachment(mimeType: mimeType, data: data, fileName: "file")
-                let request = Client.upload(attachment: formAttachment, description: compAttachment.attachmentDescription)
+                let request = Client.upload(attachment: formAttachment, description: compAttachment.description)
                 self.mastodonController.run(request) { (response) in
                     switch response {
                     case let .failure(error):

Tusker/Screens/Gallery/GalleryViewController.swift

@@ -10,8 +10,10 @@ import Pachyderm
 import AVFoundation
 import AVKit
 
-class GalleryViewController: UIPageViewController, UIPageViewControllerDataSource, UIPageViewControllerDelegate, LargeImageAnimatableViewController {
+class GalleryViewController: UIPageViewController, UIPageViewControllerDataSource, UIPageViewControllerDelegate {
 
+    var dismissInteractionController: LargeImageInteractionController?
+    
     let attachments: [Attachment]
     let sourcesInfo: [LargeImageViewController.SourceInfo?]
     let startIndex: Int
@@ -25,24 +27,6 @@ class GalleryViewController: UIPageViewController, UIPageViewControllerDataSourc
         }
         return index
     }
-
-    var animationSourceInfo: LargeImageViewController.SourceInfo? { sourcesInfo[currentIndex] }
-    var animationImage: UIImage? {
-        if let sourceImage = sourcesInfo[currentIndex]?.image {
-            return sourceImage
-        } else {
-            return (pages[currentIndex] as? LoadingLargeImageViewController)?.largeImageVC?.image
-        }
-    }
-    var animationGifData: Data? {
-        let attachment = attachments[currentIndex]
-        if attachment.url.pathExtension == "gif" {
-            return ImageCache.attachments.get(attachment.url)
-        } else {
-            return nil
-        }
-    }
-    var dismissInteractionController: LargeImageInteractionController?
     
     override var prefersStatusBarHidden: Bool {
         return true
@@ -67,9 +51,7 @@ class GalleryViewController: UIPageViewController, UIPageViewControllerDataSourc
         self.pages = attachments.map {
             switch $0.kind {
             case .image:
-                let vc = LoadingLargeImageViewController(attachment: $0)
+                return AttachmentViewController(attachment: $0)
-                vc.shrinkGestureEnabled = false
-                return vc
             case .video, .audio:
                 let vc = AVPlayerViewController()
                 vc.player = AVPlayer(url: $0.url)
@@ -114,6 +96,14 @@ class GalleryViewController: UIPageViewController, UIPageViewControllerDataSourc
             vc.player?.play()
         }
     }
+    
+    func imageForDismissalAnimation() -> UIImage? {
+        if let sourceImage = sourcesInfo[currentIndex]?.image {
+            return sourceImage
+        } else {
+            return (pages[currentIndex] as? AttachmentViewController)?.largeImageVC?.image
+        }
+    }
 
     // MARK: - Page View Controller Data Source
     
@@ -135,8 +125,8 @@ class GalleryViewController: UIPageViewController, UIPageViewControllerDataSourc
     
     // MARK: - Page View Controller Delegate
     func pageViewController(_ pageViewController: UIPageViewController, willTransitionTo pendingViewControllers: [UIViewController]) {
-        if let pending = pendingViewControllers.first as? LoadingLargeImageViewController,
+        if let pending = pendingViewControllers.first as? AttachmentViewController,
-            let current = viewControllers!.first as? LoadingLargeImageViewController {
+            let current = viewControllers!.first as? AttachmentViewController {
             pending.controlsVisible = current.controlsVisible
         }
         

Tusker/Screens/Gallery/Transitions/GalleryExpandAnimationController.swift

@@ -0,0 +1,84 @@
+//  GalleryExpandAnimationController.swift
+//  Tusker
+//
+//  Created by Shadowfacts on 6/14/19.
+//  Copyright © 2019 Shadowfacts. All rights reserved.
+//
+
+import UIKit
+import Gifu
+
+class GalleryExpandAnimationController: NSObject, UIViewControllerAnimatedTransitioning {
+    
+    func transitionDuration(using transitionContext: UIViewControllerContextTransitioning?) -> TimeInterval {
+        return 0.2
+    }
+    
+    func animateTransition(using transitionContext: UIViewControllerContextTransitioning) {
+        guard let fromVC = transitionContext.viewController(forKey: .from),
+            let toVC = transitionContext.viewController(forKey: .to) as? GalleryViewController else {
+                return
+        }
+        
+        let containerView = transitionContext.containerView
+        containerView.addSubview(toVC.view)
+
+        let finalVCFrame = transitionContext.finalFrame(for: toVC)
+        guard let sourceInfo = toVC.sourcesInfo[toVC.startIndex],
+            let image = sourceInfo.image else {
+                toVC.view.frame = finalVCFrame
+                transitionContext.completeTransition(!transitionContext.transitionWasCancelled)
+                return
+        }
+
+        let attachment = toVC.attachments[toVC.startIndex]
+
+        let ratio = image.size.width / image.size.height
+        var width = finalVCFrame.width
+        var height = width / ratio
+        let maxHeight = fromVC.view.bounds.height - fromVC.view.safeAreaInsets.top - fromVC.view.safeAreaInsets.bottom
+        if height > maxHeight {
+            let scaleFactor = maxHeight / height
+            width *= scaleFactor
+            height = maxHeight
+        }
+        let finalFrame = CGRect(x: finalVCFrame.midX - width / 2, y: finalVCFrame.midY - height / 2, width: width, height: height)
+        
+        let imageView = GIFImageView(frame: sourceInfo.frame)
+        imageView.image = image
+        if attachment.url.pathExtension == "gif",
+            let data = ImageCache.attachments.get(attachment.url) {
+            imageView.animate(withGIFData: data)
+        }
+        imageView.contentMode = .scaleAspectFill
+        imageView.layer.cornerRadius = sourceInfo.cornerRadius
+        imageView.layer.masksToBounds = true
+        
+        let blackView = UIView(frame: finalVCFrame)
+        blackView.backgroundColor = .black
+        blackView.alpha = 0
+        
+        containerView.addSubview(blackView)
+        containerView.addSubview(imageView)
+        
+        toVC.view.isHidden = true
+        
+        let duration = transitionDuration(using: transitionContext)
+        UIView.animate(withDuration: duration, animations: {
+            imageView.frame = finalFrame
+            imageView.layer.cornerRadius = 0
+            blackView.alpha = 1
+        }, completion: { _ in
+            toVC.view.frame = finalVCFrame
+            
+            toVC.view.isHidden = false
+            fromVC.view.isHidden = false
+            blackView.removeFromSuperview()
+            imageView.removeFromSuperview()
+            
+            transitionContext.completeTransition(!transitionContext.transitionWasCancelled)
+        })
+        
+    }
+    
+}

Tusker/Screens/Gallery/Transitions/GalleryShrinkAnimationController.swift

@@ -0,0 +1,84 @@
+//  GalleryShrinkAnimationController.swift
+//  Tusker
+//
+//  Created by Shadowfacts on 6/14/19.
+//  Copyright © 2019 Shadowfacts. All rights reserved.
+//
+
+import UIKit
+import Gifu
+
+class GalleryShrinkAnimationController: NSObject, UIViewControllerAnimatedTransitioning {
+    
+    let interactionController: LargeImageInteractionController?
+    
+    init(interactionController: LargeImageInteractionController?) {
+        self.interactionController = interactionController
+    }
+    
+    func transitionDuration(using transitionContext: UIViewControllerContextTransitioning?) -> TimeInterval {
+        return 0.2
+    }
+    
+    func animateTransition(using transitionContext: UIViewControllerContextTransitioning) {
+        guard let fromVC = transitionContext.viewController(forKey: .from) as? GalleryViewController,
+            let toVC = transitionContext.viewController(forKey: .to) else {
+                return
+        }
+        
+        guard let sourceInfo = fromVC.sourcesInfo[fromVC.currentIndex],
+            let image = fromVC.imageForDismissalAnimation() else {
+            transitionContext.completeTransition(!transitionContext.transitionWasCancelled)
+            return
+        }
+        let originalVCFrame = fromVC.view.frame
+        
+        let attachment = fromVC.attachments[fromVC.currentIndex]
+
+        let ratio = image.size.width / image.size.height
+        var width = originalVCFrame.width
+        var height = width / ratio
+        let maxHeight = fromVC.view.bounds.height - fromVC.view.safeAreaInsets.top - fromVC.view.safeAreaInsets.bottom
+        if height > maxHeight {
+            let scaleFactor = maxHeight / height
+            width *= scaleFactor
+            height = maxHeight
+        }
+        let originalFrame = CGRect(x: originalVCFrame.midX - width / 2, y: originalVCFrame.midY - height / 2, width: width, height: height)
+        
+        let imageView = GIFImageView(frame: originalFrame)
+        imageView.image = image
+        if attachment.url.pathExtension == "gif",
+            let data = ImageCache.attachments.get(attachment.url) {
+            imageView.animate(withGIFData: data)
+        }
+        imageView.contentMode = .scaleAspectFill
+        imageView.layer.cornerRadius = 0
+        imageView.layer.masksToBounds = true
+        
+        let blackView = UIView(frame: originalVCFrame)
+        blackView.backgroundColor = .black
+        blackView.alpha = 1
+        
+        let containerView = transitionContext.containerView
+        containerView.addSubview(toVC.view)
+        containerView.addSubview(blackView)
+        containerView.addSubview(imageView)
+        
+        let duration = transitionDuration(using: transitionContext)
+        UIView.animate(withDuration: duration, animations: {
+            imageView.frame = sourceInfo.frame
+            imageView.layer.cornerRadius = sourceInfo.cornerRadius
+            blackView.alpha = 0
+        }, completion: { _ in
+            blackView.removeFromSuperview()
+            imageView.removeFromSuperview()
+            
+            if transitionContext.transitionWasCancelled {
+                toVC.view.removeFromSuperview()
+            }
+            
+            transitionContext.completeTransition(!transitionContext.transitionWasCancelled)
+        })
+    }
+}

Tusker/Screens/Large Image/LargeImageViewController.swift

@@ -7,15 +7,15 @@
 //
 
 import UIKit
+import Pachyderm
+import Photos
 import Gifu
 
-class LargeImageViewController: UIViewController, UIScrollViewDelegate, LargeImageAnimatableViewController {
+class LargeImageViewController: UIViewController, UIScrollViewDelegate {
 
     typealias SourceInfo = (image: UIImage?, frame: CGRect, cornerRadius: CGFloat)
     
-    var animationSourceInfo: SourceInfo?
+    var sourceInfo: SourceInfo?
-    var animationImage: UIImage? { animationSourceInfo?.image ?? image }
-    var animationGifData: Data? { gifData }
     var dismissInteractionController: LargeImageInteractionController?
     
     @IBOutlet weak var scrollView: UIScrollView!
@@ -62,7 +62,7 @@ class LargeImageViewController: UIViewController, UIScrollViewDelegate, LargeIma
     init(image: UIImage, description: String?, sourceInfo: SourceInfo?) {
         self.image = image
         self.imageDescription = description
-        self.animationSourceInfo = sourceInfo
+        self.sourceInfo = sourceInfo
 
         super.init(nibName: "LargeImageViewController", bundle: nil)
         
@@ -127,6 +127,10 @@ class LargeImageViewController: UIViewController, UIScrollViewDelegate, LargeIma
             closeButtonTrailingConstraint.constant = offset
         }
     }
+    
+    func imageForDismissalAnimation() -> UIImage? {
+        return sourceInfo?.image ?? image
+    }
 
     func setControlsVisible(_ controlsVisible: Bool, animated: Bool) {
         self.controlsVisible = controlsVisible

Tusker/Screens/Large Image/LoadingLargeImageViewController.swift

@@ -1,120 +0,0 @@
-//  LoadingLargeImageViewController.swift
-//  Tusker
-//
-//  Created by Shadowfacts on 6/14/19.
-//  Copyright © 2019 Shadowfacts. All rights reserved.
-//
-
-import UIKit
-import Pachyderm
-
-class LoadingLargeImageViewController: UIViewController, LargeImageAnimatableViewController {
-
-    let url: URL
-    let cache: ImageCache
-    let imageDescription: String?
-
-    var largeImageVC: LargeImageViewController?
-    var loadingVC: LoadingViewController?
-    
-    var imageRequest: ImageCache.Request?
-    
-    private var initialControlsVisible: Bool = true
-    var controlsVisible: Bool {
-        get {
-            return largeImageVC?.controlsVisible ?? initialControlsVisible
-        }
-        set {
-            if let largeImageVC = largeImageVC {
-                largeImageVC.setControlsVisible(newValue, animated: false)
-            } else {
-                initialControlsVisible = newValue
-            }
-        }
-    }
-    
-    var shrinkGestureEnabled = true
-    
-    var animationSourceInfo: LargeImageViewController.SourceInfo?
-    var animationImage: UIImage? { animationSourceInfo?.image ?? largeImageVC?.image }
-    var animationGifData: Data? { largeImageVC?.gifData }
-    var dismissInteractionController: LargeImageInteractionController?
-    
-    override var prefersStatusBarHidden: Bool {
-        return true
-    }
-    override var childForHomeIndicatorAutoHidden: UIViewController? {
-        return largeImageVC
-    }
-    override var supportedInterfaceOrientations: UIInterfaceOrientationMask {
-        if UIDevice.current.userInterfaceIdiom == .phone {
-            return .allButUpsideDown
-        } else {
-            return .all
-        }
-    }
-    
-    init(url: URL, cache: ImageCache, imageDescription: String?) {
-        self.url = url
-        self.cache = cache
-        self.imageDescription = imageDescription
-        
-        super.init(nibName: nil, bundle: nil)
-        
-        modalPresentationStyle = .fullScreen
-    }
-    
-    convenience init(attachment: Attachment) {
-        self.init(url: attachment.url, cache: .attachments, imageDescription: attachment.description)
-    }
-    
-    required init?(coder: NSCoder) {
-        fatalError("init(coder:) has not been implemented")
-    }
-    
-    override func viewDidLoad() {
-        super.viewDidLoad()
-        
-        overrideUserInterfaceStyle = .dark
-        view.backgroundColor = .black
-        
-        if let data = cache.get(url) {
-            createLargeImage(data: data)
-        } else {
-            loadingVC = LoadingViewController()
-            embedChild(loadingVC!)
-            imageRequest = cache.get(url) { [weak self] (data) in
-                guard let self = self else { return }
-                self.imageRequest = nil
-                DispatchQueue.main.async {
-                    self.loadingVC?.removeViewAndController()
-                    self.createLargeImage(data: data!)
-                }
-            }
-        }
-        
-        if shrinkGestureEnabled {
-            dismissInteractionController = LargeImageInteractionController(viewController: self)
-        }
-    }
-    
-    override func didMove(toParent parent: UIViewController?) {
-        super.didMove(toParent: parent)
-        
-        if parent == nil {
-            imageRequest?.cancel()
-        }
-    }
-    
-    func createLargeImage(data: Data) {
-        guard let image = UIImage(data: data) else { return }
-        largeImageVC = LargeImageViewController(image: image, description: imageDescription, sourceInfo: nil)
-        largeImageVC!.initialControlsVisible = initialControlsVisible
-        largeImageVC!.shrinkGestureEnabled = false
-        if url.pathExtension == "gif" {
-            largeImageVC!.gifData = data
-        }
-        embedChild(largeImageVC!)
-    }
-    
-}

Tusker/Screens/Large Image/Transitions/LargeImageExpandAnimationController.swift

@@ -9,13 +9,6 @@
 import UIKit
 import Gifu
 
-protocol LargeImageAnimatableViewController: UIViewController {
-    var animationSourceInfo: LargeImageViewController.SourceInfo? { get }
-    var animationImage: UIImage? { get }
-    var animationGifData: Data? { get }
-    var dismissInteractionController: LargeImageInteractionController? { get }
-}
-
 class LargeImageExpandAnimationController: NSObject, UIViewControllerAnimatedTransitioning {
     
     func transitionDuration(using transitionContext: UIViewControllerContextTransitioning?) -> TimeInterval {
@@ -24,7 +17,7 @@ class LargeImageExpandAnimationController: NSObject, UIViewControllerAnimatedTra
     
     func animateTransition(using transitionContext: UIViewControllerContextTransitioning) {
         guard let fromVC = transitionContext.viewController(forKey: .from),
-            let toVC = transitionContext.viewController(forKey: .to) as? LargeImageAnimatableViewController else {
+            let toVC = transitionContext.viewController(forKey: .to) as? LargeImageViewController else {
                 return
         }
         
@@ -32,8 +25,8 @@ class LargeImageExpandAnimationController: NSObject, UIViewControllerAnimatedTra
         containerView.addSubview(toVC.view)
 
         let finalVCFrame = transitionContext.finalFrame(for: toVC)
-        guard let sourceInfo = toVC.animationSourceInfo,
+        guard let sourceInfo = toVC.sourceInfo,
-            let image = toVC.animationImage else {
+            let image = sourceInfo.image else {
                 toVC.view.frame = finalVCFrame
                 transitionContext.completeTransition(!transitionContext.transitionWasCancelled)
                 return
@@ -46,7 +39,7 @@ class LargeImageExpandAnimationController: NSObject, UIViewControllerAnimatedTra
         
         let imageView = GIFImageView(frame: sourceInfo.frame)
         imageView.image = image
-        if let gifData = toVC.animationGifData {
+        if let gifData = toVC.gifData {
             imageView.animate(withGIFData: gifData)
         }
         imageView.contentMode = .scaleAspectFill

Tusker/Screens/Large Image/Transitions/LargeImageShrinkAnimationController.swift

@@ -22,13 +22,13 @@ class LargeImageShrinkAnimationController: NSObject, UIViewControllerAnimatedTra
     }
     
     func animateTransition(using transitionContext: UIViewControllerContextTransitioning) {
-        guard let fromVC = transitionContext.viewController(forKey: .from) as? LargeImageAnimatableViewController,
+        guard let fromVC = transitionContext.viewController(forKey: .from) as? LargeImageViewController,
             let toVC = transitionContext.viewController(forKey: .to) else {
                 return
         }
         
-        guard let sourceInfo = fromVC.animationSourceInfo,
+        guard let sourceInfo = fromVC.sourceInfo,
-            let image = fromVC.animationImage else {
+            let image = fromVC.imageForDismissalAnimation() else {
                 transitionContext.completeTransition(!transitionContext.transitionWasCancelled)
                 return
         }
@@ -43,7 +43,7 @@ class LargeImageShrinkAnimationController: NSObject, UIViewControllerAnimatedTra
         
         let imageView = GIFImageView(frame: originalFrame)
         imageView.image = image
-        if let gifData = fromVC.animationGifData {
+        if let gifData = fromVC.gifData {
             imageView.animate(withGIFData: gifData)
         }
         imageView.contentMode = .scaleAspectFill

Tusker/TuskerNavigationDelegate.swift

@@ -44,10 +44,6 @@ protocol TuskerNavigationDelegate: class {
     
     func showLargeImage(gifData: Data, description: String?, animatingFrom sourceView: UIImageView)
     
-    func loadingLargeImage(url: URL, cache: ImageCache, description: String?, animatingFrom sourceView: UIImageView) -> LoadingLargeImageViewController
-    
-    func showLoadingLargeImage(url: URL, cache: ImageCache, description: String?, animatingFrom sourceView: UIImageView)
-    
     func gallery(attachments: [Attachment], sourceViews: [UIImageView?], startIndex: Int) -> GalleryViewController
     
     func showGallery(attachments: [Attachment], sourceViews: [UIImageView?], startIndex: Int)
@@ -187,17 +183,6 @@ extension TuskerNavigationDelegate where Self: UIViewController {
         present(largeImage(gifData: gifData, description: description, sourceView: sourceView), animated: true)
     }
     
-    func loadingLargeImage(url: URL, cache: ImageCache, description: String?, animatingFrom sourceView: UIImageView) -> LoadingLargeImageViewController {
-        let vc = LoadingLargeImageViewController(url: url, cache: cache, imageDescription: description)
-        vc.animationSourceInfo = sourceViewInfo(sourceView)
-        vc.transitioningDelegate = self
-        return vc
-    }
-    
-    func showLoadingLargeImage(url: URL, cache: ImageCache, description: String?, animatingFrom sourceView: UIImageView) {
-        present(loadingLargeImage(url: url, cache: cache, description: description, animatingFrom: sourceView), animated: true)
-    }
-    
     func gallery(attachments: [Attachment], sourceViews: [UIImageView?], startIndex: Int) -> GalleryViewController {
         let sourcesInfo = sourceViews.map(sourceViewInfo)
         let vc = GalleryViewController(attachments: attachments, sourcesInfo: sourcesInfo, startIndex: startIndex)

Tusker/Views/Profile Header/ProfileHeaderTableViewCell.swift

@@ -149,13 +149,11 @@ class ProfileHeaderTableViewCell: UITableViewCell {
     }
     
     @objc func avatarPressed() {
-        guard let account = mastodonController.cache.account(for: accountID) else { fatalError("Missing cached account \(accountID!)") }
+        delegate?.showLargeImage(avatarImageView.image!, description: nil, animatingFrom: avatarImageView)
-        delegate?.showLoadingLargeImage(url: account.avatar, cache: .avatars, description: nil, animatingFrom: avatarImageView)
     }
     
     @objc func headerPressed() {
-        guard let account = mastodonController.cache.account(for: accountID) else { fatalError("Missing cached account \(accountID!)") }
+        delegate?.showLargeImage(headerImageView.image!, description: nil, animatingFrom: headerImageView)
-        delegate?.showLoadingLargeImage(url: account.header, cache: .headers, description: nil, animatingFrom: headerImageView)
     }
     
 }

Tusker/Views/Status/BaseStatusTableViewCell.swift

@@ -191,7 +191,7 @@ class BaseStatusTableViewCell: UITableViewCell {
     }
     
     @objc func updateUIForPreferences() {
-        guard let mastodonController = mastodonController, let account = mastodonController.cache.account(for: accountID) else { return }
+        guard let account = mastodonController.cache.account(for: accountID) else { return }
         avatarImageView.layer.cornerRadius = Preferences.shared.avatarStyle.cornerRadius(for: avatarImageView)
         displayNameLabel.updateForAccountDisplayName(account: account)
         attachmentsView.contentHidden = Preferences.shared.blurAllMedia || (mastodonController.cache.status(for: statusID)?.sensitive ?? false)