Fix the problem of invalid auto-selection

(cherry picked from commit aef50fe0e3)

.github/workflows/build.yml

@@ -89,7 +89,7 @@ jobs:
       - name: Checkout
         uses: actions/checkout@v4
         with:
-          submodules: recursive
+          fetch-depth: 0
 
       - name: Download
         uses: actions/download-artifact@v4
@@ -101,13 +101,13 @@ jobs:
       - name: Pre Release
         run: |
           pip install gitchangelog pystache mustache markdown
-          prelease=$(curl --silent "https://api.github.com/repos/chen08209/FlClash/releases/latest" | grep -Po '"tag_name": "\K.*?(?=")' || echo "")
-          if [ -z "$prelease" ]; then
+          pre=$(curl --silent "https://api.github.com/repos/chen08209/FlClash/releases/latest" | grep -Po '"tag_name": "\K.*?(?=")' || echo "")
+          if [ -z "pre" ]; then
             echo "init" > release.md
           else
             current="${{ github.ref_name }}"
             echo -e "\n\n<details markdown=1><summary>All changes from $current to the latest commit:</summary>\n\n" >> release.md
-            gitchangelog "${prelease}.." >> release.md 2>&1 || echo "Error in gitchangelog"
+            gitchangelog "${pre}.." >> release.md 2>&1 || echo "Error in gitchangelog"
             echo -e "\n\n</details>" >> release.md
           fi
       - name: Release

README.md

@@ -10,12 +10,12 @@ A multi-platform proxy client based on ClashMeta, simple and easy to use, open-s
 
 on Desktop:
 <p style="text-align: center;">
-    <img src="snapshots/desktop.gif">
+    <img alt="desktop" src="snapshots/desktop.gif">
 </p>
 
 on Mobile:
 <p style="text-align: center;">
-    <img src="snapshots/mobile.gif">
+    <img alt="mobile" src="snapshots/mobile.gif">
 </p>
 
 ## Features
@@ -28,6 +28,10 @@ on Mobile:
 
 ✨ Support subscription link, Dark mode
 
