From 377217a724440f41e2ba626eb2687b9ca9702cf1 Mon Sep 17 00:00:00 2001 From: mrFq1 <1xxbx0il0@mozmail.com> Date: Thu, 2 Nov 2023 22:45:14 +0800 Subject: [PATCH 1/8] misc: sync info.plist --- ClashX/ClashX Meta SwiftUI-Info.plist | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/ClashX/ClashX Meta SwiftUI-Info.plist b/ClashX/ClashX Meta SwiftUI-Info.plist index b7c7ab4a0..ecd93338e 100644 --- a/ClashX/ClashX Meta SwiftUI-Info.plist +++ b/ClashX/ClashX Meta SwiftUI-Info.plist @@ -2,6 +2,10 @@ + NSLocationAlwaysAndWhenInUseUsageDescription + ClashX use location info to detect your current WiFi network SSID name and provide the auto suspend services. + NSLocationWhenInUseUsageDescription + ClashX use location info to detect your current WiFi network SSID name and provide the auto suspend services. BETA CFBundleDevelopmentRegion From a9d1bd4c26036e4a785438dd1d51b6a24bcab8ae Mon Sep 17 00:00:00 2001 From: mrFq1 <1xxbx0il0@mozmail.com> Date: Sat, 2 Dec 2023 20:28:40 +0800 Subject: [PATCH 2/8] misc: Mihomo --- ClashX/AppDelegate.swift | 4 +- ClashX/Base.lproj/Main.storyboard | 154 +++++++++++------------ ClashX/General/AlphaMetaDownloader.swift | 3 +- 3 files changed, 81 insertions(+), 80 deletions(-) diff --git a/ClashX/AppDelegate.swift b/ClashX/AppDelegate.swift index a394d38ba..f424a55a6 100644 --- a/ClashX/AppDelegate.swift +++ b/ClashX/AppDelegate.swift @@ -579,13 +579,13 @@ class AppDelegate: NSObject, NSApplicationDelegate { let outs = out .split(separator: "\n") .first { - $0.starts(with: "Clash Meta") + $0.starts(with: "Clash Meta") || $0.starts(with: "Mihomo Meta") }?.split(separator: " ") .map(String.init) guard let outs, outs.count == 13, - outs[0] == "Clash", + (outs[0] == "Clash" || outs[0] == "Mihomo"), outs[1] == "Meta", outs[3] == "darwin" else { return nil diff --git a/ClashX/Base.lproj/Main.storyboard b/ClashX/Base.lproj/Main.storyboard index d64808d6e..6f1b9194c 100644 --- a/ClashX/Base.lproj/Main.storyboard +++ b/ClashX/Base.lproj/Main.storyboard @@ -1,7 +1,7 @@ - + - + @@ -52,12 +52,12 @@ - + - + - + @@ -106,9 +106,9 @@ - + - + @@ -124,7 +124,7 @@ - + @@ -132,7 +132,7 @@ - + @@ -158,7 +158,7 @@ - + @@ -166,7 +166,7 @@ - + @@ -204,7 +204,7 @@ - + @@ -212,7 +212,7 @@ - + @@ -272,20 +272,20 @@ - + - + - - + + - + @@ -296,15 +296,15 @@ - + - + - + @@ -318,7 +318,7 @@ - + @@ -338,9 +338,9 @@ - + - + @@ -349,7 +349,7 @@ - + @@ -357,7 +357,7 @@ - + @@ -401,20 +401,20 @@ - + - + - - + + - + @@ -425,15 +425,15 @@ - + - + - + @@ -447,19 +447,19 @@ - + - + @@ -1692,13 +1692,13 @@ - + - + - +