Merge branch 'dev'

Author: jack80342

README.md

@@ -51,22 +51,14 @@ Then I rewrite the GUI code by swift.
 - Could reorder shadowsocks profiles by drag & drop in servers preferences panel.
 - Auto check update (unable to auto download)
 
-## Different from original ShadowsocksX
+## Differences from original ShadowsocksX
 
 Run ss-local as backgroud service through launchd, not in app process.
 So after you quit the app, the ss-local maybe is still running. 
 
 Add a manual mode which won't configure the system proxy settings. 
 Then you could configure your apps to use socks5 proxy manual.
 
-
-## TODO List
-- [ ] 用nettop替换掉sar，重写显示网速功能
-- [ ] 用Swift重写剩余的OC代码
-- [ ] 用SwiftUI重写界面
-- [ ] Embed the http proxy server [privoxy](http://www.privoxy.org/), [get it](https://homebrew.bintray.com/bottles/privoxy-3.0.26.sierra.bottle.tar.gz).
-- [ ] ACL mode support [Shadowsocks ACL](https://github.com/shadowsocksr/shadowsocksr-libev/tree/master/acl)
-
 ## License
 
 The project is released under the terms of GPLv3.

ShadowsocksX-NG.xcodeproj/project.pbxproj

@@ -33,6 +33,7 @@
 		099C07EE26249E6300D6FD67 /* Alamofire in Frameworks */ = {isa = PBXBuildFile; productRef = 099C07ED26249E6300D6FD67 /* Alamofire */; };
 		09AB0C26262F0485008E57C1 /* ProxyConfHelper.swift in Sources */ = {isa = PBXBuildFile; fileRef = 09AB0C25262F0485008E57C1 /* ProxyConfHelper.swift */; };
 		09AB0C2E262F298A008E57C1 /* ProxyConfHelperVersion.swift in Sources */ = {isa = PBXBuildFile; fileRef = 09AB0C2D262F298A008E57C1 /* ProxyConfHelperVersion.swift */; };
+		09B0F22926413D7A0045297F /* IconUtils.swift in Sources */ = {isa = PBXBuildFile; fileRef = 09B0F22826413D7A0045297F /* IconUtils.swift */; };
 		09C3968C26345B0B009C2C99 /* ProxyConfTool.swift in Sources */ = {isa = PBXBuildFile; fileRef = 09C3968B26345B0B009C2C99 /* ProxyConfTool.swift */; };
 		1F94B2D84433EFEBF9FAE5D0 /* Pods_ShadowsocksX_NG_R.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = DFF6A36F1612D98DC91EF19A /* Pods_ShadowsocksX_NG_R.framework */; };
 		9B07EFA71D048BBB0052D9DF /* ss-local in Resources */ = {isa = PBXBuildFile; fileRef = 9B07EFA61D048BBB0052D9DF /* ss-local */; };
@@ -139,6 +140,7 @@
 		0984E97F263AFDF800A79681 /* zh-Hans */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "zh-Hans"; path = "zh-Hans.lproj/SWBQRCodeWindowController.strings"; sourceTree = "<group>"; };
 		09AB0C25262F0485008E57C1 /* ProxyConfHelper.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ProxyConfHelper.swift; sourceTree = "<group>"; };
 		09AB0C2D262F298A008E57C1 /* ProxyConfHelperVersion.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ProxyConfHelperVersion.swift; sourceTree = "<group>"; };
+		09B0F22826413D7A0045297F /* IconUtils.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = IconUtils.swift; sourceTree = "<group>"; };
 		09C3968B26345B0B009C2C99 /* ProxyConfTool.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ProxyConfTool.swift; sourceTree = "<group>"; };
 		09F9DCD1261CC452006CA4B9 /* libcrypto.1.0.0.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; path = libcrypto.1.0.0.dylib; sourceTree = "<group>"; };
 		19083CFCED87354F006967FF /* Pods_ShadowsocksX_NGUITests.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_ShadowsocksX_NGUITests.framework; sourceTree = BUILT_PRODUCTS_DIR; };
@@ -344,6 +346,7 @@
 				0948A8CE26288D090060D4AA /* QRCodeUtils.swift */,
 				09AB0C25262F0485008E57C1 /* ProxyConfHelper.swift */,
 				09AB0C2D262F298A008E57C1 /* ProxyConfHelperVersion.swift */,
