visionOS: Improve trending link cell appearance

Tusker.xcodeproj/project.pbxproj

@@ -254,6 +254,7 @@
 		D6B9366D2828445000237D0E /* SavedInstance.swift in Sources */ = {isa = PBXBuildFile; fileRef = D6B9366C2828444F00237D0E /* SavedInstance.swift */; };
 		D6B9366F2828452F00237D0E /* SavedHashtag.swift in Sources */ = {isa = PBXBuildFile; fileRef = D6B9366E2828452F00237D0E /* SavedHashtag.swift */; };
 		D6B936712829F72900237D0E /* NSManagedObjectContext+Helpers.swift in Sources */ = {isa = PBXBuildFile; fileRef = D6B936702829F72900237D0E /* NSManagedObjectContext+Helpers.swift */; };
+		D6BC74842AFC3DF9000DD603 /* TrendingLinkCardView.swift in Sources */ = {isa = PBXBuildFile; fileRef = D6BC74832AFC3DF9000DD603 /* TrendingLinkCardView.swift */; };
 		D6BC9DB1232C61BC002CA326 /* NotificationsPageViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = D6BC9DB0232C61BC002CA326 /* NotificationsPageViewController.swift */; };
 		D6BC9DB3232D4C07002CA326 /* WellnessPrefsView.swift in Sources */ = {isa = PBXBuildFile; fileRef = D6BC9DB2232D4C07002CA326 /* WellnessPrefsView.swift */; };
 		D6BC9DD7232D7811002CA326 /* TimelinesPageViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = D6BC9DD6232D7811002CA326 /* TimelinesPageViewController.swift */; };
@@ -653,6 +654,7 @@
 		D6B9366C2828444F00237D0E /* SavedInstance.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SavedInstance.swift; sourceTree = "<group>"; };
 		D6B9366E2828452F00237D0E /* SavedHashtag.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SavedHashtag.swift; sourceTree = "<group>"; };
 		D6B936702829F72900237D0E /* NSManagedObjectContext+Helpers.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "NSManagedObjectContext+Helpers.swift"; sourceTree = "<group>"; };
+		D6BC74832AFC3DF9000DD603 /* TrendingLinkCardView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TrendingLinkCardView.swift; sourceTree = "<group>"; };
 		D6BC9DB0232C61BC002CA326 /* NotificationsPageViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NotificationsPageViewController.swift; sourceTree = "<group>"; };
 		D6BC9DB2232D4C07002CA326 /* WellnessPrefsView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = WellnessPrefsView.swift; sourceTree = "<group>"; };
 		D6BC9DD6232D7811002CA326 /* TimelinesPageViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TimelinesPageViewController.swift; sourceTree = "<group>"; };
@@ -902,6 +904,7 @@
 				D6114E1027F899B30080E273 /* TrendingLinksViewController.swift */,
 				D6E77D0A286D426E00D8B732 /* TrendingLinkCardCollectionViewCell.swift */,
 				D6E77D0C286E6B7300D8B732 /* TrendingLinkCardCollectionViewCell.xib */,
+				D6BC74832AFC3DF9000DD603 /* TrendingLinkCardView.swift */,
 				D601FA81297EEC3F00A8E8B5 /* SuggestedProfileCardCollectionViewCell.swift */,
 				D601FA82297EEC3F00A8E8B5 /* SuggestedProfileCardCollectionViewCell.xib */,
 				D693A72925CF8C1E003A14E2 /* ProfileDirectoryViewController.swift */,
@@ -2073,6 +2076,7 @@
 				D64AAE9726C88DC400FC57FB /* ToastConfiguration.swift in Sources */,
 				D63661C02381C144004B9E16 /* PreferencesNavigationController.swift in Sources */,
 				D6D79F2F2A0D6A7F00AB2315 /* StatusEditPollView.swift in Sources */,
+				D6BC74842AFC3DF9000DD603 /* TrendingLinkCardView.swift in Sources */,
 				D65B4B5E2973040D00DABDFB /* ReportAddStatusView.swift in Sources */,
 				D6EE63FB2551F7F60065485C /* StatusCollapseButton.swift in Sources */,
 				D6CA8CDE296387310050C433 /* SaveToPhotosActivity.swift in Sources */,

Tusker/Screens/Explore/TrendingLinkCardCollectionViewCell.xib

@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="21507" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="22504" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
     <device id="retina6_0" orientation="portrait" appearance="light"/>
     <dependencies>
         <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="21505"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="22504"/>
         <capability name="System colors in document resources" minToolsVersion="11.0"/>
         <capability name="collection view cell content view" minToolsVersion="11.0"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
@@ -56,9 +56,9 @@
                         </constraints>
                     </view>
                     <visualEffectView opaque="NO" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="cWo-9n-z42">
-                        <rect key="frame" x="0.0" y="196.66666666666666" width="300" height="28.333333333333343"/>
+                        <rect key="frame" x="0.0" y="196.33333333333334" width="300" height="28.666666666666657"/>
                         <view key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" insetsLayoutMarginsFromSafeArea="NO" id="ktv-3s-cp9">
