Fix windows tray issues

Support setting bypassDomain Update flutter version
chen08209 · Nov 14, 2024 · 866fbb7 · 866fbb7
1 parent 3baa26e
commit 866fbb7
Show file tree

Hide file tree

Showing 36 changed files with 1,456 additions and 488 deletions.
diff --git a/lib/common/color.dart b/lib/common/color.dart
@@ -29,7 +29,6 @@ extension ColorSchemeExtension on ColorScheme {
   ColorScheme toPrueBlack(bool isPrueBlack) => isPrueBlack
       ? copyWith(
           surface: Colors.black,
-          background: Colors.black,
           surfaceContainer: surfaceContainer.darken(0.05),
         )
       : this;

diff --git a/lib/common/link.dart b/lib/common/link.dart
@@ -1,7 +1,7 @@
 import 'dart:async';
 
 import 'package:app_links/app_links.dart';
-import 'package:flutter/cupertino.dart';
+import 'package:flutter/material.dart';
 
 typedef InstallConfigCallBack = void Function(String url);
 

diff --git a/lib/controller.dart b/lib/controller.dart
@@ -528,8 +528,8 @@ class AppController {
   }
 
   updateSystemProxy() {
-    config.desktopProps = config.desktopProps.copyWith(
-      systemProxy: !config.desktopProps.systemProxy,
+    config.networkProps = config.networkProps.copyWith(
+      systemProxy: !config.networkProps.systemProxy,
     );
   }
 

diff --git a/lib/fragments/config/config.dart b/lib/fragments/config/config.dart
@@ -24,6 +24,7 @@ class _ConfigFragmentState extends State<ConfigFragment> {
           title: appLocalizations.network,
           isScaffold: true,
           isBlur: false,
+          extendPageWidth: 360,
           widget: const NetworkListView(),
         ),
       ),

diff --git a/lib/fragments/config/network.dart b/lib/fragments/config/network.dart
@@ -39,8 +39,8 @@ class TUNItem extends StatelessWidget {
 
   @override
   Widget build(BuildContext context) {
-    return Selector<Config, bool>(
-      selector: (_, config) => config.vpnProps.enable,
+    return Selector<ClashConfig, bool>(
+      selector: (_, clashConfig) => clashConfig.tun.enable,
       builder: (_, enable, __) {
         return ListItem.switchItem(
           title: Text(appLocalizations.tun),
@@ -87,8 +87,8 @@ class AllowBypassSwitch extends StatelessWidget {
   }
 }
 
-class SystemProxySwitch extends StatelessWidget {
-  const SystemProxySwitch({super.key});
+class VpnSystemProxySwitch extends StatelessWidget {
+  const VpnSystemProxySwitch({super.key});
 
   @override
   Widget build(BuildContext context) {
@@ -114,6 +114,33 @@ class SystemProxySwitch extends StatelessWidget {
   }
 }
 
+class SystemProxySwitch extends StatelessWidget {
+  const SystemProxySwitch({super.key});
+
+  @override
+  Widget build(BuildContext context) {
+    return Selector<Config, bool>(
+      selector: (_, config) => config.networkProps.systemProxy,
+      builder: (_, systemProxy, __) {
+        return ListItem.switchItem(
+          title: Text(appLocalizations.systemProxy),
+          subtitle: Text(appLocalizations.systemProxyDesc),
+          delegate: SwitchDelegate(
+            value: systemProxy,
+            onChanged: (bool value) async {
+              final config = globalState.appController.config;
+              final networkProps = config.networkProps;
+              config.networkProps = networkProps.copyWith(
+                systemProxy: value,
+              );
+            },
+          ),
+        );
+      },
+    );
+  }
+}
+
 class Ipv6Switch extends StatelessWidget {
   const Ipv6Switch({super.key});
 
@@ -176,26 +203,57 @@ class TunStackItem extends StatelessWidget {
 class BypassDomainItem extends StatelessWidget {
   const BypassDomainItem({super.key});
 
+  _initActions(BuildContext context) {
+    WidgetsBinding.instance.addPostFrameCallback((timeStamp) {
+      final commonScaffoldState =
+          context.findAncestorStateOfType<CommonScaffoldState>();
+      commonScaffoldState?.actions = [
+        IconButton(
+          onPressed: () {
+            globalState.showMessage(
+              title: appLocalizations.reset,
+              message: TextSpan(
+                text: appLocalizations.resetTip,
+              ),
+              onTab: () {
+                final config = globalState.appController.config;
+                config.networkProps = config.networkProps.copyWith(
+                  bypassDomain: defaultBypassDomain,
+                );
+                Navigator.of(context).pop();
+              },
+            );
+          },
+          tooltip: appLocalizations.reset,
+          icon: const Icon(
+            Icons.replay,
+          ),
+        )
+      ];
+    });
+  }
+
   @override
   Widget build(BuildContext context) {
     return ListItem.open(
       title: Text(appLocalizations.bypassDomain),
       subtitle: Text(appLocalizations.bypassDomainDesc),
       delegate: OpenDelegate(
         isBlur: false,
+        isScaffold: true,
         title: appLocalizations.bypassDomain,
         widget: Selector<Config, List<String>>(
-          selector: (_, config) => config.vpnProps.bypassDomain,
-          shouldRebuild: (prev, next) =>
-              !stringListEquality.equals(prev, next),
-          builder: (_, bypassDomain, __) {
+          selector: (_, config) => config.networkProps.bypassDomain,
+          shouldRebuild: (prev, next) => !stringListEquality.equals(prev, next),
+          builder: (context, bypassDomain, __) {
+            _initActions(context);
             return ListPage(
               title: appLocalizations.bypassDomain,
               items: bypassDomain,
               titleBuilder: (item) => Text(item),
-              onChange: (items){
+              onChange: (items) {
                 final config = globalState.appController.config;
-                config.vpnProps = config.vpnProps.copyWith(
+                config.networkProps = config.networkProps.copyWith(
                   bypassDomain: List.from(items),
                 );
               },
@@ -209,20 +267,28 @@ class BypassDomainItem extends StatelessWidget {
 }
 
 final networkItems = [
-  Platform.isAndroid ? const VPNSwitch() : const TUNItem(),
+  if (Platform.isAndroid) const VPNSwitch(),
   if (Platform.isAndroid)
     ...generateSection(
       title: "VPN",
       items: [
         const SystemProxySwitch(),
         const AllowBypassSwitch(),
         const Ipv6Switch(),
-        const BypassDomainItem(),
+      ],
+    ),
+  if (system.isDesktop)
+    ...generateSection(
+      title: appLocalizations.system,
+      items: [
+        SystemProxySwitch(),
+        BypassDomainItem(),
       ],
     ),
   ...generateSection(
     title: appLocalizations.options,
     items: [
+      if (system.isDesktop) const TUNItem(),
       const TunStackItem(),
     ],
   ),

diff --git a/lib/fragments/dashboard/dashboard.dart b/lib/fragments/dashboard/dashboard.dart
@@ -1,16 +1,18 @@
+import 'dart:io';
 import 'dart:math';
 
 import 'package:fl_clash/common/common.dart';
 import 'package:fl_clash/fragments/dashboard/intranet_ip.dart';
 import 'package:fl_clash/fragments/dashboard/status_switch.dart';
 import 'package:fl_clash/models/models.dart';
-import 'package:flutter/material.dart';
 import 'package:fl_clash/widgets/widgets.dart';
+import 'package:flutter/material.dart';
 import 'package:provider/provider.dart';
+
 import 'network_detection.dart';
+import 'network_speed.dart';
 import 'outbound_mode.dart';
 import 'start_button.dart';
-import 'network_speed.dart';
 import 'traffic_usage.dart';
 
 class DashboardFragment extends StatefulWidget {
@@ -22,7 +24,7 @@ class DashboardFragment extends StatefulWidget {
 
 class _DashboardFragmentState extends State<DashboardFragment> {
   _initFab(bool isCurrent) {
-    if(!isCurrent){
+    if (!isCurrent) {
       return;
     }
     WidgetsBinding.instance.addPostFrameCallback((_) {
@@ -66,10 +68,11 @@ class _DashboardFragmentState extends State<DashboardFragment> {
                   //     child: const VPNSwitch(),
                   //   ),
                   if (system.isDesktop) ...[
-                    GridItem(
-                      crossAxisCellCount: switchCount,
-                      child: const TUNSwitch(),
-                    ),
+                    if (Platform.isWindows)
+                      GridItem(
+                        crossAxisCellCount: switchCount,
+                        child: const TUNSwitch(),
+                      ),
                     GridItem(
                       crossAxisCellCount: switchCount,
                       child: const ProxySwitch(),

diff --git a/lib/fragments/dashboard/status_switch.dart b/lib/fragments/dashboard/status_switch.dart
@@ -75,16 +75,16 @@ class ProxySwitch extends StatelessWidget {
         iconData: Icons.shuffle,
       ),
       child: Selector<Config, bool>(
-        selector: (_, config) => config.desktopProps.systemProxy,
+        selector: (_, config) => config.networkProps.systemProxy,
         builder: (_, systemProxy, __) {
           return LocaleBuilder(
             builder: (_) => Switch(
               materialTapTargetSize: MaterialTapTargetSize.shrinkWrap,
               value: systemProxy,
               onChanged: (value) {
                 final config = globalState.appController.config;
-                config.desktopProps =
-                    config.desktopProps.copyWith(systemProxy: value);
+                config.networkProps =
+                    config.networkProps.copyWith(systemProxy: value);
               },
             ),
           );

diff --git a/lib/l10n/arb/intl_en.arb b/lib/l10n/arb/intl_en.arb
@@ -168,6 +168,7 @@
   "ipv6Desc": "When turned on it will be able to receive IPv6 traffic",
   "app": "App",
   "general": "General",
+  "vpnSystemProxyDesc": "Attach HTTP proxy to VpnService",
   "systemProxyDesc": "Attach HTTP proxy to VpnService",
   "unifiedDelay": "Unified delay",
   "unifiedDelayDesc": "Remove extra delays such as handshaking",
@@ -323,5 +324,6 @@
   "adminAutoLaunchDesc": "Boot up by using admin mode",
   "fontFamily": "FontFamily",
   "systemFont": "System font",
-  "toggle": "Toggle"
+  "toggle": "Toggle",
+  "system": "System"
 }
diff --git a/lib/l10n/arb/intl_zh_CN.arb b/lib/l10n/arb/intl_zh_CN.arb
@@ -168,7 +168,8 @@
   "ipv6Desc": "开启后将可以接收IPv6流量",
   "app": "应用",
   "general": "基础",
-  "systemProxyDesc": "为VpnService附加HTTP代理",
+  "vpnSystemProxyDesc": "为VpnService附加HTTP代理",
+  "systemProxyDesc": "设置系统代理",
   "unifiedDelay": "统一延迟",
   "unifiedDelayDesc": "去除握手等额外延迟",
   "tcpConcurrent": "TCP并发",
@@ -323,5 +324,6 @@
   "adminAutoLaunchDesc": "使用管理员模式开机自启动",
   "fontFamily": "字体",
   "systemFont": "系统字体",
-  "toggle": "切换"
+  "toggle": "切换",
+  "system": "系统"
 }
diff --git a/lib/l10n/intl/messages_en.dart b/lib/l10n/intl/messages_en.dart
@@ -426,6 +426,7 @@ class MessageLookup extends MessageLookupByLibrary {
         "style": MessageLookupByLibrary.simpleMessage("Style"),
         "submit": MessageLookupByLibrary.simpleMessage("Submit"),
         "sync": MessageLookupByLibrary.simpleMessage("Sync"),
+        "system": MessageLookupByLibrary.simpleMessage("System"),
         "systemFont": MessageLookupByLibrary.simpleMessage("System font"),
         "systemProxy": MessageLookupByLibrary.simpleMessage("System proxy"),
         "systemProxyDesc": MessageLookupByLibrary.simpleMessage(
@@ -475,6 +476,8 @@ class MessageLookup extends MessageLookupByLibrary {
             MessageLookupByLibrary.simpleMessage("Modify VPN related settings"),
         "vpnEnableDesc": MessageLookupByLibrary.simpleMessage(
             "Auto routes all system traffic through VpnService"),
+        "vpnSystemProxyDesc": MessageLookupByLibrary.simpleMessage(
+            "Attach HTTP proxy to VpnService"),
         "vpnTip": MessageLookupByLibrary.simpleMessage(
             "Changes take effect after restarting the VPN"),
         "webDAVConfiguration":

diff --git a/lib/l10n/intl/messages_zh_CN.dart b/lib/l10n/intl/messages_zh_CN.dart
@@ -340,10 +340,10 @@ class MessageLookup extends MessageLookupByLibrary {
         "style": MessageLookupByLibrary.simpleMessage("风格"),
         "submit": MessageLookupByLibrary.simpleMessage("提交"),
         "sync": MessageLookupByLibrary.simpleMessage("同步"),
+        "system": MessageLookupByLibrary.simpleMessage("系统"),
         "systemFont": MessageLookupByLibrary.simpleMessage("系统字体"),
         "systemProxy": MessageLookupByLibrary.simpleMessage("系统代理"),
-        "systemProxyDesc":
-            MessageLookupByLibrary.simpleMessage("为VpnService附加HTTP代理"),
+        "systemProxyDesc": MessageLookupByLibrary.simpleMessage("设置系统代理"),
         "tab": MessageLookupByLibrary.simpleMessage("标签页"),
         "tabAnimation": MessageLookupByLibrary.simpleMessage("选项卡动画"),
         "tabAnimationDesc":
@@ -381,6 +381,8 @@ class MessageLookup extends MessageLookupByLibrary {
         "vpnDesc": MessageLookupByLibrary.simpleMessage("修改VPN相关设置"),
         "vpnEnableDesc":
             MessageLookupByLibrary.simpleMessage("通过VpnService自动路由系统所有流量"),
+        "vpnSystemProxyDesc":
+            MessageLookupByLibrary.simpleMessage("为VpnService附加HTTP代理"),
         "vpnTip": MessageLookupByLibrary.simpleMessage("重启VPN后改变生效"),
         "webDAVConfiguration": MessageLookupByLibrary.simpleMessage("WebDAV配置"),
         "whitelistMode": MessageLookupByLibrary.simpleMessage("白名单模式"),

diff --git a/lib/l10n/l10n.dart b/lib/l10n/l10n.dart
diff --git a/lib/manager/clash_manager.dart b/lib/manager/clash_manager.dart
@@ -68,7 +68,7 @@ class _ClashContainerState extends State<ClashManager> with AppMessageListener {
         accessControl: config.isAccessControl ? config.accessControl : null,
         ipv6: config.vpnProps.ipv6,
         allowBypass: config.vpnProps.allowBypass,
-        bypassDomain: config.vpnProps.bypassDomain,
+        bypassDomain: config.networkProps.bypassDomain,
         systemProxy: config.vpnProps.systemProxy,
         onlyProxy: config.appSetting.onlyProxy,
         currentProfileName:

diff --git a/lib/manager/proxy_manager.dart b/lib/manager/proxy_manager.dart
@@ -8,13 +8,13 @@ class ProxyManager extends StatelessWidget {
 
   const ProxyManager({super.key, required this.child});
 
-  _updateProxy(ProxyState proxyState) {
+  _updateProxy(ProxyState proxyState) async {
     final isStart = proxyState.isStart;
     final systemProxy = proxyState.systemProxy;
     final port = proxyState.port;
     if (isStart && systemProxy) {
-      proxy?.startProxy(port);
-    }else{
+      proxy?.startProxy(port, proxyState.bassDomain);
+    } else {
       proxy?.stopProxy();
     }
   }
@@ -24,8 +24,9 @@ class ProxyManager extends StatelessWidget {
     return Selector3<AppFlowingState, Config, ClashConfig, ProxyState>(
       selector: (_, appFlowingState, config, clashConfig) => ProxyState(
         isStart: appFlowingState.isStart,
-        systemProxy: config.desktopProps.systemProxy,
+        systemProxy: config.networkProps.systemProxy,
         port: clashConfig.mixedPort,
+        bassDomain: config.networkProps.bypassDomain,
       ),
       builder: (_, state, child) {
         _updateProxy(state);