Merge branch 'meta-dev' into meta

MetaCubeX · Jun 26, 2023 · 28601b6 · 28601b6
2 parents f5f425a + 32b8faf
commit 28601b6
Show file tree

Hide file tree

Showing 49 changed files with 1,417 additions and 220 deletions.
diff --git a/.github/workflows/pull_request.yaml b/.github/workflows/pull_request.yaml
@@ -0,0 +1,29 @@
+name: ClashX
+
+on: [ pull_request ]
+
+env:
+  FASTLANE_SKIP_UPDATE_CHECK: true
+
+jobs:
+  build:
+    runs-on: macos-13
+    steps:
+    - uses: actions/checkout@v3
+
+    - name: setup Go
+      uses: actions/setup-go@v3
+      with:
+        go-version: 1.20.x
+
+    - uses: maxim-lobanov/setup-xcode@v1
+      with:
+        xcode-version: latest-stable
+
+    - name: install deps
+      run: |
+        bash install_dependency.sh
+    
+    - name: check
+      run: |
+        bundle exec fastlane check
diff --git a/.gitignore b/.gitignore
@@ -24,3 +24,5 @@ ClashX/Resources/geosite.dat.gz
 ClashX/Resources/com.metacubex.ClashX.ProxyConfigHelper.*
 clash.meta
 *.app/**
+ClashX.app.dSYM.zip
+build_derived_data
diff --git a/.swiftlint.yml b/.swiftlint.yml
@@ -7,6 +7,8 @@ disabled_rules: # rule identifiers turned on by default to exclude from running
   - file_length
   - large_tuple
   - type_body_length
+  - cyclomatic_complexity
+  - function_body_length
 included: # paths to include during linting. `--path` is ignored if present.
   - ClashX
 excluded: # paths to ignore during linting. Takes precedence over `included`.

diff --git a/ClashX SwiftUI.xcodeproj/project.pbxproj b/ClashX SwiftUI.xcodeproj/project.pbxproj
@@ -7,7 +7,11 @@
 	objects = {
 
 /* Begin PBXBuildFile section */
+		011946B62A32F64600502077 /* TunModeSettingCommand.swift in Sources */ = {isa = PBXBuildFile; fileRef = 011946B52A32F64500502077 /* TunModeSettingCommand.swift */; };
+		011946BA2A334C4900502077 /* ClashWebViewContoller.swift in Sources */ = {isa = PBXBuildFile; fileRef = 011946B92A334C4900502077 /* ClashWebViewContoller.swift */; };
 		012875E52A2E39CD004FB615 /* ClashX Dashboard in Frameworks */ = {isa = PBXBuildFile; productRef = 012875E42A2E39CD004FB615 /* ClashX Dashboard */; };
+		015EC9412A4888E400145F7F /* Hotfixs.swift in Sources */ = {isa = PBXBuildFile; fileRef = 015EC9402A4888E300145F7F /* Hotfixs.swift */; };
+		015EC9432A48891000145F7F /* NormalMenuItemView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 015EC9422A48891000145F7F /* NormalMenuItemView.swift */; };
 		015F1E91288E42A50052B20A /* ClashMetaConfig.swift in Sources */ = {isa = PBXBuildFile; fileRef = 015F1E90288E42A50052B20A /* ClashMetaConfig.swift */; };
 		015F1E92288E60D30052B20A /* MetaTask.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0162E74E2864B819007218A6 /* MetaTask.swift */; };
 		0162E74F2864B819007218A6 /* MetaTask.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0162E74E2864B819007218A6 /* MetaTask.swift */; };
@@ -155,6 +159,10 @@
 /* End PBXCopyFilesBuildPhase section */
 
 /* Begin PBXFileReference section */
+		011946B52A32F64500502077 /* TunModeSettingCommand.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = TunModeSettingCommand.swift; sourceTree = "<group>"; };
+		011946B92A334C4900502077 /* ClashWebViewContoller.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ClashWebViewContoller.swift; sourceTree = "<group>"; };
+		015EC9402A4888E300145F7F /* Hotfixs.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Hotfixs.swift; sourceTree = "<group>"; };
+		015EC9422A48891000145F7F /* NormalMenuItemView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = NormalMenuItemView.swift; sourceTree = "<group>"; };
 		015F1E90288E42A50052B20A /* ClashMetaConfig.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ClashMetaConfig.swift; sourceTree = "<group>"; };
 		0162E74D2864B818007218A6 /* com.metacubex.ClashX.ProxyConfigHelper-Bridging-Header.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "com.metacubex.ClashX.ProxyConfigHelper-Bridging-Header.h"; sourceTree = "<group>"; };
 		0162E74E2864B819007218A6 /* MetaTask.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MetaTask.swift; sourceTree = "<group>"; };
@@ -377,6 +385,7 @@
 				492C4868210EE6B9004554A0 /* ApiRequest.swift */,
 				015F1E90288E42A50052B20A /* ClashMetaConfig.swift */,
 				016BEAAF29D80102001586C5 /* AlphaMetaDownloader.swift */,
