Tusker.xcodeproj/project.pbxproj

@@ -88,6 +88,7 @@
 		D625E4822588262A0074BB2B /* DraggableTableViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = D625E4812588262A0074BB2B /* DraggableTableViewCell.swift */; };
 		D6262C9A28D01C4B00390C1F /* LoadingTableViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = D6262C9928D01C4B00390C1F /* LoadingTableViewCell.swift */; };
 		D627943223A5466600D38C68 /* SelectableTableViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = D627943123A5466600D38C68 /* SelectableTableViewCell.swift */; };
+		D627943B23A55BA600D38C68 /* NavigableTableViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = D627943A23A55BA600D38C68 /* NavigableTableViewCell.swift */; };
 		D627944723A6AC9300D38C68 /* BasicTableViewCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = D627944623A6AC9300D38C68 /* BasicTableViewCell.xib */; };
 		D627944D23A9A03D00D38C68 /* ListTimelineViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = D627944C23A9A03D00D38C68 /* ListTimelineViewController.swift */; };
 		D627944F23A9C99800D38C68 /* EditListAccountsViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = D627944E23A9C99800D38C68 /* EditListAccountsViewController.swift */; };
@@ -467,6 +468,7 @@
 		D625E4812588262A0074BB2B /* DraggableTableViewCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DraggableTableViewCell.swift; sourceTree = "<group>"; };
 		D6262C9928D01C4B00390C1F /* LoadingTableViewCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LoadingTableViewCell.swift; sourceTree = "<group>"; };
 		D627943123A5466600D38C68 /* SelectableTableViewCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SelectableTableViewCell.swift; sourceTree = "<group>"; };
+		D627943A23A55BA600D38C68 /* NavigableTableViewCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NavigableTableViewCell.swift; sourceTree = "<group>"; };
 		D627944623A6AC9300D38C68 /* BasicTableViewCell.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = BasicTableViewCell.xib; sourceTree = "<group>"; };
 		D627944C23A9A03D00D38C68 /* ListTimelineViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ListTimelineViewController.swift; sourceTree = "<group>"; };
 		D627944E23A9C99800D38C68 /* EditListAccountsViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = EditListAccountsViewController.swift; sourceTree = "<group>"; };
@@ -1342,6 +1344,7 @@
 				D61A45E728DF477D002BE511 /* LoadingCollectionViewCell.swift */,
 				D6262C9928D01C4B00390C1F /* LoadingTableViewCell.swift */,
 				D68E6F58253C9969001A1B4C /* MultiSourceEmojiLabel.swift */,
+				D627943A23A55BA600D38C68 /* NavigableTableViewCell.swift */,
 				D6D7069F29466649000827ED /* ScrollingSegmentedControl.swift */,
 				D627943123A5466600D38C68 /* SelectableTableViewCell.swift */,
 				D620483723D38190008A63EF /* StatusContentTextView.swift */,
@@ -2012,6 +2015,7 @@
 				D61F75AB293AF11400C0B37F /* FilterKeywordMO.swift in Sources */,
 				D65B4B5A29720AB000DABDFB /* ReportStatusView.swift in Sources */,
 				D663626221360B1900C9CBA2 /* Preferences.swift in Sources */,
+				D627943B23A55BA600D38C68 /* NavigableTableViewCell.swift in Sources */,
 				D6D9498F298EB79400C59229 /* CopyableLable.swift in Sources */,
 				D6333B792139AEFD00CE884A /* Date+TimeAgo.swift in Sources */,
 				D6D706A029466649000827ED /* ScrollingSegmentedControl.swift in Sources */,

Tusker/Views/CachedImageView.swift

