From 9af4118dfcce60a292bbcab5687507955a16c1ea Mon Sep 17 00:00:00 2001
From: Shadowfacts <me@shadowfacts.net>
Date: Sun, 15 Mar 2020 11:56:41 -0400
Subject: [PATCH] Show truncated note in account cell

---
 .../Account Cell/AccountTableViewCell.swift   |  8 +++++-
 .../Account Cell/AccountTableViewCell.xib     | 26 ++++++++++++-------
 2 files changed, 23 insertions(+), 11 deletions(-)

diff --git a/Tusker/Views/Account Cell/AccountTableViewCell.swift b/Tusker/Views/Account Cell/AccountTableViewCell.swift
index 1fe639e0..ad8066e8 100644
--- a/Tusker/Views/Account Cell/AccountTableViewCell.swift	
+++ b/Tusker/Views/Account Cell/AccountTableViewCell.swift	
@@ -7,6 +7,7 @@
 //
 
 import UIKit
+import SwiftSoup
 
 class AccountTableViewCell: UITableViewCell {
 
@@ -16,6 +17,7 @@ class AccountTableViewCell: UITableViewCell {
     @IBOutlet weak var avatarImageView: UIImageView!
     @IBOutlet weak var displayNameLabel: EmojiLabel!
     @IBOutlet weak var usernameLabel: UILabel!
+    @IBOutlet weak var noteLabel: EmojiLabel!
     
     var accountID: String!
     
@@ -25,7 +27,7 @@ class AccountTableViewCell: UITableViewCell {
         super.awakeFromNib()
         
         avatarImageView.layer.masksToBounds = true
-        
+
         NotificationCenter.default.addObserver(self, selector: #selector(updateUIForPrefrences), name: .preferencesChanged, object: nil)
     }
     
@@ -54,6 +56,10 @@ class AccountTableViewCell: UITableViewCell {
         
         usernameLabel.text = "@\(account.acct)"
         
+        let doc = try! SwiftSoup.parse(account.note)
+        noteLabel.text = try! doc.text()
+        noteLabel.setEmojis(account.emojis, identifier: account.id)
+
         updateUIForPrefrences()
     }
     
diff --git a/Tusker/Views/Account Cell/AccountTableViewCell.xib b/Tusker/Views/Account Cell/AccountTableViewCell.xib
index 4a829b20..20fb4ef2 100644
--- a/Tusker/Views/Account Cell/AccountTableViewCell.xib	
+++ b/Tusker/Views/Account Cell/AccountTableViewCell.xib	
@@ -9,40 +9,45 @@
     <objects>
         <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner"/>
         <placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/>
-        <tableViewCell contentMode="scaleToFill" selectionStyle="default" indentationWidth="10" id="KGk-i7-Jjw" customClass="AccountTableViewCell" customModule="Tusker" customModuleProvider="target">
-            <rect key="frame" x="0.0" y="0.0" width="320" height="66"/>
+        <tableViewCell contentMode="scaleToFill" selectionStyle="default" indentationWidth="10" rowHeight="100" id="KGk-i7-Jjw" customClass="AccountTableViewCell" customModule="Tusker" customModuleProvider="target">
+            <rect key="frame" x="0.0" y="0.0" width="320" height="100"/>
             <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
             <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="KGk-i7-Jjw" id="H2p-sc-9uM">
-                <rect key="frame" x="0.0" y="0.0" width="320" height="66"/>
+                <rect key="frame" x="0.0" y="0.0" width="320" height="100"/>
                 <autoresizingMask key="autoresizingMask"/>
                 <subviews>
                     <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="Rp2-O5-Vew">
                         <rect key="frame" x="16" y="8" width="50" height="50"/>
                         <constraints>
                             <constraint firstAttribute="width" secondItem="Rp2-O5-Vew" secondAttribute="height" multiplier="1:1" id="1AQ-lU-ptd"/>
-                            <constraint firstAttribute="height" priority="999" constant="50" id="NqI-m0-owe"/>
+                            <constraint firstAttribute="height" constant="50" id="NqI-m0-owe"/>
                         </constraints>
                     </imageView>
                     <stackView opaque="NO" contentMode="scaleToFill" axis="vertical" translatesAutoresizingMaskIntoConstraints="NO" id="Iif-9m-vM5">
-                        <rect key="frame" x="74" y="11" width="230" height="44"/>
+                        <rect key="frame" x="74" y="11" width="230" height="78"/>
                         <subviews>
-                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" text="Display Name" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Fhc-bZ-lkB" customClass="EmojiLabel" customModule="Tusker" customModuleProvider="target">
-                                <rect key="frame" x="0.0" y="0.0" width="230" height="26"/>
+                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Display Name" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Fhc-bZ-lkB" customClass="EmojiLabel" customModule="Tusker" customModuleProvider="target">
+                                <rect key="frame" x="0.0" y="0.0" width="230" height="20.5"/>
                                 <fontDescription key="fontDescription" type="system" pointSize="17"/>
                                 <nil key="textColor"/>
                                 <nil key="highlightedColor"/>
                             </label>
                             <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="@username" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="JMo-QH-1is">
-                                <rect key="frame" x="0.0" y="26" width="230" height="18"/>
+                                <rect key="frame" x="0.0" y="20.5" width="230" height="18"/>
                                 <fontDescription key="fontDescription" type="system" weight="light" pointSize="15"/>
                                 <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>
+                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" text="Note" textAlignment="natural" lineBreakMode="tailTruncation" numberOfLines="2" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="bNO-qR-YEe" customClass="EmojiLabel" customModule="Tusker" customModuleProvider="target">
+                                <rect key="frame" x="0.0" y="38.5" width="230" height="39.5"/>
+                                <fontDescription key="fontDescription" type="system" pointSize="15"/>
+                                <nil key="textColor"/>
+                                <nil key="highlightedColor"/>
+                            </label>
                         </subviews>
                     </stackView>
                 </subviews>
                 <constraints>
-                    <constraint firstAttribute="bottom" secondItem="Rp2-O5-Vew" secondAttribute="bottom" constant="8" id="Vw1-OF-tnw"/>
                     <constraint firstAttribute="bottomMargin" secondItem="Iif-9m-vM5" secondAttribute="bottom" id="dV0-Vm-DUb"/>
                     <constraint firstItem="Iif-9m-vM5" firstAttribute="top" secondItem="H2p-sc-9uM" secondAttribute="topMargin" id="ihr-er-kLO"/>
                     <constraint firstAttribute="trailingMargin" secondItem="Iif-9m-vM5" secondAttribute="trailing" id="q7a-DT-WPF"/>
@@ -55,9 +60,10 @@
             <connections>
                 <outlet property="avatarImageView" destination="Rp2-O5-Vew" id="3Gw-Xg-bd5"/>
                 <outlet property="displayNameLabel" destination="Fhc-bZ-lkB" id="1b0-3k-KR8"/>
+                <outlet property="noteLabel" destination="bNO-qR-YEe" id="4oO-c0-BOT"/>
                 <outlet property="usernameLabel" destination="JMo-QH-1is" id="ElX-ua-xcQ"/>
             </connections>
-            <point key="canvasLocation" x="173.91304347826087" y="24.107142857142858"/>
+            <point key="canvasLocation" x="173.91304347826087" y="35.491071428571423"/>
         </tableViewCell>
     </objects>
 </document>