Packages/Pachyderm/Sources/Pachyderm/Utilities/CollapseState.swift

@@ -24,9 +24,7 @@ public final class CollapseState: Sendable {
     }
     
     public func copy() -> CollapseState {
-        let new = CollapseState(collapsible: self.collapsible, collapsed: self.collapsed)
+        return CollapseState(collapsible: self.collapsible, collapsed: self.collapsed)
-        new.statusPropertiesHash = self.statusPropertiesHash
-        return new
     }
     
     public func hash(into hasher: inout Hasher) {

Tusker.xcodeproj/project.pbxproj

@@ -301,7 +301,6 @@
 		D6D79F2B2A0D5D5C00AB2315 /* StatusEditCollectionViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = D6D79F2A2A0D5D5C00AB2315 /* StatusEditCollectionViewCell.swift */; };
 		D6D79F2D2A0D61B400AB2315 /* StatusEditContentTextView.swift in Sources */ = {isa = PBXBuildFile; fileRef = D6D79F2C2A0D61B400AB2315 /* StatusEditContentTextView.swift */; };
 		D6D79F2F2A0D6A7F00AB2315 /* StatusEditPollView.swift in Sources */ = {isa = PBXBuildFile; fileRef = D6D79F2E2A0D6A7F00AB2315 /* StatusEditPollView.swift */; };
-		D6D79F532A0FFE3200AB2315 /* ToggleableButton.swift in Sources */ = {isa = PBXBuildFile; fileRef = D6D79F522A0FFE3200AB2315 /* ToggleableButton.swift */; };
 		D6D94955298963A900C59229 /* Colors.swift in Sources */ = {isa = PBXBuildFile; fileRef = D6D94954298963A900C59229 /* Colors.swift */; };
 		D6D9498D298CBB4000C59229 /* TrendingStatusCollectionViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = D6D9498C298CBB4000C59229 /* TrendingStatusCollectionViewCell.swift */; };
 		D6D9498F298EB79400C59229 /* CopyableLable.swift in Sources */ = {isa = PBXBuildFile; fileRef = D6D9498E298EB79400C59229 /* CopyableLable.swift */; };
@@ -701,7 +700,6 @@
 		D6D79F2A2A0D5D5C00AB2315 /* StatusEditCollectionViewCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = StatusEditCollectionViewCell.swift; sourceTree = "<group>"; };
 		D6D79F2C2A0D61B400AB2315 /* StatusEditContentTextView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = StatusEditContentTextView.swift; sourceTree = "<group>"; };
 		D6D79F2E2A0D6A7F00AB2315 /* StatusEditPollView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = StatusEditPollView.swift; sourceTree = "<group>"; };
-		D6D79F522A0FFE3200AB2315 /* ToggleableButton.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ToggleableButton.swift; sourceTree = "<group>"; };
 		D6D94954298963A900C59229 /* Colors.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Colors.swift; sourceTree = "<group>"; };
 		D6D9498C298CBB4000C59229 /* TrendingStatusCollectionViewCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TrendingStatusCollectionViewCell.swift; sourceTree = "<group>"; };
 		D6D9498E298EB79400C59229 /* CopyableLable.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CopyableLable.swift; sourceTree = "<group>"; };
@@ -1373,7 +1371,6 @@
 				D65B4B69297777D900DABDFB /* StatusNotFoundView.swift */,
 				04ED00B021481ED800567C53 /* SteppedProgressView.swift */,
 				D6093FB625BE0CF3004811E6 /* TrendHistoryView.swift */,
-				D6D79F522A0FFE3200AB2315 /* ToggleableButton.swift */,
 				D686BBE224FBF8110068E6AA /* WrappedProgressView.swift */,
 				D627944623A6AC9300D38C68 /* BasicTableViewCell.xib */,
 				D6A3BC872321F78000FD64D5 /* Account Cell */,
@@ -1948,7 +1945,6 @@
 				D6BC9DB1232C61BC002CA326 /* NotificationsPageViewController.swift in Sources */,
 				D6ADB6EC28EA73CB009924AB /* StatusContentContainer.swift in Sources */,
 				D6969E9E240C81B9002843CE /* NSTextAttachment+Emoji.swift in Sources */,
-				D6D79F532A0FFE3200AB2315 /* ToggleableButton.swift in Sources */,
 				D6BC9DB3232D4C07002CA326 /* WellnessPrefsView.swift in Sources */,
 				D6ADB6F028ED1F25009924AB /* CachedImageView.swift in Sources */,
 				D693DE5923FE24310061E07D /* InteractivePushTransition.swift in Sources */,

Tusker.xcodeproj/xcshareddata/xcschemes/ShareExtension.xcscheme

