Update version

Adjust tab animation defaults

.github/workflows/build.yml

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

core/common.go

@@ -121,7 +121,6 @@ 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 {
@@ -165,7 +164,10 @@ func patchConfig(general *config.General) {
 	resolver.DisableIPv6 = !general.IPv6
 }
 
-func applyConfig(isPatch bool) {
+func applyConfig(isPatch bool) bool {
+	if currentConfig == nil {
+		return false
+	}
 	cfg, err := config.ParseRawConfig(currentConfig)
 	if err != nil {
 		cfg, _ = config.ParseRawConfig(config.DefaultRawConfig())
@@ -174,5 +176,7 @@ func applyConfig(isPatch 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.DefaultRawConfig()
+var currentConfig *config.RawConfig
 
 var isInit = false
 
@@ -63,30 +63,26 @@ func validateConfig(s *C.char) bool {
 }
 
 //export updateConfig
-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 {
-			bridge.SendToPort(i, err.Error())
-			return
-		}
-		prof := decorationConfig(params.ProfilePath, *params.Config)
-		currentConfig = prof
-		if *params.IsPatch {
-			applyConfig(true)
-		} else {
-			applyConfig(false)
-		}
-		bridge.SendToPort(i, "")
-	}()
+func updateConfig(s *C.char) bool {
+	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
+	}
+	prof := decorationConfig(params.ProfilePath, *params.Config)
+	currentConfig = prof
+	if *params.IsPatch {
+		return applyConfig(true)
+	} else {
+		return applyConfig(false)
+	}
 }
 
 //export getProxies
 func getProxies() *C.char {
-	data, err := json.Marshal(tunnel.ProxiesWithProviders())
+	data, err := json.Marshal(tunnel.Proxies())
 	if err != nil {
 		return C.CString("")
 	}
@@ -102,7 +98,7 @@ func changeProxy(s *C.char) bool {
 		log.Infoln("Unmarshal ChangeProxyParams %v", err)
 		return false
 	}
-	proxies := tunnel.ProxiesWithProviders()
+	proxies := tunnel.Proxies()
 	proxy := proxies[*params.GroupName]
 	if proxy == nil {
 		return false
@@ -152,7 +148,7 @@ func asyncTestDelay(s *C.char) {
 		ctx, cancel := context.WithTimeout(context.Background(), time.Millisecond*time.Duration(params.Timeout))
 		defer cancel()
 
-		proxies := tunnel.ProxiesWithProviders()
+		proxies := tunnel.Proxies()
 		proxy := proxies[params.ProxyName]
 
 		delayData := &Delay{

lib/application.dart

@@ -112,6 +112,7 @@ 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,4 +1,3 @@
-import 'dart:async';
 import 'dart:convert';
 import 'dart:ffi';
 import 'dart:io';
@@ -17,22 +16,19 @@ class ClashCore {
   late final ClashFFI clashFFI;
   late final DynamicLibrary lib;
 
-  DynamicLibrary _getClashLib() {
+  ClashCore._internal() {
     if (Platform.isWindows) {
-      return DynamicLibrary.open("libclash.dll");
+      lib = DynamicLibrary.open("libclash.dll");
+      clashFFI = ClashFFI(lib);
     }
     if (Platform.isMacOS) {
-      return DynamicLibrary.open("libclash.dylib");
+      lib = DynamicLibrary.open("libclash.dylib");
+      clashFFI = ClashFFI(lib);
     }
     if (Platform.isAndroid || Platform.isLinux) {
-      return DynamicLibrary.open("libclash.so");
+      lib = DynamicLibrary.open("libclash.so");
+      clashFFI = ClashFFI(lib);
     }
-    throw "Platform is not supported";
-  }
-
-  ClashCore._internal() {
-    lib = _getClashLib();
-    clashFFI = ClashFFI(lib);
     clashFFI.initNativeApiBridge(
       NativeApi.initializeApiDLData,
       receiver.sendPort.nativePort,
@@ -65,49 +61,51 @@ class ClashCore {
         1;
   }
 
-  Future<String> updateConfig(UpdateConfigParams updateConfigParams) {
-    final completer = Completer<String>();
-    final receiver = ReceivePort();
-    receiver.listen((message) {
-      if(!completer.isCompleted){
-        completer.complete(message);
-        receiver.close();
-      }
-    });
+  bool updateConfig(UpdateConfigParams updateConfigParams) {
     final params = json.encode(updateConfigParams);
-    clashFFI.updateConfig(
-      params.toNativeUtf8().cast(),
-      receiver.sendPort.nativePort,
-    );
-    return completer.future;
+    return clashFFI.updateConfig(
+          params.toNativeUtf8().cast(),
+        ) ==
+        1;
   }
 
-  Future<List<Group>> getProxiesGroups() {
+  List<Group> getProxiesGroups() {
     final proxiesRaw = clashFFI.getProxies();
-    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),
-            )
+    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)
             .map(
               (name) => proxies[name],
-            )
+        )
             .toList();
-        return group;
-      }).toList();
-      return groupsRaw.map((e) => Group.fromJson(e)).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;
   }
 
   bool changeProxy(ChangeProxyParams changeProxyParams) {

lib/clash/generated/clash_ffi.dart

@@ -907,22 +907,19 @@ class ClashFFI {
   late final _validateConfig =
       _validateConfigPtr.asFunction<int Function(ffi.Pointer<ffi.Char>)>();
 
-  void updateConfig(
+  int updateConfig(
     ffi.Pointer<ffi.Char> s,
-    int port,
   ) {
     return _updateConfig(
       s,
-      port,
     );
   }
 
-  late final _updateConfigPtr = _lookup<
-      ffi.NativeFunction<
-          ffi.Void Function(
-              ffi.Pointer<ffi.Char>, ffi.LongLong)>>('updateConfig');
+  late final _updateConfigPtr =
+      _lookup<ffi.NativeFunction<GoUint8 Function(ffi.Pointer<ffi.Char>)>>(
+          'updateConfig');
   late final _updateConfig =
-      _updateConfigPtr.asFunction<void Function(ffi.Pointer<ffi.Char>, int)>();
+      _updateConfigPtr.asFunction<int Function(ffi.Pointer<ffi.Char>)>();
 
   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), () async {
-      await Function.apply(func, args ?? [], namedArgs);
+    timer = Timer(Duration(milliseconds: milliseconds), () {
+      Function.apply(func, args ?? [], namedArgs);
     });
   };
 }

lib/controller.dart

@@ -56,9 +56,7 @@ 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;
@@ -73,10 +71,28 @@ class AppController {
   }
 
   changeProxy() {
-    globalState.changeProxy(
-      appState: appState,
-      config: config,
-      clashConfig: clashConfig,
+    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,
+      ),
     );
   }
 
@@ -117,7 +133,7 @@ class AppController {
     }
   }
 
-  Future<String> updateClashConfig({bool isPatch = true}) async {
+  Future<bool> updateClashConfig({bool isPatch = true}) async {
     return await globalState.updateClashConfig(
       clashConfig: clashConfig,
       config: config,
@@ -125,31 +141,12 @@ 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 applyProfile();
+    await updateClashConfig(isPatch: false);
+    updateGroups();
+    changeProxy();
     appState.delayMap = {};
     saveConfigPreferences();
   }
@@ -159,16 +156,19 @@ class AppController {
       if (!profile.autoUpdate) return;
       final isNotNeedUpdate = profile.lastUpdateDate
           ?.add(
-        profile.autoUpdateDuration,
-      )
+            profile.autoUpdateDuration,
+          )
           .isBeforeNow();
       if (isNotNeedUpdate == false) continue;
-      await profile.update();
+      final result = await profile.update();
+      if (result.type == ResultType.error) continue;
+      updateGroups();
+      changeProxy();
     }
   }
 
-  Future<void> updateGroups() async {
-    await globalState.updateGroups(appState);
+  updateGroups() {
+    globalState.updateGroups(appState);
   }
 
   updateSystemColorSchemes(SystemColorSchemes systemColorSchemes) {
@@ -177,7 +177,7 @@ class AppController {
 
   clearCurrentDelay() {
     final currentProxyName =
-    appState.getCurrentProxyName(config.currentProxyName, clashConfig.mode);
+        appState.getCurrentProxyName(config.currentProxyName, clashConfig.mode);
     if (currentProxyName == null) return;
     appState.setDelay(Delay(name: currentProxyName, value: null));
   }
@@ -226,6 +226,7 @@ class AppController {
 
   afterInit() async {
     if (appState.isInit) {
+      changeProxy();
       if (config.autoRun) {
         await updateSystemProxy(true);
       } else {
@@ -264,7 +265,7 @@ class AppController {
 
   toProfiles() {
     final index = globalState.currentNavigationItems.indexWhere(
-          (element) => element.label == "profiles",
+      (element) => element.label == "profiles",
     );
     if (index != -1) {
       toPage(index);
@@ -277,7 +278,7 @@ class AppController {
     final commonScaffoldState = globalState.homeScaffoldKey.currentState;
     if (commonScaffoldState?.mounted != true) return;
     commonScaffoldState?.loadingRun(
-          () async {
+      () async {
         await Future.delayed(const Duration(milliseconds: 300));
         final profile = Profile(
           url: url,
@@ -298,7 +299,7 @@ class AppController {
 
   initLink() {
     linkManager.initAppLinksListen(
-          (url) {
+      (url) {
         globalState.showMessage(
           title: "${appLocalizations.add}${appLocalizations.profile}",
           message: TextSpan(
@@ -307,20 +308,14 @@ 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(
                   text:
-                  "${appLocalizations.create}${appLocalizations.profile}"),
+                      "${appLocalizations.create}${appLocalizations.profile}"),
             ],
           ),
           onTab: () {
@@ -340,7 +335,7 @@ class AppController {
     final commonScaffoldState = globalState.homeScaffoldKey.currentState;
     if (commonScaffoldState?.mounted != true) return;
     commonScaffoldState?.loadingRun(
-          () async {
+      () async {
         await Future.delayed(const Duration(milliseconds: 300));
         final bytes = result.data?.bytes;
         if (bytes == null) {

lib/enum/enum.dart

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

lib/fragments/dashboard/core_info.dart

@@ -12,6 +12,7 @@ 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,6 +111,7 @@ class _NetworkDetectionState extends State<NetworkDetection> {
         );
       },
       builder: (_, state, __) {
+        debugPrint("[UpdateCurrentDelay] update===>");
         _updateCurrentDelay(
           state.currentProxyName,
           state.delay,
@@ -144,6 +145,7 @@ 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,6 +63,7 @@ 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,7 +24,6 @@ class ProfilesFragment extends StatefulWidget {
 }
 
 class _ProfilesFragmentState extends State<ProfilesFragment> {
-
   String _getLastUpdateTimeDifference(DateTime lastDateTime) {
     final currentDateTime = DateTime.now();
     final difference = currentDateTime.difference(lastDateTime);
@@ -210,7 +209,7 @@ class _ProfilesFragmentState extends State<ProfilesFragment> {
               child: _profileItem(
                 profile: profile,
                 groupValue: state.currentProfileId,
-                onChanged: context.appController.changeProfileDebounce,
+                onChanged: context.appController.changeProfile,
               ),
             ),
         ],
@@ -235,6 +234,7 @@ 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,3 +1,4 @@
+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';
@@ -56,6 +57,26 @@ 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>(
@@ -66,31 +87,14 @@ class _ProxiesFragmentState extends State<ProxiesFragment>
         }
         return child!;
       },
-      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,
-          );
+      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);
           return Column(
             mainAxisAlignment: MainAxisAlignment.start,
             crossAxisAlignment: CrossAxisAlignment.start,
@@ -104,7 +108,7 @@ class _ProxiesFragmentState extends State<ProxiesFragment>
                 overlayColor:
                     const MaterialStatePropertyAll(Colors.transparent),
                 tabs: [
-                  for (final group in state.groups)
+                  for (final group in groups)
                     Tab(
                       text: group.name,
                     ),
@@ -114,7 +118,7 @@ class _ProxiesFragmentState extends State<ProxiesFragment>
                 child: TabBarView(
                   controller: _tabController,
                   children: [
-                    for (final group in state.groups)
+                    for (final group in groups)
                       KeepContainer(
                         child: ProxiesTabView(
                           group: group,
@@ -193,7 +197,7 @@ class _ProxiesTabViewState extends State<ProxiesTabView>
     _controller.dispose();
   }
 
-  Group get group => widget.group;
+  get group => widget.group;
 
   get measure => context.appController.measure;
 
@@ -365,33 +369,25 @@ class _ProxiesTabViewState extends State<ProxiesTabView>
   }) {
     return SingleChildScrollView(
       padding: const EdgeInsets.all(16),
-      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(),
-            keyBuilder: (item) {
-              return ObjectKey(item);
-            },
-            builder: (_, proxy) {
-              final isSelected = group.type == GroupType.Selector
-                  ? group.name == state.currentGroupName &&
-                  proxy.name == state.currentProxyName
-                  : group.now == proxy.name;
+      child: AnimateGrid<Proxy>(
+        items: _getProxies(group.all, proxiesSortType),
+        columns: columns,
+        itemHeight: _getItemHeight(),
+        keyBuilder: (item) {
+          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;
               return _card(
-                isSelected: isSelected,
+                isSelected: proxy.name == currentProxyName,
                 onPressed: () {
                   if (group.type == GroupType.Selector) {
                     final config = context.read<Config>();

lib/models/app.dart

@@ -165,26 +165,19 @@ class AppState with ChangeNotifier {
     }
   }
 
-  String? getCurrentGroupNameWithGroups(
-    List<Group> groups,
-    String? groupName,
-    Mode mode,
-  ) {
+  String? getCurrentGroupName(String? groupName, Mode mode) {
+    final currentGroups = getCurrentGroups(mode);
     switch (mode) {
       case Mode.direct:
         return null;
       case Mode.global:
         return UsedProxy.GLOBAL.name;
       case Mode.rule:
-        return groupName ?? (groups.isNotEmpty ? groups.first.name : null);
+        return groupName ??
+            (currentGroups.isNotEmpty ? currentGroups.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/generated/selector.freezed.dart

@@ -1740,295 +1740,3 @@ 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,7 +5,6 @@ import 'config.dart';
 import 'navigation.dart';
 import 'package.dart';
 import 'profile.dart';
-import 'proxy.dart';
 
 part 'generated/selector.freezed.dart';
 
@@ -102,19 +101,3 @@ 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,6 +140,7 @@ 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<String> updateClashConfig({
+  Future<bool> updateClashConfig({
     required ClashConfig clashConfig,
     required Config config,
     bool isPatch = true,
@@ -87,25 +87,6 @@ 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,
@@ -119,44 +100,15 @@ class GlobalState {
       );
     }
     if (!appState.isInit) return;
-    await applyProfile(
-      appState: appState,
-      config: config,
+    await updateClashConfig(
       clashConfig: clashConfig,
+      config: config,
+      isPatch: false,
     );
+    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;
@@ -178,8 +130,8 @@ class GlobalState {
     );
   }
 
-  Future<void> updateGroups(AppState appState) async {
-    appState.groups = await clashCore.getProxiesGroups();
+  updateGroups(AppState appState) {
+    appState.groups = clashCore.getProxiesGroups();
   }
 
   showMessage({
@@ -246,7 +198,7 @@ class GlobalState {
     required Config config,
   }) {
     final traffic = clashCore.getTraffic();
-    if (appState != null) {
+    if(appState != null){
       appState.addTraffic(traffic);
     }
     if (Platform.isAndroid) {

lib/widgets/app_state_container.dart

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

lib/widgets/open_container.dart

@@ -446,6 +446,7 @@ 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,6 +144,7 @@ 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: "9a1d5e9f728815e27b7b612883db19107ba8a35a46a97c757ea00896cb027451"
+      sha256: "600bbe237530a249f957f7d0f36273c20bd38d137e28e098c5231c30cadbe927"
       url: "https://pub.flutter-io.cn"
     source: hosted
-    version: "0.1.10+2"
+    version: "0.1.10+1"
   flutter_lints:
     dependency: "direct dev"
     description:
@@ -279,10 +279,10 @@ packages:
     dependency: transitive
     description:
       name: flutter_plugin_android_lifecycle
-      sha256: "8cf40eebf5dec866a6d1956ad7b4f7016e6c0cc69847ab946833b7d43743809f"
+      sha256: "592dc01a18961a51c24ae5d963b724b2b7fa4a95c100fe8eb6ca8a5a4732cadf"
       url: "https://pub.flutter-io.cn"
     source: hosted
-    version: "2.0.19"
+    version: "2.0.18"
   flutter_test:
     dependency: "direct dev"
     description: flutter
@@ -997,10 +997,10 @@ packages:
     dependency: transitive
     description:
       name: yaml_edit
-      sha256: e9c1a3543d2da0db3e90270dbb1e4eebc985ee5e3ffe468d83224472b2194a5f
+      sha256: c566f4f804215d84a7a2c377667f546c6033d5b34b4f9e60dfb09d17c4e97826
       url: "https://pub.flutter-io.cn"
     source: hosted
-    version: "2.2.1"
+    version: "2.2.0"
 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.9
+version: 0.7.1
 environment:
   sdk: '>=3.1.0 <4.0.0'