Add complete emoji list to Compose emoji autocomplete

Prevents a crash due a race condition if multiple requets complete
simultaneously and attempt to modify the dictionary

Tusker.xcodeproj/project.pbxproj

@@ -140,7 +140,7 @@
 		D64BC19223C271D9000D0238 /* MastodonActivity.swift in Sources */ = {isa = PBXBuildFile; fileRef = D64BC19123C271D9000D0238 /* MastodonActivity.swift */; };
 		D64D0AAD2128D88B005A6F37 /* LocalData.swift in Sources */ = {isa = PBXBuildFile; fileRef = D64D0AAC2128D88B005A6F37 /* LocalData.swift */; };
 		D64D0AB12128D9AE005A6F37 /* OnboardingViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = D64D0AB02128D9AE005A6F37 /* OnboardingViewController.swift */; };
-		D64D8CA92463B494006B0BAA /* CachedDictionary.swift in Sources */ = {isa = PBXBuildFile; fileRef = D64D8CA82463B494006B0BAA /* CachedDictionary.swift */; };
+		D64D8CA92463B494006B0BAA /* MultiThreadDictionary.swift in Sources */ = {isa = PBXBuildFile; fileRef = D64D8CA82463B494006B0BAA /* MultiThreadDictionary.swift */; };
 		D64F80E2215875CC00BEF393 /* XCBActionType.swift in Sources */ = {isa = PBXBuildFile; fileRef = D64F80E1215875CC00BEF393 /* XCBActionType.swift */; };
 		D6531DEE246B81C9000F9538 /* GifvAttachmentView.swift in Sources */ = {isa = PBXBuildFile; fileRef = D6531DED246B81C9000F9538 /* GifvAttachmentView.swift */; };
 		D6531DF0246B867E000F9538 /* GifvAttachmentViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = D6531DEF246B867E000F9538 /* GifvAttachmentViewController.swift */; };
@@ -160,6 +160,7 @@
 		D667E5F52135BCD50057A976 /* ConversationTableViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = D667E5F42135BCD50057A976 /* ConversationTableViewController.swift */; };
 		D667E5F82135C3040057A976 /* Mastodon+Equatable.swift in Sources */ = {isa = PBXBuildFile; fileRef = D667E5F72135C3040057A976 /* Mastodon+Equatable.swift */; };
 		D66A77BB233838DC0058F1EC /* UIFont+Traits.swift in Sources */ = {isa = PBXBuildFile; fileRef = D66A77BA233838DC0058F1EC /* UIFont+Traits.swift */; };
+		D670F8B62537DC890046588A /* EmojiPickerWrapper.swift in Sources */ = {isa = PBXBuildFile; fileRef = D670F8B52537DC890046588A /* EmojiPickerWrapper.swift */; };
 		D6757A7C2157E01900721E32 /* XCBManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = D6757A7B2157E01900721E32 /* XCBManager.swift */; };
 		D6757A7E2157E02600721E32 /* XCBRequestSpec.swift in Sources */ = {isa = PBXBuildFile; fileRef = D6757A7D2157E02600721E32 /* XCBRequestSpec.swift */; };
 		D6757A822157E8FA00721E32 /* XCBSession.swift in Sources */ = {isa = PBXBuildFile; fileRef = D6757A812157E8FA00721E32 /* XCBSession.swift */; };
@@ -239,6 +240,8 @@
 		D6BC9DDA232D8BE5002CA326 /* SearchResultsViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = D6BC9DD9232D8BE5002CA326 /* SearchResultsViewController.swift */; };
 		D6BED174212667E900F02DA0 /* TimelineStatusTableViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = D6BED173212667E900F02DA0 /* TimelineStatusTableViewCell.swift */; };
 		D6C143DA253510F4007DC240 /* ComposeContentWarningTextField.swift in Sources */ = {isa = PBXBuildFile; fileRef = D6C143D9253510F4007DC240 /* ComposeContentWarningTextField.swift */; };
+		D6C143E025354E34007DC240 /* EmojiPickerCollectionViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = D6C143DF25354E34007DC240 /* EmojiPickerCollectionViewController.swift */; };
+		D6C143FD25354FD0007DC240 /* EmojiCollectionViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = D6C143FB25354FD0007DC240 /* EmojiCollectionViewCell.swift */; };
 		D6C693EF216192C2007D6A6D /* TuskerNavigationDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = D6C693EE216192C2007D6A6D /* TuskerNavigationDelegate.swift */; };
 		D6C693FC2162FE6F007D6A6D /* LoadingViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = D6C693FB2162FE6F007D6A6D /* LoadingViewController.swift */; };
 		D6C693FE2162FEEA007D6A6D /* UIViewController+Children.swift in Sources */ = {isa = PBXBuildFile; fileRef = D6C693FD2162FEEA007D6A6D /* UIViewController+Children.swift */; };
