Profile directory can have a little shadow, as a treat

Tusker/InstanceFeatures.swift

@@ -30,11 +30,12 @@ struct InstanceFeatures {
     }
     
     mutating func update(instance: Instance, nodeInfo: NodeInfo?) {
-        if instance.version.contains("glitch") {
+        let ver = instance.version.lowercased()
+        if ver.contains("glitch") {
             instanceType = .glitch
         } else if nodeInfo?.software.name == "hometown" {
             instanceType = .hometown
-        } else if instance.version.contains("pleroma") {
+        } else if ver.contains("pleroma") {
             instanceType = .pleroma
         } else {
             instanceType = .mastodon

Tusker/Screens/Explore/ExploreViewController.swift

@@ -154,7 +154,8 @@ class ExploreViewController: UIViewController, UICollectionViewDelegate {
     
     private func ownInstanceLoaded(_ instance: Instance) {
         var snapshot = self.dataSource.snapshot()
-        if mastodonController.instanceFeatures.instanceType.isMastodon {
+        if mastodonController.instanceFeatures.instanceType.isMastodon,
+           !snapshot.sectionIdentifiers.contains(.discover) {
             snapshot.insertSections([.discover], afterSection: .bookmarks)
             snapshot.appendItems([.trendingTags, .profileDirectory], toSection: .discover)
         }

Tusker/Screens/Explore/FeaturedProfileCollectionViewCell.swift

@@ -11,6 +11,7 @@ import Pachyderm
 
 class FeaturedProfileCollectionViewCell: UICollectionViewCell {
 
+    @IBOutlet weak var clippingView: UIView!
     @IBOutlet weak var headerImageView: UIImageView!
     @IBOutlet weak var avatarContainerView: UIView!
     @IBOutlet weak var avatarImageView: UIImageView!
@@ -30,6 +31,17 @@ class FeaturedProfileCollectionViewCell: UICollectionViewCell {
         
         noteTextView.defaultFont = .systemFont(ofSize: 16)
         noteTextView.textContainer.lineBreakMode = .byTruncatingTail
+        noteTextView.textContainerInset = UIEdgeInsets(top: 16, left: 4, bottom: 16, right: 4)
+        
+        backgroundColor = .clear
+        clippingView.layer.cornerRadius = 5
+        clippingView.layer.borderWidth = 1
+        clippingView.layer.masksToBounds = true
+        layer.shadowOpacity = 0.2
+        layer.shadowRadius = 8
+        layer.shadowOffset = .zero
+        layer.masksToBounds = false
+        updateLayerColors()
         
         NotificationCenter.default.addObserver(self, selector: #selector(preferencesChanged), name: .preferencesChanged, object: nil)
     }
@@ -75,6 +87,27 @@ class FeaturedProfileCollectionViewCell: UICollectionViewCell {
         }
     }
     
+    private func updateLayerColors() {
+        if traitCollection.userInterfaceStyle == .dark {
+            clippingView.layer.borderColor = UIColor.darkGray.withAlphaComponent(0.5).cgColor
+            layer.shadowColor = UIColor.darkGray.cgColor
+        } else {
+            clippingView.layer.borderColor = UIColor.lightGray.withAlphaComponent(0.5).cgColor
+            layer.shadowColor = UIColor.black.cgColor
+        }
+    }
+    
+    override func traitCollectionDidChange(_ previousTraitCollection: UITraitCollection?) {
+        super.traitCollectionDidChange(previousTraitCollection)
+        updateLayerColors()
+    }
+    
+    override func layoutSubviews() {
+        super.layoutSubviews()
+        
+        layer.shadowPath = CGPath(roundedRect: bounds, cornerWidth: 5, cornerHeight: 5, transform: nil)
+    }
+    
     @objc private func preferencesChanged() {
         avatarContainerView.layer.cornerRadius = Preferences.shared.avatarStyle.cornerRadius(for: avatarContainerView)
         avatarImageView.layer.cornerRadius = Preferences.shared.avatarStyle.cornerRadius(for: avatarImageView)

Tusker/Screens/Explore/FeaturedProfileCollectionViewCell.xib

@@ -1,8 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="18121" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="19529" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
     <device id="retina6_1" orientation="portrait" appearance="light"/>
     <dependencies>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="18091"/>
+        <deployment identifier="iOS"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="19519"/>
         <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"/>
@@ -16,6 +17,9 @@
             <view key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center">
                 <rect key="frame" x="0.0" y="0.0" width="400" height="200"/>
                 <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
+                <subviews>
+                    <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="YkJ-rV-f3C">
+                        <rect key="frame" x="0.0" y="0.0" width="400" height="200"/>
                         <subviews>
                             <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="bo4-Sd-caI">
                                 <rect key="frame" x="0.0" y="0.0" width="400" height="66"/>
@@ -50,34 +54,45 @@
                                 <nil key="highlightedColor"/>
                             </label>
                             <textView clipsSubviews="YES" multipleTouchEnabled="YES" userInteractionEnabled="NO" contentMode="scaleToFill" verticalCompressionResistancePriority="749" scrollEnabled="NO" editable="NO" textAlignment="natural" selectable="NO" translatesAutoresizingMaskIntoConstraints="NO" id="bvj-F0-ggC" customClass="StatusContentTextView" customModule="Tusker" customModuleProvider="target">
-                        <rect key="frame" x="8" y="102" width="384" height="94"/>
+                                <rect key="frame" x="8" y="102" width="384" height="98"/>
+                                <color key="backgroundColor" systemColor="systemBackgroundColor"/>
                                 <string key="text">Lorem ipsum dolor sit er elit lamet, consectetaur cillium adipisicing pecu, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum. Nam liber te conscient to factor tum poen legum odioque civiuda.</string>
                                 <color key="textColor" systemColor="labelColor"/>
                                 <fontDescription key="fontDescription" type="system" pointSize="14"/>
                                 <textInputTraits key="textInputTraits" autocapitalizationType="sentences"/>
                             </textView>
                         </subviews>
+                        <color key="backgroundColor" systemColor="systemBackgroundColor"/>
+                        <constraints>
+                            <constraint firstAttribute="trailing" secondItem="bvj-F0-ggC" secondAttribute="trailing" constant="8" id="1sd-Df-jR1"/>
+                            <constraint firstItem="bvj-F0-ggC" firstAttribute="leading" secondItem="YkJ-rV-f3C" secondAttribute="leading" constant="8" id="35h-Wh-fvk"/>
+                            <constraint firstItem="voW-Is-1b2" firstAttribute="top" relation="greaterThanOrEqual" secondItem="bo4-Sd-caI" secondAttribute="bottom" id="39l-yo-g8V"/>
+                            <constraint firstItem="bo4-Sd-caI" firstAttribute="leading" secondItem="YkJ-rV-f3C" secondAttribute="leading" id="3lQ-uN-93N"/>
+                            <constraint firstAttribute="trailing" secondItem="voW-Is-1b2" secondAttribute="trailing" constant="8" id="Ckp-Bq-lB5"/>
+                            <constraint firstItem="bo4-Sd-caI" firstAttribute="top" secondItem="YkJ-rV-f3C" secondAttribute="top" id="DWh-S5-PLQ"/>
+                            <constraint firstAttribute="bottom" secondItem="bvj-F0-ggC" secondAttribute="bottom" id="MH3-7E-THx"/>
+                            <constraint firstItem="RQe-uE-TEv" firstAttribute="leading" secondItem="YkJ-rV-f3C" secondAttribute="leading" constant="8" id="Tzo-aN-Bxq"/>
+                            <constraint firstItem="voW-Is-1b2" firstAttribute="bottom" secondItem="4wd-wq-Sh2" secondAttribute="bottom" id="Wk6-u2-azz"/>
+                            <constraint firstItem="RQe-uE-TEv" firstAttribute="centerY" secondItem="bo4-Sd-caI" secondAttribute="bottom" id="bon-bj-qnk"/>
+                            <constraint firstItem="bvj-F0-ggC" firstAttribute="top" secondItem="RQe-uE-TEv" secondAttribute="bottom" constant="4" id="dyg-LN-BDn"/>
+                            <constraint firstItem="voW-Is-1b2" firstAttribute="leading" secondItem="RQe-uE-TEv" secondAttribute="trailing" constant="4" id="shC-67-vC2"/>
+                            <constraint firstAttribute="trailing" secondItem="bo4-Sd-caI" secondAttribute="trailing" id="wZn-gO-zue"/>
+                        </constraints>
+                    </view>
+                </subviews>
             </view>
             <viewLayoutGuide key="safeArea" id="ZTg-uK-7eu"/>
             <color key="backgroundColor" systemColor="systemBackgroundColor"/>
             <constraints>
-                <constraint firstItem="bvj-F0-ggC" firstAttribute="top" secondItem="RQe-uE-TEv" secondAttribute="bottom" constant="4" id="8Nc-FF-kRX"/>
+                <constraint firstAttribute="trailing" secondItem="YkJ-rV-f3C" secondAttribute="trailing" id="Dy3-h1-zfM"/>
-                <constraint firstItem="bo4-Sd-caI" firstAttribute="top" secondItem="gTV-IL-0wX" secondAttribute="top" id="CJ1-Be-L45"/>
+                <constraint firstItem="YkJ-rV-f3C" firstAttribute="leading" secondItem="gTV-IL-0wX" secondAttribute="leading" id="Gld-3x-oE0"/>
-                <constraint firstAttribute="bottom" secondItem="bvj-F0-ggC" secondAttribute="bottom" constant="4" id="Hza-qE-Agk"/>
+                <constraint firstItem="YkJ-rV-f3C" firstAttribute="top" secondItem="gTV-IL-0wX" secondAttribute="top" id="NIV-n8-4Rl"/>
-                <constraint firstItem="voW-Is-1b2" firstAttribute="bottom" secondItem="4wd-wq-Sh2" secondAttribute="bottom" id="N0l-fE-AAX"/>
+                <constraint firstAttribute="bottom" secondItem="YkJ-rV-f3C" secondAttribute="bottom" id="zNw-2z-Hlx"/>
-                <constraint firstItem="RQe-uE-TEv" firstAttribute="centerY" secondItem="bo4-Sd-caI" secondAttribute="bottom" id="Ngh-DO-Q0X"/>
-                <constraint firstItem="bvj-F0-ggC" firstAttribute="leading" secondItem="gTV-IL-0wX" secondAttribute="leading" constant="8" id="Rjq-1i-PV2"/>
-                <constraint firstItem="voW-Is-1b2" firstAttribute="leading" secondItem="RQe-uE-TEv" secondAttribute="trailing" constant="4" id="WUb-3i-BFe"/>
-                <constraint firstAttribute="trailing" secondItem="bvj-F0-ggC" secondAttribute="trailing" constant="8" id="ZrT-Wa-pbY"/>
-                <constraint firstItem="voW-Is-1b2" firstAttribute="top" relation="greaterThanOrEqual" secondItem="bo4-Sd-caI" secondAttribute="bottom" id="g4l-yF-2wH"/>
-                <constraint firstAttribute="trailing" secondItem="bo4-Sd-caI" secondAttribute="trailing" id="geb-Qa-zZp"/>
-                <constraint firstAttribute="trailing" secondItem="voW-Is-1b2" secondAttribute="trailing" constant="8" id="l91-F6-kAL"/>
-                <constraint firstItem="bo4-Sd-caI" firstAttribute="leading" secondItem="gTV-IL-0wX" secondAttribute="leading" id="tUr-Oy-nXN"/>
-                <constraint firstItem="RQe-uE-TEv" firstAttribute="leading" secondItem="gTV-IL-0wX" secondAttribute="leading" constant="8" id="uZI-LM-bZW"/>
             </constraints>
             <connections>
                 <outlet property="avatarContainerView" destination="RQe-uE-TEv" id="tBI-fT-26P"/>
                 <outlet property="avatarImageView" destination="4wd-wq-Sh2" id="rba-cv-8fb"/>
+                <outlet property="clippingView" destination="YkJ-rV-f3C" id="hLI-4z-yIc"/>
                 <outlet property="displayNameLabel" destination="voW-Is-1b2" id="XVS-4d-PKx"/>
                 <outlet property="headerImageView" destination="bo4-Sd-caI" id="YkL-Wi-BXb"/>
                 <outlet property="noteTextView" destination="bvj-F0-ggC" id="Bbm-ai-bu1"/>

Tusker/Screens/Explore/ProfileDirectoryFilterView.swift

@@ -44,11 +44,13 @@ class ProfileDirectoryFilterView: UICollectionReusableView {
         fromLabel.translatesAutoresizingMaskIntoConstraints = false
         fromLabel.text = NSLocalizedString("From", comment: "profile directory scope label")
         fromLabel.setContentHuggingPriority(.defaultHigh, for: .horizontal)
+        fromLabel.textAlignment = .right
 
         let sortLabel = UILabel()
         sortLabel.translatesAutoresizingMaskIntoConstraints = false
         sortLabel.text = NSLocalizedString("Sort By", comment: "profile directory sort label")
         sortLabel.setContentHuggingPriority(.defaultHigh, for: .horizontal)
+        sortLabel.textAlignment = .right
         
         let labelContainer = UIView()
         labelContainer.addSubview(sortLabel)

Tusker/Screens/Explore/ProfileDirectoryViewController.swift

@@ -45,7 +45,7 @@ class ProfileDirectoryViewController: UIViewController {
             if case .compact = layoutEnvironment.traitCollection.horizontalSizeClass {
                 itemWidth = .fractionalWidth(1)
             } else {
-                itemWidth = .absolute((layoutEnvironment.container.contentSize.width - 12) / 2)
+                itemWidth = .absolute((layoutEnvironment.container.contentSize.width - 16 - 8 * 2) / 2)
             }
             
             let itemSize = NSCollectionLayoutSize(widthDimension: itemWidth, heightDimension: itemHeight)
@@ -54,15 +54,11 @@ class ProfileDirectoryViewController: UIViewController {
             
             let groupSize = NSCollectionLayoutSize(widthDimension: .fractionalWidth(1), heightDimension: itemHeight)
             let group = NSCollectionLayoutGroup.horizontal(layoutSize: groupSize, subitems: [item, itemB])
-            group.interItemSpacing = .flexible(4)
+            group.interItemSpacing = .flexible(16)
             
             let section = NSCollectionLayoutSection(group: group)
-            section.interGroupSpacing = 4
+            section.interGroupSpacing = 16
-            if case .compact = layoutEnvironment.traitCollection.horizontalSizeClass {
+            section.contentInsets = NSDirectionalEdgeInsets(top: 8, leading: 8, bottom: 8, trailing: 8)
-                section.contentInsets = NSDirectionalEdgeInsets(top: 4, leading: 0, bottom: 4, trailing: 0)
-            } else {
-                section.contentInsets = NSDirectionalEdgeInsets(top: 4, leading: 4, bottom: 4, trailing: 4)
-            }
             return section
         }, configuration: configuration)
         

Tusker/Screens/Main/MainSidebarViewController.swift

@@ -161,7 +161,8 @@ class MainSidebarViewController: UIViewController {
     
     private func ownInstanceLoaded(_ instance: Instance) {
         var snapshot = self.dataSource.snapshot()
-        if mastodonController.instanceFeatures.instanceType.isMastodon {
+        if mastodonController.instanceFeatures.instanceType.isMastodon,
+           !snapshot.sectionIdentifiers.contains(.discover) {
             snapshot.insertSections([.discover], afterSection: .compose)
             snapshot.appendItems([
                 .trendingTags,