@@ -1,105 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Scheme
-   LastUpgradeVersion = "1430"
-   wasCreatedForAppExtension = "YES"
-   version = "1.7">
-   <BuildAction
-      parallelizeBuildables = "YES"
-      buildImplicitDependencies = "YES">
-      <BuildActionEntries>
-         <BuildActionEntry
-            buildForTesting = "YES"
-            buildForRunning = "YES"
-            buildForProfiling = "YES"
-            buildForArchiving = "YES"
-            buildForAnalyzing = "YES">
-            <BuildableReference
-               BuildableIdentifier = "primary"
-               BlueprintIdentifier = "D6A4531229EF64BA00032932"
-               BuildableName = "ShareExtension.appex"
-               BlueprintName = "ShareExtension"
-               ReferencedContainer = "container:Tusker.xcodeproj">
-            </BuildableReference>
-         </BuildActionEntry>
-         <BuildActionEntry
-            buildForTesting = "YES"
-            buildForRunning = "YES"
-            buildForProfiling = "YES"
-            buildForArchiving = "YES"
-            buildForAnalyzing = "YES">
-            <BuildableReference
-               BuildableIdentifier = "primary"
-               BlueprintIdentifier = "D6D4DDCB212518A000E1C4BB"
-               BuildableName = "Tusker.app"
-               BlueprintName = "Tusker"
-               ReferencedContainer = "container:Tusker.xcodeproj">
-            </BuildableReference>
-         </BuildActionEntry>
-      </BuildActionEntries>
-   </BuildAction>
-   <TestAction
-      buildConfiguration = "Debug"
-      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
-      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
-      shouldUseLaunchSchemeArgsEnv = "YES"
-      shouldAutocreateTestPlan = "YES">
-   </TestAction>
-   <LaunchAction
-      buildConfiguration = "Debug"
-      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
-      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
-      launchStyle = "1"
-      useCustomWorkingDirectory = "NO"
-      ignoresPersistentStateOnLaunch = "NO"
-      debugDocumentVersioning = "YES"
-      debugServiceExtension = "internal"
-      allowLocationSimulation = "YES">
-      <BuildableProductRunnable
-         runnableDebuggingMode = "0">
-         <BuildableReference
-            BuildableIdentifier = "primary"
-            BlueprintIdentifier = "D6A4531229EF64BA00032932"
-            BuildableName = "ShareExtension.appex"
-            BlueprintName = "ShareExtension"
-            ReferencedContainer = "container:Tusker.xcodeproj">
-         </BuildableReference>
-      </BuildableProductRunnable>
-      <MacroExpansion>
-         <BuildableReference
-            BuildableIdentifier = "primary"
-            BlueprintIdentifier = "D6D4DDCB212518A000E1C4BB"
-            BuildableName = "Tusker.app"
-            BlueprintName = "Tusker"
-            ReferencedContainer = "container:Tusker.xcodeproj">
-         </BuildableReference>
-      </MacroExpansion>
-      <AdditionalOptions>
-         <AdditionalOption
-            key = "MallocStackLogging"
-            value = ""
-            isEnabled = "YES">
-         </AdditionalOption>
-      </AdditionalOptions>
-   </LaunchAction>
-   <ProfileAction
-      buildConfiguration = "Release"
-      shouldUseLaunchSchemeArgsEnv = "YES"
-      savedToolIdentifier = ""
-      useCustomWorkingDirectory = "NO"
-      debugDocumentVersioning = "YES"
-      askForAppToLaunch = "Yes"
-      launchAutomaticallySubstyle = "2">
-      <RemoteRunnable
-         runnableDebuggingMode = "1"
-         BundleIdentifier = "com.apple.mobileslideshow"
-         RemotePath = "/Applications/MobileSlideShow.app">
-      </RemoteRunnable>
-   </ProfileAction>
-   <AnalyzeAction
-      buildConfiguration = "Debug">
-   </AnalyzeAction>
-   <ArchiveAction
-      buildConfiguration = "Release"
-      revealArchiveInOrganizer = "YES">
-   </ArchiveAction>
-</Scheme>

Tusker.xcodeproj/xcshareddata/xcschemes/Tusker.xcscheme

@@ -88,10 +88,6 @@
             argument = "-com.apple.CoreData.ConcurrencyDebug 1"
             isEnabled = "YES">
          </CommandLineArgument>
-         <CommandLineArgument
-            argument = "-com.apple.CoreData.CloudKitDebug 0"
-            isEnabled = "YES">
-         </CommandLineArgument>
          <CommandLineArgument
             argument = "-UIFocusLoggingEnabled YES"
             isEnabled = "NO">

Tusker/Extensions/StatusStateResolver.swift

