Search: Remove ConditionalContextMenu

Was required for iOS 15 to properly update its state. This is no longer
a requirement.

Signed-off-by: kingbri <bdashore3@proton.me>

Ferrite.xcodeproj/project.pbxproj

@@ -41,7 +41,6 @@
 		0C422E80293542F300486D65 /* PremiumizeModels.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0C422E7F293542F300486D65 /* PremiumizeModels.swift */; };
 		0C42B5982932F6DD008057A0 /* Set.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0C42B5972932F6DD008057A0 /* Set.swift */; };
 		0C445C62293F9A0B0060744D /* Bundle.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0C445C61293F9A0B0060744D /* Bundle.swift */; };
-		0C448BE929A135F100F4E266 /* Introspect-Static in Frameworks */ = {isa = PBXBuildFile; productRef = 0C448BE829A135F100F4E266 /* Introspect-Static */; };
 		0C44E2A828D4DDDC007711AE /* Application.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0C44E2A728D4DDDC007711AE /* Application.swift */; };
 		0C44E2AD28D51C63007711AE /* BackupManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0C44E2AC28D51C63007711AE /* BackupManager.swift */; };
 		0C44E2AF28D52E8A007711AE /* BackupsView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0C44E2AE28D52E8A007711AE /* BackupsView.swift */; };
@@ -69,7 +68,6 @@
 		0C6C7C9D29315292002DF910 /* AllDebridModels.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0C6C7C9C29315292002DF910 /* AllDebridModels.swift */; };
 		0C7075E429D374C50093DB2D /* Color.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0C7075E329D374C50093DB2D /* Color.swift */; };
 		0C7075E629D3845D0093DB2D /* ShareSheet.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0C7075E529D3845D0093DB2D /* ShareSheet.swift */; };
-		0C70E40228C3CE9C00A5C72D /* ConditionalContextMenu.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0C70E40128C3CE9C00A5C72D /* ConditionalContextMenu.swift */; };
 		0C70E40628C40C4E00A5C72D /* NotificationCenter.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0C70E40528C40C4E00A5C72D /* NotificationCenter.swift */; };
 		0C733287289C4C820058D1FE /* SourceSettingsView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0C733286289C4C820058D1FE /* SourceSettingsView.swift */; };
 		0C748EDA29D9256D0049B8BE /* Yams in Frameworks */ = {isa = PBXBuildFile; productRef = 0C748ED929D9256D0049B8BE /* Yams */; };
@@ -82,6 +80,7 @@
 		0C794B6D289EFA2E00DD1CC8 /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 0C794B6C289EFA2E00DD1CC8 /* LaunchScreen.storyboard */; };
 		0C79DC072899AF3C003F1C5A /* SourceSeedLeech+CoreDataClass.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0C79DC052899AF3C003F1C5A /* SourceSeedLeech+CoreDataClass.swift */; };
 		0C79DC082899AF3C003F1C5A /* SourceSeedLeech+CoreDataProperties.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0C79DC062899AF3C003F1C5A /* SourceSeedLeech+CoreDataProperties.swift */; };
+		0C7B4A002CB051550048FA28 /* SwiftUIIntrospect in Frameworks */ = {isa = PBXBuildFile; productRef = 0C7B49FF2CB051550048FA28 /* SwiftUIIntrospect */; };
 		0C7C128628DAA3CD00381CD1 /* URL.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0C7C128528DAA3CD00381CD1 /* URL.swift */; };
 		0C7D11FE28AA03FE00ED92DB /* View.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0C7D11FD28AA03FE00ED92DB /* View.swift */; };
 		0C7ED14128D61BBA009E29AD /* BackupModels.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0C7ED14028D61BBA009E29AD /* BackupModels.swift */; };
@@ -112,7 +111,6 @@
 		0CA148D6288903F000DE2211 /* SettingsView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0CA148BB288903F000DE2211 /* SettingsView.swift */; };
 		0CA148D7288903F000DE2211 /* LoginWebView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0CA148BC288903F000DE2211 /* LoginWebView.swift */; };
 		0CA148D8288903F000DE2211 /* ActionChoiceView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0CA148BD288903F000DE2211 /* ActionChoiceView.swift */; };
-		0CA148DB288903F000DE2211 /* NavView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0CA148C1288903F000DE2211 /* NavView.swift */; };
 		0CA148DC288903F000DE2211 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 0CA148C2288903F000DE2211 /* Assets.xcassets */; };
 		0CA148DD288903F000DE2211 /* ScrapingViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0CA148C3288903F000DE2211 /* ScrapingViewModel.swift */; };
 		0CA148DF288903F000DE2211 /* Preview Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 0CA148C6288903F000DE2211 /* Preview Assets.xcassets */; };
@@ -136,9 +134,7 @@
 		0CAF1C7B286F5C8600296F86 /* SwiftSoup in Frameworks */ = {isa = PBXBuildFile; productRef = 0CAF1C7A286F5C8600296F86 /* SwiftSoup */; };
 		0CB0115B29D36D9E009AFEDE /* SearchResultsView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0CB0115A29D36D9E009AFEDE /* SearchResultsView.swift */; };
 		0CB0AB5F29BD2A200015422C /* KodiServerView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0CB0AB5E29BD2A200015422C /* KodiServerView.swift */; };
