Account for bidi text in combined display/username label

NotificationExtension/NotificationService.swift

@@ -371,14 +371,13 @@ private struct HTMLCallbacks: HTMLConversionCallbacks {
         // Converting WebURL to URL is a small but non-trivial expense (since it works by
         // serializing the WebURL as a string and then having Foundation parse it again),
         // so, if available, use the system parser which doesn't require another round trip.
-        if #available(iOS 16.0, macOS 13.0, *),
+        if let url = try? URL.ParseStrategy().parse(string) {
-           let url = try? URL.ParseStrategy().parse(string) {
             url
         } else if let web = WebURL(string),
                   let url = URL(web) {
             url
         } else {
-            URL(string: string)
+            nil
         }
     }
     

Packages/ComposeUI/Package.swift

@@ -1,4 +1,4 @@
-// swift-tools-version: 5.7
+// swift-tools-version: 6.0
 // The swift-tools-version declares the minimum version of Swift required to build this package.
 
 import PackageDescription
@@ -6,7 +6,7 @@ import PackageDescription
 let package = Package(
     name: "ComposeUI",
     platforms: [
-        .iOS(.v15),
+        .iOS(.v16),
     ],
     products: [
         // Products define the executables and libraries a package produces, and make them visible to other packages.
@@ -26,9 +26,15 @@ let package = Package(
         // Targets can depend on other targets in this package, and on products in packages this package depends on.
         .target(
             name: "ComposeUI",
-            dependencies: ["Pachyderm", "InstanceFeatures", "TuskerComponents", "MatchedGeometryPresentation"]),
+            dependencies: ["Pachyderm", "InstanceFeatures", "TuskerComponents", "MatchedGeometryPresentation"],
+            swiftSettings: [
+                .swiftLanguageMode(.v5)
+            ]),
         .testTarget(
             name: "ComposeUITests",
-            dependencies: ["ComposeUI"]),
+            dependencies: ["ComposeUI"],
+            swiftSettings: [
+                .swiftLanguageMode(.v5)
+            ]),
     ]
 )

Packages/ComposeUI/Sources/ComposeUI/Controllers/AttachmentRowController.swift

@@ -156,7 +156,7 @@ class AttachmentRowController: ViewController {
                         Button(role: .destructive, action: controller.removeAttachment) {
                             Label("Delete", systemImage: "trash")
                         }
-                    } previewIfAvailable: {
+                    } preview: {
                         ControllerView(controller: { controller.thumbnailController })
                     }
                 
@@ -221,16 +221,3 @@ extension AttachmentRowController {
         case allowEntry, recognizingText
     }
 }
-
-private extension View {
-    @available(iOS, obsoleted: 16.0)
-    @available(visionOS 1.0, *)
-    @ViewBuilder
-    func contextMenu<M: View, P: View>(@ViewBuilder menuItems: () -> M, @ViewBuilder previewIfAvailable preview: () -> P) -> some View {
-        if #available(iOS 16.0, *) {
-            self.contextMenu(menuItems: menuItems, preview: preview)
-        } else {
-            self.contextMenu(menuItems: menuItems)
-        }
-    }
-}

Packages/ComposeUI/Sources/ComposeUI/Controllers/AttachmentsListController.swift

@@ -214,44 +214,6 @@ fileprivate extension View {
             self
         }
     }
-    
-    @available(iOS, obsoleted: 16.0)
-    @ViewBuilder
-    func sheetOrPopover(isPresented: Binding<Bool>, @ViewBuilder content: @escaping () -> some View) -> some View {
-        if #available(iOS 16.0, *) {
-            self.modifier(SheetOrPopover(isPresented: isPresented, view: content))
-        } else {
-            self.popover(isPresented: isPresented, content: content)
-        }
-    }
-    
-    @available(iOS, obsoleted: 16.0)
-    @ViewBuilder
-    func withSheetDetentsIfAvailable() -> some View {
-        if #available(iOS 16.0, *) {
-            self
-                .presentationDetents([.medium, .large])
-                .presentationDragIndicator(.visible)
-        } else {
-            self
-        }
-    }
-}
-
-@available(iOS 16.0, *)
-fileprivate struct SheetOrPopover<V: View>: ViewModifier {
-    @Binding var isPresented: Bool
-    @ViewBuilder let view: () -> V
-    
-    @Environment(\.horizontalSizeClass) var sizeClass
-    
-    func body(content: Content) -> some View {
-        if sizeClass == .compact {
-            content.sheet(isPresented: $isPresented, content: view)
-        } else {
-            content.popover(isPresented: $isPresented, content: view)
-        }
-    }
 }
 
 @available(visionOS 1.0, *)

Packages/ComposeUI/Sources/ComposeUI/Controllers/ComposeController.swift

@@ -125,9 +125,7 @@ public final class ComposeController: ViewController {
         self.toolbarController = ToolbarController(parent: self)
         self.attachmentsListController = AttachmentsListController(parent: self)
         
-        if #available(iOS 16.0, *) {
+        NotificationCenter.default.addObserver(self, selector: #selector(currentInputModeChanged), name: UITextInputMode.currentInputModeDidChangeNotification, object: nil)
-            NotificationCenter.default.addObserver(self, selector: #selector(currentInputModeChanged), name: UITextInputMode.currentInputModeDidChangeNotification, object: nil)
-        }
         NotificationCenter.default.addObserver(self, selector: #selector(managedObjectsDidChange), name: .NSManagedObjectContextObjectsDidChange, object: DraftsPersistentContainer.shared.viewContext)
     }
     
@@ -324,10 +322,6 @@ public final class ComposeController: ViewController {
                         ControllerView(controller: { controller.toolbarController })
                         #endif
                     }
-                    #if !os(visionOS)
-                    // on iPadOS15, the toolbar ends up below the keyboard's toolbar without this
-                    .padding(.bottom, keyboardInset)
-                    #endif
                     .transition(.move(edge: .bottom))
                 }
             }
@@ -436,7 +430,7 @@ public final class ComposeController: ViewController {
             }
             .listStyle(.plain)
             #if !os(visionOS)
-            .scrollDismissesKeyboardInteractivelyIfAvailable()
+            .scrollDismissesKeyboard(.interactively)
             #endif
             .disabled(controller.isPosting)
         }
@@ -487,31 +481,6 @@ public final class ComposeController: ViewController {
             .keyboardShortcut(.return, modifiers: .command)
             .disabled(!controller.postButtonEnabled)
         }
-        
-        #if !os(visionOS)
-        @available(iOS, obsoleted: 16.0)
-        private var keyboardInset: CGFloat {
-            if #unavailable(iOS 16.0),
-               UIDevice.current.userInterfaceIdiom == .pad,
-               keyboardReader.isVisible {
-                return ToolbarController.height
-            } else {
-                return 0
-            }
-        }
-        #endif
-    }
-}
-
-private extension View {
-    @available(iOS, obsoleted: 16.0)
-    @ViewBuilder
-    func scrollDismissesKeyboardInteractivelyIfAvailable() -> some View {
-        if #available(iOS 16.0, *) {
-            self.scrollDismissesKeyboard(.interactively)
-        } else {
-            self
-        }
     }
 }
 

Packages/ComposeUI/Sources/ComposeUI/Controllers/FocusedAttachmentController.swift

@@ -51,14 +51,11 @@ class FocusedAttachmentController: ViewController {
                         .onAppear {
                             player.play()
                         }
-                } else if #available(iOS 16.0, *) {
+                } else {
                     ZoomableScrollView {
                         attachmentView
                             .matchedGeometryDestination(id: attachment.id)
                     }
-                } else {
-                    attachmentView
-                        .matchedGeometryDestination(id: attachment.id)
                 }
                 
                 Spacer(minLength: 0)

Packages/ComposeUI/Sources/ComposeUI/Controllers/PollController.swift

@@ -96,7 +96,7 @@ class PollController: ViewController {
                     .onMove(perform: controller.moveOptions)
                 }
                 .listStyle(.plain)
-                .scrollDisabledIfAvailable(true)
+                .scrollDisabled(true)
                 .frame(height: 44 * CGFloat(poll.options.count))
                 
                 Button(action: controller.addOption) {

Packages/ComposeUI/Sources/ComposeUI/Controllers/ToolbarController.swift

@@ -66,7 +66,7 @@ class ToolbarController: ViewController {
                             }
                     })
             }
-            .scrollDisabledIfAvailable(realWidth ?? 0 <= minWidth ?? 0)
+            .scrollDisabled(realWidth ?? 0 <= minWidth ?? 0)
             .frame(height: ToolbarController.height)
             .frame(maxWidth: .infinity)
             .background(.regularMaterial, ignoresSafeAreaEdges: [.bottom, .leading, .trailing])