@@ -471,7 +474,7 @@
 		D64BC19123C271D9000D0238 /* MastodonActivity.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MastodonActivity.swift; sourceTree = "<group>"; };
 		D64D0AAC2128D88B005A6F37 /* LocalData.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LocalData.swift; sourceTree = "<group>"; };
 		D64D0AB02128D9AE005A6F37 /* OnboardingViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = OnboardingViewController.swift; sourceTree = "<group>"; };
-		D64D8CA82463B494006B0BAA /* CachedDictionary.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CachedDictionary.swift; sourceTree = "<group>"; };
+		D64D8CA82463B494006B0BAA /* MultiThreadDictionary.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MultiThreadDictionary.swift; sourceTree = "<group>"; };
 		D64F80E1215875CC00BEF393 /* XCBActionType.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = XCBActionType.swift; sourceTree = "<group>"; };
 		D6531DED246B81C9000F9538 /* GifvAttachmentView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = GifvAttachmentView.swift; sourceTree = "<group>"; };
 		D6531DEF246B867E000F9538 /* GifvAttachmentViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = GifvAttachmentViewController.swift; sourceTree = "<group>"; };
@@ -495,6 +498,7 @@
 		D667E5F42135BCD50057A976 /* ConversationTableViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ConversationTableViewController.swift; sourceTree = "<group>"; };
 		D667E5F72135C3040057A976 /* Mastodon+Equatable.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "Mastodon+Equatable.swift"; sourceTree = "<group>"; };
 		D66A77BA233838DC0058F1EC /* UIFont+Traits.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "UIFont+Traits.swift"; sourceTree = "<group>"; };
+		D670F8B52537DC890046588A /* EmojiPickerWrapper.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = EmojiPickerWrapper.swift; sourceTree = "<group>"; };
 		D6757A7B2157E01900721E32 /* XCBManager.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = XCBManager.swift; sourceTree = "<group>"; };
 		D6757A7D2157E02600721E32 /* XCBRequestSpec.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = XCBRequestSpec.swift; sourceTree = "<group>"; };
 		D6757A812157E8FA00721E32 /* XCBSession.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = XCBSession.swift; sourceTree = "<group>"; };
@@ -569,6 +573,8 @@
 		D6BC9DD9232D8BE5002CA326 /* SearchResultsViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SearchResultsViewController.swift; sourceTree = "<group>"; };
 		D6BED173212667E900F02DA0 /* TimelineStatusTableViewCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TimelineStatusTableViewCell.swift; sourceTree = "<group>"; };
 		D6C143D9253510F4007DC240 /* ComposeContentWarningTextField.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ComposeContentWarningTextField.swift; sourceTree = "<group>"; };
+		D6C143DF25354E34007DC240 /* EmojiPickerCollectionViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = EmojiPickerCollectionViewController.swift; sourceTree = "<group>"; };
+		D6C143FB25354FD0007DC240 /* EmojiCollectionViewCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = EmojiCollectionViewCell.swift; sourceTree = "<group>"; };
 		D6C693EE216192C2007D6A6D /* TuskerNavigationDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TuskerNavigationDelegate.swift; sourceTree = "<group>"; };
 		D6C693FB2162FE6F007D6A6D /* LoadingViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LoadingViewController.swift; sourceTree = "<group>"; };
 		D6C693FD2162FEEA007D6A6D /* UIViewController+Children.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "UIViewController+Children.swift"; sourceTree = "<group>"; };
@@ -1007,6 +1013,9 @@
 				D62275A724F1CA2800B82A16 /* ComposeReplyContentView.swift */,
 				D6E4267625327FB400C02E1C /* ComposeAutocompleteView.swift */,
 				D6C143D9253510F4007DC240 /* ComposeContentWarningTextField.swift */,
+				D6C143DF25354E34007DC240 /* EmojiPickerCollectionViewController.swift */,
+				D6C143FB25354FD0007DC240 /* EmojiCollectionViewCell.swift */,
+				D670F8B52537DC890046588A /* EmojiPickerWrapper.swift */,
 			);
 			path = Compose;
 			sourceTree = "<group>";
@@ -1360,7 +1369,7 @@
 				D6945C2E23AC47C3005C403C /* SavedDataManager.swift */,
 				D6C693EE216192C2007D6A6D /* TuskerNavigationDelegate.swift */,
 				D6DFC69F242C4CCC00ACC392 /* WeakArray.swift */,
-				D64D8CA82463B494006B0BAA /* CachedDictionary.swift */,
+				D64D8CA82463B494006B0BAA /* MultiThreadDictionary.swift */,
 				D60E2F2B24423EAD005F8713 /* LazilyDecoding.swift */,
 				D6CA6A91249FAD8900AD45C1 /* AudioSessionHelper.swift */,
 				D6E4269C2532A3E100C02E1C /* FuzzyMatcher.swift */,
@@ -1815,6 +1824,7 @@
 				D68E525B24A3D77E0054355A /* TuskerRootViewController.swift in Sources */,
 				D62D2422217AA7E1005076CC /* UserActivityManager.swift in Sources */,
 				D6CA6A92249FAD8900AD45C1 /* AudioSessionHelper.swift in Sources */,
+				D6C143FD25354FD0007DC240 /* EmojiCollectionViewCell.swift in Sources */,
 				D60D2B8223844C71001B87A3 /* BaseStatusTableViewCell.swift in Sources */,
 				D60E2F272442372B005F8713 /* StatusMO.swift in Sources */,
 				D60E2F2C24423EAD005F8713 /* LazilyDecoding.swift in Sources */,
@@ -1829,6 +1839,7 @@
 				D667E5F82135C3040057A976 /* Mastodon+Equatable.swift in Sources */,
 				D681E4D5246E2BC30053414F /* UnmuteConversationActivity.swift in Sources */,
 				D6B4A4FF2506B81A000C81C1 /* AccountDisplayNameLabel.swift in Sources */,
+				D6C143E025354E34007DC240 /* EmojiPickerCollectionViewController.swift in Sources */,
 				D6B053A623BD2D0C00A066FA /* AssetCollectionViewController.swift in Sources */,
 				D67B506D250B291200FAECFB /* BlurHashDecode.swift in Sources */,
 				D62275A024F1677200B82A16 /* ComposeHostingController.swift in Sources */,
@@ -1906,6 +1917,7 @@
 				D627FF76217E923E00CC0648 /* DraftsManager.swift in Sources */,
 				D64F80E2215875CC00BEF393 /* XCBActionType.swift in Sources */,
 				04586B4322B301470021BD04 /* AppearancePrefsView.swift in Sources */,
+				D670F8B62537DC890046588A /* EmojiPickerWrapper.swift in Sources */,
 				D67C57AF21E28EAD00C3118B /* Array+Uniques.swift in Sources */,
 				D6945C3223AC4D36005C403C /* HashtagTimelineViewController.swift in Sources */,
 				D647D92824257BEB0005044F /* AttachmentPreviewViewController.swift in Sources */,
@@ -1928,7 +1940,7 @@
 				D641C773213CAA25004B4513 /* NotificationsTableViewController.swift in Sources */,
 				D6412B0524B0227D00F5412E /* ProfileViewController.swift in Sources */,
 				D64BC18A23C16487000D0238 /* UnpinStatusActivity.swift in Sources */,