-		0CB6516328C5A57300DCA721 /* ConditionalId.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0CB6516228C5A57300DCA721 /* ConditionalId.swift */; };
 		0CB6516528C5A5D700DCA721 /* InlinedList.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0CB6516428C5A5D700DCA721 /* InlinedList.swift */; };
-		0CB6516A28C5B4A600DCA721 /* InlineHeader.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0CB6516928C5B4A600DCA721 /* InlineHeader.swift */; };
 		0CB725322C123E6F0047FC0B /* CloudDownloadView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0CB725312C123E6F0047FC0B /* CloudDownloadView.swift */; };
 		0CB725342C123E760047FC0B /* CloudMagnetView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0CB725332C123E760047FC0B /* CloudMagnetView.swift */; };
 		0CBAB83628D12ED500AC903E /* DisableInteraction.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0CBAB83528D12ED500AC903E /* DisableInteraction.swift */; };
@@ -227,7 +223,6 @@
 		0C6C7C9C29315292002DF910 /* AllDebridModels.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AllDebridModels.swift; sourceTree = "<group>"; };
 		0C7075E329D374C50093DB2D /* Color.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Color.swift; sourceTree = "<group>"; };
 		0C7075E529D3845D0093DB2D /* ShareSheet.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ShareSheet.swift; sourceTree = "<group>"; };
-		0C70E40128C3CE9C00A5C72D /* ConditionalContextMenu.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ConditionalContextMenu.swift; sourceTree = "<group>"; };
 		0C70E40528C40C4E00A5C72D /* NotificationCenter.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NotificationCenter.swift; sourceTree = "<group>"; };
 		0C733286289C4C820058D1FE /* SourceSettingsView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SourceSettingsView.swift; sourceTree = "<group>"; };
 		0C750742289B003E004B3906 /* SourceRssParser+CoreDataClass.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "SourceRssParser+CoreDataClass.swift"; sourceTree = "<group>"; };
@@ -268,7 +263,6 @@
 		0CA148BB288903F000DE2211 /* SettingsView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = SettingsView.swift; sourceTree = "<group>"; };
 		0CA148BC288903F000DE2211 /* LoginWebView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = LoginWebView.swift; sourceTree = "<group>"; };
 		0CA148BD288903F000DE2211 /* ActionChoiceView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ActionChoiceView.swift; sourceTree = "<group>"; };
-		0CA148C1288903F000DE2211 /* NavView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = NavView.swift; sourceTree = "<group>"; };
 		0CA148C2288903F000DE2211 /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = "<group>"; };
 		0CA148C3288903F000DE2211 /* ScrapingViewModel.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ScrapingViewModel.swift; sourceTree = "<group>"; };
 		0CA148C6288903F000DE2211 /* Preview Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = "Preview Assets.xcassets"; sourceTree = "<group>"; };
@@ -292,9 +286,7 @@
 		0CAF1C68286F5C0E00296F86 /* Ferrite.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = Ferrite.app; sourceTree = BUILT_PRODUCTS_DIR; };
 		0CB0115A29D36D9E009AFEDE /* SearchResultsView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SearchResultsView.swift; sourceTree = "<group>"; };
 		0CB0AB5E29BD2A200015422C /* KodiServerView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = KodiServerView.swift; sourceTree = "<group>"; };
-		0CB6516228C5A57300DCA721 /* ConditionalId.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ConditionalId.swift; sourceTree = "<group>"; };
 		0CB6516428C5A5D700DCA721 /* InlinedList.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = InlinedList.swift; sourceTree = "<group>"; };
-		0CB6516928C5B4A600DCA721 /* InlineHeader.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = InlineHeader.swift; sourceTree = "<group>"; };
 		0CB725312C123E6F0047FC0B /* CloudDownloadView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CloudDownloadView.swift; sourceTree = "<group>"; };
 		0CB725332C123E760047FC0B /* CloudMagnetView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CloudMagnetView.swift; sourceTree = "<group>"; };
 		0CBAB83528D12ED500AC903E /* DisableInteraction.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DisableInteraction.swift; sourceTree = "<group>"; };
@@ -329,13 +321,13 @@
 			buildActionMask = 2147483647;
 			files = (
 				0C7506D728B1AC9A008BEE38 /* SwiftyJSON in Frameworks */,
-				0C448BE929A135F100F4E266 /* Introspect-Static in Frameworks */,
 				0C64A4B4288903680079976D /* Base32 in Frameworks */,
 				0C4CFC462897030D00AD9FAD /* Regex in Frameworks */,
 				0C64A4B7288903880079976D /* KeychainSwift in Frameworks */,
 				0CAF1C7B286F5C8600296F86 /* SwiftSoup in Frameworks */,
 				0C748EDA29D9256D0049B8BE /* Yams in Frameworks */,
 				0CDDDE052935235E006810B1 /* BetterSafariView in Frameworks */,