-                            <rect key="frame" x="0.0" y="0.0" width="300" height="28.333333333333343"/>
+                            <rect key="frame" x="0.0" y="0.0" width="300" height="28.666666666666657"/>
                             <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                             <subviews>
                                 <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Title" textAlignment="natural" lineBreakMode="tailTruncation" numberOfLines="2" baselineAdjustment="alignBaselines" adjustsLetterSpacingToFitWidth="YES" showsExpansionTextWhenTruncated="YES" adjustsFontForContentSizeCategory="YES" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Ho3-cU-IGi">

Tusker/Screens/Explore/TrendingLinkCardView.swift

@@ -0,0 +1,95 @@
+//
+//  TrendingLinkCardView.swift
+//  Tusker
+//
+//  Created by Shadowfacts on 11/8/23.
+//  Copyright © 2023 Shadowfacts. All rights reserved.
+//
+
+#if os(visionOS)
+import SwiftUI
+import Pachyderm
+import WebURLFoundationExtras
+import SwiftSoup
+
+struct TrendingLinkCardView: View {
+    let card: Card
+    
+    private var imageURL: URL? {
+        if let image = card.image {
+            URL(image)
+        } else {
+            nil
+        }
+    }
+    
+    private var descriptionText: String {
+        try! SwiftSoup.parseBodyFragment(card.description).text()
+    }
+    
+    var body: some View {
+        VStack(alignment: .leading, spacing: 8) {
+            AsyncImage(url: imageURL, content: { image in
+                image
+                    .resizable()
+            }, placeholder: {
+                Rectangle()
+                    .fill(.tertiary)
+            })
+            .aspectRatio(4/3, contentMode: .fill)
+            .overlay(alignment: .bottom) {
+                Text(card.title.trimmingCharacters(in: .whitespacesAndNewlines))
+                    .font(.headline)
+                    .lineLimit(2)
+                    .padding(4)
+                    .background(.regularMaterial)
+                    .padding(-4)
+            }
+            .padding(-4)
+            
+            Text(descriptionText)
+                .font(.callout)
+                .lineLimit(3, reservesSpace: true)
+            
+            HStack(alignment: .bottom, spacing: 4) {
+                VStack(alignment: .leading, spacing: 4) {
+                    if let providerName = card.providerName {
+                        Text(providerName.trimmingCharacters(in: .whitespacesAndNewlines))
+                            .font(.caption2)
+                            .lineLimit(1)
+                    }
+                    
+                    let sorted = card.history!.sorted(by: { $0.day < $1.day })
+                    let lastTwo = sorted[(sorted.count - 2)...]
+                    let accounts = lastTwo.map(\.accounts).reduce(0, +)
+                    let uses = lastTwo.map(\.uses).reduce(0, +)
+                    // U+2009 THIN SPACE
+                    Text("\(accounts.formatted())\u{2009}\(Image(systemName: "person")), \(uses.formatted())\u{2009}\(Image(systemName: "square.text.square"))")
+                        .font(.caption2)
+                }
+                
+                if let history = card.history {
+                    CardHistoryView(history: history)
+                }
+            }
+        }
+        .padding(4)
+        .glassBackgroundEffect(in: RoundedRectangle(cornerRadius: 12.5))
+    }
+}
+
+private struct CardHistoryView: UIViewRepresentable {
+    typealias UIViewType = TrendHistoryView
+    let history: [History]
+    func makeUIView(context: Context) -> TrendHistoryView {
+        TrendHistoryView()
+    }
+    func updateUIView(_ uiView: TrendHistoryView, context: Context) {
+        uiView.setHistory(history)
+    }
+}
+
+//#Preview {
+//    TrendingLinkCardView()
+//}
+#endif

Tusker/Screens/Explore/TrendsViewController.swift

@@ -10,6 +10,9 @@ import UIKit
 import Pachyderm
 import SafariServices
 import Combine
+#if os(visionOS)
+import SwiftUI
+#endif
 
 class TrendsViewController: UIViewController, CollectionViewController {
     
@@ -144,9 +147,17 @@ class TrendsViewController: UIViewController, CollectionViewController {
         let trendingHashtagCell = UICollectionView.CellRegistration<TrendingHashtagCollectionViewCell, Hashtag> { (cell, indexPath, hashtag) in
             cell.updateUI(hashtag: hashtag)
         }
+        #if os(visionOS)
+        let trendingLinkCell = UICollectionView.CellRegistration<UICollectionViewCell, Card> { cell, indexPath, card in
+            cell.contentConfiguration = UIHostingConfiguration(content: {
+                TrendingLinkCardView(card: card)
+            })
+        }
+        #else
         let trendingLinkCell = UICollectionView.CellRegistration<TrendingLinkCardCollectionViewCell, Card>(cellNib: UINib(nibName: "TrendingLinkCardCollectionViewCell", bundle: .main)) { (cell, indexPath, card) in
             cell.updateUI(card: card)
         }
+        #endif
         let statusCell = UICollectionView.CellRegistration<TrendingStatusCollectionViewCell, (String, CollapseState)> { [unowned self] cell, indexPath, item in
             cell.delegate = self
             // TODO: filter trends