+				09B0F22826413D7A0045297F /* IconUtils.swift */,
 			);
 			path = "ShadowsocksX-NG";
 			sourceTree = "<group>";
@@ -691,6 +694,7 @@
 				090294792639B2CC00FAC817 /* SWBQRCodeWindowController.swift in Sources */,
 				083BF83B1D8275A800831C68 /* SystemThemeChangeHelper.swift in Sources */,
 				0948A8CF26288D090060D4AA /* QRCodeUtils.swift in Sources */,
+				09B0F22926413D7A0045297F /* IconUtils.swift in Sources */,
 				9B3FFF0D1D05FEB30019A709 /* Utils.swift in Sources */,
 				9BEEF0751D04EF3E00FC52B3 /* PreferencesWindowController.swift in Sources */,
 				9B0BFFE91D0460A70040E62B /* AppDelegate.swift in Sources */,
@@ -951,7 +955,7 @@
 					"$(PROJECT_DIR)",
 				);
 				MACOSX_DEPLOYMENT_TARGET = 10.12;
-				MARKETING_VERSION = 1.5.5;
+				MARKETING_VERSION = 1.6.0;
 				PRODUCT_BUNDLE_IDENTIFIER = "com.qiuyuzhou.ShadowsocksX-NG-R";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_OBJC_BRIDGING_HEADER = "";
@@ -970,7 +974,7 @@
 				CODE_SIGN_IDENTITY = "Mac Developer";
 				COMBINE_HIDPI_IMAGES = YES;
 				DEVELOPMENT_TEAM = 766AV76B44;
-				ENABLE_HARDENED_RUNTIME = NO;
+				ENABLE_HARDENED_RUNTIME = YES;
 				HEADER_SEARCH_PATHS = "$(inherited)";
 				INFOPLIST_FILE = "ShadowsocksX-NG/Info.plist";
 				LD_RUNPATH_SEARCH_PATHS = (
@@ -984,7 +988,7 @@
 					"$(PROJECT_DIR)",
 				);
 				MACOSX_DEPLOYMENT_TARGET = 10.12;
-				MARKETING_VERSION = 1.5.5;
+				MARKETING_VERSION = 1.6.0;
 				ONLY_ACTIVE_ARCH = YES;
 				PRODUCT_BUNDLE_IDENTIFIER = "com.qiuyuzhou.ShadowsocksX-NG-R";
 				PRODUCT_NAME = "$(TARGET_NAME)";

ShadowsocksX-NG/AppDelegate.swift

@@ -57,8 +57,8 @@ class AppDelegate: NSObject, NSApplicationDelegate, NSUserNotificationCenterDele
     @IBOutlet var editSubscribeMenuItem: NSMenuItem!
 
     // MARK: Variables
-    var statusItemView: StatusItemView!
-    var statusItem: NSStatusItem?
+    var statusItemView: StatusItemView?
+    var statusItem: NSStatusItem!
     var speedMonitor: NetWorkMonitor?
     var globalSubscribeFeed: Subscribe!
     var proxyConfHelper: ProxyConfHelper = ProxyConfHelper()
@@ -100,13 +100,7 @@ class AppDelegate: NSObject, NSApplicationDelegate, NSUserNotificationCenterDele
             "AutoUpdateSubscribe": false,
             ])
 