@@ -16,12 +16,6 @@ class CachedImageView: UIImageView {
     private var fetchTask: Task<Void, Error>?
     private var blurHashTask: DispatchWorkItem?
     
-    override var image: UIImage? {
-        didSet {
-            fetchTask?.cancel()
-        }
-    }
-    
     init(cache: ImageCache) {
         self.cache = cache
         super.init(frame: .zero)
@@ -37,10 +31,10 @@ class CachedImageView: UIImageView {
         NotificationCenter.default.addObserver(self, selector: #selector(preferencesChanged), name: .preferencesChanged, object: nil)
     }
     
-    func update(for url: URL?, blurhash: String? = nil, placeholder: UIImage? = nil) {
+    func update(for url: URL?, blurhash: String? = nil) {
         if url != self.url || (url != nil && self.image == nil) {
             self.url = url
-            super.image = placeholder
+            self.image = nil
             updateBlurhash(blurhash, for: url)
             updateImage()
         }
@@ -88,7 +82,7 @@ class CachedImageView: UIImageView {
                 return
             }
             try Task.checkCancellation()
-            super.image = transformedImage
+            self.image = transformedImage
             self.isGrayscale = Preferences.shared.grayscaleImages
             self.blurHashTask?.cancel()
         }

Tusker/Views/NavigableTableViewCell.swift

@@ -0,0 +1,13 @@
+//
+//  NavigableTableViewCell.swift
+//  Tusker
+//
+//  Created by Shadowfacts on 12/14/19.
+//  Copyright © 2019 Shadowfacts. All rights reserved.
+//
+
+import Foundation
+
+protocol NavigableTableViewCell {
+    var navigationDelegate: TuskerNavigationDelegate? { get }
+}

Tusker/Views/Status/TimelineStatusCollectionViewCell.swift

@@ -20,8 +20,6 @@ class TimelineStatusCollectionViewCell: UICollectionViewListCell, StatusCollecti
     static let monospaceFont = UIFontMetrics.default.scaledFont(for: .monospacedSystemFont(ofSize: 16, weight: .regular))
     static let contentParagraphStyle = HTMLConverter.defaultParagraphStyle
     
-    private static let timelineReasonIconSize: CGFloat = 25
-    
     // MARK: Subviews
     
     private lazy var timelineReasonLabel = EmojiLabel().configure {
@@ -29,16 +27,8 @@ class TimelineStatusCollectionViewCell: UICollectionViewListCell, StatusCollecti
         $0.font = .preferredFont(forTextStyle: .body)
         $0.adjustsFontForContentSizeCategory = true
     }
-    private let timelineReasonIcon = CachedImageView(cache: .avatars).configure {
-        $0.image = reblogIcon
-        $0.contentMode = .scaleAspectFit
-        $0.layer.masksToBounds = true
+    private let timelineReasonIcon = UIImageView(image: reblogIcon).configure {
         $0.tintColor = .secondaryLabel
-        NSLayoutConstraint.activate([
-            // this needs to be lessThanOrEqualTo not just equalTo b/c otherwise intermediate layouts are broken
-            $0.heightAnchor.constraint(lessThanOrEqualToConstant: TimelineStatusCollectionViewCell.timelineReasonIconSize),
-            $0.widthAnchor.constraint(equalTo: $0.heightAnchor),
-        ])
     }
     private lazy var timelineReasonHStack = UIStackView(arrangedSubviews: [
         timelineReasonIcon,
@@ -314,9 +304,6 @@ class TimelineStatusCollectionViewCell: UICollectionViewListCell, StatusCollecti
         
         mainContainerTopToReblogLabelConstraint = mainContainer.topAnchor.constraint(equalTo: timelineReasonHStack.bottomAnchor, constant: 4)
         mainContainerTopToSelfConstraint = mainContainer.topAnchor.constraint(equalTo: statusContainer.topAnchor, constant: 8)
-        // when flipping between topToReblog and topToSelf constraints, the framework sometimes thinks both of them should be active simultaneously
-        // even though the code never does that; so let this one get broken temporarily
-        mainContainerTopToSelfConstraint.priority = .init(999)
         mainContainerBottomToActionsConstraint = mainContainer.bottomAnchor.constraint(equalTo: actionsContainer.topAnchor, constant: -4)
         mainContainerBottomToSelfConstraint = mainContainer.bottomAnchor.constraint(equalTo: statusContainer.bottomAnchor, constant: -6)
         
@@ -559,6 +546,7 @@ class TimelineStatusCollectionViewCell: UICollectionViewListCell, StatusCollecti
             rebloggerID = status.account.id
             
             hideTimelineReason = false
+            timelineReasonIcon.image = reblogIcon
             updateRebloggerLabel(reblogger: status.account)
             status = rebloggedStatus
         } else {
@@ -616,7 +604,6 @@ class TimelineStatusCollectionViewCell: UICollectionViewListCell, StatusCollecti
         }
         metaIndicatorsView.updateUI(status: status)
         
-        timelineReasonIcon.layer.cornerRadius = Preferences.shared.avatarStyle.cornerRadiusFraction * Self.timelineReasonIconSize
         if let rebloggerID,
            let reblogger = mastodonController.persistentContainer.account(for: rebloggerID) {
             updateRebloggerLabel(reblogger: reblogger)
@@ -663,8 +650,6 @@ class TimelineStatusCollectionViewCell: UICollectionViewListCell, StatusCollecti
     }
     
     private func updateRebloggerLabel(reblogger: AccountMO) {
-        timelineReasonIcon.update(for: reblogger.avatar, placeholder: reblogIcon)
-        
         if Preferences.shared.hideCustomEmojiInUsernames {
             timelineReasonLabel.text = "\(reblogger.displayNameWithoutCustomEmoji) reblogged"
             timelineReasonLabel.removeEmojis()