Bump build number to 164

Fix #268

CHANGELOG.md

@@ -1,16 +1,20 @@
-## Build 160
+## Build 164
-* Added button in Location settings to add current used public location to "Custom Locations"
+* Search text field focuses automatically (macOS)
-* Updated mpv and dependencies (using mpvkit library, mpv 0.36.0, ffmpeg 6.0)
+* Fixed crash when trying to create Quality Profile
-* Fixed handling playlist links
-* Fixed reported crashes
 * Other minor fixes and improvements
 
 ## Previous builds
+* Added support for "Podcasts" and "Releases" channel tabs (Invidious)
+* Added button in Location settings to add current used public location to "Custom Locations"
+* Updated mpv and dependencies (using mpvkit library, mpv 0.36.0, ffmpeg 6.0)
 * Increased controls timeline/scrubber gesture area for easier handling
+* Fixed handling playlist links
 * Fixed issue where Piped videos would use audio for other language version
 * Fixed issue with handling opening URLs on macOS
 * Fixed issue with "Keep channels with unwatched videos on top of subscriptions list" setting not honored in sidebar
 * Fixed performance issues with accounts with large amount of subscribed channels
+* Fixed regression with opening videos links
+* Fixed issue with deselecting formats in Quality profiles
 * Fixed compatibility with iOS 17, macOS 14 and tvOS 17
 * Dropped support for iOS 14 and macOS 11
 * Fixed reported crashes

Model/Applications/InvidiousAPI.swift

@@ -123,7 +123,7 @@ final class InvidiousAPI: Service, ObservableObject, VideosAPI {
             content.json.dictionaryValue["videos"]?.arrayValue.map(self.extractVideo) ?? []
         }
 