+				015EC9402A4888E300145F7F /* Hotfixs.swift */,
 			);
 			path = General;
 			sourceTree = "<group>";
@@ -410,6 +419,7 @@
 				493A9F272453E60400D35296 /* ProxyDelayHistoryMenu.swift */,
 				49228456270AADE20027A4B6 /* RemoteConfigUpdateIntervalSettingView.swift */,
 				018F88F8286DD0CB004DD0F7 /* DualTitleMenuItem.swift */,
+				015EC9422A48891000145F7F /* NormalMenuItemView.swift */,
 			);
 			path = Views;
 			sourceTree = "<group>";
@@ -458,6 +468,7 @@
 				49BC061B212931F4005A0FE7 /* AboutViewController.swift */,
 				499A485322ED707300F6C675 /* RemoteConfigViewController.swift */,
 				499ADAFE2498FC6D00C488FE /* ExternalControlViewController.swift */,
+				011946B92A334C4900502077 /* ClashWebViewContoller.swift */,
 				01B1CB072A2E1EC10073EA34 /* DashboardManagerSwiftUI.swift */,
 			);
 			path = ViewControllers;
@@ -555,6 +566,7 @@
 		8A2BBEA527A03A920081EBEF /* AppleScript */ = {
 			isa = PBXGroup;
 			children = (
+				011946B52A32F64500502077 /* TunModeSettingCommand.swift */,
 				8A2BBEA627A03ACB0081EBEF /* ProxySetting.sdef */,
 				8ACD21BA27A04C7800BC4632 /* ProxySettingCommand.swift */,
 				8ACD21BC27A04ED500BC4632 /* ProxyModeChangeCommand.swift */,
@@ -733,6 +745,7 @@
 			isa = PBXSourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
+				011946BA2A334C4900502077 /* ClashWebViewContoller.swift in Sources */,
 				49ABB749236B0F9E00535CD7 /* UnsafePointer+bridge.swift in Sources */,
 				01EACC762A2F94AB001C584B /* GlobalShortCutViewController.swift in Sources */,
 				499A485522ED707300F6C675 /* RemoteConfigViewController.swift in Sources */,
@@ -752,6 +765,7 @@
 				495A44D320D267D000888A0A /* LaunchAtLogin.swift in Sources */,
 				01EACC722A2F9469001C584B /* SSIDSuspendTool.swift in Sources */,
 				01B1CB082A2E1EC10073EA34 /* DashboardManagerSwiftUI.swift in Sources */,
+				015EC9432A48891000145F7F /* NormalMenuItemView.swift in Sources */,
 				4929F67F258CE04700A435F6 /* Settings.swift in Sources */,
 				49D6A45629AEEC55006487EF /* StatusItemViewProtocol.swift in Sources */,
 				493AEAE3221AE3420016FE98 /* AppVersionUtil.swift in Sources */,
@@ -775,6 +789,7 @@
 				F9E754D0239CC21F00CEE7CC /* WebPortalManager.swift in Sources */,
 				018F88F9286DD0CB004DD0F7 /* DualTitleMenuItem.swift in Sources */,
 				495BFB8821919B9800C8779D /* RemoteConfigManager.swift in Sources */,
+				015EC9412A4888E400145F7F /* Hotfixs.swift in Sources */,
 				4982F51F2344A216008804B0 /* Cgo+Convert.swift in Sources */,
 				8ACD21BB27A04C7800BC4632 /* ProxySettingCommand.swift in Sources */,
 				49722FF1211F338B00650A41 /* Witness.swift in Sources */,
@@ -796,6 +811,7 @@
 				49D176A9235614340093DD7B /* ProxyGroupSpeedTestMenuItem.swift in Sources */,
 				F976275C23634DF8000EDEFE /* LoginServiceKit.swift in Sources */,
 				4966E9E6211824F300A391FB /* NSImage+extension.swift in Sources */,
+				011946B62A32F64600502077 /* TunModeSettingCommand.swift in Sources */,
 				F92D0B2E236D35C000575E15 /* ProxyItemView.swift in Sources */,
 				49BB31E7246853EA008A4CB0 /* ICloudManager.swift in Sources */,
 				49B1086A216A356D0064FFCE /* String+Extension.swift in Sources */,

diff --git a/ClashX SwiftUI.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved b/ClashX SwiftUI.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved
@@ -15,7 +15,7 @@
       "location" : "https://github.com/mrFq1/ClashX-Dashboard",
       "state" : {
         "branch" : "dev",
-        "revision" : "f488f41f8dbb6d2e718101c51380f605ec2a197c"
+        "revision" : "c9e23067c908de6131671c6ff59ced91b97695a9"
       }
     },
     {