From eb8afdaab8f76950405ff6682e7088fcfaac5d7d Mon Sep 17 00:00:00 2001
From: Shadowfacts <me@shadowfacts.net>
Date: Sun, 17 Nov 2019 15:28:58 -0500
Subject: [PATCH] Change how pin icon is displayed on statuses

---
 Tusker/Views/Status/StatusTableViewCell.swift |  5 +++--
 Tusker/Views/Status/StatusTableViewCell.xib   | 22 +++++--------------
 2 files changed, 9 insertions(+), 18 deletions(-)

diff --git a/Tusker/Views/Status/StatusTableViewCell.swift b/Tusker/Views/Status/StatusTableViewCell.swift
index a62f53725c..b92b801a39 100644
--- a/Tusker/Views/Status/StatusTableViewCell.swift
+++ b/Tusker/Views/Status/StatusTableViewCell.swift
@@ -42,7 +42,7 @@ class StatusTableViewCell: UITableViewCell {
     @IBOutlet weak var favoriteButton: UIButton!
     @IBOutlet weak var reblogButton: UIButton!
     @IBOutlet weak var moreButton: UIButton!
-    @IBOutlet weak var pinnedStackView: UIStackView!
+    @IBOutlet weak var pinImageView: UIImageView!
     
     var statusID: String!
     var accountID: String!
@@ -154,7 +154,8 @@ class StatusTableViewCell: UITableViewCell {
         contentWarningLabel.isHidden = status.spoilerText.isEmpty
         
         let pinned = status.pinned ?? false
-        pinnedStackView.isHidden = !(pinned && showPinned)
+        pinImageView.isHidden = !(pinned && showPinned)
+        timestampLabel.isHidden = !pinImageView.isHidden
     }
     
     private func updateStatusState(status: Status) {
diff --git a/Tusker/Views/Status/StatusTableViewCell.xib b/Tusker/Views/Status/StatusTableViewCell.xib
index 032880d7e6..bc5e81cd61 100644
--- a/Tusker/Views/Status/StatusTableViewCell.xib
+++ b/Tusker/Views/Status/StatusTableViewCell.xib
@@ -16,21 +16,6 @@
                 <stackView opaque="NO" contentMode="scaleToFill" axis="vertical" alignment="top" spacing="8" translatesAutoresizingMaskIntoConstraints="NO" id="yNh-ac-v6c">
                     <rect key="frame" x="16" y="8" width="343" height="224"/>
                     <subviews>
-                        <stackView hidden="YES" opaque="NO" contentMode="scaleToFill" spacing="4" translatesAutoresizingMaskIntoConstraints="NO" id="3aF-uU-owK">
-                            <rect key="frame" x="0.0" y="0.0" width="77" height="0.0"/>
-                            <subviews>
-                                <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="pin.fill" catalog="system" translatesAutoresizingMaskIntoConstraints="NO" id="LRh-Cc-1br">
-                                    <rect key="frame" x="0.0" y="-0.5" width="20" height="1.5"/>
-                                    <color key="tintColor" systemColor="secondaryLabelColor" red="0.23529411759999999" green="0.23529411759999999" blue="0.26274509800000001" alpha="0.59999999999999998" colorSpace="custom" customColorSpace="sRGB"/>
-                                </imageView>
-                                <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Pinned" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="meL-En-2jB">
-                                    <rect key="frame" x="24" y="0.0" width="53" height="0.0"/>
-                                    <fontDescription key="fontDescription" type="system" pointSize="17"/>
-                                    <color key="textColor" systemColor="secondaryLabelColor" red="0.23529411759999999" green="0.23529411759999999" blue="0.26274509800000001" alpha="0.59999999999999998" colorSpace="custom" customColorSpace="sRGB"/>
-                                    <nil key="highlightedColor"/>
-                                </label>
-                            </subviews>
-                        </stackView>
                         <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">
                             <rect key="frame" x="0.0" y="0.0" width="163.5" height="20.5"/>
                             <fontDescription key="fontDescription" type="system" pointSize="17"/>
@@ -77,6 +62,11 @@
                                                     <color key="textColor" systemColor="secondaryLabelColor" red="0.23529411759999999" green="0.23529411759999999" blue="0.26274509800000001" alpha="0.59999999999999998" colorSpace="custom" customColorSpace="sRGB"/>
                                                     <nil key="highlightedColor"/>
                                                 </label>
+                                                <imageView hidden="YES" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="pin.fill" catalog="system" translatesAutoresizingMaskIntoConstraints="NO" id="LRh-Cc-1br">
+                                                    <rect key="frame" x="248.5" y="-0.5" width="0.0" height="22"/>
+                                                    <color key="tintColor" systemColor="secondaryLabelColor" red="0.23529411759999999" green="0.23529411759999999" blue="0.26274509800000001" alpha="0.59999999999999998" colorSpace="custom" customColorSpace="sRGB"/>
+                                                    <accessibility key="accessibilityConfiguration" label="Pinned Status"/>
+                                                </imageView>
                                                 <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="252" verticalCompressionResistancePriority="752" text="2m" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="35d-EA-ReR">
                                                     <rect key="frame" x="252.5" y="0.0" width="24.5" height="20.5"/>
                                                     <accessibility key="accessibilityConfiguration">
@@ -204,7 +194,7 @@
                 <outlet property="displayNameLabel" destination="gll-xe-FSr" id="63y-He-xy1"/>
                 <outlet property="favoriteButton" destination="x0t-TR-jJ4" id="Ohz-bs-Ebr"/>
                 <outlet property="moreButton" destination="982-J4-NGl" id="Xga-I4-CzK"/>
-                <outlet property="pinnedStackView" destination="3aF-uU-owK" id="O71-WE-G6U"/>
+                <outlet property="pinImageView" destination="LRh-Cc-1br" id="9jn-0V-PdJ"/>
                 <outlet property="reblogButton" destination="6tW-z8-Qh9" id="i9h-QA-ZPd"/>
                 <outlet property="reblogLabel" destination="lDH-50-AJZ" id="uJf-Pt-cEP"/>
                 <outlet property="replyButton" destination="rKF-yF-KIa" id="rul-lk-bIR"/>