-        setUpMenu(defaults.bool(forKey: "enable_showSpeed"))
-
-        statusItem = NSStatusBar.system.statusItem(withLength: 20)
-        let image = NSImage(named: NSImage.Name("menu_icon"))
-        image?.isTemplate = true
-        statusItem?.image = image
-        statusItem?.menu = statusMenu
+        setSpeedStatusItem(defaults.bool(forKey: "enable_showSpeed"))
 
         let notifyCenter = NotificationCenter.default
         notifyCenter.addObserver(forName: NSNotification.Name(rawValue: NOTIFY_ADV_PROXY_CONF_CHANGED), object: nil, queue: nil
@@ -495,7 +489,7 @@ class AppDelegate: NSObject, NSApplicationDelegate, NSUserNotificationCenterDele
         let defaults = UserDefaults.standard
         var enable = defaults.bool(forKey: "enable_showSpeed")
         enable = !enable
-        setUpMenu(enable)
+        setSpeedStatusItem(enable)
         defaults.set(enable, forKey: "enable_showSpeed")
         updateMainMenu()
     }
@@ -590,33 +584,27 @@ class AppDelegate: NSObject, NSApplicationDelegate, NSUserNotificationCenterDele
     }
 
     func updateStatusItemUI() {
-        var image = NSImage()
-        let defaults = UserDefaults.standard
-        let mode = defaults.string(forKey: "ShadowsocksRunningMode")
-        if !defaults.bool(forKey: "ShadowsocksOn") {
+        if !UserDefaults.standard.bool(forKey: "ShadowsocksOn") {
             return
         }
-        if mode == "auto" {
-            image = NSImage(named: NSImage.Name("menu_icon_pac"))!
-            //statusItem?.title = "Auto".localized
-        } else if mode == "global" {
-            //statusItem?.title = "Global".localized
-            image = NSImage(named: NSImage.Name("menu_icon_global"))!
-        } else if mode == "manual" {
-            image = NSImage(named: NSImage.Name("menu_icon_manual"))!
-            //statusItem?.title = "Manual".localized
-        } else if mode == "whiteList" {
-            if defaults.string(forKey: "ACLFileName")! == "chn.acl" {
-                image = NSImage(named: NSImage.Name("menu_icon_white"))!
-            } else {
-                image = NSImage(named: NSImage.Name("menu_icon_acl"))!
-            }
+
+        var image = NSImage()
+        let iconImageName = IconUtils.getIconImageName();
+        if(iconImageName != "") {
+            image = NSImage(named: NSImage.Name(iconImageName))!
         }
-        let titleWidth: CGFloat = 0//statusItem?.title!.size(withAttributes: [NSFontAttributeName: statusItem?.button!.font!]).width//这里不包含IP白名单模式等等，需要重新调整//PS还是给上游加上白名单模式？
-        let imageWidth: CGFloat = 22
-        statusItem?.length = titleWidth + imageWidth
         image.isTemplate = true
         statusItem!.image = image
+
+        if(statusItem!.view != nil) {
+            statusItem!.length = 85
+            statusItemView = StatusItemView(statusItem: statusItem!, menu: statusMenu)
+            statusItem!.view = statusItemView
+
+            speedMonitor?.stop()
+            speedMonitor = NetWorkMonitor(statusItemView: statusItemView!)
+            speedMonitor?.start()
+        }
     }
 
     func updateMainMenu() {
@@ -723,28 +711,33 @@ class AppDelegate: NSObject, NSApplicationDelegate, NSUserNotificationCenterDele
 
     }
 
-    func setUpMenu(_ showSpeed: Bool) {
+    func setSpeedStatusItem(_ showSpeed: Bool) {
         // should not operate the system status bar
         // we can add sub menu like bittorrent sync
-//        if statusItem == nil{
-//            statusItem = NSStatusBar.system().statusItem(withLength: 85)
-//            let image = NSImage(named: "menu_icon")
-//            image?.isTemplate = true
-//            statusItem!.image = image
-//            statusItemView = StatusItemView(statusItem: statusItem!, menu: statusMenu)
-//            statusItem!.view = statusItemView
-//        }
-//        if showSpeed{
-//            if speedMonitor == nil{
-//                speedMonitor = NetWorkMonitor(statusItemView: statusItemView)
-//            }
-//            statusItem?.length = 85
-//            speedMonitor?.start()
-//        }else{
-//            speedMonitor?.stop()
-//            speedMonitor = nil
-//            statusItem?.length = 20
-//        }
+        if(statusItem == nil) {
+            statusItem = NSStatusBar.system.statusItem(withLength: NSStatusItem.variableLength)
+            let image = NSImage(named: NSImage.Name("menu_icon"))
+            image!.isTemplate = true
+            statusItem!.image = image
+            statusItem!.menu = statusMenu
+        }
+
+        if showSpeed {
+            statusItem!.length = 85
+            statusItemView = StatusItemView(statusItem: statusItem!, menu: statusMenu)
+            statusItem!.view = statusItemView
+
+            if speedMonitor == nil {
+                speedMonitor = NetWorkMonitor(statusItemView: statusItemView!)
+            }
+            speedMonitor?.start()
+        } else {
+            statusItem!.length = 20
+            statusItem!.view = nil
+
+            speedMonitor?.stop()
+            speedMonitor = nil
+        }
     }
 
     func checkForUpdate(mustShowAlert: Bool) -> Void {

ShadowsocksX-NG/Assets.xcassets/menu_icon_acl.imageset/Contents.json

@@ -1,22 +1,54 @@
 {
   "images" : [
     {
-      "idiom" : "universal",
       "filename" : "menu_icon_acl.png",
+      "idiom" : "universal",
       "scale" : "1x"
     },
     {
+      "appearances" : [
+        {
+          "appearance" : "luminosity",
+          "value" : "dark"
+        }
+      ],
+      "filename" : "menu_icon_acl-1.png",
       "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
       "filename" : "[email protected]",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "appearances" : [
+        {
+          "appearance" : "luminosity",
+          "value" : "dark"
+        }
+      ],
+      "filename" : "[email protected]",
+      "idiom" : "universal",
       "scale" : "2x"
     },
     {
       "idiom" : "universal",
       "scale" : "3x"
+    },
+    {
+      "appearances" : [
+        {
+          "appearance" : "luminosity",
+          "value" : "dark"
+        }
+      ],
+      "idiom" : "universal",
+      "scale" : "3x"
     }
   ],
   "info" : {
-    "version" : 1,
-    "author" : "xcode"
+    "author" : "xcode",
+    "version" : 1
   }
-}
+}

ShadowsocksX-NG/Assets.xcassets/menu_icon_acl.imageset/menu_icon_acl-1.png

@@ -1,22 +1,54 @@
 {
   "images" : [
     {
-      "idiom" : "universal",
       "filename" : "menu_icon_global.png",
+      "idiom" : "universal",
       "scale" : "1x"
     },
     {
+      "appearances" : [
+        {
+          "appearance" : "luminosity",
+          "value" : "dark"
+        }
+      ],
+      "filename" : "menu_icon_global-1.png",
       "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
       "filename" : "[email protected]",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "appearances" : [
+        {
+          "appearance" : "luminosity",
+          "value" : "dark"
+        }
+      ],
+      "filename" : "[email protected]",
+      "idiom" : "universal",
       "scale" : "2x"
     },
     {
       "idiom" : "universal",
       "scale" : "3x"
+    },
+    {
+      "appearances" : [
+        {
+          "appearance" : "luminosity",
+          "value" : "dark"
+        }
+      ],
+      "idiom" : "universal",
+      "scale" : "3x"
     }
   ],
   "info" : {
-    "version" : 1,
-    "author" : "xcode"
+    "author" : "xcode",
+    "version" : 1
   }
-}
+}