Fix android udp direct error

Add ipv6 switch Add access all selected button Remove android low version splash
chen08209 · Jun 12, 2024 · ee22709 · ee22709
1 parent 0a2ad63
commit ee22709
Show file tree

Hide file tree

Showing 21 changed files with 378 additions and 245 deletions.
diff --git a/android/app/src/main/res/values-night/styles.xml b/android/app/src/main/res/values-night/styles.xml
@@ -4,7 +4,6 @@
     <style name="LaunchTheme" parent="@android:style/Theme.Black.NoTitleBar">
         <!-- Show a splash screen on the activity. Automatically removed when
              the Flutter engine draws its first frame -->
-        <item name="android:windowBackground">@mipmap/ic_launcher_foreground</item>
     </style>
     <!-- Theme applied to the Android Window as soon as the process has started.
          This theme determines the color of the Android Window while your

diff --git a/android/app/src/main/res/values/styles.xml b/android/app/src/main/res/values/styles.xml
@@ -4,7 +4,6 @@
     <style name="LaunchTheme" parent="@android:style/Theme.Light.NoTitleBar">
         <!-- Show a splash screen on the activity. Automatically removed when
              the Flutter engine draws its first frame -->
-        <item name="android:windowBackground">@mipmap/ic_launcher_foreground</item>
     </style>
     <!-- Theme applied to the Android Window as soon as the process has started.
          This theme determines the color of the Android Window while your

