Fix insets with new sidebar

Tusker.xcodeproj/project.pbxproj

@@ -131,6 +131,7 @@
 		D646DCDC2A081CF10059ECEB /* StatusUpdatedNotificationCollectionViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = D646DCDB2A081CF10059ECEB /* StatusUpdatedNotificationCollectionViewCell.swift */; };
 		D64A50462C739DC0009D7193 /* NewMainTabBarViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = D64A50452C739DC0009D7193 /* NewMainTabBarViewController.swift */; };
 		D64A50482C739DEA009D7193 /* BaseMainTabBarViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = D64A50472C739DEA009D7193 /* BaseMainTabBarViewController.swift */; };
+		D64A50BC2C74F8F4009D7193 /* FindInstanceViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = D64A50BB2C74F8F4009D7193 /* FindInstanceViewController.swift */; };
 		D64AAE9126C80DC600FC57FB /* ToastView.swift in Sources */ = {isa = PBXBuildFile; fileRef = D64AAE9026C80DC600FC57FB /* ToastView.swift */; };
 		D64AAE9526C88C5000FC57FB /* ToastableViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = D64AAE9426C88C5000FC57FB /* ToastableViewController.swift */; };
 		D64AAE9726C88DC400FC57FB /* ToastConfiguration.swift in Sources */ = {isa = PBXBuildFile; fileRef = D64AAE9626C88DC400FC57FB /* ToastConfiguration.swift */; };
@@ -225,7 +226,6 @@
 		D6945C3223AC4D36005C403C /* HashtagTimelineViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = D6945C3123AC4D36005C403C /* HashtagTimelineViewController.swift */; };
 		D6945C3423AC6431005C403C /* AddSavedHashtagViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = D6945C3323AC6431005C403C /* AddSavedHashtagViewController.swift */; };
 		D6945C3823AC739F005C403C /* InstanceTimelineViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = D6945C3723AC739F005C403C /* InstanceTimelineViewController.swift */; };
-		D6945C3A23AC75E2005C403C /* FindInstanceViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = D6945C3923AC75E2005C403C /* FindInstanceViewController.swift */; };
 		D6958F3D2AA383D90062FE52 /* WidescreenNavigationPrefsView.swift in Sources */ = {isa = PBXBuildFile; fileRef = D6958F3C2AA383D90062FE52 /* WidescreenNavigationPrefsView.swift */; };
 		D69693F42585941A00F4E116 /* UIWindowSceneDelegate+Close.swift in Sources */ = {isa = PBXBuildFile; fileRef = D69693F32585941A00F4E116 /* UIWindowSceneDelegate+Close.swift */; };
 		D69693FA25859A8000F4E116 /* ComposeSceneDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = D69693F925859A8000F4E116 /* ComposeSceneDelegate.swift */; };
@@ -564,6 +564,7 @@
 		D646DCDB2A081CF10059ECEB /* StatusUpdatedNotificationCollectionViewCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = StatusUpdatedNotificationCollectionViewCell.swift; sourceTree = "<group>"; };
 		D64A50452C739DC0009D7193 /* NewMainTabBarViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NewMainTabBarViewController.swift; sourceTree = "<group>"; };
 		D64A50472C739DEA009D7193 /* BaseMainTabBarViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BaseMainTabBarViewController.swift; sourceTree = "<group>"; };
+		D64A50BB2C74F8F4009D7193 /* FindInstanceViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FindInstanceViewController.swift; sourceTree = "<group>"; };
 		D64AAE9026C80DC600FC57FB /* ToastView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ToastView.swift; sourceTree = "<group>"; };
 		D64AAE9426C88C5000FC57FB /* ToastableViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ToastableViewController.swift; sourceTree = "<group>"; };
 		D64AAE9626C88DC400FC57FB /* ToastConfiguration.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ToastConfiguration.swift; sourceTree = "<group>"; };
@@ -661,7 +662,6 @@
 		D6945C3123AC4D36005C403C /* HashtagTimelineViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = HashtagTimelineViewController.swift; sourceTree = "<group>"; };
 		D6945C3323AC6431005C403C /* AddSavedHashtagViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AddSavedHashtagViewController.swift; sourceTree = "<group>"; };
 		D6945C3723AC739F005C403C /* InstanceTimelineViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = InstanceTimelineViewController.swift; sourceTree = "<group>"; };
-		D6945C3923AC75E2005C403C /* FindInstanceViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; name = FindInstanceViewController.swift; path = Tusker/Screens/FindInstanceViewController.swift; sourceTree = SOURCE_ROOT; };
 		D6958F3C2AA383D90062FE52 /* WidescreenNavigationPrefsView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = WidescreenNavigationPrefsView.swift; sourceTree = "<group>"; };
 		D69693F32585941A00F4E116 /* UIWindowSceneDelegate+Close.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "UIWindowSceneDelegate+Close.swift"; sourceTree = "<group>"; };
 		D69693F925859A8000F4E116 /* ComposeSceneDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ComposeSceneDelegate.swift; sourceTree = "<group>"; };
@@ -981,7 +981,7 @@
 				D68E525C24A3E8F00054355A /* InlineTrendsViewController.swift */,
 				D6945C3323AC6431005C403C /* AddSavedHashtagViewController.swift */,
 				D6093F9A25BDD4B9004811E6 /* HashtagSearchResultsViewController.swift */,