@@ -122,8 +122,7 @@ class ToolbarController: ViewController {
                 
                 Spacer()
                 
-                if #available(iOS 16.0, *),
+                if composeController.mastodonController.instanceFeatures.createStatusWithLanguage {
-                   composeController.mastodonController.instanceFeatures.createStatusWithLanguage {
                     LanguagePicker(draftLanguage: $draft.language, hasChangedSelection: $composeController.hasChangedLanguageSelection)
                 }
             }

Packages/ComposeUI/Sources/ComposeUI/KeyboardReader.swift

@@ -10,7 +10,6 @@
 import UIKit
 import Combine
 
-@available(iOS, obsoleted: 16.0)
 class KeyboardReader: ObservableObject {
 //    @Published var isVisible = false
     @Published var keyboardHeight: CGFloat = 0

Packages/ComposeUI/Sources/ComposeUI/View+ForwardsCompat.swift

@@ -1,26 +0,0 @@
-//
-//  View+ForwardsCompat.swift
-//  ComposeUI
-//
-//  Created by Shadowfacts on 3/25/23.
-//
-
-import SwiftUI
-
-extension View {
-    #if os(visionOS)
-    func scrollDisabledIfAvailable(_ disabled: Bool) -> some View {
-        self.scrollDisabled(disabled)
-    }
-    #else
-    @available(iOS, obsoleted: 16.0)
-    @ViewBuilder
-    func scrollDisabledIfAvailable(_ disabled: Bool) -> some View {
-        if #available(iOS 16.0, *) {
-            self.scrollDisabled(disabled)
-        } else {
-            self
-        }
-    }
-    #endif
-}

Packages/Duckable/Package.swift

@@ -1,4 +1,4 @@
-// swift-tools-version: 5.7
+// swift-tools-version: 6.0
 // The swift-tools-version declares the minimum version of Swift required to build this package.
 
 import PackageDescription
@@ -6,7 +6,7 @@ import PackageDescription
 let package = Package(
     name: "Duckable",
     platforms: [
-        .iOS(.v15),
+        .iOS(.v16),
     ],
     products: [
         // Products define the executables and libraries a package produces, and make them visible to other packages.
@@ -23,7 +23,10 @@ let package = Package(
         // Targets can depend on other targets in this package, and on products in packages this package depends on.
         .target(
             name: "Duckable",
-            dependencies: []),
+            dependencies: [],
+            swiftSettings: [
+                .swiftLanguageMode(.v5)
+            ]),
 //        .testTarget(
 //            name: "DuckableTests",
 //            dependencies: ["Duckable"]),

Packages/GalleryVC/Package.swift

@@ -1,4 +1,4 @@
-// swift-tools-version: 5.10
+// swift-tools-version: 6.0
 // The swift-tools-version declares the minimum version of Swift required to build this package.
 
 import PackageDescription
@@ -6,7 +6,7 @@ import PackageDescription
 let package = Package(
     name: "GalleryVC",
     platforms: [
-        .iOS(.v15),
+        .iOS(.v16),
     ],
     products: [
         // Products define the executables and libraries a package produces, making them visible to other packages.
@@ -18,9 +18,15 @@ let package = Package(
         // Targets are the basic building blocks of a package, defining a module or a test suite.
         // Targets can depend on other targets in this package and products from dependencies.
         .target(
-            name: "GalleryVC"),
+            name: "GalleryVC",
+            swiftSettings: [
+                .swiftLanguageMode(.v5)
+            ]),
         .testTarget(
             name: "GalleryVCTests",
-            dependencies: ["GalleryVC"]),
+            dependencies: ["GalleryVC"],
+            swiftSettings: [
+                .swiftLanguageMode(.v5)
+            ]),
     ]
 )

Packages/InstanceFeatures/Package.swift

@@ -1,4 +1,4 @@
-// swift-tools-version: 5.7
+// swift-tools-version: 6.0
 // The swift-tools-version declares the minimum version of Swift required to build this package.
 
 import PackageDescription
@@ -6,7 +6,7 @@ import PackageDescription
 let package = Package(
     name: "InstanceFeatures",
     platforms: [
-        .iOS(.v15),
+        .iOS(.v16),
     ],
     products: [
         // Products define the executables and libraries a package produces, and make them visible to other packages.
@@ -23,9 +23,15 @@ let package = Package(
         // Targets can depend on other targets in this package, and on products in packages this package depends on.
         .target(
             name: "InstanceFeatures",
-            dependencies: ["Pachyderm"]),
+            dependencies: ["Pachyderm"],
+            swiftSettings: [
+                .swiftLanguageMode(.v5)
+            ]),
         .testTarget(
             name: "InstanceFeaturesTests",
-            dependencies: ["InstanceFeatures"]),
+            dependencies: ["InstanceFeatures"],
+            swiftSettings: [
+                .swiftLanguageMode(.v5)
+            ]),
     ]
 )

Packages/MatchedGeometryPresentation/Package.swift

@@ -1,4 +1,4 @@
-// swift-tools-version: 5.8
+// swift-tools-version: 6.0
 // The swift-tools-version declares the minimum version of Swift required to build this package.
 
 import PackageDescription
@@ -6,7 +6,7 @@ import PackageDescription
 let package = Package(
     name: "MatchedGeometryPresentation",
     platforms: [
-        .iOS(.v15),
+        .iOS(.v16),
     ],
     products: [
         // Products define the executables and libraries a package produces, making them visible to other packages.
@@ -18,7 +18,10 @@ let package = Package(
         // Targets are the basic building blocks of a package, defining a module or a test suite.
         // Targets can depend on other targets in this package and products from dependencies.
         .target(
-            name: "MatchedGeometryPresentation"),
+            name: "MatchedGeometryPresentation",
+            swiftSettings: [
+                .swiftLanguageMode(.v5)
+            ]),
         // .testTarget(
         //     name: "MatchedGeometryPresentationTests",
         //     dependencies: ["MatchedGeometryPresentation"]),

Packages/Pachyderm/Package.swift

@@ -1,4 +1,4 @@
-// swift-tools-version: 5.6
+// swift-tools-version: 6.0
 // The swift-tools-version declares the minimum version of Swift required to build this package.
 
 import PackageDescription
@@ -6,7 +6,7 @@ import PackageDescription
 let package = Package(
     name: "Pachyderm",
     platforms: [
-        .iOS(.v15),
+        .iOS(.v16),
     ],
     products: [
         // Products define the executables and libraries a package produces, and make them visible to other packages.
@@ -26,9 +26,15 @@ let package = Package(
             dependencies: [
                 .product(name: "WebURL", package: "swift-url"),
                 .product(name: "WebURLFoundationExtras", package: "swift-url"),
+            ],
+            swiftSettings: [
+                .swiftLanguageMode(.v5)
             ]),
         .testTarget(
             name: "PachydermTests",
-            dependencies: ["Pachyderm"]),
+            dependencies: ["Pachyderm"],
+            swiftSettings: [
+                .swiftLanguageMode(.v5)
+            ]),
     ]
 )

Packages/PushNotifications/Package.swift

@@ -1,4 +1,4 @@
-// swift-tools-version: 5.10
+// swift-tools-version: 6.0
 // The swift-tools-version declares the minimum version of Swift required to build this package.
 
 import PackageDescription
@@ -6,7 +6,7 @@ import PackageDescription
 let package = Package(
     name: "PushNotifications",
     platforms: [
-        .iOS(.v15),
+        .iOS(.v16),
     ],
     products: [
         // Products define the executables and libraries a package produces, making them visible to other packages.
@@ -23,10 +23,17 @@ let package = Package(
         // Targets can depend on other targets in this package and products from dependencies.
         .target(
             name: "PushNotifications",
-            dependencies: ["UserAccounts", "Pachyderm"]
+            dependencies: ["UserAccounts", "Pachyderm"],
+            swiftSettings: [
+                .swiftLanguageMode(.v5)
+            ]
         ),
         .testTarget(
             name: "PushNotificationsTests",
-            dependencies: ["PushNotifications"]),
+            dependencies: ["PushNotifications"],
+            swiftSettings: [
+                .swiftLanguageMode(.v5)
+            ]
+        ),
     ]
 )

Packages/TTTKit/Package.swift

@@ -1,4 +1,4 @@
-// swift-tools-version: 5.7
+// swift-tools-version: 6.0
 // The swift-tools-version declares the minimum version of Swift required to build this package.
 
 import PackageDescription
@@ -6,7 +6,7 @@ import PackageDescription
 let package = Package(
     name: "TTTKit",
     platforms: [
-        .iOS(.v15),
+        .iOS(.v16),
     ],
     products: [
         // Products define the executables and libraries a package produces, and make them visible to other packages.
@@ -23,9 +23,15 @@ let package = Package(
         // Targets can depend on other targets in this package, and on products in packages this package depends on.
         .target(
             name: "TTTKit",
-            dependencies: []),
+            dependencies: [],
+            swiftSettings: [
+                .swiftLanguageMode(.v5)
+            ]),
         .testTarget(
             name: "TTTKitTests",
-            dependencies: ["TTTKit"]),
+            dependencies: ["TTTKit"],
+            swiftSettings: [
+                .swiftLanguageMode(.v5)
+            ]),
     ]
 )

Packages/TuskerComponents/Package.swift

@@ -1,4 +1,4 @@
-// swift-tools-version: 5.7
+// swift-tools-version: 6.0
 // The swift-tools-version declares the minimum version of Swift required to build this package.
 
 import PackageDescription
@@ -6,7 +6,7 @@ import PackageDescription
 let package = Package(
     name: "TuskerComponents",
     platforms: [
-        .iOS(.v15),
+        .iOS(.v16),
     ],
     products: [
         // Products define the executables and libraries a package produces, and make them visible to other packages.
@@ -23,7 +23,10 @@ let package = Package(
         // Targets can depend on other targets in this package, and on products in packages this package depends on.
         .target(
             name: "TuskerComponents",
-            dependencies: []),
+            dependencies: [],
+            swiftSettings: [
+                .swiftLanguageMode(.v5)
+            ]),
         // .testTarget(
         //     name: "TuskerComponentsTests",
         //     dependencies: ["TuskerComponents"]),

Packages/TuskerComponents/Sources/TuskerComponents/AsyncPicker.swift

@@ -9,21 +9,14 @@ import SwiftUI
 
 public struct AsyncPicker<V: Hashable, Content: View>: View {
     let titleKey: LocalizedStringKey
-    #if !os(visionOS)
-    @available(iOS, obsoleted: 16.0, message: "Switch to LabeledContent")
-    let labelHidden: Bool
-    #endif
     let alignment: Alignment
     @Binding var value: V
     let onChange: (V) async -> Bool
     let content: Content
     @State private var isLoading = false
     
-    public init(_ titleKey: LocalizedStringKey, labelHidden: Bool = false, alignment: Alignment = .center, value: Binding<V>, onChange: @escaping (V) async -> Bool, @ViewBuilder content: () -> Content) {
+    public init(_ titleKey: LocalizedStringKey, alignment: Alignment = .center, value: Binding<V>, onChange: @escaping (V) async -> Bool, @ViewBuilder content: () -> Content) {
         self.titleKey = titleKey
-        #if !os(visionOS)
-        self.labelHidden = labelHidden
-        #endif
         self.alignment = alignment
         self._value = value
         self.onChange = onChange
@@ -31,25 +24,9 @@ public struct AsyncPicker<V: Hashable, Content: View>: View {
     }
     
     public var body: some View {
-        #if os(visionOS)
         LabeledContent(titleKey) {
             picker
         }
-        #else
-        if #available(iOS 16.0, *) {
-            LabeledContent(titleKey) {
-                picker
-            }
-        } else if labelHidden {
-            picker
-        } else {
-            HStack {
-                Text(titleKey)
-                Spacer()
-                picker
-            }
-        }
-        #endif
     }
     
     private var picker: some View {

Packages/TuskerComponents/Sources/TuskerComponents/AsyncToggle.swift

@@ -10,42 +10,19 @@ import SwiftUI
 
 public struct AsyncToggle: View {
     let titleKey: LocalizedStringKey
-    #if !os(visionOS)
-    @available(iOS, obsoleted: 16.0, message: "Switch to LabeledContent")
-    let labelHidden: Bool
-    #endif
     @Binding var mode: Mode
     let onChange: (Bool) async -> Bool
     
-    public init(_ titleKey: LocalizedStringKey, labelHidden: Bool = false, mode: Binding<Mode>, onChange: @escaping (Bool) async -> Bool) {
+    public init(_ titleKey: LocalizedStringKey, mode: Binding<Mode>, onChange: @escaping (Bool) async -> Bool) {
         self.titleKey = titleKey
-        #if !os(visionOS)
-        self.labelHidden = labelHidden
-        #endif
         self._mode = mode
         self.onChange = onChange
     }
     
     public var body: some View {
-        #if os(visionOS)
         LabeledContent(titleKey) {
             toggleOrSpinner
         }
-        #else
-        if #available(iOS 16.0, *) {
-            LabeledContent(titleKey) {
-                toggleOrSpinner
-            }
-        } else if labelHidden {
-            toggleOrSpinner
-        } else {
-            HStack {
-                Text(titleKey)
-                Spacer()
-                toggleOrSpinner
-            }
-        }
-        #endif
     }
     
     @ViewBuilder

Packages/TuskerComponents/Sources/TuskerComponents/MenuPicker.swift

@@ -47,9 +47,7 @@ public struct MenuPicker<Value: Hashable>: UIViewRepresentable {
     
     private func makeConfiguration() -> UIButton.Configuration {
         var config = UIButton.Configuration.borderless()
-        if #available(iOS 16.0, *) {
+        config.indicator = .popup
-            config.indicator = .popup
-        }
         if buttonStyle.hasIcon {
             config.image = selectedOption.image
         }

Packages/TuskerPreferences/Package.swift

@@ -1,4 +1,4 @@
-// swift-tools-version: 5.8
+// swift-tools-version: 6.0
 // The swift-tools-version declares the minimum version of Swift required to build this package.
 
 import PackageDescription
@@ -6,7 +6,7 @@ import PackageDescription
 let package = Package(
     name: "TuskerPreferences",
     platforms: [
-        .iOS(.v15),
+        .iOS(.v16),
     ],
     products: [
         // Products define the executables and libraries a package produces, making them visible to other packages.
@@ -22,11 +22,17 @@ let package = Package(
         // Targets can depend on other targets in this package and products from dependencies.
         .target(
             name: "TuskerPreferences",
-            dependencies: ["Pachyderm"]
+            dependencies: ["Pachyderm"],
+            swiftSettings: [
+                .swiftLanguageMode(.v5)
+            ]
         ),
         .testTarget(
             name: "TuskerPreferencesTests",
-            dependencies: ["TuskerPreferences"]
+            dependencies: ["TuskerPreferences"],
+            swiftSettings: [
+                .swiftLanguageMode(.v5)
+            ]
         )
     ]
 )

Packages/UserAccounts/Package.swift

@@ -1,4 +1,4 @@
-// swift-tools-version: 5.7
+// swift-tools-version: 6.0
 // The swift-tools-version declares the minimum version of Swift required to build this package.
 
 import PackageDescription
@@ -6,7 +6,7 @@ import PackageDescription
 let package = Package(
     name: "UserAccounts",
     platforms: [
-        .iOS(.v15),
+        .iOS(.v16),
     ],
     products: [
         // Products define the executables and libraries a package produces, and make them visible to other packages.
@@ -23,7 +23,10 @@ let package = Package(
         // Targets can depend on other targets in this package, and on products in packages this package depends on.
         .target(
             name: "UserAccounts",
-            dependencies: ["Pachyderm"]),
+            dependencies: ["Pachyderm"],
+            swiftSettings: [
+                .swiftLanguageMode(.v5)
+            ]),
         // .testTarget(
         //     name: "UserAccountsTests",
         //     dependencies: ["UserAccounts"]),

Tusker.xcodeproj/project.pbxproj

@@ -141,7 +141,6 @@
 		D64B96812BC3279D002C8990 /* PrefsAccountView.swift in Sources */ = {isa = PBXBuildFile; fileRef = D64B96802BC3279D002C8990 /* PrefsAccountView.swift */; };
 		D64B96842BC3893C002C8990 /* PushSubscriptionView.swift in Sources */ = {isa = PBXBuildFile; fileRef = D64B96832BC3893C002C8990 /* PushSubscriptionView.swift */; };
 		D64D0AB12128D9AE005A6F37 /* OnboardingViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = D64D0AB02128D9AE005A6F37 /* OnboardingViewController.swift */; };
-		D64D8CA92463B494006B0BAA /* MultiThreadDictionary.swift in Sources */ = {isa = PBXBuildFile; fileRef = D64D8CA82463B494006B0BAA /* MultiThreadDictionary.swift */; };
 		D651C5B42915B00400236EF6 /* ProfileFieldsView.swift in Sources */ = {isa = PBXBuildFile; fileRef = D651C5B32915B00400236EF6 /* ProfileFieldsView.swift */; };
 		D6531DEE246B81C9000F9538 /* GifvPlayerView.swift in Sources */ = {isa = PBXBuildFile; fileRef = D6531DED246B81C9000F9538 /* GifvPlayerView.swift */; };
 		D6538945214D6D7500E3CEFC /* TableViewSwipeActionProvider.swift in Sources */ = {isa = PBXBuildFile; fileRef = D6538944214D6D7500E3CEFC /* TableViewSwipeActionProvider.swift */; };
@@ -337,7 +336,7 @@
 		D6D79F592A13293200AB2315 /* BackgroundManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = D6D79F582A13293200AB2315 /* BackgroundManager.swift */; };
 		D6D94955298963A900C59229 /* Colors.swift in Sources */ = {isa = PBXBuildFile; fileRef = D6D94954298963A900C59229 /* Colors.swift */; };
 		D6D9498D298CBB4000C59229 /* TrendingStatusCollectionViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = D6D9498C298CBB4000C59229 /* TrendingStatusCollectionViewCell.swift */; };
-		D6D9498F298EB79400C59229 /* CopyableLable.swift in Sources */ = {isa = PBXBuildFile; fileRef = D6D9498E298EB79400C59229 /* CopyableLable.swift */; };
+		D6D9498F298EB79400C59229 /* CopyableLabel.swift in Sources */ = {isa = PBXBuildFile; fileRef = D6D9498E298EB79400C59229 /* CopyableLabel.swift */; };
 		D6DD8FFD298495A8002AD3FD /* LogoutService.swift in Sources */ = {isa = PBXBuildFile; fileRef = D6DD8FFC298495A8002AD3FD /* LogoutService.swift */; };
 		D6DD8FFF2984D327002AD3FD /* BookmarksViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = D6DD8FFE2984D327002AD3FD /* BookmarksViewController.swift */; };
 		D6DD996B2998611A0015C962 /* SuggestedProfilesViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = D6DD996A2998611A0015C962 /* SuggestedProfilesViewController.swift */; };
@@ -572,7 +571,6 @@
 		D64B96802BC3279D002C8990 /* PrefsAccountView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PrefsAccountView.swift; sourceTree = "<group>"; };
 		D64B96832BC3893C002C8990 /* PushSubscriptionView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PushSubscriptionView.swift; sourceTree = "<group>"; };
 		D64D0AB02128D9AE005A6F37 /* OnboardingViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = OnboardingViewController.swift; sourceTree = "<group>"; };
-		D64D8CA82463B494006B0BAA /* MultiThreadDictionary.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MultiThreadDictionary.swift; sourceTree = "<group>"; };
 		D651C5B32915B00400236EF6 /* ProfileFieldsView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ProfileFieldsView.swift; sourceTree = "<group>"; };
 		D6531DED246B81C9000F9538 /* GifvPlayerView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = GifvPlayerView.swift; sourceTree = "<group>"; };
 		D6538944214D6D7500E3CEFC /* TableViewSwipeActionProvider.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TableViewSwipeActionProvider.swift; sourceTree = "<group>"; };
@@ -778,7 +776,7 @@
 		D6D79F582A13293200AB2315 /* BackgroundManager.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BackgroundManager.swift; sourceTree = "<group>"; };
 		D6D94954298963A900C59229 /* Colors.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Colors.swift; sourceTree = "<group>"; };
 		D6D9498C298CBB4000C59229 /* TrendingStatusCollectionViewCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TrendingStatusCollectionViewCell.swift; sourceTree = "<group>"; };
-		D6D9498E298EB79400C59229 /* CopyableLable.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CopyableLable.swift; sourceTree = "<group>"; };
+		D6D9498E298EB79400C59229 /* CopyableLabel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CopyableLabel.swift; sourceTree = "<group>"; };
 		D6DD8FFC298495A8002AD3FD /* LogoutService.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LogoutService.swift; sourceTree = "<group>"; };
 		D6DD8FFE2984D327002AD3FD /* BookmarksViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BookmarksViewController.swift; sourceTree = "<group>"; };
 		D6DD996A2998611A0015C962 /* SuggestedProfilesViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SuggestedProfilesViewController.swift; sourceTree = "<group>"; };
@@ -1490,7 +1488,7 @@
 				D6ADB6EF28ED1F25009924AB /* CachedImageView.swift */,
 				D6895DC328D65342006341DA /* ConfirmReblogStatusPreviewView.swift */,
 				D620483523D38075008A63EF /* ContentTextView.swift */,
-				D6D9498E298EB79400C59229 /* CopyableLable.swift */,
+				D6D9498E298EB79400C59229 /* CopyableLabel.swift */,
 				D6E426B225337C7000C02E1C /* CustomEmojiImageView.swift */,
 				D6969E9F240C8384002843CE /* EmojiLabel.swift */,
 				D61F75B8293C15A000C0B37F /* ZeroHeightCollectionViewCell.swift */,
@@ -1627,7 +1625,6 @@
 				D6DEBA8C2B6579830008629A /* MainThreadBox.swift */,
 				D6B81F432560390300F6E31D /* MenuController.swift */,
 				D6CF5B842AC7C56F00F15D83 /* MultiColumnCollectionViewLayout.swift */,
-				D64D8CA82463B494006B0BAA /* MultiThreadDictionary.swift */,
 				D6945C2E23AC47C3005C403C /* SavedDataManager.swift */,
 				D61F759E29385AD800C0B37F /* SemiCaseSensitiveComparator.swift */,
 				D6895DE828D962C2006341DA /* TimelineLikeController.swift */,
@@ -2306,7 +2303,7 @@
 				D61ABEFE28F1C92600B29151 /* FavoriteService.swift in Sources */,
 				D61F75AB293AF11400C0B37F /* FilterKeywordMO.swift in Sources */,
 				D65B4B5A29720AB000DABDFB /* ReportStatusView.swift in Sources */,
-				D6D9498F298EB79400C59229 /* CopyableLable.swift in Sources */,
+				D6D9498F298EB79400C59229 /* CopyableLabel.swift in Sources */,
 				D6333B792139AEFD00CE884A /* Date+TimeAgo.swift in Sources */,
 				D6D706A029466649000827ED /* ScrollingSegmentedControl.swift in Sources */,
 				D686BBE324FBF8110068E6AA /* WrappedProgressView.swift in Sources */,
@@ -2390,7 +2387,6 @@
 				D62E9987279D094F00C26176 /* StatusMetaIndicatorsView.swift in Sources */,
 				D6BEA247291A0F2D002F4D01 /* Duckable+Root.swift in Sources */,
 				D6C1B2082545D1EC00DAAA66 /* StatusCardView.swift in Sources */,
-				D64D8CA92463B494006B0BAA /* MultiThreadDictionary.swift in Sources */,
 				D630C3CA2BC59FF500208903 /* MastodonController+Push.swift in Sources */,
 				D6F6A554291F0D9600F496A8 /* DeleteListService.swift in Sources */,
 				D68E6F5F253C9B2D001A1B4C /* BaseEmojiLabel.swift in Sources */,
@@ -2547,6 +2543,7 @@
 				INFOPLIST_FILE = NotificationExtension/Info.plist;
 				INFOPLIST_KEY_CFBundleDisplayName = NotificationExtension;
 				INFOPLIST_KEY_NSHumanReadableCopyright = "Copyright © 2024 Shadowfacts. All rights reserved.";
+				IPHONEOS_DEPLOYMENT_TARGET = 16.0;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/Frameworks",
@@ -2579,6 +2576,7 @@
 				INFOPLIST_FILE = NotificationExtension/Info.plist;
 				INFOPLIST_KEY_CFBundleDisplayName = NotificationExtension;
 				INFOPLIST_KEY_NSHumanReadableCopyright = "Copyright © 2024 Shadowfacts. All rights reserved.";
+				IPHONEOS_DEPLOYMENT_TARGET = 16.0;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/Frameworks",
@@ -2610,6 +2608,7 @@
 				INFOPLIST_FILE = NotificationExtension/Info.plist;
 				INFOPLIST_KEY_CFBundleDisplayName = NotificationExtension;
 				INFOPLIST_KEY_NSHumanReadableCopyright = "Copyright © 2024 Shadowfacts. All rights reserved.";
+				IPHONEOS_DEPLOYMENT_TARGET = 16.0;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/Frameworks",
@@ -2700,6 +2699,7 @@
 				CURRENT_PROJECT_VERSION = "$(CURRENT_PROJECT_VERSION)";
 				INFOPLIST_FILE = Tusker/Info.plist;
 				INFOPLIST_KEY_LSApplicationCategoryType = "public.app-category.social-networking";
+				IPHONEOS_DEPLOYMENT_TARGET = 16.0;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/Frameworks",
@@ -2743,7 +2743,7 @@
 				ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
 				CODE_SIGN_STYLE = Automatic;
 				INFOPLIST_FILE = TuskerUITests/Info.plist;
-				IPHONEOS_DEPLOYMENT_TARGET = 15.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 16.0;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/Frameworks",
@@ -2766,6 +2766,7 @@
 				CODE_SIGN_STYLE = Automatic;
 				CURRENT_PROJECT_VERSION = "$(CURRENT_PROJECT_VERSION)";
 				INFOPLIST_FILE = OpenInTusker/Info.plist;
+				IPHONEOS_DEPLOYMENT_TARGET = 16.0;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/Frameworks",
@@ -2793,6 +2794,7 @@
 				INFOPLIST_FILE = ShareExtension/Info.plist;
 				INFOPLIST_KEY_CFBundleDisplayName = ShareExtension;
 				INFOPLIST_KEY_NSHumanReadableCopyright = "Copyright © 2023 Shadowfacts. All rights reserved.";
+				IPHONEOS_DEPLOYMENT_TARGET = 16.0;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/Frameworks",
@@ -2821,6 +2823,7 @@
 				INFOPLIST_FILE = ShareExtension/Info.plist;
 				INFOPLIST_KEY_CFBundleDisplayName = ShareExtension;
 				INFOPLIST_KEY_NSHumanReadableCopyright = "Copyright © 2023 Shadowfacts. All rights reserved.";
+				IPHONEOS_DEPLOYMENT_TARGET = 16.0;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/Frameworks",
@@ -2849,6 +2852,7 @@
 				INFOPLIST_FILE = ShareExtension/Info.plist;
 				INFOPLIST_KEY_CFBundleDisplayName = ShareExtension;
 				INFOPLIST_KEY_NSHumanReadableCopyright = "Copyright © 2023 Shadowfacts. All rights reserved.";
+				IPHONEOS_DEPLOYMENT_TARGET = 16.0;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/Frameworks",
@@ -3004,6 +3008,7 @@
 				CURRENT_PROJECT_VERSION = "$(CURRENT_PROJECT_VERSION)";
 				INFOPLIST_FILE = Tusker/Info.plist;
 				INFOPLIST_KEY_LSApplicationCategoryType = "public.app-category.social-networking";
+				IPHONEOS_DEPLOYMENT_TARGET = 16.0;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/Frameworks",
@@ -3036,6 +3041,7 @@
 				CURRENT_PROJECT_VERSION = "$(CURRENT_PROJECT_VERSION)";
 				INFOPLIST_FILE = Tusker/Info.plist;
 				INFOPLIST_KEY_LSApplicationCategoryType = "public.app-category.social-networking";
+				IPHONEOS_DEPLOYMENT_TARGET = 16.0;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/Frameworks",
@@ -3100,7 +3106,7 @@
 				ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
 				CODE_SIGN_STYLE = Automatic;
 				INFOPLIST_FILE = TuskerUITests/Info.plist;
-				IPHONEOS_DEPLOYMENT_TARGET = 15.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 16.0;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/Frameworks",
@@ -3120,7 +3126,7 @@
 				ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
 				CODE_SIGN_STYLE = Automatic;
 				INFOPLIST_FILE = TuskerUITests/Info.plist;
-				IPHONEOS_DEPLOYMENT_TARGET = 15.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 16.0;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/Frameworks",
@@ -3143,6 +3149,7 @@
 				CODE_SIGN_STYLE = Automatic;
 				CURRENT_PROJECT_VERSION = "$(CURRENT_PROJECT_VERSION)";
 				INFOPLIST_FILE = OpenInTusker/Info.plist;
+				IPHONEOS_DEPLOYMENT_TARGET = 16.0;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/Frameworks",
@@ -3167,6 +3174,7 @@
 				CODE_SIGN_STYLE = Automatic;
 				CURRENT_PROJECT_VERSION = "$(CURRENT_PROJECT_VERSION)";
 				INFOPLIST_FILE = OpenInTusker/Info.plist;
+				IPHONEOS_DEPLOYMENT_TARGET = 16.0;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/Frameworks",

Tusker/Caching/DiskCache.swift

@@ -8,6 +8,7 @@
 
 import Foundation
 import CryptoKit
+import os
 
 struct DiskCacheTransformer<T> {
     let toData: (T) throws -> Data
@@ -21,7 +22,7 @@ class DiskCache<T> {
     let defaultExpiry: CacheExpiry
     let transformer: DiskCacheTransformer<T>
     
-    private var fileStates = MultiThreadDictionary<String, FileState>()
+    private var fileStates = OSAllocatedUnfairLock(initialState: [String: FileState]())
     
     init(name: String, defaultExpiry: CacheExpiry, transformer: DiskCacheTransformer<T>, fileManager: FileManager = .default) throws {
         self.defaultExpiry = defaultExpiry
@@ -59,7 +60,9 @@ class DiskCache<T> {
     }
     
     private func fileState(forKey key: String) -> FileState {
-        return fileStates[key] ?? .unknown
+        return fileStates.withLock {
+            $0[key] ?? .unknown
+        }
     }
     
     func setObject(_ object: T, forKey key: String) throws {
@@ -68,13 +71,17 @@ class DiskCache<T> {
         guard fileManager.createFile(atPath: path, contents: data, attributes: [.modificationDate: defaultExpiry.date]) else {
             throw Error.couldNotCreateFile
         }
-        fileStates[key] = .exists
+        fileStates.withLock {
+            $0[key] = .exists
+        }
     }
     
     func removeObject(forKey key: String) throws {
         let path = makeFilePath(for: key)
         try fileManager.removeItem(atPath: path)
-        fileStates[key] = .doesNotExist
+        fileStates.withLock {
+            $0[key] = .doesNotExist
+        }
     }
     
     func existsObject(forKey key: String) throws -> Bool {
@@ -105,7 +112,9 @@ class DiskCache<T> {
         }
         guard date.timeIntervalSinceNow >= 0 else {
             try fileManager.removeItem(atPath: path)
-            fileStates[key] = .doesNotExist
+            fileStates.withLock {
+                $0[key] = .doesNotExist
+            }
             throw Error.expired
         }
         

Tusker/CoreData/TimelinePosition.swift

@@ -76,17 +76,10 @@ func fromTimelineKind(_ kind: String) -> Timeline {
     } else if kind == "direct" {
         return .direct
     } else if kind.starts(with: "hashtag:") {
-        return .tag(hashtag: String(trimmingPrefix("hashtag:", of: kind)))
+        return .tag(hashtag: String(kind.trimmingPrefix("hashtag:")))
     } else if kind.starts(with: "list:") {
-        return .list(id: String(trimmingPrefix("list:", of: kind)))
+        return .list(id: String(kind.trimmingPrefix("list:")))
     } else {
         fatalError("invalid timeline kind \(kind)")
     }
 }
-
-// replace with Collection.trimmingPrefix
-@available(iOS, obsoleted: 16.0)
-@available(visionOS 1.0, *)
-private func trimmingPrefix(_ prefix: String, of str: String) -> Substring {
-    return str[str.index(str.startIndex, offsetBy: prefix.count)...]
-}

Tusker/Extensions/View+AppListStyle.swift

@@ -36,19 +36,12 @@ private struct AppGroupedListBackground: ViewModifier {
     }
     
     func body(content: Content) -> some View {
-        if #available(iOS 16.0, *) {
+        if colorScheme == .dark, !pureBlackDarkMode {
-            if colorScheme == .dark, !pureBlackDarkMode {
+            content
-                content
+                .scrollContentBackground(.hidden)
-                    .scrollContentBackground(.hidden)
+                .background(Color.appGroupedBackground.edgesIgnoringSafeArea(.all))
-                    .background(Color.appGroupedBackground.edgesIgnoringSafeArea(.all))
-            } else {
-                content
-            }
         } else {
             content
-                .onAppear {
-                    UITableView.appearance(whenContainedInInstancesOf: [container]).backgroundColor = .appGroupedBackground
-                }
         }
     }
 }

Tusker/HTMLConverter.swift

@@ -48,14 +48,13 @@ extension HTMLConverter {
             // Converting WebURL to URL is a small but non-trivial expense (since it works by
             // serializing the WebURL as a string and then having Foundation parse it again),
             // so, if available, use the system parser which doesn't require another round trip.
-            if #available(iOS 16.0, macOS 13.0, *),
+            if let url = try? URL.ParseStrategy().parse(string) {
-               let url = try? URL.ParseStrategy().parse(string) {
                 url
             } else if let web = WebURL(string),
                       let url = URL(web) {
                 url
             } else {
-                URL(string: string)
+                nil
             }
         }
         

Tusker/MultiThreadDictionary.swift

@@ -1,104 +0,0 @@
-//
-//  MultiThreadDictionary.swift
-//  Tusker
-//
-//  Created by Shadowfacts on 5/6/20.
-//  Copyright © 2020 Shadowfacts. All rights reserved.
-//
-
-import Foundation
-import os
-
-// once we target iOS 16, replace uses of this with OSAllocatedUnfairLock<[Key: Value]>
-// to make the lock semantics more clear
-@available(iOS, obsoleted: 16.0)
-@available(visionOS 1.0, *)
-final class MultiThreadDictionary<Key: Hashable & Sendable, Value: Sendable>: @unchecked Sendable {
-    #if os(visionOS)
-    private let lock = OSAllocatedUnfairLock(initialState: [Key: Value]())
-    #else
-    private let lock: any Lock<[Key: Value]>
-    #endif
-    
-    init() {
-        #if !os(visionOS)
-        if #available(iOS 16.0, *) {
-            self.lock = OSAllocatedUnfairLock(initialState: [:])
-        } else {
-            self.lock = UnfairLock(initialState: [:])
-        }
-        #endif
-    }
-    
-    subscript(key: Key) -> Value? {
-        get {
-            return lock.withLock { dict in
-                dict[key]
-            }
-        }
-        set(value) {
-            #if os(visionOS)
-            lock.withLock { dict in
-                dict[key] = value
-            }
-            #else
-            _ = lock.withLock { dict in
-                dict[key] = value
-            }
-            #endif
-        }
-    }
-    
-    /// If the result of this function is unused, it is preferable to use `removeValueWithoutReturning` as it executes asynchronously and doesn't block the calling thread.
-    func removeValue(forKey key: Key) -> Value? {
-        return lock.withLock { dict in
-            dict.removeValue(forKey: key)
-        }
-    }
-    
-    func contains(key: Key) -> Bool {
-        return lock.withLock { dict in
-            dict.keys.contains(key)
-        }
-    }
-    
-    // TODO: this should really be throws/rethrows but the stupid type-erased lock makes that not possible
-    func withLock<R>(_ body: @Sendable (inout [Key: Value]) throws -> R) rethrows -> R where R: Sendable {
-        return try lock.withLock { dict in
-            return try body(&dict)
-        }
-    }
-}
-
-#if !os(visionOS)
-// TODO: replace this only with OSAllocatedUnfairLock
-@available(iOS, obsoleted: 16.0)
-fileprivate protocol Lock<State> {
-    associatedtype State
-    func withLock<R>(_ body: @Sendable (inout State) throws -> R) rethrows -> R where R: Sendable
-}
-
-@available(iOS 16.0, *)
-extension OSAllocatedUnfairLock: Lock {
-}
-
-// from http://www.russbishop.net/the-law
-fileprivate class UnfairLock<State>: Lock {
-    private var lock: UnsafeMutablePointer<os_unfair_lock>
-    private var state: State
-    init(initialState: State) {
-        self.state = initialState
-        self.lock = .allocate(capacity: 1)
-        self.lock.initialize(to: os_unfair_lock())
-    }
-    deinit {
-        self.lock.deinitialize(count: 1)
-        self.lock.deallocate()
-    }
-    func withLock<R>(_ body: (inout State) throws -> R) rethrows -> R where R: Sendable {
-        os_unfair_lock_lock(lock)
-        defer { os_unfair_lock_unlock(lock) }
-        return try body(&state)
-    }
-}
-#endif

Tusker/Scenes/MainSceneDelegate.swift

@@ -274,8 +274,7 @@ class MainSceneDelegate: UIResponder, UIWindowSceneDelegate, TuskerSceneDelegate
         } else {
             mainVC = MainSplitViewController(mastodonController: mastodonController)
         }
-        if UIDevice.current.userInterfaceIdiom == .phone,
+        if UIDevice.current.userInterfaceIdiom == .phone {
-           #available(iOS 16.0, *) {
             // TODO: maybe the duckable container should be outside the account switching container
             return DuckableContainerViewController(child: mainVC)
         } else {

Tusker/Screens/Announcements/AddReactionView.swift

@@ -86,7 +86,7 @@ struct AddReactionView: View {
             }
         }
         .navigationViewStyle(.stack)
-        .mediumPresentationDetentIfAvailable()
+        .presentationDetents([.medium, .large])
         .alertWithData("Error Adding Reaction", data: $error, actions: { _ in
             Button("OK") {}
         }, message: { error in
@@ -171,17 +171,6 @@ private struct AddReactionButton<Label: View>: View {
 }
 
 private extension View {
-    @available(iOS, obsoleted: 16.0)
-    @available(visionOS 1.0, *)
-    @ViewBuilder
-    func mediumPresentationDetentIfAvailable() -> some View {
-        if #available(iOS 16.0, *) {
-            self.presentationDetents([.medium, .large])
-        } else {
-            self
-        }
-    }
-    
     @available(iOS, obsoleted: 17.1)
     @available(visionOS 1.0, *)
     @ViewBuilder

Tusker/Screens/Announcements/AnnouncementListRow.swift

@@ -20,14 +20,10 @@ struct AnnouncementListRow: View {
     @State private var isShowingAddReactionSheet = false
     
     var body: some View {
-        if #available(iOS 16.0, *) {
+        mostOfTheBody
-            mostOfTheBody
+            .alignmentGuide(.listRowSeparatorLeading, computeValue: { dimension in
-                .alignmentGuide(.listRowSeparatorLeading, computeValue: { dimension in
+                dimension[.leading]
-                    dimension[.leading]
+            })
-                })
-        } else {
-            mostOfTheBody
-        }
     }
     
     private var mostOfTheBody: some View {
@@ -54,11 +50,7 @@ struct AnnouncementListRow: View {
                         Label {
                             Text("Add Reaction")
                         } icon: {
-                            if #available(iOS 16.0, *) {
+                            Image("face.smiling.badge.plus")
-                                Image("face.smiling.badge.plus")
-                            } else {
-                                Image(systemName: "face.smiling")
-                            }
                         }
                     }
                     .labelStyle(.iconOnly)

Tusker/Screens/Customize Timelines/AddHashtagPinnedTimelineView.swift

@@ -9,20 +9,6 @@
 import SwiftUI
 import Pachyderm
 
-@available(iOS, obsoleted: 16.0)
-struct AddHashtagPinnedTimelineRepresentable: UIViewControllerRepresentable {
-    typealias UIViewControllerType = UIHostingController<AddHashtagPinnedTimelineView>
-    
-    @Binding var pinnedTimelines: [PinnedTimeline]
-    
-    func makeUIViewController(context: Context) -> UIHostingController<AddHashtagPinnedTimelineView> {
-        return UIHostingController(rootView: AddHashtagPinnedTimelineView(pinnedTimelines: $pinnedTimelines))
-    }
-    
-    func updateUIViewController(_ uiViewController: UIHostingController<AddHashtagPinnedTimelineView>, context: Context) {
-    }
-}
-
 struct AddHashtagPinnedTimelineView: View {
     @EnvironmentObject private var mastodonController: MastodonController
     @Environment(\.dismiss) private var dismiss
@@ -49,9 +35,6 @@ struct AddHashtagPinnedTimelineView: View {
     var body: some View {
         NavigationView {
             list
-                #if !os(visionOS)
-                .appGroupedListBackground(container: AddHashtagPinnedTimelineRepresentable.UIViewControllerType.self)
-                #endif
                 .listStyle(.grouped)
                 .navigationTitle("Add Hashtag")
                 .navigationBarTitleDisplayMode(.inline)

Tusker/Screens/Customize Timelines/CustomizeTimelinesView.swift

@@ -36,15 +36,8 @@ struct CustomizeTimelinesList: View {
     }
 
     var body: some View {
-        if #available(iOS 16.0, *) {
+        NavigationStack {
-            NavigationStack {
+            navigationBody
-                navigationBody
-            }
-        } else {
-            NavigationView {
-                navigationBody
-            }
-            .navigationViewStyle(.stack)
         }
     }
     

Tusker/Screens/Customize Timelines/EditFilterView.swift

@@ -149,7 +149,7 @@ struct EditFilterView: View {
         }
         .appGroupedListBackground(container: UIHostingController<CustomizeTimelinesList>.self)
         #if !os(visionOS)
-        .scrollDismissesKeyboardInteractivelyIfAvailable()
+        .scrollDismissesKeyboard(.interactively)
         #endif
         .navigationTitle(create ? "Add Filter" : "Edit Filter")
         .navigationBarTitleDisplayMode(.inline)
@@ -226,18 +226,6 @@ private struct FilterContextToggleStyle: ToggleStyle {
     }
 }
 
-private extension View {
-    @available(iOS, obsoleted: 16.0)
-    @ViewBuilder
-    func scrollDismissesKeyboardInteractivelyIfAvailable() -> some View {
-        if #available(iOS 16.0, *) {
-            self.scrollDismissesKeyboard(.interactively)
-        } else {
-            self
-        }
-    }
-}
-
 //struct EditFilterView_Previews: PreviewProvider {
 //    static var previews: some View {
 //        EditFilterView()

Tusker/Screens/Customize Timelines/PinnedTimelinesView.swift

@@ -115,18 +115,8 @@ struct PinnedTimelinesModifier: ViewModifier {
     func body(content: Content) -> some View {
         content
             .sheet(isPresented: $isShowingAddHashtagSheet, content: {
-                #if os(visionOS)
                 AddHashtagPinnedTimelineView(pinnedTimelines: $pinnedTimelines)
                     .edgesIgnoringSafeArea(.bottom)
-                #else
-                if #available(iOS 16.0, *) {
-                    AddHashtagPinnedTimelineView(pinnedTimelines: $pinnedTimelines)
-                        .edgesIgnoringSafeArea(.bottom)
-                } else {
-                    AddHashtagPinnedTimelineRepresentable(pinnedTimelines: $pinnedTimelines)
-                        .edgesIgnoringSafeArea(.bottom)
-                }
-                #endif
             })
             .sheet(isPresented: $isShowingAddInstanceSheet, content: {
                 AddInstancePinnedTimelineView(pinnedTimelines: $pinnedTimelines)

Tusker/Screens/Explore/InlineTrendsViewController.swift

@@ -41,9 +41,7 @@ class InlineTrendsViewController: UIViewController {
 
         navigationItem.searchController = searchController
         navigationItem.hidesSearchBarWhenScrolling = false
-        if #available(iOS 16.0, *) {
+        navigationItem.preferredSearchBarPlacement = .stacked
-            navigationItem.preferredSearchBarPlacement = .stacked
-        }
         
         let trends = TrendsViewController(mastodonController: mastodonController)
         trends.view.translatesAutoresizingMaskIntoConstraints = false

Tusker/Screens/Explore/TrendsViewController.swift

@@ -525,12 +525,12 @@ extension TrendsViewController: UICollectionViewDelegate {
         }
     }
     
-    @available(iOS, obsoleted: 16.0)
+    func collectionView(_ collectionView: UICollectionView, contextMenuConfigurationForItemsAt indexPaths: [IndexPath], point: CGPoint) -> UIContextMenuConfiguration? {
-    @available(visionOS 1.0, *)
+        guard indexPaths.count == 1,
-    func collectionView(_ collectionView: UICollectionView, contextMenuConfigurationForItemAt indexPath: IndexPath, point: CGPoint) -> UIContextMenuConfiguration? {
+              let item = dataSource.itemIdentifier(for: indexPaths[0])  else {
-        guard let item = dataSource.itemIdentifier(for: indexPath) else {
             return nil
         }
+        let indexPath = indexPaths[0]
         
         switch item {
         case .loadingIndicator, .confirmLoadMoreStatuses(_):
@@ -584,15 +584,6 @@ extension TrendsViewController: UICollectionViewDelegate {
         }
     }
     
-    // implementing the highlightPreviewForItemAt method seems to prevent the old, single IndexPath variant of this method from being called on iOS 16
-    @available(iOS 16.0, visionOS 1.0, *)
-    func collectionView(_ collectionView: UICollectionView, contextMenuConfigurationForItemsAt indexPaths: [IndexPath], point: CGPoint) -> UIContextMenuConfiguration? {
-        guard indexPaths.count == 1 else {
-            return nil
-        }
-        return self.collectionView(collectionView, contextMenuConfigurationForItemAt: indexPaths[0], point: point)
-    }
-    
     func collectionView(_ collectionView: UICollectionView, willPerformPreviewActionForMenuWith configuration: UIContextMenuConfiguration, animator: UIContextMenuInteractionCommitAnimating) {
         MenuPreviewHelper.willPerformPreviewAction(animator: animator, presenter: self)
     }

Tusker/Screens/Gallery/VideoControlsViewController.swift

@@ -18,9 +18,6 @@ class VideoControlsViewController: UIViewController {
     }()
 
     private let player: AVPlayer
-    #if !os(visionOS)
-    @Box private var playbackSpeed: Float
-    #endif
     
     private lazy var muteButton = MuteButton().configure {
         $0.addTarget(self, action: #selector(muteButtonPressed), for: .touchUpInside)
@@ -46,13 +43,8 @@ class VideoControlsViewController: UIViewController {
     
     private lazy var optionsButton = MenuButton { [unowned self] in
         let imageName: String
-        #if os(visionOS)
-        let playbackSpeed = player.defaultRate
-        #else
-        let playbackSpeed = self.playbackSpeed
-        #endif
         if #available(iOS 17.0, *) {
-            switch playbackSpeed {
+            switch player.defaultRate {
             case 0.5:
                 imageName = "gauge.with.dots.needle.0percent"
             case 1:
@@ -68,12 +60,8 @@ class VideoControlsViewController: UIViewController {
             imageName = "speedometer"
         }
         let speedMenu = UIMenu(title: "Playback Speed", image: UIImage(systemName: imageName), children: PlaybackSpeed.allCases.map { speed in
-            UIAction(title: speed.displayName, state: playbackSpeed == speed.rate ? .on : .off) { [unowned self] _ in
+            UIAction(title: speed.displayName, state: self.player.defaultRate == speed.rate ? .on : .off) { [unowned self] _ in
-                #if os(visionOS)
                 self.player.defaultRate = speed.rate
-                #else
-                self.playbackSpeed = speed.rate
-                #endif
                 if self.player.rate > 0 {
                     self.player.rate = speed.rate
                 }
@@ -101,20 +89,11 @@ class VideoControlsViewController: UIViewController {
     private var scrubbingTargetTime: CMTime?
     private var isSeeking = false
     
-    #if os(visionOS)
     init(player: AVPlayer) {
         self.player = player
         
         super.init(nibName: nil, bundle: nil)
     }
-    #else
-    init(player: AVPlayer, playbackSpeed: Box<Float>) {
-        self.player = player
-        self._playbackSpeed = playbackSpeed
-        
-        super.init(nibName: nil, bundle: nil)
-    }
-    #endif
     
     required init?(coder: NSCoder) {
         fatalError("init(coder:) has not been implemented")
@@ -198,11 +177,7 @@ class VideoControlsViewController: UIViewController {
     @objc private func scrubbingEnded() {
         scrubbingChanged()
         if wasPlayingWhenScrubbingStarted {
-            #if os(visionOS)
             player.play()
-            #else
-            player.rate = playbackSpeed
-            #endif
         }
     }
     

Tusker/Screens/Gallery/VideoGalleryContentViewController.swift

@@ -17,11 +17,6 @@ class VideoGalleryContentViewController: UIViewController, GalleryContentViewCon
     private var item: AVPlayerItem
     let player: AVPlayer
     
-    #if !os(visionOS)
-    @available(iOS, obsoleted: 16.0, message: "Use AVPlayer.defaultRate")
-    @Box private var playbackSpeed: Float = 1
-    #endif
-    
     private var isGrayscale: Bool
     
     private var presentationSizeObservation: NSKeyValueObservation?
@@ -161,11 +156,7 @@ class VideoGalleryContentViewController: UIViewController, GalleryContentViewCon
             player.replaceCurrentItem(with: item)
             updateItemObservations()
             if isPlaying {
-                #if os(visionOS)
                 player.play()
-                #else
-                player.rate = playbackSpeed
-                #endif
             }
         }
     }
@@ -196,20 +187,12 @@ class VideoGalleryContentViewController: UIViewController, GalleryContentViewCon
         [VideoActivityItemSource(asset: item.asset, url: url)]
     }
     
-    #if os(visionOS)
     private lazy var overlayVC = VideoOverlayViewController(player: player)
-    #else
-    private lazy var overlayVC = VideoOverlayViewController(player: player, playbackSpeed: _playbackSpeed)
-    #endif
     var contentOverlayAccessoryViewController: UIViewController? {
         overlayVC
     }
     
-    #if os(visionOS)
     private(set) lazy var bottomControlsAccessoryViewController: UIViewController? = VideoControlsViewController(player: player)
-    #else
-    private(set) lazy var bottomControlsAccessoryViewController: UIViewController? = VideoControlsViewController(player: player, playbackSpeed: _playbackSpeed)
-    #endif
     
     func setControlsVisible(_ visible: Bool, animated: Bool, dueToUserInteraction: Bool) {
         overlayVC.setVisible(visible)

Tusker/Screens/Gallery/VideoOverlayViewController.swift

@@ -15,9 +15,6 @@ class VideoOverlayViewController: UIViewController {
     private static let pauseImage = UIImage(systemName: "pause.fill")!
 
     private let player: AVPlayer
-    #if !os(visionOS)
-    @Box private var playbackSpeed: Float
-    #endif
     
     private var dimmingView: UIView!
     private var controlsStack: UIStackView!
@@ -26,18 +23,10 @@ class VideoOverlayViewController: UIViewController {
 
     private var rateObservation: NSKeyValueObservation?
     
-    #if os(visionOS)
     init(player: AVPlayer) {
         self.player = player
         super.init(nibName: nil, bundle: nil)
     }
-    #else
-    init(player: AVPlayer, playbackSpeed: Box<Float>) {
-        self.player = player
-        self._playbackSpeed = playbackSpeed
-        super.init(nibName: nil, bundle: nil)
-    }
-    #endif
 
     required init?(coder: NSCoder) {
         fatalError("init(coder:) has not been implemented")
@@ -109,11 +98,7 @@ class VideoOverlayViewController: UIViewController {
             if player.currentTime() >= player.currentItem!.duration {
                 player.seek(to: .zero)
             }
-            #if os(visionOS)
             player.play()
-            #else
-            player.rate = playbackSpeed
-            #endif
         }
     }
     

Tusker/Screens/Lists/EditListAccountsViewController.swift

@@ -100,28 +100,13 @@ class EditListAccountsViewController: UIViewController, CollectionViewController
         
         navigationItem.searchController = searchController
         navigationItem.hidesSearchBarWhenScrolling = false
-        if #available(iOS 16.0, *) {
+        navigationItem.preferredSearchBarPlacement = .stacked
-            navigationItem.preferredSearchBarPlacement = .stacked
         
-            navigationItem.renameDelegate = self
+        navigationItem.renameDelegate = self
-            navigationItem.titleMenuProvider = { [unowned self] suggested in
+        navigationItem.titleMenuProvider = { [unowned self] suggested in
-                var children = suggested
+            var children = suggested
-                children.append(contentsOf: self.listSettingsMenuElements())
+            children.append(contentsOf: self.listSettingsMenuElements())
-                return UIMenu(children: children)
+            return UIMenu(children: children)
-            }
-        } else {
-            navigationItem.leftBarButtonItem = UIBarButtonItem(title: "Edit", menu: UIMenu(children: [
-                // uncached so that menu always reflects the current state of the list
-                UIDeferredMenuElement.uncached({ [unowned self] elementHandler in
-                    var elements = self.listSettingsMenuElements()
-                    elements.insert(UIAction(title: "Rename…", image: UIImage(systemName: "pencil"), handler: { [unowned self] _ in
-                        RenameListService(list: self.list, mastodonController: self.mastodonController, present: {
-                            self.present($0, animated: true)
-                        }).run()
-                    }), at: 0)
-                    elementHandler(elements)
-                })
-            ]))
         }
     }
     

Tusker/Screens/Main/NewMainTabBarViewController.swift

@@ -454,15 +454,20 @@ extension NewMainTabBarViewController {
 extension NewMainTabBarViewController: UITabBarControllerDelegate {
     func tabBarController(_ tabBarController: UITabBarController, shouldSelectTab tab: UITab) -> Bool {
         if tab.identifier == Tab.compose.rawValue {
-            let currentTab = selectedTab
+            if #unavailable(iOS 18.1) {
-            // returning false for shouldSelectTab doesn't prevent the UITabBar from being updated (FB14857254)
+                let currentTab = selectedTab
-            // returning false and then setting selectedTab=tab and selectedTab=currentTab seems to leave things in a bad state (currentTab's VC is on screen but in the disappeared state)
+                // returning false for shouldSelectTab doesn't prevent the UITabBar from being updated (FB14857254)
-            // so return true, and then after the tab bar VC has finished updating, go back to currentTab
+                // returning false and then setting selectedTab=tab and selectedTab=currentTab seems to leave things in a bad state (currentTab's VC is on screen but in the disappeared state)
-            DispatchQueue.main.async {
+                // so return true, and then after the tab bar VC has finished updating, go back to currentTab
-                self.selectedTab = currentTab
+                DispatchQueue.main.async {
+                    self.selectedTab = currentTab
+                }
+                compose(editing: nil)
+                return true
+            } else {
+                compose(editing: nil)
+                return false
             }
-            compose(editing: nil)
-            return true
         } else if let selectedTab,
                   selectedTab == tab,
                   let nav = selectedViewController as? any NavigationControllerProtocol {

Tusker/Screens/Mute/MuteAccountView.swift

@@ -41,15 +41,8 @@ struct MuteAccountView: View {
     @State private var error: Error?
     
     var body: some View {
-        if #available(iOS 16.0, *) {
+        NavigationStack {
-            NavigationStack {
+            navigationViewContent
-                navigationViewContent
-            }
-        } else {
-            NavigationView {
-                navigationViewContent
-            }
-            .navigationViewStyle(.stack)
         }
     }
     

Tusker/Screens/Notifications/FollowRequestNotificationViewController.swift

@@ -101,14 +101,8 @@ extension FollowRequestNotificationViewController: UICollectionViewDelegate {
                 UIAction(title: "Accept", image: UIImage(systemName: "checkmark.circle"), handler: { _ in cell.acceptButtonPressed() }),
                 UIAction(title: "Reject", image: UIImage(systemName: "xmark.circle"), handler: { _ in cell.rejectButtonPressed() }),
             ]
-            let acceptRejectMenu: UIMenu
-            if #available(iOS 16.0, *) {
-                acceptRejectMenu = UIMenu(options: .displayInline, preferredElementSize: .medium, children: acceptRejectChildren)
-            } else {
-                acceptRejectMenu = UIMenu(options: .displayInline, children: acceptRejectChildren)
-            }
             return UIMenu(children: [
-                acceptRejectMenu,
+                UIMenu(options: .displayInline, preferredElementSize: .medium, children: acceptRejectChildren),
                 UIMenu(options: .displayInline, children: self.actionsForProfile(accountID: accountID, source: .view(cell))),
             ])
         }

Tusker/Screens/Notifications/NotificationsCollectionViewController.swift

@@ -700,14 +700,8 @@ extension NotificationsCollectionViewController: UICollectionViewDelegate {
                     UIAction(title: "Accept", image: UIImage(systemName: "checkmark.circle"), handler: { _ in cell.acceptButtonPressed() }),
                     UIAction(title: "Reject", image: UIImage(systemName: "xmark.circle"), handler: { _ in cell.rejectButtonPressed() }),
                 ]
-                let acceptRejectMenu: UIMenu
-                if #available(iOS 16.0, *) {
-                    acceptRejectMenu = UIMenu(options: .displayInline, preferredElementSize: .medium, children: acceptRejectChildren)
-                } else {
-                    acceptRejectMenu = UIMenu(options: .displayInline, children: acceptRejectChildren)
-                }
                 return UIMenu(children: [
-                    acceptRejectMenu,
+                    UIMenu(options: .displayInline, preferredElementSize: .medium, children: acceptRejectChildren),
                     UIMenu(options: .displayInline, children: self.actionsForProfile(accountID: accountID, source: .view(cell))),
                 ])
             }

Tusker/Screens/Onboarding/InstanceSelectorTableViewController.swift

@@ -96,9 +96,7 @@ class InstanceSelectorTableViewController: UITableViewController {
         searchController.searchBar.placeholder = "Search or enter a URL"
         navigationItem.searchController = searchController
         navigationItem.hidesSearchBarWhenScrolling = false
-        if #available(iOS 16.0, *) {
+        navigationItem.preferredSearchBarPlacement = .stacked
-            navigationItem.preferredSearchBarPlacement = .stacked
-        }
         definesPresentationContext = true
         
         urlHandler = urlCheckerSubject

Tusker/Screens/Preferences/About/AboutView.swift

@@ -91,14 +91,10 @@ struct AboutView: View {
     
     @ViewBuilder
     private var iconOrGame: some View {
-        if #available(iOS 16.0, *) {
+        FlipView {
-            FlipView {
-                appIcon
-            } back: {
-                TTTView()
-            }
-        } else {
             appIcon
+        } back: {
+            TTTView()
         }
     }
     

Tusker/Screens/Preferences/Appearance/AppearancePrefsView.swift

@@ -27,14 +27,7 @@ struct AppearancePrefsView: View {
     private static let accentColorsAndImages: [(AccentColor, UIImage?)] = AccentColor.allCases.map { color in
         var image: UIImage?
         if let color = color.color {
-            if #available(iOS 16.0, *) {
+            image = UIImage(systemName: "circle.fill")!.withTintColor(color, renderingMode: .alwaysTemplate).withRenderingMode(.alwaysOriginal)
-                image = UIImage(systemName: "circle.fill")!.withTintColor(color, renderingMode: .alwaysTemplate).withRenderingMode(.alwaysOriginal)
-            } else {
-                image = UIGraphicsImageRenderer(size: CGSize(width: 20, height: 20)).image { context in
-                    color.setFill()
-                    context.cgContext.fillEllipse(in: CGRect(x: 0, y: 0, width: 20, height: 20))
-                }
-            }
         }
         return (color, image)
     }

Tusker/Screens/Preferences/Notifications/NotificationsPrefsView.swift

@@ -36,12 +36,7 @@ struct NotificationsPrefsView: View {
             if #available(iOS 15.4, *) {
                 Section {
                     Button {
-                        let str = if #available(iOS 16.0, *) {
+                        if let url = URL(string: UIApplication.openNotificationSettingsURLString) {
-                            UIApplication.openNotificationSettingsURLString
-                        } else {
-                            UIApplicationOpenNotificationSettingsURLString
-                        }
-                        if let url = URL(string: str) {
                             UIApplication.shared.open(url)
                         }
                     } label: {

Tusker/Screens/Preferences/Notifications/PushInstanceSettingsView.swift

@@ -34,7 +34,7 @@ struct PushInstanceSettingsView: View {
             HStack {
                 PrefsAccountView(account: account)
                 Spacer()
-                AsyncToggle("\(account.instanceURL.host!) notifications enabled", labelHidden: true, mode: $mode, onChange: updateNotificationsEnabled(enabled:))
+                AsyncToggle("\(account.instanceURL.host!) notifications enabled", mode: $mode, onChange: updateNotificationsEnabled(enabled:))
                     .labelsHidden()
             }
             PushSubscriptionView(account: account, mastodonController: mastodonController, subscription: subscription, updateSubscription: updateSubscription)

Tusker/Screens/Preferences/OppositeCollapseKeywordsView.swift

@@ -43,21 +43,9 @@ struct OppositeCollapseKeywordsView: View {
             .listStyle(.grouped)
             .appGroupedListBackground(container: PreferencesNavigationController.self)
         }
-        #if !os(visionOS)
-        .onAppear(perform: updateAppearance)
-        #endif
         .navigationBarTitle(preferences.expandAllContentWarnings ? "Collapse Post CW Keywords" : "Expand Post CW Keywords")
     }
     
-    @available(iOS, obsoleted: 16.0)
-    private func updateAppearance() {
-        if #available(iOS 16.0, *) {
-            // no longer necessary
-        } else {
-            UIScrollView.appearance(whenContainedInInstancesOf: [PreferencesNavigationController.self]).keyboardDismissMode = .interactive
-        }
-    }
-    
     private func commitExisting(at index: Int) -> () -> Void {
         return {
             if keywords[index].value.trimmingCharacters(in: .whitespacesAndNewlines).isEmpty {

Tusker/Screens/Report/ReportAddStatusView.swift

@@ -69,34 +69,30 @@ private struct ScrollBackgroundModifier: ViewModifier {
     @Environment(\.colorScheme) private var colorScheme
     
     func body(content: Content) -> some View {
-        if #available(iOS 16.0, *) {
+        content
-            content
+            .scrollContentBackground(.hidden)
-                .scrollContentBackground(.hidden)
+            .background {
-                .background {
+                // otherwise the pureBlackDarkMode isn't propagated, for some reason?
-                    // otherwise the pureBlackDarkMode isn't propagated, for some reason?
+                // even though it is for ReportSelectRulesView??
-                    // even though it is for ReportSelectRulesView??
+                let traits: UITraitCollection = {
-                    let traits: UITraitCollection = {
+                    var t = UITraitCollection(userInterfaceStyle: colorScheme == .dark ? .dark : .light)
-                        var t = UITraitCollection(userInterfaceStyle: colorScheme == .dark ? .dark : .light)
+                    #if os(visionOS)
-                        #if os(visionOS)
+                    t = t.modifyingTraits({ mutableTraits in
+                        mutableTraits.pureBlackDarkMode = true
+                    })
+                    #else
+                    if #available(iOS 17.0, *) {
                         t = t.modifyingTraits({ mutableTraits in
                             mutableTraits.pureBlackDarkMode = true
                         })
-                        #else
+                    } else {
-                        if #available(iOS 17.0, *) {
+                        t.obsoletePureBlackDarkMode = true
-                            t = t.modifyingTraits({ mutableTraits in
+                    }
-                                mutableTraits.pureBlackDarkMode = true
+                    #endif
-                            })
+                    return t
-                        } else {
+                }()
-                            t.obsoletePureBlackDarkMode = true
+                Color(uiColor: .appGroupedBackground.resolvedColor(with: traits))
-                        }
+                    .edgesIgnoringSafeArea(.all)
-                        #endif
+            }
-                        return t
-                    }()
-                    Color(uiColor: .appGroupedBackground.resolvedColor(with: traits))
-                        .edgesIgnoringSafeArea(.all)
-                }
-        } else {
-            content
-        }
     }
 }

Tusker/Screens/Report/ReportSelectRulesView.swift

@@ -49,26 +49,12 @@ struct ReportSelectRulesView: View {
             }
             .appGroupedListRowBackground()
         }
-        .withAppBackgroundIfAvailable()
+        .scrollContentBackground(.hidden)
+        .background(Color.appGroupedBackground)
         .navigationTitle("Rules")
     }
 }
 
-private extension View {
-    @available(iOS, obsoleted: 16.0)
-    @available(visionOS 1.0, *)
-    @ViewBuilder
-    func withAppBackgroundIfAvailable() -> some View {
-        if #available(iOS 16.0, *) {
-            self
-                .scrollContentBackground(.hidden)
-                .background(Color.appGroupedBackground)
-        } else {
-            self
-        }
-    }
-}
-
 //struct ReportSelectRulesView_Previews: PreviewProvider {
 //    static var previews: some View {
 //        ReportSelectRulesView()

Tusker/Screens/Report/ReportView.swift

@@ -27,18 +27,11 @@ struct ReportView: View {
     }
     
     var body: some View {
-        if #available(iOS 16.0, *) {
+        NavigationStack {
-            NavigationStack {
+            navigationViewContent
-                navigationViewContent
+                #if !os(visionOS)
-                    #if !os(visionOS)
+                .scrollDismissesKeyboard(.interactively)
-                    .scrollDismissesKeyboard(.interactively)
+                #endif
-                    #endif
-            }
-        } else {
-            NavigationView {
-                navigationViewContent
-            }
-            .navigationViewStyle(.stack)
         }
     }
     

Tusker/Screens/Search/MastodonSearchController.swift

@@ -39,9 +39,7 @@ class MastodonSearchController: UISearchController {
         searchResultsUpdater = searchResultsController
         automaticallyShowsSearchResultsController = false
         showsSearchResultsController = true
-        if #available(iOS 16.0, *) {
+        scopeBarActivation = .onSearchActivation
-            scopeBarActivation = .onSearchActivation
-        }
         
         searchBar.autocapitalizationType = .none
         searchBar.delegate = self
@@ -78,12 +76,8 @@ class MastodonSearchController: UISearchController {
         if searchText != defaultLanguage,
            let match = languageRegex.firstMatch(in: searchText, range: NSRange(location: 0, length: searchText.utf16.count)) {
             let identifier = (searchText as NSString).substring(with: match.range(at: 1))
-            if #available(iOS 16.0, *) {
+            if Locale.LanguageCode.isoLanguageCodes.contains(where: { $0.identifier == identifier }) {
-                if Locale.LanguageCode.isoLanguageCodes.contains(where: { $0.identifier == identifier }) {
+                langSuggestions.append("language:\(identifier)")
-                    langSuggestions.append("language:\(identifier)")
-                }
-            } else if searchText != "en" {
-                langSuggestions.append("language:\(searchText)")
             }
         }
         suggestions.append((.language, langSuggestions))

Tusker/Screens/Utilities/EnhancedNavigationViewController.swift

@@ -22,8 +22,7 @@ class EnhancedNavigationViewController: UINavigationController {
     override var viewControllers: [UIViewController] {
         didSet {
             poppedViewControllers = []
-            if #available(iOS 16.0, *),
+            if useBrowserStyleNavigation {
-               useBrowserStyleNavigation {
                 // TODO: this for loop might not be necessary
                 for vc in viewControllers {
                     configureNavItem(vc.navigationItem)
@@ -40,8 +39,7 @@ class EnhancedNavigationViewController: UINavigationController {
         self.interactivePushTransition = InteractivePushTransition(navigationController: self)
         #endif
         
-        if #available(iOS 16.0, *),
+        if useBrowserStyleNavigation,
-           useBrowserStyleNavigation,
            let topViewController {
             configureNavItem(topViewController.navigationItem)
             updateTopNavItemState()
@@ -52,9 +50,7 @@ class EnhancedNavigationViewController: UINavigationController {
         let popped = performAfterAnimating(block: {
             super.popViewController(animated: animated)
         }, after: {
-            if #available(iOS 16.0, *) {
+            self.updateTopNavItemState()
-                self.updateTopNavItemState()
-            }
         }, animated: animated)
         if let popped {
             poppedViewControllers.insert(popped, at: 0)
@@ -66,9 +62,7 @@ class EnhancedNavigationViewController: UINavigationController {
         let popped = performAfterAnimating(block: {
             super.popToRootViewController(animated: animated)
         }, after: {
-            if #available(iOS 16.0, *) {
+            self.updateTopNavItemState()
-                self.updateTopNavItemState()
-            }
         }, animated: animated)
         if let popped {
             poppedViewControllers = popped
@@ -80,9 +74,7 @@ class EnhancedNavigationViewController: UINavigationController {
         let popped = performAfterAnimating(block: {
             super.popToViewController(viewController, animated: animated)
         }, after: {
-            if #available(iOS 16.0, *) {
+            self.updateTopNavItemState()
-                self.updateTopNavItemState()
-            }
         }, animated: animated)
         if let popped {
             poppedViewControllers.insert(contentsOf: popped, at: 0)
@@ -97,15 +89,11 @@ class EnhancedNavigationViewController: UINavigationController {
             self.poppedViewControllers = []
         }
         
-        if #available(iOS 16.0, *) {
+        configureNavItem(viewController.navigationItem)
-            configureNavItem(viewController.navigationItem)
-        }
         
         super.pushViewController(viewController, animated: animated)
         
-        if #available(iOS 16.0, *) {
+        updateTopNavItemState()
-            updateTopNavItemState()
-        }
     }
     
     func pushPoppedViewController() {
@@ -135,9 +123,7 @@ class EnhancedNavigationViewController: UINavigationController {
             pushViewController(target, animated: true)
         }, after: {
             self.viewControllers.insert(contentsOf: toInsert, at: self.viewControllers.count - 1)
-            if #available(iOS 16.0, *) {
+            self.updateTopNavItemState()
-                self.updateTopNavItemState()
-            }
         }, animated: true)
     }
     

Tusker/Screens/Utilities/Previewing.swift

@@ -204,8 +204,7 @@ extension MenuActionProvider {
             }),
         ]
         
-        if #available(iOS 16.0, *),
+        if includeStatusButtonActions {
-           includeStatusButtonActions {
             let favorited = status.favourited
             // TODO: move this color into an asset catalog or something
             var favImage = UIImage(systemName: favorited ? "star.fill" : "star")!
@@ -368,19 +367,11 @@ extension MenuActionProvider {
         
         addOpenInNewWindow(actions: &shareSection, activity: UserActivityManager.showConversationActivity(mainStatusID: status.id, accountID: accountID))
         
-        if #available(iOS 16.0, *) {
+        let toggleableAndActions = toggleableSection + actionsSection
-            let toggleableAndActions = toggleableSection + actionsSection
+        return [
-            return [
+            UIMenu(options: .displayInline, preferredElementSize: toggleableAndActions.count == 1 ? .large : .medium, children: toggleableAndActions),
-                UIMenu(options: .displayInline, preferredElementSize: toggleableAndActions.count == 1 ? .large : .medium, children: toggleableAndActions),
+            UIMenu(options: .displayInline, children: shareSection),
-                UIMenu(options: .displayInline, children: shareSection),
+        ]
-            ]
-        } else {
-            return [
-                UIMenu(options: .displayInline, children: shareSection),
-                UIMenu(options: .displayInline, children: toggleableSection),
-                UIMenu(options: .displayInline, children: actionsSection),
-            ]
-        }
     }
     
     func actionsForTrendingLink(card: Card, source: PopoverSource) -> [UIMenuElement] {

Tusker/Shortcuts/UserActivityHandlingContext.swift

@@ -108,8 +108,7 @@ class StateRestorationUserActivityHandlingContext: UserActivityHandlingContext {
     }
     
     func compose(editing draft: Draft) {
-        if #available(iOS 16.0, *),
+        if UIDevice.current.userInterfaceIdiom == .phone {
-           UIDevice.current.userInterfaceIdiom == .phone {
             self.root.compose(editing: draft, animated: false, isDucked: true, completion: nil)
         } else {
             DispatchQueue.main.async {
@@ -123,8 +122,7 @@ class StateRestorationUserActivityHandlingContext: UserActivityHandlingContext {
         precondition(state > .initial)
         navigation.run()
         #if !os(visionOS)
-        if #available(iOS 16.0, *),
+        if let duckedDraft = UserActivityManager.getDuckedDraft(from: activity) {
-           let duckedDraft = UserActivityManager.getDuckedDraft(from: activity) {
             self.root.compose(editing: duckedDraft, animated: false, isDucked: true, completion: nil)
         }
         #endif

Tusker/TuskerNavigationDelegate.swift

@@ -114,8 +114,7 @@ extension TuskerNavigationDelegate {
             #if os(visionOS)
             fatalError("unreachable")
             #else
-            if #available(iOS 16.0, *),
+            if presentDuckable(compose, animated: animated, isDucked: isDucked, completion: completion) {
-               presentDuckable(compose, animated: animated, isDucked: isDucked, completion: completion) {
                 return
             } else {
                 present(compose, animated: animated, completion: completion)

Tusker/Views/AccountDisplayAndUserNameLabel.swift

@@ -30,7 +30,9 @@ class AccountDisplayAndUserNameLabel: EmojiLabel {
     
     private func makeAttributedText(state: State) -> NSAttributedString {
         let s = NSMutableAttributedString()
-        s.append(NSAttributedString(string: state.displayName, attributes: [
+        // U+2068 FIRST-STRONG ISOLATE and U+2069 POP DIRECTIONAL ISOLATE
+        // to prevent bidi text in the display name influencing the username
+        s.append(NSAttributedString(string: "\u{2068}\(state.displayName)\u{2069}", attributes: [
             .font: UIFont(descriptor: baseFont.addingAttributes([
                 .traits: [
                     UIFontDescriptor.TraitKey.weight: UIFont.Weight.semibold.rawValue,

Tusker/Views/AccountDisplayNameView.swift

@@ -9,6 +9,7 @@
 import SwiftUI
 import Pachyderm
 import WebURLFoundationExtras
+import os
 
 private let emojiRegex = try! NSRegularExpression(pattern: ":(\\w+):", options: [])
 
@@ -40,7 +41,7 @@ struct AccountDisplayNameView: View {
         guard !matches.isEmpty else { return }
         
         let emojiSize = self.emojiSize
-        let emojiImages = MultiThreadDictionary<String, Image>()
+        let emojiImages = OSAllocatedUnfairLock(initialState: [String: Image]())
         
         let group = DispatchGroup()
         
@@ -63,7 +64,9 @@ struct AccountDisplayNameView: View {
                     image.draw(in: CGRect(origin: .zero, size: size))
                 }
                 
-                emojiImages[emoji.shortcode] = Image(uiImage: resized)
+                emojiImages.withLock {
+                    $0[emoji.shortcode] = Image(uiImage: resized)
+                }
             }
             if let request = request {
                 emojiRequests.append(request)
@@ -78,7 +81,7 @@ struct AccountDisplayNameView: View {
             // iterate backwards as to not alter the indices of earlier matches
             for match in matches.reversed() {
                 let shortcode = (account.displayName as NSString).substring(with: match.range(at: 1))
-                guard let image = emojiImages[shortcode] else { continue }
+                guard let image = emojiImages.withLock({ $0[shortcode] }) else { continue }
                 
                 let afterCurrentMatch = (account.displayName as NSString).substring(with: NSRange(location: match.range.upperBound, length: endIndex - match.range.upperBound))
                 

Tusker/Views/Attachments/AttachmentView.swift

@@ -263,17 +263,7 @@ class AttachmentView: GIFImageView {
             let asset = AVURLAsset(url: attachment.url)
             let generator = AVAssetImageGenerator(asset: asset)
             generator.appliesPreferredTrackTransform = true
-            let image: CGImage?
+            guard let image = try? await generator.image(at: .zero).image,
-            #if os(visionOS)
-            image = try? await generator.image(at: .zero).image
-            #else
-            if #available(iOS 16.0, *) {
-                image = try? await generator.image(at: .zero).image
-            } else {
-                image = try? generator.copyCGImage(at: .zero, actualTime: nil)
-            }
-            #endif
-            guard let image,
                   let prepared = await UIImage(cgImage: image).byPreparingForDisplay(),
                   !Task.isCancelled else {
                 return

Tusker/Views/BaseEmojiLabel.swift

@@ -9,6 +9,7 @@
 import UIKit
 import Pachyderm
 import WebURLFoundationExtras
+import os
 
 private let emojiRegex = try! NSRegularExpression(pattern: ":(\\w+):", options: [])
 
@@ -56,7 +57,7 @@ extension BaseEmojiLabel {
             return imageSizeMatchingFontSize
         }
         
-        let emojiImages = MultiThreadDictionary<String, UIImage>()
+        let emojiImages = OSAllocatedUnfairLock(initialState: [String: UIImage]())
         var foundEmojis = false
         
         let group = DispatchGroup()
@@ -79,9 +80,11 @@ extension BaseEmojiLabel {
                 // todo: consider caching these somewhere? the cache needs to take into account both the url and the font size, which may vary across labels, so can't just use ImageCache
                 if let thumbnail = image.preparingThumbnail(of: emojiImageSize(image)),
                    let cgImage = thumbnail.cgImage {
-                    // the thumbnail API takes a pixel size and returns an image with scale 1, but we want the actual screen scale, so convert
+                    emojiImages.withLock {
-                    // see FB12187798
+                        // the thumbnail API takes a pixel size and returns an image with scale 1, but we want the actual screen scale, so convert
-                    emojiImages[emoji.shortcode] = UIImage(cgImage: cgImage, scale: screenScale, orientation: .up)
+                        // see FB12187798
+                        $0[emoji.shortcode] = UIImage(cgImage: cgImage, scale: screenScale, orientation: .up)
+                    }
                 }
             } else {
                 // otherwise, perform the network request
@@ -99,7 +102,9 @@ extension BaseEmojiLabel {
                             group.leave()
                             return
                         }
-                        emojiImages[emoji.shortcode] = transformedImage
+                        emojiImages.withLock {
+                            $0[emoji.shortcode] = transformedImage
+                        }
                         group.leave()
                     }
                 }

Tusker/Views/ContentTextView.swift

@@ -146,8 +146,7 @@ class ContentTextView: LinkTextView, BaseEmojiLabel {
 
     func getLinkAtPoint(_ point: CGPoint) -> (URL, NSRange)? {
         let locationInTextContainer = CGPoint(x: point.x - textContainerInset.left, y: point.y - textContainerInset.top)
-        if #available(iOS 16.0, *),
+        if let textLayoutManager {
-           let textLayoutManager {
             guard let fragment = textLayoutManager.textLayoutFragment(for: locationInTextContainer) else {
                 return nil
             }
@@ -305,8 +304,7 @@ extension ContentTextView: UIContextMenuInteractionDelegate {
         
         // Determine the line rects that the link takes up in the coordinate space of this view.
         var rects = [CGRect]()
-        if #available(iOS 16.0, *),
+        if let textLayoutManager,
-           let textLayoutManager,
            let contentManager = textLayoutManager.textContentManager {
             // convert from NSRange to NSTextRange
             // i have no idea under what circumstances any of these calls could fail

Tusker/Views/CopyableLabel.swift

@@ -1,5 +1,5 @@
 //
-//  CopyableLable.swift
+//  CopyableLabel.swift
 //  Tusker
 //
 //  Created by Shadowfacts on 2/4/23.
@@ -8,7 +8,7 @@
 
 import UIKit
 
-class CopyableLable: UILabel {
+class CopyableLabel: UILabel {
     
     private var _editMenuInteraction: Any!
     @available(iOS 16.0, *)
@@ -28,12 +28,10 @@ class CopyableLable: UILabel {
     }
     
     private func commonInit() {
-        if #available(iOS 16.0, *) {
+        editMenuInteraction = UIEditMenuInteraction(delegate: nil)
-            editMenuInteraction = UIEditMenuInteraction(delegate: nil)
+        addInteraction(editMenuInteraction)
-            addInteraction(editMenuInteraction)
+        isUserInteractionEnabled = true
-            isUserInteractionEnabled = true
+        addGestureRecognizer(UILongPressGestureRecognizer(target: self, action: #selector(longPressed)))
-            addGestureRecognizer(UILongPressGestureRecognizer(target: self, action: #selector(longPressed)))
-        }
     }
     
     override func copy(_ sender: Any?) {

Tusker/Views/Profile Header/ProfileHeaderView.xib

@@ -1,9 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="32700.99.1234" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="23094" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
     <device id="retina6_1" orientation="portrait" appearance="light"/>
     <dependencies>
-        <deployment identifier="iOS"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="23084"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="22685"/>
         <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"/>
@@ -125,16 +124,16 @@
                     </constraints>
                 </stackView>
                 <stackView opaque="NO" contentMode="scaleToFill" alignment="center" spacing="4" translatesAutoresizingMaskIntoConstraints="NO" id="jwU-EH-hmC">
-                    <rect key="frame" x="144" y="235" width="103.5" height="23"/>
+                    <rect key="frame" x="144" y="235" width="101.5" height="23"/>
                     <subviews>
-                        <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" verticalCompressionResistancePriority="751" text="@username" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="1C3-Pd-QiL" customClass="CopyableLable" customModule="Tusker" customModuleProvider="target">
+                        <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" verticalCompressionResistancePriority="751" text="@username" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="1C3-Pd-QiL" customClass="CopyableLabel" customModule="Tusker" customModuleProvider="target">
                             <rect key="frame" x="0.0" y="2.5" width="81" height="18"/>
                             <fontDescription key="fontDescription" type="system" weight="light" pointSize="15"/>
                             <color key="textColor" systemColor="secondaryLabelColor"/>
                             <nil key="highlightedColor"/>
                         </label>
                         <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" horizontalCompressionResistancePriority="751" image="lock.fill" catalog="system" translatesAutoresizingMaskIntoConstraints="NO" id="KNY-GD-beC">
-                            <rect key="frame" x="85" y="1.5" width="18.5" height="19.5"/>
+                            <rect key="frame" x="85" y="1.5" width="16.5" height="19.5"/>
                             <color key="tintColor" systemColor="secondaryLabelColor"/>
                             <preferredSymbolConfiguration key="preferredSymbolConfiguration" weight="light"/>
                         </imageView>
@@ -187,14 +186,14 @@
         </view>
     </objects>
     <resources>
-        <image name="ellipsis" catalog="system" width="128" height="37"/>
+        <image name="ellipsis" catalog="system" width="32" height="32"/>
-        <image name="lock.fill" catalog="system" width="125" height="128"/>
+        <image name="lock.fill" catalog="system" width="32" height="32"/>
-        <image name="person.badge.plus" catalog="system" width="128" height="124"/>
+        <image name="person.badge.plus" catalog="system" width="32" height="32"/>
         <systemColor name="labelColor">
             <color white="0.0" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
         </systemColor>
         <systemColor name="secondaryLabelColor">
-            <color red="0.23529411759999999" green="0.23529411759999999" blue="0.26274509800000001" alpha="0.59999999999999998" colorSpace="custom" customColorSpace="sRGB"/>
+            <color red="0.23529411764705882" green="0.23529411764705882" blue="0.2627450980392157" alpha="0.59999999999999998" colorSpace="custom" customColorSpace="sRGB"/>
         </systemColor>
         <systemColor name="systemBackgroundColor">
             <color white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>

Tusker/Views/Status/ConversationMainStatusCollectionViewCell.swift

@@ -143,10 +143,7 @@ class ConversationMainStatusCollectionViewCell: UICollectionViewListCell, Status
         $0.isEditable = false
         $0.isSelectable = true
         $0.emojiFont = ConversationMainStatusCollectionViewCell.contentFont
-        $0.dataDetectorTypes = [.flightNumber, .address, .shipmentTrackingNumber, .phoneNumber]
+        $0.dataDetectorTypes = [.flightNumber, .address, .shipmentTrackingNumber, .phoneNumber, .money, .physicalValue]
-        if #available(iOS 16.0, *) {
-            $0.dataDetectorTypes.formUnion([.money, .physicalValue])
-        }
     }
     
     private var translateButton: TranslateButton?