Disable automatic GIF playback in low-power mode

Tusker/Screens/Large Image/LargeImageContentView.swift

@@ -78,6 +78,8 @@ class LargeImageGifvContentView: GifvAttachmentView, LargeImageContentView {
         super.init(asset: asset, gravity: .resizeAspect)
         
         self.animationImage = source.image
+        
+        self.player.play()
     }
     
     required init?(coder: NSCoder) {

Tusker/Screens/Preferences/AdvancedPrefsView.swift

@@ -36,7 +36,7 @@ struct AdvancedPrefsView : View {
     }
     
     var automationSection: some View {
-        Section(header: Text("AUTOMATION")) {
+        Section(header: Text("Automation")) {
             NavigationLink(destination: SilentActionPrefs()) {
                 Text("Silent Action Permissions")
             }
@@ -44,7 +44,7 @@ struct AdvancedPrefsView : View {
     }
     
     var cachingSection: some View {
-        Section(header: Text("CACHING")) {
+        Section(header: Text("Caching")) {
             Button(action: clearCache) {
                 Text("Clear Cache")
             }.foregroundColor(.red)

Tusker/Screens/Preferences/AppearancePrefsView.swift

@@ -30,12 +30,26 @@ struct AppearancePrefsView : View {
                 Text("Light").tag(UIUserInterfaceStyle.light)
                 Text("Dark").tag(UIUserInterfaceStyle.dark)
             }
+            accountsSection
+            postsSection
+        }
+            .listStyle(GroupedListStyle())
+            .navigationBarTitle(Text("Appearance"))
+    }
+    
+    private var accountsSection: some View {
+        Section(header: Text("Accounts")) {
             Toggle(isOn: useCircularAvatars) {
                 Text("Use Circular Avatars")
             }
             Toggle(isOn: $preferences.hideCustomEmojiInUsernames) {
                 Text("Hide Custom Emoji in Usernames")
             }
+        }
+    }
+    
+    private var postsSection: some View {
+        Section(header: Text("Posts")) {
             Toggle(isOn: $preferences.showIsStatusReplyIcon) {
                 Text("Show Status Reply Icons")
             }
@@ -43,8 +57,6 @@ struct AppearancePrefsView : View {
                 Text("Always Show Status Visibility Icons")
             }
         }
-            .listStyle(GroupedListStyle())
-            .navigationBarTitle(Text("Appearance"))
     }
 }
 

Tusker/Screens/Preferences/BehaviorPrefsView.swift

@@ -18,7 +18,7 @@ struct BehaviorPrefsView: View {
     }
 
     var linksSection: some View {
-        Section(header: Text("LINKS")) {
+        Section(header: Text("Links")) {
             Toggle(isOn: $preferences.openLinksInApps) {
                 Text("Open Links in Apps")
             }

Tusker/Screens/Preferences/ComposingPrefsView.swift

@@ -20,7 +20,7 @@ struct ComposingPrefsView: View {
     }
     
     var composingSection: some View {
-        Section(header: Text("COMPOSING")) {
+        Section(header: Text("Composing")) {
             Picker(selection: $preferences.defaultPostVisibility, label: Text("Default Post Visibility")) {
                 ForEach(Status.Visibility.allCases, id: \.self) { visibility in
                     HStack {
@@ -41,7 +41,7 @@ struct ComposingPrefsView: View {
     }
     
     var replyingSection: some View {
-        Section(header: Text("REPLYING")) {
+        Section(header: Text("Replying")) {
             Picker(selection: $preferences.contentWarningCopyMode, label: Text("Copy Content Warnings")) {
                 Text("As-is").tag(ContentWarningCopyMode.asIs)
                 Text("Prepend 're: '").tag(ContentWarningCopyMode.prependRe)

Tusker/Screens/Preferences/MediaPrefsView.swift

@@ -18,7 +18,7 @@ struct MediaPrefsView: View {
     }
     
     var viewingSection: some View {
-        Section(header: Text("VIEWING")) {
+        Section(header: Text("Viewing")) {
             Toggle(isOn: $preferences.blurAllMedia) {
                 Text("Blur All Media")
             }

Tusker/Screens/Timeline/TimelineTableViewController.swift

@@ -179,11 +179,12 @@ class TimelineTableViewController: EnhancedTableViewController {
             mastodonController.run(request) { response in
                 guard case let .success(newStatuses, pagination) = response else { fatalError() }
                 self.older = pagination?.older
-                let newRows = self.timelineSegments.last!.count..<(self.timelineSegments.last!.count + newStatuses.count)
-                let newIndexPaths = newRows.map { IndexPath(row: $0, section: self.timelineSegments.count - 1) }
-                self.timelineSegments[self.timelineSegments.count - 1].append(contentsOf: newStatuses.map { ($0.id, .unknown) })
                 self.mastodonController.persistentContainer.addAll(statuses: newStatuses) {
                     DispatchQueue.main.async {
+                        let newRows = self.timelineSegments.last!.count..<(self.timelineSegments.last!.count + newStatuses.count)
+                        let newIndexPaths = newRows.map { IndexPath(row: $0, section: self.timelineSegments.count - 1) }
+                        self.timelineSegments[self.timelineSegments.count - 1].append(contentsOf: newStatuses.map { ($0.id, .unknown) })
+                        
                         UIView.performWithoutAnimation {
                             self.tableView.insertRows(at: newIndexPaths, with: .none)
                         }

Tusker/Views/Attachments/AttachmentView.swift

@@ -21,6 +21,7 @@ class AttachmentView: UIImageView, GIFAnimatable {
     weak var delegate: AttachmentViewDelegate?
 
     var playImageView: UIImageView?
+    var gifvView: GifvAttachmentView?
     
     var attachment: Attachment!
     var index: Int!
@@ -28,6 +29,9 @@ class AttachmentView: UIImageView, GIFAnimatable {
     private var attachmentRequest: ImageCache.Request?
     
     var gifData: Data?
+    private var autoplayGifs: Bool {
+        Preferences.shared.automaticallyPlayGifs && !ProcessInfo.processInfo.isLowPowerModeEnabled
+    }
 
     public lazy var animator: Animator? = Animator(withDelegate: self)
 
@@ -55,17 +59,29 @@ class AttachmentView: UIImageView, GIFAnimatable {
         isUserInteractionEnabled = true
         addGestureRecognizer(UITapGestureRecognizer(target: self, action: #selector(imagePressed)))
         
-        NotificationCenter.default.addObserver(self, selector: #selector(preferencesChanged), name: .preferencesChanged, object: nil)
+        NotificationCenter.default.addObserver(self, selector: #selector(gifPlaybackModeChanged), name: .preferencesChanged, object: nil)
+        NotificationCenter.default.addObserver(self, selector: #selector(gifPlaybackModeChanged), name: .NSProcessInfoPowerStateDidChange, object: nil)
         
         addInteraction(UIContextMenuInteraction(delegate: self))
     }
     
-    @objc func preferencesChanged() {
+    @objc func gifPlaybackModeChanged() {
-        if let gifData = gifData {
+        // NSProcessInfoPowerStateDidChange is sometimes fired on a background thread
-            if Preferences.shared.automaticallyPlayGifs && !isAnimatingGIF {
+        DispatchQueue.main.async {
-                animate(withGIFData: gifData)
+            if self.attachment.kind == .image,
-            } else if !Preferences.shared.automaticallyPlayGifs && isAnimatingGIF {
+               let gifData = self.gifData {
-                stopAnimatingGIF()
+                if self.autoplayGifs && !self.isAnimatingGIF {
+                    self.animate(withGIFData: gifData)
+                } else if !self.autoplayGifs && self.isAnimatingGIF {
+                    self.stopAnimatingGIF()
+                }
+            } else if self.attachment.kind == .gifv,
+                      let gifvView = self.gifvView {
+                if self.autoplayGifs {
+                    gifvView.player.play()
+                } else {
+                    gifvView.player.pause()
+                }
             }
         }
     }
@@ -95,7 +111,7 @@ class AttachmentView: UIImageView, GIFAnimatable {
             DispatchQueue.main.async {
                 if self.attachment.url.pathExtension == "gif" {
                     self.gifData = data
-                    if Preferences.shared.automaticallyPlayGifs {
+                    if self.autoplayGifs {
                         self.animate(withGIFData: data)
                     } else {
                         self.image = UIImage(data: data)
@@ -166,7 +182,11 @@ class AttachmentView: UIImageView, GIFAnimatable {
         }
         
         let gifvView = GifvAttachmentView(asset: asset, gravity: .resizeAspectFill)
+        self.gifvView = gifvView
         gifvView.translatesAutoresizingMaskIntoConstraints = false
+        if autoplayGifs {
+            gifvView.player.play()
+        }
         addSubview(gifvView)
         NSLayoutConstraint.activate([
             gifvView.leadingAnchor.constraint(equalTo: leadingAnchor),

Tusker/Views/Attachments/GifvAttachmentView.swift

@@ -31,7 +31,6 @@ class GifvAttachmentView: UIView {
         playerLayer.player = player
         playerLayer.videoGravity = gravity
         player.isMuted = true
-        player.play()
 
         NotificationCenter.default.addObserver(self, selector: #selector(restartItem), name: .AVPlayerItemDidPlayToEndTime, object: item)
     }

Tusker/Views/ContentTextView.swift

@@ -197,7 +197,7 @@ class ContentTextView: LinkTextView {
         let locationInTextContainer = CGPoint(x: point.x - textContainerInset.left, y: point.y - textContainerInset.top)
         var partialFraction: CGFloat = 0
         let characterIndex = layoutManager.characterIndex(for: locationInTextContainer, in: textContainer, fractionOfDistanceBetweenInsertionPoints: &partialFraction)
-        if characterIndex < textStorage.length {
+        if characterIndex < textStorage.length && partialFraction < 1 {
             var range = NSRange()
             if let link = textStorage.attribute(.link, at: characterIndex, longestEffectiveRange: &range, in: textStorage.fullRange) as? URL {
                 return (link, range)
@@ -334,6 +334,7 @@ extension ContentTextView: UIContextMenuInteractionDelegate {
         // Create a dummy containerview for the snapshot view, since using a view with a CALayer mask and UIPreviewParameters(textLineRects:)
         // causes the mask to be ignored. See FB7832297
         let snapshotContainer = UIView(frame: snapshot.bounds)
+        snapshotContainer.backgroundColor = .systemBackground
         snapshotContainer.addSubview(snapshot)
         
         let preview = UITargetedPreview(view: snapshotContainer, parameters: parameters, target: target)

Tusker/Views/EmojiLabel.swift

@@ -24,6 +24,8 @@ class EmojiLabel: UILabel {
         emojiRequests = []
         
         let matches = emojiRegex.matches(in: attributedText.string, options: [], range: attributedText.fullRange)
+        guard !matches.isEmpty else { return }
+        
         let emojiImages = CachedDictionary<UIImage>(name: "EmojiLabel Emoji Images")
         
         let group = DispatchGroup()

Tusker/Views/Profile Header/ProfileHeaderView.swift

@@ -133,13 +133,14 @@ class ProfileHeaderView: UIView {
         fieldNamesStackView.arrangedSubviews.forEach { $0.removeFromSuperview() }
         fieldValuesStackView.arrangedSubviews.forEach { $0.removeFromSuperview() }
         for field in account.fields {
-            let nameLabel = UILabel()
+            let nameLabel = EmojiLabel()
             nameLabel.text = field.name
             nameLabel.font = .boldSystemFont(ofSize: 17)
             nameLabel.textAlignment = .right
             nameLabel.numberOfLines = 0
             nameLabel.lineBreakMode = .byWordWrapping
             nameLabel.setContentCompressionResistancePriority(.defaultLow, for: .horizontal)
+            nameLabel.setEmojis(account.emojis, identifier: "")
             fieldNamesStackView.addArrangedSubview(nameLabel)
             
             let valueTextView = ContentTextView()

Tusker/Views/Profile Header/ProfileHeaderView.xib

@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="17132" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="17147" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
     <device id="retina6_1" orientation="portrait" appearance="light"/>
     <dependencies>
         <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="17105"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="17120"/>
         <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"/>
@@ -39,7 +39,7 @@
                         <constraint firstItem="TkY-oK-if4" firstAttribute="centerX" secondItem="wT9-2J-uSY" secondAttribute="centerX" id="ozz-sa-gSc"/>
                     </constraints>
                 </view>
-                <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Display name" textAlignment="natural" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" minimumFontSize="10" translatesAutoresizingMaskIntoConstraints="NO" id="vcl-Gl-kXl" customClass="EmojiLabel" customModule="Tusker" customModuleProvider="target">
+                <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Display name" textAlignment="natural" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" minimumFontSize="10" adjustsLetterSpacingToFitWidth="YES" translatesAutoresizingMaskIntoConstraints="NO" id="vcl-Gl-kXl" customClass="EmojiLabel" customModule="Tusker" customModuleProvider="target">
                     <rect key="frame" x="144" y="202" width="254" height="24"/>
                     <fontDescription key="fontDescription" type="system" weight="semibold" pointSize="20"/>
                     <nil key="textColor"/>

Tusker/Views/Status/ConversationMainStatusTableViewCell.xib

@@ -1,9 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="16097" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="17147" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
     <device id="retina4_7" orientation="portrait" appearance="light"/>
     <dependencies>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="16087"/>
+        <deployment identifier="iOS"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="17120"/>
+        <capability name="Image references" minToolsVersion="12.0"/>
         <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"/>
     </dependencies>
     <objects>
@@ -26,7 +29,7 @@
                                         <constraint firstAttribute="width" constant="50" id="Yxp-Vr-dfl"/>
                                     </constraints>
                                 </imageView>
-                                <label opaque="NO" contentMode="left" verticalHuggingPriority="251" text="Display name" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="lZY-2e-17d" customClass="EmojiLabel" customModule="Tusker" customModuleProvider="target">
+                                <label opaque="NO" contentMode="left" verticalHuggingPriority="251" text="Display name" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" minimumFontSize="12" adjustsLetterSpacingToFitWidth="YES" translatesAutoresizingMaskIntoConstraints="NO" id="lZY-2e-17d" customClass="EmojiLabel" customModule="Tusker" customModuleProvider="target">
                                     <rect key="frame" x="58" y="0.0" width="255" height="29"/>
                                     <fontDescription key="fontDescription" type="system" weight="semibold" pointSize="24"/>
                                     <nil key="textColor"/>
@@ -35,12 +38,12 @@
                                 <label opaque="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="@username" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="SWg-Ka-QyP">
                                     <rect key="frame" x="58" y="29" width="285" height="20.5"/>
                                     <fontDescription key="fontDescription" type="system" weight="light" pointSize="17"/>
-                                    <color key="textColor" systemColor="secondaryLabelColor" red="0.23529411759999999" green="0.23529411759999999" blue="0.26274509800000001" alpha="0.59999999999999998" colorSpace="custom" customColorSpace="sRGB"/>
+                                    <color key="textColor" systemColor="secondaryLabelColor"/>
                                     <nil key="highlightedColor"/>
                                 </label>
                                 <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="globe" catalog="system" translatesAutoresizingMaskIntoConstraints="NO" id="3Qu-IO-5wt">
-                                    <rect key="frame" x="321" y="1" width="22" height="20"/>
+                                    <rect key="frame" x="321" y="0.5" width="22" height="20.5"/>
-                                    <color key="tintColor" systemColor="secondaryLabelColor" red="0.23529411759999999" green="0.23529411759999999" blue="0.26274509800000001" alpha="0.59999999999999998" colorSpace="custom" customColorSpace="sRGB"/>
+                                    <color key="tintColor" systemColor="secondaryLabelColor"/>
                                     <constraints>
                                         <constraint firstAttribute="height" constant="22" id="Kqh-qI-dSa"/>
                                         <constraint firstAttribute="width" constant="22" id="QY1-tL-QHr"/>
@@ -64,21 +67,21 @@
                             </constraints>
                         </view>
                         <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="252" verticalCompressionResistancePriority="751" text="Content Warning" textAlignment="natural" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="cwQ-mR-L1b" customClass="EmojiLabel" customModule="Tusker" customModuleProvider="target">
-                            <rect key="frame" x="0.0" y="58" width="138" height="20.5"/>
+                            <rect key="frame" x="0.0" y="58" width="137.5" height="20.5"/>
                             <accessibility key="accessibilityConfiguration">
                                 <accessibilityTraits key="traits" staticText="YES" notEnabled="YES"/>
                             </accessibility>
                             <fontDescription key="fontDescription" type="boldSystem" pointSize="17"/>
-                            <color key="textColor" systemColor="secondaryLabelColor" red="0.23529411759999999" green="0.23529411759999999" blue="0.26274509800000001" alpha="0.59999999999999998" colorSpace="custom" customColorSpace="sRGB"/>
+                            <color key="textColor" systemColor="secondaryLabelColor"/>
                             <nil key="highlightedColor"/>
                         </label>
                         <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="8r8-O8-Agh">
                             <rect key="frame" x="0.0" y="86.5" width="343" height="30"/>
-                            <color key="backgroundColor" systemColor="systemBlueColor" red="0.0" green="0.47843137250000001" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                            <color key="backgroundColor" systemColor="systemBlueColor"/>
                             <constraints>
                                 <constraint firstAttribute="height" constant="30" id="icD-3q-uJ6"/>
                             </constraints>
-                            <color key="tintColor" systemColor="systemBackgroundColor" cocoaTouchSystemColor="whiteColor"/>
+                            <color key="tintColor" systemColor="systemBackgroundColor"/>
                             <state key="normal" image="chevron.down" catalog="system">
                                 <preferredSymbolConfiguration key="preferredSymbolConfiguration" scale="large"/>
                             </state>
@@ -87,48 +90,48 @@
                             </connections>
                         </button>
                         <textView clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" verticalCompressionResistancePriority="749" scrollEnabled="NO" delaysContentTouches="NO" editable="NO" translatesAutoresizingMaskIntoConstraints="NO" id="z0g-HN-gS0" customClass="StatusContentTextView" customModule="Tusker" customModuleProvider="target">
-                            <rect key="frame" x="0.0" y="124.5" width="343" height="55.5"/>
+                            <rect key="frame" x="0.0" y="124.5" width="343" height="47.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" cocoaTouchSystemColor="darkTextColor"/>
+                            <color key="textColor" systemColor="labelColor"/>
                             <fontDescription key="fontDescription" type="system" pointSize="20"/>
                             <textInputTraits key="textInputTraits" autocapitalizationType="sentences"/>
                         </textView>
                         <view hidden="YES" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="IF9-9U-Gk0" customClass="AttachmentsContainerView" customModule="Tusker" customModuleProvider="target">
-                            <rect key="frame" x="0.0" y="184" width="343" height="193"/>
+                            <rect key="frame" x="0.0" y="176" width="343" height="193"/>
-                            <color key="backgroundColor" systemColor="secondarySystemBackgroundColor" red="0.94901960780000005" green="0.94901960780000005" blue="0.96862745100000003" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                            <color key="backgroundColor" systemColor="secondarySystemBackgroundColor"/>
                             <constraints>
                                 <constraint firstAttribute="width" secondItem="IF9-9U-Gk0" secondAttribute="height" multiplier="16:9" id="5oh-eK-J5d"/>
                             </constraints>
                         </view>
                         <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="ejU-sO-Og5">
-                            <rect key="frame" x="0.0" y="188" width="343" height="0.5"/>
+                            <rect key="frame" x="0.0" y="180" width="343" height="0.5"/>
-                            <color key="backgroundColor" systemColor="opaqueSeparatorColor" red="0.77647058820000003" green="0.77647058820000003" blue="0.7843137255" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                            <color key="backgroundColor" systemColor="opaqueSeparatorColor"/>
                             <constraints>
                                 <constraint firstAttribute="height" constant="0.5" id="DRI-lB-TyG"/>
                             </constraints>
                         </view>
                         <stackView opaque="NO" contentMode="scaleToFill" spacing="8" translatesAutoresizingMaskIntoConstraints="NO" id="HZv-qj-gi6">
-                            <rect key="frame" x="0.0" y="196.5" width="142" height="18"/>
+                            <rect key="frame" x="0.0" y="188.5" width="142" height="18"/>
                             <subviews>
-                                <button opaque="NO" contentMode="scaleToFill" verticalHuggingPriority="252" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="yyj-Bs-Vjq">
+                                <button opaque="NO" contentMode="scaleToFill" verticalHuggingPriority="252" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="yyj-Bs-Vjq">
                                     <rect key="frame" x="0.0" y="0.0" width="75" height="18"/>
                                     <constraints>
                                         <constraint firstAttribute="height" constant="18" id="F9W-LW-swd"/>
                                     </constraints>
                                     <state key="normal" title="2 Favorites">
-                                        <color key="titleColor" systemColor="secondaryLabelColor" red="0.23529411759999999" green="0.23529411759999999" blue="0.26274509800000001" alpha="0.59999999999999998" colorSpace="custom" customColorSpace="sRGB"/>
+                                        <color key="titleColor" systemColor="secondaryLabelColor"/>
                                     </state>
                                     <connections>
                                         <action selector="totalFavoritesPressed" destination="iN0-l3-epB" eventType="touchUpInside" id="D3Y-YB-bqP"/>
                                     </connections>
                                 </button>
-                                <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="dem-vG-cPB">
+                                <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="dem-vG-cPB">
                                     <rect key="frame" x="83" y="0.0" width="59" height="18"/>
                                     <constraints>
                                         <constraint firstAttribute="height" constant="18" id="k0P-W7-wMF"/>
                                     </constraints>
                                     <state key="normal" title="1 Reblog">
-                                        <color key="titleColor" systemColor="secondaryLabelColor" red="0.23529411759999999" green="0.23529411759999999" blue="0.26274509800000001" alpha="0.59999999999999998" colorSpace="custom" customColorSpace="sRGB"/>
+                                        <color key="titleColor" systemColor="secondaryLabelColor"/>
                                     </state>
                                     <connections>
                                         <action selector="totalReblogsPressed" destination="iN0-l3-epB" eventType="touchUpInside" id="WG3-nQ-jgr"/>
@@ -137,59 +140,67 @@
                             </subviews>
                         </stackView>
                         <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Sep 7, 2019 12:12:53 PM • Web" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="YHN-wG-YWi">
-                            <rect key="frame" x="0.0" y="222.5" width="213.5" height="18"/>
+                            <rect key="frame" x="0.0" y="214.5" width="213.5" height="18"/>
                             <accessibility key="accessibilityConfiguration">
                                 <accessibilityTraits key="traits" staticText="YES" notEnabled="YES"/>
                             </accessibility>
                             <fontDescription key="fontDescription" type="system" pointSize="15"/>
-                            <color key="textColor" systemColor="secondaryLabelColor" red="0.23529411759999999" green="0.23529411759999999" blue="0.26274509800000001" alpha="0.59999999999999998" colorSpace="custom" customColorSpace="sRGB"/>
+                            <color key="textColor" systemColor="secondaryLabelColor"/>
                             <nil key="highlightedColor"/>
                         </label>
                         <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="3Fp-Nj-sVj">
-                            <rect key="frame" x="0.0" y="248.5" width="343" height="0.5"/>
+                            <rect key="frame" x="0.0" y="240.5" width="343" height="0.5"/>
-                            <color key="backgroundColor" systemColor="opaqueSeparatorColor" red="0.77647058820000003" green="0.77647058820000003" blue="0.7843137255" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                            <color key="backgroundColor" systemColor="opaqueSeparatorColor"/>
                             <constraints>
                                 <constraint firstAttribute="height" constant="0.5" id="akf-Kl-8mK"/>
                             </constraints>
                         </view>
-                        <stackView opaque="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" distribution="equalSpacing" translatesAutoresizingMaskIntoConstraints="NO" id="3Bg-XP-d13">
+                        <stackView opaque="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" distribution="fillEqually" translatesAutoresizingMaskIntoConstraints="NO" id="3Bg-XP-d13">
-                            <rect key="frame" x="0.0" y="257" width="343" height="18"/>
+                            <rect key="frame" x="0.0" y="249" width="343" height="26"/>
                             <subviews>
-                                <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="leading" contentVerticalAlignment="center" lineBreakMode="middleTruncation" pointerInteraction="YES" translatesAutoresizingMaskIntoConstraints="NO" id="2cc-lE-AdG">
+                                <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" pointerInteraction="YES" translatesAutoresizingMaskIntoConstraints="NO" id="2cc-lE-AdG">
-                                    <rect key="frame" x="0.0" y="0.0" width="21" height="18"/>
+                                    <rect key="frame" x="0.0" y="0.0" width="86" height="26"/>
                                     <accessibility key="accessibilityConfiguration" label="Reply"/>
-                                    <state key="normal" image="arrowshape.turn.up.left.fill" catalog="system"/>
+                                    <state key="normal">
+                                        <imageReference key="image" image="arrowshape.turn.up.left.fill" catalog="system" symbolScale="large"/>
+                                    </state>
                                     <connections>
                                         <action selector="replyPressed" destination="iN0-l3-epB" eventType="touchUpInside" id="RxZ-zv-lkN"/>
                                     </connections>
                                 </button>
                                 <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" pointerInteraction="YES" translatesAutoresizingMaskIntoConstraints="NO" id="DhN-rJ-jdA">
-                                    <rect key="frame" x="107" y="0.0" width="22" height="18"/>
+                                    <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"/>
+                                    <state key="normal">
+                                        <imageReference key="image" image="star.fill" catalog="system" symbolScale="large"/>
+                                    </state>
                                     <connections>
                                         <action selector="favoritePressed" destination="iN0-l3-epB" eventType="touchUpInside" id="NCA-iR-VMt"/>
                                     </connections>
                                 </button>
                                 <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" pointerInteraction="YES" translatesAutoresizingMaskIntoConstraints="NO" id="GUG-f7-Hdy">
-                                    <rect key="frame" x="215.5" y="0.0" width="22.5" height="18"/>
+                                    <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"/>
+                                    <state key="normal">
+                                        <imageReference key="image" image="repeat" catalog="system" symbolScale="large"/>
+                                    </state>
                                     <connections>
                                         <action selector="reblogPressed" destination="iN0-l3-epB" eventType="touchUpInside" id="iIu-Vv-U0I"/>
                                     </connections>
                                 </button>
                                 <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" pointerInteraction="YES" translatesAutoresizingMaskIntoConstraints="NO" id="Ujo-Ap-dmK">
-                                    <rect key="frame" x="324" y="0.0" width="19" height="18"/>
+                                    <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"/>
+                                    <state key="normal">
+                                        <imageReference key="image" image="ellipsis" catalog="system" symbolScale="large"/>
+                                    </state>
                                     <connections>
                                         <action selector="morePressed" destination="iN0-l3-epB" eventType="touchUpInside" id="1vn-0k-gYi"/>
                                     </connections>
                                 </button>
                             </subviews>
                             <constraints>
-                                <constraint firstAttribute="height" constant="18" id="bqe-m8-5Lo"/>
+                                <constraint firstAttribute="height" constant="26" id="bqe-m8-5Lo"/>
                             </constraints>
                         </stackView>
                     </subviews>
@@ -204,7 +215,8 @@
                     </constraints>
                 </stackView>
             </subviews>
-            <color key="backgroundColor" systemColor="systemBackgroundColor" cocoaTouchSystemColor="whiteColor"/>
+            <viewLayoutGuide key="safeArea" id="vUN-kp-3ea"/>
+            <color key="backgroundColor" systemColor="systemBackgroundColor"/>
             <constraints>
                 <constraint firstItem="vUN-kp-3ea" firstAttribute="bottom" secondItem="GuG-Qd-B8I" secondAttribute="bottom" constant="8" id="2F3-0f-0tC"/>
                 <constraint firstItem="GuG-Qd-B8I" firstAttribute="leading" secondItem="vUN-kp-3ea" secondAttribute="leading" constant="16" id="PFH-TI-ZQ9"/>
@@ -212,7 +224,6 @@
                 <constraint firstItem="GuG-Qd-B8I" firstAttribute="top" secondItem="vUN-kp-3ea" secondAttribute="top" constant="8" id="oMG-LP-HUD"/>
             </constraints>
             <freeformSimulatedSizeMetrics key="simulatedDestinationMetrics"/>
-            <viewLayoutGuide key="safeArea" id="vUN-kp-3ea"/>
             <connections>
                 <outlet property="attachmentsView" destination="IF9-9U-Gk0" id="Oxw-sJ-MJE"/>
                 <outlet property="avatarImageView" destination="mB9-HO-1vf" id="0R0-rt-Osh"/>
@@ -236,11 +247,29 @@
         </view>
     </objects>
     <resources>
-        <image name="arrowshape.turn.up.left.fill" catalog="system" width="128" height="106"/>
+        <image name="arrowshape.turn.up.left.fill" catalog="system" width="128" height="104"/>
         <image name="chevron.down" catalog="system" width="128" height="72"/>
         <image name="ellipsis" catalog="system" width="128" height="37"/>
         <image name="globe" catalog="system" width="128" height="121"/>
         <image name="repeat" catalog="system" width="128" height="99"/>
         <image name="star.fill" catalog="system" width="128" height="116"/>
+        <systemColor name="labelColor">
+            <color white="0.0" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
+        </systemColor>
+        <systemColor name="opaqueSeparatorColor">
+            <color red="0.77647058823529413" green="0.77647058823529413" blue="0.78431372549019607" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+        </systemColor>
+        <systemColor name="secondaryLabelColor">
+            <color red="0.23529411764705882" green="0.23529411764705882" blue="0.2627450980392157" alpha="0.59999999999999998" colorSpace="custom" customColorSpace="sRGB"/>
+        </systemColor>
+        <systemColor name="secondarySystemBackgroundColor">
+            <color red="0.94901960784313721" green="0.94901960784313721" blue="0.96862745098039216" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+        </systemColor>
+        <systemColor name="systemBackgroundColor">
+            <color white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
+        </systemColor>
+        <systemColor name="systemBlueColor">
+            <color red="0.0" green="0.47843137254901963" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+        </systemColor>
     </resources>
 </document>

Tusker/Views/Status/TimelineStatusTableViewCell.swift

@@ -41,9 +41,13 @@ class TimelineStatusTableViewCell: BaseStatusTableViewCell {
     
     override func awakeFromNib() {
         super.awakeFromNib()
+        
         reblogLabel.addGestureRecognizer(UITapGestureRecognizer(target: self, action: #selector(reblogLabelPressed)))
 
         accessibilityElements!.insert(reblogLabel!, at: 0)
+        
+        // todo: double check this on RTL layouts
+        replyButton.imageView!.leadingAnchor.constraint(equalTo: contentTextView.leadingAnchor).isActive = true
     }
     
     override func createObserversIfNecessary() {
@@ -54,7 +58,8 @@ class TimelineStatusTableViewCell: BaseStatusTableViewCell {
                 .filter { [unowned self] in $0 == self.rebloggerID }
                 .receive(on: DispatchQueue.main)
                 .sink { [unowned self] in
-                    if let reblogger = self.mastodonController.persistentContainer.account(for: $0) {
+                    if let mastodonController = self.mastodonController,
+                       let reblogger = mastodonController.persistentContainer.account(for: $0) {
                         self.updateRebloggerLabel(reblogger: reblogger)
                     }
             }

Tusker/Views/Status/TimelineStatusTableViewCell.xib

@@ -1,9 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="16097" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="17147" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
     <device id="retina4_7" orientation="portrait" appearance="light"/>
     <dependencies>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="16087"/>
+        <deployment identifier="iOS"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="17120"/>
         <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"/>
     </dependencies>
     <objects>
@@ -17,9 +19,9 @@
                     <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="163.5" height="20.5"/>
+                            <rect key="frame" x="0.0" y="0.0" width="162.5" height="20.5"/>
                             <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"/>
+                            <color key="textColor" systemColor="secondaryLabelColor"/>
                             <nil key="highlightedColor"/>
                         </label>
                         <view contentMode="scaleToFill" verticalHuggingPriority="249" translatesAutoresizingMaskIntoConstraints="NO" id="ve3-Y1-NQH">
@@ -37,13 +39,13 @@
                                     </constraints>
                                 </imageView>
                                 <stackView opaque="NO" contentMode="scaleToFill" verticalCompressionResistancePriority="751" axis="vertical" spacing="4" translatesAutoresizingMaskIntoConstraints="NO" id="gIY-Wp-RSk">
-                                    <rect key="frame" x="58" y="0.0" width="277" height="195.5"/>
+                                    <rect key="frame" x="58" y="0.0" width="277" height="169.5"/>
                                     <subviews>
                                         <stackView opaque="NO" contentMode="scaleToFill" spacing="4" translatesAutoresizingMaskIntoConstraints="NO" id="3Sm-P0-ySf">
                                             <rect key="frame" x="0.0" y="0.0" width="277" height="20.5"/>
                                             <subviews>
-                                                <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="252" horizontalCompressionResistancePriority="749" verticalCompressionResistancePriority="752" text="Display name" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="gll-xe-FSr" customClass="EmojiLabel" customModule="Tusker" customModuleProvider="target">
+                                                <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="252" horizontalCompressionResistancePriority="749" verticalCompressionResistancePriority="752" text="Display name" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" minimumFontSize="10" adjustsLetterSpacingToFitWidth="YES" translatesAutoresizingMaskIntoConstraints="NO" id="gll-xe-FSr" customClass="EmojiLabel" customModule="Tusker" customModuleProvider="target">
-                                                    <rect key="frame" x="0.0" y="0.0" width="107" height="20.5"/>
+                                                    <rect key="frame" x="0.0" y="0.0" width="106.5" height="20.5"/>
                                                     <accessibility key="accessibilityConfiguration">
                                                         <accessibilityTraits key="traits" staticText="YES" notEnabled="YES"/>
                                                     </accessibility>
@@ -53,28 +55,28 @@
                                                     <nil key="highlightedColor"/>
                                                 </label>
                                                 <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="249" verticalHuggingPriority="252" horizontalCompressionResistancePriority="748" verticalCompressionResistancePriority="752" text="@username" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="j89-zc-SFa">
-                                                    <rect key="frame" x="111" y="0.0" width="137.5" height="20.5"/>
+                                                    <rect key="frame" x="110.5" y="0.0" width="138.5" height="20.5"/>
                                                     <accessibility key="accessibilityConfiguration">
                                                         <accessibilityTraits key="traits" staticText="YES" notEnabled="YES"/>
                                                     </accessibility>
                                                     <gestureRecognizers/>
                                                     <fontDescription key="fontDescription" type="system" weight="light" pointSize="17"/>
-                                                    <color key="textColor" systemColor="secondaryLabelColor" red="0.23529411759999999" green="0.23529411759999999" blue="0.26274509800000001" alpha="0.59999999999999998" colorSpace="custom" customColorSpace="sRGB"/>
+                                                    <color key="textColor" systemColor="secondaryLabelColor"/>
                                                     <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="wtt-8G-Ua1">
-                                                    <rect key="frame" x="250.5" y="-0.5" width="0.0" height="22"/>
+                                                    <rect key="frame" x="251" 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"/>
+                                                    <color key="tintColor" systemColor="secondaryLabelColor"/>
                                                     <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"/>
+                                                    <rect key="frame" x="253" y="0.0" width="24" height="20.5"/>
                                                     <accessibility key="accessibilityConfiguration">
                                                         <accessibilityTraits key="traits" staticText="YES" notEnabled="YES"/>
                                                         <bool key="isElement" value="YES"/>
                                                     </accessibility>
                                                     <fontDescription key="fontDescription" type="system" weight="light" pointSize="17"/>
-                                                    <color key="textColor" systemColor="secondaryLabelColor" red="0.23529411759999999" green="0.23529411759999999" blue="0.26274509800000001" alpha="0.59999999999999998" colorSpace="custom" customColorSpace="sRGB"/>
+                                                    <color key="textColor" systemColor="secondaryLabelColor"/>
                                                     <nil key="highlightedColor"/>
                                                 </label>
                                             </subviews>
@@ -88,16 +90,16 @@
                                                 <accessibilityTraits key="traits" staticText="YES" notEnabled="YES"/>
                                             </accessibility>
                                             <fontDescription key="fontDescription" type="boldSystem" pointSize="17"/>
-                                            <color key="textColor" systemColor="secondaryLabelColor" red="0.23529411759999999" green="0.23529411759999999" blue="0.26274509800000001" alpha="0.59999999999999998" colorSpace="custom" customColorSpace="sRGB"/>
+                                            <color key="textColor" systemColor="secondaryLabelColor"/>
                                             <nil key="highlightedColor"/>
                                         </label>
                                         <button opaque="NO" contentMode="scaleToFill" verticalHuggingPriority="252" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="O0E-Vf-XYR">
                                             <rect key="frame" x="0.0" y="49" width="277" height="30"/>
-                                            <color key="backgroundColor" systemColor="systemBlueColor" red="0.0" green="0.47843137250000001" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                                            <color key="backgroundColor" systemColor="systemBlueColor"/>
                                             <constraints>
                                                 <constraint firstAttribute="height" constant="30" id="z84-XW-gP3"/>
                                             </constraints>
-                                            <color key="tintColor" systemColor="systemBackgroundColor" cocoaTouchSystemColor="whiteColor"/>
+                                            <color key="tintColor" systemColor="systemBackgroundColor"/>
                                             <state key="normal" image="chevron.down" catalog="system">
                                                 <preferredSymbolConfiguration key="preferredSymbolConfiguration" scale="large"/>
                                             </state>
@@ -108,62 +110,66 @@
                                         <textView clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" scrollEnabled="NO" delaysContentTouches="NO" editable="NO" 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="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" cocoaTouchSystemColor="darkTextColor"/>
+                                            <color key="textColor" systemColor="labelColor"/>
                                             <fontDescription key="fontDescription" type="system" pointSize="17"/>
                                             <textInputTraits key="textInputTraits" autocapitalizationType="sentences"/>
                                         </textView>
                                         <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="171.5" width="277" height="156"/>
+                                            <rect key="frame" x="0.0" y="169.5" width="277" height="156"/>
-                                            <color key="backgroundColor" systemColor="secondarySystemBackgroundColor" red="0.94901960780000005" green="0.94901960780000005" blue="0.96862745100000003" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                                            <color key="backgroundColor" systemColor="secondarySystemBackgroundColor"/>
                                             <constraints>
                                                 <constraint firstAttribute="width" secondItem="nbq-yr-2mA" secondAttribute="height" multiplier="16:9" id="Rvt-zs-fkd"/>
                                             </constraints>
                                         </view>
-                                        <stackView opaque="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" distribution="equalSpacing" alignment="bottom" translatesAutoresizingMaskIntoConstraints="NO" id="Zlb-yt-NTw">
-                                            <rect key="frame" x="0.0" y="173.5" width="277" height="22"/>
-                                            <subviews>
-                                                <button opaque="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" contentHorizontalAlignment="leading" contentVerticalAlignment="center" lineBreakMode="middleTruncation" pointerInteraction="YES" translatesAutoresizingMaskIntoConstraints="NO" id="rKF-yF-KIa">
-                                                    <rect key="frame" x="0.0" y="0.0" width="21" height="22"/>
-                                                    <accessibility key="accessibilityConfiguration" label="Reply"/>
-                                                    <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="x0t-TR-jJ4">
-                                                    <rect key="frame" x="85" y="0.0" width="22" height="22"/>
-                                                    <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>
-                                                <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="22.5" height="22"/>
-                                                    <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="258" y="0.0" width="19" height="22"/>
-                                                    <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>
-                                            </subviews>
-                                        </stackView>
                                     </subviews>
                                 </stackView>
+                                <stackView opaque="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" distribution="fillEqually" translatesAutoresizingMaskIntoConstraints="NO" id="Zlb-yt-NTw">
+                                    <rect key="frame" x="0.0" y="169.5" 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="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>
+                                        <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>
+                                    </subviews>
+                                    <constraints>
+                                        <constraint firstAttribute="height" constant="26" id="PnB-XK-9U0"/>
+                                    </constraints>
+                                </stackView>
                                 <stackView opaque="NO" contentMode="scaleToFill" distribution="equalSpacing" spacing="5" translatesAutoresizingMaskIntoConstraints="NO" id="oie-wK-IpU">
-                                    <rect key="frame" x="0.5" y="54" width="49.5" height="22"/>
+                                    <rect key="frame" x="0.0" y="54" width="50" height="22"/>
                                     <subviews>
                                         <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="bubble.left.and.bubble.right" catalog="system" translatesAutoresizingMaskIntoConstraints="NO" id="KdQ-Zn-IhD">
                                             <rect key="frame" x="0.0" y="1" width="25.5" height="21.5"/>
-                                            <color key="tintColor" systemColor="secondaryLabelColor" red="0.23529411759999999" green="0.23529411759999999" blue="0.26274509800000001" alpha="0.59999999999999998" colorSpace="custom" customColorSpace="sRGB"/>
+                                            <color key="tintColor" systemColor="secondaryLabelColor"/>
                                             <accessibility key="accessibilityConfiguration" label="Is a reply"/>
                                             <constraints>
                                                 <constraint firstAttribute="height" constant="22" id="x0C-Qo-YVA"/>
@@ -171,8 +177,8 @@
                                             <preferredSymbolConfiguration key="preferredSymbolConfiguration" weight="thin"/>
                                         </imageView>
                                         <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="globe" catalog="system" translatesAutoresizingMaskIntoConstraints="NO" id="LRh-Cc-1br">
-                                            <rect key="frame" x="30.5" y="1" width="19" height="20"/>
+                                            <rect key="frame" x="30.5" y="0.5" width="19.5" height="20.5"/>
-                                            <color key="tintColor" systemColor="secondaryLabelColor" red="0.23529411759999999" green="0.23529411759999999" blue="0.26274509800000001" alpha="0.59999999999999998" colorSpace="custom" customColorSpace="sRGB"/>
+                                            <color key="tintColor" systemColor="secondaryLabelColor"/>
                                             <constraints>
                                                 <constraint firstAttribute="height" constant="22" id="3Mk-NN-6fY"/>
                                             </constraints>
@@ -185,12 +191,15 @@
                                 <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="oie-wK-IpU" firstAttribute="top" secondItem="QMP-j2-HLn" secondAttribute="bottom" constant="4" id="7Mp-WS-FhY"/>
+                                <constraint firstAttribute="bottom" secondItem="Zlb-yt-NTw" secondAttribute="bottom" id="HOe-6l-ES0"/>
                                 <constraint firstItem="QMP-j2-HLn" firstAttribute="top" secondItem="ve3-Y1-NQH" secondAttribute="top" id="PC4-Bi-QXm"/>
                                 <constraint firstItem="oie-wK-IpU" firstAttribute="leading" relation="greaterThanOrEqual" secondItem="ve3-Y1-NQH" secondAttribute="leading" id="QKi-ny-jOJ"/>
+                                <constraint firstItem="Zlb-yt-NTw" firstAttribute="leading" secondItem="ve3-Y1-NQH" secondAttribute="leading" id="aUm-Uo-wkY"/>
+                                <constraint firstItem="Zlb-yt-NTw" firstAttribute="top" secondItem="gIY-Wp-RSk" secondAttribute="bottom" id="dOI-nF-1L9"/>
                                 <constraint firstItem="gIY-Wp-RSk" firstAttribute="top" secondItem="QMP-j2-HLn" secondAttribute="top" id="fEd-wN-kuQ"/>
                                 <constraint firstItem="gIY-Wp-RSk" firstAttribute="leading" secondItem="oie-wK-IpU" secondAttribute="trailing" constant="8" id="fqd-p6-oGe"/>
+                                <constraint firstAttribute="trailing" secondItem="Zlb-yt-NTw" secondAttribute="trailing" id="gxD-EE-ISA"/>
                                 <constraint firstAttribute="trailingMargin" secondItem="gIY-Wp-RSk" secondAttribute="trailing" id="hKk-kO-wFT"/>
-                                <constraint firstAttribute="bottom" secondItem="gIY-Wp-RSk" secondAttribute="bottom" id="kRU-Ct-CIg"/>
                                 <constraint firstItem="QMP-j2-HLn" firstAttribute="leading" secondItem="ve3-Y1-NQH" secondAttribute="leading" id="zeW-tQ-uJl"/>
                             </constraints>
                         </view>
@@ -200,6 +209,7 @@
                     </constraints>
                 </stackView>
             </subviews>
+            <viewLayoutGuide key="safeArea" id="vUN-kp-3ea"/>
             <color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
             <constraints>
                 <constraint firstAttribute="trailingMargin" secondItem="yNh-ac-v6c" secondAttribute="trailing" id="2qQ-80-4Ui"/>
@@ -208,7 +218,6 @@
                 <constraint firstItem="yNh-ac-v6c" firstAttribute="top" secondItem="vUN-kp-3ea" secondAttribute="top" constant="8" id="aAG-d7-dmV"/>
             </constraints>
             <freeformSimulatedSizeMetrics key="simulatedDestinationMetrics"/>
-            <viewLayoutGuide key="safeArea" id="vUN-kp-3ea"/>
             <connections>
                 <outlet property="attachmentsView" destination="nbq-yr-2mA" id="SVm-zl-mPb"/>
                 <outlet property="avatarImageView" destination="QMP-j2-HLn" id="xfS-v8-Gzu"/>
@@ -231,7 +240,7 @@
         </view>
     </objects>
     <resources>
-        <image name="arrowshape.turn.up.left.fill" catalog="system" width="128" height="106"/>
+        <image name="arrowshape.turn.up.left.fill" catalog="system" width="128" height="104"/>
         <image name="bubble.left.and.bubble.right" catalog="system" width="128" height="96"/>
         <image name="chevron.down" catalog="system" width="128" height="72"/>
         <image name="ellipsis" catalog="system" width="128" height="37"/>
@@ -239,5 +248,20 @@
         <image name="pin.fill" catalog="system" width="119" height="128"/>
         <image name="repeat" catalog="system" width="128" height="99"/>
         <image name="star.fill" catalog="system" width="128" height="116"/>
+        <systemColor name="labelColor">
+            <color white="0.0" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
+        </systemColor>
+        <systemColor name="secondaryLabelColor">
+            <color red="0.23529411764705882" green="0.23529411764705882" blue="0.2627450980392157" alpha="0.59999999999999998" colorSpace="custom" customColorSpace="sRGB"/>
+        </systemColor>
+        <systemColor name="secondarySystemBackgroundColor">
+            <color red="0.94901960784313721" green="0.94901960784313721" blue="0.96862745098039216" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+        </systemColor>
+        <systemColor name="systemBackgroundColor">
+            <color white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
+        </systemColor>
+        <systemColor name="systemBlueColor">
+            <color red="0.0" green="0.47843137254901963" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+        </systemColor>
     </resources>
 </document>