+				0C7B4A002CB051550048FA28 /* SwiftUIIntrospect in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -485,8 +477,6 @@
 		0C44E2A928D4DFC4007711AE /* Modifiers */ = {
 			isa = PBXGroup;
 			children = (
-				0C70E40128C3CE9C00A5C72D /* ConditionalContextMenu.swift */,
-				0CB6516228C5A57300DCA721 /* ConditionalId.swift */,
 				0CD5E78828CD932B001BF684 /* DisabledAppearance.swift */,
 				0CBAB83528D12ED500AC903E /* DisableInteraction.swift */,
 				0CB6516428C5A5D700DCA721 /* InlinedList.swift */,
@@ -587,9 +577,7 @@
 			children = (
 				0C44E2A928D4DFC4007711AE /* Modifiers */,
 				0CDCB91728C662640098B513 /* EmptyInstructionView.swift */,
-				0CA148C1288903F000DE2211 /* NavView.swift */,
 				0CA3FB1F28B91D9500FA10A8 /* IndeterminateProgressView.swift */,
-				0CB6516928C5B4A600DCA721 /* InlineHeader.swift */,
 				0C32FB562890D1F2002BD219 /* ListRowViews.swift */,
 				0C2D9652299316CC00A504B6 /* Tag.swift */,
 				0C6771FB29B3E0DB005D38D2 /* HybridSecureField.swift */,
@@ -756,8 +744,8 @@
 				0C4CFC452897030D00AD9FAD /* Regex */,
 				0C7506D628B1AC9A008BEE38 /* SwiftyJSON */,
 				0CDDDE042935235E006810B1 /* BetterSafariView */,
-				0C448BE829A135F100F4E266 /* Introspect-Static */,
 				0C748ED929D9256D0049B8BE /* Yams */,
+				0C7B49FF2CB051550048FA28 /* SwiftUIIntrospect */,
 			);
 			productName = Torrenter;
 			productReference = 0CAF1C68286F5C0E00296F86 /* Ferrite.app */;
@@ -794,8 +782,8 @@
 				0C4CFC442897030D00AD9FAD /* XCRemoteSwiftPackageReference "Regex" */,
 				0C7506D528B1AC9A008BEE38 /* XCRemoteSwiftPackageReference "SwiftyJSON" */,
 				0CDDDE032935235E006810B1 /* XCRemoteSwiftPackageReference "BetterSafariView" */,
-				0C448BE729A135F100F4E266 /* XCRemoteSwiftPackageReference "SwiftUI-Introspect" */,
 				0C748ED829D9256D0049B8BE /* XCRemoteSwiftPackageReference "Yams" */,
+				0C7B49FE2CB051550048FA28 /* XCRemoteSwiftPackageReference "swiftui-introspect" */,
 			);
 			productRefGroup = 0CAF1C69286F5C0E00296F86 /* Products */;
 			projectDirPath = "";
@@ -855,13 +843,11 @@
 				0CB6516528C5A5D700DCA721 /* InlinedList.swift in Sources */,
 				0C8DC35429CE2AB5008A83AD /* SourceSettingsBaseUrlView.swift in Sources */,
 				0C32FB532890D19D002BD219 /* AboutView.swift in Sources */,
-				0CB6516328C5A57300DCA721 /* ConditionalId.swift in Sources */,
 				0C70E40628C40C4E00A5C72D /* NotificationCenter.swift in Sources */,
 				0C84F4832895BFED0074B7C9 /* Source+CoreDataProperties.swift in Sources */,
 				0C2D9653299316CC00A504B6 /* Tag.swift in Sources */,
 				0C84FCE129E4B41D00B0DFE4 /* SourceFilterView.swift in Sources */,
 				0CD5E78928CD932B001BF684 /* DisabledAppearance.swift in Sources */,
-				0CA148DB288903F000DE2211 /* NavView.swift in Sources */,
 				0CA3B23C28C2AA5600616D3A /* Bookmark+CoreDataClass.swift in Sources */,
 				0CD4030A29DA01B6008D9F03 /* PluginInfoMetaView.swift in Sources */,
 				0C750745289B003E004B3906 /* SourceRssParser+CoreDataProperties.swift in Sources */,
@@ -888,7 +874,6 @@
 				0C7D11FE28AA03FE00ED92DB /* View.swift in Sources */,
 				0CD0265729FEFBF900A83D25 /* FerriteKeychain.swift in Sources */,
 				0CA3B23728C2660700616D3A /* HistoryView.swift in Sources */,
-				0C70E40228C3CE9C00A5C72D /* ConditionalContextMenu.swift in Sources */,
 				0C50B7D0299DF63C00A9FA3C /* UIDevice.swift in Sources */,
 				0C0D50E7288DFF850035ECC8 /* PluginAggregateView.swift in Sources */,
 				0CA3B23428C2658700616D3A /* LibraryView.swift in Sources */,
@@ -915,7 +900,6 @@
 				0CA148DD288903F000DE2211 /* ScrapingViewModel.swift in Sources */,
 				0C445C62293F9A0B0060744D /* Bundle.swift in Sources */,
 				0C0755C6293424A200ECA142 /* DebridLabelView.swift in Sources */,
-				0CB6516A28C5B4A600DCA721 /* InlineHeader.swift in Sources */,
 				0CA148D8288903F000DE2211 /* ActionChoiceView.swift in Sources */,
 				0C41BC6528C2AEB900B47DD6 /* SearchModels.swift in Sources */,
 				0C68135028BC1A2D00FAD890 /* GithubWrapper.swift in Sources */,
@@ -1141,7 +1125,7 @@
 				INFOPLIST_KEY_UISupportedInterfaceOrientations_iPad = "UIInterfaceOrientationPortrait UIInterfaceOrientationPortraitUpsideDown UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight";
 				INFOPLIST_KEY_UISupportedInterfaceOrientations_iPhone = "UIInterfaceOrientationPortrait UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight";
 				INFOPLIST_KEY_UISupportsDocumentBrowser = YES;
-				IPHONEOS_DEPLOYMENT_TARGET = 15.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 16.0;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/Frameworks",
@@ -1177,7 +1161,7 @@
 				INFOPLIST_KEY_UISupportedInterfaceOrientations_iPad = "UIInterfaceOrientationPortrait UIInterfaceOrientationPortraitUpsideDown UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight";
 				INFOPLIST_KEY_UISupportedInterfaceOrientations_iPhone = "UIInterfaceOrientationPortrait UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight";
 				INFOPLIST_KEY_UISupportsDocumentBrowser = YES;
-				IPHONEOS_DEPLOYMENT_TARGET = 15.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 16.0;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/Frameworks",
@@ -1216,14 +1200,6 @@
 /* End XCConfigurationList section */
 
 /* Begin XCRemoteSwiftPackageReference section */
-		0C448BE729A135F100F4E266 /* XCRemoteSwiftPackageReference "SwiftUI-Introspect" */ = {
-			isa = XCRemoteSwiftPackageReference;
-			repositoryURL = "https://github.com/siteline/SwiftUI-Introspect/";
-			requirement = {
-				kind = upToNextMajorVersion;
-				minimumVersion = 0.2.3;
-			};
-		};
 		0C4CFC442897030D00AD9FAD /* XCRemoteSwiftPackageReference "Regex" */ = {
 			isa = XCRemoteSwiftPackageReference;
 			repositoryURL = "https://github.com/sindresorhus/Regex";
@@ -1264,6 +1240,14 @@
 				kind = branch;
 			};
 		};
