From d94a0050b79d58923fe73194035d942264724afe Mon Sep 17 00:00:00 2001
From: Shadowfacts <me@shadowfacts.net>
Date: Mon, 1 Apr 2019 19:34:50 -0400
Subject: [PATCH] Show fields in profiles

Closes #19
---
 Pachyderm/Model/Account.swift                 |  4 +--
 .../Profile/ProfileTableViewController.swift  |  2 +-
 .../ProfileHeaderTableViewCell.swift          | 36 ++++++++++++++++---
 .../ProfileHeaderTableViewCell.xib            | 27 +++++++++++---
 4 files changed, 56 insertions(+), 13 deletions(-)

diff --git a/Pachyderm/Model/Account.swift b/Pachyderm/Model/Account.swift
index c1a3ba31c6..9540d6a276 100644
--- a/Pachyderm/Model/Account.swift
+++ b/Pachyderm/Model/Account.swift
@@ -124,7 +124,7 @@ extension Account: CustomDebugStringConvertible {
 
 extension Account {
     public struct Field: Codable {
-        let name: String
-        let value: String
+        public let name: String
+        public let value: String
     }
 }
diff --git a/Tusker/Screens/Profile/ProfileTableViewController.swift b/Tusker/Screens/Profile/ProfileTableViewController.swift
index e61e82d551..2235f0f4fe 100644
--- a/Tusker/Screens/Profile/ProfileTableViewController.swift
+++ b/Tusker/Screens/Profile/ProfileTableViewController.swift
@@ -180,8 +180,8 @@ class ProfileTableViewController: EnhancedTableViewController, PreferencesAdapti
         case 0:
             guard let cell = tableView.dequeueReusableCell(withIdentifier: "headerCell", for: indexPath) as? ProfileHeaderTableViewCell else { fatalError() }
             cell.selectionStyle = .none
-            cell.updateUI(for: accountID)
             cell.delegate = self
+            cell.updateUI(for: accountID)
             return cell
         case 1:
             guard let cell = tableView.dequeueReusableCell(withIdentifier: "statusCell", for: indexPath) as? StatusTableViewCell else { fatalError() }
diff --git a/Tusker/Views/Profile Header/ProfileHeaderTableViewCell.swift b/Tusker/Views/Profile Header/ProfileHeaderTableViewCell.swift
index b6deb8f2fc..8b7487673b 100644
--- a/Tusker/Views/Profile Header/ProfileHeaderTableViewCell.swift	
+++ b/Tusker/Views/Profile Header/ProfileHeaderTableViewCell.swift	
@@ -15,11 +15,7 @@ protocol ProfileHeaderTableViewCellDelegate: TuskerNavigationDelegate {
 
 class ProfileHeaderTableViewCell: UITableViewCell, PreferencesAdaptive {
     
-    var delegate: ProfileHeaderTableViewCellDelegate? {
-        didSet {
-            noteLabel.navigationDelegate = delegate
-        }
-    }
+    var delegate: ProfileHeaderTableViewCellDelegate?
 
     @IBOutlet weak var headerImageView: UIImageView!
     @IBOutlet weak var avatarContainerView: UIView!
@@ -28,6 +24,9 @@ class ProfileHeaderTableViewCell: UITableViewCell, PreferencesAdaptive {
     @IBOutlet weak var usernameLabel: UILabel!
     @IBOutlet weak var followsYouLabel: UILabel!
     @IBOutlet weak var noteLabel: StatusContentLabel!
+    @IBOutlet weak var fieldsStackView: UIStackView!
+    @IBOutlet weak var fieldNamesStackView: UIStackView!
+    @IBOutlet weak var fieldValuesStack: UIStackView!
     
     var accountID: String!
     
@@ -52,7 +51,9 @@ class ProfileHeaderTableViewCell: UITableViewCell, PreferencesAdaptive {
     }
     
     func updateUI(for accountID: String) {
+        guard accountID != self.accountID else { return }
         self.accountID = accountID
+        
         guard let account = MastodonCache.account(for: accountID) else { fatalError("Missing cached account \(accountID)") }
         
         updateUIForPreferences()
@@ -76,7 +77,9 @@ class ProfileHeaderTableViewCell: UITableViewCell, PreferencesAdaptive {
             }
         }
         
+        noteLabel.navigationDelegate = delegate
         noteLabel.setTextFromHtml(account.note)
+        noteLabel.setEmojis(account.emojis)
         
         if accountID != MastodonController.account.id {
             // don't show relationship label for the user's own account
@@ -90,6 +93,29 @@ class ProfileHeaderTableViewCell: UITableViewCell, PreferencesAdaptive {
                 }
             }
         }
+        
+        if let fields = account.fields, !fields.isEmpty {
+            fieldsStackView.isHidden = false
+            
+            for field in fields {
+                let nameLabel = UILabel()
+                nameLabel.text = field.name
+                nameLabel.font = .boldSystemFont(ofSize: 17)
+                nameLabel.textAlignment = .right
+                fieldNamesStackView.addArrangedSubview(nameLabel)
+                
+                let valueLabel = ContentLabel()
+                valueLabel.setTextFromHtml(field.value)
+                valueLabel.setEmojis(account.emojis)
+                valueLabel.font = .systemFont(ofSize: 17)
+                valueLabel.textAlignment = .left
+                valueLabel.awakeFromNib() // TODO: this shouldn't be necessary
+                valueLabel.navigationDelegate = delegate
+                fieldValuesStack.addArrangedSubview(valueLabel)
+            }
+        } else {
+            fieldsStackView.isHidden = true
+        }
     }
     
     override func prepareForReuse() {
diff --git a/Tusker/Views/Profile Header/ProfileHeaderTableViewCell.xib b/Tusker/Views/Profile Header/ProfileHeaderTableViewCell.xib
index efd4b7471d..c99e2c66a1 100644
--- a/Tusker/Views/Profile Header/ProfileHeaderTableViewCell.xib	
+++ b/Tusker/Views/Profile Header/ProfileHeaderTableViewCell.xib	
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="14460.15" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="14490.70" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
     <device id="retina4_7" orientation="portrait">
         <adaptation id="fullscreen"/>
     </device>
     <dependencies>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="14460.9"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="14490.49"/>
         <capability name="Safe area layout guides" minToolsVersion="9.0"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
@@ -54,7 +54,7 @@
                     <nil key="highlightedColor"/>
                 </label>
                 <stackView opaque="NO" contentMode="scaleToFill" axis="vertical" alignment="top" spacing="8" translatesAutoresizingMaskIntoConstraints="NO" id="DfO-uD-UNI">
-                    <rect key="frame" x="16" y="218" width="343" height="70"/>
+                    <rect key="frame" x="16" y="218" width="343" height="12"/>
                     <subviews>
                         <label hidden="YES" opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Follows you" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="a32-1a-xXZ">
                             <rect key="frame" x="0.0" y="0.0" width="75.5" height="0.0"/>
@@ -63,13 +63,24 @@
                             <nil key="highlightedColor"/>
                         </label>
                         <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" text="Note" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="I0n-aP-dJP" customClass="StatusContentLabel" customModule="Tusker" customModuleProvider="target">
-                            <rect key="frame" x="0.0" y="0.0" width="37" height="70"/>
+                            <rect key="frame" x="0.0" y="0.0" width="37" height="12"/>
                             <fontDescription key="fontDescription" type="system" pointSize="17"/>
                             <nil key="textColor"/>
                             <nil key="highlightedColor"/>
                         </label>
                     </subviews>
                 </stackView>
+                <stackView opaque="NO" contentMode="scaleToFill" distribution="fillProportionally" spacing="8" translatesAutoresizingMaskIntoConstraints="NO" id="sHU-GU-klv">
+                    <rect key="frame" x="16" y="238" width="343" height="50"/>
+                    <subviews>
+                        <stackView opaque="NO" contentMode="scaleToFill" axis="vertical" distribution="fillEqually" spacing="8" translatesAutoresizingMaskIntoConstraints="NO" id="pV2-Mz-54W">
+                            <rect key="frame" x="0.0" y="0.0" width="147" height="50"/>
+                        </stackView>
+                        <stackView opaque="NO" contentMode="scaleToFill" axis="vertical" distribution="fillEqually" spacing="8" translatesAutoresizingMaskIntoConstraints="NO" id="oza-9d-8v4">
+                            <rect key="frame" x="155" y="0.0" width="188" height="50"/>
+                        </stackView>
+                    </subviews>
+                </stackView>
                 <button opaque="NO" alpha="0.59999999999999998" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="qiv-gB-kiX">
                     <rect key="frame" x="309" y="117" width="50" height="25"/>
                     <constraints>
@@ -94,10 +105,13 @@
                 <constraint firstItem="DfO-uD-UNI" firstAttribute="top" secondItem="KyB-ey-l11" secondAttribute="bottom" constant="8" id="Ljh-8x-yI3"/>
                 <constraint firstItem="Fw7-OL-iy5" firstAttribute="trailing" secondItem="vUN-kp-3ea" secondAttribute="trailing" id="LqH-lE-AIe"/>
                 <constraint firstItem="KyB-ey-l11" firstAttribute="leading" secondItem="vUN-kp-3ea" secondAttribute="leading" constant="16" id="NN7-5B-k1Q"/>
-                <constraint firstItem="vUN-kp-3ea" firstAttribute="bottom" secondItem="DfO-uD-UNI" secondAttribute="bottom" constant="8" id="aj3-iF-QBe"/>
+                <constraint firstItem="sHU-GU-klv" firstAttribute="top" secondItem="DfO-uD-UNI" secondAttribute="bottom" constant="8" id="Vza-1s-qbG"/>
+                <constraint firstAttribute="trailingMargin" secondItem="sHU-GU-klv" secondAttribute="trailing" id="XJa-zP-Ma2"/>
+                <constraint firstItem="sHU-GU-klv" firstAttribute="leading" secondItem="iN0-l3-epB" secondAttribute="leadingMargin" id="cSX-WD-2aJ"/>
                 <constraint firstItem="Fw7-OL-iy5" firstAttribute="leading" secondItem="vUN-kp-3ea" secondAttribute="leading" id="d1j-6d-hBb"/>
                 <constraint firstItem="vUN-kp-3ea" firstAttribute="trailing" secondItem="LjK-72-Bez" secondAttribute="trailing" constant="16" id="hn9-c3-iNH"/>
                 <constraint firstItem="MIj-OR-NOR" firstAttribute="leading" secondItem="KyB-ey-l11" secondAttribute="trailing" constant="8" id="iG7-yZ-9u3"/>
+                <constraint firstItem="vUN-kp-3ea" firstAttribute="bottom" secondItem="sHU-GU-klv" secondAttribute="bottom" constant="8" id="iRf-l0-ZZX"/>
                 <constraint firstItem="MIj-OR-NOR" firstAttribute="top" secondItem="LjK-72-Bez" secondAttribute="bottom" constant="8" id="nMM-6t-bjX"/>
                 <constraint firstAttribute="trailing" secondItem="qiv-gB-kiX" secondAttribute="trailing" constant="16" id="nYG-p6-Ezm"/>
                 <constraint firstItem="qiv-gB-kiX" firstAttribute="bottom" secondItem="Fw7-OL-iy5" secondAttribute="bottom" constant="-8" id="pg7-L7-u2f"/>
@@ -109,6 +123,9 @@
                 <outlet property="avatarContainerView" destination="KyB-ey-l11" id="45s-jV-l8L"/>
                 <outlet property="avatarImageView" destination="tH8-sR-DHC" id="6ll-yL-g1o"/>
                 <outlet property="displayNameLabel" destination="LjK-72-Bez" id="nIU-ey-H1C"/>
+                <outlet property="fieldNamesStackView" destination="pV2-Mz-54W" id="xfG-60-K0s"/>
+                <outlet property="fieldValuesStack" destination="oza-9d-8v4" id="UIS-KM-5fR"/>
+                <outlet property="fieldsStackView" destination="sHU-GU-klv" id="Gli-Gf-Ubh"/>
                 <outlet property="followsYouLabel" destination="a32-1a-xXZ" id="phY-0L-NnN"/>
                 <outlet property="headerImageView" destination="Fw7-OL-iy5" id="6sv-E5-D73"/>
                 <outlet property="noteLabel" destination="I0n-aP-dJP" id="7yW-mE-jxY"/>