Fix previewing video/audio attachments

Masking the container makes context menu interactions look weird

Tusker.xcodeproj/project.pbxproj

@@ -117,6 +117,7 @@
 		D646C956213B365700269FB5 /* LargeImageExpandAnimationController.swift in Sources */ = {isa = PBXBuildFile; fileRef = D646C955213B365700269FB5 /* LargeImageExpandAnimationController.swift */; };
 		D646C958213B367000269FB5 /* LargeImageShrinkAnimationController.swift in Sources */ = {isa = PBXBuildFile; fileRef = D646C957213B367000269FB5 /* LargeImageShrinkAnimationController.swift */; };
 		D646C95A213B5D0500269FB5 /* LargeImageInteractionController.swift in Sources */ = {isa = PBXBuildFile; fileRef = D646C959213B5D0500269FB5 /* LargeImageInteractionController.swift */; };
+		D647D92824257BEB0005044F /* AttachmentPreviewViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = D647D92724257BEB0005044F /* AttachmentPreviewViewController.swift */; };
 		D64BC18623C1253A000D0238 /* AssetPreviewViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = D64BC18523C1253A000D0238 /* AssetPreviewViewController.swift */; };
 		D64BC18823C1640A000D0238 /* PinStatusActivity.swift in Sources */ = {isa = PBXBuildFile; fileRef = D64BC18723C1640A000D0238 /* PinStatusActivity.swift */; };
 		D64BC18A23C16487000D0238 /* UnpinStatusActivity.swift in Sources */ = {isa = PBXBuildFile; fileRef = D64BC18923C16487000D0238 /* UnpinStatusActivity.swift */; };
@@ -398,6 +399,7 @@
 		D646C955213B365700269FB5 /* LargeImageExpandAnimationController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LargeImageExpandAnimationController.swift; sourceTree = "<group>"; };
 		D646C957213B367000269FB5 /* LargeImageShrinkAnimationController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LargeImageShrinkAnimationController.swift; sourceTree = "<group>"; };
 		D646C959213B5D0500269FB5 /* LargeImageInteractionController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LargeImageInteractionController.swift; sourceTree = "<group>"; };
+		D647D92724257BEB0005044F /* AttachmentPreviewViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AttachmentPreviewViewController.swift; sourceTree = "<group>"; };
 		D64BC18523C1253A000D0238 /* AssetPreviewViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AssetPreviewViewController.swift; sourceTree = "<group>"; };
 		D64BC18723C1640A000D0238 /* PinStatusActivity.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PinStatusActivity.swift; sourceTree = "<group>"; };
 		D64BC18923C16487000D0238 /* UnpinStatusActivity.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = UnpinStatusActivity.swift; sourceTree = "<group>"; };
@@ -570,6 +572,7 @@
 			isa = PBXGroup;
 			children = (
 				04D14BAE22B34A2800642648 /* GalleryViewController.swift */,
+				D647D92724257BEB0005044F /* AttachmentPreviewViewController.swift */,
 			);
 			path = "Attachment Gallery";
 			sourceTree = "<group>";
@@ -1698,6 +1701,7 @@
 				04586B4322B301470021BD04 /* AppearancePrefsView.swift in Sources */,
 				D67C57AF21E28EAD00C3118B /* Array+Uniques.swift in Sources */,
 				D6945C3223AC4D36005C403C /* HashtagTimelineViewController.swift in Sources */,
+				D647D92824257BEB0005044F /* AttachmentPreviewViewController.swift in Sources */,
 				D66362752137068A00C9CBA2 /* Visibility+Helpers.swift in Sources */,
 				D6C693FC2162FE6F007D6A6D /* LoadingViewController.swift in Sources */,
 				D646C95A213B5D0500269FB5 /* LargeImageInteractionController.swift in Sources */,

Tusker/Screens/Attachment Gallery/AttachmentPreviewViewController.swift