+		0C7B49FE2CB051550048FA28 /* XCRemoteSwiftPackageReference "swiftui-introspect" */ = {
+			isa = XCRemoteSwiftPackageReference;
+			repositoryURL = "https://github.com/siteline/swiftui-introspect";
+			requirement = {
+				kind = upToNextMajorVersion;
+				minimumVersion = 1.3.0;
+			};
+		};
 		0CAF1C79286F5C8600296F86 /* XCRemoteSwiftPackageReference "SwiftSoup" */ = {
 			isa = XCRemoteSwiftPackageReference;
 			repositoryURL = "https://github.com/scinfu/SwiftSoup.git";
@@ -1283,11 +1267,6 @@
 /* End XCRemoteSwiftPackageReference section */
 
 /* Begin XCSwiftPackageProductDependency section */
-		0C448BE829A135F100F4E266 /* Introspect-Static */ = {
-			isa = XCSwiftPackageProductDependency;
-			package = 0C448BE729A135F100F4E266 /* XCRemoteSwiftPackageReference "SwiftUI-Introspect" */;
-			productName = "Introspect-Static";
-		};
 		0C4CFC452897030D00AD9FAD /* Regex */ = {
 			isa = XCSwiftPackageProductDependency;
 			package = 0C4CFC442897030D00AD9FAD /* XCRemoteSwiftPackageReference "Regex" */;
@@ -1313,6 +1292,11 @@
 			package = 0C7506D528B1AC9A008BEE38 /* XCRemoteSwiftPackageReference "SwiftyJSON" */;
 			productName = SwiftyJSON;
 		};
+		0C7B49FF2CB051550048FA28 /* SwiftUIIntrospect */ = {
+			isa = XCSwiftPackageProductDependency;
+			package = 0C7B49FE2CB051550048FA28 /* XCRemoteSwiftPackageReference "swiftui-introspect" */;
+			productName = SwiftUIIntrospect;
+		};
 		0CAF1C7A286F5C8600296F86 /* SwiftSoup */ = {
 			isa = XCSwiftPackageProductDependency;
 			package = 0CAF1C79286F5C8600296F86 /* XCRemoteSwiftPackageReference "SwiftSoup" */;

Ferrite/Extensions/UIDevice.swift

@@ -9,10 +9,6 @@ import UIKit
 
 extension UIDevice {
     var hasNotch: Bool {
-        if #available(iOS 11.0, *) {
-            return UIApplication.shared.currentUIWindow?.safeAreaInsets.bottom ?? 0 > 0
-        } else {
-            return false
-        }
+        UIApplication.shared.currentUIWindow?.safeAreaInsets.bottom ?? 0 > 0
     }
 }

Ferrite/Extensions/View.swift

@@ -5,7 +5,6 @@
 //  Created by Brian Dashore on 8/15/22.
 //
 
-import Introspect
 import SwiftUI
 
 extension View {
@@ -20,16 +19,6 @@ extension View {
 
     // MARK: Modifiers
 
-    func conditionalContextMenu(id: some Hashable,
-                                @ViewBuilder _ internalContent: @escaping () -> some View) -> some View
-    {
-        modifier(ConditionalContextMenuModifier(internalContent, id: id))
-    }
-
-    func conditionalId(_ id: some Hashable) -> some View {
-        modifier(ConditionalIdModifier(id: id))
-    }
-
     func disabledAppearance(_ disabled: Bool, dimmedOpacity: Double? = nil, animation: Animation? = nil) -> some View {
         modifier(DisabledAppearanceModifier(disabled: disabled, dimmedOpacity: dimmedOpacity, animation: animation))
     }

Ferrite/Views/CommonViews/InlineHeader.swift

@@ -1,27 +0,0 @@
-//
-//  InlineHeader.swift
-//  Ferrite
-//
-//  Created by Brian Dashore on 9/5/22.
-//
-//  For iOS 15's weird defaults regarding sectioned list padding
-//
-
-import SwiftUI
-
-struct InlineHeader: View {
-    let title: String
-
-    init(_ title: String) {
-        self.title = title
-    }
-
-    var body: some View {
-        if #available(iOS 16, *) {
-            Text(title)
-        } else {
-            Text(title)
-                .listRowInsets(EdgeInsets(top: 10, leading: 15, bottom: 0, trailing: 0))
-        }
-    }
-}

Ferrite/Views/CommonViews/Modifiers/ConditionalContextMenu.swift

@@ -1,39 +0,0 @@
-//
-//  ConditionalContextMenu.swift
-//  Ferrite
-//
-//  Created by Brian Dashore on 9/3/22.
-//
-//  Used as a workaround for iOS 15 not updating context views with conditional variables
-//  A stateful ID is required for the contextMenu to update itself.
-//
-
-import SwiftUI
-
-struct ConditionalContextMenuModifier<InternalContent: View, ID: Hashable>: ViewModifier {
-    let internalContent: () -> InternalContent
-    let id: ID
-
-    init(@ViewBuilder _ internalContent: @escaping () -> InternalContent, id: ID) {
-        self.internalContent = internalContent
-        self.id = id
-    }
-
-    func body(content: Content) -> some View {
-        if #available(iOS 16, *) {
-            content
-                .contextMenu {
-                    internalContent()
-                }
-        } else {
-            content
-                .background {
-                    Color.clear
-                        .contextMenu {
-                            internalContent()
-                        }
-                        .id(id)
-                }
-        }
-    }
-}

Ferrite/Views/CommonViews/Modifiers/ConditionalId.swift

@@ -1,24 +0,0 @@
-//
-//  ConditionalId.swift
-//  Ferrite
-//
-//  Created by Brian Dashore on 9/4/22.
-//
-//  Applies an ID below iOS 16
-//  This is due to ID workarounds making iOS 16 apps crash
-//
-
-import SwiftUI
-
-struct ConditionalIdModifier<ID: Hashable>: ViewModifier {
-    let id: ID
-
-    func body(content: Content) -> some View {
-        if #available(iOS 16, *) {
-            content
-        } else {
-            content
-                .id(id)
-        }
-    }
-}

