diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index f5a3b08..85b1a2b 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -22,9 +22,9 @@ jobs: run: git rev-list --count origin/master..origin/meta - name: setup Go - uses: actions/setup-go@v2 + uses: actions/setup-go@v3 with: - go-version: 1.18.x + go-version: 1.19.x - name: install deps run: bash install_dependency.sh diff --git a/ClashX.xcodeproj/project.pbxproj b/ClashX.xcodeproj/project.pbxproj index 0c230d9..8b9dc88 100644 --- a/ClashX.xcodeproj/project.pbxproj +++ b/ClashX.xcodeproj/project.pbxproj @@ -20,7 +20,6 @@ 4913C82321157D0200F6B87C /* Notification.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4913C82221157D0200F6B87C /* Notification.swift */; }; 491E6203258A424D00313AEF /* CommonUtils.m in Sources */ = {isa = PBXBuildFile; fileRef = 491E61FD258A424500313AEF /* CommonUtils.m */; }; 49228457270AADE20027A4B6 /* RemoteConfigUpdateIntervalSettingView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 49228456270AADE20027A4B6 /* RemoteConfigUpdateIntervalSettingView.swift */; }; - 4929F610258CD22E00A435F6 /* menu_icon@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 4929F60F258CD22E00A435F6 /* menu_icon@2x.png */; }; 4929F677258CD89B00A435F6 /* Country.mmdb.gz in Resources */ = {isa = PBXBuildFile; fileRef = 4929F676258CD89B00A435F6 /* Country.mmdb.gz */; }; 4929F67F258CE04700A435F6 /* Settings.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4929F67E258CE04700A435F6 /* Settings.swift */; }; 4929F684258CE07500A435F6 /* UserDefaultWrapper.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4929F683258CE07500A435F6 /* UserDefaultWrapper.swift */; }; @@ -73,6 +72,7 @@ 49D176A72355FE680093DD7B /* NetworkChangeNotifier.swift in Sources */ = {isa = PBXBuildFile; fileRef = 49D176A62355FE680093DD7B /* NetworkChangeNotifier.swift */; }; 49D176A9235614340093DD7B /* ProxyGroupSpeedTestMenuItem.swift in Sources */ = {isa = PBXBuildFile; fileRef = 49D176A8235614340093DD7B /* ProxyGroupSpeedTestMenuItem.swift */; }; 49D176AB23575BB20093DD7B /* ProxyGroupMenuItemView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 49D176AA23575BB20093DD7B /* ProxyGroupMenuItemView.swift */; }; + 6AB113B928AF9D6800F46261 /* menu_icon.icns in Resources */ = {isa = PBXBuildFile; fileRef = 6AB113B828AF9D6800F46261 /* menu_icon.icns */; }; 8A2BBEA727A03ACB0081EBEF /* ProxySetting.sdef in Resources */ = {isa = PBXBuildFile; fileRef = 8A2BBEA627A03ACB0081EBEF /* ProxySetting.sdef */; }; 8ACD21BB27A04C7800BC4632 /* ProxySettingCommand.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8ACD21BA27A04C7800BC4632 /* ProxySettingCommand.swift */; }; 8ACD21BD27A04ED500BC4632 /* ProxyModeChangeCommand.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8ACD21BC27A04ED500BC4632 /* ProxyModeChangeCommand.swift */; }; @@ -147,7 +147,6 @@ 491E61FC258A424500313AEF /* CommonUtils.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CommonUtils.h; sourceTree = ""; }; 491E61FD258A424500313AEF /* CommonUtils.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = CommonUtils.m; sourceTree = ""; }; 49228456270AADE20027A4B6 /* RemoteConfigUpdateIntervalSettingView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RemoteConfigUpdateIntervalSettingView.swift; sourceTree = ""; }; - 4929F60F258CD22E00A435F6 /* menu_icon@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "menu_icon@2x.png"; sourceTree = ""; }; 4929F676258CD89B00A435F6 /* Country.mmdb.gz */ = {isa = PBXFileReference; lastKnownFileType = archive.gzip; path = Country.mmdb.gz; sourceTree = ""; }; 4929F67E258CE04700A435F6 /* Settings.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Settings.swift; sourceTree = ""; }; 4929F683258CE07500A435F6 /* UserDefaultWrapper.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = UserDefaultWrapper.swift; sourceTree = ""; }; @@ -210,6 +209,7 @@ 49D8276627E9B01700159D93 /* LoginKitWrapper.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = LoginKitWrapper.h; sourceTree = ""; }; 49D8276727E9B01700159D93 /* LoginKitWrapper.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = LoginKitWrapper.m; sourceTree = ""; }; 5217C006C5A22A1CEA24BFC1 /* Pods-ClashX.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-ClashX.debug.xcconfig"; path = "Pods/Target Support Files/Pods-ClashX/Pods-ClashX.debug.xcconfig"; sourceTree = ""; }; + 6AB113B828AF9D6800F46261 /* menu_icon.icns */ = {isa = PBXFileReference; lastKnownFileType = image.icns; path = menu_icon.icns; sourceTree = ""; }; 8A2BBEA627A03ACB0081EBEF /* ProxySetting.sdef */ = {isa = PBXFileReference; lastKnownFileType = text.xml; path = ProxySetting.sdef; sourceTree = ""; }; 8ACD21BA27A04C7800BC4632 /* ProxySettingCommand.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ProxySettingCommand.swift; sourceTree = ""; }; 8ACD21BC27A04ED500BC4632 /* ProxyModeChangeCommand.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ProxyModeChangeCommand.swift; sourceTree = ""; }; @@ -393,11 +393,11 @@ 49761DA521C9490400AE13EF /* Resources */ = { isa = PBXGroup; children = ( + 6AB113B828AF9D6800F46261 /* menu_icon.icns */, 4929F676258CD89B00A435F6 /* Country.mmdb.gz */, 01B009AC2854533200B93618 /* geoip.dat.gz */, 01B009AD2854533300B93618 /* geosite.dat.gz */, 01C1462928962E4E00346AF3 /* com.metacubex.ClashX.ProxyConfigHelper.meta.gz */, - 4929F60F258CD22E00A435F6 /* menu_icon@2x.png */, 49761DA621C9497000AE13EF /* dashboard */, 4989F98D20D0AE990001E564 /* sampleConfig.yaml */, ); @@ -632,6 +632,7 @@ isa = PBXResourcesBuildPhase; buildActionMask = 2147483647; files = ( + 6AB113B928AF9D6800F46261 /* menu_icon.icns in Resources */, 01B009AF2854533300B93618 /* geosite.dat.gz in Resources */, 49761DA721C9497000AE13EF /* dashboard in Resources */, 4929F677258CD89B00A435F6 /* Country.mmdb.gz in Resources */, @@ -642,7 +643,6 @@ 01B009AE2854533300B93618 /* geoip.dat.gz in Resources */, 49CF3B2820CD7465001EBF94 /* Main.storyboard in Resources */, 499A485A22ED781100F6C675 /* RemoteConfigAddView.xib in Resources */, - 4929F610258CD22E00A435F6 /* menu_icon@2x.png in Resources */, 4989F98E20D0AE990001E564 /* sampleConfig.yaml in Resources */, 01C1462A28962E4E00346AF3 /* com.metacubex.ClashX.ProxyConfigHelper.meta.gz in Resources */, ); diff --git a/ClashX/Resources/menu_icon.icns b/ClashX/Resources/menu_icon.icns new file mode 100644 index 0000000..3bee8a0 Binary files /dev/null and b/ClashX/Resources/menu_icon.icns differ diff --git a/ClashX/Views/StatusItemView.swift b/ClashX/Views/StatusItemView.swift index d710766..929b4a6 100644 --- a/ClashX/Views/StatusItemView.swift +++ b/ClashX/Views/StatusItemView.swift @@ -25,7 +25,7 @@ class StatusItemView: NSView { if let image = NSImage(contentsOfFile: customImagePath) { return image } - if let imagePath = Bundle.main.path(forResource: "menu_icon@2x", ofType: "png"), + if let imagePath = Bundle.main.path(forResource: "menu_icon", ofType: "icns"), let image = NSImage(contentsOfFile: imagePath) { return image } @@ -54,9 +54,6 @@ class StatusItemView: NSView { } uploadSpeedLabel.font = font downloadSpeedLabel.font = font - - uploadSpeedLabel.textColor = NSColor.black - downloadSpeedLabel.textColor = NSColor.black } func updateViewStatus(enableProxy: Bool) { @@ -68,6 +65,8 @@ class StatusItemView: NSView { unselectedColor = selectedColor.withAlphaComponent(0.5) } + uploadSpeedLabel.textColor = enableProxy ? NSColor.black : NSColor.init(white: 1.0, alpha: 0.5) + downloadSpeedLabel.textColor = enableProxy ? NSColor.black : NSColor.init(white: 1.0, alpha: 0.5) imageView.image = menuImage.tint(color: enableProxy ? selectedColor : unselectedColor) updateStatusItemView() } diff --git a/ClashX/Views/StatusItemView.xib b/ClashX/Views/StatusItemView.xib index dc15934..406d5df 100644 --- a/ClashX/Views/StatusItemView.xib +++ b/ClashX/Views/StatusItemView.xib @@ -1,15 +1,15 @@ - + - + - + @@ -69,6 +69,6 @@ - +