Fix windows tray issues

Fix urltest issues Add auto changelog
chen08209 · Oct 12, 2024 · 89bbbc6 · 89bbbc6
1 parent a3e1b38
commit 89bbbc6
Show file tree

Hide file tree

Showing 52 changed files with 2,445 additions and 151 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -102,7 +102,6 @@ jobs:
         with:
           name: artifact-${{ matrix.platform }}${{ matrix.arch && format('-{0}', matrix.arch) }}
           path: ./dist
-          retention-days: 1
           overwrite: true
 
 
@@ -162,3 +161,30 @@ jobs:
           target-branch: action-pr
           commit-message: Update from ${{ github.ref_name }}
           target-directory: /tmp/
+
+
+  upload-test:
+    if: ${{ contains(github.ref, '+') }}
+    permissions: write-all
+    needs: [ build ]
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
+
+      - name: Download
+        uses: actions/download-artifact@v4
+        with:
+          path: ./dist/
+          pattern: artifact-*
+          merge-multiple: true
+
+      - name: Upload
+        uses: actions/upload-artifact@v4
+        with:
+          name: artifact
+          path: ./dist
+          retention-days: 7
+          overwrite: true
diff --git a/.github/workflows/change.yml b/.github/workflows/change.yml
@@ -0,0 +1,45 @@
+name: change
+
+on:
+  push:
+    branches:
+      - 'main'
+
+jobs:
+  changelog:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
+
+      - name: Generate
+        run: |
+          tags=$(git tag --sort=creatordate)
+          previous=""
+          if [ ! -f CHANGELOG.md ]; then
+            echo "" > CHANGELOG.md
+          else
+            previous=$(grep -oP '^## \K.*' CHANGELOG.md | tail -n 1)
+          fi
+          for tag in $tags; do
+            if [ -n "$previous" ]; then
+              echo "## $tag" >> CHANGELOG.md
+              git log --pretty=format:"* %s (%h)" "$previous..$tag" >> CHANGELOG.md
+              echo -e "\n" >> CHANGELOG.md
+            fi
+            previous=$tag
+          done
+
+      - name: Commit
+        run: |
+          if ！git diff --cached --quiet; then
+            git config --local user.email "[email protected]"
+            git config --local user.name "GitHub Action"
+            git add CHANGELOG.md
+            git commit -m "Update Changelog"
+            git push
+          fi
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
diff --git a/core/common.go b/core/common.go
@@ -411,6 +411,12 @@ func overwriteConfig(targetConfig *config.RawConfig, patchConfig config.RawConfi
 	targetConfig.Profile.StoreSelected = false
 	targetConfig.GeoXUrl = patchConfig.GeoXUrl
 	targetConfig.GlobalUA = patchConfig.GlobalUA
+	if configParams.TestURL != nil {
+		constant.DefaultTestURL = *configParams.TestURL
+	}
+	for idx := range targetConfig.ProxyGroup {
+		targetConfig.ProxyGroup[idx]["url"] = ""
+	}
 	genHosts(targetConfig.Hosts, patchConfig.Hosts)
 	if configParams.OverrideDns {
 		targetConfig.DNS = patchConfig.DNS
@@ -454,7 +460,6 @@ func updateListeners(general *config.General, listeners map[string]constant.Inbo
 	}
 	runLock.Lock()
 	defer runLock.Unlock()
-
 	listener.PatchInboundListeners(listeners, tunnel.Tunnel, true)
 	listener.SetAllowLan(general.AllowLan)
 	inbound.SetSkipAuthPrefixes(general.SkipAuthPrefixes)
@@ -529,9 +534,6 @@ func applyConfig() error {
 	if err != nil {
 		cfg, _ = config.ParseRawConfig(config.DefaultRawConfig())
 	}
-	if configParams.TestURL != nil {
-		constant.DefaultTestURL = *configParams.TestURL
-	}
 	if configParams.IsPatch {
 		patchConfig(cfg.General, cfg.Controller)
 	} else {

diff --git a/lib/controller.dart b/lib/controller.dart
@@ -9,8 +9,10 @@ import 'package:fl_clash/common/archive.dart';
 import 'package:fl_clash/enum/enum.dart';
 import 'package:fl_clash/state.dart';
 import 'package:flutter/material.dart';
+import 'package:intl/intl.dart';
 import 'package:path/path.dart';
 import 'package:provider/provider.dart';
+import 'package:tray_manager/tray_manager.dart';
 import 'package:url_launcher/url_launcher.dart';
 
 import 'clash/core.dart';
@@ -605,6 +607,117 @@ class AppController {
     });
   }
 
+  Future _updateSystemTray({
+    required bool isStart,
+    required Brightness? brightness,
+  }) async {
+    await trayManager.destroy();
+    await trayManager.setIcon(
+      other.getTrayIconPath(
+        isStart: isStart,
+        brightness: brightness ??
+            WidgetsBinding.instance.platformDispatcher.platformBrightness,
+      ),
+    );
+    if (!Platform.isLinux) {
+      await trayManager.setToolTip(
+        appName,
+      );
+    }
+  }
+
+  updateTray() async {
+    if (!Platform.isLinux) {
+      await _updateSystemTray(
+        isStart: appFlowingState.isStart,
+        brightness: appState.brightness,
+      );
+    }
+    List<MenuItem> menuItems = [];
+    final showMenuItem = MenuItem(
+      label: appLocalizations.show,
+      onClick: (_) {
+        window?.show();
+      },
+    );
+    menuItems.add(showMenuItem);
+    final startMenuItem = MenuItem.checkbox(
+      label:
+      appFlowingState.isStart ? appLocalizations.stop : appLocalizations.start,
+      onClick: (_) async {
+        globalState.appController.updateStart();
+      },
+      checked: false,
+    );
+    menuItems.add(startMenuItem);
+    menuItems.add(MenuItem.separator());
+    for (final mode in Mode.values) {
+      menuItems.add(
+        MenuItem.checkbox(
+          label: Intl.message(mode.name),
+          onClick: (_) {
+            globalState.appController.clashConfig.mode = mode;
+          },
+          checked: mode == clashConfig.mode,
+        ),
+      );
+    }
+    menuItems.add(MenuItem.separator());
+    if (appFlowingState.isStart) {
+      menuItems.add(
+        MenuItem.checkbox(
+          label: appLocalizations.tun,
+          onClick: (_) {
+            globalState.appController.updateTun();
+          },
+          checked: clashConfig.tun.enable,
+        ),
+      );
+      menuItems.add(
+        MenuItem.checkbox(
+          label: appLocalizations.systemProxy,
+          onClick: (_) {
+            globalState.appController.updateSystemProxy();
+          },
+          checked: config.desktopProps.systemProxy,
+        ),
+      );
+      menuItems.add(MenuItem.separator());
+    }
+    final autoStartMenuItem = MenuItem.checkbox(
+      label: appLocalizations.autoLaunch,
+      onClick: (_) async {
+        globalState.appController.updateAutoLaunch();
+      },
+      checked: config.appSetting.autoLaunch,
+    );
+    final adminAutoStartMenuItem = MenuItem.checkbox(
+      label: appLocalizations.adminAutoLaunch,
+      onClick: (_) async {
+        globalState.appController.updateAdminAutoLaunch();
+      },
+      checked: config.appSetting.adminAutoLaunch,
+    );
+    menuItems.add(autoStartMenuItem);
+    menuItems.add(adminAutoStartMenuItem);
+    menuItems.add(MenuItem.separator());
+    final exitMenuItem = MenuItem(
+      label: appLocalizations.exit,
+      onClick: (_) async {
+        await globalState.appController.handleExit();
+      },
+    );
+    menuItems.add(exitMenuItem);
+    final menu = Menu(items: menuItems);
+    await trayManager.setContextMenu(menu);
+    if (Platform.isLinux) {
+      await _updateSystemTray(
+        isStart: appFlowingState.isStart,
+        brightness: appState.brightness,
+      );
+    }
+  }
+
   recoveryData(
     List<int> data,
     RecoveryOption recoveryOption,

diff --git a/lib/manager/tray_manager.dart b/lib/manager/tray_manager.dart
@@ -8,6 +8,7 @@ import 'package:flutter/material.dart';
 import 'package:intl/intl.dart';
 import 'package:provider/provider.dart';
 import 'package:tray_manager/tray_manager.dart';
+import 'package:window_ext/window_ext.dart';
 
 class TrayManager extends StatefulWidget {
   final Widget child;
@@ -21,129 +22,14 @@ class TrayManager extends StatefulWidget {
   State<TrayManager> createState() => _TrayContainerState();
 }
 
-class _TrayContainerState extends State<TrayManager> with TrayListener {
+class _TrayContainerState extends State<TrayManager>
+    with TrayListener {
   @override
   void initState() {
     super.initState();
     trayManager.addListener(this);
   }
 
-  _updateSystemTray({
-    required bool isStart,
-    required Brightness? brightness,
-  }) async {
-    if (Platform.isLinux) {
-      await trayManager.destroy();
-    }
-    await trayManager.setIcon(
-      other.getTrayIconPath(
-        isStart: isStart,
-        brightness: brightness ??
-            WidgetsBinding.instance.platformDispatcher.platformBrightness,
-      ),
-    );
-    if (!Platform.isLinux) {
-      await trayManager.setToolTip(
-        appName,
-      );
-    }
-  }
-
-  _updateTray(TrayState trayState) async {
-    WidgetsBinding.instance.addPostFrameCallback((_) {
-      if (!Platform.isLinux) {
-        _updateSystemTray(
-          isStart: trayState.isStart,
-          brightness: trayState.brightness,
-        );
-      }
-      List<MenuItem> menuItems = [];
-      final showMenuItem = MenuItem(
-        label: appLocalizations.show,
-        onClick: (_) {
-          window?.show();
-        },
-      );
-      menuItems.add(showMenuItem);
-      final startMenuItem = MenuItem.checkbox(
-        label:
-            trayState.isStart ? appLocalizations.stop : appLocalizations.start,
-        onClick: (_) async {
-          globalState.appController.updateStart();
-        },
-        checked: false,
-      );
-      menuItems.add(startMenuItem);
-      menuItems.add(MenuItem.separator());
-      for (final mode in Mode.values) {
-        menuItems.add(
-          MenuItem.checkbox(
-            label: Intl.message(mode.name),
-            onClick: (_) {
-              globalState.appController.clashConfig.mode = mode;
-            },
-            checked: mode == trayState.mode,
-          ),
-        );
-      }
-      menuItems.add(MenuItem.separator());
-      if (trayState.isStart) {
-        menuItems.add(
-          MenuItem.checkbox(
-            label: appLocalizations.tun,
-            onClick: (_) {
-              globalState.appController.updateTun();
-            },
-            checked: trayState.tunEnable,
-          ),
-        );
-        menuItems.add(
-          MenuItem.checkbox(
-            label: appLocalizations.systemProxy,
-            onClick: (_) {
-              globalState.appController.updateSystemProxy();
-            },
-            checked: trayState.systemProxy,
-          ),
-        );
-        menuItems.add(MenuItem.separator());
-      }
-      final autoStartMenuItem = MenuItem.checkbox(
-        label: appLocalizations.autoLaunch,
-        onClick: (_) async {
-          globalState.appController.updateAutoLaunch();
-        },
-        checked: trayState.autoLaunch,
-      );
-      final adminAutoStartMenuItem = MenuItem.checkbox(
-        label: appLocalizations.adminAutoLaunch,
-        onClick: (_) async {
-          globalState.appController.updateAdminAutoLaunch();
-        },
-        checked: trayState.adminAutoLaunch,
-      );
-      menuItems.add(autoStartMenuItem);
-      menuItems.add(adminAutoStartMenuItem);
-      menuItems.add(MenuItem.separator());
-      final exitMenuItem = MenuItem(
-        label: appLocalizations.exit,
-        onClick: (_) async {
-          await globalState.appController.handleExit();
-        },
-      );
-      menuItems.add(exitMenuItem);
-      final menu = Menu();
-      menu.items = menuItems;
-      trayManager.setContextMenu(menu);
-      if (Platform.isLinux) {
-        _updateSystemTray(
-          isStart: trayState.isStart,
-          brightness: trayState.brightness,
-        );
-      }
-    });
-  }
-
   @override
   Widget build(BuildContext context) {
     return Selector4<AppState, AppFlowingState, Config, ClashConfig, TrayState>(
@@ -162,7 +48,7 @@ class _TrayContainerState extends State<TrayManager> with TrayListener {
         return prev != next;
       },
       builder: (_, state, child) {
-        _updateTray(state);
+        globalState.appController.updateTray();
         return child!;
       },
       child: widget.child,