Ferrite/Views/CommonViews/Modifiers/InlinedList.swift

@@ -5,26 +5,18 @@
 //  Created by Brian Dashore on 9/4/22.
 //
 //  Removes the top padding on unsectioned lists
-//  If a list is sectioned, see InlineHeader
 //
 
-import Introspect
 import SwiftUI
+import SwiftUIIntrospect
 
 struct InlinedListModifier: ViewModifier {
     let inset: CGFloat
 
     func body(content: Content) -> some View {
-        if #available(iOS 16, *) {
-            content
-                .introspectCollectionView { collectionView in
-                    collectionView.contentInset.top = inset
-                }
-        } else {
-            content
-                .introspectTableView { tableView in
-                    tableView.contentInset.top = inset
-                }
-        }
+        content
+            .introspect(.list, on: .iOS(.v16, .v17, .v18)) { collectionView in
+                collectionView.contentInset.top = inset
+            }
     }
 }

Ferrite/Views/CommonViews/NavView.swift

@@ -1,29 +0,0 @@
-//
-//  NavView.swift
-//  Ferrite
-//
-//  Created by Brian Dashore on 7/4/22.
-//  Contributed by Mantton
-//
-//  A wrapper that switches between NavigationStack and the legacy NavigationView
-//
-
-import SwiftUI
-
-struct NavView<Content: View>: View {
-    @ViewBuilder var content: Content
-
-    var body: some View {
-        // NavigationStack issues are fixed on iOS 17
-        if #available(iOS 17, *) {
-            NavigationStack {
-                content
-            }
-        } else {
-            NavigationView {
-                content
-            }
-            .navigationViewStyle(.stack)
-        }
-    }
-}

Ferrite/Views/ComponentViews/Library/HistoryView.swift

