new: colorized tray icon

assets/images/convert_icon.sh

@@ -0,0 +1,3 @@
+in=$1
+out=$2
+convert -define icon:auto-resize=128,64,48,32,16 -gravity center  $in   $out

lib/features/system_tray/notifier/system_tray_notifier.dart

@@ -8,6 +8,7 @@ import 'package:hiddify/core/router/router.dart';
 import 'package:hiddify/features/config_option/data/config_option_repository.dart';
 import 'package:hiddify/features/connection/model/connection_status.dart';
 import 'package:hiddify/features/connection/notifier/connection_notifier.dart';
+import 'package:hiddify/features/proxy/active/active_proxy_notifier.dart';
 import 'package:hiddify/features/window/notifier/window_notifier.dart';
 import 'package:hiddify/gen/assets.gen.dart';
 import 'package:hiddify/singbox/model/singbox_config_enum.dart';
@@ -22,12 +23,7 @@ class SystemTrayNotifier extends _$SystemTrayNotifier with AppLogger {
   @override
   Future<void> build() async {
     if (!PlatformUtils.isDesktop) return;
-
+    ref.watch(activeProxyNotifierProvider).whenData((activeProxy) => setDelay(activeProxy.urlTestDelay));
-    await trayManager.setIcon(
-      _trayIconPath,
-      isTemplate: Platform.isMacOS,
-    );
-    if (!Platform.isLinux) await trayManager.setToolTip(Constants.appName);
 
     ConnectionStatus connection;
     try {
@@ -36,8 +32,12 @@ class SystemTrayNotifier extends _$SystemTrayNotifier with AppLogger {
       loggy.warning("error getting connection status", e);
       connection = const ConnectionStatus.disconnected();
     }
-
     final serviceMode = ref.watch(ConfigOptions.serviceMode);
+    if (connection == Disconnected()) {
+      setIcon(connection);
+    }
+
+    if (!Platform.isLinux) await trayManager.setToolTip(Constants.appName);
 
     final t = ref.watch(translationsProvider);
     final destinations = <(String label, String location)>[
@@ -66,18 +66,20 @@ class SystemTrayNotifier extends _$SystemTrayNotifier with AppLogger {
             Connected() => t.tray.status.disconnect,
             Disconnecting() => t.tray.status.disconnecting,
           },
-          checked: connection.isConnected,
+          // checked: connection.isConnected,
+          checked: false,
           disabled: connection.isSwitching,
           onClick: (_) async {
-            await ref
+            await ref.read(connectionNotifierProvider.notifier).toggleConnection();
-                .read(connectionNotifierProvider.notifier)
-                .toggleConnection();
           },
         ),
-        MenuItem.submenu(
+        MenuItem.separator(),
+        MenuItem(
           label: t.config.serviceMode,
-          submenu: Menu(
+          icon: Assets.images.trayIconIco,
-            items: [
+          disabled: true,
+        ),
+
         ...ServiceMode.values.map(
           (e) => MenuItem.checkbox(
             checked: e == serviceMode,
@@ -86,31 +88,27 @@ class SystemTrayNotifier extends _$SystemTrayNotifier with AppLogger {
             onClick: (menuItem) async {
               final newMode = ServiceMode.values.byName(menuItem.key!);
               loggy.debug("switching service mode: [$newMode]");
-                    await ref
+              await ref.read(ConfigOptions.serviceMode.notifier).update(newMode);
-                        .read(ConfigOptions.serviceMode.notifier)
-                        .update(newMode);
             },
           ),
         ),
-            ],
+
-          ),
+        // MenuItem.submenu(
-        ),
+        //   label: t.tray.open,
-        MenuItem.submenu(
+        //   submenu: Menu(
-          label: t.tray.open,
+        //     items: [
-          submenu: Menu(
+        //       ...destinations.map(
-            items: [
+        //         (e) => MenuItem(
-              ...destinations.map(
+        //           label: e.$1,
-                (e) => MenuItem(
+        //           onClick: (_) async {
-                  label: e.$1,
+        //             await ref.read(windowNotifierProvider.notifier).open();
-                  onClick: (_) async {
+        //             ref.read(routerProvider).go(e.$2);
-                    await ref.read(windowNotifierProvider.notifier).open();
+        //           },
-                    ref.read(routerProvider).go(e.$2);
+        //         ),
-                  },
+        //       ),
-                ),
+        //     ],
-              ),
+        //   ),
-            ],
+        // ),
-          ),
-        ),
         MenuItem.separator(),
         MenuItem(
           label: t.tray.quit,
@@ -124,17 +122,60 @@ class SystemTrayNotifier extends _$SystemTrayNotifier with AppLogger {
     await trayManager.setContextMenu(menu);
   }
 
-  static String get _trayIconPath {
+  static void setDelay(int delay) {
+    if (delay > 65000 || delay == 0) {
+      setIcon(const Disconnecting());
+      // else if (delay>1000)
+      //   SystemTrayNotifier.setIcon(timeout ? Disconnecting() : Connecting());
+    } else {
+      setIcon(const Connected());
+    }
+  }
+
+  static void setIcon(ConnectionStatus status) {
+    if (!PlatformUtils.isDesktop) return;
+    trayManager
+        .setIcon(
+          _trayIconPath(status),
+          isTemplate: Platform.isMacOS,
+        )
+        .asStream();
+  }
+
+  static String _trayIconPath(ConnectionStatus status) {
     if (Platform.isWindows) {
       final Brightness brightness = WidgetsBinding.instance.platformDispatcher.platformBrightness;
-      bool isDarkMode = brightness == Brightness.dark;
+      final isDarkMode = brightness == Brightness.dark;
+      switch (status) {
+        case Connected():
+          return Assets.images.trayIconConnectedIco;
+        case Connecting():
+          return Assets.images.trayIconDisconnectedIco;
+        case Disconnecting():
+          return Assets.images.trayIconDisconnectedIco;
+        case Disconnected():
           if (isDarkMode) {
             return Assets.images.trayIconIco;
           } else {
             return Assets.images.trayIconDarkIco;
           }
       }
-    
+    }
+    final isDarkMode = false;
+    switch (status) {
+      case Connected():
+        return Assets.images.trayIconConnectedPng.path;
+      case Connecting():
+        return Assets.images.trayIconDisconnectedPng.path;
+      case Disconnecting():
+        return Assets.images.trayIconDisconnectedPng.path;
+      case Disconnected():
+        if (isDarkMode) {
+          return Assets.images.trayIconDarkPng.path;
+        } else {
           return Assets.images.trayIconPng.path;
         }
     }
+    // return Assets.images.trayIconPng.path;
+  }
+}

pubspec.yaml

@@ -127,7 +127,9 @@ flutter:
     - assets/images/tray_icon_dark.ico
     - assets/images/tray_icon_dark.png
     - assets/images/tray_icon_connected.ico
+    - assets/images/tray_icon_connected.png
     - assets/images/tray_icon_disconnected.ico
+    - assets/images/tray_icon_disconnected.png
     - assets/images/connect_norouz.PNG
     - assets/images/disconnect_norouz.PNG