-				D6945C3923AC75E2005C403C /* FindInstanceViewController.swift */,
+				D64A50BB2C74F8F4009D7193 /* FindInstanceViewController.swift */,
 				D6114E0C27F7FEB30080E273 /* TrendingStatusesViewController.swift */,
 				D693A72725CF282E003A14E2 /* TrendingHashtagsViewController.swift */,
 				D6114E1027F899B30080E273 /* TrendingLinksViewController.swift */,
@@ -2241,6 +2241,7 @@
 				D691772E29AA5D420054D7EF /* UserActivityHandlingContext.swift in Sources */,
 				04ED00B121481ED800567C53 /* SteppedProgressView.swift in Sources */,
 				D6A6C11B25B63CEE00298D0F /* MemoryCache.swift in Sources */,
+				D64A50BC2C74F8F4009D7193 /* FindInstanceViewController.swift in Sources */,
 				D6114E0D27F7FEB30080E273 /* TrendingStatusesViewController.swift in Sources */,
 				D6BC9DDA232D8BE5002CA326 /* SearchResultsViewController.swift in Sources */,
 				D698F4672BD079800054DB14 /* AnnouncementsHostingController.swift in Sources */,
@@ -2280,7 +2281,6 @@
 				D63CC7102911F1E4000E19DE /* UIScrollView+Top.swift in Sources */,
 				D6F6A557291F4F1600F496A8 /* MuteAccountView.swift in Sources */,
 				D65B4B8B297879E900DABDFB /* AccountFollowsViewController.swift in Sources */,
-				D6945C3A23AC75E2005C403C /* FindInstanceViewController.swift in Sources */,
 				D65B4B6429771EFF00DABDFB /* ConversationViewController.swift in Sources */,
 				D68E6F59253C9969001A1B4C /* MultiSourceEmojiLabel.swift in Sources */,
 				D6EBF01523C55C0900AE061B /* UIApplication+Scenes.swift in Sources */,

Tusker/Screens/Account Follows/AccountFollowsListViewController.swift

@@ -17,9 +17,7 @@ class AccountFollowsListViewController: UIViewController, CollectionViewControll
     let mastodonController: MastodonController
     let mode: AccountFollowsViewController.Mode
     
-    var collectionView: UICollectionView! {
+    private(set) var collectionView: UICollectionView!
-        view as? UICollectionView
-    }
     private var dataSource: UICollectionViewDiffableDataSource<Section, Item>!
     
     private var state: State = .unloaded
@@ -40,7 +38,11 @@ class AccountFollowsListViewController: UIViewController, CollectionViewControll
         fatalError("init(coder:) has not been implemented")
     }
     
