Rename

Author: Mx-Iris

Examples/Example-SwiftUI/ContentView.swift

@@ -10,13 +10,13 @@ import SystemSettingsNavigator
 
 struct ContentView: View {
 
-    @Environment(\.openSystemSetting)
-    private var openSystemSetting
+    @Environment(\.openSystemSettings)
+    private var openSystemSettings
 
     var body: some View {
         VStack {
             Button {
-                openSystemSetting(.privacySecurity(.extensions(.fileSystem)))
+                openSystemSettings(.privacySecurity(.extensions(.fileSystem)))
             } label: {
                 Text("Open System Settings")
             }

Sources/SystemSettingsNavigator/SystemSettingsNavigator.swift

@@ -10,15 +10,15 @@ public final class SystemSettingsNavigator {
     public static let shared = SystemSettingsNavigator()
 
     #if canImport(UIKit) && targetEnvironment(macCatalyst)
-    @available(*, deprecated, renamed: "UIApplication.openSystemSetting(_:completion:)")
+    @available(*, deprecated, renamed: "UIApplication.openSystemSettings(_:completion:)")
     public func navigate(to pane: SystemSettingsPane, completion: ((Bool) -> Void)? = nil) throws {
         UIApplication.shared.open(pane.url, completionHandler: completion)
     }
     #endif
 
     #if canImport(AppKit) && !targetEnvironment(macCatalyst)
     @discardableResult
-    @available(*, deprecated, renamed: "NSWorkspace.openSystemSetting(_:)")
+    @available(*, deprecated, renamed: "NSWorkspace.openSystemSettings(_:)")
     public func navigate(to pane: SystemSettingsPane) throws -> Bool {
         NSWorkspace.shared.open(pane.url)
     }
@@ -27,12 +27,7 @@ public final class SystemSettingsNavigator {
 
 #if canImport(UIKit) && targetEnvironment(macCatalyst)
 extension UIApplication {
-    @available(*, deprecated, renamed: "UIApplication.openSystemSetting(_:completion:)")
     public func openSystemSettings(_ pane: SystemSettingsPane, completion: ((Bool) -> Void)? = nil) {
-        openSystemSetting(pane, completion: completion)
-    }
-
-    public func openSystemSetting(_ pane: SystemSettingsPane, completion: ((Bool) -> Void)? = nil) {
         open(pane.url, completionHandler: completion)
     }
 }
@@ -41,13 +36,7 @@ extension UIApplication {
 #if canImport(AppKit) && !targetEnvironment(macCatalyst)
 extension NSWorkspace {
     @discardableResult
-    @available(*, deprecated, renamed: "NSWorkspace.openSystemSetting(_:)")
     public func openSystemSettings(_ pane: SystemSettingsPane) -> Bool {
-        openSystemSetting(pane)
-    }
-
-    @discardableResult
-    public func openSystemSetting(_ pane: SystemSettingsPane) -> Bool {
         open(pane.url)
     }
 }
@@ -57,33 +46,33 @@ extension NSWorkspace {
 
 import SwiftUI
 
-@MainActor @preconcurrency public struct OpenSystemSettingAction: Sendable {
+@MainActor @preconcurrency public struct OpenSystemSettingsAction: Sendable {
     @MainActor @preconcurrency public func callAsFunction(_ pane: SystemSettingsPane) {
         #if canImport(UIKit) && targetEnvironment(macCatalyst)
-        UIApplication.shared.openSystemSetting(pane)
+        UIApplication.shared.openSystemSettings(pane)
         #elseif canImport(AppKit) && !targetEnvironment(macCatalyst)
-        NSWorkspace.shared.openSystemSetting(pane)
+        NSWorkspace.shared.openSystemSettings(pane)
         #endif
     }
 
     @MainActor @preconcurrency public func callAsFunction(_ pane: SystemSettingsPane, completion: @escaping (_ accepted: Bool) -> Void) {
         #if canImport(UIKit) && targetEnvironment(macCatalyst)
-        UIApplication.shared.openSystemSetting(pane) { completion($0) }
+        UIApplication.shared.openSystemSettings(pane) { completion($0) }
         #elseif canImport(AppKit) && !targetEnvironment(macCatalyst)
-        let accepted = NSWorkspace.shared.openSystemSetting(pane)
+        let accepted = NSWorkspace.shared.openSystemSettings(pane)
         completion(accepted)
         #endif
     }
 }
 
-@preconcurrency private enum OpenSystemSettingActionKey: EnvironmentKey {
-    static let defaultValue: OpenSystemSettingAction = .init()
+@preconcurrency private enum OpenSystemSettingsActionKey: EnvironmentKey {
+    static let defaultValue: OpenSystemSettingsAction = .init()
 }
 
 extension EnvironmentValues {
-    @MainActor @preconcurrency public var openSystemSetting: OpenSystemSettingAction {
-        get { self[OpenSystemSettingActionKey.self] }
-        set { self[OpenSystemSettingActionKey.self] = newValue }
+    @MainActor @preconcurrency public var openSystemSettings: OpenSystemSettingsAction {
+        get { self[OpenSystemSettingsActionKey.self] }
+        set { self[OpenSystemSettingsActionKey.self] = newValue }
     }
 }