Fix blurhash image being used as gallery content

Packages/GalleryVC/Sources/GalleryVC/GalleryDismissAnimationController.swift

@@ -43,9 +43,10 @@ class GalleryDismissAnimationController: NSObject, UIViewControllerAnimatedTrans
         let appliedSourceToDestTransform: Bool
         if destFrameInContainer.width > 0 && destFrameInContainer.height > 0 {
             appliedSourceToDestTransform = true
+            let scale = min(destFrameInContainer.width / sourceFrameInContainer.width, destFrameInContainer.height / sourceFrameInContainer.height)
             let sourceToDestTransform = origSourceTransform
                 .translatedBy(x: destFrameInContainer.midX - sourceFrameInContainer.midX, y: destFrameInContainer.midY - sourceFrameInContainer.midY)
-                .scaledBy(x: destFrameInContainer.width / sourceFrameInContainer.width, y: destFrameInContainer.height / sourceFrameInContainer.height)
+                .scaledBy(x: scale, y: scale)
             sourceView.transform = sourceToDestTransform
         } else {
             appliedSourceToDestTransform = false

Packages/GalleryVC/Sources/GalleryVC/GalleryItemViewController.swift

@@ -64,8 +64,7 @@ class GalleryItemViewController: UIViewController {
     override func viewDidLoad() {
         super.viewDidLoad()
         
-        let scrollView = UIScrollView()
+        scrollView = UIScrollView()
-        self.scrollView = scrollView
         scrollView.translatesAutoresizingMaskIntoConstraints = false
         scrollView.delegate = self
         
@@ -91,7 +90,9 @@ class GalleryItemViewController: UIViewController {
         topControlsView.translatesAutoresizingMaskIntoConstraints = false
         view.addSubview(topControlsView)
         
-        var shareConfig = UIButton.Configuration.plain()
+        var shareConfig = UIButton.Configuration.gray()
+        shareConfig.cornerStyle = .capsule
+        shareConfig.background.backgroundColor = .black.withAlphaComponent(0.25)
         shareConfig.baseForegroundColor = .white
         shareConfig.image = UIImage(systemName: "square.and.arrow.up")
         shareButton = UIButton(configuration: shareConfig)
@@ -100,7 +101,9 @@ class GalleryItemViewController: UIViewController {
         updateShareButton()
         topControlsView.addSubview(shareButton)
         
-        var closeConfig = UIButton.Configuration.plain()
+        var closeConfig = UIButton.Configuration.gray()
+        closeConfig.cornerStyle = .capsule
+        closeConfig.background.backgroundColor = .black.withAlphaComponent(0.25)
         closeConfig.baseForegroundColor = .white
         closeConfig.image = UIImage(systemName: "xmark")
         let closeButton = UIButton(configuration: closeConfig)
@@ -288,8 +291,8 @@ class GalleryItemViewController: UIViewController {
             return
         }
         
-        let heightScale = view.safeAreaLayoutGuide.layoutFrame.height / content.contentSize.height
+        let heightScale = view.bounds.height / content.contentSize.height
-        let widthScale = view.safeAreaLayoutGuide.layoutFrame.width / content.contentSize.width
+        let widthScale = view.bounds.width / content.contentSize.width
         let minScale = min(widthScale, heightScale)
         let maxScale = minScale >= 1 ? minScale + 2 : 2
         

Packages/GalleryVC/Sources/GalleryVC/GalleryPresentationAnimationController.swift

@@ -49,9 +49,11 @@ class GalleryPresentationAnimationController: NSObject, UIViewControllerAnimated
         let origSourceTransform = sourceView.transform
         let sourceToDestTransform: CGAffineTransform?
         if destFrameInContainer.width > 0 && destFrameInContainer.height > 0 {
+            // Scale evenly in both dimensions, to prevent the source view appearing to stretch/distort during the animation.
+            let scale = min(destFrameInContainer.width / sourceFrameInContainer.width, destFrameInContainer.height / sourceFrameInContainer.height)
             sourceToDestTransform = origSourceTransform
                 .translatedBy(x: destFrameInContainer.midX - sourceFrameInContainer.midX, y: destFrameInContainer.midY - sourceFrameInContainer.midY)
-                .scaledBy(x: destFrameInContainer.width / sourceFrameInContainer.width, y: destFrameInContainer.height / sourceFrameInContainer.height)
+                .scaledBy(x: scale, y: scale)
         } else {
             sourceToDestTransform = nil
         }
@@ -59,9 +61,17 @@ class GalleryPresentationAnimationController: NSObject, UIViewControllerAnimated
         let content = itemViewController.takeContent()
         content.view.translatesAutoresizingMaskIntoConstraints = true
         
-        container.addSubview(to.view)
+        // Use a separate dimming view from to.view, so that the gallery controls can be in front of the moving content.
-        container.addSubview(content.view)
+        let dimmingView = UIView()
+        dimmingView.backgroundColor = .black
+        dimmingView.frame = container.bounds
+        dimmingView.layer.opacity = 0
         
+        container.addSubview(dimmingView)
+        container.addSubview(content.view)
+        container.addSubview(to.view)
+
+        to.view.backgroundColor = nil
         to.view.layer.opacity = 0
         content.view.frame = sourceFrameInContainer
         content.view.layer.opacity = 0
@@ -77,6 +87,8 @@ class GalleryPresentationAnimationController: NSObject, UIViewControllerAnimated
         let animator = UIViewPropertyAnimator(duration: duration, timingParameters: spring)
         
         animator.addAnimations {
+            dimmingView.layer.opacity = 1
+            
             to.view.layer.opacity = 1
             
             content.view.frame = destFrameInContainer
@@ -90,6 +102,8 @@ class GalleryPresentationAnimationController: NSObject, UIViewControllerAnimated
         }
         
         animator.addCompletion { _ in
+            to.view.backgroundColor = .black
+            
             if sourceToDestTransform != nil {
                 self.sourceView.transform = origSourceTransform
             }

Tusker/Screens/Gallery/ImageGalleryContentViewController.swift

@@ -57,7 +57,7 @@ class ImageGalleryContentViewController: UIViewController, GalleryContentViewCon
         
         imageView = GIFImageView(image: maybeGrayscaleImage)
         imageView.translatesAutoresizingMaskIntoConstraints = false
-        imageView.contentMode = .scaleAspectFit
+        imageView.contentMode = .scaleAspectFill
         imageView.isUserInteractionEnabled = true
         view.addSubview(imageView)
         NSLayoutConstraint.activate([

Tusker/Screens/Gallery/StatusAttachmentsGalleryDataSource.swift

@@ -30,7 +30,7 @@ class StatusAttachmentsGalleryDataSource: GalleryDataSource {
         switch attachment.kind {
         case .image:
             if let view = attachmentView(for: attachment),
-               let image = view.image {
+               let image = view.attachmentImage {
                 return ImageGalleryContentViewController(
                     url: attachment.url,
                     caption: attachment.description,

Tusker/Views/Attachments/AttachmentView.swift

@@ -32,6 +32,16 @@ class AttachmentView: GIFImageView {
     
     private var loadAttachmentTask: Task<Void, Never>?
     private var source: Source?
+    var attachmentImage: UIImage? {
+        switch source {
+        case .image(_, _, let image):
+            return image
+        case .gifData(_, _, let image):
+            return image
+        case nil:
+            return nil
+        }
+    }
     var originalData: Data? {
         switch source {
         case .image(_, let data, _):