Tusker/Screens/Large Image/LargeImageContentView.swift

@@ -14,7 +14,6 @@ import VisionKit
 protocol LargeImageContentView: UIView {
     var animationImage: UIImage? { get }
     var activityItemsForSharing: [Any] { get }
-    func setControlsVisible(_ controlsVisible: Bool)
     func grayscaleStateChanged()
 }
 
@@ -23,9 +22,6 @@ class LargeImageImageContentView: UIImageView, LargeImageContentView {
     #if !targetEnvironment(macCatalyst)
     @available(iOS 16.0, *)
     private static let analyzer = ImageAnalyzer()
-    private var _analysisInteraction: AnyObject?
-    @available(iOS 16.0, *)
-    private var analysisInteraction: ImageAnalysisInteraction? { _analysisInteraction as? ImageAnalysisInteraction }
     #endif
     
     var animationImage: UIImage? { image! }
@@ -49,7 +45,6 @@ class LargeImageImageContentView: UIImageView, LargeImageContentView {
         if #available(iOS 16.0, *),
            ImageAnalyzer.isSupported {
             let interaction = ImageAnalysisInteraction()
-            self._analysisInteraction = interaction
             interaction.delegate = self
             interaction.preferredInteractionTypes = .automatic
             addInteraction(interaction)
@@ -69,17 +64,6 @@ class LargeImageImageContentView: UIImageView, LargeImageContentView {
         fatalError("init(coder:) has not been implemented")
     }
     
-    func setControlsVisible(_ controlsVisible: Bool) {
-        #if !targetEnvironment(macCatalyst)
-        if #available(iOS 16.0, *),
-           let analysisInteraction {
-            // note: passing animated: true here doesn't seem to do anything by itself as of iOS 16.2 (20C5032e)
-            // so the LargeImageViewController handles animating, but we still need to pass true here otherwise it doesn't animate
-            analysisInteraction.setSupplementaryInterfaceHidden(!controlsVisible, animated: true)
-        }
-        #endif
-    }
-    
     func grayscaleStateChanged() {
         guard let data = sourceData else {
             return
@@ -129,9 +113,6 @@ class LargeImageGifContentView: GIFImageView, LargeImageContentView {
         fatalError("init(coder:) has not been implemented")
     }
     
-    func setControlsVisible(_ controlsVisible: Bool) {
-    }
-    
     func grayscaleStateChanged() {
         // todo
     }
@@ -170,9 +151,6 @@ class LargeImageGifvContentView: GifvAttachmentView, LargeImageContentView {
         fatalError("init(coder:) has not been implemented")
     }
     
-    func setControlsVisible(_ controlsVisible: Bool) {
-    }
-    
     func grayscaleStateChanged() {
         // no-op, GifvAttachmentView observes the grayscale state itself
     }

Tusker/Screens/Large Image/LargeImageViewController.swift

@@ -174,7 +174,6 @@ class LargeImageViewController: UIViewController, UIScrollViewDelegate, LargeIma
         self.controlsVisible = controlsVisible
         if animated {
             UIView.animate(withDuration: 0.2) {
-                self.contentView.setControlsVisible(controlsVisible)
                 self.updateControlsView()
             }
         } else {

Tusker/Screens/Timeline/TimelineViewController.swift

@@ -160,7 +160,7 @@ class TimelineViewController: UIViewController, TimelineLikeCollectionViewContro
     override func viewDidDisappear(_ animated: Bool) {
         super.viewDidDisappear(animated)
         
-//        pruneOffscreenRows()
+        pruneOffscreenRows()
     }
     
     private func removeTimelineDescriptionCell() {
@@ -170,28 +170,27 @@ class TimelineViewController: UIViewController, TimelineLikeCollectionViewContro
         isShowingTimelineDescription = false
     }
     
-//    private func pruneOffscreenRows() {
+    private func pruneOffscreenRows() {
-//        guard let lastVisibleIndexPath = collectionView.indexPathsForVisibleItems.last else {
+        guard let lastVisibleIndexPath = collectionView.indexPathsForVisibleItems.last else {
-//            return
+            return
-//        }
+        }
-//        var snapshot = dataSource.snapshot()
+        var snapshot = dataSource.snapshot()
-//        guard snapshot.indexOfSection(.statuses) != nil else {
+        guard snapshot.indexOfSection(.statuses) != nil else {
-//            return
+            return
-//        }
+        }
-//        let items = snapshot.itemIdentifiers(inSection: .statuses)
+        let items = snapshot.itemIdentifiers(inSection: .statuses)
-//        let pageSize = 20
+        let pageSize = 20
-//        let numberOfPagesToPrune = (items.count - lastVisibleIndexPath.row - 1) / pageSize
+        let numberOfPagesToPrune = (items.count - lastVisibleIndexPath.row - 1) / pageSize
-//        if numberOfPagesToPrune > 0 {
+        if numberOfPagesToPrune > 0 {
-//            let itemsToRemove = Array(items.suffix(numberOfPagesToPrune * pageSize))
+            let itemsToRemove = Array(items.suffix(numberOfPagesToPrune * pageSize))
-//            snapshot.deleteItems(itemsToRemove)
+            snapshot.deleteItems(itemsToRemove)
-//
+        }
-//            dataSource.apply(snapshot, animatingDifferences: false)
+        dataSource.apply(snapshot, animatingDifferences: false)
-//
+        
-//            if case .status(id: let id, state: _) = snapshot.itemIdentifiers(inSection: .statuses).last {
+        if case .status(id: let id, state: _) = snapshot.itemIdentifiers(inSection: .statuses).last {
-//                older = .before(id: id, count: nil)
+            older = .before(id: id, count: nil)
-//            }
+        }
-//        }
+    }
-//    }
     
     @objc func refresh() {
         Task {

Tusker/Views/Status/TimelineStatusCollectionViewCell.swift

@@ -18,7 +18,6 @@ class TimelineStatusCollectionViewCell: UICollectionViewListCell, StatusCollecti
         $0.textColor = .secondaryLabel
         // this needs to have a higher priorty than the content container's zero height constraint
         $0.setContentHuggingPriority(.defaultHigh, for: .vertical)
-        $0.isUserInteractionEnabled = true
         $0.addGestureRecognizer(UITapGestureRecognizer(target: self, action: #selector(reblogLabelPressed)))
     }