From 10f6a68065d73e82217bcb7bd87061a27a4bd954 Mon Sep 17 00:00:00 2001
From: Shadowfacts <me@shadowfacts.net>
Date: Mon, 27 Jun 2022 14:25:22 -0700
Subject: [PATCH] Use new-style self-sizing cells on iOS 16

---
 .../Notifications/NotificationsTableViewController.swift   | 5 ++++-
 Tusker/Screens/Profile/ProfileStatusesViewController.swift | 5 ++++-
 Tusker/Screens/Timeline/TimelineTableViewController.swift  | 5 ++++-
 .../DiffableTimelineLikeTableViewController.swift          | 1 +
 Tusker/Views/Status/BaseStatusTableViewCell.swift          | 7 ++++++-
 5 files changed, 19 insertions(+), 4 deletions(-)

diff --git a/Tusker/Screens/Notifications/NotificationsTableViewController.swift b/Tusker/Screens/Notifications/NotificationsTableViewController.swift
index 45d4beb0..c45c391c 100644
--- a/Tusker/Screens/Notifications/NotificationsTableViewController.swift
+++ b/Tusker/Screens/Notifications/NotificationsTableViewController.swift
@@ -255,7 +255,10 @@ extension NotificationsTableViewController: MenuActionProvider {
 
 extension NotificationsTableViewController: StatusTableViewCellDelegate {
     func statusCellCollapsedStateChanged(_ cell: BaseStatusTableViewCell) {
-        cellHeightChanged()
+        if #available(iOS 16.0, *) {
+        } else {
+            cellHeightChanged()
+        }
     }
 }
 
diff --git a/Tusker/Screens/Profile/ProfileStatusesViewController.swift b/Tusker/Screens/Profile/ProfileStatusesViewController.swift
index d4910e26..8adc972e 100644
--- a/Tusker/Screens/Profile/ProfileStatusesViewController.swift
+++ b/Tusker/Screens/Profile/ProfileStatusesViewController.swift
@@ -265,7 +265,10 @@ extension ProfileStatusesViewController: TuskerNavigationDelegate {
 
 extension ProfileStatusesViewController: StatusTableViewCellDelegate {
     func statusCellCollapsedStateChanged(_ cell: BaseStatusTableViewCell) {
-        cellHeightChanged()
+        if #available(iOS 16.0, *) {
+        } else {
+            cellHeightChanged()
+        }
     }
 }
 
diff --git a/Tusker/Screens/Timeline/TimelineTableViewController.swift b/Tusker/Screens/Timeline/TimelineTableViewController.swift
index f8dc9632..04aaf676 100644
--- a/Tusker/Screens/Timeline/TimelineTableViewController.swift
+++ b/Tusker/Screens/Timeline/TimelineTableViewController.swift
@@ -290,7 +290,10 @@ extension TimelineTableViewController: TuskerNavigationDelegate {
 
 extension TimelineTableViewController: StatusTableViewCellDelegate {
     func statusCellCollapsedStateChanged(_ cell: BaseStatusTableViewCell) {
-        cellHeightChanged()
+        if #available(iOS 16.0, *) {
+        } else {
+            cellHeightChanged()
+        }
     }
 }
 
diff --git a/Tusker/Screens/Utilities/DiffableTimelineLikeTableViewController.swift b/Tusker/Screens/Utilities/DiffableTimelineLikeTableViewController.swift
index 599e49ef..48a9753a 100644
--- a/Tusker/Screens/Utilities/DiffableTimelineLikeTableViewController.swift
+++ b/Tusker/Screens/Utilities/DiffableTimelineLikeTableViewController.swift
@@ -163,6 +163,7 @@ class DiffableTimelineLikeTableViewController<Section: Hashable & CaseIterable,
         }
     }
     
+    @available(iOS, deprecated: 16.0)
     func cellHeightChanged() {
         // causes the table view to recalculate the cell heights
         tableView.beginUpdates()
diff --git a/Tusker/Views/Status/BaseStatusTableViewCell.swift b/Tusker/Views/Status/BaseStatusTableViewCell.swift
index 5bacedb3..77202578 100644
--- a/Tusker/Views/Status/BaseStatusTableViewCell.swift
+++ b/Tusker/Views/Status/BaseStatusTableViewCell.swift
@@ -12,6 +12,7 @@ import Combine
 import AVKit
 
 protocol StatusTableViewCellDelegate: TuskerNavigationDelegate, MenuActionProvider {
+    // @available(iOS, obsoleted: 16.0)
     func statusCellCollapsedStateChanged(_ cell: BaseStatusTableViewCell)
 }
 
@@ -332,7 +333,11 @@ class BaseStatusTableViewCell: UITableViewCell {
 
     @IBAction func collapseButtonPressed() {
         setCollapsed(!collapsed, animated: true)
-        delegate?.statusCellCollapsedStateChanged(self)
+        if #available(iOS 16.0, *) {
+            invalidateIntrinsicContentSize()
+        } else {
+            delegate?.statusCellCollapsedStateChanged(self)
+        }
     }
     
     func setCollapsed(_ collapsed: Bool, animated: Bool) {