-				D64D8CA92463B494006B0BAA /* CachedDictionary.swift in Sources */,
+				D64D8CA92463B494006B0BAA /* MultiThreadDictionary.swift in Sources */,
 				D6757A7C2157E01900721E32 /* XCBManager.swift in Sources */,
 				D6F1F84D2193B56E00F5FE67 /* Cache.swift in Sources */,
 				D6F0B12B24A3071C001E48C3 /* MainSplitViewController.swift in Sources */,

Tusker/CachedDictionary.swift

@@ -1,35 +0,0 @@
-//
-//  CachedDictionary.swift
-//  Tusker
-//
-//  Created by Shadowfacts on 5/6/20.
-//  Copyright © 2020 Shadowfacts. All rights reserved.
-//
-
-import Foundation
-
-class CachedDictionary<Value> {
-    private let name: String
-    private var dict = [String: Value]()
-    private let queue: DispatchQueue
-    
-    init(name: String) {
-        self.name = name
-        self.queue = DispatchQueue(label: "CachedDictionary (\(name)) Coordinator", attributes: .concurrent)
-    }
-    
-    subscript(key: String) -> Value? {
-        get {
-            var result: Value? = nil
-            queue.sync {
-                result = dict[key]
-            }
-            return result
-        }
-        set(value) {
-            queue.async(flags: .barrier) {
-                self.dict[key] = value
-            }
-        }
-    }
-}

Tusker/Caching/ImageCache.swift