+## Contact
+
+[Telegram](https://t.me/+G-veVtwBOl4wODc1)
+
 ## Build
 
 1. Update submodules
@@ -82,3 +86,6 @@ on Mobile:
            ```bash
            dart .\setup.dart	
            ```
+           
+
+    

README_zh_CN.md

@@ -10,12 +10,12 @@
 
 on Desktop:
 <p style="text-align: center;">
-    <img src="snapshots/desktop.gif">
+    <img alt="desktop" src="snapshots/desktop.gif">
 </p>
 
 on Mobile:
 <p style="text-align: center;">
-    <img src="snapshots/mobile.gif">
+    <img alt="mobile" src="snapshots/mobile.gif">
 </p>
 
 ## Features
@@ -28,6 +28,10 @@ on Mobile:
 
 ✨ 支持一键导入订阅, 深色模式
 
+## Contact
+
+[Telegram](https://t.me/+G-veVtwBOl4wODc1)
+
 ## Build
 
 1. 更新 submodules

android/app/src/main/kotlin/com/follow/clash/MainActivity.kt

@@ -10,6 +10,7 @@ import io.flutter.embedding.engine.FlutterEngine
 class MainActivity : FlutterActivity() {
 
     override fun configureFlutterEngine(flutterEngine: FlutterEngine) {
+        GlobalState.flutterEngine?.destroy()
         super.configureFlutterEngine(flutterEngine)
         flutterEngine.plugins.add(AppPlugin())
         flutterEngine.plugins.add(ProxyPlugin())

android/app/src/main/kotlin/com/follow/clash/services/FlClashTileService.kt

@@ -37,14 +37,12 @@ class FlClashTileService : TileService() {
         }
     }
 
-
     override fun onStartListening() {
         super.onStartListening()
         GlobalState.runState.value?.let { updateTile(it) }
         GlobalState.runState.observeForever(observer)
     }
 
-
     @SuppressLint("StartActivityAndCollapseDeprecated")
     private fun activityTransfer() {
         val intent = Intent(this, TempActivity::class.java)
@@ -88,7 +86,7 @@ class FlClashTileService : TileService() {
             if(currentTilePlugin == null){
                 initFlutterEngine()
             }else{
-                currentTilePlugin?.handleStart()
+                currentTilePlugin.handleStart()
             }
         } else if(GlobalState.runState.value == RunState.START){
             GlobalState.runState.value = RunState.PENDING
@@ -97,7 +95,6 @@ class FlClashTileService : TileService() {
 
     }
 
-
     override fun onDestroy() {
         GlobalState.runState.removeObserver(observer)
         super.onDestroy()

android/app/src/main/kotlin/com/follow/clash/services/FlClashVpnService.kt

@@ -25,7 +25,8 @@ class FlClashVpnService : VpnService() {
 
     private val CHANNEL = "FlClash"
 
-    var fd: Int? = null;
+    var fd: Int? = null
+    private val notificationId: Int = 1
 
     private val passList = listOf(
         "*zhihu.com",
@@ -100,11 +101,12 @@ class FlClashVpnService : VpnService() {
     fun startForeground(title: String, content: String) {
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
             val channel =
-                NotificationChannel(CHANNEL, "FlClash", NotificationManager.IMPORTANCE_DEFAULT)
+                NotificationChannel(CHANNEL, "FlClash", NotificationManager.IMPORTANCE_LOW)
             val manager = getSystemService(NotificationManager::class.java)
             manager.createNotificationChannel(channel)
 
             val intent = Intent(this, MainActivity::class.java)
+
             val pendingIntent = if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
                 PendingIntent.getActivity(
                     this,
@@ -120,7 +122,9 @@ class FlClashVpnService : VpnService() {
                     PendingIntent.FLAG_UPDATE_CURRENT
                 )
             }
+
             val icon = IconCompat.createWithResource(this, this.applicationInfo.icon)
+
             val notification = with(NotificationCompat.Builder(this, CHANNEL)) {
                 setSmallIcon(icon)
                 setContentTitle(title)
@@ -132,12 +136,13 @@ class FlClashVpnService : VpnService() {
                 build()
             }
             if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.UPSIDE_DOWN_CAKE) {
-                startForeground(1, notification, FOREGROUND_SERVICE_TYPE_SPECIAL_USE)
+                startForeground(notificationId, notification, FOREGROUND_SERVICE_TYPE_SPECIAL_USE)
             } else {
-                startForeground(1, notification)
+                startForeground(notificationId, notification)
             }
         }
     }
+
     private fun stopForeground() {
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) {
             stopForeground(Service.STOP_FOREGROUND_REMOVE)

core/common.go

@@ -121,6 +121,7 @@ func overwriteConfig(targetConfig *config.RawConfig, patchConfig config.RawConfi
 	targetConfig.Tun.Device = patchConfig.Tun.Device
 	targetConfig.Tun.DNSHijack = patchConfig.Tun.DNSHijack
 	targetConfig.Tun.Stack = patchConfig.Tun.Stack
+	targetConfig.Profile.StoreSelected = false
 	if targetConfig.DNS.Enable == false {
 		targetConfig.DNS = patchConfig.DNS
 	} else {
@@ -164,10 +165,7 @@ func patchConfig(general *config.General) {
 	resolver.DisableIPv6 = !general.IPv6
 }
 
-func applyConfig(isPatch bool) bool {
-	if currentConfig == nil {
-		return false
-	}
+func applyConfig(isPatch bool) {
 	cfg, err := config.ParseRawConfig(currentConfig)
 	if err != nil {
 		cfg, _ = config.ParseRawConfig(config.DefaultRawConfig())
@@ -176,7 +174,5 @@ func applyConfig(isPatch bool) bool {
 		patchConfig(cfg.General)
 	} else {
 		executor.ApplyConfig(cfg, true)
-
 	}
-	return true
 }

core/dart-bridge/lib.go

@@ -24,7 +24,7 @@ func InitDartApi(api unsafe.Pointer) {
 	}
 }
 
-func sendToPort(port int64, msg string) {
+func SendToPort(port int64, msg string) {
 	var obj C.Dart_CObject
 	obj._type = C.Dart_CObject_kString
 	msgString := C.CString(msg)

core/dart-bridge/message.go

@@ -24,5 +24,5 @@ func (message *Message) toJson() string {
 }
 
 func SendMessage(message Message) {
-	sendToPort(*Port, message.toJson())
+	SendToPort(*Port, message.toJson())
 }

core/hub.go

@@ -21,7 +21,7 @@ import (
 	"unsafe"
 )
 
-var currentConfig *config.RawConfig
+var currentConfig = config.DefaultRawConfig()
 
 var isInit = false
 
@@ -63,26 +63,30 @@ func validateConfig(s *C.char) bool {
 }
 
 //export updateConfig
-func updateConfig(s *C.char) bool {
+func updateConfig(s *C.char, port C.longlong) {
+	i := int64(port)
+	go func() {
 		paramsString := C.GoString(s)
 		var params = &GenerateConfigParams{}
 		err := json.Unmarshal([]byte(paramsString), params)
 		if err != nil {
-		log.Errorln("generateConfig Unmarshal error %v", err)
-		return false
+			bridge.SendToPort(i, err.Error())
+			return
 		}
 		prof := decorationConfig(params.ProfilePath, *params.Config)
 		currentConfig = prof
 		if *params.IsPatch {
-		return applyConfig(true)
+			applyConfig(true)
 		} else {
-		return applyConfig(false)
+			applyConfig(false)
 		}
+		bridge.SendToPort(i, "")
+	}()
 }
 
 //export getProxies
 func getProxies() *C.char {
-	data, err := json.Marshal(tunnel.Proxies())
+	data, err := json.Marshal(tunnel.ProxiesWithProviders())
 	if err != nil {
 		return C.CString("")
 	}
@@ -98,7 +102,7 @@ func changeProxy(s *C.char) bool {
 		log.Infoln("Unmarshal ChangeProxyParams %v", err)
 		return false
 	}
-	proxies := tunnel.Proxies()
+	proxies := tunnel.ProxiesWithProviders()
 	proxy := proxies[*params.GroupName]
 	if proxy == nil {
 		return false
@@ -148,7 +152,7 @@ func asyncTestDelay(s *C.char) {
 		ctx, cancel := context.WithTimeout(context.Background(), time.Millisecond*time.Duration(params.Timeout))
 		defer cancel()
 
-		proxies := tunnel.Proxies()
+		proxies := tunnel.ProxiesWithProviders()
 		proxy := proxies[params.ProxyName]
 
 		delayData := &Delay{

lib/application.dart

@@ -112,7 +112,6 @@ class ApplicationState extends State<Application> {
               primaryColor: config.primaryColor,
             ),
             builder: (_, state, child) {
-              debugPrint("[Application] update===>");
               return DynamicColorBuilder(
                 builder: (lightDynamic, darkDynamic) {
                   _updateSystemColorSchemes(lightDynamic, darkDynamic);

lib/clash/core.dart

@@ -1,3 +1,4 @@
+import 'dart:async';
 import 'dart:convert';
 import 'dart:ffi';
 import 'dart:io';
@@ -16,19 +17,22 @@ class ClashCore {
   late final ClashFFI clashFFI;
   late final DynamicLibrary lib;
 
-  ClashCore._internal() {
+  DynamicLibrary _getClashLib() {
     if (Platform.isWindows) {
-      lib = DynamicLibrary.open("libclash.dll");
-      clashFFI = ClashFFI(lib);
+      return DynamicLibrary.open("libclash.dll");
     }
     if (Platform.isMacOS) {
-      lib = DynamicLibrary.open("libclash.dylib");
-      clashFFI = ClashFFI(lib);
+      return DynamicLibrary.open("libclash.dylib");
     }
     if (Platform.isAndroid || Platform.isLinux) {
-      lib = DynamicLibrary.open("libclash.so");
-      clashFFI = ClashFFI(lib);
+      return DynamicLibrary.open("libclash.so");
     }
+    throw "Platform is not supported";
+  }
+
+  ClashCore._internal() {
+    lib = _getClashLib();
+    clashFFI = ClashFFI(lib);
     clashFFI.initNativeApiBridge(
       NativeApi.initializeApiDLData,
       receiver.sendPort.nativePort,
@@ -61,51 +65,49 @@ class ClashCore {
         1;
   }
 
-  bool updateConfig(UpdateConfigParams updateConfigParams) {
+  Future<String> updateConfig(UpdateConfigParams updateConfigParams) {
+    final completer = Completer<String>();
+    final receiver = ReceivePort();
+    receiver.listen((message) {
+      if(!completer.isCompleted){
+        completer.complete(message);
+        receiver.close();
+      }
+    });
     final params = json.encode(updateConfigParams);
-    return clashFFI.updateConfig(
+    clashFFI.updateConfig(
       params.toNativeUtf8().cast(),
-        ) ==
-        1;
+      receiver.sendPort.nativePort,
+    );
+    return completer.future;
   }
 
-  List<Group> getProxiesGroups() {
+  Future<List<Group>> getProxiesGroups() {
     final proxiesRaw = clashFFI.getProxies();
-    final proxies = json.decode(proxiesRaw.cast<Utf8>().toDartString());
-    final groupsRaw = List.from(proxies.values).where((e) {
-      final excludeName = !UsedProxyExtension.valueList
-          .where((element) => element != UsedProxy.GLOBAL.name)
-          .contains(e['name']);
-      final validType = GroupTypeExtension.valueList.contains(e['type']);
-      return excludeName && validType;
-    }).map(
-          (e) {
-        e["all"] = ((e["all"] ?? []) as List)
+    final proxiesRawString = proxiesRaw.cast<Utf8>().toDartString();
+    return Isolate.run<List<Group>>(() {
+      final proxies = json.decode(proxiesRawString);
+      final groupNames = [
+        UsedProxy.GLOBAL.name,
+        ...(proxies[UsedProxy.GLOBAL.name]["all"] as List).where((e) {
+          final proxy = proxies[e];
+          return GroupTypeExtension.valueList.contains(proxy['type']);
+        })
+      ];
+      final groupsRaw = groupNames.map((groupName) {
+        final group = proxies[groupName];
+        group["all"] = ((group["all"] ?? []) as List)
+            .where(
+              (name) => !groupNames.contains(groupNames),
+            )
             .map(
               (name) => proxies[name],
             )
             .toList();
-        return e;
-      },
-    ).toList()
-      ..sort(
-            (a, b) {
-          final aIndex = GroupTypeExtension.getGroupType(a['type'])?.index;
-          final bIndex = GroupTypeExtension.getGroupType(b['type'])?.index;
-          if (a == null && b == null) {
-            return 0;
-          }
-          if (a == null) {
-            return 1;
-          }
-          if (b == null) {
-            return -1;
-          }
-          return aIndex! - bIndex!;
-        },
-      );
-    final groups = groupsRaw.map((e) => Group.fromJson(e)).toList();
-    return groups;
+        return group;
+      }).toList();
+      return groupsRaw.map((e) => Group.fromJson(e)).toList();
+    });
   }
 
   bool changeProxy(ChangeProxyParams changeProxyParams) {

lib/clash/generated/clash_ffi.dart

@@ -907,19 +907,22 @@ class ClashFFI {
   late final _validateConfig =
       _validateConfigPtr.asFunction<int Function(ffi.Pointer<ffi.Char>)>();
 
-  int updateConfig(
+  void updateConfig(
     ffi.Pointer<ffi.Char> s,
+    int port,
   ) {
     return _updateConfig(
       s,
+      port,
     );
   }
 
-  late final _updateConfigPtr =
-      _lookup<ffi.NativeFunction<GoUint8 Function(ffi.Pointer<ffi.Char>)>>(
-          'updateConfig');
+  late final _updateConfigPtr = _lookup<
+      ffi.NativeFunction<
+          ffi.Void Function(
+              ffi.Pointer<ffi.Char>, ffi.LongLong)>>('updateConfig');
   late final _updateConfig =
-      _updateConfigPtr.asFunction<int Function(ffi.Pointer<ffi.Char>)>();
+      _updateConfigPtr.asFunction<void Function(ffi.Pointer<ffi.Char>, int)>();
 
   ffi.Pointer<ffi.Char> getProxies() {
     return _getProxies();

lib/common/function.dart

@@ -19,8 +19,8 @@ Function debounce<F extends Function>(F func,{int milliseconds = 600}) {
     if (timer != null) {
       timer!.cancel();
     }
-    timer = Timer(Duration(milliseconds: milliseconds), () {
-      Function.apply(func, args ?? [], namedArgs);
+    timer = Timer(Duration(milliseconds: milliseconds), () async {
+      await Function.apply(func, args ?? [], namedArgs);
     });
   };
 }

lib/controller.dart

@@ -56,7 +56,9 @@ class AppController {
   updateRunTime() {
     if (proxyManager.startTime != null) {
       final startTimeStamp = proxyManager.startTime!.millisecondsSinceEpoch;
-      final nowTimeStamp = DateTime.now().millisecondsSinceEpoch;
+      final nowTimeStamp = DateTime
+          .now()
+          .millisecondsSinceEpoch;
       appState.runTime = nowTimeStamp - startTimeStamp;
     } else {
       appState.runTime = null;
@@ -71,28 +73,10 @@ class AppController {
   }
 
   changeProxy() {
-    final currentGroupName =
-        appState.getCurrentGroupName(config.currentGroupName, clashConfig.mode);
-    final currentProxyName =
-        appState.getCurrentProxyName(config.currentProxyName, clashConfig.mode);
-    if (config.profiles.isEmpty || currentProxyName == null) {
-      updateSystemProxy(false);
-      return;
-    }
-    if (currentGroupName == null) return;
-    final groupIndex = appState.groups.indexWhere(
-      (element) => element.name == currentGroupName,
-    );
-    if (groupIndex == -1) return;
-    final proxyIndex = appState.groups[groupIndex].all.indexWhere(
-      (element) => element.name == currentProxyName,
-    );
-    if (proxyIndex == -1) return;
-    clashCore.changeProxy(
-      ChangeProxyParams(
-        groupName: currentGroupName,
-        proxyName: currentProxyName,
-      ),
+    globalState.changeProxy(
+      appState: appState,
+      config: config,
+      clashConfig: clashConfig,
     );
   }
 
@@ -133,7 +117,7 @@ class AppController {
     }
   }
 
-  Future<bool> updateClashConfig({bool isPatch = true}) async {
+  Future<String> updateClashConfig({bool isPatch = true}) async {
     return await globalState.updateClashConfig(
       clashConfig: clashConfig,
       config: config,
@@ -141,12 +125,31 @@ class AppController {
     );
   }
 
+  applyProfile() async {
+    await globalState.applyProfile(
+      appState: appState,
+      config: config,
+      clashConfig: clashConfig,
+    );
+  }
+
+  Function?  _changeProfileDebounce;
+
+  changeProfileDebounce(String? profileId) {
+    if (profileId == config.currentProfileId) return;
+    config.currentProfileId = profileId;
+    _changeProfileDebounce ??= debounce<Function(String?)>((profileId) async {
+      await applyProfile();
+      appState.delayMap = {};
+      saveConfigPreferences();
+    });
+    _changeProfileDebounce!([profileId]);
+  }
+
   changeProfile(String? value) async {
     if (value == config.currentProfileId) return;
     config.currentProfileId = value;
-    await updateClashConfig(isPatch: false);
-    updateGroups();
-    changeProxy();
+    await applyProfile();
     appState.delayMap = {};
     saveConfigPreferences();
   }
@@ -160,15 +163,12 @@ class AppController {
       )
           .isBeforeNow();
       if (isNotNeedUpdate == false) continue;
-      final result = await profile.update();
-      if (result.type == ResultType.error) continue;
-      updateGroups();
-      changeProxy();
+      await profile.update();
     }
   }
 
-  updateGroups() {
-    globalState.updateGroups(appState);
+  Future<void> updateGroups() async {
+    await globalState.updateGroups(appState);
   }
 
   updateSystemColorSchemes(SystemColorSchemes systemColorSchemes) {
@@ -226,7 +226,6 @@ class AppController {
 
   afterInit() async {
     if (appState.isInit) {
-      changeProxy();
       if (config.autoRun) {
         await updateSystemProxy(true);
       } else {
@@ -308,9 +307,15 @@ class AppController {
               TextSpan(
                 text: " $url ",
                 style: TextStyle(
-                  color: Theme.of(context).colorScheme.primary,
+                  color: Theme
+                      .of(context)
+                      .colorScheme
+                      .primary,
                   decoration: TextDecoration.underline,
-                  decorationColor: Theme.of(context).colorScheme.primary,
+                  decorationColor: Theme
+                      .of(context)
+                      .colorScheme
+                      .primary,
                 ),
               ),
               TextSpan(

lib/enum/enum.dart

@@ -9,8 +9,7 @@ extension GroupTypeExtension on GroupType {
       )
       .toList();
 
-  static GroupType? getGroupType(String? value) {
-    if (value == null) return null;
+  static GroupType? getGroupType(String value) {
     final index = GroupTypeExtension.valueList.indexOf(value);
     if (index == -1) return null;
     return GroupType.values[index];

lib/fragments/dashboard/core_info.dart

@@ -12,7 +12,6 @@ class CoreInfo extends StatelessWidget {
     return Selector<AppState, VersionInfo?>(
       selector: (_, appState) => appState.versionInfo,
       builder: (_, versionInfo, __) {
-        debugPrint("[CoreInfo] update===>");
         return CommonCard(
           info: Info(
             label: appLocalizations.coreInfo,

lib/fragments/dashboard/network_detection.dart

@@ -111,7 +111,6 @@ class _NetworkDetectionState extends State<NetworkDetection> {
         );
       },
       builder: (_, state, __) {
-        debugPrint("[UpdateCurrentDelay] update===>");
         _updateCurrentDelay(
           state.currentProxyName,
           state.delay,
@@ -145,7 +144,6 @@ class _NetworkDetectionState extends State<NetworkDetection> {
             );
           },
           builder: (_, state, __) {
-            debugPrint("[NetworkDetection] update===>");
             return Container(
               padding: const EdgeInsets.all(16).copyWith(top: 0),
               child: Column(

lib/fragments/dashboard/start_button.dart

@@ -63,7 +63,6 @@ class _StartButtonState extends State<StartButton>
         hasProfile: config.profiles.isNotEmpty,
       ),
       builder: (_, state, child) {
-        debugPrint("[StartButton] update===>");
         if (!state.isInit || !state.hasProfile) {
           return Container();
         }

lib/fragments/profiles/profiles.dart

@@ -24,6 +24,7 @@ class ProfilesFragment extends StatefulWidget {
 }
 
 class _ProfilesFragmentState extends State<ProfilesFragment> {
+
   String _getLastUpdateTimeDifference(DateTime lastDateTime) {
     final currentDateTime = DateTime.now();
     final difference = currentDateTime.difference(lastDateTime);
@@ -209,7 +210,7 @@ class _ProfilesFragmentState extends State<ProfilesFragment> {
               child: _profileItem(
                 profile: profile,
                 groupValue: state.currentProfileId,
-                onChanged: context.appController.changeProfile,
+                onChanged: context.appController.changeProfileDebounce,
               ),
             ),
         ],
@@ -234,7 +235,6 @@ class _ProfilesFragmentState extends State<ProfilesFragment> {
           currentProfileId: config.currentProfileId,
         ),
         builder: (context, state, child) {
-          debugPrint("[Profiles] update===>");
           if (state.profiles.isEmpty) {
             return NullStatus(
               label: appLocalizations.nullProfileDesc,

lib/fragments/proxies.dart

@@ -1,4 +1,3 @@
-import 'package:collection/collection.dart';
 import 'package:fl_clash/clash/clash.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_adaptive_scaffold/flutter_adaptive_scaffold.dart';
@@ -57,26 +56,6 @@ class _ProxiesFragmentState extends State<ProxiesFragment>
     });
   }
 
-  _updateTabController(length) {
-    if (_tabController != null) {
-      _tabController!.dispose();
-      _tabController = null;
-    }
-    _tabController = TabController(
-      length: length,
-      vsync: this,
-    );
-  }
-
-  @override
-  void dispose() {
-    if (_tabController != null) {
-      _tabController!.dispose();
-      _tabController = null;
-    }
-    super.dispose();
-  }
-
   @override
   Widget build(BuildContext context) {
     return Selector<AppState, bool>(
@@ -87,14 +66,31 @@ class _ProxiesFragmentState extends State<ProxiesFragment>
         }
         return child!;
       },
-      child: Selector2<AppState, ClashConfig, List<Group>>(
-        selector: (_, appState, clashConfig) =>
-            appState.getCurrentGroups(clashConfig.mode),
-        shouldRebuild: (prev, next) =>
-            !const ListEquality<Group>().equals(prev, next),
-        builder: (_, groups, __) {
-          debugPrint("[Proxies] update===>");
-          _updateTabController(groups.length);
+      child: Selector3<AppState, Config, ClashConfig, ProxiesSelectorState>(
+        selector: (_, appState, config, clashConfig) {
+          final currentGroups = appState.getCurrentGroups(clashConfig.mode);
+          final currentProxyName = appState.getCurrentGroupNameWithGroups(
+            currentGroups,
+            config.currentGroupName,
+            clashConfig.mode,
+          );
+          final currentIndex = currentGroups
+              .indexWhere((element) => element.name == currentProxyName);
+          return ProxiesSelectorState(
+            currentIndex: currentIndex != -1 ? currentIndex : 0,
+            groups: currentGroups,
+          );
+        },
+        builder: (_, state, __) {
+          if (_tabController != null) {
+            _tabController!.dispose();
+            _tabController = null;
+          }
+          _tabController = TabController(
+            length: state.groups.length,
+            vsync: this,
+            initialIndex: state.currentIndex,
+          );
           return Column(
             mainAxisAlignment: MainAxisAlignment.start,
             crossAxisAlignment: CrossAxisAlignment.start,
@@ -108,7 +104,7 @@ class _ProxiesFragmentState extends State<ProxiesFragment>
                 overlayColor:
                     const MaterialStatePropertyAll(Colors.transparent),
                 tabs: [
-                  for (final group in groups)
+                  for (final group in state.groups)
                     Tab(
                       text: group.name,
                     ),
@@ -118,7 +114,7 @@ class _ProxiesFragmentState extends State<ProxiesFragment>
                 child: TabBarView(
                   controller: _tabController,
                   children: [
-                    for (final group in groups)
+                    for (final group in state.groups)
                       KeepContainer(
                         child: ProxiesTabView(
                           group: group,
@@ -197,7 +193,7 @@ class _ProxiesTabViewState extends State<ProxiesTabView>
     _controller.dispose();
   }
 
-  get group => widget.group;
+  Group get group => widget.group;
 
   get measure => context.appController.measure;
 
@@ -369,7 +365,20 @@ class _ProxiesTabViewState extends State<ProxiesTabView>
   }) {
     return SingleChildScrollView(
       padding: const EdgeInsets.all(16),
-      child: AnimateGrid<Proxy>(
+      child: Selector3<AppState, Config, ClashConfig, ProxiesCardSelectorState>(
+        selector: (_, appState, config, clashConfig) =>
+            ProxiesCardSelectorState(
+          currentGroupName: appState.getCurrentGroupName(
+            config.currentGroupName,
+            clashConfig.mode,
+          ),
+          currentProxyName: appState.getCurrentProxyName(
+            config.currentProxyName,
+            clashConfig.mode,
+          ),
+        ),
+        builder: (_, state, __) {
+          return AnimateGrid<Proxy>(
             items: _getProxies(group.all, proxiesSortType),
             columns: columns,
             itemHeight: _getItemHeight(),
@@ -377,17 +386,12 @@ class _ProxiesTabViewState extends State<ProxiesTabView>
               return ObjectKey(item);
             },
             builder: (_, proxy) {
-          return Selector3<AppState, Config, ClashConfig, String?>(
-            selector: (_, appState, config, clashConfig) =>
-                appState.getCurrentProxyName(
-              config.currentProxyName,
-              clashConfig.mode,
-            ),
-            builder: (_, value, __) {
-              final currentProxyName =
-                  group.type == GroupType.Selector ? value : group.now;
+              final isSelected = group.type == GroupType.Selector
+                  ? group.name == state.currentGroupName &&
+                  proxy.name == state.currentProxyName
+                  : group.now == proxy.name;
               return _card(
-                isSelected: proxy.name == currentProxyName,
+                isSelected: isSelected,
                 onPressed: () {
                   if (group.type == GroupType.Selector) {
                     final config = context.read<Config>();

lib/main.dart

@@ -78,6 +78,7 @@ Future<void> vpnService() async {
       TileListenerWithVpn(
         onStop: () async {
           await app?.tip(appLocalizations.stopVpn);
+          await globalState.stopSystemProxy();
           clashCore.shutdown();
           exit(0);
         },

lib/models/app.dart

@@ -165,19 +165,26 @@ class AppState with ChangeNotifier {
     }
   }
 
-  String? getCurrentGroupName(String? groupName, Mode mode) {
-    final currentGroups = getCurrentGroups(mode);
+  String? getCurrentGroupNameWithGroups(
+    List<Group> groups,
+    String? groupName,
+    Mode mode,
+  ) {
     switch (mode) {
       case Mode.direct:
         return null;
       case Mode.global:
         return UsedProxy.GLOBAL.name;
       case Mode.rule:
-        return groupName ??
-            (currentGroups.isNotEmpty ? currentGroups.first.name : null);
+        return groupName ?? (groups.isNotEmpty ? groups.first.name : null);
     }
   }
 
+  String? getCurrentGroupName(String? groupName, Mode mode) {
+    final currentGroups = getCurrentGroups(mode);
+    return getCurrentGroupNameWithGroups(currentGroups, groupName, mode);
+  }
+
   String? getCurrentProxyName(String? proxyName, Mode mode) {
     final currentGroups = getCurrentGroups(mode);
     switch (mode) {

lib/models/config.dart

@@ -87,7 +87,7 @@ class Config extends ChangeNotifier {
         _isMinimizeOnExit = true,
         _isAccessControl = false,
         _accessControl = AccessControl(),
-        _isAnimateToPage = false;
+        _isAnimateToPage = true;
 
   deleteProfileById(String id) {
     _profiles = profiles.where((element) => element.id != id).toList();

lib/models/generated/selector.freezed.dart

@@ -1740,3 +1740,295 @@ abstract class _HomeNavigationSelectorState
   _$$HomeNavigationSelectorStateImplCopyWith<_$HomeNavigationSelectorStateImpl>
       get copyWith => throw _privateConstructorUsedError;
 }
+
+/// @nodoc
+mixin _$ProxiesSelectorState {
+  int get currentIndex => throw _privateConstructorUsedError;
+  List<Group> get groups => throw _privateConstructorUsedError;
+
+  @JsonKey(ignore: true)
+  $ProxiesSelectorStateCopyWith<ProxiesSelectorState> get copyWith =>
+      throw _privateConstructorUsedError;
+}
+
+/// @nodoc
+abstract class $ProxiesSelectorStateCopyWith<$Res> {
+  factory $ProxiesSelectorStateCopyWith(ProxiesSelectorState value,
+          $Res Function(ProxiesSelectorState) then) =
+      _$ProxiesSelectorStateCopyWithImpl<$Res, ProxiesSelectorState>;
+  @useResult
+  $Res call({int currentIndex, List<Group> groups});
+}
+
+/// @nodoc
+class _$ProxiesSelectorStateCopyWithImpl<$Res,
+        $Val extends ProxiesSelectorState>
+    implements $ProxiesSelectorStateCopyWith<$Res> {
+  _$ProxiesSelectorStateCopyWithImpl(this._value, this._then);
+
+  // ignore: unused_field
+  final $Val _value;
+  // ignore: unused_field
+  final $Res Function($Val) _then;
+
+  @pragma('vm:prefer-inline')
+  @override
+  $Res call({
+    Object? currentIndex = null,
+    Object? groups = null,
+  }) {
+    return _then(_value.copyWith(
+      currentIndex: null == currentIndex
+          ? _value.currentIndex
+          : currentIndex // ignore: cast_nullable_to_non_nullable
+              as int,
+      groups: null == groups
+          ? _value.groups
+          : groups // ignore: cast_nullable_to_non_nullable
+              as List<Group>,
+    ) as $Val);
+  }
+}
+
+/// @nodoc
+abstract class _$$ProxiesSelectorStateImplCopyWith<$Res>
+    implements $ProxiesSelectorStateCopyWith<$Res> {
+  factory _$$ProxiesSelectorStateImplCopyWith(_$ProxiesSelectorStateImpl value,
+          $Res Function(_$ProxiesSelectorStateImpl) then) =
+      __$$ProxiesSelectorStateImplCopyWithImpl<$Res>;
+  @override
+  @useResult
+  $Res call({int currentIndex, List<Group> groups});
+}
+
+/// @nodoc
+class __$$ProxiesSelectorStateImplCopyWithImpl<$Res>
+    extends _$ProxiesSelectorStateCopyWithImpl<$Res, _$ProxiesSelectorStateImpl>
+    implements _$$ProxiesSelectorStateImplCopyWith<$Res> {
+  __$$ProxiesSelectorStateImplCopyWithImpl(_$ProxiesSelectorStateImpl _value,
+      $Res Function(_$ProxiesSelectorStateImpl) _then)
+      : super(_value, _then);
+
+  @pragma('vm:prefer-inline')
+  @override
+  $Res call({
+    Object? currentIndex = null,
+    Object? groups = null,
+  }) {
+    return _then(_$ProxiesSelectorStateImpl(
+      currentIndex: null == currentIndex
+          ? _value.currentIndex
+          : currentIndex // ignore: cast_nullable_to_non_nullable
+              as int,
+      groups: null == groups
+          ? _value._groups
+          : groups // ignore: cast_nullable_to_non_nullable
+              as List<Group>,
+    ));
+  }
+}
+
+/// @nodoc
+
+class _$ProxiesSelectorStateImpl implements _ProxiesSelectorState {
+  const _$ProxiesSelectorStateImpl(
+      {required this.currentIndex, required final List<Group> groups})
+      : _groups = groups;
+
+  @override
+  final int currentIndex;
+  final List<Group> _groups;
+  @override
+  List<Group> get groups {
+    if (_groups is EqualUnmodifiableListView) return _groups;
+    // ignore: implicit_dynamic_type
+    return EqualUnmodifiableListView(_groups);
+  }
+
+  @override
+  String toString() {
+    return 'ProxiesSelectorState(currentIndex: $currentIndex, groups: $groups)';
+  }
+
+  @override
+  bool operator ==(Object other) {
+    return identical(this, other) ||
+        (other.runtimeType == runtimeType &&
+            other is _$ProxiesSelectorStateImpl &&
+            (identical(other.currentIndex, currentIndex) ||
+                other.currentIndex == currentIndex) &&
+            const DeepCollectionEquality().equals(other._groups, _groups));
+  }
+
+  @override
+  int get hashCode => Object.hash(
+      runtimeType, currentIndex, const DeepCollectionEquality().hash(_groups));
+
+  @JsonKey(ignore: true)
+  @override
+  @pragma('vm:prefer-inline')
+  _$$ProxiesSelectorStateImplCopyWith<_$ProxiesSelectorStateImpl>
+      get copyWith =>
+          __$$ProxiesSelectorStateImplCopyWithImpl<_$ProxiesSelectorStateImpl>(
+              this, _$identity);
+}
+
+abstract class _ProxiesSelectorState implements ProxiesSelectorState {
+  const factory _ProxiesSelectorState(
+      {required final int currentIndex,
+      required final List<Group> groups}) = _$ProxiesSelectorStateImpl;
+
+  @override
+  int get currentIndex;
+  @override
+  List<Group> get groups;
+  @override
+  @JsonKey(ignore: true)
+  _$$ProxiesSelectorStateImplCopyWith<_$ProxiesSelectorStateImpl>
+      get copyWith => throw _privateConstructorUsedError;
+}
+
+/// @nodoc
+mixin _$ProxiesCardSelectorState {
+  String? get currentGroupName => throw _privateConstructorUsedError;
+  String? get currentProxyName => throw _privateConstructorUsedError;
+
+  @JsonKey(ignore: true)
+  $ProxiesCardSelectorStateCopyWith<ProxiesCardSelectorState> get copyWith =>
+      throw _privateConstructorUsedError;
+}
+
+/// @nodoc
+abstract class $ProxiesCardSelectorStateCopyWith<$Res> {
+  factory $ProxiesCardSelectorStateCopyWith(ProxiesCardSelectorState value,
+          $Res Function(ProxiesCardSelectorState) then) =
+      _$ProxiesCardSelectorStateCopyWithImpl<$Res, ProxiesCardSelectorState>;
+  @useResult
+  $Res call({String? currentGroupName, String? currentProxyName});
+}
+
+/// @nodoc
+class _$ProxiesCardSelectorStateCopyWithImpl<$Res,
+        $Val extends ProxiesCardSelectorState>
+    implements $ProxiesCardSelectorStateCopyWith<$Res> {
+  _$ProxiesCardSelectorStateCopyWithImpl(this._value, this._then);
+
+  // ignore: unused_field
+  final $Val _value;
+  // ignore: unused_field
+  final $Res Function($Val) _then;
+
+  @pragma('vm:prefer-inline')
+  @override
+  $Res call({
+    Object? currentGroupName = freezed,
+    Object? currentProxyName = freezed,
+  }) {
+    return _then(_value.copyWith(
+      currentGroupName: freezed == currentGroupName
+          ? _value.currentGroupName
+          : currentGroupName // ignore: cast_nullable_to_non_nullable
+              as String?,
+      currentProxyName: freezed == currentProxyName
+          ? _value.currentProxyName
+          : currentProxyName // ignore: cast_nullable_to_non_nullable
+              as String?,
+    ) as $Val);
+  }
+}
+
+/// @nodoc
+abstract class _$$ProxiesCardSelectorStateImplCopyWith<$Res>
+    implements $ProxiesCardSelectorStateCopyWith<$Res> {
+  factory _$$ProxiesCardSelectorStateImplCopyWith(
+          _$ProxiesCardSelectorStateImpl value,
+          $Res Function(_$ProxiesCardSelectorStateImpl) then) =
+      __$$ProxiesCardSelectorStateImplCopyWithImpl<$Res>;
+  @override
+  @useResult
+  $Res call({String? currentGroupName, String? currentProxyName});
+}
+
+/// @nodoc
+class __$$ProxiesCardSelectorStateImplCopyWithImpl<$Res>
+    extends _$ProxiesCardSelectorStateCopyWithImpl<$Res,
+        _$ProxiesCardSelectorStateImpl>
+    implements _$$ProxiesCardSelectorStateImplCopyWith<$Res> {
+  __$$ProxiesCardSelectorStateImplCopyWithImpl(
+      _$ProxiesCardSelectorStateImpl _value,
+      $Res Function(_$ProxiesCardSelectorStateImpl) _then)
+      : super(_value, _then);
+
+  @pragma('vm:prefer-inline')
+  @override
+  $Res call({
+    Object? currentGroupName = freezed,
+    Object? currentProxyName = freezed,
+  }) {
+    return _then(_$ProxiesCardSelectorStateImpl(
+      currentGroupName: freezed == currentGroupName
+          ? _value.currentGroupName
+          : currentGroupName // ignore: cast_nullable_to_non_nullable
+              as String?,
+      currentProxyName: freezed == currentProxyName
+          ? _value.currentProxyName
+          : currentProxyName // ignore: cast_nullable_to_non_nullable
+              as String?,
+    ));
+  }
+}
+
+/// @nodoc
+
+class _$ProxiesCardSelectorStateImpl implements _ProxiesCardSelectorState {
+  const _$ProxiesCardSelectorStateImpl(
+      {required this.currentGroupName, required this.currentProxyName});
+
+  @override
+  final String? currentGroupName;
+  @override
+  final String? currentProxyName;
+
+  @override
+  String toString() {
+    return 'ProxiesCardSelectorState(currentGroupName: $currentGroupName, currentProxyName: $currentProxyName)';
+  }
+
+  @override
+  bool operator ==(Object other) {
+    return identical(this, other) ||
+        (other.runtimeType == runtimeType &&
+            other is _$ProxiesCardSelectorStateImpl &&
+            (identical(other.currentGroupName, currentGroupName) ||
+                other.currentGroupName == currentGroupName) &&
+            (identical(other.currentProxyName, currentProxyName) ||
+                other.currentProxyName == currentProxyName));
+  }
+
+  @override
+  int get hashCode =>
+      Object.hash(runtimeType, currentGroupName, currentProxyName);
+
+  @JsonKey(ignore: true)
+  @override
+  @pragma('vm:prefer-inline')
+  _$$ProxiesCardSelectorStateImplCopyWith<_$ProxiesCardSelectorStateImpl>
+      get copyWith => __$$ProxiesCardSelectorStateImplCopyWithImpl<
+          _$ProxiesCardSelectorStateImpl>(this, _$identity);
+}
+
+abstract class _ProxiesCardSelectorState implements ProxiesCardSelectorState {
+  const factory _ProxiesCardSelectorState(
+          {required final String? currentGroupName,
+          required final String? currentProxyName}) =
+      _$ProxiesCardSelectorStateImpl;
+
+  @override
+  String? get currentGroupName;
+  @override
+  String? get currentProxyName;
+  @override
+  @JsonKey(ignore: true)
+  _$$ProxiesCardSelectorStateImplCopyWith<_$ProxiesCardSelectorStateImpl>
+      get copyWith => throw _privateConstructorUsedError;
+}

lib/models/selector.dart

@@ -5,6 +5,7 @@ import 'config.dart';
 import 'navigation.dart';
 import 'package.dart';
 import 'profile.dart';
+import 'proxy.dart';
 
 part 'generated/selector.freezed.dart';
 
@@ -101,3 +102,19 @@ class HomeNavigationSelectorState with _$HomeNavigationSelectorState{
     required String? locale,
   }) = _HomeNavigationSelectorState;
 }
+
+@freezed
+class ProxiesSelectorState with _$ProxiesSelectorState{
+  const factory ProxiesSelectorState({
+    required int currentIndex,
+    required List<Group> groups,
+  }) = _ProxiesSelectorState;
+}
+
+@freezed
+class ProxiesCardSelectorState with _$ProxiesCardSelectorState{
+  const factory ProxiesCardSelectorState({
+    required String? currentGroupName,
+    required String? currentProxyName,
+  }) = _ProxiesCardSelectorState;
+}

lib/pages/home.dart

@@ -140,7 +140,6 @@ class HomePage extends StatelessWidget {
         child: Selector<AppState, List<NavigationItem>>(
           selector: (_, appState) => appState.navigationItems,
           builder: (_, navigationItems, __) {
-            debugPrint("[Home] update===>");
             final desktopNavigationItems = navigationItems
                 .where(
                   (element) =>

lib/state.dart

@@ -38,7 +38,7 @@ class GlobalState {
     timer?.cancel();
   }
 
-  Future<bool> updateClashConfig({
+  Future<String> updateClashConfig({
     required ClashConfig clashConfig,
     required Config config,
     bool isPatch = true,
@@ -87,6 +87,25 @@ class GlobalState {
     updateCurrentDelayDebounce!([proxyName]);
   }
 
+  applyProfile({
+    required AppState appState,
+    required Config config,
+    required ClashConfig clashConfig,
+  }) async {
+    final res = await updateClashConfig(
+      clashConfig: clashConfig,
+      config: config,
+      isPatch: false,
+    );
+    if (res.isNotEmpty) return Result.error(message: res);
+    await updateGroups(appState);
+    changeProxy(
+      appState: appState,
+      config: config,
+      clashConfig: clashConfig,
+    );
+  }
+
   init({
     required AppState appState,
     required Config config,
@@ -100,15 +119,44 @@ class GlobalState {
       );
     }
     if (!appState.isInit) return;
-    await updateClashConfig(
-      clashConfig: clashConfig,
+    await applyProfile(
+      appState: appState,
       config: config,
-      isPatch: false,
+      clashConfig: clashConfig,
     );
-    updateGroups(appState);
     updateCoreVersionInfo(appState);
   }
 
+  changeProxy({
+    required AppState appState,
+    required Config config,
+    required ClashConfig clashConfig,
+  }) {
+    final currentGroupName =
+        appState.getCurrentGroupName(config.currentGroupName, clashConfig.mode);
+    final currentProxyName =
+        appState.getCurrentProxyName(config.currentProxyName, clashConfig.mode);
+    if (config.profiles.isEmpty || currentProxyName == null) {
+      stopSystemProxy();
+      return;
+    }
+    if (currentGroupName == null) return;
+    final groupIndex = appState.groups.indexWhere(
+      (element) => element.name == currentGroupName,
+    );
+    if (groupIndex == -1) return;
+    final proxyIndex = appState.groups[groupIndex].all.indexWhere(
+      (element) => element.name == currentProxyName,
+    );
+    if (proxyIndex == -1) return;
+    clashCore.changeProxy(
+      ChangeProxyParams(
+        groupName: currentGroupName,
+        proxyName: currentProxyName,
+      ),
+    );
+  }
+
   updatePackages(AppState appState) async {
     if (appState.packages.isEmpty && updatePackagesLock == false) {
       updatePackagesLock = true;
@@ -130,8 +178,8 @@ class GlobalState {
     );
   }
 
-  updateGroups(AppState appState) {
-    appState.groups = clashCore.getProxiesGroups();
+  Future<void> updateGroups(AppState appState) async {
+    appState.groups = await clashCore.getProxiesGroups();
   }
 
   showMessage({

lib/widgets/app_state_container.dart

@@ -15,7 +15,6 @@ class AppStateContainer extends StatelessWidget {
     return Selector<Config, bool>(
       selector: (_, config) => config.autoLaunch,
       builder: (_, isAutoLaunch, child) {
-        debugPrint("[autoLaunchContainer] update===>");
         autoLaunch?.updateStatus(isAutoLaunch);
         return child!;
       },
@@ -35,7 +34,6 @@ class AppStateContainer extends StatelessWidget {
         );
       },
       builder: (context, state, child) {
-        debugPrint("[NavigationsContainer] update===>");
         WidgetsBinding.instance.addPostFrameCallback(
           (_) {
             context.appController.appState.navigationItems =

lib/widgets/open_container.dart

@@ -446,7 +446,6 @@ class _OpenContainerRoute<T> extends ModalRoute<T> {
     return Selector<Config, ThemeMode>(
       selector: (_, config) => config.themeMode,
       builder: (_, __, ___) {
-        debugPrint("[OpenContainerTheme] update===>");
         _colorTween = _getColorTween(
           transitionType: transitionType,
           closedColor: Theme.of(context).colorScheme.background,

lib/widgets/tray_container.dart

@@ -144,7 +144,6 @@ class _TrayContainerState extends State<TrayContainer> with TrayListener {
         locale: config.locale,
       ),
       builder: (_, state, child) {
-        debugPrint("[TrayContainer] update===>");
         WidgetsBinding.instance.addPostFrameCallback((timeStamp) {
           updateMenu(state);
         });

pubspec.lock

@@ -258,10 +258,10 @@ packages:
     dependency: "direct main"
     description:
       name: flutter_adaptive_scaffold
-      sha256: "600bbe237530a249f957f7d0f36273c20bd38d137e28e098c5231c30cadbe927"
+      sha256: "9a1d5e9f728815e27b7b612883db19107ba8a35a46a97c757ea00896cb027451"
       url: "https://pub.flutter-io.cn"
     source: hosted
-    version: "0.1.10+1"
+    version: "0.1.10+2"
   flutter_lints:
     dependency: "direct dev"
     description:
@@ -279,10 +279,10 @@ packages:
     dependency: transitive
     description:
       name: flutter_plugin_android_lifecycle
-      sha256: "592dc01a18961a51c24ae5d963b724b2b7fa4a95c100fe8eb6ca8a5a4732cadf"
+      sha256: "8cf40eebf5dec866a6d1956ad7b4f7016e6c0cc69847ab946833b7d43743809f"
       url: "https://pub.flutter-io.cn"
     source: hosted
-    version: "2.0.18"
+    version: "2.0.19"
   flutter_test:
     dependency: "direct dev"
     description: flutter
@@ -997,10 +997,10 @@ packages:
     dependency: transitive
     description:
       name: yaml_edit
-      sha256: c566f4f804215d84a7a2c377667f546c6033d5b34b4f9e60dfb09d17c4e97826
+      sha256: e9c1a3543d2da0db3e90270dbb1e4eebc985ee5e3ffe468d83224472b2194a5f
       url: "https://pub.flutter-io.cn"
     source: hosted
-    version: "2.2.0"
+    version: "2.2.1"
 sdks:
   dart: ">=3.3.0 <4.0.0"
   flutter: ">=3.19.0"

pubspec.yaml

@@ -1,7 +1,7 @@
 name: fl_clash
 description: A multi-platform proxy client based on ClashMeta, simple and easy to use, open-source and ad-free.
 publish_to: 'none'
-version: 0.7.0
+version: 0.7.9
 environment:
   sdk: '>=3.1.0 <4.0.0'