ContentTextView cleanup

Fixes crash when re-showing timeline actions after being hidden

Tusker/Screens/Utilities/SegmentedPageViewController.swift

@@ -13,11 +13,13 @@ class SegmentedPageViewController: UIPageViewController, UIPageViewControllerDel
     let titles: [String]
     let pageControllers: [UIViewController]
     
-    private(set) var currentIndex: Int!
+    private(set) var currentIndex = 0
     
     var segmentedControl: UISegmentedControl!
 
     init(titles: [String], pageControllers: [UIViewController]) {
+        precondition(!pageControllers.isEmpty)
+        
         self.titles = titles
         self.pageControllers = pageControllers
         
@@ -41,7 +43,6 @@ class SegmentedPageViewController: UIPageViewController, UIPageViewControllerDel
         
         view.backgroundColor = .systemBackground
         
-        segmentedControl.selectedSegmentIndex = 0
         selectPage(at: 0, animated: false)
         
         addKeyCommand(MenuController.prevSubTabCommand)
@@ -56,7 +57,7 @@ class SegmentedPageViewController: UIPageViewController, UIPageViewControllerDel
     }
     
     func selectPage(at index: Int, animated: Bool) {
-        let direction: UIPageViewController.NavigationDirection = currentIndex == nil ? .forward  : index - currentIndex > 0 ? .forward : .reverse
+        let direction: UIPageViewController.NavigationDirection = index - currentIndex > 0 ? .forward : .reverse
         setViewControllers([pageControllers[index]], direction: direction, animated: animated)
         navigationItem.title = pageControllers[index].title
         currentIndex = index

Tusker/Screens/Utilities/SplitNavigationController.swift

@@ -67,6 +67,17 @@ class SplitNavigationController: UIViewController {
         if let rootViewController {
             rootNav.viewControllers = [rootViewController]
         }
+        
+        // add the child VCs here, rather than in viewDidLoad, because this VC is added to the UISplitViewController,
+        // it needs a UINavigationController to be this VC's first child, otherwise it will embed this VC inside
+        // yet another UINavigationController, which can then cause a crash when we try to embed a nav controller inside
+        // of ourself (because nested nav controllers are forbidden)
+        rootNav.willMove(toParent: self)
+        addChild(rootNav)
+        rootNav.didMove(toParent: self)
+        secondaryNav.willMove(toParent: self)
+        addChild(secondaryNav)
+        secondaryNav.didMove(toParent: self)
     }
     
     required init?(coder: NSCoder) {
@@ -76,10 +87,10 @@ class SplitNavigationController: UIViewController {
     override func viewDidLoad() {
         super.viewDidLoad()
         
-        embedChild(rootNav, layout: false)
-        embedChild(secondaryNav, layout: false)
         rootNav.view.translatesAutoresizingMaskIntoConstraints = false
+        view.addSubview(rootNav.view)
         secondaryNav.view.translatesAutoresizingMaskIntoConstraints = false
+        view.addSubview(secondaryNav.view)
 
         separatorView.backgroundColor = .separator
         separatorView.translatesAutoresizingMaskIntoConstraints = false

Tusker/Views/ContentTextView.swift

@@ -197,13 +197,17 @@ class ContentTextView: LinkTextView, BaseEmojiLabel {
         let locationInTextContainer = CGPoint(x: point.x - textContainerInset.left, y: point.y - textContainerInset.top)
         if #available(iOS 16.0, *),
            let textLayoutManager {
-            guard let fragment = textLayoutManager.textLayoutFragment(for: point),
+            guard let fragment = textLayoutManager.textLayoutFragment(for: locationInTextContainer) else {
-               let lineFragment = fragment.textLineFragments.first(where: { lineFragment in
+                return nil
-                   lineFragment.typographicBounds.offsetBy(dx: fragment.layoutFragmentFrame.minX, dy: fragment.layoutFragmentFrame.minY).contains(point)
+            }
+            let pointInLayoutFragment = CGPoint(x: locationInTextContainer.x - fragment.layoutFragmentFrame.minX, y: locationInTextContainer.y - fragment.layoutFragmentFrame.minY)
+            guard let lineFragment = fragment.textLineFragments.first(where: { lineFragment in
+                   lineFragment.typographicBounds.contains(pointInLayoutFragment)
                }) else {
                 return nil
             }
-            let charIndex = lineFragment.characterIndex(for: point)
+            let pointInLineFragment = CGPoint(x: pointInLayoutFragment.x - lineFragment.typographicBounds.minX, y: pointInLayoutFragment.y - lineFragment.typographicBounds.minY)
+            let charIndex = lineFragment.characterIndex(for: pointInLineFragment)
             
             var range = NSRange()
             guard let link = lineFragment.attributedString.attribute(.link, at: charIndex, longestEffectiveRange: &range, in: lineFragment.attributedString.fullRange) as? URL else {
@@ -332,7 +336,7 @@ extension ContentTextView: UIContextMenuInteractionDelegate {
                 return nil
             }
             // .standard because i have no idea what the difference is
-            textLayoutManager.enumerateTextSegments(in: textRange, type: .standard, options: []) { range, rect, float, textContainer in
+            textLayoutManager.enumerateTextSegments(in: textRange, type: .standard, options: .rangeNotRequired) { range, rect, float, textContainer in
                 rects.append(rect)
                 return true
             }

Tusker/Views/Status/TimelineStatusTableViewCell.swift

@@ -20,6 +20,7 @@ class TimelineStatusTableViewCell: BaseStatusTableViewCell {
     }()
     
     @IBOutlet weak var reblogLabel: EmojiLabel!
+    @IBOutlet weak var reblogSpacer: UIView!
     @IBOutlet weak var timestampLabel: UILabel!
     @IBOutlet weak var pinImageView: UIImageView!
     @IBOutlet weak var actionsContainerView: UIView!
@@ -82,6 +83,7 @@ class TimelineStatusTableViewCell: BaseStatusTableViewCell {
             reblogStatusID = statusID
             rebloggerID = status.account.id
             reblogLabel.isHidden = false
+            reblogSpacer.isHidden = false
             updateRebloggerLabel(reblogger: status.account)
             
             status = rebloggedStatus
@@ -91,6 +93,7 @@ class TimelineStatusTableViewCell: BaseStatusTableViewCell {
             reblogStatusID = nil
             rebloggerID = nil
             reblogLabel.isHidden = true
+            reblogSpacer.isHidden = true
         }
         
         super.doUpdateUI(status: status, state: state)
@@ -131,8 +134,12 @@ class TimelineStatusTableViewCell: BaseStatusTableViewCell {
         let oldState = actionsContainerView.isHidden
         if oldState != Preferences.shared.hideActionsInTimeline {
             updateActionsVisibility()
-            // not really accurate, but it notifies the vc our height has changed
+            if #available(iOS 16.0, *) {
-            delegate?.statusCellCollapsedStateChanged(self)
+                invalidateIntrinsicContentSize()
+            } else {
+                // not really accurate, but it notifies the vc our height has changed
+                delegate?.statusCellCollapsedStateChanged(self)
+            }
         }
         
         super.updateStatusIconsForPreferences(status)
@@ -141,16 +148,8 @@ class TimelineStatusTableViewCell: BaseStatusTableViewCell {
     private func updateActionsVisibility() {
         if Preferences.shared.hideActionsInTimeline {
             actionsContainerView.isHidden = true
-            actionsContainerHeightConstraint.isActive = false
-            verticalStackToSuperviewConstraint.isActive = true
-            verticalStackToActionsContainerConstraint.isActive = false
         } else {
             actionsContainerView.isHidden = false
-            // sometimes this constraint is nil for reasons i can't discern
-            // not re-activating in that case doesn't seem to make a difference
-            actionsContainerHeightConstraint?.isActive = true
-            verticalStackToSuperviewConstraint.isActive = false
-            verticalStackToActionsContainerConstraint.isActive = true
         }
     }
     

Tusker/Views/Status/TimelineStatusTableViewCell.xib

@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="21179.7" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="21208.1" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
     <device id="retina4_7" orientation="portrait" appearance="light"/>
     <dependencies>
         <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="21169.4"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="21191"/>
         <capability name="Safe area layout guides" minToolsVersion="9.0"/>
         <capability name="System colors in document resources" minToolsVersion="11.0"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
@@ -15,17 +15,24 @@
             <rect key="frame" x="0.0" y="0.0" width="375" height="240"/>
             <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
             <subviews>
-                <stackView opaque="NO" contentMode="scaleToFill" axis="vertical" alignment="top" spacing="8" translatesAutoresizingMaskIntoConstraints="NO" id="yNh-ac-v6c">
+                <stackView opaque="NO" contentMode="scaleToFill" axis="vertical" translatesAutoresizingMaskIntoConstraints="NO" id="yNh-ac-v6c">
                     <rect key="frame" x="16" y="8" width="343" height="224"/>
                     <subviews>
                         <label opaque="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="252" verticalCompressionResistancePriority="751" text="Reblogged by Person" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="lDH-50-AJZ" customClass="EmojiLabel" customModule="Tusker" customModuleProvider="target">
-                            <rect key="frame" x="0.0" y="0.0" width="162.5" height="20.5"/>
+                            <rect key="frame" x="0.0" y="0.0" width="343" height="20.5"/>
                             <fontDescription key="fontDescription" type="system" pointSize="17"/>
                             <color key="textColor" systemColor="secondaryLabelColor"/>
                             <nil key="highlightedColor"/>
                         </label>
+                        <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="H6C-5s-ICE">
+                            <rect key="frame" x="0.0" y="20.5" width="343" height="4"/>
+                            <color key="backgroundColor" systemColor="systemBackgroundColor"/>
+                            <constraints>
+                                <constraint firstAttribute="height" constant="4" id="KdU-GV-9et"/>
+                            </constraints>
+                        </view>
                         <view contentMode="scaleToFill" verticalHuggingPriority="249" translatesAutoresizingMaskIntoConstraints="NO" id="ve3-Y1-NQH">
-                            <rect key="frame" x="0.0" y="28.5" width="343" height="195.5"/>
+                            <rect key="frame" x="0.0" y="24.5" width="343" height="173.5"/>
                             <subviews>
                                 <imageView contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="QMP-j2-HLn">
                                     <rect key="frame" x="0.0" y="0.0" width="50" height="50"/>
@@ -109,36 +116,30 @@
                                             </connections>
                                         </button>
                                         <textView clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" scrollEnabled="NO" delaysContentTouches="NO" editable="NO" textAlignment="natural" selectable="NO" translatesAutoresizingMaskIntoConstraints="NO" id="waJ-f5-LKv" customClass="StatusContentTextView" customModule="Tusker" customModuleProvider="target">
-                                            <rect key="frame" x="0.0" y="83" width="277" height="82.5"/>
+                                            <rect key="frame" x="0.0" y="83" width="277" height="86.5"/>
                                             <string key="text">Lorem ipsum dolor sit er elit lamet, consectetaur cillium adipisicing pecu, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum. Nam liber te conscient to factor tum poen legum odioque civiuda.</string>
                                             <color key="textColor" systemColor="labelColor"/>
                                             <fontDescription key="fontDescription" type="system" pointSize="16"/>
                                             <textInputTraits key="textInputTraits" autocapitalizationType="sentences"/>
                                         </textView>
                                         <view hidden="YES" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="LKo-VB-XWl" customClass="StatusCardView" customModule="Tusker" customModuleProvider="target">
-                                            <rect key="frame" x="0.0" y="167.5" width="277" height="0.0"/>
+                                            <rect key="frame" x="0.0" y="171.5" width="277" height="0.0"/>
                                             <color key="backgroundColor" systemColor="systemBackgroundColor"/>
                                             <constraints>
                                                 <constraint firstAttribute="height" priority="999" constant="65" id="khY-jm-CPn"/>
                                             </constraints>
                                         </view>
                                         <view hidden="YES" contentMode="scaleToFill" verticalCompressionResistancePriority="1" translatesAutoresizingMaskIntoConstraints="NO" id="nbq-yr-2mA" customClass="AttachmentsContainerView" customModule="Tusker" customModuleProvider="target">
-                                            <rect key="frame" x="0.0" y="167.5" width="277" height="0.0"/>
+                                            <rect key="frame" x="0.0" y="171.5" width="277" height="0.0"/>
                                             <color key="backgroundColor" systemColor="secondarySystemBackgroundColor"/>
                                             <constraints>
                                                 <constraint firstAttribute="height" secondItem="nbq-yr-2mA" secondAttribute="width" multiplier="9:16" priority="999" id="Rvt-zs-fkd"/>
                                             </constraints>
                                         </view>
                                         <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="x3b-Zl-9F0" customClass="StatusPollView" customModule="Tusker" customModuleProvider="target">
-                                            <rect key="frame" x="0.0" y="169.5" width="277" height="0.0"/>
+                                            <rect key="frame" x="0.0" y="173.5" width="277" height="0.0"/>
                                             <color key="backgroundColor" systemColor="systemBackgroundColor"/>
                                         </view>
-                                        <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="1" verticalCompressionResistancePriority="1" text="" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="oFl-rC-EEN">
-                                            <rect key="frame" x="0.0" y="173.5" width="277" height="0.0"/>
-                                            <fontDescription key="fontDescription" type="system" pointSize="17"/>
-                                            <nil key="textColor"/>
-                                            <nil key="highlightedColor"/>
-                                        </label>
                                     </subviews>
                                 </stackView>
                                 <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="qBn-Gk-DCa" customClass="StatusMetaIndicatorsView" customModule="Tusker" customModuleProvider="target">
@@ -148,78 +149,18 @@
                                         <constraint firstAttribute="height" constant="22" placeholder="YES" id="ipd-WE-P20"/>
                                     </constraints>
                                 </view>
-                                <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="TUP-Nz-5Yh">
-                                    <rect key="frame" x="0.0" y="169.5" width="335" height="26"/>
-                                    <subviews>
-                                        <button opaque="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" pointerInteraction="YES" translatesAutoresizingMaskIntoConstraints="NO" id="rKF-yF-KIa">
-                                            <rect key="frame" x="0.0" y="0.0" width="84" height="26"/>
-                                            <accessibility key="accessibilityConfiguration" label="Reply"/>
-                                            <fontDescription key="fontDescription" type="system" pointSize="18"/>
-                                            <state key="normal" image="arrowshape.turn.up.left.fill" catalog="system"/>
-                                            <connections>
-                                                <action selector="replyPressed" destination="iN0-l3-epB" eventType="touchUpInside" id="ybz-3W-jAa"/>
-                                            </connections>
-                                        </button>
-                                        <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" pointerInteraction="YES" translatesAutoresizingMaskIntoConstraints="NO" id="6tW-z8-Qh9">
-                                            <rect key="frame" x="167.5" y="0.0" width="84" height="26"/>
-                                            <accessibility key="accessibilityConfiguration" label="Reblog"/>
-                                            <state key="normal" image="repeat" catalog="system"/>
-                                            <connections>
-                                                <action selector="reblogPressed" destination="iN0-l3-epB" eventType="touchUpInside" id="Wa2-ZA-TBo"/>
-                                            </connections>
-                                        </button>
-                                        <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" pointerInteraction="YES" translatesAutoresizingMaskIntoConstraints="NO" id="982-J4-NGl">
-                                            <rect key="frame" x="251.5" y="0.0" width="83.5" height="26"/>
-                                            <accessibility key="accessibilityConfiguration" label="More Actions"/>
-                                            <state key="normal" image="ellipsis" catalog="system"/>
-                                            <connections>
-                                                <action selector="morePressed" destination="iN0-l3-epB" eventType="touchUpInside" id="WT4-fi-usq"/>
-                                            </connections>
-                                        </button>
-                                        <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" pointerInteraction="YES" translatesAutoresizingMaskIntoConstraints="NO" id="x0t-TR-jJ4">
-                                            <rect key="frame" x="84" y="0.0" width="83.5" height="26"/>
-                                            <accessibility key="accessibilityConfiguration" label="Favorite"/>
-                                            <state key="normal" image="star.fill" catalog="system"/>
-                                            <connections>
-                                                <action selector="favoritePressed" destination="iN0-l3-epB" eventType="touchUpInside" id="8Q8-Rz-k02"/>
-                                            </connections>
-                                        </button>
-                                    </subviews>
-                                    <constraints>
-                                        <constraint firstAttribute="height" constant="26" id="1FK-Er-G11"/>
-                                        <constraint firstAttribute="bottom" secondItem="rKF-yF-KIa" secondAttribute="bottom" id="KyG-2C-MgN"/>
-                                        <constraint firstItem="x0t-TR-jJ4" firstAttribute="top" secondItem="TUP-Nz-5Yh" secondAttribute="top" id="L3w-JH-eeG"/>
-                                        <constraint firstItem="6tW-z8-Qh9" firstAttribute="top" secondItem="TUP-Nz-5Yh" secondAttribute="top" id="N7j-f4-gvP"/>
-                                        <constraint firstItem="982-J4-NGl" firstAttribute="leading" secondItem="6tW-z8-Qh9" secondAttribute="trailing" id="VQo-DJ-C7L"/>
-                                        <constraint firstItem="982-J4-NGl" firstAttribute="top" secondItem="TUP-Nz-5Yh" secondAttribute="top" id="W53-1a-fKu"/>
-                                        <constraint firstItem="x0t-TR-jJ4" firstAttribute="leading" secondItem="rKF-yF-KIa" secondAttribute="trailing" id="WPd-A2-6Ju"/>
-                                        <constraint firstItem="rKF-yF-KIa" firstAttribute="width" secondItem="x0t-TR-jJ4" secondAttribute="width" id="X7m-pJ-oje"/>
-                                        <constraint firstItem="rKF-yF-KIa" firstAttribute="leading" secondItem="TUP-Nz-5Yh" secondAttribute="leading" placeholder="YES" id="aFR-Ew-99S"/>
-                                        <constraint firstAttribute="bottom" secondItem="982-J4-NGl" secondAttribute="bottom" id="eXy-3h-51w"/>
-                                        <constraint firstAttribute="bottom" secondItem="x0t-TR-jJ4" secondAttribute="bottom" id="euN-Nf-rwh"/>
-                                        <constraint firstItem="6tW-z8-Qh9" firstAttribute="leading" secondItem="x0t-TR-jJ4" secondAttribute="trailing" id="oAK-VG-bbp"/>
-                                        <constraint firstAttribute="bottom" secondItem="6tW-z8-Qh9" secondAttribute="bottom" id="tpf-Q3-V3l"/>
-                                        <constraint firstAttribute="trailing" secondItem="982-J4-NGl" secondAttribute="trailing" id="uQG-FZ-F7u"/>
-                                        <constraint firstItem="rKF-yF-KIa" firstAttribute="width" secondItem="982-J4-NGl" secondAttribute="width" id="vir-iq-biv"/>
-                                        <constraint firstItem="rKF-yF-KIa" firstAttribute="width" secondItem="6tW-z8-Qh9" secondAttribute="width" id="vqw-d7-VtZ"/>
-                                        <constraint firstItem="rKF-yF-KIa" firstAttribute="top" secondItem="TUP-Nz-5Yh" secondAttribute="top" id="wWH-J7-egM"/>
-                                    </constraints>
-                                </view>
                             </subviews>
                             <constraints>
                                 <constraint firstItem="gIY-Wp-RSk" firstAttribute="leading" secondItem="QMP-j2-HLn" secondAttribute="trailing" constant="8" id="0Tm-v7-Ts4"/>
                                 <constraint firstAttribute="bottom" relation="greaterThanOrEqual" secondItem="QMP-j2-HLn" secondAttribute="bottom" constant="8" id="2Ao-Gj-fY3"/>
-                                <constraint firstItem="TUP-Nz-5Yh" firstAttribute="trailing" secondItem="ve3-Y1-NQH" secondAttribute="trailingMargin" id="3l0-tE-Ak1"/>
+                                <constraint firstAttribute="bottom" relation="greaterThanOrEqual" secondItem="gIY-Wp-RSk" secondAttribute="bottom" id="6OU-Ub-VH8"/>
-                                <constraint firstItem="TUP-Nz-5Yh" firstAttribute="top" secondItem="gIY-Wp-RSk" secondAttribute="bottom" constant="-4" id="4KL-a3-qyf"/>
                                 <constraint firstItem="gIY-Wp-RSk" firstAttribute="leading" secondItem="qBn-Gk-DCa" secondAttribute="trailing" constant="8" id="AQs-QN-j49"/>
+                                <constraint firstAttribute="bottom" relation="greaterThanOrEqual" secondItem="qBn-Gk-DCa" secondAttribute="bottom" id="P1i-ZM-TRt"/>
                                 <constraint firstItem="QMP-j2-HLn" firstAttribute="top" secondItem="ve3-Y1-NQH" secondAttribute="top" id="PC4-Bi-QXm"/>
-                                <constraint firstItem="TUP-Nz-5Yh" firstAttribute="leading" secondItem="ve3-Y1-NQH" secondAttribute="leading" id="QZ2-iO-ckC"/>
                                 <constraint firstItem="gIY-Wp-RSk" firstAttribute="top" secondItem="QMP-j2-HLn" secondAttribute="top" id="fEd-wN-kuQ"/>
-                                <constraint firstItem="TUP-Nz-5Yh" firstAttribute="bottom" relation="greaterThanOrEqual" secondItem="qBn-Gk-DCa" secondAttribute="bottom" id="gxb-hp-7lU"/>
                                 <constraint firstAttribute="trailingMargin" secondItem="gIY-Wp-RSk" secondAttribute="trailing" id="hKk-kO-wFT"/>
                                 <constraint firstItem="qBn-Gk-DCa" firstAttribute="leading" relation="greaterThanOrEqual" secondItem="ve3-Y1-NQH" secondAttribute="leading" id="iLD-VU-ixJ"/>
                                 <constraint firstAttribute="bottom" secondItem="gIY-Wp-RSk" secondAttribute="bottom" id="kq7-bk-S8j"/>
-                                <constraint firstAttribute="bottom" secondItem="TUP-Nz-5Yh" secondAttribute="bottom" id="rmQ-QM-Llu"/>
                                 <constraint firstItem="qBn-Gk-DCa" firstAttribute="top" secondItem="QMP-j2-HLn" secondAttribute="bottom" constant="4" id="tKU-VP-n8P"/>
                                 <constraint firstItem="qBn-Gk-DCa" firstAttribute="width" secondItem="QMP-j2-HLn" secondAttribute="width" id="v1v-Pp-ubE"/>
                                 <constraint firstItem="QMP-j2-HLn" firstAttribute="leading" secondItem="ve3-Y1-NQH" secondAttribute="leading" id="zeW-tQ-uJl"/>
@@ -230,6 +171,63 @@
                                 </mask>
                             </variation>
                         </view>
+                        <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="TUP-Nz-5Yh">
+                            <rect key="frame" x="0.0" y="198" width="343" height="26"/>
+                            <subviews>
+                                <button opaque="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" pointerInteraction="YES" translatesAutoresizingMaskIntoConstraints="NO" id="rKF-yF-KIa">
+                                    <rect key="frame" x="0.0" y="0.0" width="86" height="26"/>
+                                    <accessibility key="accessibilityConfiguration" label="Reply"/>
+                                    <fontDescription key="fontDescription" type="system" pointSize="18"/>
+                                    <state key="normal" image="arrowshape.turn.up.left.fill" catalog="system"/>
+                                    <connections>
+                                        <action selector="replyPressed" destination="iN0-l3-epB" eventType="touchUpInside" id="ybz-3W-jAa"/>
+                                    </connections>
+                                </button>
+                                <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" pointerInteraction="YES" translatesAutoresizingMaskIntoConstraints="NO" id="6tW-z8-Qh9">
+                                    <rect key="frame" x="171.5" y="0.0" width="86" height="26"/>
+                                    <accessibility key="accessibilityConfiguration" label="Reblog"/>
+                                    <state key="normal" image="repeat" catalog="system"/>
+                                    <connections>
+                                        <action selector="reblogPressed" destination="iN0-l3-epB" eventType="touchUpInside" id="Wa2-ZA-TBo"/>
+                                    </connections>
+                                </button>
+                                <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" pointerInteraction="YES" translatesAutoresizingMaskIntoConstraints="NO" id="982-J4-NGl">
+                                    <rect key="frame" x="257.5" y="0.0" width="85.5" height="26"/>
+                                    <accessibility key="accessibilityConfiguration" label="More Actions"/>
+                                    <state key="normal" image="ellipsis" catalog="system"/>
+                                    <connections>
+                                        <action selector="morePressed" destination="iN0-l3-epB" eventType="touchUpInside" id="WT4-fi-usq"/>
+                                    </connections>
+                                </button>
+                                <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" pointerInteraction="YES" translatesAutoresizingMaskIntoConstraints="NO" id="x0t-TR-jJ4">
+                                    <rect key="frame" x="86" y="0.0" width="85.5" height="26"/>
+                                    <accessibility key="accessibilityConfiguration" label="Favorite"/>
+                                    <state key="normal" image="star.fill" catalog="system"/>
+                                    <connections>
+                                        <action selector="favoritePressed" destination="iN0-l3-epB" eventType="touchUpInside" id="8Q8-Rz-k02"/>
+                                    </connections>
+                                </button>
+                            </subviews>
+                            <constraints>
+                                <constraint firstAttribute="height" constant="26" id="1FK-Er-G11"/>
+                                <constraint firstAttribute="bottom" secondItem="rKF-yF-KIa" secondAttribute="bottom" id="KyG-2C-MgN"/>
+                                <constraint firstItem="x0t-TR-jJ4" firstAttribute="top" secondItem="TUP-Nz-5Yh" secondAttribute="top" id="L3w-JH-eeG"/>
+                                <constraint firstItem="6tW-z8-Qh9" firstAttribute="top" secondItem="TUP-Nz-5Yh" secondAttribute="top" id="N7j-f4-gvP"/>
+                                <constraint firstItem="982-J4-NGl" firstAttribute="leading" secondItem="6tW-z8-Qh9" secondAttribute="trailing" id="VQo-DJ-C7L"/>
+                                <constraint firstItem="982-J4-NGl" firstAttribute="top" secondItem="TUP-Nz-5Yh" secondAttribute="top" id="W53-1a-fKu"/>
+                                <constraint firstItem="x0t-TR-jJ4" firstAttribute="leading" secondItem="rKF-yF-KIa" secondAttribute="trailing" id="WPd-A2-6Ju"/>
+                                <constraint firstItem="rKF-yF-KIa" firstAttribute="width" secondItem="x0t-TR-jJ4" secondAttribute="width" id="X7m-pJ-oje"/>
+                                <constraint firstItem="rKF-yF-KIa" firstAttribute="leading" secondItem="TUP-Nz-5Yh" secondAttribute="leading" placeholder="YES" id="aFR-Ew-99S"/>
+                                <constraint firstAttribute="bottom" secondItem="982-J4-NGl" secondAttribute="bottom" id="eXy-3h-51w"/>
+                                <constraint firstAttribute="bottom" secondItem="x0t-TR-jJ4" secondAttribute="bottom" id="euN-Nf-rwh"/>
+                                <constraint firstItem="6tW-z8-Qh9" firstAttribute="leading" secondItem="x0t-TR-jJ4" secondAttribute="trailing" id="oAK-VG-bbp"/>
+                                <constraint firstAttribute="bottom" secondItem="6tW-z8-Qh9" secondAttribute="bottom" id="tpf-Q3-V3l"/>
+                                <constraint firstAttribute="trailing" secondItem="982-J4-NGl" secondAttribute="trailing" id="uQG-FZ-F7u"/>
+                                <constraint firstItem="rKF-yF-KIa" firstAttribute="width" secondItem="982-J4-NGl" secondAttribute="width" id="vir-iq-biv"/>
+                                <constraint firstItem="rKF-yF-KIa" firstAttribute="width" secondItem="6tW-z8-Qh9" secondAttribute="width" id="vqw-d7-VtZ"/>
+                                <constraint firstItem="rKF-yF-KIa" firstAttribute="top" secondItem="TUP-Nz-5Yh" secondAttribute="top" id="wWH-J7-egM"/>
+                            </constraints>
+                        </view>
                     </subviews>
                     <constraints>
                         <constraint firstItem="ve3-Y1-NQH" firstAttribute="width" secondItem="yNh-ac-v6c" secondAttribute="width" id="xN6-cs-Tnn"/>
@@ -262,10 +260,10 @@
                 <outlet property="pollView" destination="x3b-Zl-9F0" id="WIF-Oz-cnm"/>
                 <outlet property="reblogButton" destination="6tW-z8-Qh9" id="u2t-8D-kOn"/>
                 <outlet property="reblogLabel" destination="lDH-50-AJZ" id="uJf-Pt-cEP"/>
+                <outlet property="reblogSpacer" destination="H6C-5s-ICE" id="yFb-Yx-flv"/>
                 <outlet property="replyButton" destination="rKF-yF-KIa" id="rka-q1-o4a"/>
                 <outlet property="timestampLabel" destination="35d-EA-ReR" id="Ny2-nV-nqP"/>
                 <outlet property="usernameLabel" destination="j89-zc-SFa" id="bXX-FZ-fCp"/>
-                <outlet property="verticalStackToActionsContainerConstraint" destination="4KL-a3-qyf" id="ooW-DI-8AX"/>
                 <outlet property="verticalStackToSuperviewConstraint" destination="kq7-bk-S8j" id="Rfv-Bn-8B4"/>
             </connections>
             <point key="canvasLocation" x="29.600000000000001" y="79.160419790104953"/>