@@ -0,0 +1,46 @@
+//
+//  AttachmentPreviewViewController.swift
+//  Tusker
+//
+//  Created by Shadowfacts on 3/20/20.
+//  Copyright © 2020 Shadowfacts. All rights reserved.
+//
+
+import UIKit
+import Pachyderm
+import Gifu
+
+class AttachmentPreviewViewController: UIViewController {
+
+    let attachment: Attachment
+
+    init(attachment: Attachment) {
+        self.attachment = attachment
+
+        super.init(nibName: nil, bundle: nil)
+    }
+    
+    required init?(coder: NSCoder) {
+        fatalError("init(coder:) has not been implemented")
+    }
+    
+    override func loadView() {
+        if let data = ImageCache.attachments.get(attachment.url),
+            let image = UIImage(data: data) {
+            let imageView: UIImageView
+            if attachment.url.pathExtension == "gif" {
+                let gifView = GIFImageView(image: image)
+                gifView.animate(withGIFData: data)
+                imageView = gifView
+            } else {
+                imageView = UIImageView(image: image)
+            }
+            imageView.contentMode = .scaleAspectFit
+            imageView.backgroundColor = .black
+            view = imageView
+            preferredContentSize = image.size
+        } else {
+            view = UIActivityIndicatorView(style: .large)
+        }
+    }
+}

Tusker/Screens/Utilities/EnhancedTableViewController.swift