diff --git a/core/Clash.Meta b/core/Clash.Meta
diff --git a/core/common.go b/core/common.go
@@ -321,12 +321,12 @@ func generateProxyGroupAndRule(proxyGroup *[]map[string]any, rule *[]string) {
 }
 
 func overwriteConfig(targetConfig *config.RawConfig, patchConfig config.RawConfig, compatible bool) {
-	targetConfig.ExternalController = ""
+	targetConfig.ExternalController = patchConfig.ExternalController
 	targetConfig.ExternalUI = ""
 	targetConfig.Interface = ""
 	targetConfig.ExternalUIURL = ""
 	targetConfig.GeodataMode = false
-	//targetConfig.IPv6 = patchConfig.IPv6
+	targetConfig.IPv6 = patchConfig.IPv6
 	targetConfig.LogLevel = patchConfig.LogLevel
 	targetConfig.Port = 0
 	targetConfig.SocksPort = 0

diff --git a/lib/application.dart b/lib/application.dart
@@ -82,7 +82,7 @@ class ApplicationState extends State<Application> {
     super.initState();
     globalState.appController = AppController(context);
     WidgetsBinding.instance.addPostFrameCallback((timeStamp) async {
-      globalState.appController.afterInit();
+      await globalState.appController.init();
       globalState.appController.initLink();
       _updateGroups();
     });

diff --git a/lib/common/constant.dart b/lib/common/constant.dart
@@ -18,6 +18,7 @@ const configKey = "config";
 const listItemPadding = EdgeInsets.symmetric(horizontal: 16);
 const double dialogCommonWidth = 300;
 const repository = "chen08209/FlClash";
+const defaultExternalController = "127.0.0.1:9090";
 const maxMobileWidth = 600;
 const maxLaptopWidth = 840;
 final filter = ImageFilter.blur(

diff --git a/lib/controller.dart b/lib/controller.dart
@@ -256,6 +256,29 @@ class AppController {
     }
   }
 
+  init() async {
+    if (!config.silentLaunch) {
+      window?.show();
+    }
+    final commonScaffoldState = globalState.homeScaffoldKey.currentState;
+    if(commonScaffoldState?.mounted == true){
+      await commonScaffoldState?.loadingRun(() async {
+        await globalState.applyProfile(
+          appState: appState,
+          config: config,
+          clashConfig: clashConfig,
+        );
+      });
+    }else{
+      await globalState.applyProfile(
+        appState: appState,
+        config: config,
+        clashConfig: clashConfig,
+      );
+    }
+    await afterInit();
+  }
+
   afterInit() async {
     if (config.autoRun) {
       await updateSystemProxy(true);
@@ -265,9 +288,6 @@ class AppController {
     }
     autoUpdateProfiles();
     updateLogStatus();
-    if (!config.silentLaunch) {
-      window?.show();
-    }
     autoCheckUpdate();
   }
 

diff --git a/lib/fragments/access.dart b/lib/fragments/access.dart
@@ -105,49 +105,56 @@ class _AccessFragmentState extends State<AccessFragment> {
     );
   }
 
-  // Widget _buildSelectedAllButton({
-  //   required bool isSelectedAll,
-  //   required List<String> allValueList,
-  // }) {
-  //   return Builder(
-  //     builder: (context) {
-  //       final tooltip = isSelectedAll
-  //           ? appLocalizations.cancelSelectAll
-  //           : appLocalizations.selectAll;
-  //       return IconButton(
-  //         tooltip: tooltip,
-  //         onPressed: () {
-  //           final config = globalState.appController.config;
-  //           final isAccept =
-  //               config.accessControl.mode == AccessControlMode.acceptSelected;
-  //
-  //           if (isSelectedAll) {
-  //             config.accessControl = switch (isAccept) {
-  //               true => config.accessControl.copyWith(
-  //                   acceptList: [],
-  //                 ),
-  //               false => config.accessControl.copyWith(
-  //                   rejectList: [],
-  //                 ),
-  //             };
-  //           } else {
-  //             config.accessControl = switch (isAccept) {
-  //               true => config.accessControl.copyWith(
-  //                   acceptList: allValueList,
-  //                 ),
-  //               false => config.accessControl.copyWith(
-  //                   rejectList: allValueList,
-  //                 ),
-  //             };
-  //           }
-  //         },
-  //         icon: isSelectedAll
-  //             ? const Icon(Icons.deselect)
-  //             : const Icon(Icons.select_all),
-  //       );
-  //     },
-  //   );
-  // }
+  _buildSelectedAllButton({
+    required bool isAccessControl,
+    required bool isSelectedAll,
+    required List<String> allValueList,
+  }) {
+    WidgetsBinding.instance.addPostFrameCallback((_) {
+      final tooltip = isSelectedAll
+          ? appLocalizations.cancelSelectAll
+          : appLocalizations.selectAll;
+      final commonScaffoldState =
+          context.findAncestorStateOfType<CommonScaffoldState>();
+      commonScaffoldState?.floatingActionButton = DisabledMask(
+        status: !isAccessControl,
+        child: AbsorbPointer(
+          absorbing: !isAccessControl,
+          child: FloatingActionButton (
+            tooltip: tooltip,
+            onPressed: () {
+              final config = globalState.appController.config;
+              final isAccept =
+                  config.accessControl.mode == AccessControlMode.acceptSelected;
+
+              if (isSelectedAll) {
+                config.accessControl = switch (isAccept) {
+                  true => config.accessControl.copyWith(
+                      acceptList: [],
+                    ),
+                  false => config.accessControl.copyWith(
+                      rejectList: [],
+                    ),
+                };
+              } else {
+                config.accessControl = switch (isAccept) {
+                  true => config.accessControl.copyWith(
+                      acceptList: allValueList,
+                    ),
+                  false => config.accessControl.copyWith(
+                      rejectList: allValueList,
+                    ),
+                };
+              }
+            },
+            child: isSelectedAll
+                ? const Icon(Icons.deselect)
+                : const Icon(Icons.select_all),
+          ),
+        ),
+      );
+    });
+  }
 
   Widget _buildPackageList() {
     return ValueListenableBuilder(
@@ -199,6 +206,11 @@ class _AccessFragmentState extends State<AccessFragment> {
                 accessControlMode == AccessControlMode.acceptSelected
                     ? appLocalizations.accessControlAllowDesc
                     : appLocalizations.accessControlNotAllowDesc;
+            _buildSelectedAllButton(
+              isAccessControl: isAccessControl,
+              isSelectedAll: valueList.length == packageNameList.length,
+              allValueList: packageNameList,
+            );
             return DisabledMask(
               status: !isAccessControl,
               child: Column(
@@ -490,7 +502,8 @@ class AccessControlSearchDelegate extends SearchDelegate {
         final isAccessControl = state.isAccessControl;
         final accessControlMode = accessControl.mode;
         final currentList = accessControl.currentList;
-        final packageNameList = this.packages.map((e) => e.packageName).toList();
+        final packageNameList =
+            this.packages.map((e) => e.packageName).toList();
         final valueList = currentList.intersection(packageNameList);
         return DisabledMask(
           status: !isAccessControl,

diff --git a/lib/fragments/config.dart b/lib/fragments/config.dart
@@ -57,7 +57,7 @@ class _ConfigFragmentState extends State<ConfigFragment> {
               _modifyMixedPort(mixedPort);
             },
             padding: const EdgeInsets.symmetric(horizontal: 16, vertical: 4),
-            leading: const Icon(Icons.adjust),
+            leading: const Icon(Icons.adjust_outlined),
             title: Text(appLocalizations.proxyPort),
             trailing: FilledButton.tonal(
               onPressed: () {
@@ -70,6 +70,26 @@ class _ConfigFragmentState extends State<ConfigFragment> {
           );
         },
       ),
+      Selector<ClashConfig, bool>(
+        selector: (_, clashConfig) => clashConfig.ipv6,
+        builder: (_, ipv6, __) {
+          return ListItem.switchItem(
+            leading: const Icon(Icons.water_outlined),
+            title: const Text("Ipv6"),
+            subtitle: Text(appLocalizations.ipv6Desc),
+            delegate: SwitchDelegate(
+              value: ipv6,
+              onChanged: (bool value) async {
+                final appController = globalState.appController;
+                appController.clashConfig.ipv6 = value;
+                await appController.updateClashConfig(
+                  isPatch: false,
+                );
+              },
+            ),
+          );
+        },
+      ),
       Selector<ClashConfig, bool>(
         selector: (_, clashConfig) => clashConfig.allowLan,
         builder: (_, allowLan, __) {
@@ -129,7 +149,7 @@ class _ConfigFragmentState extends State<ConfigFragment> {
         selector: (_, config) => config.isCompatible,
         builder: (_, isCompatible, __) {
           return ListItem.switchItem(
-            leading: const Icon(Icons.expand),
+            leading: const Icon(Icons.expand_outlined),
             title: Text(appLocalizations.compatible),
             subtitle: Text(appLocalizations.compatibleDesc),
             delegate: SwitchDelegate(
@@ -145,25 +165,39 @@ class _ConfigFragmentState extends State<ConfigFragment> {
           );
         },
       ),
+      // Selector<ClashConfig, bool>(
+      //   selector: (_, clashConfig) => clashConfig.externalController.isNotEmpty,
+      //   builder: (_, hasExternalController, __) {
+      //     return ListItem.switchItem(
+      //       leading: const Icon(Icons.api_outlined),
+      //       title: Text(appLocalizations.externalController),
+      //       subtitle: Text(appLocalizations.externalControllerDesc),
+      //       delegate: SwitchDelegate(
+      //         value: hasExternalController,
+      //         onChanged: (bool value) async {
+      //           final appController = globalState.appController;
+      //           appController.clashConfig.externalController =
+      //               value ? defaultExternalController : '';
+      //           await appController.updateClashConfig(
+      //             isPatch: false,
+      //           );
+      //         },
+      //       ),
+      //     );
+      //   },
+      // ),
       Padding(
         padding: kMaterialListPadding,
         child: Selector<ClashConfig, LogLevel>(
           selector: (_, clashConfig) => clashConfig.logLevel,
           builder: (_, value, __) {
             return ListItem(
-              leading: const Icon(Icons.feedback),
+              leading: const Icon(Icons.info_outline),
               title: Text(appLocalizations.logLevel),
               trailing: SizedBox(
                 height: 48,
                 child: DropdownMenu<LogLevel>(
                   width: 124,
-                  inputDecorationTheme: const InputDecorationTheme(
-                    filled: true,
-                    contentPadding: EdgeInsets.symmetric(
-                      vertical: 5,
-                      horizontal: 16,
-                    ),
-                  ),
                   initialSelection: value,
                   dropdownMenuEntries: [
                     for (final logLevel in LogLevel.values)

diff --git a/lib/fragments/dashboard/network_detection.dart b/lib/fragments/dashboard/network_detection.dart
@@ -25,6 +25,7 @@ class _NetworkDetectionState extends State<NetworkDetection> {
     bool isStart,
   ) async {
     if (!isInit) return;
+    timeoutNotifier.value = false;
     if (_preIsStart == false && _preIsStart == isStart) return;
     if (cancelToken != null) {
       cancelToken!.cancel();
@@ -151,9 +152,10 @@ class _NetworkDetectionState extends State<NetworkDetection> {
                             builder: (_, timeout, __) {
                               if (timeout) {
                                 return Text(
-                                  appLocalizations.ipCheckTimeout,
-                                  style: context.textTheme.titleLarge
-                                      ?.toSoftBold(),
+                                  "timeout",
+                                  style: context.textTheme.titleMedium
+                                      ?.copyWith(color: Colors.red)
+                                      .toSoftBold(),
                                   maxLines: 1,
                                   overflow: TextOverflow.ellipsis,
                                 );

diff --git a/lib/l10n/arb/intl_en.arb b/lib/l10n/arb/intl_en.arb
@@ -163,5 +163,8 @@
   "ipCheckTimeout": "Ip check timeout",
   "search": "Search",
   "allowBypass": "Allow applications to bypass VPN",
-  "allowBypassDesc": "After opening, some applications can bypass VPN"
+  "allowBypassDesc": "Enabled to some applications can bypass VPN",
+  "externalController": "ExternalController",
+  "externalControllerDesc": "Enabled to control the clash on port 9090",
+  "ipv6Desc": "Enabled to will allow it to receive ipv6 traffic"
 }
diff --git a/lib/l10n/arb/intl_zh_CN.arb b/lib/l10n/arb/intl_zh_CN.arb
@@ -163,5 +163,8 @@
   "ipCheckTimeout": "Ip检测超时",
   "search": "搜索",
   "allowBypass": "允许应用绕过vpn",
-  "allowBypassDesc": "开启后部分应用可绕过VPN"
+  "allowBypassDesc": "开启后部分应用可绕过VPN",
+  "externalController": "外部控制器",
+  "externalControllerDesc": "开启后可通过9090端口控制clash内核",
+  "ipv6Desc": "开启后将可以接收ipv6流量"
 }
diff --git a/lib/l10n/intl/messages_en.dart b/lib/l10n/intl/messages_en.dart
@@ -43,7 +43,7 @@ class MessageLookup extends MessageLookupByLibrary {
         "allowBypass": MessageLookupByLibrary.simpleMessage(
             "Allow applications to bypass VPN"),
         "allowBypassDesc": MessageLookupByLibrary.simpleMessage(
-            "After opening, some applications can bypass VPN"),
+            "Enabled to some applications can bypass VPN"),
         "allowLan": MessageLookupByLibrary.simpleMessage("AllowLan"),
         "allowLanDesc": MessageLookupByLibrary.simpleMessage(
             "Allow access proxy through the LAN"),
@@ -116,6 +116,10 @@ class MessageLookup extends MessageLookupByLibrary {
         "edit": MessageLookupByLibrary.simpleMessage("Edit"),
         "en": MessageLookupByLibrary.simpleMessage("English"),
         "exit": MessageLookupByLibrary.simpleMessage("Exit"),
+        "externalController":
+            MessageLookupByLibrary.simpleMessage("ExternalController"),
+        "externalControllerDesc": MessageLookupByLibrary.simpleMessage(
+            "Enabled to control the clash on port 9090"),
         "externalResources":
             MessageLookupByLibrary.simpleMessage("External resources"),
         "file": MessageLookupByLibrary.simpleMessage("File"),
@@ -131,6 +135,8 @@ class MessageLookup extends MessageLookupByLibrary {
             MessageLookupByLibrary.simpleMessage("Import from URL"),
         "ipCheckTimeout":
             MessageLookupByLibrary.simpleMessage("Ip check timeout"),
+        "ipv6Desc": MessageLookupByLibrary.simpleMessage(
+            "Enabled to will allow it to receive ipv6 traffic"),
         "just": MessageLookupByLibrary.simpleMessage("Just"),
         "language": MessageLookupByLibrary.simpleMessage("Language"),
         "light": MessageLookupByLibrary.simpleMessage("Light"),

diff --git a/lib/l10n/intl/messages_zh_CN.dart b/lib/l10n/intl/messages_zh_CN.dart
@@ -96,6 +96,9 @@ class MessageLookup extends MessageLookupByLibrary {
         "edit": MessageLookupByLibrary.simpleMessage("编辑"),
         "en": MessageLookupByLibrary.simpleMessage("英语"),
         "exit": MessageLookupByLibrary.simpleMessage("退出"),
+        "externalController": MessageLookupByLibrary.simpleMessage("外部控制器"),
+        "externalControllerDesc":
+            MessageLookupByLibrary.simpleMessage("开启后可通过9090端口控制clash内核"),
         "externalResources": MessageLookupByLibrary.simpleMessage("外部资源"),
         "file": MessageLookupByLibrary.simpleMessage("文件"),
         "fileDesc": MessageLookupByLibrary.simpleMessage("直接上传配置文件"),
@@ -106,6 +109,7 @@ class MessageLookup extends MessageLookupByLibrary {
         "hours": MessageLookupByLibrary.simpleMessage("小时"),
         "importFromURL": MessageLookupByLibrary.simpleMessage("从URL导入"),
         "ipCheckTimeout": MessageLookupByLibrary.simpleMessage("Ip检测超时"),
+        "ipv6Desc": MessageLookupByLibrary.simpleMessage("开启后将可以接收ipv6流量"),
         "just": MessageLookupByLibrary.simpleMessage("刚刚"),
         "language": MessageLookupByLibrary.simpleMessage("语言"),
         "light": MessageLookupByLibrary.simpleMessage("浅色"),