@@ -76,7 +76,7 @@ struct HistorySectionView: View {
 
     var body: some View {
         if compareGroup(historyGroup) > 0 {
-            Section(header: InlineHeader(formatter.string(from: historyGroup[0].date ?? Date()))) {
+            Section(formatter.string(from: historyGroup[0].date ?? Date())) {
                 ForEach(historyGroup, id: \.self) { history in
                     ForEach(history.entryArray.filter { allEntries.contains($0) }, id: \.self) { entry in
                         HistoryButtonView(entry: entry)

Ferrite/Views/ComponentViews/Plugin/Info/PluginInfoAboutView.swift

@@ -11,7 +11,7 @@ struct PluginInfoAboutView<P: Plugin>: View {
     @ObservedObject var selectedPlugin: P
 
     var body: some View {
-        Section(header: InlineHeader("Description")) {
+        Section("Description") {
             VStack(alignment: .leading, spacing: 10) {
                 if let pluginAbout = selectedPlugin.about {
                     if pluginAbout.last == "\n" {

Ferrite/Views/ComponentViews/Plugin/Info/PluginInfoMetaView.swift

@@ -16,7 +16,7 @@ struct PluginInfoMetaView<P: Plugin>: View {
     ) var pluginLists: FetchedResults<PluginList>
 
     var body: some View {
-        Section(header: InlineHeader("Metadata")) {
+        Section("Metadata") {
             VStack(alignment: .leading) {
                 VStack(alignment: .leading, spacing: 5) {
                     HStack(spacing: 5) {

Ferrite/Views/ComponentViews/Plugin/PluginAggregateView.swift

@@ -39,7 +39,7 @@ struct PluginAggregateView<P: Plugin, PJ: PluginJson>: View {
                 searchText: searchText
             )
             if !filteredUpdatedPlugins.isEmpty {
-                Section(header: InlineHeader("Updates")) {
+                Section("Updates") {
                     ForEach(filteredUpdatedPlugins, id: \.self) { (updatedPlugin: PJ) in
                         PluginCatalogButtonView(availablePlugin: updatedPlugin, needsUpdate: true)
                     }
@@ -47,7 +47,7 @@ struct PluginAggregateView<P: Plugin, PJ: PluginJson>: View {
             }
 
             if !installedPlugins.isEmpty {
-                Section(header: InlineHeader("Installed")) {
+                Section("Installed") {
                     ForEach(installedPlugins, id: \.self) { installedPlugin in
                         InstalledPluginButtonView(
                             installedPlugin: installedPlugin,
@@ -64,7 +64,7 @@ struct PluginAggregateView<P: Plugin, PJ: PluginJson>: View {
                 searchText: searchText
             )
             if !filteredAvailablePlugins.isEmpty {
-                Section(header: InlineHeader("Catalog")) {
+                Section("Catalog") {
                     ForEach(filteredAvailablePlugins, id: \.self) { availablePlugin in
                         PluginCatalogButtonView(availablePlugin: availablePlugin, needsUpdate: false)
                     }

Ferrite/Views/ComponentViews/Plugin/PluginInfoView.swift

@@ -13,7 +13,7 @@ struct PluginInfoView<P: Plugin>: View {
     @Binding var selectedPlugin: P?
 
     var body: some View {
-        NavView {
+        NavigationStack {
             List {
                 if let selectedPlugin {
                     PluginInfoMetaView(selectedPlugin: selectedPlugin)

Ferrite/Views/ComponentViews/Plugin/Source/SourceSettingsApiView.swift

@@ -19,7 +19,7 @@ struct SourceSettingsApiView: View {
 
     var body: some View {
         Section(
-            header: InlineHeader("API credentials"),
+            header: Text("API credentials"),
             footer: Text("Grab the required API credentials from the website. A client secret can be an API token.")
         ) {
             if let clientId = selectedSourceApi.clientId, clientId.dynamic {

Ferrite/Views/ComponentViews/Plugin/Source/SourceSettingsBaseUrlView.swift

@@ -13,7 +13,7 @@ struct SourceSettingsBaseUrlView: View {
     @State private var tempSite: String = ""
     var body: some View {
         Section(
-            header: InlineHeader("Base URL"),
+            header: Text("Base URL"),
             footer: Text("Enter the base URL of your server.")
         ) {
             TextField("https://...", text: $tempSite, onEditingChanged: { isFocused in

Ferrite/Views/ComponentViews/Plugin/Source/SourceSettingsMethodView.swift

@@ -11,7 +11,7 @@ struct SourceSettingsMethodView: View {
     @ObservedObject var selectedSource: Source
 
     var body: some View {
-        Section(header: InlineHeader("Fetch method")) {
+        Section("Fetch method") {
             Picker("", selection: $selectedSource.preferredParser) {
                 if selectedSource.jsonParser != nil {
                     Text("Website API").tag(SourcePreferredParser.siteApi.rawValue)

Ferrite/Views/ComponentViews/SearchResult/SearchResultButtonView.swift

@@ -68,7 +68,7 @@ struct SearchResultButtonView: View {
         }
         .disableInteraction(navModel.currentChoiceSheet != nil)
         .tint(.primary)
-        .conditionalContextMenu(id: existingBookmark) {
+        .contextMenu {
             ZStack {
                 if let bookmark = existingBookmark {
                     Button {

Ferrite/Views/ComponentViews/Settings/Kodi/KodiEditorView.swift

@@ -25,11 +25,11 @@ struct KodiEditorView: View {
     @State private var errorAlertText: String = ""
 
     var body: some View {
-        NavView {
+        NavigationStack {
             Form {
                 Group {
                     Section(
-                        header: InlineHeader("URL"),
+                        header: Text("URL"),
                         footer: Text("Must follow the format http(s)://<ip>:<port>")
                     ) {
                         TextField("Enter URL", text: $serverUrl)
@@ -37,14 +37,14 @@ struct KodiEditorView: View {
                     }
 
                     Section(
-                        header: InlineHeader("Friendly name"),
+                        header: Text("Friendly name"),
                         footer: Text("Defaults to the URL if not provided")
                     ) {
                         TextField("Friendly name", text: $friendlyName)
                     }
 
                     Section(
-                        header: InlineHeader("Credentials"),
+                        header: Text("Credentials"),
                         footer: Text("Only use for clients with authentication")
                     ) {
                         TextField("Username", text: $username)

Ferrite/Views/ComponentViews/Settings/Kodi/SettingsKodiView.swift

@@ -18,7 +18,7 @@ struct SettingsKodiView: View {
 
     var body: some View {
         List {
-            Section(header: InlineHeader("Description")) {
+            Section("Description") {
                 VStack(alignment: .leading, spacing: 10) {
                     Text("Kodi is an external application that is used to manage a local media library and playback.")
 
@@ -27,7 +27,7 @@ struct SettingsKodiView: View {
             }
 
             Section(
-                header: InlineHeader("Servers"),
+                header: Text("Servers"),
                 footer: Text("Edit a server by holding it and accessing the context menu")
             ) {
                 if kodiServers.isEmpty {

Ferrite/Views/ComponentViews/Settings/PluginList/PluginListEditorView.swift

@@ -25,7 +25,7 @@ struct PluginListEditorView: View {
     @State private var loadedSelectedList = false
 
     var body: some View {
-        NavView {
+        NavigationStack {
             Form {
                 TextField("Enter URL", text: $pluginListUrl)
                     .disableAutocorrection(true)

Ferrite/Views/ComponentViews/Settings/PluginList/SettingsPluginListView.swift

@@ -69,12 +69,8 @@ struct SettingsPluginListView: View {
             }
         }
         .sheet(isPresented: $presentEditSheet) {
-            if #available(iOS 16, *) {
-                PluginListEditorView()
-                    .presentationDetents([.medium])
-            } else {
-                PluginListEditorView()
-            }
+            PluginListEditorView()
+                .presentationDetents([.medium])
         }
         .navigationTitle("Plugin Lists")
         .navigationBarTitleDisplayMode(.inline)

Ferrite/Views/ComponentViews/Settings/SettingsAppVersionView.swift

@@ -20,7 +20,7 @@ struct SettingsAppVersionView: View {
                 ProgressView()
             } else if !releases.isEmpty {
                 List {
-                    Section(header: InlineHeader("GitHub links")) {
+                    Section("GitHub links") {
                         ForEach(releases, id: \.self) { release in
                             ListRowLinkView(text: release.tagName, link: release.htmlUrl)
                         }

Ferrite/Views/ComponentViews/Settings/SettingsDebridInfoView.swift

@@ -16,7 +16,7 @@ struct SettingsDebridInfoView: View {
 
     var body: some View {
         List {
-            Section(header: InlineHeader("Description")) {
+            Section("Description") {
                 VStack(alignment: .leading, spacing: 10) {
                     Text(debridSource.description ??
                         "\(debridSource.id) is a debrid service that is used for downloads and media playback. You must pay to access the service."
@@ -27,7 +27,7 @@ struct SettingsDebridInfoView: View {
             }
 
             Section(
-                header: InlineHeader("Login status"),
+                header: Text("Login status"),
                 footer: Text("A WebView will show up to prompt you for credentials")
             ) {
                 Button {
@@ -58,7 +58,7 @@ struct SettingsDebridInfoView: View {
             }
 
             Section(
-                header: InlineHeader("API key"),
+                header: Text("API key"),
                 footer: Text("Add a permanent API key here. Only use this if web authentication does not work!")
             ) {
                 HybridSecureField(

Ferrite/Views/ContentView.swift

@@ -27,7 +27,7 @@ struct ContentView: View {
     @State private var dismissAction: () -> Void = {}
 
     var body: some View {
-        NavView {
+        NavigationStack {
             List {
                 SearchResultsView(searchText: $searchText)
             }

Ferrite/Views/LibraryView.swift

@@ -30,7 +30,7 @@ struct LibraryView: View {
     @State private var searchText: String = ""
 
     var body: some View {
-        NavView {
+        NavigationStack {
             ZStack {
                 switch navModel.libraryPickerSelection {
                 case .bookmarks:

Ferrite/Views/LoginWebView.swift

@@ -12,7 +12,7 @@ struct LoginWebView: View {
     var url: URL
 
     var body: some View {
-        NavView {
+        NavigationStack {
             WebView(url: url)
                 .navigationTitle("Sign in")
                 .navigationBarTitleDisplayMode(.inline)

Ferrite/Views/MainView.swift

@@ -54,12 +54,8 @@ struct MainView: View {
             case .batch:
                 BatchChoiceView()
             case .activity:
-                if #available(iOS 16, *) {
-                    ShareSheet(activityItems: navModel.activityItems)
-                        .presentationDetents([.medium, .large])
-                } else {
-                    ShareSheet(activityItems: navModel.activityItems)
-                }
+                ShareSheet(activityItems: navModel.activityItems)
+                    .presentationDetents([.medium, .large])
             }
         }
         .onAppear {

Ferrite/Views/PluginsView.swift

@@ -30,7 +30,7 @@ struct PluginsView: View {
     @State private var searchText: String = ""
 
     var body: some View {
-        NavView {
+        NavigationStack {
             ZStack {
                 if checkedForPlugins {
                     switch navModel.pluginPickerSelection {

Ferrite/Views/RepresentableViews/ExpandedSearchable.swift

@@ -212,10 +212,7 @@ struct SearchBar<ScopeContent: View>: UIViewControllerRepresentable {
         private func setup() {
             parent?.navigationItem.searchController = searchController
             parent?.navigationItem.hidesSearchBarWhenScrolling = false
-
-            if #available(iOS 16, *) {
-                parent?.navigationItem.preferredSearchBarPlacement = .stacked
-            }
+            parent?.navigationItem.preferredSearchBarPlacement = .stacked
 
             // Makes search bar appear when application starts
             parent?.navigationController?.navigationBar.sizeToFit()

Ferrite/Views/SettingsView.swift

@@ -6,7 +6,6 @@
 //
 
 import BetterSafariView
-import Introspect
 import SwiftUI
 import WebKit
 
@@ -43,15 +42,15 @@ struct SettingsView: View {
     @FocusState private var focusedField: Field?
 
     var body: some View {
-        NavView {
+        NavigationStack {
             Form {
-                Section(header: InlineHeader("Debrid services")) {
+                Section("Debrid services") {
                     ForEach(debridManager.debridSources, id: \.id) { (debridSource: DebridSource) in
                         SettingsDebridLinkView(debridSource: debridSource)
                     }
                 }
 
-                Section(header: InlineHeader("Playback services")) {
+                Section("Playback services") {
                     NavigationLink {
                         SettingsKodiView(kodiServers: kodiServers)
                     } label: {
@@ -65,7 +64,7 @@ struct SettingsView: View {
                 }
 
                 Section(
-                    header: InlineHeader("Behavior"),
+                    header: Text("Behavior"),
                     footer: VStack(alignment: .leading, spacing: 8) {
                         Text("Temporarily disable ephemeral auth if you cannot log into a service")
                         Text("Only disable search timeout if results are slow to fetch")
@@ -112,13 +111,13 @@ struct SettingsView: View {
                     }
                 }
 
-                Section(header: InlineHeader("Plugin management")) {
+                Section("Plugin management") {
                     NavigationLink("Plugin lists") {
                         SettingsPluginListView()
                     }
                 }
 
-                Section(header: InlineHeader("Default actions")) {
+                Section("Default actions") {
                     if !debridManager.enabledDebrids.isEmpty {
                         NavigationLink {
                             DefaultActionPickerView(
@@ -176,13 +175,13 @@ struct SettingsView: View {
                     }
                 }
 
-                Section(header: InlineHeader("Backups")) {
+                Section("Backups") {
                     NavigationLink("Backups") {
                         BackupsView()
                     }
                 }
 
-                Section(header: InlineHeader("Updates")) {
+                Section("Updates") {
                     Toggle(isOn: $autoUpdateNotifs) {
                         Text("Show update alerts")
                     }
@@ -192,7 +191,7 @@ struct SettingsView: View {
                     }
                 }
 
-                Section(header: InlineHeader("Information")) {
+                Section("Information") {
                     ListRowLinkView(text: "Donate", link: "https://ko-fi.com/kingbri")
                     ListRowLinkView(text: "Report issues", link: "https://github.com/bdashore3/Ferrite/issues")
 
@@ -201,7 +200,7 @@ struct SettingsView: View {
                     }
                 }
 
-                Section(header: InlineHeader("Debug")) {
+                Section("Debug") {
                     NavigationLink("Logs") {
                         SettingsLogView()
                     }

Ferrite/Views/SheetViews/ActionChoiceView.swift

@@ -29,9 +29,9 @@ struct ActionChoiceView: View {
     @State private var showMagnetCopyAlert = false
 
     var body: some View {
-        NavView {
+        NavigationStack {
             Form {
-                Section(header: InlineHeader("Now Playing")) {
+                Section("Now Playing") {
                     VStack(alignment: .leading, spacing: 5) {
                         Text(navModel.selectedTitle)
                             .font(.callout)
@@ -46,7 +46,7 @@ struct ActionChoiceView: View {
                 }
 
                 if !debridManager.downloadUrl.isEmpty {
-                    Section(header: InlineHeader("Debrid options")) {
+                    Section("Debrid options") {
                         ForEach(actions, id: \.id) { action in
                             if action.requires.contains(ActionRequirement.debrid.rawValue) {
                                 ListRowButtonView(action.name, systemImage: "arrow.up.forward.app.fill") {
@@ -91,7 +91,7 @@ struct ActionChoiceView: View {
                 }
 
                 if !navModel.resultFromCloud {
-                    Section(header: InlineHeader("Magnet options")) {
+                    Section("Magnet options") {
                         ForEach(actions, id: \.id) { action in
                             if action.requires.contains(ActionRequirement.magnet.rawValue) {
                                 ListRowButtonView(action.name, systemImage: "arrow.up.forward.app.fill") {
@@ -123,13 +123,8 @@ struct ActionChoiceView: View {
             }
             .tint(.primary)
             .sheet(isPresented: $navModel.showLocalActivitySheet) {
-                // TODO: Fix share sheet
-                if #available(iOS 16, *) {
-                    ShareSheet(activityItems: navModel.activityItems)
-                        .presentationDetents([.medium, .large])
-                } else {
-                    ShareSheet(activityItems: navModel.activityItems)
-                }
+                ShareSheet(activityItems: navModel.activityItems)
+                    .presentationDetents([.medium, .large])
             }
             .alert("Action successful", isPresented: $pluginManager.showActionSuccessAlert) {
                 Button("OK", role: .cancel) {}

Ferrite/Views/SheetViews/BatchChoiceView.swift

@@ -19,9 +19,8 @@ struct BatchChoiceView: View {
 
     @State private var searchText: String = ""
 
-    // TODO: Make this generic for an IA protocol
     var body: some View {
-        NavView {
+        NavigationStack {
             List {
                 ForEach(debridManager.selectedDebridItem?.files ?? [], id: \.self) { file in
                     if file.name.lowercased().contains(searchText.lowercased()) || searchText.isEmpty {