@@ -72,8 +72,8 @@ extension EnhancedTableViewController {
         if let viewController = animator.previewViewController {
             animator.preferredCommitStyle = .pop
             animator.addCompletion {
-                if viewController is LargeImageViewController || viewController is GalleryViewController || viewController is SFSafariViewController {
+                if let customPresenting = viewController as? CustomPreviewPresenting {
-                    self.present(viewController, animated: true)
+                    customPresenting.presentFromPreview(presenter: self)
                 } else {
                     self.show(viewController, sender: nil)
                 }

Tusker/Screens/Utilities/Previewing.swift

@@ -20,6 +20,10 @@ protocol MenuPreviewProvider {
     
 }
 
+protocol CustomPreviewPresenting {
+    func presentFromPreview(presenter: UIViewController)
+}
+
 extension MenuPreviewProvider {
     
     private var mastodonController: MastodonController? { navigationDelegate?.apiController }
@@ -76,3 +80,21 @@ extension MenuPreviewProvider {
     }
     
 }
+
+extension LargeImageViewController: CustomPreviewPresenting {
+    func presentFromPreview(presenter: UIViewController) {
+        presenter.present(self, animated: true)
+    }
+}
+
+extension GalleryViewController: CustomPreviewPresenting {
+    func presentFromPreview(presenter: UIViewController) {
+        presenter.present(self, animated: true)
+    }
+}
+
+extension SFSafariViewController: CustomPreviewPresenting {
+    func presentFromPreview(presenter: UIViewController) {
+        presenter.present(self, animated: true)
+    }
+}

Tusker/Views/Attachments/AttachmentView.swift

@@ -12,7 +12,8 @@ import Gifu
 import AVFoundation
 
 protocol AttachmentViewDelegate: class {
-    func showAttachmentsGallery(startingAt index: Int)
+    func attachmentViewGallery(startingAt index: Int) -> UIViewController
+    func attachmentViewPresent(_ vc: UIViewController, animated: Bool)
 }
 
 class AttachmentView: UIImageView, GIFAnimatable {
@@ -55,6 +56,8 @@ class AttachmentView: UIImageView, GIFAnimatable {
         addGestureRecognizer(UITapGestureRecognizer(target: self, action: #selector(imagePressed)))
         
         NotificationCenter.default.addObserver(self, selector: #selector(preferencesChanged), name: .preferencesChanged, object: nil)
+        
+        addInteraction(UIContextMenuInteraction(delegate: self))
     }
     
     @objc func preferencesChanged() {
@@ -151,8 +154,37 @@ class AttachmentView: UIImageView, GIFAnimatable {
         updateImageIfNeeded()
     }
     
+    func showGallery() {
+        if let delegate = delegate {
+            let gallery = delegate.attachmentViewGallery(startingAt: index)
+            delegate.attachmentViewPresent(gallery, animated: true)
+        }
+    }
+    
     @objc func imagePressed() {
-        delegate?.showAttachmentsGallery(startingAt: index)
+        showGallery()
     }
 
 }
+
+extension AttachmentView: UIContextMenuInteractionDelegate {
+    func contextMenuInteraction(_ interaction: UIContextMenuInteraction, configurationForMenuAtLocation location: CGPoint) -> UIContextMenuConfiguration? {
+        return UIContextMenuConfiguration(identifier: nil, previewProvider: { () -> UIViewController? in
+            if self.attachment.kind == .image {
+                return AttachmentPreviewViewController(attachment: self.attachment)
+            } else {
+                return self.delegate?.attachmentViewGallery(startingAt: self.index)
+            }
+        }, actionProvider: nil)
+    }
+    func contextMenuInteraction(_ interaction: UIContextMenuInteraction, willPerformPreviewActionForMenuWith configuration: UIContextMenuConfiguration, animator: UIContextMenuInteractionCommitAnimating) {
+        animator.addCompletion {
+            animator.preferredCommitStyle = .pop
+            if let gallery = animator.previewViewController as? GalleryViewController {
+                self.delegate?.attachmentViewPresent(gallery, animated: true)
+            } else {
+                self.showGallery()
+            }
+        }
+    }
+}

Tusker/Views/Attachments/AttachmentsContainerView.swift

@@ -64,12 +64,20 @@ class AttachmentsContainerView: UIView {
             switch attachments.count {
             case 1:
                 let attachmentView = createAttachmentView(index: 0)
+                attachmentView.layer.cornerRadius = 5
+                attachmentView.layer.masksToBounds = true
                 fillView(attachmentView)
                 sendSubviewToBack(attachmentView)
                 accessibilityElements.append(attachmentView)
             case 2:
                 let left = createAttachmentView(index: 0)
+                left.layer.cornerRadius = 5
+                left.layer.maskedCorners = [.layerMinXMinYCorner, .layerMinXMaxYCorner]
+                left.layer.masksToBounds = true
                 let right = createAttachmentView(index: 1)
+                right.layer.cornerRadius = 5
+                right.layer.maskedCorners = [.layerMaxXMinYCorner, .layerMaxXMaxYCorner]
+                right.layer.masksToBounds = true
                 let stack = createAttachmentsStack(axis: .horizontal, arrangedSubviews: [
                     left,
                     right
@@ -83,8 +91,17 @@ class AttachmentsContainerView: UIView {
                 accessibilityElements.append(right)
             case 3:
                 let left = createAttachmentView(index: 0)
+                left.layer.cornerRadius = 5
+                left.layer.maskedCorners = [.layerMinXMinYCorner, .layerMinXMaxYCorner]
+                left.layer.masksToBounds = true
                 let topRight = createAttachmentView(index: 1)
+                topRight.layer.cornerRadius = 5
+                topRight.layer.maskedCorners = .layerMaxXMinYCorner
+                topRight.layer.masksToBounds = true
                 let bottomRight = createAttachmentView(index: 2)
+                bottomRight.layer.cornerRadius = 5
+                bottomRight.layer.maskedCorners = .layerMaxXMaxYCorner
+                bottomRight.layer.masksToBounds = true
                 let outerStack = createAttachmentsStack(axis: .horizontal, arrangedSubviews: [
                     left,
                     createAttachmentsStack(axis: .vertical, arrangedSubviews: [
@@ -103,13 +120,25 @@ class AttachmentsContainerView: UIView {
                 accessibilityElements.append(bottomRight)
             case 4:
                 let topLeft = createAttachmentView(index: 0)
+                topLeft.layer.cornerRadius = 5
+                topLeft.layer.maskedCorners = .layerMinXMinYCorner
+                topLeft.layer.masksToBounds = true
                 let bottomLeft = createAttachmentView(index: 2)
+                bottomLeft.layer.cornerRadius = 5
+                bottomLeft.layer.maskedCorners = .layerMinXMaxYCorner
+                bottomLeft.layer.masksToBounds = true
                 let left = createAttachmentsStack(axis: .vertical, arrangedSubviews: [
                     topLeft,
                     bottomLeft
                 ])
                 let topRight = createAttachmentView(index: 1)
+                topRight.layer.cornerRadius = 5
+                topRight.layer.maskedCorners = .layerMaxXMinYCorner
+                topRight.layer.masksToBounds = true
                 let bottomRight = createAttachmentView(index: 3)
+                bottomRight.layer.cornerRadius = 5
+                bottomRight.layer.maskedCorners = .layerMaxXMaxYCorner
+                bottomRight.layer.masksToBounds = true
                 let outerStack = createAttachmentsStack(axis: .horizontal, arrangedSubviews: [
                     left,
                     createAttachmentsStack(axis: .vertical, arrangedSubviews: [
@@ -135,6 +164,9 @@ class AttachmentsContainerView: UIView {
                 moreView.translatesAutoresizingMaskIntoConstraints = false
                 moreView.isUserInteractionEnabled = true
                 moreView.addGestureRecognizer(UITapGestureRecognizer(target: self, action: #selector(moreViewTapped)))
+                moreView.layer.cornerRadius = 5
+                moreView.layer.maskedCorners = .layerMaxXMaxYCorner
+                moreView.layer.masksToBounds = true
                 let moreLabel = UILabel()
                 moreLabel.text = "\(attachments.count - 3) more..."
                 moreLabel.textColor = .secondaryLabel
@@ -144,12 +176,21 @@ class AttachmentsContainerView: UIView {
                 moreView.accessibilityLabel = moreLabel.text
 
                 let topLeft = createAttachmentView(index: 0)
+                topLeft.layer.cornerRadius = 5
+                topLeft.layer.maskedCorners = .layerMinXMinYCorner
+                topLeft.layer.masksToBounds = true
                 let bottomLeft = createAttachmentView(index: 2)
+                bottomLeft.layer.cornerRadius = 5
+                bottomLeft.layer.maskedCorners = .layerMinXMaxYCorner
+                bottomLeft.layer.masksToBounds = true
                 let left = createAttachmentsStack(axis: .vertical, arrangedSubviews: [
                     topLeft,
                     bottomLeft
                 ])
                 let topRight = createAttachmentView(index: 1)
+                topRight.layer.cornerRadius = 5
+                topRight.layer.maskedCorners = .layerMaxXMinYCorner
+                topRight.layer.masksToBounds = true
                 let outerStack = createAttachmentsStack(axis: .horizontal, arrangedSubviews: [
                     left,
                     createAttachmentsStack(axis: .vertical, arrangedSubviews: [
@@ -325,7 +366,10 @@ class AttachmentsContainerView: UIView {
     @objc func moreViewTapped() {
         guard attachments.count > 4 else { return }
         // the more view shows up in place of the fourth attachemtn view, show tapping it should start at the fourth attachment
-        delegate?.showAttachmentsGallery(startingAt: 3)
+        if let delegate = delegate {
+            let gallery = delegate.attachmentViewGallery(startingAt: 3)
+            delegate.attachmentViewPresent(gallery, animated: true)
+        }
     }
 
 }

Tusker/Views/Status/BaseStatusTableViewCell.swift

@@ -84,8 +84,6 @@ class BaseStatusTableViewCell: UITableViewCell {
         avatarImageView.layer.masksToBounds = true
     
         attachmentsView.delegate = self
-        attachmentsView.layer.cornerRadius = 5
-        attachmentsView.layer.masksToBounds = true
         
         collapseButton.layer.masksToBounds = true
         collapseButton.layer.cornerRadius = 5
@@ -312,10 +310,14 @@ class BaseStatusTableViewCell: UITableViewCell {
 }
 
 extension BaseStatusTableViewCell: AttachmentViewDelegate {
-    func showAttachmentsGallery(startingAt index: Int) {
+    func attachmentViewGallery(startingAt index: Int) -> UIViewController {
         guard let status = mastodonController.cache.status(for: statusID) else { fatalError("Missing cached status \(statusID!)") }
         let sourceViews = status.attachments.map(attachmentsView.getAttachmentView(for:))
-        delegate?.showGallery(attachments: status.attachments, sourceViews: sourceViews, startIndex: index)
+        return delegate!.gallery(attachments: status.attachments, sourceViews: sourceViews, startIndex: index)
+    }
+    
+    func attachmentViewPresent(_ vc: UIViewController, animated: Bool) {
+        delegate?.show(vc)
     }
 }
 
@@ -329,19 +331,6 @@ extension BaseStatusTableViewCell: MenuPreviewProvider {
                 content: { ProfileTableViewController(accountID: self.accountID, mastodonController: mastodonController) },
                 actions: { self.actionsForProfile(accountID: self.accountID, sourceView: self.avatarImageView) }
             )
-        } else if attachmentsView.frame.contains(location) {
-            let attachmentsViewLocation = attachmentsView.convert(location, from: self)
-            if let attachmentView = attachmentsView.attachmentViews.allObjects.first(where: { $0.frame.contains(attachmentsViewLocation) }) {
-                return (
-                    content: {
-                        let attachments = self.attachmentsView.attachments!
-                        let sourceViews = attachments.map(self.attachmentsView.getAttachmentView(for:))
-                        let startIndex = sourceViews.firstIndex(of: attachmentView)!
-                        return self.delegate?.gallery(attachments: attachments, sourceViews: sourceViews, startIndex: startIndex)
-                    },
-                    actions: { [] }
-                )
-            }
         }
         return self.getStatusCellPreviewProviders(for: location, sourceViewController: sourceViewController)
     }