-    override func loadView() {
+    override func viewDidLoad() {
+        super.viewDidLoad()
+        
+        view.backgroundColor = .appGroupedBackground
+        
         var config = UICollectionLayoutListConfiguration(appearance: .plain)
         config.backgroundColor = .appBackground
         config.itemSeparatorHandler = { [unowned self] indexPath, sectionConfig in
@@ -65,10 +67,19 @@ class AccountFollowsListViewController: UIViewController, CollectionViewControll
             section.readableContentInset(in: environment)
             return section
         }
-        view = UICollectionView(frame: .zero, collectionViewLayout: layout)
+        collectionView = UICollectionView(frame: .zero, collectionViewLayout: layout)
         collectionView.delegate = self
         collectionView.dragDelegate = self
         collectionView.allowsFocus = true
+        collectionView.translatesAutoresizingMaskIntoConstraints = false
+        view.addSubview(collectionView)
+        NSLayoutConstraint.activate([
+            collectionView.leadingAnchor.constraint(equalTo: view.safeAreaLayoutGuide.leadingAnchor),
+            collectionView.trailingAnchor.constraint(equalTo: view.safeAreaLayoutGuide.trailingAnchor),
+            collectionView.topAnchor.constraint(equalTo: view.topAnchor),
+            collectionView.bottomAnchor.constraint(equalTo: view.bottomAnchor),
+        ])
+        
         dataSource = createDataSource()
     }
     

Tusker/Screens/Account List/AccountListViewController.swift

@@ -14,9 +14,7 @@ class AccountListViewController: UIViewController, CollectionViewController {
     private let mastodonController: MastodonController
     private let accountIDs: [String]
     
-    var collectionView: UICollectionView! {
+    private(set) var collectionView: UICollectionView!
-        view as? UICollectionView
-    }
     private var dataSource: UICollectionViewDiffableDataSource<Section, Item>!
     
     init(accountIDs: [String], mastodonController: MastodonController) {
@@ -30,7 +28,11 @@ class AccountListViewController: UIViewController, CollectionViewController {
         fatalError("init(coder:) has not been implemented")
     }
     
-    override func loadView() {
+    override func viewDidLoad() {
+        super.viewDidLoad()
+        
+        view.backgroundColor = .appGroupedBackground
+        
         var config = UICollectionLayoutListConfiguration(appearance: .grouped)
         config.backgroundColor = .appGroupedBackground
         config.separatorConfiguration.topSeparatorInsets = TimelineStatusCollectionViewCell.separatorInsets
@@ -40,11 +42,25 @@ class AccountListViewController: UIViewController, CollectionViewController {
             section.readableContentInset(in: environment)
             return section
         }
-        view = UICollectionView(frame: .zero, collectionViewLayout: layout)
+        collectionView = UICollectionView(frame: .zero, collectionViewLayout: layout)
         collectionView.delegate = self
         collectionView.dragDelegate = self
         collectionView.allowsFocus = true
+        collectionView.translatesAutoresizingMaskIntoConstraints = false
+        view.addSubview(collectionView)
+        NSLayoutConstraint.activate([
+            collectionView.leadingAnchor.constraint(equalTo: view.safeAreaLayoutGuide.leadingAnchor),
+            collectionView.trailingAnchor.constraint(equalTo: view.safeAreaLayoutGuide.trailingAnchor),
+            collectionView.topAnchor.constraint(equalTo: view.topAnchor),
+            collectionView.bottomAnchor.constraint(equalTo: view.bottomAnchor),
+        ])
+
         dataSource = createDataSource()
+
+        var snapshot = NSDiffableDataSourceSnapshot<Section, Item>()
+        snapshot.appendSections([.accounts])
+        snapshot.appendItems(accountIDs)
+        dataSource.apply(snapshot, animatingDifferences: false)
     }
     
     private func createDataSource() -> UICollectionViewDiffableDataSource<Section, Item> {
@@ -56,16 +72,7 @@ class AccountListViewController: UIViewController, CollectionViewController {
             return collectionView.dequeueConfiguredReusableCell(using: accountCell, for: indexPath, item: itemIdentifier)
         }
     }
-    
-    override func viewDidLoad() {
-        super.viewDidLoad()
 
-        var snapshot = NSDiffableDataSourceSnapshot<Section, Item>()
-        snapshot.appendSections([.accounts])
-        snapshot.appendItems(accountIDs)
-        dataSource.apply(snapshot, animatingDifferences: false)
-    }
-    
     override func viewWillAppear(_ animated: Bool) {
         super.viewWillAppear(animated)
         

Tusker/Screens/Conversation/ConversationCollectionViewController.swift

@@ -19,9 +19,7 @@ class ConversationCollectionViewController: UIViewController, CollectionViewCont
     var statusIDToScrollToOnLoad: String
     var showStatusesAutomatically = false
     
-    var collectionView: UICollectionView! {
+    private(set) var collectionView: UICollectionView!
-        view as? UICollectionView
-    }
     private var dataSource: UICollectionViewDiffableDataSource<Section, Item>!
     
     init(for mainStatusID: String, state: CollapseState, conversationViewController: ConversationViewController) {
@@ -38,7 +36,9 @@ class ConversationCollectionViewController: UIViewController, CollectionViewCont
         fatalError("init(coder:) has not been implemented")
     }
     
-    override func loadView() {
+    override func viewDidLoad() {
+        super.viewDidLoad()
+        
         var config = UICollectionLayoutListConfiguration(appearance: .plain)
         config.backgroundColor = .appSecondaryBackground
         config.leadingSwipeActionsConfigurationProvider = { [unowned self] in
@@ -66,13 +66,19 @@ class ConversationCollectionViewController: UIViewController, CollectionViewCont
             return section
         }
         viewRespectsSystemMinimumLayoutMargins = false
-        view = UICollectionView(frame: .zero, collectionViewLayout: layout)
+        collectionView = UICollectionView(frame: .zero, collectionViewLayout: layout)
-        // something about the autoresizing mask breaks resizing the vc
-        view.translatesAutoresizingMaskIntoConstraints = false
         collectionView.delegate = self
         collectionView.dragDelegate = self
         collectionView.allowsFocus = true
-        
+        collectionView.translatesAutoresizingMaskIntoConstraints = false
+        view.addSubview(collectionView)
+        NSLayoutConstraint.activate([
+            collectionView.leadingAnchor.constraint(equalTo: view.safeAreaLayoutGuide.leadingAnchor),
+            collectionView.trailingAnchor.constraint(equalTo: view.safeAreaLayoutGuide.trailingAnchor),
+            collectionView.topAnchor.constraint(equalTo: view.topAnchor),
+            collectionView.bottomAnchor.constraint(equalTo: view.bottomAnchor),
+        ])
+
         #if !targetEnvironment(macCatalyst)
         collectionView.refreshControl = UIRefreshControl()
         collectionView.refreshControl!.addTarget(self, action: #selector(refresh), for: .valueChanged)

Tusker/Screens/Explore/ExploreViewController.swift

@@ -48,12 +48,18 @@ class ExploreViewController: UIViewController, UICollectionViewDelegate, Collect
         configuration.headerMode = .supplementary
         let layout = UICollectionViewCompositionalLayout.list(using: configuration)
         collectionView = UICollectionView(frame: view.bounds, collectionViewLayout: layout)
-        collectionView.autoresizingMask = [.flexibleWidth, .flexibleHeight]
         collectionView.delegate = self
         collectionView.dragDelegate = self
         collectionView.allowsFocus = true
+        collectionView.translatesAutoresizingMaskIntoConstraints = false
         view.addSubview(collectionView)
-        
+        NSLayoutConstraint.activate([
+            collectionView.leadingAnchor.constraint(equalTo: view.safeAreaLayoutGuide.leadingAnchor),
+            collectionView.trailingAnchor.constraint(equalTo: view.safeAreaLayoutGuide.trailingAnchor),
+            collectionView.topAnchor.constraint(equalTo: view.topAnchor),
+            collectionView.bottomAnchor.constraint(equalTo: view.bottomAnchor),
+        ])
+
         dataSource = createDataSource()
         applyInitialSnapshot()
         

Tusker/Screens/Explore/SuggestedProfilesViewController.swift

@@ -46,8 +46,8 @@ class SuggestedProfilesViewController: UIViewController, CollectionViewControlle
         collectionView.allowsFocus = true
         view.addSubview(collectionView)
         NSLayoutConstraint.activate([
-            collectionView.leadingAnchor.constraint(equalTo: view.leadingAnchor),
+            collectionView.leadingAnchor.constraint(equalTo: view.safeAreaLayoutGuide.leadingAnchor),
-            collectionView.trailingAnchor.constraint(equalTo: view.trailingAnchor),
+            collectionView.trailingAnchor.constraint(equalTo: view.safeAreaLayoutGuide.trailingAnchor),
             collectionView.topAnchor.constraint(equalTo: view.topAnchor),
             collectionView.bottomAnchor.constraint(equalTo: view.bottomAnchor),
         ])

Tusker/Screens/Explore/TrendingHashtagsViewController.swift

@@ -53,12 +53,18 @@ class TrendingHashtagsViewController: UIViewController, CollectionViewController
         }
         let layout = UICollectionViewCompositionalLayout.list(using: config)
         collectionView = UICollectionView(frame: view.bounds, collectionViewLayout: layout)
-        collectionView.autoresizingMask = [.flexibleWidth, .flexibleHeight]
         collectionView.delegate = self
         collectionView.dragDelegate = self
         collectionView.allowsFocus = true
+        collectionView.translatesAutoresizingMaskIntoConstraints = false
         view.addSubview(collectionView)
-        
+        NSLayoutConstraint.activate([
+            collectionView.leadingAnchor.constraint(equalTo: view.safeAreaLayoutGuide.leadingAnchor),
+            collectionView.trailingAnchor.constraint(equalTo: view.safeAreaLayoutGuide.trailingAnchor),
+            collectionView.topAnchor.constraint(equalTo: view.topAnchor),
+            collectionView.bottomAnchor.constraint(equalTo: view.bottomAnchor),
+        ])
+
         let loadingCell = UICollectionView.CellRegistration<LoadingCollectionViewCell, Void> { cell, indexPath, itemIdentifier in
             cell.indicator.startAnimating()
         }

Tusker/Screens/Explore/TrendingLinksViewController.swift

@@ -40,6 +40,8 @@ class TrendingLinksViewController: UIViewController, CollectionViewController {
 
         title = NSLocalizedString("Trending Links", comment: "trending links screen title")
         
+        view.backgroundColor = .appGroupedBackground
+        
         let layout = UICollectionViewCompositionalLayout { [unowned self] sectionIndex, environment in
             switch dataSource.sectionIdentifier(for: sectionIndex) {
             case nil:
@@ -80,8 +82,8 @@ class TrendingLinksViewController: UIViewController, CollectionViewController {
         collectionView.allowsFocus = true
         view.addSubview(collectionView)
         NSLayoutConstraint.activate([
-            collectionView.leadingAnchor.constraint(equalTo: view.leadingAnchor),
+            collectionView.leadingAnchor.constraint(equalTo: view.safeAreaLayoutGuide.leadingAnchor),
-            collectionView.trailingAnchor.constraint(equalTo: view.trailingAnchor),
+            collectionView.trailingAnchor.constraint(equalTo: view.safeAreaLayoutGuide.trailingAnchor),
             collectionView.topAnchor.constraint(equalTo: view.topAnchor),
             collectionView.bottomAnchor.constraint(equalTo: view.bottomAnchor),
         ])

Tusker/Screens/Explore/TrendingStatusesViewController.swift

@@ -14,9 +14,7 @@ class TrendingStatusesViewController: UIViewController, CollectionViewController
     private let mastodonController: MastodonController
     let filterer: Filterer
     
-    var collectionView: UICollectionView! {
+    private(set) var collectionView: UICollectionView!
-        view as? UICollectionView
-    }
     private var dataSource: UICollectionViewDiffableDataSource<Section, Item>!
     
     private var loaded = false
@@ -34,7 +32,9 @@ class TrendingStatusesViewController: UIViewController, CollectionViewController
         fatalError("init(coder:) has not been implemented")
     }
     
-    override func loadView() {
+    override func viewDidLoad() {
+        super.viewDidLoad()
+        
         var config = UICollectionLayoutListConfiguration(appearance: .plain)
         config.leadingSwipeActionsConfigurationProvider = { [unowned self] in
             (collectionView.cellForItem(at: $0) as? TimelineStatusCollectionViewCell)?.leadingSwipeActions()
@@ -62,12 +62,22 @@ class TrendingStatusesViewController: UIViewController, CollectionViewController
             section.readableContentInset(in: environment)
             return section
         }
-        view = UICollectionView(frame: .zero, collectionViewLayout: layout)
+        collectionView = UICollectionView(frame: .zero, collectionViewLayout: layout)
         collectionView.delegate = self
         collectionView.dragDelegate = self
         collectionView.allowsFocus = true
-        
+        collectionView.translatesAutoresizingMaskIntoConstraints = false
+        view.addSubview(collectionView)
+        NSLayoutConstraint.activate([
+            collectionView.leadingAnchor.constraint(equalTo: view.safeAreaLayoutGuide.leadingAnchor),
+            collectionView.trailingAnchor.constraint(equalTo: view.safeAreaLayoutGuide.trailingAnchor),
+            collectionView.topAnchor.constraint(equalTo: view.topAnchor),
+            collectionView.bottomAnchor.constraint(equalTo: view.bottomAnchor),
+        ])
+
         dataSource = createDataSource()
+        
+        NotificationCenter.default.addObserver(self, selector: #selector(handleStatusDeleted), name: .statusDeleted, object: mastodonController)
     }
     
     private func createDataSource() -> UICollectionViewDiffableDataSource<Section, Item> {
@@ -96,12 +106,6 @@ class TrendingStatusesViewController: UIViewController, CollectionViewController
         }
     }
     
-    override func viewDidLoad() {
-        super.viewDidLoad()
-        
-        NotificationCenter.default.addObserver(self, selector: #selector(handleStatusDeleted), name: .statusDeleted, object: mastodonController)
-    }
-
     override func viewWillAppear(_ animated: Bool) {
         super.viewWillAppear(animated)
         

Tusker/Screens/Explore/TrendsViewController.swift

@@ -44,6 +44,8 @@ class TrendsViewController: UIViewController, CollectionViewController {
 
     override func viewDidLoad() {
         super.viewDidLoad()
+        
+        view.backgroundColor = .appGroupedBackground
 
         let layout = UICollectionViewCompositionalLayout { [unowned self] sectionIndex, environment in
             let sectionIdentifier = self.dataSource.snapshot().sectionIdentifiers[sectionIndex]
@@ -114,13 +116,19 @@ class TrendsViewController: UIViewController, CollectionViewController {
             }
         }
         collectionView = UICollectionView(frame: view.bounds, collectionViewLayout: layout)
-        collectionView.autoresizingMask = [.flexibleWidth, .flexibleHeight]
         collectionView.delegate = self
         collectionView.dragDelegate = self
         collectionView.backgroundColor = .appGroupedBackground
         collectionView.allowsFocus = true
+        collectionView.translatesAutoresizingMaskIntoConstraints = false
         view.addSubview(collectionView)
-        
+        NSLayoutConstraint.activate([
+            collectionView.leadingAnchor.constraint(equalTo: view.safeAreaLayoutGuide.leadingAnchor),
+            collectionView.trailingAnchor.constraint(equalTo: view.safeAreaLayoutGuide.trailingAnchor),
+            collectionView.topAnchor.constraint(equalTo: view.topAnchor),
+            collectionView.bottomAnchor.constraint(equalTo: view.bottomAnchor),
+        ])
+
         dataSource = createDataSource()
         
         NotificationCenter.default.addObserver(self, selector: #selector(preferencesChanged), name: .preferencesChanged, object: nil)

Tusker/Screens/Local Predicate Statuses List/LocalPredicateStatusesViewController.swift

@@ -19,9 +19,7 @@ class LocalPredicateStatusesViewController: UIViewController, CollectionViewCont
     private let predicateTitle: String
     private let request: (RequestRange) -> Request<[TryDecode<Status>]>
     
-    var collectionView: UICollectionView! {
+    private(set) var collectionView: UICollectionView!
-        view as? UICollectionView
-    }
     private var dataSource: UICollectionViewDiffableDataSource<Section, Item>!
     
     private var state = State.unloaded
@@ -43,7 +41,9 @@ class LocalPredicateStatusesViewController: UIViewController, CollectionViewCont
         fatalError("init(coder:) has not been implemented")
     }
     
-    override func loadView() {
+    override func viewDidLoad() {
+        super.viewDidLoad()
+        
         var config = UICollectionLayoutListConfiguration(appearance: .plain)
         config.backgroundColor = .appBackground
         config.leadingSwipeActionsConfigurationProvider = { [unowned self] in
@@ -71,12 +71,30 @@ class LocalPredicateStatusesViewController: UIViewController, CollectionViewCont
             section.readableContentInset(in: environment)
             return section
         }
-        view = UICollectionView(frame: .zero, collectionViewLayout: layout)
+        collectionView = UICollectionView(frame: .zero, collectionViewLayout: layout)
         collectionView.delegate = self
         collectionView.dragDelegate = self
         collectionView.allowsFocus = true
-        
+        collectionView.translatesAutoresizingMaskIntoConstraints = false
+        view.addSubview(collectionView)
+        NSLayoutConstraint.activate([
+            collectionView.leadingAnchor.constraint(equalTo: view.safeAreaLayoutGuide.leadingAnchor),
+            collectionView.trailingAnchor.constraint(equalTo: view.safeAreaLayoutGuide.trailingAnchor),
+            collectionView.topAnchor.constraint(equalTo: view.topAnchor),
+            collectionView.bottomAnchor.constraint(equalTo: view.bottomAnchor),
+        ])
+
         dataSource = createDataSource()
+        
+        #if !targetEnvironment(macCatalyst)
+        collectionView.refreshControl = UIRefreshControl()
+        collectionView.refreshControl!.addTarget(self, action: #selector(refresh), for: .valueChanged)
+        #endif
+        
+        addKeyCommand(MenuController.refreshCommand(discoverabilityTitle: "Refresh \(predicateTitle)"))
+        
+        NotificationCenter.default.addObserver(self, selector: #selector(handleStatusDeleted), name: .statusDeleted, object: mastodonController)
+        NotificationCenter.default.addObserver(self, selector: #selector(managedObjectsDidChange), name: .NSManagedObjectContextObjectsDidChange, object: mastodonController.persistentContainer.viewContext)
     }
     
     private func createDataSource() -> UICollectionViewDiffableDataSource<Section, Item> {
@@ -97,20 +115,6 @@ class LocalPredicateStatusesViewController: UIViewController, CollectionViewCont
         }
     }
     
-    override func viewDidLoad() {
-        super.viewDidLoad()
-        
-        #if !targetEnvironment(macCatalyst)
-        collectionView.refreshControl = UIRefreshControl()
-        collectionView.refreshControl!.addTarget(self, action: #selector(refresh), for: .valueChanged)
-        #endif
-        
-        addKeyCommand(MenuController.refreshCommand(discoverabilityTitle: "Refresh \(predicateTitle)"))
-        
-        NotificationCenter.default.addObserver(self, selector: #selector(handleStatusDeleted), name: .statusDeleted, object: mastodonController)
-        NotificationCenter.default.addObserver(self, selector: #selector(managedObjectsDidChange), name: .NSManagedObjectContextObjectsDidChange, object: mastodonController.persistentContainer.viewContext)
-    }
-    
     override func viewWillAppear(_ animated: Bool) {
         super.viewWillAppear(animated)
         

Tusker/Screens/Main/NewMainTabBarViewController.swift

@@ -97,7 +97,11 @@ class NewMainTabBarViewController: BaseMainTabBarViewController {
         case .compose:
             return composePlaceholder
         case .explore:
-            root = ExploreViewController(mastodonController: mastodonController)
+            if UIDevice.current.userInterfaceIdiom == .phone {
+                root = ExploreViewController(mastodonController: mastodonController)
+            } else {
+                root = InlineTrendsViewController(mastodonController: mastodonController)
+            }
         case .bookmarks:
             root = BookmarksViewController(mastodonController: mastodonController)
         case .favorites:

Tusker/Screens/Notifications/NotificationsCollectionViewController.swift

@@ -108,8 +108,8 @@ class NotificationsCollectionViewController: UIViewController, TimelineLikeColle
         collectionView.translatesAutoresizingMaskIntoConstraints = false
         view.addSubview(collectionView)
         NSLayoutConstraint.activate([
-            collectionView.leadingAnchor.constraint(equalTo: view.leadingAnchor),
+            collectionView.leadingAnchor.constraint(equalTo: view.safeAreaLayoutGuide.leadingAnchor),
-            collectionView.trailingAnchor.constraint(equalTo: view.trailingAnchor),
+            collectionView.trailingAnchor.constraint(equalTo: view.safeAreaLayoutGuide.trailingAnchor),
             collectionView.topAnchor.constraint(equalTo: view.topAnchor),
             collectionView.bottomAnchor.constraint(equalTo: view.bottomAnchor),
         ])

Tusker/Screens/Profile/ProfileStatusesViewController.swift

@@ -26,9 +26,7 @@ class ProfileStatusesViewController: UIViewController, TimelineLikeCollectionVie
     private var older: RequestRange?
     private var cancellables = Set<AnyCancellable>()
     
-    var collectionView: UICollectionView! {
+    private(set) var collectionView: UICollectionView!
-        view as? UICollectionView
-    }
     private(set) var dataSource: UICollectionViewDiffableDataSource<Section, Item>!
     var headerCell: ProfileHeaderCollectionViewCell? {
         collectionView.cellForItem(at: IndexPath(item: 0, section: 0)) as? ProfileHeaderCollectionViewCell
@@ -56,7 +54,9 @@ class ProfileStatusesViewController: UIViewController, TimelineLikeCollectionVie
         fatalError("init(coder:) has not been implemented")
     }
     
-    override func loadView() {
+    override func viewDidLoad() {
+        super.viewDidLoad()
+        
         var config = UICollectionLayoutListConfiguration(appearance: .plain)
         config.backgroundColor = .appBackground
         config.leadingSwipeActionsConfigurationProvider = { [unowned self] in
@@ -103,10 +103,18 @@ class ProfileStatusesViewController: UIViewController, TimelineLikeCollectionVie
                 return section
             }
         }
-        view = UICollectionView(frame: .zero, collectionViewLayout: layout)
+        collectionView = UICollectionView(frame: .zero, collectionViewLayout: layout)
         collectionView.delegate = self
         collectionView.dragDelegate = self
         collectionView.allowsFocus = true
+        collectionView.translatesAutoresizingMaskIntoConstraints = false
+        view.addSubview(collectionView)
+        NSLayoutConstraint.activate([
+            collectionView.leadingAnchor.constraint(equalTo: view.safeAreaLayoutGuide.leadingAnchor),
+            collectionView.trailingAnchor.constraint(equalTo: view.safeAreaLayoutGuide.trailingAnchor),
+            collectionView.topAnchor.constraint(equalTo: view.topAnchor),
+            collectionView.bottomAnchor.constraint(equalTo: view.bottomAnchor),
+        ])
         
         registerTimelineLikeCells()
         dataSource = createDataSource()
@@ -115,10 +123,6 @@ class ProfileStatusesViewController: UIViewController, TimelineLikeCollectionVie
         collectionView.refreshControl = UIRefreshControl()
         collectionView.refreshControl!.addTarget(self, action: #selector(refresh), for: .valueChanged)
         #endif
-    }
-    
-    override func viewDidLoad() {
-        super.viewDidLoad()
                 
         mastodonController.persistentContainer.accountSubject
             .receive(on: DispatchQueue.main)

Tusker/Screens/Search/SearchResultsViewController.swift

@@ -36,7 +36,7 @@ class SearchResultsViewController: UIViewController, CollectionViewController {
     weak var delegate: SearchResultsViewControllerDelegate?
     var tokenHandler: ((String, SearchOperatorType) -> Void)?
     
-    var collectionView: UICollectionView! { view as? UICollectionView }
+    private(set) var collectionView: UICollectionView!
     private var dataSource: UICollectionViewDiffableDataSource<Section, Item>!
     
     /// Types of results to search for.
@@ -62,7 +62,9 @@ class SearchResultsViewController: UIViewController, CollectionViewController {
         fatalError("init(coder:) has not been implemented")
     }
     
-    override func loadView() {
+    override func viewDidLoad() {
+        super.viewDidLoad()
+        
         let layout = UICollectionViewCompositionalLayout { [unowned self] sectionIndex, environment in
             let sectionIdentifier = self.dataSource.sectionIdentifier(for: sectionIndex)!
             switch sectionIdentifier {
@@ -102,7 +104,7 @@ class SearchResultsViewController: UIViewController, CollectionViewController {
                 return .list(using: config, layoutEnvironment: environment)
             }
         }
-        view = UICollectionView(frame: .zero, collectionViewLayout: layout)
+        collectionView = UICollectionView(frame: .zero, collectionViewLayout: layout)
         collectionView.delegate = self
         collectionView.dragDelegate = self
         collectionView.allowsFocus = true
@@ -110,12 +112,16 @@ class SearchResultsViewController: UIViewController, CollectionViewController {
         #if !os(visionOS)
         collectionView.keyboardDismissMode = .interactive
         #endif
-        
+        collectionView.translatesAutoresizingMaskIntoConstraints = false
+        view.addSubview(collectionView)
+        NSLayoutConstraint.activate([
+            collectionView.leadingAnchor.constraint(equalTo: view.safeAreaLayoutGuide.leadingAnchor),
+            collectionView.trailingAnchor.constraint(equalTo: view.safeAreaLayoutGuide.trailingAnchor),
+            collectionView.topAnchor.constraint(equalTo: view.topAnchor),
+            collectionView.bottomAnchor.constraint(equalTo: view.bottomAnchor),
+        ])
+
         dataSource = createDataSource()
-    }
-    
-    override func viewDidLoad() {
-        super.viewDidLoad()
         
         searchCancellable = searchSubject
             .debounce(for: .seconds(1), scheduler: RunLoop.main)

Tusker/Screens/Status Action Account List/StatusActionAccountListCollectionViewController.swift

@@ -19,9 +19,7 @@ class StatusActionAccountListCollectionViewController: UIViewController, Collect
     
     private var needsInaccurateCountWarning = false
     
-    var collectionView: UICollectionView! {
+    private(set) var collectionView: UICollectionView!
-        view as? UICollectionView
-    }
     private var dataSource: UICollectionViewDiffableDataSource<Section, Item>!
     
     private var state: State = .unloaded
@@ -45,7 +43,11 @@ class StatusActionAccountListCollectionViewController: UIViewController, Collect
         fatalError("init(coder:) has not been implemented")
     }
     
-    override func loadView() {
+    override func viewDidLoad() {
+        super.viewDidLoad()
+        
+        view.backgroundColor = .appGroupedBackground
+        
         var accountsConfig = UICollectionLayoutListConfiguration(appearance: .grouped)
         accountsConfig.backgroundColor = .appGroupedBackground
         accountsConfig.itemSeparatorHandler = { [unowned self] indexPath, sectionConfig in
@@ -85,10 +87,19 @@ class StatusActionAccountListCollectionViewController: UIViewController, Collect
             section.readableContentInset(in: environment)
             return section
         }
-        view = UICollectionView(frame: .zero, collectionViewLayout: layout)
+        collectionView = UICollectionView(frame: .zero, collectionViewLayout: layout)
         collectionView.delegate = self
         collectionView.dragDelegate = self
         collectionView.allowsFocus = true
+        collectionView.translatesAutoresizingMaskIntoConstraints = false
+        view.addSubview(collectionView)
+        NSLayoutConstraint.activate([
+            collectionView.leadingAnchor.constraint(equalTo: view.safeAreaLayoutGuide.leadingAnchor),
+            collectionView.trailingAnchor.constraint(equalTo: view.safeAreaLayoutGuide.trailingAnchor),
+            collectionView.topAnchor.constraint(equalTo: view.topAnchor),
+            collectionView.bottomAnchor.constraint(equalTo: view.bottomAnchor),
+        ])
+        
         dataSource = createDataSource()
     }
     

Tusker/Screens/Status Edit History/StatusEditHistoryViewController.swift

@@ -35,6 +35,8 @@ class StatusEditHistoryViewController: UIViewController, CollectionViewControlle
     override func viewDidLoad() {
         super.viewDidLoad()
         
+        view.backgroundColor = .appGroupedBackground
+        
         var config = UICollectionLayoutListConfiguration(appearance: .grouped)
         config.backgroundColor = .appGroupedBackground
         config.itemSeparatorHandler = { [unowned self] indexPath, sectionConfig in
@@ -62,8 +64,8 @@ class StatusEditHistoryViewController: UIViewController, CollectionViewControlle
         collectionView.translatesAutoresizingMaskIntoConstraints = false
         view.addSubview(collectionView)
         NSLayoutConstraint.activate([
-            collectionView.leadingAnchor.constraint(equalTo: view.leadingAnchor),
+            collectionView.leadingAnchor.constraint(equalTo: view.safeAreaLayoutGuide.leadingAnchor),
-            collectionView.trailingAnchor.constraint(equalTo: view.trailingAnchor),
+            collectionView.trailingAnchor.constraint(equalTo: view.safeAreaLayoutGuide.trailingAnchor),
             collectionView.topAnchor.constraint(equalTo: view.topAnchor),
             collectionView.bottomAnchor.constraint(equalTo: view.bottomAnchor),
         ])

Tusker/Screens/Timeline/TimelineViewController.swift

@@ -123,8 +123,8 @@ class TimelineViewController: UIViewController, TimelineLikeCollectionViewContro
         collectionView.translatesAutoresizingMaskIntoConstraints = false
         view.addSubview(collectionView)
         NSLayoutConstraint.activate([
-            collectionView.leadingAnchor.constraint(equalTo: view.leadingAnchor),
+            collectionView.leadingAnchor.constraint(equalTo: view.safeAreaLayoutGuide.leadingAnchor),
-            collectionView.trailingAnchor.constraint(equalTo: view.trailingAnchor),
+            collectionView.trailingAnchor.constraint(equalTo: view.safeAreaLayoutGuide.trailingAnchor),
             collectionView.topAnchor.constraint(equalTo: view.topAnchor),
             collectionView.bottomAnchor.constraint(equalTo: view.bottomAnchor),
         ])