@@ -24,7 +24,9 @@ class ImageCache {
 
     private let cache: Cache<Data>
     
-    private var groups = [URL: RequestGroup]()
+    private var groups = MultiThreadDictionary<URL, RequestGroup>(name: "ImageCache request groups")
+    
+    private var backgroundQueue = DispatchQueue(label: "ImageCache completion queue", qos: .default)
     
     init(name: String, memoryExpiry expiry: Expiry) {
         let storage = MemoryStorage<Data>(config: MemoryConfig(expiry: expiry))
@@ -45,8 +47,14 @@ class ImageCache {
     func get(_ url: URL, completion: ((Data?) -> Void)?) -> Request? {
         let key = url.absoluteString
         if !ImageCache.disableCaching,
+           // todo: calling object(forKey: key) does disk I/O and this method is often called from the main thread
+           // in performance sensitive paths. a nice optimization to DiskStorage would be adding an internal cache
+           // of the state (unknown/exists/does not exist) of whether or not objects exist on disk so that the slow, disk I/O
+           // path can be avoided most of the time
            let data = try? cache.object(forKey: key) {
-            completion?(data)
+            backgroundQueue.async {
+                completion?(data)
+            }
             return nil
         } else {
             if let completion = completion, let group = groups[url] {
@@ -56,7 +64,7 @@ class ImageCache {
                     if let data = data {
                         try? self.cache.setObject(data, forKey: key)
                     }
-                    self.groups.removeValue(forKey: url)
+                    self.groups.removeValueWithoutReturning(forKey: url)
                 }
                 groups[url] = group
                 let request = group.addCallback(completion)

Tusker/Info.plist

@@ -81,6 +81,10 @@
 			</array>
 		</dict>
 	</dict>
+	<key>UIBackgroundModes</key>
+	<array>
+		<string>audio</string>
+	</array>
 	<key>UILaunchStoryboardName</key>
 	<string>LaunchScreen</string>
 	<key>UIRequiredDeviceCapabilities</key>

Tusker/MultiThreadDictionary.swift

@@ -0,0 +1,50 @@
+//
+//  MultiThreadDictionary.swift
+//  Tusker
+//
+//  Created by Shadowfacts on 5/6/20.
+//  Copyright © 2020 Shadowfacts. All rights reserved.
+//
+
+import Foundation
+
+class MultiThreadDictionary<Key: Hashable, Value> {
+    private let name: String
+    private var dict = [Key: Value]()
+    private let queue: DispatchQueue
+    
+    init(name: String) {
+        self.name = name
+        self.queue = DispatchQueue(label: "MultiThreadDictionary (\(name)) Coordinator", attributes: .concurrent)
+    }
+    
+    subscript(key: Key) -> Value? {
+        get {
+            var result: Value? = nil
+            queue.sync {
+                result = dict[key]
+            }
+            return result
+        }
+        set(value) {
+            queue.async(flags: .barrier) {
+                self.dict[key] = value
+            }
+        }
+    }
+    
+    func removeValueWithoutReturning(forKey key: Key) {
+        queue.async(flags: .barrier) {
+            self.dict.removeValue(forKey: key)
+        }
+    }
+    
+    /// If the result of this function is unused, it is preferable to use `removeValueWithoutReturning` as it executes asynchronously and doesn't block the calling thread.
+    func removeValue(forKey key: Key) -> Value? {
+        var value: Value? = nil
+        queue.sync(flags: .barrier) {
+            value = dict.removeValue(forKey: key)
+        }
+        return value
+    }
+}

Tusker/Screens/Attachment Gallery/GalleryPlayerViewController.swift

@@ -8,9 +8,18 @@
 
 import UIKit
 import AVKit
+import Pachyderm
 
 class GalleryPlayerViewController: AVPlayerViewController {
 
+    var attachment: Attachment!
+    
+    override func viewDidLoad() {
+        super.viewDidLoad()
+        
+        allowsPictureInPicturePlayback = true
+    }
+    
     override func viewDidAppear(_ animated: Bool) {
         super.viewDidAppear(animated)
         

Tusker/Screens/Attachment Gallery/GalleryViewController.swift

@@ -12,11 +12,13 @@ import AVKit
 
 class GalleryViewController: UIPageViewController, UIPageViewControllerDataSource, UIPageViewControllerDelegate, LargeImageAnimatableViewController {
 
+    weak var avPlayerViewControllerDelegate: AVPlayerViewControllerDelegate?
+    
     let attachments: [Attachment]
     let sourceViews: WeakArray<UIImageView>
     let startIndex: Int
     
-    let pages: [UIViewController]
+    var pages: [UIViewController]!
     
     var currentIndex: Int {
         guard let vc = viewControllers?.first,
@@ -72,6 +74,18 @@ class GalleryViewController: UIPageViewController, UIPageViewControllerDataSourc
         self.sourceViews = WeakArray(sourceViews)
         self.startIndex = startIndex
         
+        super.init(transitionStyle: .scroll, navigationOrientation: .horizontal)
+        
+        modalPresentationStyle = .fullScreen
+    }
+    
+    required init?(coder: NSCoder) {
+        fatalError("init(coder:) has not been implemented")
+    }
+    
+    override func viewDidLoad() {
+        super.viewDidLoad()
+        
         self.pages = attachments.enumerated().map { (index, attachment) in
             switch attachment.kind {
             case .image:
@@ -82,6 +96,8 @@ class GalleryViewController: UIPageViewController, UIPageViewControllerDataSourc
             case .video, .audio:
                 let vc = GalleryPlayerViewController()
                 vc.player = AVPlayer(url: attachment.url)
+                vc.delegate = avPlayerViewControllerDelegate
+                vc.attachment = attachment
                 return vc
             case .gifv:
                 // Passing the source view to the LargeImageGifvContentView is a crappy workaround for not
@@ -101,20 +117,8 @@ class GalleryViewController: UIPageViewController, UIPageViewControllerDataSourc
             }
         }
         
-        super.init(transitionStyle: .scroll, navigationOrientation: .horizontal)
-        
         setViewControllers([pages[startIndex]], direction: .forward, animated: false)
 
-        modalPresentationStyle = .fullScreen
-    }
-    
-    required init?(coder: NSCoder) {
-        fatalError("init(coder:) has not been implemented")
-    }
-    
-    override func viewDidLoad() {
-        super.viewDidLoad()
-
         self.dataSource = self
         self.delegate = self
         

Tusker/Screens/Compose/ComposeAutocompleteView.swift

@@ -218,9 +218,40 @@ struct ComposeAutocompleteEmojisView: View {
     @EnvironmentObject private var mastodonController: MastodonController
     @EnvironmentObject private var uiState: ComposeUIState
     
+    @State var expanded = false
     @State private var emojis: [Emoji] = []
     
     var body: some View {
+        // When exapnded, the toggle button should be at the top. When collapsed, it should be centered.
+        HStack(alignment: expanded ? .top : .center, spacing: 0) {
+            if case let .emoji(query) = uiState.autocompleteState {
+                emojiList(query: query)
+                    .animation(.default)
+                    .transition(.move(edge: .bottom))
+            } else {
+                // when the autocomplete view is animating out, the autocomplete state is nil
+                // add a spacer so the expand button remains on the right
+                Spacer()
+            }
+            
+            toggleExpandedButton
+                .padding(.trailing, 8)
+                .padding(.top, expanded ? 8 : 0)
+        }
+    }
+    
+    @ViewBuilder
+    private func emojiList(query: String) -> some View {
+        if expanded {
+            EmojiPickerWrapper(searchQuery: query)
+                .frame(height: 150)
+        } else {
+            horizontalScrollView
+                .onReceive(uiState.$autocompleteState, perform: queryChanged)
+        }
+    }
+    
+    private var horizontalScrollView: some View {
         ScrollView(.horizontal) {
             HStack(spacing: 8) {
                 ForEach(emojis, id: \.shortcode) { (emoji) in
@@ -236,15 +267,25 @@ struct ComposeAutocompleteEmojisView: View {
                     }
                     .frame(height: 30)
                     .padding(.vertical, 8)
-                    .animation(.linear(duration: 0.1))
+                    .animation(.linear(duration: 0.2))
                 }
                 
-                Spacer()
+                Spacer(minLength: 30)
             }
             .padding(.horizontal, 8)
-            .iOS13OnlyPadding()
+            .frame(height: 46)
         }
-        .onReceive(uiState.$autocompleteState.debounce(for: .milliseconds(250), scheduler: DispatchQueue.main), perform: queryChanged)
+    }
+    
+    private var toggleExpandedButton: some View {
+        Button {
+            expanded.toggle()
+        } label: {
+            Image(systemName: expanded ? "chevron.down" : "chevron.up")
+                .resizable()
+                .aspectRatio(contentMode: .fit)
+        }
+        .frame(width: 20, height: 20)
     }
     
     private func queryChanged(_ autocompleteState: ComposeUIState.AutocompleteState?) {
@@ -255,8 +296,6 @@ struct ComposeAutocompleteEmojisView: View {
         }
         
         mastodonController.getCustomEmojis { (emojis) in
-            guard case .emoji(query) = self.uiState.autocompleteState else { return }
-            
             self.emojis =
                 emojis.map { (emoji) -> (Emoji, (matched: Bool, score: Int)) in
                     (emoji, FuzzyMatcher.match(pattern: query, str: emoji.shortcode))

Tusker/Screens/Compose/ComposeContentWarningTextField.swift

@@ -54,7 +54,6 @@ struct ComposeContentWarningTextField: UIViewRepresentable {
         }
         
         func textFieldDidEndEditing(_ textField: UITextField) {
-            uiState.autocompleteHandler = nil
             updateAutocompleteState(textField: textField)
         }
         
@@ -76,8 +75,8 @@ struct ComposeContentWarningTextField: UIViewRepresentable {
             let characterBeforeCursorIndex = text.utf16.index(text.startIndex, offsetBy: selectedRangeStartUTF16)
             
             let insertSpace: Bool
-            if text.distance(from: characterBeforeCursorIndex, to: text.endIndex) > 0 {
-                let charAfterCursor = text[text.index(after: characterBeforeCursorIndex)]
+            if distanceToEnd > 0 {
+                let charAfterCursor = text[characterBeforeCursorIndex]
                 insertSpace = charAfterCursor != " " && charAfterCursor != "\n"
             } else {
                 insertSpace = true
@@ -85,10 +84,13 @@ struct ComposeContentWarningTextField: UIViewRepresentable {
             let string = insertSpace ? string + " " : string
             
             textField.text!.replaceSubrange(lastWordStartIndex..<characterBeforeCursorIndex, with: string)
-            didChange(textField)
+            self.didChange(textField)
+            self.updateAutocompleteState(textField: textField)
             
             // keep the cursor at the same position in the text, immediately after what was inserted
-            let newCursorPosition = textField.position(from: textField.endOfDocument, offset: -distanceToEnd)!
+            // if we inserted a space, move the cursor 1 farther so it's immediately after the pre-existing space
+            let insertSpaceOffset = insertSpace ? 0 : 1
+            let newCursorPosition = textField.position(from: textField.endOfDocument, offset: -distanceToEnd + insertSpaceOffset)!
             textField.selectedTextRange = textField.textRange(from: newCursorPosition, to: newCursorPosition)
         }
         

Tusker/Screens/Compose/ComposeUIState.swift

@@ -53,3 +53,7 @@ extension ComposeUIState {
         case hashtag(String)
     }
 }
+
+protocol ComposeAutocompleteHandler: class {
+    func autocomplete(with string: String)
+}

Tusker/Screens/Compose/ComposeView.swift

@@ -66,9 +66,7 @@ struct ComposeView: View {
             // can't use SwiftUI.ProgressView because there's no UIProgressView.Style.bar equivalent, see FB8587149
             WrappedProgressView(value: postProgress, total: postTotalProgress)
             
-            if let state = uiState.autocompleteState {
-                autocompleteSuggestions(state: state)
-            }
+            autocompleteSuggestions
         }
         .onAppear(perform: self.didAppear)
         .navigationBarTitle("Compose")
@@ -83,19 +81,23 @@ struct ComposeView: View {
     }
     
     @ViewBuilder
-    func autocompleteSuggestions(state: ComposeUIState.AutocompleteState) -> some View {
+    var autocompleteSuggestions: some View {
         // on iOS 13, the transition causes SwiftUI to hang on the main thread when the view appears, so it's disabled
         if #available(iOS 14.0, *) {
             VStack(spacing: 0) {
                 Spacer()
-                ComposeAutocompleteView(autocompleteState: state)
+                if let state = uiState.autocompleteState {
+                    ComposeAutocompleteView(autocompleteState: state)
+                }
             }
             .transition(.move(edge: .bottom))
             .animation(.default)
         } else {
             VStack(spacing: 0) {
                 Spacer()
-                ComposeAutocompleteView(autocompleteState: state)
+                if let state = uiState.autocompleteState {
+                    ComposeAutocompleteView(autocompleteState: state)
+                }
             }
         }
     }

Tusker/Screens/Compose/EmojiCollectionViewCell.swift

@@ -0,0 +1,64 @@
+//
+//  EmojiCollectionViewCell.swift
+//  Tusker
+//
+//  Created by Shadowfacts on 10/12/20.
+//  Copyright © 2020 Shadowfacts. All rights reserved.
+//
+
+import UIKit
+import Pachyderm
+
+class EmojiCollectionViewCell: UICollectionViewCell {
+
+    private var emojiImageView: UIImageView!
+    private var emojiNameLabel: UILabel!
+    
+    private var currentEmojiShortcode: String?
+    private var imageRequest: ImageCache.Request?
+    
+    override init(frame: CGRect) {
+        super.init(frame: frame)
+        
+        commonInit()
+    }
+    
+    required init?(coder: NSCoder) {
+        super.init(coder: coder)
+        
+        commonInit()
+    }
+    
+    private func commonInit() {
+        emojiImageView = UIImageView()
+        emojiImageView.translatesAutoresizingMaskIntoConstraints = false
+        emojiImageView.contentMode = .scaleAspectFit
+        addSubview(emojiImageView)
+        NSLayoutConstraint.activate([
+            emojiImageView.leadingAnchor.constraint(equalTo: leadingAnchor),
+            emojiImageView.trailingAnchor.constraint(equalTo: trailingAnchor),
+            emojiImageView.topAnchor.constraint(equalTo: topAnchor),
+            emojiImageView.bottomAnchor.constraint(equalTo: bottomAnchor),
+        ])
+    }
+    
+    func updateUI(emoji: Emoji) {
+        currentEmojiShortcode = emoji.shortcode
+        
+        imageRequest = ImageCache.emojis.get(emoji.url) { [weak self] (data) in
+            if let data = data, let image = UIImage(data: data) {
+                DispatchQueue.main.async { [weak self] in
+                    guard let self = self, self.currentEmojiShortcode == emoji.shortcode else { return }
+                    self.emojiImageView.image = image
+                }
+            }
+        }
+    }
+    
+    override func prepareForReuse() {
+        super.prepareForReuse()
+        
+        imageRequest?.cancel()
+    }
+
+}

Tusker/Screens/Compose/EmojiPickerCollectionViewController.swift

@@ -0,0 +1,128 @@
+//
+//  EmojiPickerCollectionViewController.swift
+//  Tusker
+//
+//  Created by Shadowfacts on 10/12/20.
+//  Copyright © 2020 Shadowfacts. All rights reserved.
+//
+
+import UIKit
+import Pachyderm
+
+private let reuseIdentifier = "EmojiCell"
+
+protocol EmojiPickerCollectionViewControllerDelegate: class {
+    func selectedEmoji(_ emoji: Emoji)
+}
+
+// It would be nice to replace this with a LazyVGrid when the deployment target is bumped to 14.0
+class EmojiPickerCollectionViewController: UICollectionViewController {
+
+    weak var delegate: EmojiPickerCollectionViewControllerDelegate?
+    
+    private weak var mastodonController: MastodonController!
+
+    private var dataSource: UICollectionViewDiffableDataSource<Section, Item>!
+    
+    var searchQuery: String = "" {
+        didSet {
+            guard let emojis = mastodonController.customEmojis else { return }
+            let snapshot = createFilteredSnapshot(emojis: emojis)
+            DispatchQueue.main.async {
+                self.dataSource.apply(snapshot)
+            }
+        }
+    }
+    
+    init(mastodonController: MastodonController) {
+        self.mastodonController = mastodonController
+        
+        let itemWidth = NSCollectionLayoutDimension.fractionalWidth(1.0 / 10)
+        let itemSize = NSCollectionLayoutSize(widthDimension: itemWidth, heightDimension: itemWidth)
+        let item = NSCollectionLayoutItem(layoutSize: itemSize)
+        
+        let groupSize = NSCollectionLayoutSize(widthDimension: .fractionalWidth(1.0), heightDimension: itemWidth)
+        let group = NSCollectionLayoutGroup.horizontal(layoutSize: groupSize, subitems: [item])
+        group.interItemSpacing = .fixed(4)
+        
+        let section = NSCollectionLayoutSection(group: group)
+        section.interGroupSpacing = 4
+        
+        let layout = UICollectionViewCompositionalLayout(section: section)
+        
+        super.init(collectionViewLayout: layout)
+    }
+    
+    required init?(coder: NSCoder) {
+        fatalError("init(coder:) has not been implemented")
+    }
+    
+    override func viewDidLoad() {
+        super.viewDidLoad()
+        
+        additionalSafeAreaInsets = UIEdgeInsets(top: 0, left: 8, bottom: 0, right: 8)
+        // use negative indicator insets to bring the indicators back to the edge of the containing view
+        // using collectionView.contentInset doesn't work the compositional layout ignores the inset when calculating fractional widths
+        collectionView.scrollIndicatorInsets = UIEdgeInsets(top: 0, left: -8, bottom: 0, right: -8)
+        collectionView.contentInset = UIEdgeInsets(top: 8, left: 0, bottom: 8, right: 0)
+        
+        collectionView.backgroundColor = .clear
+        collectionView.register(EmojiCollectionViewCell.self, forCellWithReuseIdentifier: reuseIdentifier)
+        
+        dataSource = UICollectionViewDiffableDataSource(collectionView: collectionView) { (collectionView, indexPath, item) -> UICollectionViewCell? in
+            let cell = collectionView.dequeueReusableCell(withReuseIdentifier: reuseIdentifier, for: indexPath) as! EmojiCollectionViewCell
+            cell.updateUI(emoji: item.emoji)
+            return cell
+        }
+        
+        mastodonController.getCustomEmojis { (emojis) in
+            DispatchQueue.main.async {
+                self.dataSource.apply(self.createFilteredSnapshot(emojis: emojis))
+            }
+        }
+    }
+    
+    private func createFilteredSnapshot(emojis: [Emoji]) -> NSDiffableDataSourceSnapshot<Section, Item> {
+        let items: [Item]
+        if searchQuery.trimmingCharacters(in: .whitespacesAndNewlines).isEmpty {
+            items = emojis.map { Item(emoji: $0) }
+        } else {
+            items = emojis
+                .map { ($0, FuzzyMatcher.match(pattern: searchQuery, str: $0.shortcode)) }
+                .filter(\.1.matched)
+                .sorted { $0.1.score > $1.1.score }
+                .map { Item(emoji: $0.0) }
+        }
+        
+        var snapshot = NSDiffableDataSourceSnapshot<Section, Item>()
+        snapshot.appendSections([.emojis])
+        snapshot.appendItems(items)
+        return snapshot
+    }
+
+    // MARK: UICollectionViewDelegate
+    
+    override func collectionView(_ collectionView: UICollectionView, didSelectItemAt indexPath: IndexPath) {
+        guard let item = dataSource.itemIdentifier(for: indexPath) else { return }
+        delegate?.selectedEmoji(item.emoji)
+    }
+
+}
+
+extension EmojiPickerCollectionViewController {
+    enum Section {
+        case emojis
+    }
+    
+    struct Item: Hashable, Equatable {
+        let emoji: Emoji
+        
+        func hash(into hasher: inout Hasher) {
+            hasher.combine(emoji.shortcode)
+        }
+        
+        static func ==(lhs: Item, rhs: Item) -> Bool {
+            lhs.emoji.shortcode == rhs.emoji.shortcode
+        }
+    }
+}

Tusker/Screens/Compose/EmojiPickerWrapper.swift

@@ -0,0 +1,46 @@
+//
+//  EmojiPickerWrapper.swift
+//  Tusker
+//
+//  Created by Shadowfacts on 10/14/20.
+//  Copyright © 2020 Shadowfacts. All rights reserved.
+//
+
+import SwiftUI
+import Pachyderm
+
+struct EmojiPickerWrapper: UIViewControllerRepresentable {
+    typealias UIViewControllerType = EmojiPickerCollectionViewController
+    
+    let searchQuery: String
+    
+    @EnvironmentObject private var mastodonController: MastodonController
+    @EnvironmentObject private var uiState: ComposeUIState
+    
+    func makeUIViewController(context: Context) -> EmojiPickerCollectionViewController {
+        let vc = EmojiPickerCollectionViewController(mastodonController: mastodonController)
+        vc.delegate = context.coordinator
+        return vc
+    }
+    
+    func updateUIViewController(_ uiViewController: EmojiPickerCollectionViewController, context: Context) {
+        uiViewController.searchQuery = searchQuery
+    }
+    
+    func makeCoordinator() -> Coordinator {
+        return Coordinator(uiState: uiState)
+    }
+    
+    class Coordinator: EmojiPickerCollectionViewControllerDelegate {
+        let uiState: ComposeUIState
+        
+        init(uiState: ComposeUIState) {
+            self.uiState = uiState
+        }
+        
+        func selectedEmoji(_ emoji: Emoji) {
+            uiState.autocompleteHandler?.autocomplete(with: ":\(emoji.shortcode):")
+            uiState.autocompleteState = nil
+        }
+    }
+}

Tusker/Screens/Compose/MainComposeTextView.swift

@@ -184,8 +184,6 @@ struct MainComposeWrappedTextView: UIViewRepresentable {
         func textViewDidChange(_ textView: UITextView) {
             text.wrappedValue = textView.text
             didChange(textView)
-            
-            updateAutocompleteState()
         }
         
         @objc func formatButtonPressed(_ sender: UIBarButtonItem) {
@@ -224,7 +222,6 @@ struct MainComposeWrappedTextView: UIViewRepresentable {
         }
         
         func textViewDidEndEditing(_ textView: UITextView) {
-            uiState.autocompleteHandler = nil
             updateAutocompleteState()
         }
         
@@ -244,8 +241,8 @@ struct MainComposeWrappedTextView: UIViewRepresentable {
             let characterBeforeCursorIndex = text.utf16.index(text.startIndex, offsetBy: textView.selectedRange.upperBound)
             
             let insertSpace: Bool
-            if text.distance(from: characterBeforeCursorIndex, to: text.endIndex) > 0 {
-                let charAfterCursor = text[text.index(after: characterBeforeCursorIndex)]
+            if distanceToEnd > 0 {
+                let charAfterCursor = text[characterBeforeCursorIndex]
                 insertSpace = charAfterCursor != " " && charAfterCursor != "\n"
             } else {
                 insertSpace = true
@@ -254,9 +251,12 @@ struct MainComposeWrappedTextView: UIViewRepresentable {
             
             textView.text.replaceSubrange(lastWordStartIndex..<characterBeforeCursorIndex, with: string)
             self.textViewDidChange(textView)
+            self.updateAutocompleteState()
             
             // keep the cursor at the same position in the text, immediately after what was inserted
-            textView.selectedRange = NSRange(location: textView.text.utf16.count - distanceToEnd, length: 0)
+            // if we inserted a space, move the cursor 1 farther so it's immediately after the pre-existing space
+            let insertSpaceOffset = insertSpace ? 0 : 1
+            textView.selectedRange = NSRange(location: textView.text.utf16.count - distanceToEnd + insertSpaceOffset, length: 0)
         }
         
         private func updateAutocompleteState() {
@@ -358,7 +358,3 @@ struct MainComposeWrappedTextView: UIViewRepresentable {
         }
     }
 }
-
-protocol ComposeAutocompleteHandler: class {
-    func autocomplete(with string: String)
-}

Tusker/Screens/Explore/AddSavedHashtagViewController.swift

@@ -13,11 +13,18 @@ class AddSavedHashtagViewController: SearchResultsViewController {
 
     var searchController: UISearchController!
     
+    init(mastodonController: MastodonController) {
+        super.init(mastodonController: mastodonController, resultTypes: [.hashtags])
+    }
+    
+    required init?(coder: NSCoder) {
+        fatalError("init(coder:) has not been implemented")
+    }
+    
     override func viewDidLoad() {
         super.viewDidLoad()
 
         delegate = self
-        onlySections = [.hashtags]
         
         searchController = UISearchController(searchResultsController: nil)
         searchController.obscuresBackgroundDuringPresentation = false

Tusker/Screens/Lists/EditListAccountsViewController.swift

@@ -52,9 +52,8 @@ class EditListAccountsViewController: EnhancedTableViewController {
         })
         dataSource.editListAccountsController = self
         
-        searchResultsController = SearchResultsViewController(mastodonController: mastodonController)
+        searchResultsController = SearchResultsViewController(mastodonController: mastodonController, resultTypes: [.accounts])
         searchResultsController.delegate = self
-        searchResultsController.onlySections = [.accounts]
         searchController = UISearchController(searchResultsController: searchResultsController)
         searchController.hidesNavigationBarDuringPresentation = false
         searchController.searchResultsUpdater = searchResultsController

Tusker/Screens/Search/SearchResultsViewController.swift

@@ -35,15 +35,17 @@ class SearchResultsViewController: EnhancedTableViewController {
     
     var dataSource: UITableViewDiffableDataSource<Section, Item>!
 
-    var activityIndicator: UIActivityIndicatorView!
+    private var activityIndicator: UIActivityIndicatorView!
     
-    var onlySections: [Section] = Section.allCases
+    /// Types of results to search for. `nil` means all results will be included.
+    var resultTypes: [SearchResultType]? = nil
     
     let searchSubject = PassthroughSubject<String?, Never>()
     var currentQuery: String?
     
-    init(mastodonController: MastodonController) {
+    init(mastodonController: MastodonController, resultTypes: [SearchResultType]? = nil) {
         self.mastodonController = mastodonController
+        self.resultTypes = resultTypes
 
         super.init(style: .grouped)
         
@@ -128,7 +130,7 @@ class SearchResultsViewController: EnhancedTableViewController {
         activityIndicator.isHidden = false
         activityIndicator.startAnimating()
 
-        let request = Client.search(query: query, resolve: true, limit: 10)
+        let request = Client.search(query: query, types: resultTypes, resolve: true, limit: 10)
         mastodonController.run(request) { (response) in
             guard case let .success(results, _) = response else { fatalError() }
 
@@ -157,16 +159,16 @@ class SearchResultsViewController: EnhancedTableViewController {
                     }
                 }
                 
-                if self.onlySections.contains(.accounts) && !results.accounts.isEmpty {
+                if !results.accounts.isEmpty {
                     snapshot.appendSections([.accounts])
                     snapshot.appendItems(results.accounts.map { .account($0.id) }, toSection: .accounts)
                     addAccounts(results.accounts)
                 }
-                if self.onlySections.contains(.hashtags) && !results.hashtags.isEmpty {
+                if !results.hashtags.isEmpty {
                     snapshot.appendSections([.hashtags])
                     snapshot.appendItems(results.hashtags.map { .hashtag($0) }, toSection: .hashtags)
                 }
-                if self.onlySections.contains(.statuses) && !results.statuses.isEmpty {
+                if !results.statuses.isEmpty {
                     snapshot.appendSections([.statuses])
                     snapshot.appendItems(results.statuses.map { .status($0.id, .unknown) }, toSection: .statuses)
                     addStatuses(results.statuses)

Tusker/Views/AccountDisplayNameLabel.swift

@@ -41,7 +41,7 @@ struct AccountDisplayNameLabel<Account: AccountProtocol>: View {
         let matches = emojiRegex.matches(in: account.displayName, options: [], range: fullRange)
         guard !matches.isEmpty else { return }
         
-        let emojiImages = CachedDictionary<Image>(name: "AcccountDisplayNameLabel Emoji Images")
+        let emojiImages = MultiThreadDictionary<String, Image>(name: "AcccountDisplayNameLabel Emoji Images")
         
         let group = DispatchGroup()
         

Tusker/Views/Attachments/AttachmentView.swift

@@ -12,7 +12,7 @@ import Gifu
 import AVFoundation
 
 protocol AttachmentViewDelegate: class {
-    func attachmentViewGallery(startingAt index: Int) -> UIViewController?
+    func attachmentViewGallery(startingAt index: Int) -> GalleryViewController?
     func attachmentViewPresent(_ vc: UIViewController, animated: Bool)
 }
 

Tusker/Views/ContentTextView.swift

@@ -51,7 +51,7 @@ class ContentTextView: LinkTextView {
     func setEmojis(_ emojis: [Emoji]) {
         guard !emojis.isEmpty else { return }
         
-        let emojiImages = CachedDictionary<UIImage>(name: "ContentTextView Emoji Images")
+        let emojiImages = MultiThreadDictionary<String, UIImage>(name: "ContentTextView Emoji Images")
         
         let group = DispatchGroup()
         

Tusker/Views/EmojiLabel.swift

@@ -26,7 +26,7 @@ class EmojiLabel: UILabel {
         let matches = emojiRegex.matches(in: attributedText.string, options: [], range: attributedText.fullRange)
         guard !matches.isEmpty else { return }
         
-        let emojiImages = CachedDictionary<UIImage>(name: "EmojiLabel Emoji Images")
+        let emojiImages = MultiThreadDictionary<String, UIImage>(name: "EmojiLabel Emoji Images")
         
         let group = DispatchGroup()
         

Tusker/Views/Status/BaseStatusTableViewCell.swift

@@ -9,6 +9,7 @@
 import UIKit
 import Pachyderm
 import Combine
+import AVKit
 
 protocol StatusTableViewCellDelegate: TuskerNavigationDelegate {
     func statusCellCollapsedStateChanged(_ cell: BaseStatusTableViewCell)
@@ -70,6 +71,8 @@ class BaseStatusTableViewCell: UITableViewCell {
     private var statusUpdater: Cancellable?
     private var accountUpdater: Cancellable?
     
+    private var currentPictureInPictureVideoStatusID: String?
+    
     override func awakeFromNib() {
         super.awakeFromNib()
         
@@ -360,15 +363,74 @@ class BaseStatusTableViewCell: UITableViewCell {
 }
 
 extension BaseStatusTableViewCell: AttachmentViewDelegate {
-    func attachmentViewGallery(startingAt index: Int) -> UIViewController? {
+    func attachmentViewGallery(startingAt index: Int) -> GalleryViewController? {
         guard let delegate = delegate,
               let status = mastodonController.persistentContainer.status(for: statusID) else { return nil }
         let sourceViews = status.attachments.map(attachmentsView.getAttachmentView(for:))
-        return delegate.gallery(attachments: status.attachments, sourceViews: sourceViews, startIndex: index)
+        let gallery = delegate.gallery(attachments: status.attachments, sourceViews: sourceViews, startIndex: index)
+        gallery.avPlayerViewControllerDelegate = self
+        return gallery
     }
     
     func attachmentViewPresent(_ vc: UIViewController, animated: Bool) {
-        delegate?.show(vc)
+        delegate?.present(vc, animated: animated)
+    }
+}
+
+// todo: This is not ideal. It works when the original cell remains visible and when the cell is reused, but if the cell is dealloc'd
+// resuming from PiP won't work because AVPlayerViewController.delegate is a weak reference.
+extension BaseStatusTableViewCell: AVPlayerViewControllerDelegate {
+    func playerViewControllerWillStartPictureInPicture(_ playerViewController: AVPlayerViewController) {
+        // We need to save the current statusID when PiP is initiated, because if the user restores from PiP after this cell has
+        // been reused, the current value of statusID will not be correct.
+        currentPictureInPictureVideoStatusID = statusID
+    }
+    
+    func playerViewControllerDidStopPictureInPicture(_ playerViewController: AVPlayerViewController) {
+        currentPictureInPictureVideoStatusID = nil
+    }
+    
+    func playerViewControllerShouldAutomaticallyDismissAtPictureInPictureStart(_ playerViewController: AVPlayerViewController) -> Bool {
+        // Ideally, when PiP is automatically initiated by app closing the gallery should not be dismissed
+        // and when PiP is started because the user has tapped the button in the player controls the gallery
+        // gallery should be dismissed. Unfortunately, this doesn't seem to be possible. Instead, the gallery is
+        // always dismissed and is recreated when restoring the interface from PiP.
+        return true
+    }
+    
+    func playerViewController(_ playerViewController: AVPlayerViewController, restoreUserInterfaceForPictureInPictureStopWithCompletionHandler completionHandler: @escaping (Bool) -> Void) {
+        guard let delegate = delegate,
+              let playerViewController = playerViewController as? GalleryPlayerViewController,
+              let id = currentPictureInPictureVideoStatusID,
+              let status = mastodonController.persistentContainer.status(for: id),
+              let index = status.attachments.firstIndex(where: { $0.id == playerViewController.attachment?.id }) else {
+            // returning without invoking completionHandler will dismiss the PiP window
+            return
+        }
+
+        // We create a new gallery view controller starting at the appropriate index and swap the
+        // already-playing VC into the appropriate index so it smoothly continues playing.
+        
+        let sourceViews: [UIImageView?]
+        if self.statusID == id {
+            sourceViews = status.attachments.map(attachmentsView.getAttachmentView(for:))
+        } else {
+            sourceViews = status.attachments.map { (_) in nil }
+        }
+        let gallery = delegate.gallery(attachments: status.attachments, sourceViews: sourceViews, startIndex: index)
+        gallery.avPlayerViewControllerDelegate = self
+        
+        // ensure that all other page VCs are created
+        gallery.loadViewIfNeeded()
+        // replace the newly created player for the same attachment with the already-playing one
+        gallery.pages[index] = playerViewController
+        gallery.setViewControllers([playerViewController], direction: .forward, animated: false, completion: nil)
+
+        // this isn't animated, otherwise the animation plays first and then the PiP window expands
+        // which looks even weirder than the black background appearing instantly and then the PiP window animating
+        delegate.present(gallery, animated: false) {
+            completionHandler(false)
+        }
     }
 }