-        ["latest", "playlists", "streams", "shorts", "channels", "videos"].forEach { type in
+        ["latest", "playlists", "streams", "shorts", "channels", "videos", "releases", "podcasts"].forEach { type in
             configureTransformer(pathPattern("channels/*/\(type)"), requestMethods: [.get]) { (content: Entity<JSON>) -> ChannelPage in
                 self.extractChannelPage(from: content.json)
             }

Model/Channel.swift

@@ -10,6 +10,8 @@ struct Channel: Identifiable, Hashable {
         case livestreams
         case shorts
         case channels
+        case releases
+        case podcasts
 
         static func from(_ name: String) -> Self? {
             let rawValueMatch = allCases.first { $0.rawValue == name }
@@ -45,6 +47,10 @@ struct Channel: Identifiable, Hashable {
                 return "1.square"
             case .channels:
                 return "person.3"
+            case .releases:
+                return "square.stack"
+            case .podcasts:
+                return "radio"
             }
         }
 

Model/NavigationModel.swift

@@ -66,7 +66,7 @@ final class NavigationModel: ObservableObject {
     @Published var tabSelection: TabSelection! { didSet {
         if oldValue == tabSelection { multipleTapHandler() }
         if tabSelection == nil, let item = recents.presentedItem {
-            DispatchQueue.main.async { [weak self] in
+            Delay.by(0.2) { [weak self] in
                 self?.tabSelection = .recentlyOpened(item.tag)
             }
         }

Model/Search/SearchModel.swift

@@ -18,6 +18,12 @@ final class SearchModel: ObservableObject {
 
     @Published var focused = false
 
+    #if os(iOS)
+        var textField: UITextField!
+    #elseif os(macOS)
+        var textField: NSTextField!
+    #endif
+
     var accounts: AccountsModel { .shared }
     private var resource: Resource!
 

Shared/Navigation/AppSidebarNavigation.swift

@@ -1,7 +1,7 @@
 import Defaults
 import SwiftUI
 #if os(iOS)
-    import Introspect
+    import SwiftUIIntrospect
 #endif
 
 struct AppSidebarNavigation: View {
@@ -15,7 +15,7 @@ struct AppSidebarNavigation: View {
 
     var body: some View {
         #if os(iOS)
-            content.introspectViewController { viewController in
+            content.introspect(.viewController, on: .iOS(.v15, .v16, .v17)) { viewController in
                 // workaround for an empty supplementary view on launch
                 // the supplementary view is determined by the default selection inside the
                 // primary view, but the primary view is not loaded so its selection is not read

Shared/Navigation/ContentView.swift

@@ -167,6 +167,9 @@ struct ContentView: View {
         #if os(iOS)
             .statusBarHidden(player.playingFullScreen)
         #endif
+        #if os(macOS)
+            .frame(minWidth: 1200)
+        #endif
     }
 
     @ViewBuilder var videoPlayer: some View {

Shared/Navigation/Sidebar.swift

@@ -35,7 +35,9 @@ struct Sidebar: View {
                 }
             }
             .onChange(of: navigation.sidebarSectionChanged) { _ in
-                scrollScrollViewToItem(scrollView: scrollView, for: navigation.tabSelection)
+                if let tabSelection = navigation.tabSelection {
+                    scrollScrollViewToItem(scrollView: scrollView, for: navigation.tabSelection)
+                }
             }
             .listStyle(.sidebar)
         }

Shared/Search/FocusableSearchTextField.swift

@@ -1,24 +1,27 @@
-import Introspect
 import Repeat
 import SwiftUI
+import SwiftUIIntrospect
 
 struct FocusableSearchTextField: View {
     @ObservedObject private var state = SearchModel.shared
 
-    #if os(iOS)
-        @State private var textField: UITextField?
-    #elseif os(macOS)
-        @State private var textField: NSTextField?
-    #endif
-
     var body: some View {
         SearchTextField()
-        #if os(iOS)
+        #if os(macOS)
-            .introspectTextField { field in
+            .introspect(.textField, on: .macOS(.v12, .v13, .v14)) { textField in
-                textField = field
+                state.textField = textField
+            }
+            .onAppear {
+                DispatchQueue.main.async {
+                    state.textField?.becomeFirstResponder()
+                }
+            }
+        #elseif os(iOS)
+            .introspect(.textField, on: .iOS(.v15, .v16, .v17)) { textField in
+                state.textField = textField
             }
             .onChange(of: state.focused) { newValue in
-                if newValue, let textField, !textField.isFirstResponder {
+                if newValue, let textField = state.textField, !textField.isFirstResponder {
                     textField.becomeFirstResponder()
                     textField.selectedTextRange = textField.textRange(from: textField.beginningOfDocument, to: textField.endOfDocument)
                 }

Shared/Search/SearchSuggestions.swift

@@ -11,7 +11,7 @@ struct SearchSuggestions: View {
                 } label: {
                     HStack {
                         Image(systemName: "magnifyingglass")
-                        Text(state.queryText)
+                        Text(state.queryText.trimmingCharacters(in: .whitespacesAndNewlines))
                             .lineLimit(1)
                     }
                 }

Shared/Settings/AddPublicInstanceButton.swift

@@ -11,7 +11,7 @@ struct AddPublicInstanceButton: View {
                 _ = InstancesModel.shared.add(app: app, name: "", url: account.urlString)
                 regenerateID()
             } label: {
-                Label("Add \(account.urlString)", systemImage: "plus")
+                Label(String(format: "Add %@", account.urlString), systemImage: "plus")
             }
             .id(id)
         }

Shared/Settings/QualityProfileForm.swift

@@ -10,6 +10,7 @@ struct QualityProfileForm: View {
 
     @State private var valid = false
 
+    @State private var initialized = false
     @State private var name = ""
     @State private var backend = PlayerBackendType.mpv
     @State private var resolution = ResolutionSetting.hd1080p60
@@ -226,7 +227,7 @@ struct QualityProfileForm: View {
     }
 
     func isFormatSelected(_ format: QualityProfile.Format) -> Bool {
-        (editing && formats.isEmpty ? qualityProfile.formats : formats).contains(format)
+        (initialized || qualityProfile.isNil ? formats : qualityProfile.formats).contains(format)
     }
 
     func toggleFormat(_ format: QualityProfile.Format, value: Bool) {
@@ -282,6 +283,7 @@ struct QualityProfileForm: View {
             self.backend = qualityProfile.backend
             self.resolution = qualityProfile.resolution
             self.formats = .init(qualityProfile.formats)
+            self.initialized = true
         }
 
         validate()

Shared/URLParser.swift

@@ -41,7 +41,7 @@ struct URLParser {
 
         if hasAnyOfPrefixes(path, Self.prefixes[.playlist]!) ||
             queryItemValue("v") == "playlist" ||
-            !(queryItemValue("list")?.isEmpty ?? false)
+            (queryItemValue("list") ?? "").count > 3
         {
             return .playlist
         }

Shared/en.lproj/Localizable.strings

@@ -595,3 +595,6 @@
 "Play Now in AVPlayer" = "Play Now in AVPlayer";
 "Show channel avatars in videos lists" = "Show channel avatars in videos lists";
 "Show channel avatars in channels lists" = "Show channel avatars in channels lists";
+"Podcasts" = "Podcasts";
+"Releases" = "Releases";
+"Add %@" = "Add %@";

Shared/pl.lproj/Localizable.strings

@@ -598,3 +598,6 @@
 "Show video context menu options to force selected backend" = "Pokaż opcje menu kontekstowego wideo, aby wymusić wybrany silnik";
 "Show channel avatars in videos lists" = "Pokaż awatary kanałów na listach wideo";
 "Show channel avatars in channels lists" = "Pokaż awatary kanałów na listach kanałów";
+"Podcasts" = "Podkasty";
+"Releases" = "Wydania";
+"Add %@" = "Dodaj %@";

Shared/pt-BR.lproj/Localizable.strings

@@ -597,3 +597,6 @@
 "Play Now in MPV" = "Tocar Agora em MPV";
 "Show channel avatars in videos lists" = "Mostrar avatares de canais em listas de vídeos";
 "Show channel avatars in channels lists" = "Mostrar avatares de canais em listas de canais";
+"Podcasts" = "Podcasts";
+"Releases" = "Lançamentos";
+"Add %@" = "Adicionar %@";

Yattee.xcodeproj/project.pbxproj

@@ -601,7 +601,6 @@
 		379DC3D328BA4EB400B09677 /* Seek.swift in Sources */ = {isa = PBXBuildFile; fileRef = 379DC3D028BA4EB400B09677 /* Seek.swift */; };
 		379E7C332A20FE3900AF8118 /* FocusableSearchTextField.swift in Sources */ = {isa = PBXBuildFile; fileRef = 379E7C322A20FE3900AF8118 /* FocusableSearchTextField.swift */; };
 		379E7C342A20FE3900AF8118 /* FocusableSearchTextField.swift in Sources */ = {isa = PBXBuildFile; fileRef = 379E7C322A20FE3900AF8118 /* FocusableSearchTextField.swift */; };
-		379E7C362A2105B900AF8118 /* Introspect in Frameworks */ = {isa = PBXBuildFile; productRef = 379E7C352A2105B900AF8118 /* Introspect */; };
 		379EF9E029AA585F009FE6C6 /* HideShortsButtons.swift in Sources */ = {isa = PBXBuildFile; fileRef = 379EF9DF29AA585F009FE6C6 /* HideShortsButtons.swift */; };
 		379EF9E129AA585F009FE6C6 /* HideShortsButtons.swift in Sources */ = {isa = PBXBuildFile; fileRef = 379EF9DF29AA585F009FE6C6 /* HideShortsButtons.swift */; };
 		379EF9E229AA585F009FE6C6 /* HideShortsButtons.swift in Sources */ = {isa = PBXBuildFile; fileRef = 379EF9DF29AA585F009FE6C6 /* HideShortsButtons.swift */; };
@@ -698,7 +697,6 @@
 		37BD07BC2698AB60003EBB87 /* AppSidebarNavigation.swift in Sources */ = {isa = PBXBuildFile; fileRef = 37BD07BA2698AB60003EBB87 /* AppSidebarNavigation.swift */; };
 		37BD07C12698AD3B003EBB87 /* TrendingCountry.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3705B17F267B4DFB00704544 /* TrendingCountry.swift */; };
 		37BD07C32698AD4F003EBB87 /* ContentView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 37BD07B42698AA4D003EBB87 /* ContentView.swift */; };
-		37BD07C72698B27B003EBB87 /* Introspect in Frameworks */ = {isa = PBXBuildFile; productRef = 37BD07C62698B27B003EBB87 /* Introspect */; };
 		37BD07C82698B71C003EBB87 /* AppTabNavigation.swift in Sources */ = {isa = PBXBuildFile; fileRef = 37D4B0C32671614700C925CA /* AppTabNavigation.swift */; };
 		37BD07C92698FBDB003EBB87 /* ContentView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 37BD07B42698AA4D003EBB87 /* ContentView.swift */; };
 		37BD672426F13D65004BE0C1 /* AppSidebarPlaylists.swift in Sources */ = {isa = PBXBuildFile; fileRef = 37BA794A26DC30EC002A0235 /* AppSidebarPlaylists.swift */; };
@@ -729,9 +727,6 @@
 		37C194C726F6A9C8005D3B96 /* RecentsModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 37C194C626F6A9C8005D3B96 /* RecentsModel.swift */; };
 		37C194C826F6A9C8005D3B96 /* RecentsModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 37C194C626F6A9C8005D3B96 /* RecentsModel.swift */; };
 		37C2211D27ADA33300305B41 /* MPVViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 37C2211C27ADA33300305B41 /* MPVViewController.swift */; };
-		37C2211F27ADA3A200305B41 /* libz.tbd in Frameworks */ = {isa = PBXBuildFile; fileRef = 37C2211E27ADA3A200305B41 /* libz.tbd */; };
-		37C2212127ADA3A600305B41 /* libbz2.tbd in Frameworks */ = {isa = PBXBuildFile; fileRef = 37C2212027ADA3A600305B41 /* libbz2.tbd */; };
-		37C2212327ADA3F200305B41 /* libiconv.tbd in Frameworks */ = {isa = PBXBuildFile; fileRef = 37C2212227ADA3F200305B41 /* libiconv.tbd */; };
 		37C2212527ADA40A00305B41 /* AudioToolbox.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 37C2212427ADA40A00305B41 /* AudioToolbox.framework */; };
 		37C2212727ADA41000305B41 /* CoreFoundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 37C2212627ADA41000305B41 /* CoreFoundation.framework */; };
 		37C2212927ADA41400305B41 /* CoreMedia.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 37C2212827ADA41400305B41 /* CoreMedia.framework */; };
@@ -751,6 +746,8 @@
 		37C3A251272366440087A57A /* ChannelPlaylistView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 37C3A250272366440087A57A /* ChannelPlaylistView.swift */; };
 		37C3A252272366440087A57A /* ChannelPlaylistView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 37C3A250272366440087A57A /* ChannelPlaylistView.swift */; };
 		37C3A253272366440087A57A /* ChannelPlaylistView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 37C3A250272366440087A57A /* ChannelPlaylistView.swift */; };
+		37C736782AC32B28007630E1 /* SwiftUIIntrospect in Frameworks */ = {isa = PBXBuildFile; productRef = 37C736772AC32B28007630E1 /* SwiftUIIntrospect */; };
+		37C7367A2AC33010007630E1 /* SwiftUIIntrospect in Frameworks */ = {isa = PBXBuildFile; productRef = 37C736792AC33010007630E1 /* SwiftUIIntrospect */; };
 		37C7A1D5267BFD9D0010EAD6 /* SponsorBlockSegment.swift in Sources */ = {isa = PBXBuildFile; fileRef = 37C7A1D4267BFD9D0010EAD6 /* SponsorBlockSegment.swift */; };
 		37C7A1D6267BFD9D0010EAD6 /* SponsorBlockSegment.swift in Sources */ = {isa = PBXBuildFile; fileRef = 37C7A1D4267BFD9D0010EAD6 /* SponsorBlockSegment.swift */; };
 		37C7A1D7267BFD9D0010EAD6 /* SponsorBlockSegment.swift in Sources */ = {isa = PBXBuildFile; fileRef = 37C7A1D4267BFD9D0010EAD6 /* SponsorBlockSegment.swift */; };
@@ -1406,11 +1403,8 @@
 				37C2212727ADA41000305B41 /* CoreFoundation.framework in Frameworks */,
 				37C2212527ADA40A00305B41 /* AudioToolbox.framework in Frameworks */,
 				372AA410286D067B0000B1DC /* Repeat in Frameworks */,
-				37C2212327ADA3F200305B41 /* libiconv.tbd in Frameworks */,
 				379325D529A265A300181CF1 /* Logging in Frameworks */,
-				37C2212127ADA3A600305B41 /* libbz2.tbd in Frameworks */,
 				37EE6DC528A305AD00BFD632 /* Reachability in Frameworks */,
-				37C2211F27ADA3A200305B41 /* libz.tbd in Frameworks */,
 				375B8AB128B57F4200397B31 /* KeychainAccess in Frameworks */,
 				3765917C27237D21009F956E /* PINCache in Frameworks */,
 				37BD07B72698AB2E003EBB87 /* Defaults in Frameworks */,
@@ -1421,9 +1415,9 @@
 				3797104928D3D10600D5F53C /* SDWebImageSwiftUI in Frameworks */,
 				FA97174C2A494700001FF53D /* MPVKit in Frameworks */,
 				37BD07B92698AB2E003EBB87 /* Siesta in Frameworks */,
-				37BD07C72698B27B003EBB87 /* Introspect in Frameworks */,
 				37FB284D2722099E00A57617 /* SDWebImageWebPCoder in Frameworks */,
 				37CF8B8428535E4F00B71E37 /* SDWebImage in Frameworks */,
+				37C7367A2AC33010007630E1 /* SwiftUIIntrospect in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -1434,12 +1428,12 @@
 				379325D729A265AE00181CF1 /* Logging in Frameworks */,
 				372AA414286D06A10000B1DC /* Repeat in Frameworks */,
 				37F7AB5228A94EB900FB46B5 /* IOKit.framework in Frameworks */,
-				379E7C362A2105B900AF8118 /* Introspect in Frameworks */,
 				3703205827D2BAE4007A0CB8 /* Siesta in Frameworks */,
 				3703206827D2BB45007A0CB8 /* Defaults in Frameworks */,
 				3703206A27D2BB49007A0CB8 /* Alamofire in Frameworks */,
 				374D11E72943C56300CB4350 /* Cache in Frameworks */,
 				3797104B28D3D18800D5F53C /* SDWebImageSwiftUI in Frameworks */,
+				37C736782AC32B28007630E1 /* SwiftUIIntrospect in Frameworks */,
 				3703206227D2BB1B007A0CB8 /* SDWebImagePINPlugin in Frameworks */,
 				371AC0B2294D1C230085989E /* CachedAsyncImage in Frameworks */,
 				3703206627D2BB35007A0CB8 /* PINCache in Frameworks */,
@@ -2280,7 +2274,6 @@
 				377FC7D4267A080300A6BBAF /* SwiftyJSON */,
 				37BD07B62698AB2E003EBB87 /* Defaults */,
 				37BD07B82698AB2E003EBB87 /* Siesta */,
-				37BD07C62698B27B003EBB87 /* Introspect */,
 				37BADCA42699FB72009BE4FB /* Alamofire */,
 				37FB284C2722099E00A57617 /* SDWebImageWebPCoder */,
 				37FB285527220D9000A57617 /* SDWebImagePINPlugin */,
@@ -2295,6 +2288,7 @@
 				371AC0AB294D1A490085989E /* CachedAsyncImage */,
 				379325D429A265A300181CF1 /* Logging */,
 				FA97174B2A494700001FF53D /* MPVKit */,
+				37C736792AC33010007630E1 /* SwiftUIIntrospect */,
 			);
 			productName = "Yattee (iOS)";
 			productReference = 37D4B0C92671614900C925CA /* Yattee.app */;
@@ -2332,8 +2326,8 @@
 				374D11E62943C56300CB4350 /* Cache */,
 				371AC0B1294D1C230085989E /* CachedAsyncImage */,
 				379325D629A265AE00181CF1 /* Logging */,
-				379E7C352A2105B900AF8118 /* Introspect */,
 				3704BDFE2ABF260C00370FF7 /* MPVKit */,
+				37C736772AC32B28007630E1 /* SwiftUIIntrospect */,
 			);
 			productName = "Yattee (macOS)";
 			productReference = 37D4B0CF2671614900C925CA /* Yattee.app */;
@@ -3673,7 +3667,7 @@
 				CODE_SIGN_ENTITLEMENTS = "Open in Yattee/Open in Yattee.entitlements";
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 160;
+				CURRENT_PROJECT_VERSION = 164;
 				GENERATE_INFOPLIST_FILE = YES;
 				INFOPLIST_FILE = "Open in Yattee/Info.plist";
 				INFOPLIST_KEY_CFBundleDisplayName = "Open in Yattee";
@@ -3704,7 +3698,7 @@
 				CODE_SIGN_IDENTITY = "Apple Development";
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Distribution";
 				CODE_SIGN_STYLE = Manual;
-				CURRENT_PROJECT_VERSION = 160;
+				CURRENT_PROJECT_VERSION = 164;
 				"DEVELOPMENT_TEAM[sdk=iphoneos*]" = 78Z5H3M6RJ;
 				GENERATE_INFOPLIST_FILE = YES;
 				INFOPLIST_FILE = "Open in Yattee/Info.plist";
@@ -3735,7 +3729,7 @@
 			buildSettings = {
 				CLANG_CXX_LANGUAGE_STANDARD = "gnu++17";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 160;
+				CURRENT_PROJECT_VERSION = 164;
 				GENERATE_INFOPLIST_FILE = YES;
 				IPHONEOS_DEPLOYMENT_TARGET = 14.0;
 				MACOSX_DEPLOYMENT_TARGET = 11.0;
@@ -3755,7 +3749,7 @@
 			buildSettings = {
 				CLANG_CXX_LANGUAGE_STANDARD = "gnu++17";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 160;
+				CURRENT_PROJECT_VERSION = 164;
 				GENERATE_INFOPLIST_FILE = YES;
 				IPHONEOS_DEPLOYMENT_TARGET = 14.0;
 				MACOSX_DEPLOYMENT_TARGET = 11.0;
@@ -3919,7 +3913,7 @@
 				CODE_SIGN_ENTITLEMENTS = "iOS/Yattee (iOS).entitlements";
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 160;
+				CURRENT_PROJECT_VERSION = 164;
 				ENABLE_PREVIEWS = YES;
 				GCC_PREPROCESSOR_DEFINITIONS = (
 					"DEBUG=1",
@@ -3972,7 +3966,7 @@
 				CODE_SIGN_IDENTITY = "Apple Development";
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Distribution";
 				CODE_SIGN_STYLE = Manual;
-				CURRENT_PROJECT_VERSION = 160;
+				CURRENT_PROJECT_VERSION = 164;
 				"DEVELOPMENT_TEAM[sdk=iphoneos*]" = 78Z5H3M6RJ;
 				ENABLE_PREVIEWS = YES;
 				GCC_PREPROCESSOR_DEFINITIONS = "GLES_SILENCE_DEPRECATION=1";
@@ -4024,7 +4018,7 @@
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
 				COMBINE_HIDPI_IMAGES = YES;
-				CURRENT_PROJECT_VERSION = 160;
+				CURRENT_PROJECT_VERSION = 164;
 				DEAD_CODE_STRIPPING = YES;
 				ENABLE_APP_SANDBOX = YES;
 				ENABLE_HARDENED_RUNTIME = YES;
@@ -4038,9 +4032,7 @@
 					"$(inherited)",
 					"@executable_path/../Frameworks",
 				);
-				LIBRARY_SEARCH_PATHS = (
+				LIBRARY_SEARCH_PATHS = "$(inherited)";
-					"$(inherited)",
-				);
 				MACOSX_DEPLOYMENT_TARGET = 12.0;
 				MARKETING_VERSION = 1.5;
 				OTHER_LDFLAGS = "-Wl,-no_compact_unwind";
@@ -4065,7 +4057,7 @@
 				"CODE_SIGN_IDENTITY[sdk=macosx*]" = "3rd Party Mac Developer Application";
 				CODE_SIGN_STYLE = Manual;
 				COMBINE_HIDPI_IMAGES = YES;
-				CURRENT_PROJECT_VERSION = 160;
+				CURRENT_PROJECT_VERSION = 164;
 				DEAD_CODE_STRIPPING = YES;
 				"DEVELOPMENT_TEAM[sdk=macosx*]" = 78Z5H3M6RJ;
 				ENABLE_APP_SANDBOX = YES;
@@ -4080,9 +4072,7 @@
 					"$(inherited)",
 					"@executable_path/../Frameworks",
 				);
-				LIBRARY_SEARCH_PATHS = (
+				LIBRARY_SEARCH_PATHS = "$(inherited)";
-					"$(inherited)",
-				);
 				MACOSX_DEPLOYMENT_TARGET = 12.0;
 				MARKETING_VERSION = 1.5;
 				OTHER_LDFLAGS = "-Wl,-no_compact_unwind";
@@ -4102,7 +4092,7 @@
 			buildSettings = {
 				ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 160;
+				CURRENT_PROJECT_VERSION = 164;
 				GENERATE_INFOPLIST_FILE = YES;
 				IPHONEOS_DEPLOYMENT_TARGET = 15.0;
 				LD_RUNPATH_SEARCH_PATHS = (
@@ -4126,7 +4116,7 @@
 			buildSettings = {
 				ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 160;
+				CURRENT_PROJECT_VERSION = 164;
 				GENERATE_INFOPLIST_FILE = YES;
 				IPHONEOS_DEPLOYMENT_TARGET = 15.0;
 				LD_RUNPATH_SEARCH_PATHS = (
@@ -4152,7 +4142,7 @@
 				ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
 				CODE_SIGN_STYLE = Automatic;
 				COMBINE_HIDPI_IMAGES = YES;
-				CURRENT_PROJECT_VERSION = 160;
+				CURRENT_PROJECT_VERSION = 164;
 				DEAD_CODE_STRIPPING = YES;
 				GENERATE_INFOPLIST_FILE = YES;
 				LD_RUNPATH_SEARCH_PATHS = (
@@ -4177,7 +4167,7 @@
 				ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
 				CODE_SIGN_STYLE = Automatic;
 				COMBINE_HIDPI_IMAGES = YES;
-				CURRENT_PROJECT_VERSION = 160;
+				CURRENT_PROJECT_VERSION = 164;
 				DEAD_CODE_STRIPPING = YES;
 				GENERATE_INFOPLIST_FILE = YES;
 				LD_RUNPATH_SEARCH_PATHS = (
@@ -4203,7 +4193,7 @@
 				ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 160;
+				CURRENT_PROJECT_VERSION = 164;
 				DEVELOPMENT_ASSET_PATHS = "";
 				ENABLE_PREVIEWS = YES;
 				GENERATE_INFOPLIST_FILE = YES;
@@ -4243,7 +4233,7 @@
 				ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
 				"CODE_SIGN_IDENTITY[sdk=appletvos*]" = "iPhone Distribution";
 				CODE_SIGN_STYLE = Manual;
-				CURRENT_PROJECT_VERSION = 160;
+				CURRENT_PROJECT_VERSION = 164;
 				DEVELOPMENT_ASSET_PATHS = "";
 				"DEVELOPMENT_TEAM[sdk=appletvos*]" = 78Z5H3M6RJ;
 				ENABLE_PREVIEWS = YES;
@@ -4284,7 +4274,7 @@
 			buildSettings = {
 				ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 160;
+				CURRENT_PROJECT_VERSION = 164;
 				GENERATE_INFOPLIST_FILE = YES;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
@@ -4308,7 +4298,7 @@
 			buildSettings = {
 				ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 160;
+				CURRENT_PROJECT_VERSION = 164;
 				GENERATE_INFOPLIST_FILE = YES;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
@@ -4825,11 +4815,6 @@
 			package = 3799AC0728B03CEC001376F9 /* XCRemoteSwiftPackageReference "ActiveLabel.swift" */;
 			productName = ActiveLabel;
 		};
-		379E7C352A2105B900AF8118 /* Introspect */ = {
-			isa = XCSwiftPackageProductDependency;
-			package = 37BD07C52698B27B003EBB87 /* XCRemoteSwiftPackageReference "SwiftUI-Introspect" */;
-			productName = Introspect;
-		};
 		37BADCA42699FB72009BE4FB /* Alamofire */ = {
 			isa = XCSwiftPackageProductDependency;
 			package = 37BADCA32699FB72009BE4FB /* XCRemoteSwiftPackageReference "Alamofire" */;
@@ -4850,10 +4835,15 @@
 			package = 3797757B268922D100DD52A8 /* XCRemoteSwiftPackageReference "siesta" */;
 			productName = Siesta;
 		};
-		37BD07C62698B27B003EBB87 /* Introspect */ = {
+		37C736772AC32B28007630E1 /* SwiftUIIntrospect */ = {
 			isa = XCSwiftPackageProductDependency;
 			package = 37BD07C52698B27B003EBB87 /* XCRemoteSwiftPackageReference "SwiftUI-Introspect" */;
-			productName = Introspect;
+			productName = SwiftUIIntrospect;
+		};
+		37C736792AC33010007630E1 /* SwiftUIIntrospect */ = {
+			isa = XCSwiftPackageProductDependency;
+			package = 37BD07C52698B27B003EBB87 /* XCRemoteSwiftPackageReference "SwiftUI-Introspect" */;
+			productName = SwiftUIIntrospect;
 		};
 		37CF8B8328535E4F00B71E37 /* SDWebImage */ = {
 			isa = XCSwiftPackageProductDependency;