@@ -19,7 +19,7 @@ extension StatusEdit: CollapseStateResolving {}
 extension CollapseState {
     
     func resolveFor(status: CollapseStateResolving, height: () -> CGFloat, textLength: Int? = nil) -> Bool {
-        let newHash = hashStatusProperties(status: status)
+        lazy var newHash = hashStatusProperties(status: status)
         guard unknown || statusPropertiesHash != newHash else {
             return false
         }

Tusker/Extensions/UIView+Configure.swift

@@ -13,7 +13,6 @@ protocol Configurable {
     func configure(_ closure: (T) -> Void) -> T
 }
 extension Configurable where Self: UIView {
-    @inline(__always)
     func configure(_ closure: (Self) -> Void) -> Self {
         closure(self)
         return self

Tusker/Screens/Status Edit History/StatusEditCollectionViewCell.swift

@@ -117,8 +117,8 @@ class StatusEditCollectionViewCell: UICollectionViewListCell {
         }
         
         _ = state.resolveFor(status: edit, height: {
-            let width = self.bounds.width - 2*16
+            layoutIfNeeded()
-            return contentContainer.estimateVisibleSubviewHeight(effectiveWidth: width)
+            return contentContainer.visibleSubviewHeight
         })
         collapseButton.isHidden = !state.collapsible!
         contentContainer.setCollapsed(state.collapsed!)

Tusker/Screens/Status Edit History/StatusEditPollView.swift

@@ -9,9 +9,7 @@
 import UIKit
 import Pachyderm
 
-class StatusEditPollView: UIStackView, StatusContentPollView {
+class StatusEditPollView: UIStackView {
-    
-    private var titleLabels: [EmojiLabel] = []
     
     init() {
         super.init(frame: .zero)
@@ -27,7 +25,6 @@ class StatusEditPollView: UIStackView, StatusContentPollView {
     
     func updateUI(poll: StatusEdit.Poll?, emojis: [Emoji]) {
         arrangedSubviews.forEach { $0.removeFromSuperview() }
-        titleLabels = []
         
         for option in poll?.options ?? [] {
             // the edit poll doesn't actually include the multiple value
@@ -36,7 +33,6 @@ class StatusEditPollView: UIStackView, StatusContentPollView {
             let label = EmojiLabel()
             label.text = option.title
             label.setEmojis(emojis, identifier: Optional<String>.none)
-            titleLabels.append(label)
             let stack = UIStackView(arrangedSubviews: [
                 icon,
                 label,
@@ -48,14 +44,4 @@ class StatusEditPollView: UIStackView, StatusContentPollView {
         }
     }
 
-    func estimateHeight(effectiveWidth: CGFloat) -> CGFloat {
-        var height: CGFloat = 0
-        height += CGFloat(arrangedSubviews.count - 1) * 4
-        let labelWidth = effectiveWidth /* checkbox size: */ - 20 /* spacing: */ - 8
-        for titleLabel in titleLabels {
-            height += titleLabel.sizeThatFits(CGSize(width: labelWidth, height: UIView.layoutFittingCompressedSize.height)).height
-        }
-        return height
-    }
-
 }

Tusker/Views/Attachments/AttachmentsContainerView.swift

@@ -22,15 +22,6 @@ class AttachmentsContainerView: UIView {
     let attachmentStacks: NSHashTable<UIStackView> = .weakObjects()
     var moreView: UIView?
     private var aspectRatioConstraint: NSLayoutConstraint?
-    private(set) var aspectRatio: CGFloat = 16/9 {
-        didSet {
-            if aspectRatio != aspectRatioConstraint?.multiplier {
-                aspectRatioConstraint?.isActive = false
-                aspectRatioConstraint = widthAnchor.constraint(equalTo: heightAnchor, multiplier: aspectRatio)
-                aspectRatioConstraint!.isActive = true
-            }
-        }
-    }
     
     var blurView: UIVisualEffectView?
     var hideButtonView: UIVisualEffectView?
@@ -102,8 +93,7 @@ class AttachmentsContainerView: UIView {
                 fillView(attachmentView)
                 sendSubviewToBack(attachmentView)
                 accessibilityElements.append(attachmentView)
-                if Preferences.shared.showUncroppedMediaInline,
+                if let attachmentAspectRatio = attachmentView.attachmentAspectRatio {
-                   let attachmentAspectRatio = attachmentView.attachmentAspectRatio {
                     aspectRatio = attachmentAspectRatio
                 }
             case 2:
@@ -276,7 +266,18 @@ class AttachmentsContainerView: UIView {
                 accessibilityElements.append(moreView)
             }
             
-            self.aspectRatio = aspectRatio
+            if Preferences.shared.showUncroppedMediaInline {
+                if aspectRatioConstraint?.multiplier != aspectRatio {
+                    aspectRatioConstraint?.isActive = false
+                    aspectRatioConstraint = widthAnchor.constraint(equalTo: heightAnchor, multiplier: aspectRatio)
+                    aspectRatioConstraint!.isActive = true
+                }
+            } else {
+                if aspectRatioConstraint == nil {
+                    aspectRatioConstraint = widthAnchor.constraint(equalTo: heightAnchor, multiplier: 16/9)
+                    aspectRatioConstraint!.isActive = true
+                }
+            }
         } else {
             self.isHidden = true
         }

Tusker/Views/Poll/PollOptionView.swift

@@ -11,27 +11,24 @@ import Pachyderm
 
 class PollOptionView: UIView {
     
-    private static let unselectedBackgroundColor = UIColor(white: 0.5, alpha: 0.25)
+    private let unselectedBackgroundColor = UIColor(white: 0.5, alpha: 0.25)
     
-    private(set) var label: EmojiLabel!
+    let checkbox: PollOptionCheckboxView
-    private(set) var checkbox: PollOptionCheckboxView?
     
     init(poll: Poll, option: Poll.Option, mastodonController: MastodonController) {
+        checkbox = PollOptionCheckboxView(multiple: poll.multiple)
+        
         super.init(frame: .zero)
         
         let minHeight: CGFloat = 35
         layer.cornerRadius = 0.1 * minHeight
         layer.cornerCurve = .continuous
-        backgroundColor = PollOptionView.unselectedBackgroundColor
+        backgroundColor = unselectedBackgroundColor
         
-        let showCheckbox = poll.ownVotes?.isEmpty == false || !poll.effectiveExpired
+        checkbox.translatesAutoresizingMaskIntoConstraints = false
-        if showCheckbox {
+        addSubview(checkbox)
-            checkbox = PollOptionCheckboxView(multiple: poll.multiple)
-            checkbox!.translatesAutoresizingMaskIntoConstraints = false
-            addSubview(checkbox!)
-        }
         
-        label = EmojiLabel()
+        let label = EmojiLabel()
         label.translatesAutoresizingMaskIntoConstraints = false
         label.numberOfLines = 0
         label.font = .preferredFont(forTextStyle: .callout)
@@ -91,8 +88,12 @@ class PollOptionView: UIView {
         NSLayoutConstraint.activate([
             minHeightConstraint,
             
+            checkbox.centerYAnchor.constraint(equalTo: centerYAnchor),
+            checkbox.leadingAnchor.constraint(equalTo: leadingAnchor, constant: 8),
+            
             label.topAnchor.constraint(equalTo: topAnchor, constant: 4),
             label.bottomAnchor.constraint(equalTo: bottomAnchor, constant: -4),
+            label.leadingAnchor.constraint(equalTo: checkbox.trailingAnchor, constant: 8),
             label.trailingAnchor.constraint(equalTo: percentLabel.leadingAnchor, constant: -4),
             
             percentLabel.topAnchor.constraint(equalTo: topAnchor),
@@ -100,16 +101,6 @@ class PollOptionView: UIView {
             percentLabel.trailingAnchor.constraint(equalTo: trailingAnchor, constant: -8),
         ])
         
-        if let checkbox {
-            NSLayoutConstraint.activate([
-                checkbox.centerYAnchor.constraint(equalTo: centerYAnchor),
-                checkbox.leadingAnchor.constraint(equalTo: leadingAnchor, constant: 8),
-                label.leadingAnchor.constraint(equalTo: checkbox.trailingAnchor, constant: 8),
-            ])
-        } else {
-            label.leadingAnchor.constraint(equalTo: leadingAnchor, constant: 8).isActive = true
-        }
-        
         isAccessibilityElement = true
     }
     

Tusker/Views/Poll/PollOptionsView.swift

@@ -14,7 +14,7 @@ class PollOptionsView: UIControl {
     var mastodonController: MastodonController!
 
     var checkedOptionIndices: [Int] {
-        options.enumerated().filter { $0.element.checkbox?.isChecked == true }.map(\.offset)
+        options.enumerated().filter { $0.element.checkbox.isChecked }.map(\.offset)
     }
     var checkedOptionsChanged: (() -> Void)?
     
@@ -32,7 +32,7 @@ class PollOptionsView: UIControl {
     
     override var isEnabled: Bool {
         didSet {
-            options.forEach { $0.checkbox?.readOnly = !isEnabled }
+            options.forEach { $0.checkbox.readOnly = !isEnabled }
         }
     }
     
@@ -65,11 +65,9 @@ class PollOptionsView: UIControl {
         
         options = poll.options.enumerated().map { (index, opt) in
             let optionView = PollOptionView(poll: poll, option: opt, mastodonController: mastodonController)
-            if let checkbox = optionView.checkbox {
+            optionView.checkbox.readOnly = !isEnabled
-                checkbox.readOnly = !isEnabled
+            optionView.checkbox.isChecked = poll.ownVotes?.contains(index) ?? false
-                checkbox.isChecked = poll.ownVotes?.contains(index) ?? false
+            optionView.checkbox.voted = poll.voted ?? false
-                checkbox.voted = poll.voted ?? false
-            }
             stack.addArrangedSubview(optionView)
             return optionView
         }
@@ -77,25 +75,15 @@ class PollOptionsView: UIControl {
         accessibilityElements = options
     }
     
-    func estimateHeight(effectiveWidth: CGFloat) -> CGFloat {
-        var height: CGFloat = 0
-        height += CGFloat(options.count - 1) * stack.spacing
-        for option in options {
-            // this isn't the actual width, but it's close enough for the estimate
-            height += option.label.sizeThatFits(CGSize(width: effectiveWidth, height: UIView.layoutFittingCompressedSize.height)).height
-        }
-        return height
-    }
-    
     private func selectOption(_ option: PollOptionView) {
         if poll.multiple {
-            option.checkbox?.isChecked.toggle()
+            option.checkbox.isChecked.toggle()
         } else {
             for opt in options {
                 if opt === option {
-                    opt.checkbox?.isChecked = true
+                    opt.checkbox.isChecked = true
                 } else {
-                    opt.checkbox?.isChecked = false
+                    opt.checkbox.isChecked = false
                 }
             }
         }

Tusker/Views/Poll/StatusPollView.swift

@@ -9,7 +9,7 @@
 import UIKit
 import Pachyderm
 
-class StatusPollView: UIView, StatusContentPollView {
+class StatusPollView: UIView {
 
     private static let formatter: DateComponentsFormatter = {
         let f = DateComponentsFormatter()
@@ -140,11 +140,6 @@ class StatusPollView: UIView, StatusContentPollView {
         voteButton.isEnabled = false
     }
     
-    func estimateHeight(effectiveWidth: CGFloat) -> CGFloat {
-        guard let poll else { return 0 }
-        return optionsView.estimateHeight(effectiveWidth: effectiveWidth) + infoLabel.sizeThatFits(UIView.layoutFittingExpandedSize).height
-    }
-    
     private func checkedOptionsChanged() {
         voteButton.isEnabled = optionsView.checkedOptionIndices.count > 0
     }

Tusker/Views/Status/ConversationMainStatusCollectionViewCell.swift

@@ -191,13 +191,13 @@ class ConversationMainStatusCollectionViewCell: UICollectionViewListCell, Status
         $0.addInteraction(UIPointerInteraction(delegate: self))
     }
     
-    private(set) lazy var favoriteButton = ToggleableButton(activeColor: UIColor(displayP3Red: 1, green: 0.8, blue: 0, alpha: 1)).configure {
+    private(set) lazy var favoriteButton = UIButton().configure {
         $0.setImage(UIImage(systemName: "star.fill"), for: .normal)
         $0.addTarget(self, action: #selector(favoritePressed), for: .touchUpInside)
         $0.addInteraction(UIPointerInteraction(delegate: self))
     }
     
-    private(set) lazy var reblogButton = ToggleableButton(activeColor: UIColor(displayP3Red: 1, green: 0.8, blue: 0, alpha: 1)).configure {
+    private(set) lazy var reblogButton = UIButton().configure {
         $0.setImage(UIImage(systemName: "repeat"), for: .normal)
         $0.addTarget(self, action: #selector(reblogPressed), for: .touchUpInside)
         $0.addInteraction(UIPointerInteraction(delegate: self))
@@ -348,6 +348,24 @@ class ConversationMainStatusCollectionViewCell: UICollectionViewListCell, Status
         accountDetailAccessibilityElement.navigationDelegate = delegate
         accountDetailAccessibilityElement.accountID = accountID
         
+        let metaButtonAttributes = AttributeContainer([
+            .font: ConversationMainStatusCollectionViewCell.metaFont
+        ])
+        
+        let favoritesFormat = NSLocalizedString("favorites count", comment: "conv main status favorites button label")
+        var favoritesConfig = UIButton.Configuration.plain()
+        favoritesConfig.baseForegroundColor = .secondaryLabel
+        favoritesConfig.attributedTitle = AttributedString(String.localizedStringWithFormat(favoritesFormat, status.favouritesCount), attributes: metaButtonAttributes)
+        favoritesConfig.contentInsets = .zero
+        favoritesCountButton.configuration = favoritesConfig
+        
+        let reblogsFormat = NSLocalizedString("reblogs count", comment: "conv main status reblogs button label")
+        var reblogsConfig = UIButton.Configuration.plain()
+        reblogsConfig.baseForegroundColor = .secondaryLabel
+        reblogsConfig.attributedTitle = AttributedString(String.localizedStringWithFormat(reblogsFormat, status.reblogsCount), attributes: metaButtonAttributes)
+        reblogsConfig.contentInsets = .zero
+        reblogsCountButton.configuration = reblogsConfig
+        
         var timestampAndClientText = ConversationMainStatusCollectionViewCell.dateFormatter.string(from: status.createdAt)
         if let application = status.applicationName {
             timestampAndClientText += " • \(application)"
@@ -358,9 +376,7 @@ class ConversationMainStatusCollectionViewCell: UICollectionViewListCell, Status
             editTimestampButton.isHidden = false
             var config = UIButton.Configuration.plain()
             config.baseForegroundColor = .secondaryLabel
-            config.attributedTitle = AttributedString("Edited on \(ConversationMainStatusCollectionViewCell.dateFormatter.string(from: editedAt))", attributes: AttributeContainer([
+            config.attributedTitle = AttributedString("Edited on \(ConversationMainStatusCollectionViewCell.dateFormatter.string(from: editedAt))", attributes: metaButtonAttributes)
-                .font: ConversationMainStatusCollectionViewCell.metaFont
-            ]))
             config.contentInsets = .zero
             editTimestampButton.configuration = config
         } else {
@@ -376,33 +392,6 @@ class ConversationMainStatusCollectionViewCell: UICollectionViewListCell, Status
         baseCreateObservers()
     }
     
-    func updateStatusState(status: StatusMO) {
-        baseUpdateStatusState(status: status)
-        
-        let attributes = AttributeContainer([
-            .font: ConversationMainStatusCollectionViewCell.metaFont
-        ])
-        
-        let favoritesFormat = NSLocalizedString("favorites count", comment: "conv main status favorites button label")
-        var favoritesConfig = UIButton.Configuration.plain()
-        favoritesConfig.baseForegroundColor = .secondaryLabel
-        favoritesConfig.attributedTitle = AttributedString(String.localizedStringWithFormat(favoritesFormat, status.favouritesCount), attributes: attributes)
-        favoritesConfig.contentInsets = .zero
-        favoritesCountButton.configuration = favoritesConfig
-        
-        let reblogsFormat = NSLocalizedString("reblogs count", comment: "conv main status reblogs button label")
-        var reblogsConfig = UIButton.Configuration.plain()
-        reblogsConfig.baseForegroundColor = .secondaryLabel
-        reblogsConfig.attributedTitle = AttributedString(String.localizedStringWithFormat(reblogsFormat, status.reblogsCount), attributes: attributes)
-        reblogsConfig.contentInsets = .zero
-        reblogsCountButton.configuration = reblogsConfig
-    }
-    
-    func estimateContentHeight() -> CGFloat {
-        let width = bounds.width - 2*16
-        return contentContainer.estimateVisibleSubviewHeight(effectiveWidth: width)
-    }
-    
     func updateUIForPreferences(status: StatusMO) {
         baseUpdateUIForPreferences(status: status)
     }

Tusker/Views/Status/StatusCollectionViewCell.swift

@@ -26,8 +26,8 @@ protocol StatusCollectionViewCell: UICollectionViewCell, AttachmentViewDelegate
     var collapseButton: StatusCollapseButton { get }
     var contentContainer: StatusContentContainer<StatusContentTextView, StatusPollView> { get }
     var replyButton: UIButton { get }
-    var favoriteButton: ToggleableButton { get }
+    var favoriteButton: UIButton { get }
-    var reblogButton: ToggleableButton { get }
+    var reblogButton: UIButton { get }
     var moreButton: UIButton { get }
     var prevThreadLinkView: UIView? { get set }
     var nextThreadLinkView: UIView? { get set }
@@ -45,8 +45,6 @@ protocol StatusCollectionViewCell: UICollectionViewCell, AttachmentViewDelegate
     var cancellables: Set<AnyCancellable> { get set }
     
     func updateUIForPreferences(status: StatusMO)
-    func updateStatusState(status: StatusMO)
-    func estimateContentHeight() -> CGFloat
 }
 
 // MARK: UI Configuration
@@ -60,14 +58,8 @@ extension StatusCollectionViewCell {
             .receive(on: DispatchQueue.main)
             .filter { [unowned self] in $0 == self.statusID }
             .sink { [unowned self] _ in
-                if let status = self.mastodonController.persistentContainer.status(for: self.statusID) {
-                    // update immediately w/o animation
-                    self.favoriteButton.active = status.favourited
-                    self.reblogButton.active = status.reblogged
-                    
                 self.delegate?.statusCellNeedsReconfigure(self, animated: true, completion: nil)
             }
-            }
             .store(in: &cancellables)
         
         mastodonController.persistentContainer.accountSubject
@@ -106,7 +98,6 @@ extension StatusCollectionViewCell {
         }
         
         updateUIForPreferences(status: status)
-        updateStatusState(status: status)
         
         contentWarningLabel.text = status.spoilerText
         contentWarningLabel.isHidden = status.spoilerText.isEmpty
@@ -114,17 +105,35 @@ extension StatusCollectionViewCell {
             contentWarningLabel.setEmojis(status.emojis, identifier: statusID)
         }
         
-        reblogButton.isEnabled = reblogEnabled(status: status)
         replyButton.isEnabled = mastodonController.loggedIn
-        favoriteButton.isEnabled = mastodonController.loggedIn
         
-        let didResolve = statusState.resolveFor(status: status, height: self.estimateContentHeight)
+        favoriteButton.isEnabled = mastodonController.loggedIn
-//        let didResolve = statusState.resolveFor(status: status) {
+        if status.favourited {
-////            // layout so that we can take the content height into consideration when deciding whether to collapse
+            favoriteButton.tintColor = UIColor(displayP3Red: 1, green: 0.8, blue: 0, alpha: 1)
-////            layoutIfNeeded()
+            favoriteButton.accessibilityLabel = NSLocalizedString("Undo Favorite", comment: "undo favorite button accessibility label")
-////            return contentContainer.visibleSubviewHeight
+        } else {
-//            return contentContainer.estimateVisibleSubviewHeight(effectiveWidth: )
+            favoriteButton.tintColor = nil
-//        }
+            favoriteButton.accessibilityLabel = NSLocalizedString("Favorite", comment: "favorite button accessibility label")
+        }
+        
+        reblogButton.isEnabled = reblogEnabled(status: status)
+        if status.reblogged {
+            reblogButton.tintColor = UIColor(displayP3Red: 1, green: 0.8, blue: 0, alpha: 1)
+            reblogButton.accessibilityLabel = NSLocalizedString("Undo Reblog", comment: "undo reblog button accessibility label")
+        } else {
+            reblogButton.tintColor = nil
+            reblogButton.accessibilityLabel = NSLocalizedString("Reblog", comment: "reblog button accessibility label")
+        }
+        
+        // keep menu in sync with changed states e.g. bookmarked, muted
+        // do not include reply action here, because the cell already contains a button for it
+        moreButton.menu = UIMenu(title: "", image: nil, identifier: nil, options: [], children: delegate?.actionsForStatus(status, source: .view(moreButton), includeStatusButtonActions: false) ?? [])
+        
+        let didResolve = statusState.resolveFor(status: status) {
+            // layout so that we can take the content height into consideration when deciding whether to collapse
+            layoutIfNeeded()
+            return contentContainer.visibleSubviewHeight
+        }
         if didResolve {
             if statusState.collapsible! && showStatusAutomatically {
                 statusState.collapsed = false
@@ -148,9 +157,7 @@ extension StatusCollectionViewCell {
         guard mastodonController.loggedIn else {
             return false
         }
-        if status.visibility == .direct {
+        if status.visibility == .direct || status.visibility == .private {
-            return false
-        } else if status.visibility == .private {
             if mastodonController.instanceFeatures.boostToOriginalAudience,
                status.account.id == mastodonController.account?.id {
                 return true
@@ -205,30 +212,6 @@ extension StatusCollectionViewCell {
         displayNameLabel.updateForAccountDisplayName(account: status.account)
     }
     
-    func baseUpdateStatusState(status: StatusMO) {
-        favoriteButton.active = status.favourited
-        if status.favourited {
-            favoriteButton.accessibilityLabel = NSLocalizedString("Undo Favorite", comment: "undo favorite button accessibility label")
-        } else {
-            favoriteButton.accessibilityLabel = NSLocalizedString("Favorite", comment: "favorite button accessibility label")
-        }
-        reblogButton.active = status.reblogged
-        if status.reblogged {
-            reblogButton.accessibilityLabel = NSLocalizedString("Undo Reblog", comment: "undo reblog button accessibility label")
-        } else {
-            reblogButton.accessibilityLabel = NSLocalizedString("Reblog", comment: "reblog button accessibility label")
-        }
-        
-        // keep menu in sync with changed states e.g. bookmarked, muted
-        // do not include reply action here, because the cell already contains a button for it
-        moreButton.menu = UIMenu(title: "", image: nil, identifier: nil, options: [], children: delegate?.actionsForStatus(status, source: .view(moreButton), includeStatusButtonActions: false) ?? [])
-        
-        contentContainer.pollView.isHidden = status.poll == nil
-        contentContainer.pollView.mastodonController = mastodonController
-        contentContainer.pollView.delegate = delegate
-        contentContainer.pollView.updateUI(status: status, poll: status.poll)
-    }
-    
     func setShowThreadLinks(prev: Bool, next: Bool) {
         if prev {
             if let prevThreadLinkView {

Tusker/Views/Status/StatusContentContainer.swift

@@ -8,11 +8,7 @@
 
 import UIKit
 
-protocol StatusContentPollView: UIView {
+class StatusContentContainer<ContentView: ContentTextView, PollView: UIView>: UIView {
-    func estimateHeight(effectiveWidth: CGFloat) -> CGFloat
-}
-
-class StatusContentContainer<ContentView: ContentTextView, PollView: StatusContentPollView>: UIView {
     
     private var useTopSpacer = false
     private let topSpacer = UIView().configure {
@@ -29,10 +25,9 @@ class StatusContentContainer<ContentView: ContentTextView, PollView: StatusConte
          $0.isSelectable = false
     }
     
-    private static var cardViewHeight: CGFloat { 90 }
     let cardView = StatusCardView().configure {
         NSLayoutConstraint.activate([
-            $0.heightAnchor.constraint(equalToConstant: StatusContentContainer.cardViewHeight),
+            $0.heightAnchor.constraint(equalToConstant: 90),
         ])
     }
     
@@ -137,22 +132,4 @@ class StatusContentContainer<ContentView: ContentTextView, PollView: StatusConte
         zeroHeightConstraint.isActive = collapsed
     }
     
-    // used only for collapsing automatically based on height, doesn't need to be accurate
-    // just roughly inline with the content height
-    func estimateVisibleSubviewHeight(effectiveWidth: CGFloat) -> CGFloat {
-        var height: CGFloat = 0
-        height += contentTextView.sizeThatFits(CGSize(width: effectiveWidth, height: UIView.layoutFittingCompressedSize.height)).height
-        if !cardView.isHidden {
-            height += StatusContentContainer.cardViewHeight
-        }
-        if !attachmentsView.isHidden {
-            height += effectiveWidth / attachmentsView.aspectRatio
-        }
-        if !pollView.isHidden {
-            let pollHeight = pollView.estimateHeight(effectiveWidth: effectiveWidth)
-            height += pollHeight
-        }
-        return height
-    }
-    
 }

Tusker/Views/Status/TimelineStatusCollectionViewCell.swift

@@ -238,13 +238,13 @@ class TimelineStatusCollectionViewCell: UICollectionViewListCell, StatusCollecti
         $0.addInteraction(UIPointerInteraction(delegate: self))
     }
     
-    private(set) lazy var favoriteButton = ToggleableButton(activeColor: UIColor(displayP3Red: 1, green: 0.8, blue: 0, alpha: 1)).configure {
+    private(set) lazy var favoriteButton = UIButton().configure {
         $0.setImage(UIImage(systemName: "star.fill"), for: .normal)
         $0.addTarget(self, action: #selector(favoritePressed), for: .touchUpInside)
         $0.addInteraction(UIPointerInteraction(delegate: self))
     }
     
-    private(set) lazy var reblogButton = ToggleableButton(activeColor: UIColor(displayP3Red: 1, green: 0.8, blue: 0, alpha: 1)).configure {
+    private(set) lazy var reblogButton = UIButton().configure {
         $0.setImage(UIImage(systemName: "repeat"), for: .normal)
         $0.addTarget(self, action: #selector(reblogPressed), for: .touchUpInside)
         $0.addInteraction(UIPointerInteraction(delegate: self))
@@ -625,15 +625,6 @@ class TimelineStatusCollectionViewCell: UICollectionViewListCell, StatusCollecti
         }
     }
     
-    func updateStatusState(status: StatusMO) {
-        baseUpdateStatusState(status: status)
-    }
-    
-    func estimateContentHeight() -> CGFloat {
-        let width = bounds.width /* leading spacing: */ - 16 /* avatar: */ - 50 /* spacing: 8 */ - 8 /* trailing spacing: */ - 16
-        return contentContainer.estimateVisibleSubviewHeight(effectiveWidth: width)
-    }
-    
     private func updateTimestamp() {
         guard let mastodonController,
               let status = mastodonController.persistentContainer.status(for: statusID) else {

Tusker/Views/ToggleableButton.swift

@@ -1,31 +0,0 @@
-//
-//  ToggleableButton.swift
-//  Tusker
-//
-//  Created by Shadowfacts on 5/13/23.
-//  Copyright © 2023 Shadowfacts. All rights reserved.
-//
-
-import UIKit
-
-class ToggleableButton: UIButton {
-    
-    let activeColor: UIColor
-    
-    var active: Bool {
-        didSet {
-            tintColor = active ? activeColor : nil
-        }
-    }
-    
-    init(activeColor: UIColor) {
-        self.activeColor = activeColor
-        self.active = false
-        super.init(frame: .zero)
-    }
-    
-    required init?(coder: NSCoder) {
-        fatalError("init(coder:) has not been implemented")
-    }
-    
-}