Fix flashback caused by process

Optimize quick start

Update system default option

(cherry picked from commit 05abf2d56d)

android/app/build.gradle

@@ -62,7 +62,7 @@ android {
 
     defaultConfig {
         applicationId "com.follow.clash"
-        minSdkVersion 21
+        minSdkVersion 24
         targetSdkVersion 34
         versionCode flutterVersionCode.toInteger()
         versionName flutterVersionName

android/app/src/main/AndroidManifest.xml

@@ -23,6 +23,7 @@
         android:name="${applicationName}"
         android:icon="@mipmap/ic_launcher"
         android:extractNativeLibs="true"
+        android:networkSecurityConfig="@xml/network_security_config"
         android:label="FlClash">
         <activity
             android:name="com.follow.clash.MainActivity"

android/app/src/main/kotlin/com/follow/clash/plugins/AppPlugin.kt

@@ -64,6 +64,7 @@ class AppPlugin : FlutterPlugin, MethodChannel.MethodCallHandler, ActivityAware
         toast!!.show()
     }
 
+    @RequiresApi(Build.VERSION_CODES.Q)
     override fun onMethodCall(call: MethodCall, result: MethodChannel.Result) {
         when (call.method) {
             "moveTaskToBack" -> {
@@ -150,6 +151,7 @@ class AppPlugin : FlutterPlugin, MethodChannel.MethodCallHandler, ActivityAware
                 val message = call.argument<String>("message")
                 tip(message)
                 result.success(true)
+
             }
 
             else -> {

android/app/src/main/kotlin/com/follow/clash/plugins/ProxyPlugin.kt

@@ -44,7 +44,6 @@ class ProxyPlugin : FlutterPlugin, MethodChannel.MethodCallHandler, ActivityAwar
     private var props: Props? = null
     private lateinit var title: String
     private lateinit var content: String
-    var isBlockNotification: Boolean = false
 
     private val connection = object : ServiceConnection {
         override fun onServiceConnected(className: ComponentName, service: IBinder) {
@@ -153,14 +152,13 @@ class ProxyPlugin : FlutterPlugin, MethodChannel.MethodCallHandler, ActivityAwar
             if (permission == PackageManager.PERMISSION_GRANTED) {
                 startForeground()
             } else {
-                if (isBlockNotification) return
-                if (activity == null) return
-                ActivityCompat.requestPermissions(
-                    activity!!,
-                    arrayOf(Manifest.permission.POST_NOTIFICATIONS),
-                    NOTIFICATION_PERMISSION_REQUEST_CODE
-                )
-
+                activity?.let {
+                    ActivityCompat.requestPermissions(
+                        it,
+                        arrayOf(Manifest.permission.POST_NOTIFICATIONS),
+                        NOTIFICATION_PERMISSION_REQUEST_CODE
+                    )
+                }
             }
         } else {
             startForeground()
@@ -194,14 +192,11 @@ class ProxyPlugin : FlutterPlugin, MethodChannel.MethodCallHandler, ActivityAwar
         grantResults: IntArray
     ): Boolean {
         if (requestCode == NOTIFICATION_PERMISSION_REQUEST_CODE) {
-            isBlockNotification = true
-            if (grantResults.isNotEmpty()) {
-                if (grantResults[0] == PackageManager.PERMISSION_GRANTED) {
-                    startForeground()
-                }
+            if (grantResults.isNotEmpty() && grantResults[0] == PackageManager.PERMISSION_GRANTED) {
+                startForeground()
             }
         }
-        return false;
+        return true;
     }
 
 

core/common.go

@@ -396,8 +396,6 @@ func applyConfig(isPatch bool) {
 	if isPatch {
 		patchConfig(cfg.General)
 	} else {
-		executor.Shutdown()
-		runtime.GC()
 		hub.UltraApplyConfig(cfg, true)
 	}
 }

core/dart-bridge/lib.go

@@ -1,7 +1,6 @@
 package dart_bridge
 
 /*
-#include <stdlib.h>
 #include "stdint.h"
 #include "include/dart_api_dl.h"
 #include "include/dart_api_dl.c"
@@ -29,7 +28,6 @@ func SendToPort(port int64, msg string) {
 	var obj C.Dart_CObject
 	obj._type = C.Dart_CObject_kString
 	msgString := C.CString(msg)
-	defer C.free(unsafe.Pointer(msgString))
 	ptr := unsafe.Pointer(&obj.value[0])
 	*(**C.char)(ptr) = msgString
 	isSuccess := C.GoDart_PostCObject(C.Dart_Port_DL(port), &obj)

core/hub.go

@@ -1,8 +1,5 @@
 package main
 
-/*
-#include <stdlib.h>
-*/
 import "C"
 import (
 	bridge "core/dart-bridge"
@@ -74,8 +71,8 @@ func forceGc() {
 //export validateConfig
 func validateConfig(s *C.char, port C.longlong) {
 	i := int64(port)
-	bytes := []byte(C.GoString(s))
 	go func() {
+		bytes := []byte(C.GoString(s))
 		_, err := config.UnmarshalRawConfig(bytes)
 		if err != nil {
 			bridge.SendToPort(i, err.Error())
@@ -88,8 +85,8 @@ func validateConfig(s *C.char, port C.longlong) {
 //export updateConfig
 func updateConfig(s *C.char, port C.longlong) {
 	i := int64(port)
-	paramsString := C.GoString(s)
 	go func() {
+		paramsString := C.GoString(s)
 		var params = &GenerateConfigParams{}
 		err := json.Unmarshal([]byte(paramsString), params)
 		if err != nil {
@@ -151,8 +148,8 @@ func getProxies() *C.char {
 
 //export changeProxy
 func changeProxy(s *C.char) bool {
-	paramsString := C.GoString(s)
 	go func() {
+		paramsString := C.GoString(s)
 		var params = &ChangeProxyParams{}
 		err := json.Unmarshal([]byte(paramsString), params)
 		if err != nil {
@@ -191,31 +188,11 @@ func getTraffic() *C.char {
 	return C.CString(string(data))
 }
 
-//export getTotalTraffic
-func getTotalTraffic() *C.char {
-	up, down := statistic.DefaultManager.Total()
-	traffic := map[string]int64{
-		"up":   up,
-		"down": down,
-	}
-	data, err := json.Marshal(traffic)
-	if err != nil {
-		fmt.Println("Error:", err)
-		return C.CString("")
-	}
-	return C.CString(string(data))
-}
-
-//export resetTraffic
-func resetTraffic() {
-	statistic.DefaultManager.ResetStatistic()
-}
-
 //export asyncTestDelay
 func asyncTestDelay(s *C.char, port C.longlong) {
 	i := int64(port)
-	paramsString := C.GoString(s)
 	go func() {
+		paramsString := C.GoString(s)
 		var params = &TestDelayParams{}
 		err := json.Unmarshal([]byte(paramsString), params)
 		if err != nil {
@@ -299,6 +276,7 @@ func closeConnections() bool {
 //export closeConnection
 func closeConnection(id *C.char) bool {
 	connectionId := C.GoString(id)
+
 	err := statistic.DefaultManager.Get(connectionId).Close()
 	if err != nil {
 		return false
@@ -309,13 +287,10 @@ func closeConnection(id *C.char) bool {
 //export getProviders
 func getProviders() *C.char {
 	data, err := json.Marshal(tunnel.Providers())
-	var msg *C.char
 	if err != nil {
-		msg = C.CString("")
-		return msg
+		return C.CString("")
 	}
-	msg = C.CString(string(data))
-	return msg
+	return C.CString(string(data))
 }
 
 //export getProvider
@@ -365,9 +340,10 @@ func getExternalProviders() *C.char {
 //export updateExternalProvider
 func updateExternalProvider(providerName *C.char, providerType *C.char, port C.longlong) {
 	i := int64(port)
-	providerNameString := C.GoString(providerName)
-	providerTypeString := C.GoString(providerType)
 	go func() {
+		providerNameString := C.GoString(providerName)
+		providerTypeString := C.GoString(providerType)
+
 		switch providerTypeString {
 		case "Proxy":
 			providers := tunnel.Providers()
@@ -413,11 +389,6 @@ func initNativeApiBridge(api unsafe.Pointer, port C.longlong) {
 	bridge.Port = &i
 }
 
-//export freeCString
-func freeCString(s *C.char) {
-	C.free(unsafe.Pointer(s))
-}
-
 func init() {
 	provider.HealthcheckHook = func(name string, delay uint16) {
 		delayData := &Delay{

core/platform/limit.go

@@ -1,42 +0,0 @@
-//go:build android
-
-package platform
-
-import "syscall"
-
-var nullFd int
-var maxFdCount int
-
-func init() {
-	fd, err := syscall.Open("/dev/null", syscall.O_WRONLY, 0644)
-	if err != nil {
-		panic(err.Error())
-	}
-
-	nullFd = fd
-
-	var limit syscall.Rlimit
-
-	if err := syscall.Getrlimit(syscall.RLIMIT_NOFILE, &limit); err != nil {
-		maxFdCount = 1024
-	} else {
-		maxFdCount = int(limit.Cur)
-	}
-
-	maxFdCount = maxFdCount / 4 * 3
-}
-
-func ShouldBlockConnection() bool {
-	fd, err := syscall.Dup(nullFd)
-	if err != nil {
-		return true
-	}
-
-	_ = syscall.Close(fd)
-
-	if fd > maxFdCount {
-		return true
-	}
-
-	return false
-}

core/process.go

@@ -71,8 +71,8 @@ func setProcessMap(s *C.char) {
 	if s == nil {
 		return
 	}
-	paramsString := C.GoString(s)
 	go func() {
+		paramsString := C.GoString(s)
 		var processMapItem = &ProcessMapItem{}
 		err := json.Unmarshal([]byte(paramsString), processMapItem)
 		if err == nil {

core/tun.go

@@ -4,9 +4,7 @@ package main
 
 import "C"
 import (
-	"core/platform"
 	t "core/tun"
-	"errors"
 	"github.com/metacubex/mihomo/component/dialer"
 	"github.com/metacubex/mihomo/log"
 	"golang.org/x/sync/semaphore"
@@ -37,6 +35,8 @@ func startTUN(fd C.int) {
 
 		closer, err := t.Start(f, gateway, portal, dns)
 
+		applyConfig(true)
+
 		if err != nil {
 			log.Errorln("startTUN error: %v", err)
 			tempTun.Close()
@@ -56,18 +56,14 @@ func stopTun() {
 
 		if tun != nil {
 			tun.Close()
+			applyConfig(true)
 			tun = nil
 		}
 	}()
 }
 
-var errBlocked = errors.New("blocked")
-
 func init() {
 	dialer.DefaultSocketHook = func(network, address string, conn syscall.RawConn) error {
-		if platform.ShouldBlockConnection() {
-			return errBlocked
-		}
 		return conn.Control(func(fd uintptr) {
 			if tun != nil {
 				tun.MarkSocket(int(fd))

lib/application.dart

@@ -130,6 +130,7 @@ class ApplicationState extends State<Application> {
       httpTimeoutDuration,
       (timer) async {
         await globalState.appController.updateGroups();
+        globalState.appController.appState.sortNum++;
       },
     );
   }
@@ -164,6 +165,7 @@ class ApplicationState extends State<Application> {
                     themeMode: state.themeMode,
                     theme: ThemeData(
                       useMaterial3: true,
+                      fontFamily: '',
                       pageTransitionsTheme: _pageTransitionsTheme,
                       colorScheme: _getAppColorScheme(
                         brightness: Brightness.light,
@@ -173,6 +175,7 @@ class ApplicationState extends State<Application> {
                     ),
                     darkTheme: ThemeData(
                       useMaterial3: true,
+                      fontFamily: '',
                       pageTransitionsTheme: _pageTransitionsTheme,
                       colorScheme: _getAppColorScheme(
                         brightness: Brightness.dark,

lib/clash/core.dart

@@ -45,10 +45,10 @@ class ClashCore {
   }
 
   bool init(String homeDir) {
-    final homeDirChar = homeDir.toNativeUtf8().cast<Char>();
-    final isInit = clashFFI.initClash(homeDirChar) == 1;
-    malloc.free(homeDirChar);
-    return isInit;
+    return clashFFI.initClash(
+          homeDir.toNativeUtf8().cast(),
+        ) ==
+        1;
   }
 
   shutdown() {
@@ -67,12 +67,10 @@ class ClashCore {
         receiver.close();
       }
     });
-    final dataChar = data.toNativeUtf8().cast<Char>();
     clashFFI.validateConfig(
-      dataChar,
+      data.toNativeUtf8().cast(),
       receiver.sendPort.nativePort,
     );
-    malloc.free(dataChar);
     return completer.future;
   }
 
@@ -86,29 +84,23 @@ class ClashCore {
       }
     });
     final params = json.encode(updateConfigParams);
-    final paramsChar = params.toNativeUtf8().cast<Char>();
     clashFFI.updateConfig(
-      paramsChar,
+      params.toNativeUtf8().cast(),
       receiver.sendPort.nativePort,
     );
-    malloc.free(paramsChar);
     return completer.future;
   }
 
   Future<List<Group>> getProxiesGroups() {
     final proxiesRaw = clashFFI.getProxies();
     final proxiesRawString = proxiesRaw.cast<Utf8>().toDartString();
-    clashFFI.freeCString(proxiesRaw);
     return Isolate.run<List<Group>>(() {
-      if (proxiesRawString.isEmpty) return [];
-      final proxies = (json.decode(proxiesRawString) ?? {}) as Map;
-      if (proxies.isEmpty) return [];
+      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']) &&
-              proxy['hidden'] != true;
+          return GroupTypeExtension.valueList.contains(proxy['type']) && proxy['hidden'] != true;
         })
       ];
       final groupsRaw = groupNames.map((groupName) {
@@ -128,7 +120,6 @@ class ClashCore {
     final externalProvidersRaw = clashFFI.getExternalProviders();
     final externalProvidersRawString =
         externalProvidersRaw.cast<Utf8>().toDartString();
-    clashFFI.freeCString(externalProvidersRaw);
     return Isolate.run<List<ExternalProvider>>(() {
       final externalProviders =
           (json.decode(externalProvidersRawString) as List<dynamic>)
@@ -152,24 +143,17 @@ class ClashCore {
         receiver.close();
       }
     });
-    final providerNameChar = providerName.toNativeUtf8().cast<Char>();
-    final providerTypeChar = providerType.toNativeUtf8().cast<Char>();
     clashFFI.updateExternalProvider(
-      providerNameChar,
-      providerTypeChar,
+      providerName.toNativeUtf8().cast(),
+      providerType.toNativeUtf8().cast(),
       receiver.sendPort.nativePort,
     );
-    malloc.free(providerNameChar);
-    malloc.free(providerTypeChar);
     return completer.future;
   }
 
   bool changeProxy(ChangeProxyParams changeProxyParams) {
     final params = json.encode(changeProxyParams);
-    final paramsChar = params.toNativeUtf8().cast<Char>();
-    final isInit = clashFFI.changeProxy(paramsChar) == 1;
-    malloc.free(paramsChar);
-    return isInit;
+    return clashFFI.changeProxy(params.toNativeUtf8().cast()) == 1;
   }
 
   Future<Delay> getDelay(String proxyName) {
@@ -185,54 +169,35 @@ class ClashCore {
         receiver.close();
       }
     });
-    final delayParamsChar = json.encode(delayParams).toNativeUtf8().cast<Char>();
     clashFFI.asyncTestDelay(
-      delayParamsChar,
+      json.encode(delayParams).toNativeUtf8().cast(),
       receiver.sendPort.nativePort,
     );
-    malloc.free(delayParamsChar);
     Future.delayed(httpTimeoutDuration + moreDuration, () {
       receiver.close();
-      if (!completer.isCompleted) {
-        completer.complete(
-          Delay(name: proxyName, value: -1),
-        );
-      }
+      completer.complete(
+        Delay(name: proxyName, value: -1),
+      );
     });
     return completer.future;
   }
 
   clearEffect(String path) {
-    final pathChar = path.toNativeUtf8().cast<Char>();
-    clashFFI.clearEffect(pathChar);
-    malloc.free(pathChar);
+    clashFFI.clearEffect(path.toNativeUtf8().cast());
   }
 
   VersionInfo getVersionInfo() {
     final versionInfoRaw = clashFFI.getVersionInfo();
     final versionInfo = json.decode(versionInfoRaw.cast<Utf8>().toDartString());
-    clashFFI.freeCString(versionInfoRaw);
     return VersionInfo.fromJson(versionInfo);
   }
 
   Traffic getTraffic() {
     final trafficRaw = clashFFI.getTraffic();
     final trafficMap = json.decode(trafficRaw.cast<Utf8>().toDartString());
-    clashFFI.freeCString(trafficRaw);
     return Traffic.fromMap(trafficMap);
   }
 
-  Traffic getTotalTraffic() {
-    final trafficRaw = clashFFI.getTotalTraffic();
-    final trafficMap = json.decode(trafficRaw.cast<Utf8>().toDartString());
-    clashFFI.freeCString(trafficRaw);
-    return Traffic.fromMap(trafficMap);
-  }
-
-  void resetTraffic() {
-    clashFFI.resetTraffic();
-  }
-
   void startLog() {
     clashFFI.startLog();
   }
@@ -254,31 +219,22 @@ class ClashCore {
   }
 
   void setProcessMap(ProcessMapItem processMapItem) {
-    final processMapItemChar = json.encode(processMapItem).toNativeUtf8().cast<Char>();
-    clashFFI.setProcessMap(processMapItemChar);
-    malloc.free(processMapItemChar);
+    clashFFI.setProcessMap(json.encode(processMapItem).toNativeUtf8().cast());
   }
 
-  // DateTime? getRunTime() {
-  //   final runTimeString = clashFFI.getRunTime().cast<Utf8>().toDartString();
-  //   if (runTimeString.isEmpty) return null;
-  //   return DateTime.fromMillisecondsSinceEpoch(int.parse(runTimeString));
-  // }
+  DateTime? getRunTime() {
+    final runTimeString = clashFFI.getRunTime().cast<Utf8>().toDartString();
+    if (runTimeString.isEmpty) return null;
+    return DateTime.fromMillisecondsSinceEpoch(int.parse(runTimeString));
+  }
 
   List<Connection> getConnections() {
     final connectionsDataRaw = clashFFI.getConnections();
     final connectionsData =
         json.decode(connectionsDataRaw.cast<Utf8>().toDartString()) as Map;
-    clashFFI.freeCString(connectionsDataRaw);
     final connectionsRaw = connectionsData['connections'] as List? ?? [];
     return connectionsRaw.map((e) => Connection.fromJson(e)).toList();
   }
-
-  closeConnections(String id) {
-    final idChar = id.toNativeUtf8().cast<Char>();
-    clashFFI.closeConnection(idChar);
-    malloc.free(idChar);
-  }
 }
 
 final clashCore = ClashCore();

lib/common/android.dart

@@ -7,6 +7,7 @@ class Android {
   init() async {
     app?.onExit = () {
       clashCore.shutdown();
+      print("adsadda==>");
       exit(0);
     };
   }

lib/common/constant.dart

@@ -7,7 +7,6 @@ const coreName = "clash.meta";
 const packageName = "FlClash";
 const httpTimeoutDuration = Duration(milliseconds: 5000);
 const moreDuration = Duration(milliseconds: 100);
-const animateDuration = Duration(milliseconds: 100);
 const defaultUpdateDuration = Duration(days: 1);
 const mmdbFileName = "geoip.metadb";
 const geoSiteFileName = "GeoSite.dat";

lib/common/context.dart

@@ -7,12 +7,8 @@ extension BuildContextExtension on BuildContext {
     return findAncestorStateOfType<CommonScaffoldState>();
   }
 
-  Size get appSize{
-    return MediaQuery.of(this).size;
-  }
-
   double get width {
-    return appSize.width;
+    return MediaQuery.of(this).size.width;
   }
 
   ColorScheme get colorScheme => Theme.of(this).colorScheme;

lib/common/navigation.dart

@@ -29,18 +29,11 @@ class Navigation {
         label: "profiles",
         fragment: ProfilesFragment(),
       ),
-      const NavigationItem(
-        icon:  Icon(Icons.view_timeline),
-        label: "requests",
-        fragment:  RequestsFragment(),
-        description: "requestsDesc",
-        modes: [NavigationItemMode.desktop, NavigationItemMode.more],
-      ),
       const NavigationItem(
         icon:  Icon(Icons.ballot),
-        label: "connections",
-        fragment:  ConnectionsFragment(),
-        description: "connectionsDesc",
+        label: "requests",
+        fragment:  RequestFragment(),
+        description: "requestsDesc",
         modes: [NavigationItemMode.desktop, NavigationItemMode.more],
       ),
       const NavigationItem(

lib/common/path.dart

@@ -8,30 +8,12 @@ import 'constant.dart';
 
 class AppPath {
   static AppPath? _instance;
-  Completer<Directory> cacheDir = Completer();
-
-  // Future<Directory> _createDesktopCacheDir() async {
-  //   final path = join(dirname(Platform.resolvedExecutable), 'cache');
-  //   final dir = Directory(path);
-  //   if (await dir.exists()) {
-  //     await dir.create(recursive: true);
-  //   }
-  //   return dir;
-  // }
+  Completer<Directory> applicationSupportDirectoryCompleter = Completer();
 
   AppPath._internal() {
-    getApplicationSupportDirectory().then((value) {
-      cacheDir.complete(value);
-    });
-    // if (Platform.isAndroid) {
-    //   getApplicationSupportDirectory().then((value) {
-    //     cacheDir.complete(value);
-    //   });
-    // } else {
-    //   _createDesktopCacheDir().then((value) {
-    //     cacheDir.complete(value);
-    //   });
-    // }
+    getApplicationSupportDirectory().then(
+      (value) => applicationSupportDirectoryCompleter.complete(value),
+    );
   }
 
   factory AppPath() {
@@ -40,12 +22,12 @@ class AppPath {
   }
 
   Future<String> getHomeDirPath() async {
-    final directory = await cacheDir.future;
+    final directory = await applicationSupportDirectoryCompleter.future;
     return directory.path;
   }
 
   Future<String> getProfilesPath() async {
-    final directory = await cacheDir.future;
+    final directory = await applicationSupportDirectoryCompleter.future;
     return join(directory.path, profilesDirectoryName);
   }
 

lib/common/text.dart

@@ -2,13 +2,20 @@ import 'package:flutter/material.dart';
 import 'color.dart';
 
 extension TextStyleExtension on TextStyle {
-  TextStyle get toLight => copyWith(color: color?.toLight());
+  toLight() {
+    return copyWith(color: color?.toLight());
+  }
 
-  TextStyle get toLighter => copyWith(color: color?.toLighter());
+  toLighter() {
+    return copyWith(color: color?.toLighter());
+  }
 
-  TextStyle get toSoftBold => copyWith(fontWeight: FontWeight.w500);
 
-  TextStyle get toBold => copyWith(fontWeight: FontWeight.bold);
+  toSoftBold() {
+    return copyWith(fontWeight: FontWeight.w500);
+  }
 
-  TextStyle get toMinus => copyWith(fontSize: fontSize! - 1);
-}
+  toBold() {
+    return copyWith(fontWeight: FontWeight.bold);
+  }
+}

lib/controller.dart

@@ -31,7 +31,6 @@ class AppController {
   Future<void> updateSystemProxy(bool isStart) async {
     if (isStart) {
       await globalState.startSystemProxy(
-        appState: appState,
         config: config,
         clashConfig: clashConfig,
       );
@@ -43,9 +42,7 @@ class AppController {
       ];
     } else {
       await globalState.stopSystemProxy();
-      clashCore.resetTraffic();
       appState.traffics = [];
-      appState.totalTraffic = Traffic();
       appState.runTime = null;
     }
   }
@@ -100,9 +97,13 @@ class AppController {
     }
   }
 
-  Future<void> updateProfile(Profile profile) async {
-    await profile.update();
-    config.setProfile(await profile.update());
+  Future<void> updateProfile(String id) async {
+    final profile = config.getCurrentProfileForId(id);
+    if (profile != null) {
+      final tempProfile = profile.copyWith();
+      await tempProfile.update();
+      config.setProfile(tempProfile);
+    }
   }
 
   Future<void> updateClashConfig({bool isPatch = true}) async {
@@ -145,7 +146,7 @@ class AppController {
         continue;
       }
       try {
-        updateProfile(profile);
+        await updateProfile(profile.id);
       } catch (e) {
         appState.addLog(
           Log(
@@ -162,7 +163,7 @@ class AppController {
       if (profile.type == ProfileType.file) {
         continue;
       }
-      await updateProfile(profile);
+      await updateProfile(profile.id);
     }
   }
 
@@ -266,7 +267,6 @@ class AppController {
   }
 
   init() async {
-    updateLogStatus();
     if (!config.silentLaunch) {
       window?.show();
     }
@@ -278,7 +278,7 @@ class AppController {
           config: config,
           clashConfig: clashConfig,
         );
-      }, title: appLocalizations.init);
+      },title: appLocalizations.init);
     } else {
       await globalState.applyProfile(
         appState: appState,
@@ -290,13 +290,14 @@ class AppController {
   }
 
   afterInit() async {
-    await proxyManager.updateStartTime();
-    if (proxyManager.isStart) {
+    if (config.autoRun) {
       await updateSystemProxy(true);
     } else {
-      await updateSystemProxy(config.autoRun);
+      await proxyManager.updateStartTime();
+      await updateSystemProxy(proxyManager.isStart);
     }
     autoUpdateProfiles();
+    updateLogStatus();
     autoCheckUpdate();
   }
 
@@ -359,17 +360,17 @@ class AppController {
   }
 
   addProfileFormURL(String url) async {
-    if (globalState.navigatorKey.currentState?.canPop() ?? false) {
-      globalState.navigatorKey.currentState?.popUntil((route) => route.isFirst);
-    }
+    globalState.navigatorKey.currentState?.popUntil((route) => route.isFirst);
     toProfiles();
     final commonScaffoldState = globalState.homeScaffoldKey.currentState;
     if (commonScaffoldState?.mounted != true) return;
     final profile = await commonScaffoldState?.loadingRun<Profile>(
       () async {
-        return await Profile.normal(
+        final profile = Profile(
           url: url,
-        ).update();
+        );
+        await profile.update();
+        return profile;
       },
       title: "${appLocalizations.add}${appLocalizations.profile}",
     );
@@ -392,7 +393,9 @@ class AppController {
         if (bytes == null) {
           return null;
         }
-        return await Profile.normal(label: platformFile?.name).saveFile(bytes);
+        final profile = Profile(label: platformFile?.name);
+        await profile.saveFile(bytes);
+        return profile;
       },
       title: "${appLocalizations.add}${appLocalizations.profile}",
     );
@@ -407,54 +410,9 @@ class AppController {
     addProfileFormURL(url);
   }
 
-  int get columns =>
-      globalState.getColumns(appState.viewMode, config.proxiesColumns);
-
-  changeColumns() {
-    config.proxiesColumns = globalState.getColumns(
-      appState.viewMode,
-      columns - 1,
-    );
-  }
-
   updateViewWidth(double width) {
     WidgetsBinding.instance.addPostFrameCallback((_) {
       appState.viewWidth = width;
     });
   }
-
-  List<Proxy> _sortOfName(List<Proxy> proxies) {
-    return List.of(proxies)
-      ..sort(
-        (a, b) => other.sortByChar(a.name, b.name),
-      );
-  }
-
-  List<Proxy> _sortOfDelay(List<Proxy> proxies) {
-    return proxies = List.of(proxies)
-      ..sort(
-        (a, b) {
-          final aDelay = appState.getDelay(a.name);
-          final bDelay = appState.getDelay(b.name);
-          if (aDelay == null && bDelay == null) {
-            return 0;
-          }
-          if (aDelay == null || aDelay == -1) {
-            return 1;
-          }
-          if (bDelay == null || bDelay == -1) {
-            return -1;
-          }
-          return aDelay.compareTo(bDelay);
-        },
-      );
-  }
-
-  List<Proxy> getSortProxies(List<Proxy> proxies) {
-    return switch (config.proxiesSortType) {
-      ProxiesSortType.none => proxies,
-      ProxiesSortType.delay => _sortOfDelay(proxies),
-      ProxiesSortType.name => _sortOfName(proxies),
-    };
-  }
 }

lib/enum/enum.dart

@@ -64,11 +64,3 @@ enum RecoveryOption {
   all,
   onlyProfiles,
 }
-
-enum ChipType { action, delete }
-
-enum CommonCardType { plain, filled }
-
-enum ProxiesType { tab, expansion }
-
-enum ProxyCardType { expand, shrink }

lib/fragments/access.dart

@@ -35,13 +35,6 @@ class _AccessFragmentState extends State<AccessFragment> {
     });
   }
 
-
-  @override
-  void dispose() {
-    super.dispose();
-    packagesListenable.dispose();
-  }
-
   Widget _buildAppProxyModePopup() {
     final items = [
       CommonPopupMenuItem(

lib/fragments/backup_and_recovery.dart

@@ -228,13 +228,6 @@ class _WebDAVFormDialogState extends State<WebDAVFormDialog> {
     Navigator.pop(context);
   }
 
-
-  @override
-  void dispose() {
-    super.dispose();
-    _obscureController.dispose();
-  }
-
   @override
   Widget build(BuildContext context) {
     return AlertDialog(

lib/fragments/config.dart

@@ -191,7 +191,7 @@ class _ConfigFragmentState extends State<ConfigFragment> {
         builder: (_, ipv6, __) {
           return ListItem.switchItem(
             leading: const Icon(Icons.water_outlined),
-            title: const Text("IPv6"),
+            title: const Text("Ipv6"),
             subtitle: Text(appLocalizations.ipv6Desc),
             delegate: SwitchDelegate(
               value: ipv6,

lib/fragments/connections.dart

@@ -1,435 +1,140 @@
-import 'dart:async';
-import 'dart:io';
-
-import 'package:fl_clash/clash/clash.dart';
-import 'package:fl_clash/common/common.dart';
-import 'package:fl_clash/enum/enum.dart';
-import 'package:fl_clash/models/models.dart';
-import 'package:fl_clash/plugins/app.dart';
-import 'package:fl_clash/widgets/widgets.dart';
-import 'package:flutter/material.dart';
-import 'package:provider/provider.dart';
-
-class ConnectionsFragment extends StatefulWidget {
-  const ConnectionsFragment({super.key});
-
-  @override
-  State<ConnectionsFragment> createState() => _ConnectionsFragmentState();
-}
-
-class _ConnectionsFragmentState extends State<ConnectionsFragment> {
-  final connectionsNotifier =
-      ValueNotifier<ConnectionsAndKeywords>(const ConnectionsAndKeywords());
-  final ScrollController _scrollController = ScrollController(
-    keepScrollOffset: false,
-  );
-
-  Timer? timer;
-
-  @override
-  void initState() {
-    super.initState();
-    WidgetsBinding.instance.addPostFrameCallback((_) {
-      connectionsNotifier.value = connectionsNotifier.value
-          .copyWith(connections: clashCore.getConnections());
-      if (timer != null) {
-        timer?.cancel();
-        timer = null;
-      }
-      timer = Timer.periodic(
-        const Duration(seconds: 1),
-        (timer) {
-          connectionsNotifier.value = connectionsNotifier.value
-              .copyWith(connections: clashCore.getConnections());
-        },
-      );
-    });
-  }
-
-  _initActions() {
-    WidgetsBinding.instance.addPostFrameCallback(
-      (_) {
-        final commonScaffoldState =
-            context.findAncestorStateOfType<CommonScaffoldState>();
-        commonScaffoldState?.actions = [
-          IconButton(
-            onPressed: () {
-              showSearch(
-                context: context,
-                delegate: ConnectionsSearchDelegate(
-                  state: connectionsNotifier.value,
-                ),
-              );
-            },
-            icon: const Icon(Icons.search),
-          ),
-          const SizedBox(
-            width: 8,
-          )
-        ];
-      },
-    );
-  }
-
-  _addKeyword(String keyword) {
-    final isContains = connectionsNotifier.value.keywords.contains(keyword);
-    if (isContains) return;
-    final keywords = List<String>.from(connectionsNotifier.value.keywords)
-      ..add(keyword);
-    connectionsNotifier.value = connectionsNotifier.value.copyWith(
-      keywords: keywords,
-    );
-  }
-
-  _deleteKeyword(String keyword) {
-    final isContains = connectionsNotifier.value.keywords.contains(keyword);
-    if (!isContains) return;
-    final keywords = List<String>.from(connectionsNotifier.value.keywords)
-      ..remove(keyword);
-    connectionsNotifier.value = connectionsNotifier.value.copyWith(
-      keywords: keywords,
-    );
-  }
-
-  _handleBlockConnection(String id) {
-    clashCore.closeConnections(id);
-    connectionsNotifier.value = connectionsNotifier.value
-        .copyWith(connections: clashCore.getConnections());
-  }
-
-  @override
-  void dispose() {
-    super.dispose();
-    timer?.cancel();
-    connectionsNotifier.dispose();
-    _scrollController.dispose();
-    timer = null;
-  }
-
-  @override
-  Widget build(BuildContext context) {
-    return Selector<AppState, bool?>(
-      selector: (_, appState) =>
-          appState.currentLabel == 'connections' ||
-          appState.viewMode == ViewMode.mobile &&
-              appState.currentLabel == "tools",
-      builder: (_, isCurrent, child) {
-        if (isCurrent == null || isCurrent) {
-          _initActions();
-        }
-        return child!;
-      },
-      child: ValueListenableBuilder<ConnectionsAndKeywords>(
-        valueListenable: connectionsNotifier,
-        builder: (_, state, __) {
-          var connections = state.filteredConnections;
-          if (connections.isEmpty) {
-            return NullStatus(
-              label: appLocalizations.nullConnectionsDesc,
-            );
-          }
-          connections = connections.reversed.toList();
-          return Column(
-            crossAxisAlignment: CrossAxisAlignment.start,
-            children: [
-              if (state.keywords.isNotEmpty)
-                Padding(
-                  padding: const EdgeInsets.symmetric(
-                    horizontal: 16,
-                    vertical: 16,
-                  ),
-                  child: Wrap(
-                    runSpacing: 8,
-                    spacing: 8,
-                    children: [
-                      for (final keyword in state.keywords)
-                        CommonChip(
-                          label: keyword,
-                          type: ChipType.delete,
-                          onPressed: () {
-                            _deleteKeyword(keyword);
-                          },
-                        ),
-                    ],
-                  ),
-                ),
-              Expanded(
-                child: ListView.separated(
-                  controller: _scrollController,
-                  itemBuilder: (_, index) {
-                    final connection = connections[index];
-                    return ConnectionItem(
-                      key: Key(connection.id),
-                      connection: connection,
-                      onClick: _addKeyword,
-                      onBlock: _handleBlockConnection,
-                    );
-                  },
-                  separatorBuilder: (BuildContext context, int index) {
-                    return const Divider(
-                      height: 0,
-                    );
-                  },
-                  itemCount: connections.length,
-                ),
-              )
-            ],
-          );
-        },
-      ),
-    );
-  }
-}
-
-class ConnectionItem extends StatelessWidget {
-  final Connection connection;
-  final Function(String)? onClick;
-  final Function(String)? onBlock;
-
-  const ConnectionItem({
-    super.key,
-    required this.connection,
-    this.onClick,
-    this.onBlock,
-  });
-
-  Future<ImageProvider?> _getPackageIcon(Connection connection) async {
-    return await app?.getPackageIcon(connection.metadata.process);
-  }
-
-  String _getRequestText(Metadata metadata) {
-    var text = "${metadata.network}://";
-    final ips = [
-      metadata.host,
-      metadata.destinationIP,
-    ].where((ip) => ip.isNotEmpty);
-    text += ips.join("/");
-    text += ":${metadata.destinationPort}";
-    return text;
-  }
-
-  String _getSourceText(Connection connection) {
-    final metadata = connection.metadata;
-    if (metadata.process.isEmpty) {
-      return connection.start.lastUpdateTimeDesc;
-    }
-    return "${metadata.process} · ${connection.start.lastUpdateTimeDesc}";
-  }
-
-  @override
-  Widget build(BuildContext context) {
-    return ListItem(
-      tileTitleAlignment: ListTileTitleAlignment.titleHeight,
-      leading: Platform.isAndroid
-          ? Container(
-              margin: const EdgeInsets.only(top: 4),
-              width: 48,
-              height: 48,
-              child: FutureBuilder<ImageProvider?>(
-                future: _getPackageIcon(connection),
-                builder: (_, snapshot) {
-                  if (!snapshot.hasData && snapshot.data == null) {
-                    return Container();
-                  } else {
-                    return Image(
-                      image: snapshot.data!,
-                      gaplessPlayback: true,
-                      width: 48,
-                      height: 48,
-                    );
-                  }
-                },
-              ),
-            )
-          : null,
-      title: Text(
-        _getRequestText(connection.metadata),
-      ),
-      subtitle: Column(
-        crossAxisAlignment: CrossAxisAlignment.start,
-        children: [
-          const SizedBox(
-            height: 12,
-          ),
-          Text(
-            _getSourceText(connection),
-          ),
-          const SizedBox(
-            height: 12,
-          ),
-          Wrap(
-            runSpacing: 8,
-            spacing: 8,
-            children: [
-              for (final chain in connection.chains)
-                CommonChip(
-                  label: chain,
-                  onPressed: () {
-                    if (onClick == null) return;
-                    onClick!(chain);
-                  },
-                ),
-            ],
-          ),
-          const SizedBox(
-            height: 12,
-          ),
-        ],
-      ),
-      trailing: IconButton(
-        icon: const Icon(Icons.block),
-        onPressed: () {
-          if (onBlock == null) return;
-          onBlock!(connection.id);
-        },
-      ),
-    );
-  }
-}
-
-class ConnectionsSearchDelegate extends SearchDelegate {
-  ValueNotifier<ConnectionsAndKeywords> connectionsNotifier;
-
-  ConnectionsSearchDelegate({
-    required ConnectionsAndKeywords state,
-  }) : connectionsNotifier = ValueNotifier<ConnectionsAndKeywords>(state);
-
-  get state => connectionsNotifier.value;
-
-  List<Connection> get _results {
-    final lowerQuery = query.toLowerCase().trim();
-    return connectionsNotifier.value.filteredConnections.where((request) {
-      final lowerNetwork = request.metadata.network.toLowerCase();
-      final lowerHost = request.metadata.host.toLowerCase();
-      final lowerDestinationIP = request.metadata.destinationIP.toLowerCase();
-      final lowerProcess = request.metadata.process.toLowerCase();
-      final lowerChains = request.chains.join("").toLowerCase();
-      return lowerNetwork.contains(lowerQuery) ||
-          lowerHost.contains(lowerQuery) ||
-          lowerDestinationIP.contains(lowerQuery) ||
-          lowerProcess.contains(lowerQuery) ||
-          lowerChains.contains(lowerQuery);
-    }).toList();
-  }
-
-  _addKeyword(String keyword) {
-    final isContains = connectionsNotifier.value.keywords.contains(keyword);
-    if (isContains) return;
-    final keywords = List<String>.from(connectionsNotifier.value.keywords)
-      ..add(keyword);
-    connectionsNotifier.value = connectionsNotifier.value.copyWith(
-      keywords: keywords,
-    );
-  }
-
-  _deleteKeyword(String keyword) {
-    final isContains = connectionsNotifier.value.keywords.contains(keyword);
-    if (!isContains) return;
-    final keywords = List<String>.from(connectionsNotifier.value.keywords)
-      ..remove(keyword);
-    connectionsNotifier.value = connectionsNotifier.value.copyWith(
-      keywords: keywords,
-    );
-  }
-
-
-  _handleBlockConnection(String id) {
-    clashCore.closeConnections(id);
-    connectionsNotifier.value = connectionsNotifier.value
-        .copyWith(connections: clashCore.getConnections());
-  }
-
-  @override
-  List<Widget>? buildActions(BuildContext context) {
-    return [
-      IconButton(
-        onPressed: () {
-          if (query.isEmpty) {
-            close(context, null);
-            return;
-          }
-          query = '';
-        },
-        icon: const Icon(Icons.clear),
-      ),
-      const SizedBox(
-        width: 8,
-      )
-    ];
-  }
-
-  @override
-  Widget? buildLeading(BuildContext context) {
-    return IconButton(
-      onPressed: () {
-        close(context, null);
-      },
-      icon: const Icon(Icons.arrow_back),
-    );
-  }
-
-  @override
-  Widget buildResults(BuildContext context) {
-    return buildSuggestions(context);
-  }
-
-  @override
-  void dispose() {
-    connectionsNotifier.dispose();
-    super.dispose();
-  }
-
-  @override
-  Widget buildSuggestions(BuildContext context) {
-    return ValueListenableBuilder(
-      valueListenable: connectionsNotifier,
-      builder: (_, __, ___) {
-        return Column(
-          crossAxisAlignment: CrossAxisAlignment.start,
-          children: [
-            if (state.keywords.isNotEmpty)
-              Padding(
-                padding: const EdgeInsets.symmetric(
-                  horizontal: 16,
-                  vertical: 16,
-                ),
-                child: Wrap(
-                  runSpacing: 8,
-                  spacing: 8,
-                  children: [
-                    for (final keyword in state.keywords)
-                      CommonChip(
-                        label: keyword,
-                        type: ChipType.delete,
-                        onPressed: () {
-                          _deleteKeyword(keyword);
-                        },
-                      ),
-                  ],
-                ),
-              ),
-            Expanded(
-              child: ListView.separated(
-                itemBuilder: (_, index) {
-                  final connection = _results[index];
-                  return ConnectionItem(
-                    key: Key(connection.id),
-                    connection: connection,
-                    onClick: _addKeyword,
-                    onBlock: _handleBlockConnection,
-                  );
-                },
-                separatorBuilder: (BuildContext context, int index) {
-                  return const Divider(
-                    height: 0,
-                  );
-                },
-                itemCount: _results.length,
-              ),
-            )
-          ],
-        );
-      },
-    );
-  }
-}
+// import 'dart:async';
+//
+// import 'package:fl_clash/clash/core.dart';
+// import 'package:fl_clash/models/models.dart';
+// import 'package:fl_clash/plugins/app.dart';
+// import 'package:fl_clash/state.dart';
+// import 'package:fl_clash/widgets/widgets.dart';
+// import 'package:flutter/material.dart';
+//
+// class ConnectionsFragment extends StatefulWidget {
+//   const ConnectionsFragment({super.key});
+//
+//   @override
+//   State<ConnectionsFragment> createState() => _ConnectionsFragmentState();
+// }
+//
+// class _ConnectionsFragmentState extends State<ConnectionsFragment> {
+//   final connectionsNotifier = ValueNotifier<List<Connection>>([]);
+//   Map<String, String?> idPackageNameMap = {};
+//
+//   Timer? timer;
+//
+//   @override
+//   void initState() {
+//     super.initState();
+//     WidgetsBinding.instance.addPostFrameCallback((timeStamp) {
+//       _getConnections();
+//       if (timer != null) {
+//         timer?.cancel();
+//         timer = null;
+//       }
+//       timer = Timer.periodic(const Duration(seconds: 3), (timer) {
+//         if (mounted) {
+//           _getConnections();
+//         }
+//       });
+//     });
+//   }
+//
+//   _getConnections() {
+//     connectionsNotifier.value = clashCore
+//         .getConnections();
+//   }
+//
+//   @override
+//   void dispose() {
+//     super.dispose();
+//     timer?.cancel();
+//     timer = null;
+//   }
+//
+//   Future<ImageProvider?> _getPackageIconWithConnection(
+//       Connection connection) async {
+//     final uid = connection.metadata.uid;
+//     // if(globalState.packageNameMap[uid] == null){
+//     //   globalState.packageNameMap[uid] = await app?.getPackageName(connection.metadata);
+//     // }
+//     final packageName = globalState.packageNameMap[uid];
+//     if(packageName == null) return null;
+//     return await app?.getPackageIcon(packageName);
+//   }
+//
+//   @override
+//   Widget build(BuildContext context) {
+//     return ValueListenableBuilder<List<Connection>>(
+//       valueListenable: connectionsNotifier,
+//       builder: (_, List<Connection> connections, __) {
+//         if (connections.isEmpty) {
+//           return const NullStatus(
+//             label: "未开启代理,或者没有连接数据",
+//           );
+//         }
+//         return ListView.separated(
+//           physics: const AlwaysScrollableScrollPhysics(),
+//           itemBuilder: (_, index) {
+//             final connection = connections[index];
+//             return ListTile(
+//               titleAlignment: ListTileTitleAlignment.top,
+//               leading: Container(
+//                 margin: const EdgeInsets.only(top: 4),
+//                 width: 48,
+//                 height: 48,
+//                 child: FutureBuilder<ImageProvider?>(
+//                   future: _getPackageIconWithConnection(connection),
+//                   builder: (_, snapshot) {
+//                     if (!snapshot.hasData && snapshot.data == null) {
+//                       return Container();
+//                     } else {
+//                       return Image(
+//                         image: snapshot.data!,
+//                         gaplessPlayback: true,
+//                         width: 48,
+//                         height: 48,
+//                       );
+//                     }
+//                   },
+//                 ),
+//               ),
+//               contentPadding:
+//                   const EdgeInsets.symmetric(vertical: 12, horizontal: 16),
+//               title: Column(
+//                 crossAxisAlignment: CrossAxisAlignment.start,
+//                 children: [
+//                   Text(connection.metadata.host.isNotEmpty
+//                       ? connection.metadata.host
+//                       : connection.metadata.destinationIP),
+//                   Padding(
+//                     padding: const EdgeInsets.only(
+//                       top: 12,
+//                     ),
+//                     child: Wrap(
+//                       runSpacing: 8,
+//                       spacing: 8,
+//                       children: [
+//                         for (final chain in connection.chains)
+//                           CommonChip(
+//                             label: chain,
+//                           ),
+//                       ],
+//                     ),
+//                   ),
+//                 ],
+//               ),
+//               trailing: IconButton(
+//                 icon: const Icon(Icons.block),
+//                 onPressed: () {},
+//               ),
+//             );
+//           },
+//           separatorBuilder: (BuildContext context, int index) {
+//             return const Divider(
+//               height: 0,
+//             );
+//           },
+//           itemCount: connections.length,
+//         );
+//       },
+//     );
+//   }
+// }

lib/fragments/dashboard/core_info.dart

@@ -13,7 +13,6 @@ class CoreInfo extends StatelessWidget {
       selector: (_, appState) => appState.versionInfo,
       builder: (_, versionInfo, __) {
         return CommonCard(
-          onPressed: () {},
           info: Info(
             label: appLocalizations.coreInfo,
             iconData: Icons.memory,
@@ -32,7 +31,7 @@ class CoreInfo extends StatelessWidget {
                     style: context
                         .textTheme
                         .titleMedium
-                        ?.toSoftBold,
+                        ?.toSoftBold(),
                   ),
                 ),
                 const SizedBox(
@@ -45,7 +44,7 @@ class CoreInfo extends StatelessWidget {
                     style: context
                         .textTheme
                         .titleLarge
-                        ?.toSoftBold,
+                        ?.toSoftBold(),
                   ),
                 ),
               ],

lib/fragments/dashboard/dashboard.dart

@@ -1,11 +1,11 @@
 import 'package:fl_clash/enum/enum.dart';
-import 'package:fl_clash/fragments/dashboard/intranet_ip.dart';
 import 'package:fl_clash/models/models.dart';
 import 'package:flutter/material.dart';
 import 'package:fl_clash/widgets/widgets.dart';
 import 'package:provider/provider.dart';
 
 import 'network_detection.dart';
+import 'core_info.dart';
 import 'outbound_mode.dart';
 import 'start_button.dart';
 import 'network_speed.dart';
@@ -56,7 +56,7 @@ class _DashboardFragmentState extends State<DashboardFragment> {
                   ),
                   GridItem(
                     crossAxisCellCount: isDesktop ? 4 : 6,
-                    child: const IntranetIP(),
+                    child: const CoreInfo(),
                   ),
                 ],
               );

lib/fragments/dashboard/intranet_ip.dart

@@ -1,92 +0,0 @@
-import 'dart:io';
-
-import 'package:fl_clash/common/common.dart';
-import 'package:fl_clash/state.dart';
-import 'package:fl_clash/widgets/widgets.dart';
-import 'package:flutter/material.dart';
-
-class IntranetIP extends StatefulWidget {
-  const IntranetIP({super.key});
-
-  @override
-  State<IntranetIP> createState() => _IntranetIPState();
-}
-
-class _IntranetIPState extends State<IntranetIP> {
-  final ipNotifier = ValueNotifier<String>("");
-
-  Future<String?> getLocalIpAddress() async {
-    List<NetworkInterface> interfaces = await NetworkInterface.list();
-    for (final interface in interfaces) {
-      for (final address in interface.addresses) {
-        if (!address.isLoopback) {
-          return address.address;
-        }
-      }
-    }
-    return null;
-  }
-
-  @override
-  void dispose() {
-    super.dispose();
-    ipNotifier.dispose();
-  }
-
-  @override
-  void initState() {
-    super.initState();
-    WidgetsBinding.instance.addPostFrameCallback((_) async {
-      ipNotifier.value = await getLocalIpAddress() ?? "";
-    });
-  }
-
-  @override
-  Widget build(BuildContext context) {
-    return CommonCard(
-      info: Info(
-        label: appLocalizations.intranetIP,
-        iconData: Icons.devices,
-      ),
-      onPressed: (){
-
-      },
-      child: Container(
-        padding: const EdgeInsets.all(16).copyWith(top: 0),
-        height: globalState.appController.measure.titleLargeHeight + 24 - 1,
-        child: ValueListenableBuilder(
-          valueListenable: ipNotifier,
-          builder: (_, value, __) {
-            return FadeBox(
-              child: value.isNotEmpty
-                  ? Column(
-                      crossAxisAlignment: CrossAxisAlignment.start,
-                      mainAxisSize: MainAxisSize.min,
-                      children: [
-                        Flexible(
-                          flex: 1,
-                          child: TooltipText(
-                            text: Text(
-                              value,
-                              style: context.textTheme.titleLarge?.toSoftBold.toMinus,
-                              maxLines: 1,
-                              overflow: TextOverflow.ellipsis,
-                            ),
-                          ),
-                        ),
-                      ],
-                    )
-                  : const Padding(
-                      padding: EdgeInsets.all(2),
-                      child: AspectRatio(
-                        aspectRatio: 1,
-                        child: CircularProgressIndicator(),
-                      ),
-                    ),
-            );
-          },
-        ),
-      ),
-    );
-  }
-}

lib/fragments/dashboard/network_detection.dart

@@ -19,7 +19,6 @@ class _NetworkDetectionState extends State<NetworkDetection> {
   final timeoutNotifier = ValueNotifier<bool>(false);
   bool? _preIsStart;
   CancelToken? cancelToken;
-  Function? _checkIpDebounce;
 
   _checkIp(
     bool isInit,
@@ -45,7 +44,6 @@ class _NetworkDetectionState extends State<NetworkDetection> {
   }
 
   _checkIpContainer(Widget child) {
-    _checkIpDebounce = debounce(_checkIp);
     return Selector2<AppState, Config, CheckIpSelectorState>(
       selector: (_, appState, config) {
         return CheckIpSelectorState(
@@ -55,22 +53,13 @@ class _NetworkDetectionState extends State<NetworkDetection> {
         );
       },
       builder: (_, state, __) {
-        if (_checkIpDebounce != null) {
-          _checkIpDebounce!([state.isInit, state.isStart]);
-        }
+        _checkIp(state.isInit, state.isStart);
         return child;
       },
       child: child,
     );
   }
 
-  @override
-  void dispose() {
-    super.dispose();
-    ipInfoNotifier.dispose();
-    timeoutNotifier.dispose();
-  }
-
   @override
   Widget build(BuildContext context) {
     return _checkIpContainer(
@@ -78,7 +67,6 @@ class _NetworkDetectionState extends State<NetworkDetection> {
         valueListenable: ipInfoNotifier,
         builder: (_, ipInfo, __) {
           return CommonCard(
-            onPressed: () {},
             child: Column(
               children: [
                 Flexible(
@@ -135,9 +123,8 @@ class _NetworkDetectionState extends State<NetworkDetection> {
                   ),
                 ),
                 Container(
-                  height: globalState.appController.measure.titleLargeHeight +
-                      24 -
-                      1,
+                  height:
+                      globalState.appController.measure.titleLargeHeight + 24,
                   alignment: Alignment.centerLeft,
                   padding: const EdgeInsets.all(16).copyWith(top: 0),
                   child: FadeBox(
@@ -152,7 +139,7 @@ class _NetworkDetectionState extends State<NetworkDetection> {
                                   text: Text(
                                     ipInfo.ip,
                                     style: context.textTheme.titleLarge
-                                        ?.toSoftBold.toMinus,
+                                        ?.toSoftBold(),
                                     maxLines: 1,
                                     overflow: TextOverflow.ellipsis,
                                   ),
@@ -166,10 +153,9 @@ class _NetworkDetectionState extends State<NetworkDetection> {
                               if (timeout) {
                                 return Text(
                                   "timeout",
-                                  style: context.textTheme.titleLarge
+                                  style: context.textTheme.titleMedium
                                       ?.copyWith(color: Colors.red)
-                                      .toSoftBold
-                                      .toMinus,
+                                      .toSoftBold(),
                                   maxLines: 1,
                                   overflow: TextOverflow.ellipsis,
                                 );

lib/fragments/dashboard/network_speed.dart

@@ -21,17 +21,26 @@ class _NetworkSpeedState extends State<NetworkSpeed> {
         .asMap()
         .map(
           (index, e) => MapEntry(
-            index,
-            Point(
-              (index + initPoints.length).toDouble(),
-              e.speed.toDouble(),
-            ),
-          ),
-        )
+        index,
+        Point(
+          (index + initPoints.length).toDouble(),
+          e.speed.toDouble(),
+        ),
+      ),
+    )
         .values
         .toList();
+    var pointsRaw = [...initPoints, ...trafficPoints];
+    List<Point> points;
+    if (pointsRaw.length > 60) {
+      points = pointsRaw
+          .getRange(pointsRaw.length - 61, pointsRaw.length - 1)
+          .toList();
+    } else {
+      points = pointsRaw;
+    }
 
-    return [...initPoints, ...trafficPoints];
+    return points;
   }
 
   Traffic _getLastTraffic(List<Traffic> traffics) {
@@ -44,11 +53,12 @@ class _NetworkSpeedState extends State<NetworkSpeed> {
     required IconData iconData,
     required TrafficValue value,
   }) {
+
     final showValue = value.showValue;
     final showUnit = "${value.showUnit}/s";
     final titleLargeSoftBold =
-        Theme.of(context).textTheme.titleLarge?.toSoftBold;
-    final bodyMedium = Theme.of(context).textTheme.bodySmall?.toLight;
+    Theme.of(context).textTheme.titleLarge?.toSoftBold();
+    final bodyMedium = Theme.of(context).textTheme.bodySmall?.toLight();
     final valueText = Text(
       showValue,
       style: titleLargeSoftBold,
@@ -75,7 +85,7 @@ class _NetworkSpeedState extends State<NetworkSpeed> {
             Flexible(
               child: Text(
                 label,
-                style: Theme.of(context).textTheme.titleSmall?.toSoftBold,
+                style: Theme.of(context).textTheme.titleSmall?.toSoftBold(),
               ),
             ),
           ],
@@ -111,8 +121,7 @@ class _NetworkSpeedState extends State<NetworkSpeed> {
   @override
   Widget build(BuildContext context) {
     return CommonCard(
-      onPressed: () {},
-      info: Info(
+      info:  Info(
         label: appLocalizations.networkSpeed,
         iconData: Icons.speed,
       ),
@@ -163,4 +172,4 @@ class _NetworkSpeedState extends State<NetworkSpeed> {
       ),
     );
   }
-}
+}

lib/fragments/dashboard/outbound_mode.dart

@@ -33,7 +33,6 @@ class OutboundMode extends StatelessWidget {
       selector: (_, clashConfig) => clashConfig.mode,
       builder: (_, mode, __) {
         return CommonCard(
-          onPressed: () {},
           info: Info(
             label: appLocalizations.outboundMode,
             iconData: Icons.call_split,
@@ -68,7 +67,7 @@ class OutboundMode extends StatelessWidget {
                           .of(context)
                           .textTheme
                           .titleMedium
-                          ?.toSoftBold,
+                          ?.toSoftBold(),
                     ),
                   ),
               ],

lib/fragments/dashboard/start_button.dart

@@ -13,17 +13,19 @@ class StartButton extends StatefulWidget {
 
 class _StartButtonState extends State<StartButton>
     with SingleTickerProviderStateMixin {
-  late AnimationController _controller;
   bool isStart = false;
+  bool isInit = false;
+  late AnimationController _controller;
 
   @override
   void initState() {
-    super.initState();
+    isStart = globalState.appController.appState.isStart;
     _controller = AnimationController(
       vsync: this,
-      value: 0,
+      value: isStart ? 1 : 0,
       duration: const Duration(milliseconds: 200),
     );
+    super.initState();
   }
 
   @override
@@ -33,12 +35,9 @@ class _StartButtonState extends State<StartButton>
   }
 
   handleSwitchStart() {
-    final appController = globalState.appController;
-    if (isStart == appController.appState.isStart) {
-      isStart = !isStart;
-      updateController();
-      appController.updateSystemProxy(isStart);
-    }
+    isStart = !isStart;
+    updateController();
+    updateSystemProxy();
   }
 
   updateController() {
@@ -49,18 +48,11 @@ class _StartButtonState extends State<StartButton>
     }
   }
 
-  Widget _updateControllerContainer(Widget child) {
-    return Selector<AppState, bool>(
-      selector: (_, appState) => appState.isStart,
-      builder: (_, isStart, child) {
-        if(isStart != this.isStart){
-          this.isStart = isStart;
-          updateController();
-        }
-        return child!;
-      },
-      child: child,
-    );
+  updateSystemProxy() {
+    WidgetsBinding.instance.addPostFrameCallback((_) async {
+      final appController = globalState.appController;
+      await appController.updateSystemProxy(isStart);
+    });
   }
 
   @override
@@ -80,7 +72,8 @@ class _StartButtonState extends State<StartButton>
                     other.getTimeDifference(
                       DateTime.now(),
                     ),
-                    style: Theme.of(context).textTheme.titleMedium?.toSoftBold,
+                    style:
+                        Theme.of(context).textTheme.titleMedium?.toSoftBold(),
                   ),
                 )
                 .width +
@@ -126,14 +119,24 @@ class _StartButtonState extends State<StartButton>
           child: child,
         );
       },
-      child: _updateControllerContainer(
-        Selector<AppState, int?>(
+      child: Selector<AppState, bool>(
+        selector: (_, appState) => appState.runTime != null,
+        builder: (_, isRun, child) {
+          WidgetsBinding.instance.addPostFrameCallback((_) {
+            if (isStart != isRun) {
+              isStart = isRun;
+              updateController();
+            }
+          });
+          return child!;
+        },
+        child: Selector<AppState, int?>(
           selector: (_, appState) => appState.runTime,
           builder: (_, int? value, __) {
             final text = other.getTimeText(value);
             return Text(
               text,
-              style: Theme.of(context).textTheme.titleMedium?.toSoftBold,
+              style: Theme.of(context).textTheme.titleMedium?.toSoftBold(),
             );
           },
         ),

lib/fragments/dashboard/traffic_usage.dart

@@ -42,7 +42,7 @@ class TrafficUsage extends StatelessWidget {
         ),
         Text(
           trafficValue.showUnit,
-          style: context.textTheme.labelMedium?.toLight,
+          style: context.textTheme.labelMedium?.toLight(),
         ),
       ],
     );
@@ -51,16 +51,25 @@ class TrafficUsage extends StatelessWidget {
   @override
   Widget build(BuildContext context) {
     return CommonCard(
-      onPressed: () {},
       info: Info(
         label: appLocalizations.trafficUsage,
         iconData: Icons.data_saver_off,
       ),
-      child: Selector<AppState, Traffic>(
-        selector: (_, appState) => appState.totalTraffic,
-        builder: (_, totalTraffic, __) {
-          final upTotalTrafficValue = totalTraffic.up;
-          final downTotalTrafficValue = totalTraffic.down;
+      child: Selector<AppState, List<Traffic>>(
+        selector: (_, appState) => appState.traffics,
+        builder: (_, traffics, __) {
+          final trafficTotal = traffics.isNotEmpty
+              ? traffics.reduce(
+                  (value, element) {
+                    return Traffic(
+                      up: element.up.value + value.up.value,
+                      down: element.down.value + value.down.value,
+                    );
+                  },
+                )
+              : Traffic();
+          final upTrafficValue = trafficTotal.up;
+          final downTrafficValue = trafficTotal.down;
           return Padding(
             padding: const EdgeInsets.all(16).copyWith(top: 0),
             child: Column(
@@ -71,7 +80,7 @@ class TrafficUsage extends StatelessWidget {
                   child: getTrafficDataItem(
                     context,
                     Icons.arrow_upward,
-                    upTotalTrafficValue,
+                    upTrafficValue,
                   ),
                 ),
                 const SizedBox(
@@ -82,7 +91,7 @@ class TrafficUsage extends StatelessWidget {
                   child: getTrafficDataItem(
                     context,
                     Icons.arrow_downward,
-                    downTotalTrafficValue,
+                    downTrafficValue,
                   ),
                 ),
               ],

lib/fragments/logs.dart

@@ -17,12 +17,7 @@ class LogsFragment extends StatefulWidget {
 }
 
 class _LogsFragmentState extends State<LogsFragment> {
-  final logsNotifier = ValueNotifier<LogsAndKeywords>(const LogsAndKeywords());
-  final scrollController = ScrollController(
-    keepScrollOffset: false,
-  );
-  List<GlobalObjectKey<_LogItemState>> keys = [];
-
+  final logsNotifier = ValueNotifier<List<Log>>([]);
   Timer? timer;
 
   @override
@@ -30,18 +25,18 @@ class _LogsFragmentState extends State<LogsFragment> {
     super.initState();
     WidgetsBinding.instance.addPostFrameCallback((_) {
       final appState = globalState.appController.appState;
-      logsNotifier.value = logsNotifier.value.copyWith(logs: appState.logs);
+      logsNotifier.value = List<Log>.from(appState.logs);
       if (timer != null) {
         timer?.cancel();
         timer = null;
       }
       timer = Timer.periodic(const Duration(milliseconds: 200), (timer) {
-        final logs = appState.logs;
+        final logs = List<Log>.from(appState.logs);
         if (!const ListEquality<Log>().equals(
-          logsNotifier.value.logs,
+          logsNotifier.value,
           logs,
         )) {
-          logsNotifier.value = logsNotifier.value.copyWith(logs: logs);
+          logsNotifier.value = logs;
         }
       });
     });
@@ -51,8 +46,6 @@ class _LogsFragmentState extends State<LogsFragment> {
   void dispose() {
     super.dispose();
     timer?.cancel();
-    logsNotifier.dispose();
-    scrollController.dispose();
     timer = null;
   }
 
@@ -66,7 +59,7 @@ class _LogsFragmentState extends State<LogsFragment> {
             showSearch(
               context: context,
               delegate: LogsSearchDelegate(
-                logs: logsNotifier.value,
+                logs: logsNotifier.value.reversed.toList(),
               ),
             );
           },
@@ -79,23 +72,32 @@ class _LogsFragmentState extends State<LogsFragment> {
     });
   }
 
-  _addKeyword(String keyword) {
-    final isContains = logsNotifier.value.keywords.contains(keyword);
-    if (isContains) return;
-    final keywords = List<String>.from(logsNotifier.value.keywords)
-      ..add(keyword);
-    logsNotifier.value = logsNotifier.value.copyWith(
-      keywords: keywords,
-    );
-  }
-
-  _deleteKeyword(String keyword) {
-    final isContains = logsNotifier.value.keywords.contains(keyword);
-    if (!isContains) return;
-    final keywords = List<String>.from(logsNotifier.value.keywords)
-      ..remove(keyword);
-    logsNotifier.value = logsNotifier.value.copyWith(
-      keywords: keywords,
+  _buildList() {
+    return ValueListenableBuilder<List<Log>>(
+      valueListenable: logsNotifier,
+      builder: (_, List<Log> logs, __) {
+        if (logs.isEmpty) {
+          return NullStatus(
+            label: appLocalizations.nullLogsDesc,
+          );
+        }
+        logs = logs.reversed.toList();
+        return ListView.separated(
+          physics: const AlwaysScrollableScrollPhysics(),
+          itemCount: logs.length,
+          itemBuilder: (BuildContext context, int index) {
+            final log = logs[index];
+            return LogItem(
+              log: log,
+            );
+          },
+          separatorBuilder: (BuildContext context, int index) {
+            return const Divider(
+              height: 0,
+            );
+          },
+        );
+      },
     );
   }
 
@@ -112,88 +114,21 @@ class _LogsFragmentState extends State<LogsFragment> {
         }
         return child!;
       },
-      child: ValueListenableBuilder<LogsAndKeywords>(
-        valueListenable: logsNotifier,
-        builder: (_, state, __) {
-          var logs = state.filteredLogs;
-          if (logs.isEmpty) {
-            return NullStatus(
-              label: appLocalizations.nullLogsDesc,
-            );
-          }
-          logs = logs.reversed.toList();
-          keys = logs
-              .map((log) => GlobalObjectKey<_LogItemState>(log.dateTime))
-              .toList();
-          return Column(
-            crossAxisAlignment: CrossAxisAlignment.start,
-            children: [
-              if (state.keywords.isNotEmpty)
-                Padding(
-                  padding: const EdgeInsets.symmetric(
-                    horizontal: 16,
-                    vertical: 16,
-                  ),
-                  child: Wrap(
-                    runSpacing: 8,
-                    spacing: 8,
-                    children: [
-                      for (final keyword in state.keywords)
-                        CommonChip(
-                          label: keyword,
-                          type: ChipType.delete,
-                          onPressed: () {
-                            _deleteKeyword(keyword);
-                          },
-                        ),
-                    ],
-                  ),
-                ),
-              Expanded(
-                child: ListView.separated(
-                  controller: scrollController,
-                  itemBuilder: (_, index) {
-                    final log = logs[index];
-                    return LogItem(
-                      key: Key(log.dateTime.toString()),
-                      log: log,
-                      onClick: _addKeyword,
-                    );
-                  },
-                  separatorBuilder: (BuildContext context, int index) {
-                    return const Divider(
-                      height: 0,
-                    );
-                  },
-                  itemCount: logs.length,
-                ),
-              )
-            ],
-          );
-        },
-      ),
+      child: _buildList(),
     );
   }
 }
 
 class LogsSearchDelegate extends SearchDelegate {
-  ValueNotifier<LogsAndKeywords> logsNotifier;
+  List<Log> logs = [];
 
   LogsSearchDelegate({
-    required LogsAndKeywords logs,
-  }) : logsNotifier = ValueNotifier(logs);
-
-  @override
-  void dispose() {
-    super.dispose();
-    logsNotifier.dispose();
-  }
-
-  get state => logsNotifier.value;
+    required this.logs,
+  });
 
   List<Log> get _results {
     final lowQuery = query.toLowerCase();
-    return logsNotifier.value.filteredLogs
+    return logs
         .where(
           (log) =>
               (log.payload?.toLowerCase().contains(lowQuery) ?? false) ||
@@ -236,98 +171,37 @@ class LogsSearchDelegate extends SearchDelegate {
     return buildSuggestions(context);
   }
 
-  _addKeyword(String keyword) {
-    final isContains = logsNotifier.value.keywords.contains(keyword);
-    if (isContains) return;
-    final keywords = List<String>.from(logsNotifier.value.keywords)..add(keyword);
-    logsNotifier.value = logsNotifier.value.copyWith(
-      keywords: keywords,
-    );
-  }
-
-  _deleteKeyword(String keyword) {
-    final isContains = logsNotifier.value.keywords.contains(keyword);
-    if (!isContains) return;
-    final keywords = List<String>.from(logsNotifier.value.keywords)..remove(keyword);
-    logsNotifier.value = logsNotifier.value.copyWith(
-      keywords: keywords,
-    );
-  }
-
   @override
   Widget buildSuggestions(BuildContext context) {
-    return ValueListenableBuilder(
-      valueListenable: logsNotifier,
-      builder: (_, __, ___) {
-        return Column(
-          crossAxisAlignment: CrossAxisAlignment.start,
-          children: [
-            if (state.keywords.isNotEmpty)
-              Padding(
-                padding: const EdgeInsets.symmetric(
-                  horizontal: 16,
-                  vertical: 16,
-                ),
-                child: Wrap(
-                  runSpacing: 8,
-                  spacing: 8,
-                  children: [
-                    for (final keyword in state.keywords)
-                      CommonChip(
-                        label: keyword,
-                        type: ChipType.delete,
-                        onPressed: () {
-                          _deleteKeyword(keyword);
-                        },
-                      ),
-                  ],
-                ),
-              ),
-            Expanded(
-              child: ListView.separated(
-                itemBuilder: (_, index) {
-                  final log = _results[index];
-                  return LogItem(
-                    key: Key(log.dateTime.toString()),
-                    log: log,
-                    onClick: (value) {
-                      _addKeyword(value);
-                    },
-                  );
-                },
-                separatorBuilder: (BuildContext context, int index) {
-                  return const Divider(
-                    height: 0,
-                  );
-                },
-                itemCount: _results.length,
-              ),
-            )
-          ],
+    return ListView.separated(
+      physics: const AlwaysScrollableScrollPhysics(),
+      itemCount: _results.length,
+      itemBuilder: (BuildContext context, int index) {
+        final log = _results[index];
+        return LogItem(
+          key: ValueKey(log.dateTime),
+          log: log,
+        );
+      },
+      separatorBuilder: (BuildContext context, int index) {
+        return const Divider(
+          height: 0,
         );
       },
     );
   }
 }
 
-class LogItem extends StatefulWidget {
+class LogItem extends StatelessWidget {
   final Log log;
-  final Function(String)? onClick;
 
   const LogItem({
     super.key,
     required this.log,
-    this.onClick,
   });
 
-  @override
-  State<LogItem> createState() => _LogItemState();
-}
-
-class _LogItemState extends State<LogItem> {
   @override
   Widget build(BuildContext context) {
-    final log = widget.log;
     return ListTile(
       title: SelectableText(log.payload ?? ''),
       subtitle: Column(
@@ -349,10 +223,6 @@ class _LogItemState extends State<LogItem> {
               vertical: 8,
             ),
             child: CommonChip(
-              onPressed: () {
-                if (widget.onClick == null) return;
-                widget.onClick!(log.logLevel.name);
-              },
               label: log.logLevel.name,
             ),
           ),

lib/fragments/profiles/add_profile.dart

@@ -25,9 +25,7 @@ class AddProfile extends StatelessWidget {
     final url = await Navigator.of(context)
         .push<String>(MaterialPageRoute(builder: (_) => const ScanPage()));
     if (url != null) {
-      WidgetsBinding.instance.addPostFrameCallback((_){
-        _handleAddProfileFormURL(url);
-      });
+      _handleAddProfileFormURL(url);
     }
   }
 
@@ -93,8 +91,6 @@ class _URLFormDialogState extends State<URLFormDialog> {
           runSpacing: 16,
           children: [
             TextField(
-              maxLines: 5,
-              minLines: 1,
               controller: urlController,
               decoration: InputDecoration(
                 border: const OutlineInputBorder(),

lib/fragments/profiles/edit_profile.dart

@@ -41,26 +41,19 @@ class _EditProfileState extends State<EditProfile> {
   _handleConfirm() {
     if (!_formKey.currentState!.validate()) return;
     final config = widget.context.read<Config>();
-    final profile = widget.profile.copyWith(
-      url: urlController.text,
-      label: labelController.text,
-      autoUpdate: autoUpdate,
-      autoUpdateDuration: Duration(
-        minutes: int.parse(
-          autoUpdateDurationController.text,
-        ),
-      ),
-    );
-    final hasUpdate = widget.profile.url != profile.url;
-    config.setProfile(profile);
+    final hasUpdate = urlController.text.isNotEmpty && widget.profile.url != urlController.text;
+    widget.profile.url = urlController.text;
+    widget.profile.label = labelController.text;
+    widget.profile.autoUpdate = autoUpdate;
+    widget.profile.autoUpdateDuration =
+        Duration(minutes: int.parse(autoUpdateDurationController.text));
+    config.setProfile(widget.profile);
     if (hasUpdate) {
-      globalState.homeScaffoldKey.currentState?.loadingRun(
-        () async {
-          if (hasUpdate) {
-            await globalState.appController.updateProfile(profile);
-          }
-        },
-      );
+      widget.context.findAncestorStateOfType<CommonScaffoldState>()?.loadingRun(
+            () => globalState.appController.updateProfile(
+              widget.profile.id,
+            ),
+          );
     }
     Navigator.of(context).pop();
   }
@@ -90,12 +83,12 @@ class _EditProfileState extends State<EditProfile> {
           },
         ),
       ),
-      if (widget.profile.type == ProfileType.url) ...[
+      if (widget.profile.type == ProfileType.url)...[
         ListItem(
           title: TextFormField(
             controller: urlController,
-            maxLines: 5,
             minLines: 1,
+            maxLines: 2,
             decoration: InputDecoration(
               border: const OutlineInputBorder(),
               labelText: appLocalizations.url,

lib/fragments/profiles/profiles.dart

@@ -1,6 +1,5 @@
 import 'package:fl_clash/enum/enum.dart';
 import 'package:fl_clash/fragments/profiles/edit_profile.dart';
-import 'package:fl_clash/fragments/profiles/view_profile.dart';
 import 'package:fl_clash/models/models.dart';
 import 'package:fl_clash/common/common.dart';
 import 'package:fl_clash/state.dart';
@@ -16,7 +15,6 @@ enum ProfileActions {
   edit,
   update,
   delete,
-  view,
 }
 
 class ProfilesFragment extends StatefulWidget {
@@ -29,8 +27,6 @@ class ProfilesFragment extends StatefulWidget {
 class _ProfilesFragmentState extends State<ProfilesFragment> {
   final hasPadding = ValueNotifier<bool>(false);
 
-  List<GlobalObjectKey<_ProfileItemState>> profileItemKeys = [];
-
   _handleShowAddExtendPage() {
     showExtendPage(
       globalState.navigatorKey.currentState!.context,
@@ -52,22 +48,19 @@ class _ProfilesFragmentState extends State<ProfilesFragment> {
     }
   }
 
-  _updateProfiles() async {
-    final updateProfiles = profileItemKeys.map<Future>(
-        (key) async => await key.currentState?.updateProfile(false));
-    await Future.wait(updateProfiles);
-  }
-
   _initScaffoldState() {
     WidgetsBinding.instance.addPostFrameCallback(
       (_) {
         final commonScaffoldState =
             context.findAncestorStateOfType<CommonScaffoldState>();
-        if (!context.mounted) return;
         commonScaffoldState?.actions = [
           IconButton(
             onPressed: () {
-              _updateProfiles();
+              commonScaffoldState.loadingRun<void>(
+                () async {
+                  await globalState.appController.updateProfiles();
+                },
+              );
             },
             icon: const Icon(Icons.sync),
           ),
@@ -86,12 +79,6 @@ class _ProfilesFragmentState extends State<ProfilesFragment> {
     );
   }
 
-  @override
-  void dispose() {
-    super.dispose();
-    hasPadding.dispose();
-  }
-
   @override
   Widget build(BuildContext context) {
     return Selector<AppState, bool>(
@@ -114,9 +101,6 @@ class _ProfilesFragmentState extends State<ProfilesFragment> {
               label: appLocalizations.nullProfileDesc,
             );
           }
-          profileItemKeys = state.profiles
-              .map((profile) => GlobalObjectKey<_ProfileItemState>(profile.id))
-              .toList();
           final columns = _getColumns(state.viewMode);
           final isMobile = state.viewMode == ViewMode.mobile;
           return Align(
@@ -148,11 +132,10 @@ class _ProfilesFragmentState extends State<ProfilesFragment> {
                       crossAxisSpacing: 16,
                       crossAxisCount: columns,
                       children: [
-                        for (int i = 0; i < state.profiles.length; i++)
+                        for (final profile in state.profiles)
                           GridItem(
                             child: ProfileItem(
-                              key: profileItemKeys[i],
-                              profile: state.profiles[i],
+                              profile: profile,
                               groupValue: state.currentProfileId,
                               onChanged:
                                   globalState.appController.changeProfile,
@@ -190,51 +173,42 @@ class ProfileItem extends StatefulWidget {
 class _ProfileItemState extends State<ProfileItem> {
   final isUpdating = ValueNotifier<bool>(false);
 
-  _handleDeleteProfile() async {
-    globalState.appController.deleteProfile(widget.profile.id);
+  _handleDeleteProfile(String id) async {
+    globalState.appController.deleteProfile(id);
   }
 
-  _handleUpdateProfile() async {
-    await globalState.safeRun<void>(updateProfile);
-  }
-
-  Future updateProfile([isSingle = true]) async {
+  _handleUpdateProfile(String id) async {
     isUpdating.value = true;
-    try {
-      await globalState.appController.updateProfile(widget.profile);
-    } catch (e) {
-      isUpdating.value = false;
-      if (!isSingle) {
-        return e.toString();
-      }
-    }
+    await globalState.safeRun<void>(() async {
+      await globalState.appController.updateProfile(id);
+    });
     isUpdating.value = false;
-    return null;
   }
 
-  _handleShowEditExtendPage() {
+  _handleShowEditExtendPage(
+    Profile profile,
+  ) {
     showExtendPage(
       context,
       body: EditProfile(
-        profile: widget.profile,
+        profile: profile.copyWith(),
         context: context,
       ),
       title: "${appLocalizations.edit}${appLocalizations.profile}",
     );
   }
 
-  _handleViewProfile() {
-    Navigator.of(context).push(
-      MaterialPageRoute(
-        builder: (context) => ViewProfile(
-          profile: widget.profile,
-        ),
-      ),
-    );
-  }
-
   _buildTitle(Profile profile) {
     final textTheme = context.textTheme;
+    final userInfo = profile.userInfo ?? UserInfo();
+    final use = userInfo.upload + userInfo.download;
+    final total = userInfo.total;
+    final useShow = TrafficValue(value: use).show;
+    final totalShow = TrafficValue(value: total).show;
+    final progress = total == 0 ? 0.0 : use / total;
+    final expireShow = userInfo.expire == 0
+        ? "长期有效"
+        : DateTime.fromMillisecondsSinceEpoch(userInfo.expire * 1000).show;
     return Container(
       padding: const EdgeInsets.symmetric(vertical: 4),
       child: Column(
@@ -253,141 +227,53 @@ class _ProfileItemState extends State<ProfileItem> {
               ),
               Text(
                 profile.lastUpdateDate?.lastUpdateTimeDesc ?? '',
-                style: textTheme.labelMedium?.toLight,
+                style: textTheme.labelMedium?.toLight(),
               ),
             ],
           ),
-          Builder(builder: (context) {
-            final userInfo = profile.userInfo ?? const UserInfo();
-            final use = userInfo.upload + userInfo.download;
-            final total = userInfo.total;
-            final useShow = TrafficValue(value: use).show;
-            final totalShow = TrafficValue(value: total).show;
-            final progress = total == 0 ? 0.0 : use / total;
-            final expireShow = userInfo.expire == 0
-                ? appLocalizations.infiniteTime
-                : DateTime.fromMillisecondsSinceEpoch(userInfo.expire * 1000)
-                    .show;
-            return Column(
-              mainAxisSize: MainAxisSize.min,
-              crossAxisAlignment: CrossAxisAlignment.start,
-              mainAxisAlignment: MainAxisAlignment.center,
-              children: [
-                Container(
-                  margin: const EdgeInsets.symmetric(
-                    vertical: 8,
+          Column(
+            mainAxisSize: MainAxisSize.min,
+            crossAxisAlignment: CrossAxisAlignment.start,
+            mainAxisAlignment: MainAxisAlignment.center,
+            children: [
+              Container(
+                margin: const EdgeInsets.symmetric(
+                  vertical: 8,
+                ),
+                child: LinearProgressIndicator(
+                  minHeight: 6,
+                  value: progress,
+                ),
+              ),
+              Text(
+                "$useShow / $totalShow",
+                style: textTheme.labelMedium?.toLight(),
+              ),
+              const SizedBox(
+                height: 2,
+              ),
+              Row(
+                children: [
+                  Text(
+                    "到期时间:",
+                    style: textTheme.labelMedium?.toLighter(),
                   ),
-                  child: LinearProgressIndicator(
-                    minHeight: 6,
-                    value: progress,
+                  const SizedBox(
+                    width: 4,
                   ),
-                ),
-                Text(
-                  "$useShow / $totalShow",
-                  style: textTheme.labelMedium?.toLight,
-                ),
-                const SizedBox(
-                  height: 2,
-                ),
-                Row(
-                  children: [
-                    Text(
-                      appLocalizations.expirationTime,
-                      style: textTheme.labelMedium?.toLighter,
-                    ),
-                    const SizedBox(
-                      width: 4,
-                    ),
-                    Text(
-                      expireShow,
-                      style: textTheme.labelMedium?.toLighter,
-                    ),
-                  ],
-                )
-              ],
-            );
-            // final child = switch (userInfo != null) {
-            //   true => () {
-            //       final use = userInfo!.upload + userInfo.download;
-            //       final total = userInfo.total;
-            //       final useShow = TrafficValue(value: use).show;
-            //       final totalShow = TrafficValue(value: total).show;
-            //       final progress = total == 0 ? 0.0 : use / total;
-            //       final expireShow = userInfo.expire == 0
-            //           ? appLocalizations.infiniteTime
-            //           : DateTime.fromMillisecondsSinceEpoch(
-            //                   userInfo.expire * 1000)
-            //               .show;
-            //       return Column(
-            //         mainAxisSize: MainAxisSize.min,
-            //         crossAxisAlignment: CrossAxisAlignment.start,
-            //         mainAxisAlignment: MainAxisAlignment.center,
-            //         children: [
-            //           Container(
-            //             margin: const EdgeInsets.symmetric(
-            //               vertical: 8,
-            //             ),
-            //             child: LinearProgressIndicator(
-            //               minHeight: 6,
-            //               value: progress,
-            //             ),
-            //           ),
-            //           Text(
-            //             "$useShow / $totalShow",
-            //             style: textTheme.labelMedium?.toLight(),
-            //           ),
-            //           const SizedBox(
-            //             height: 2,
-            //           ),
-            //           Row(
-            //             children: [
-            //               Text(
-            //                 appLocalizations.expirationTime,
-            //                 style: textTheme.labelMedium?.toLighter(),
-            //               ),
-            //               const SizedBox(
-            //                 width: 4,
-            //               ),
-            //               Text(
-            //                 expireShow,
-            //                 style: textTheme.labelMedium?.toLighter(),
-            //               ),
-            //             ],
-            //           )
-            //         ],
-            //       );
-            //     }(),
-            //   false => Column(
-            //       children: [
-            //         Padding(
-            //           padding: const EdgeInsets.only(top: 8),
-            //           child: CommonChip(
-            //             onPressed: _handleViewProfile,
-            //             avatar: const Icon(Icons.remove_red_eye),
-            //             label: appLocalizations.view,
-            //           ),
-            //         ),
-            //       ],
-            //     ),
-            // };
-            // final measure = globalState.appController.measure;
-            // final height = 6 + 8 * 2 + 2 + measure.labelMediumHeight * 2;
-            // return SizedBox(
-            //   height: height,
-            //   child: child,
-            // );
-          }),
+                  Text(
+                    expireShow,
+                    style: textTheme.labelMedium?.toLighter(),
+                  ),
+                ],
+              )
+            ],
+          ),
         ],
       ),
     );
   }
 
-  @override
-  void dispose() {
-    isUpdating.dispose();
-    super.dispose();
-  }
-
   @override
   Widget build(BuildContext context) {
     final profile = widget.profile;
@@ -412,63 +298,40 @@ class _ProfileItemState extends State<ProfileItem> {
           onChanged: onChanged,
         ),
         padding: const EdgeInsets.symmetric(horizontal: 16),
-        trailing: SizedBox(
-          height: 48,
-          width: 48,
-          child: ValueListenableBuilder(
-            valueListenable: isUpdating,
-            builder: (_, isUpdating, ___) {
-              return FadeBox(
-                  child: isUpdating
-                      ? const Padding(
-                          padding: EdgeInsets.all(8),
-                          child: CircularProgressIndicator(),
-                        )
-                      : CommonPopupMenu<ProfileActions>(
-                          items: [
-                            CommonPopupMenuItem(
-                              action: ProfileActions.edit,
-                              label: appLocalizations.edit,
-                              iconData: Icons.edit,
-                            ),
-                            if (profile.type == ProfileType.url)
-                              CommonPopupMenuItem(
-                                action: ProfileActions.update,
-                                label: appLocalizations.update,
-                                iconData: Icons.sync,
-                              ),
-                            CommonPopupMenuItem(
-                              action: ProfileActions.view,
-                              label: appLocalizations.view,
-                              iconData: Icons.visibility,
-                            ),
-                            CommonPopupMenuItem(
-                              action: ProfileActions.delete,
-                              label: appLocalizations.delete,
-                              iconData: Icons.delete,
-                            ),
-                          ],
-                          onSelected: (ProfileActions? action) async {
-                            switch (action) {
-                              case ProfileActions.edit:
-                                _handleShowEditExtendPage();
-                                break;
-                              case ProfileActions.delete:
-                                _handleDeleteProfile();
-                                break;
-                              case ProfileActions.update:
-                                _handleUpdateProfile();
-                                break;
-                              case ProfileActions.view:
-                                _handleViewProfile();
-                                break;
-                              case null:
-                                break;
-                            }
-                          },
-                        ));
-            },
-          ),
+        trailing: CommonPopupMenu<ProfileActions>(
+          items: [
+            CommonPopupMenuItem(
+              action: ProfileActions.edit,
+              label: appLocalizations.edit,
+              iconData: Icons.edit,
+            ),
+            if (profile.type == ProfileType.url)
+              CommonPopupMenuItem(
+                action: ProfileActions.update,
+                label: appLocalizations.update,
+                iconData: Icons.sync,
+              ),
+            CommonPopupMenuItem(
+              action: ProfileActions.delete,
+              label: appLocalizations.delete,
+              iconData: Icons.delete,
+            ),
+          ],
+          onSelected: (ProfileActions? action) async {
+            switch (action) {
+              case ProfileActions.edit:
+                _handleShowEditExtendPage(profile);
+                break;
+              case ProfileActions.delete:
+                _handleDeleteProfile(profile.id);
+                break;
+              case ProfileActions.update:
+                _handleUpdateProfile(profile.id);
+                break;
+              case null:
+                break;
+            }
+          },
         ),
         title: _buildTitle(profile),
         tileTitleAlignment: ListTileTitleAlignment.titleHeight,

lib/fragments/profiles/view_profile.dart

@@ -1,207 +0,0 @@
-import 'dart:io';
-
-import 'package:fl_clash/common/common.dart';
-import 'package:fl_clash/models/models.dart';
-import 'package:fl_clash/state.dart';
-import 'package:fl_clash/widgets/scaffold.dart';
-import 'package:flutter/material.dart';
-import 'package:re_editor/re_editor.dart';
-import 'package:re_highlight/languages/yaml.dart';
-import 'package:re_highlight/styles/intellij-light.dart';
-
-class ViewProfile extends StatefulWidget {
-  final Profile profile;
-
-  const ViewProfile({
-    super.key,
-    required this.profile,
-  });
-
-  @override
-  State<ViewProfile> createState() => _ViewProfileState();
-}
-
-class _ViewProfileState extends State<ViewProfile> {
-  bool readOnly = true;
-  CodeLineEditingController? controller;
-  final contentNotifier = ValueNotifier<String>("");
-  final key = GlobalKey<CommonScaffoldState>();
-
-  @override
-  void initState() {
-    super.initState();
-    WidgetsBinding.instance.addPostFrameCallback((_) async {
-      final profilePath = await appPath.getProfilePath(widget.profile.id);
-      if (profilePath == null) {
-        return;
-      }
-      final file = File(profilePath);
-      final text = await file.readAsString();
-      contentNotifier.value = text;
-    });
-  }
-
-  @override
-  void dispose() {
-    super.dispose();
-    contentNotifier.dispose();
-    controller?.dispose();
-  }
-
-  Profile get profile => widget.profile;
-
-  _handleChangeReadOnly() async {
-    if (readOnly == true) {
-      setState(() {
-        readOnly = false;
-      });
-    } else {
-      final text = controller?.text;
-      if (text == null || text == contentNotifier.value) {
-        setState(() {
-          readOnly = true;
-        });
-        return;
-      }
-      contentNotifier.value = text;
-      final newProfile = await key.currentState?.loadingRun<Profile>(() async {
-        return await profile.saveFileWithString(text);
-      });
-      if (newProfile == null) return;
-      globalState.appController.config.setProfile(newProfile);
-      setState(() {
-        readOnly = true;
-      });
-    }
-  }
-
-  @override
-  Widget build(BuildContext context) {
-    return CommonScaffold(
-      key: key,
-      actions: [
-        IconButton(
-          onPressed: controller?.undo,
-          icon: const Icon(Icons.undo),
-        ),
-        IconButton(
-          onPressed: controller?.redo,
-          icon: const Icon(Icons.redo),
-        ),
-        if (!widget.profile.realAutoUpdate)
-          IconButton(
-            onPressed: _handleChangeReadOnly,
-            icon: readOnly ? const Icon(Icons.edit) : const Icon(Icons.save),
-          ),
-        const SizedBox(
-          width: 8,
-        )
-      ],
-      body: ValueListenableBuilder(
-        valueListenable: contentNotifier,
-        builder: (_, value, __) {
-          if (value.isEmpty) return Container();
-          controller = CodeLineEditingController.fromText(value);
-          return CodeEditor(
-            autofocus: false,
-            readOnly: readOnly,
-            scrollbarBuilder: (context, child, details) {
-              return Scrollbar(
-                controller: details.controller,
-                thickness: 8,
-                radius: const Radius.circular(2),
-                interactive: true,
-                child: child,
-              );
-            },
-            showCursorWhenReadOnly: false,
-            controller: controller,
-            toolbarController:
-                !readOnly ? const ContextMenuControllerImpl() : null,
-            shortcutsActivatorsBuilder:
-                const DefaultCodeShortcutsActivatorsBuilder(),
-            indicatorBuilder:
-                (context, editingController, chunkController, notifier) {
-              return Row(
-                children: [
-                  DefaultCodeLineNumber(
-                    controller: editingController,
-                    notifier: notifier,
-                  ),
-                  DefaultCodeChunkIndicator(
-                    width: 20,
-                    controller: chunkController,
-                    notifier: notifier,
-                  )
-                ],
-              );
-            },
-            style: CodeEditorStyle(
-              fontSize: 14,
-              codeTheme: CodeHighlightTheme(
-                languages: {
-                  'yaml': CodeHighlightThemeMode(
-                    mode: langYaml,
-                  )
-                },
-                theme: intellijLightTheme,
-              ),
-            ),
-          );
-        },
-      ),
-      title: widget.profile.label ?? widget.profile.id,
-    );
-  }
-}
-
-class ContextMenuItemWidget extends PopupMenuItem<void> {
-  ContextMenuItemWidget({
-    super.key,
-    required String text,
-    required VoidCallback super.onTap,
-  }) : super(child: Text(text));
-}
-
-class ContextMenuControllerImpl implements SelectionToolbarController {
-  const ContextMenuControllerImpl();
-
-  @override
-  void hide(BuildContext context) {}
-
-  @override
-  void show({
-    required BuildContext context,
-    required CodeLineEditingController controller,
-    required TextSelectionToolbarAnchors anchors,
-    Rect? renderRect,
-    required LayerLink layerLink,
-    required ValueNotifier<bool> visibility,
-  }) {
-    if (controller.selectedText.isEmpty) {
-      return;
-    }
-    showMenu(
-      context: context,
-      position: RelativeRect.fromSize(
-        (anchors.secondaryAnchor ?? anchors.primaryAnchor) &
-            const Size(150, double.infinity),
-        MediaQuery.of(context).size,
-      ),
-      items: [
-        ContextMenuItemWidget(
-          text: appLocalizations.cut,
-          onTap: controller.cut,
-        ),
-        ContextMenuItemWidget(
-          text: appLocalizations.copy,
-          onTap: controller.copy,
-        ),
-        ContextMenuItemWidget(
-          text: appLocalizations.paste,
-          onTap: controller.paste,
-        ),
-      ],
-    );
-  }
-}

lib/fragments/requests.dart

@@ -3,24 +3,21 @@ import 'dart:io';
 
 import 'package:collection/collection.dart';
 import 'package:fl_clash/common/common.dart';
-import 'package:fl_clash/enum/enum.dart';
 import 'package:fl_clash/models/models.dart';
 import 'package:fl_clash/plugins/app.dart';
 import 'package:fl_clash/state.dart';
 import 'package:fl_clash/widgets/widgets.dart';
 import 'package:flutter/material.dart';
-import 'package:provider/provider.dart';
 
-class RequestsFragment extends StatefulWidget {
-  const RequestsFragment({super.key});
+class RequestFragment extends StatefulWidget {
+  const RequestFragment({super.key});
 
   @override
-  State<RequestsFragment> createState() => _RequestsFragmentState();
+  State<RequestFragment> createState() => _RequestFragmentState();
 }
 
-class _RequestsFragmentState extends State<RequestsFragment> {
-  final requestsNotifier =
-      ValueNotifier<ConnectionsAndKeywords>(const ConnectionsAndKeywords());
+class _RequestFragmentState extends State<RequestFragment> {
+  final requestsNotifier = ValueNotifier<List<Connection>>([]);
   final ScrollController _scrollController = ScrollController(
     keepScrollOffset: false,
   );
@@ -32,70 +29,23 @@ class _RequestsFragmentState extends State<RequestsFragment> {
     super.initState();
     WidgetsBinding.instance.addPostFrameCallback((_) {
       final appState = globalState.appController.appState;
-      requestsNotifier.value =
-          requestsNotifier.value.copyWith(connections: appState.requests);
+      requestsNotifier.value = List<Connection>.from(appState.requests);
       if (timer != null) {
         timer?.cancel();
         timer = null;
       }
       timer = Timer.periodic(const Duration(milliseconds: 200), (timer) {
-        final requests = appState.requests;
+        final requests = List<Connection>.from(appState.requests);
         if (!const ListEquality<Connection>().equals(
-          requestsNotifier.value.connections,
+          requestsNotifier.value,
           requests,
         )) {
-          requestsNotifier.value =
-              requestsNotifier.value.copyWith(connections: requests);
+          requestsNotifier.value = requests;
         }
       });
     });
   }
 
-  _initActions() {
-    WidgetsBinding.instance.addPostFrameCallback(
-      (_) {
-        final commonScaffoldState =
-            context.findAncestorStateOfType<CommonScaffoldState>();
-        commonScaffoldState?.actions = [
-          IconButton(
-            onPressed: () {
-              showSearch(
-                context: context,
-                delegate: RequestsSearchDelegate(
-                  state: requestsNotifier.value,
-                ),
-              );
-            },
-            icon: const Icon(Icons.search),
-          ),
-          const SizedBox(
-            width: 8,
-          )
-        ];
-      },
-    );
-  }
-
-  _addKeyword(String keyword) {
-    final isContains = requestsNotifier.value.keywords.contains(keyword);
-    if (isContains) return;
-    final keywords = List<String>.from(requestsNotifier.value.keywords)
-      ..add(keyword);
-    requestsNotifier.value = requestsNotifier.value.copyWith(
-      keywords: keywords,
-    );
-  }
-
-  _deleteKeyword(String keyword) {
-    final isContains = requestsNotifier.value.keywords.contains(keyword);
-    if (!isContains) return;
-    final keywords = List<String>.from(requestsNotifier.value.keywords)
-      ..remove(keyword);
-    requestsNotifier.value = requestsNotifier.value.copyWith(
-      keywords: keywords,
-    );
-  }
-
   @override
   void dispose() {
     super.dispose();
@@ -106,86 +56,42 @@ class _RequestsFragmentState extends State<RequestsFragment> {
 
   @override
   Widget build(BuildContext context) {
-    return Selector<AppState, bool?>(
-      selector: (_, appState) =>
-          appState.currentLabel == 'requests' ||
-          appState.viewMode == ViewMode.mobile &&
-              appState.currentLabel == "tools",
-      builder: (_, isCurrent, child) {
-        if (isCurrent == null || isCurrent) {
-          _initActions();
-        }
-        return child!;
-      },
-      child: ValueListenableBuilder<ConnectionsAndKeywords>(
-        valueListenable: requestsNotifier,
-        builder: (_, state, __) {
-          var connections = state.filteredConnections;
-          if (connections.isEmpty) {
-            return NullStatus(
-              label: appLocalizations.nullRequestsDesc,
-            );
-          }
-          connections = connections.reversed.toList();
-          return Column(
-            crossAxisAlignment: CrossAxisAlignment.start,
-            children: [
-              if (state.keywords.isNotEmpty)
-                Padding(
-                  padding: const EdgeInsets.symmetric(
-                    horizontal: 16,
-                    vertical: 16,
-                  ),
-                  child: Wrap(
-                    runSpacing: 8,
-                    spacing: 8,
-                    children: [
-                      for (final keyword in state.keywords)
-                        CommonChip(
-                          label: keyword,
-                          type: ChipType.delete,
-                          onPressed: () {
-                            _deleteKeyword(keyword);
-                          },
-                        ),
-                    ],
-                  ),
-                ),
-              Expanded(
-                child: ListView.separated(
-                  controller: _scrollController,
-                  itemBuilder: (_, index) {
-                    final connection = connections[index];
-                    return RequestItem(
-                      key: Key(connection.id),
-                      connection: connection,
-                      onClick: _addKeyword,
-                    );
-                  },
-                  separatorBuilder: (BuildContext context, int index) {
-                    return const Divider(
-                      height: 0,
-                    );
-                  },
-                  itemCount: connections.length,
-                ),
-              )
-            ],
+    return ValueListenableBuilder<List<Connection>>(
+      valueListenable: requestsNotifier,
+      builder: (_, List<Connection> connections, __) {
+        if (connections.isEmpty) {
+          return NullStatus(
+            label: appLocalizations.nullRequestsDesc,
           );
-        },
-      ),
+        }
+        connections = connections.reversed.toList();
+        return ListView.separated(
+          controller: _scrollController,
+          itemBuilder: (_, index) {
+            final connection = connections[index];
+            return RequestItem(
+              key: Key(connection.id),
+              connection: connection,
+            );
+          },
+          separatorBuilder: (BuildContext context, int index) {
+            return const Divider(
+              height: 0,
+            );
+          },
+          itemCount: connections.length,
+        );
+      },
     );
   }
 }
 
 class RequestItem extends StatelessWidget {
   final Connection connection;
-  final Function(String)? onClick;
 
   const RequestItem({
     super.key,
     required this.connection,
-    this.onClick,
   });
 
   Future<ImageProvider?> _getPackageIcon(Connection connection) async {
@@ -193,7 +99,7 @@ class RequestItem extends StatelessWidget {
   }
 
   String _getRequestText(Metadata metadata) {
-    var text = "${metadata.network}://";
+    var text = "${metadata.network}:://";
     final ips = [
       metadata.host,
       metadata.destinationIP,
@@ -213,8 +119,8 @@ class RequestItem extends StatelessWidget {
 
   @override
   Widget build(BuildContext context) {
-    return ListItem(
-      tileTitleAlignment: ListTileTitleAlignment.titleHeight,
+    return ListTile(
+      titleAlignment: ListTileTitleAlignment.top,
       leading: Platform.isAndroid
           ? Container(
               margin: const EdgeInsets.only(top: 4),
@@ -259,10 +165,6 @@ class RequestItem extends StatelessWidget {
               for (final chain in connection.chains)
                 CommonChip(
                   label: chain,
-                  onPressed: () {
-                    if (onClick == null) return;
-                    onClick!(chain);
-                  },
                 ),
             ],
           ),
@@ -274,144 +176,3 @@ class RequestItem extends StatelessWidget {
     );
   }
 }
-
-class RequestsSearchDelegate extends SearchDelegate {
-  ValueNotifier<ConnectionsAndKeywords> requestsNotifier;
-
-  RequestsSearchDelegate({
-    required ConnectionsAndKeywords state,
-  }) : requestsNotifier = ValueNotifier<ConnectionsAndKeywords>(state);
-
-  get state => requestsNotifier.value;
-
-  List<Connection> get _results {
-    final lowerQuery = query.toLowerCase().trim();
-    return requestsNotifier.value.filteredConnections.where((request) {
-      final lowerNetwork = request.metadata.network.toLowerCase();
-      final lowerHost = request.metadata.host.toLowerCase();
-      final lowerDestinationIP = request.metadata.destinationIP.toLowerCase();
-      final lowerProcess = request.metadata.process.toLowerCase();
-      final lowerChains = request.chains.join("").toLowerCase();
-      return lowerNetwork.contains(lowerQuery) ||
-          lowerHost.contains(lowerQuery) ||
-          lowerDestinationIP.contains(lowerQuery) ||
-          lowerProcess.contains(lowerQuery) ||
-          lowerChains.contains(lowerQuery);
-    }).toList();
-  }
-
-  _addKeyword(String keyword) {
-    final isContains = requestsNotifier.value.keywords.contains(keyword);
-    if (isContains) return;
-    final keywords = List<String>.from(requestsNotifier.value.keywords)
-      ..add(keyword);
-    requestsNotifier.value = requestsNotifier.value.copyWith(
-      keywords: keywords,
-    );
-  }
-
-  _deleteKeyword(String keyword) {
-    final isContains = requestsNotifier.value.keywords.contains(keyword);
-    if (!isContains) return;
-    final keywords = List<String>.from(requestsNotifier.value.keywords)
-      ..remove(keyword);
-    requestsNotifier.value = requestsNotifier.value.copyWith(
-      keywords: keywords,
-    );
-  }
-
-  @override
-  List<Widget>? buildActions(BuildContext context) {
-    return [
-      IconButton(
-        onPressed: () {
-          if (query.isEmpty) {
-            close(context, null);
-            return;
-          }
-          query = '';
-        },
-        icon: const Icon(Icons.clear),
-      ),
-      const SizedBox(
-        width: 8,
-      )
-    ];
-  }
-
-  @override
-  Widget? buildLeading(BuildContext context) {
-    return IconButton(
-      onPressed: () {
-        close(context, null);
-      },
-      icon: const Icon(Icons.arrow_back),
-    );
-  }
-
-  @override
-  Widget buildResults(BuildContext context) {
-    return buildSuggestions(context);
-  }
-
-  @override
-  void dispose() {
-    requestsNotifier.dispose();
-    super.dispose();
-  }
-
-  @override
-  Widget buildSuggestions(BuildContext context) {
-    return ValueListenableBuilder(
-      valueListenable: requestsNotifier,
-      builder: (_, __, ___) {
-        return Column(
-          crossAxisAlignment: CrossAxisAlignment.start,
-          children: [
-            if (state.keywords.isNotEmpty)
-              Padding(
-                padding: const EdgeInsets.symmetric(
-                  horizontal: 16,
-                  vertical: 16,
-                ),
-                child: Wrap(
-                  runSpacing: 8,
-                  spacing: 8,
-                  children: [
-                    for (final keyword in state.keywords)
-                      CommonChip(
-                        label: keyword,
-                        type: ChipType.delete,
-                        onPressed: () {
-                          _deleteKeyword(keyword);
-                        },
-                      ),
-                  ],
-                ),
-              ),
-            Expanded(
-              child: ListView.separated(
-                itemBuilder: (_, index) {
-                  final connection = _results[index];
-                  return RequestItem(
-                    key: Key(connection.id),
-                    connection: connection,
-                    onClick: (value) {
-                      _addKeyword(value);
-                    },
-                  );
-                },
-                separatorBuilder: (BuildContext context, int index) {
-                  return const Divider(
-                    height: 0,
-                  );
-                },
-                itemCount: _results.length,
-              ),
-            )
-          ],
-        );
-      },
-    );
-  }
-}

lib/fragments/resources.dart

@@ -78,9 +78,9 @@ class _ResourcesState extends State<Resources> {
                                 const Padding(
                                   padding: EdgeInsets.only(left: 12,right: 4),
                                   child: VerticalDivider(
-                                    endIndent: 6,
+                                    endIndent: 2,
                                     width: 4,
-                                    indent: 6,
+                                    indent: 2,
                                   ),
                                 ),
                                 externalProvider.vehicleType == "HTTP"

lib/fragments/theme.dart

@@ -111,10 +111,9 @@ class ThemeFragment extends StatelessWidget {
       null,
       defaultPrimaryColor,
       Colors.pinkAccent,
-      Colors.lightBlue,
       Colors.greenAccent,
       Colors.yellowAccent,
-      Colors.purple,
+      Colors.purple
     ];
     return Column(
       children: [

lib/l10n/arb/intl_en.arb

@@ -111,7 +111,7 @@
   "noMoreInfoDesc": "No more info",
   "profileParseErrorDesc": "profile parse error",
   "proxyPort": "ProxyPort",
-  "proxyPortDesc": "Set the Clash listening port",
+  "proxyPortDesc": "Set the clash listening port",
   "port": "Port",
   "logLevel": "LogLevel",
   "show": "Show",
@@ -161,35 +161,26 @@
   "checking": "Checking...",
   "country": "Country",
   "checkError": "Check error",
+  "ipCheckTimeout": "Ip check timeout",
   "search": "Search",
   "allowBypass": "Allow applications to bypass VPN",
   "allowBypassDesc": "Some apps can bypass VPN when turned on",
   "externalController": "ExternalController",
-  "externalControllerDesc": "Once enabled, the Clash kernel can be controlled on port 9090",
-  "ipv6Desc": "When turned on it will be able to receive IPv6 traffic",
+  "externalControllerDesc": "Once enabled, the clash kernel can be controlled on port 9090",
+  "ipv6Desc": "When turned on it will be able to receive ipv6 traffic",
   "app": "App",
   "general": "General",
   "systemProxyDesc": "Attach HTTP proxy to VpnService",
   "unifiedDelay": "Unified delay",
   "unifiedDelayDesc": "Remove extra delays such as handshaking",
-  "tcpConcurrent": "TCP concurrent",
-  "tcpConcurrentDesc": "Enabling it will allow TCP concurrency",
+  "tcpConcurrent": "Tcp concurrent",
+  "tcpConcurrentDesc": "Enabling it will allow tcp concurrency",
   "geodataLoader": "Geo Low Memory Mode",
   "geodataLoaderDesc": "Enabling will use the Geo low memory loader",
   "requests": "Requests",
   "requestsDesc": "View recently requested data",
+  "nullRequestsDesc": "No proxy or no request",
   "findProcessMode": "Find process",
   "findProcessModeDesc": "There is a risk of flashback after opening",
-  "init": "Init",
-  "infiniteTime": "Long term effective",
-  "expirationTime": "Expiration time",
-  "connections": "Connections",
-  "connectionsDesc": "View current connection",
-  "nullRequestsDesc": "No requests",
-  "nullConnectionsDesc": "No connections",
-  "intranetIP": "Intranet IP",
-  "view": "View",
-  "cut": "Cut",
-  "copy": "Copy",
-  "paste": "Paste"
+  "init": "Init"
 }

lib/l10n/arb/intl_zh_CN.arb

@@ -111,7 +111,7 @@
   "noMoreInfoDesc": "暂无更多信息",
   "profileParseErrorDesc": "配置文件解析错误",
   "proxyPort": "代理端口",
-  "proxyPortDesc": "设置Clash监听端口",
+  "proxyPortDesc": "设置clash监听端口",
   "port": "端口",
   "logLevel": "日志等级",
   "show": "显示",
@@ -161,35 +161,26 @@
   "checking": "检测中...",
   "country": "区域",
   "checkError": "检测失败",
+  "ipCheckTimeout": "Ip检测超时",
   "search": "搜索",
-  "allowBypass": "允许应用绕过VPN",
+  "allowBypass": "允许应用绕过vpn",
   "allowBypassDesc": "开启后部分应用可绕过VPN",
   "externalController": "外部控制器",
-  "externalControllerDesc": "开启后将可以通过9090端口控制Clash内核",
-  "ipv6Desc": "开启后将可以接收IPv6流量",
+  "externalControllerDesc": "开启后将可以通过9090端口控制clash内核",
+  "ipv6Desc": "开启后将可以接收ipv6流量",
   "app": "应用",
   "general": "基础",
   "systemProxyDesc": "为VpnService附加HTTP代理",
   "unifiedDelay": "统一延迟",
   "unifiedDelayDesc": "去除握手等额外延迟",
   "tcpConcurrent": "TCP并发",
-  "tcpConcurrentDesc": "开启后允许TCP并发",
+  "tcpConcurrentDesc": "开启后允许tcp并发",
   "geodataLoader": "Geo低内存模式",
   "geodataLoaderDesc": "开启将使用Geo低内存加载器",
   "requests": "请求",
   "requestsDesc": "查看最近请求数据",
+  "nullRequestsDesc": "未开启代理或者没有请求",
   "findProcessMode": "查找进程",
   "findProcessModeDesc": "开启后存在闪退风险",
-  "init": "初始化",
-  "infiniteTime": "长期有效",
-  "expirationTime": "到期时间",
-  "connections": "连接",
-  "connectionsDesc": "查看当前连接",
-  "nullRequestsDesc": "暂无请求",
-  "nullConnectionsDesc": "暂无连接",
-  "intranetIP": "内网 IP",
-  "view": "查看",
-  "cut": "剪切",
-  "copy": "复制",
-  "paste": "粘贴"
+  "init": "初始化"
 }

lib/l10n/intl/messages_en.dart

@@ -92,16 +92,11 @@ class MessageLookup extends MessageLookupByLibrary {
         "compatibleDesc": MessageLookupByLibrary.simpleMessage(
             "Opening it will lose part of its application ability and gain the support of full amount of Clash."),
         "confirm": MessageLookupByLibrary.simpleMessage("Confirm"),
-        "connections": MessageLookupByLibrary.simpleMessage("Connections"),
-        "connectionsDesc":
-            MessageLookupByLibrary.simpleMessage("View current connection"),
         "connectivity": MessageLookupByLibrary.simpleMessage("Connectivity："),
-        "copy": MessageLookupByLibrary.simpleMessage("Copy"),
         "core": MessageLookupByLibrary.simpleMessage("Core"),
         "coreInfo": MessageLookupByLibrary.simpleMessage("Core info"),
         "country": MessageLookupByLibrary.simpleMessage("Country"),
         "create": MessageLookupByLibrary.simpleMessage("Create"),
-        "cut": MessageLookupByLibrary.simpleMessage("Cut"),
         "dark": MessageLookupByLibrary.simpleMessage("Dark"),
         "dashboard": MessageLookupByLibrary.simpleMessage("Dashboard"),
         "days": MessageLookupByLibrary.simpleMessage("Days"),
@@ -122,12 +117,10 @@ class MessageLookup extends MessageLookupByLibrary {
         "edit": MessageLookupByLibrary.simpleMessage("Edit"),
         "en": MessageLookupByLibrary.simpleMessage("English"),
         "exit": MessageLookupByLibrary.simpleMessage("Exit"),
-        "expirationTime":
-            MessageLookupByLibrary.simpleMessage("Expiration time"),
         "externalController":
             MessageLookupByLibrary.simpleMessage("ExternalController"),
         "externalControllerDesc": MessageLookupByLibrary.simpleMessage(
-            "Once enabled, the Clash kernel can be controlled on port 9090"),
+            "Once enabled, the clash kernel can be controlled on port 9090"),
         "externalResources":
             MessageLookupByLibrary.simpleMessage("External resources"),
         "file": MessageLookupByLibrary.simpleMessage("File"),
@@ -149,12 +142,11 @@ class MessageLookup extends MessageLookupByLibrary {
         "hours": MessageLookupByLibrary.simpleMessage("Hours"),
         "importFromURL":
             MessageLookupByLibrary.simpleMessage("Import from URL"),
-        "infiniteTime":
-            MessageLookupByLibrary.simpleMessage("Long term effective"),
         "init": MessageLookupByLibrary.simpleMessage("Init"),
-        "intranetIP": MessageLookupByLibrary.simpleMessage("Intranet IP"),
+        "ipCheckTimeout":
+            MessageLookupByLibrary.simpleMessage("Ip check timeout"),
         "ipv6Desc": MessageLookupByLibrary.simpleMessage(
-            "When turned on it will be able to receive IPv6 traffic"),
+            "When turned on it will be able to receive ipv6 traffic"),
         "just": MessageLookupByLibrary.simpleMessage("Just"),
         "language": MessageLookupByLibrary.simpleMessage("Language"),
         "light": MessageLookupByLibrary.simpleMessage("Light"),
@@ -183,14 +175,13 @@ class MessageLookup extends MessageLookupByLibrary {
             "Please create a profile or add a valid profile"),
         "notSelectedTip": MessageLookupByLibrary.simpleMessage(
             "The current proxy group cannot be selected."),
-        "nullConnectionsDesc":
-            MessageLookupByLibrary.simpleMessage("No connections"),
         "nullCoreInfoDesc":
             MessageLookupByLibrary.simpleMessage("Unable to obtain core info"),
         "nullLogsDesc": MessageLookupByLibrary.simpleMessage("No logs"),
         "nullProfileDesc": MessageLookupByLibrary.simpleMessage(
             "No profile, Please add a profile"),
-        "nullRequestsDesc": MessageLookupByLibrary.simpleMessage("No requests"),
+        "nullRequestsDesc":
+            MessageLookupByLibrary.simpleMessage("No proxy or no request"),
         "other": MessageLookupByLibrary.simpleMessage("Other"),
         "outboundMode": MessageLookupByLibrary.simpleMessage("Outbound mode"),
         "override": MessageLookupByLibrary.simpleMessage("Override"),
@@ -199,7 +190,6 @@ class MessageLookup extends MessageLookupByLibrary {
         "password": MessageLookupByLibrary.simpleMessage("Password"),
         "passwordTip":
             MessageLookupByLibrary.simpleMessage("Password cannot be empty"),
-        "paste": MessageLookupByLibrary.simpleMessage("Paste"),
         "pleaseBindWebDAV":
             MessageLookupByLibrary.simpleMessage("Please bind WebDAV"),
         "pleaseUploadFile":
@@ -228,7 +218,7 @@ class MessageLookup extends MessageLookupByLibrary {
         "proxies": MessageLookupByLibrary.simpleMessage("Proxies"),
         "proxyPort": MessageLookupByLibrary.simpleMessage("ProxyPort"),
         "proxyPortDesc": MessageLookupByLibrary.simpleMessage(
-            "Set the Clash listening port"),
+            "Set the clash listening port"),
         "qrcode": MessageLookupByLibrary.simpleMessage("QR code"),
         "qrcodeDesc": MessageLookupByLibrary.simpleMessage(
             "Scan QR code to obtain profile"),
@@ -266,9 +256,9 @@ class MessageLookup extends MessageLookupByLibrary {
         "tabAnimation": MessageLookupByLibrary.simpleMessage("Tab animation"),
         "tabAnimationDesc": MessageLookupByLibrary.simpleMessage(
             "When enabled, the home tab will add a toggle animation"),
-        "tcpConcurrent": MessageLookupByLibrary.simpleMessage("TCP concurrent"),
+        "tcpConcurrent": MessageLookupByLibrary.simpleMessage("Tcp concurrent"),
         "tcpConcurrentDesc": MessageLookupByLibrary.simpleMessage(
-            "Enabling it will allow TCP concurrency"),
+            "Enabling it will allow tcp concurrency"),
         "theme": MessageLookupByLibrary.simpleMessage("Theme"),
         "themeColor": MessageLookupByLibrary.simpleMessage("Theme color"),
         "themeDesc": MessageLookupByLibrary.simpleMessage(
@@ -292,7 +282,6 @@ class MessageLookup extends MessageLookupByLibrary {
         "url": MessageLookupByLibrary.simpleMessage("URL"),
         "urlDesc":
             MessageLookupByLibrary.simpleMessage("Obtain profile through URL"),
-        "view": MessageLookupByLibrary.simpleMessage("View"),
         "webDAVConfiguration":
             MessageLookupByLibrary.simpleMessage("WebDAV configuration"),
         "whitelistMode": MessageLookupByLibrary.simpleMessage("Whitelist mode"),

lib/l10n/intl/messages_zh_CN.dart

@@ -36,7 +36,7 @@ class MessageLookup extends MessageLookupByLibrary {
         "addressHelp": MessageLookupByLibrary.simpleMessage("WebDAV服务器地址"),
         "addressTip": MessageLookupByLibrary.simpleMessage("请输入有效的WebDAV地址"),
         "ago": MessageLookupByLibrary.simpleMessage("前"),
-        "allowBypass": MessageLookupByLibrary.simpleMessage("允许应用绕过VPN"),
+        "allowBypass": MessageLookupByLibrary.simpleMessage("允许应用绕过vpn"),
         "allowBypassDesc":
             MessageLookupByLibrary.simpleMessage("开启后部分应用可绕过VPN"),
         "allowLan": MessageLookupByLibrary.simpleMessage("局域网代理"),
@@ -75,15 +75,11 @@ class MessageLookup extends MessageLookupByLibrary {
         "compatibleDesc":
             MessageLookupByLibrary.simpleMessage("开启将失去部分应用能力，获得全量的Clash的支持"),
         "confirm": MessageLookupByLibrary.simpleMessage("确定"),
-        "connections": MessageLookupByLibrary.simpleMessage("连接"),
-        "connectionsDesc": MessageLookupByLibrary.simpleMessage("查看当前连接"),
         "connectivity": MessageLookupByLibrary.simpleMessage("连通性："),
-        "copy": MessageLookupByLibrary.simpleMessage("复制"),
         "core": MessageLookupByLibrary.simpleMessage("内核"),
         "coreInfo": MessageLookupByLibrary.simpleMessage("内核信息"),
         "country": MessageLookupByLibrary.simpleMessage("区域"),
         "create": MessageLookupByLibrary.simpleMessage("创建"),
-        "cut": MessageLookupByLibrary.simpleMessage("剪切"),
         "dark": MessageLookupByLibrary.simpleMessage("深色"),
         "dashboard": MessageLookupByLibrary.simpleMessage("仪表盘"),
         "days": MessageLookupByLibrary.simpleMessage("天"),
@@ -101,10 +97,9 @@ class MessageLookup extends MessageLookupByLibrary {
         "edit": MessageLookupByLibrary.simpleMessage("编辑"),
         "en": MessageLookupByLibrary.simpleMessage("英语"),
         "exit": MessageLookupByLibrary.simpleMessage("退出"),
-        "expirationTime": MessageLookupByLibrary.simpleMessage("到期时间"),
         "externalController": MessageLookupByLibrary.simpleMessage("外部控制器"),
         "externalControllerDesc":
-            MessageLookupByLibrary.simpleMessage("开启后将可以通过9090端口控制Clash内核"),
+            MessageLookupByLibrary.simpleMessage("开启后将可以通过9090端口控制clash内核"),
         "externalResources": MessageLookupByLibrary.simpleMessage("外部资源"),
         "file": MessageLookupByLibrary.simpleMessage("文件"),
         "fileDesc": MessageLookupByLibrary.simpleMessage("直接上传配置文件"),
@@ -121,10 +116,9 @@ class MessageLookup extends MessageLookupByLibrary {
         "goDownload": MessageLookupByLibrary.simpleMessage("前往下载"),
         "hours": MessageLookupByLibrary.simpleMessage("小时"),
         "importFromURL": MessageLookupByLibrary.simpleMessage("从URL导入"),
-        "infiniteTime": MessageLookupByLibrary.simpleMessage("长期有效"),
         "init": MessageLookupByLibrary.simpleMessage("初始化"),
-        "intranetIP": MessageLookupByLibrary.simpleMessage("内网 IP"),
-        "ipv6Desc": MessageLookupByLibrary.simpleMessage("开启后将可以接收IPv6流量"),
+        "ipCheckTimeout": MessageLookupByLibrary.simpleMessage("Ip检测超时"),
+        "ipv6Desc": MessageLookupByLibrary.simpleMessage("开启后将可以接收ipv6流量"),
         "just": MessageLookupByLibrary.simpleMessage("刚刚"),
         "language": MessageLookupByLibrary.simpleMessage("语言"),
         "light": MessageLookupByLibrary.simpleMessage("浅色"),
@@ -149,19 +143,17 @@ class MessageLookup extends MessageLookupByLibrary {
         "noProxyDesc":
             MessageLookupByLibrary.simpleMessage("请创建配置文件或者添加有效配置文件"),
         "notSelectedTip": MessageLookupByLibrary.simpleMessage("当前代理组无法选中"),
-        "nullConnectionsDesc": MessageLookupByLibrary.simpleMessage("暂无连接"),
         "nullCoreInfoDesc": MessageLookupByLibrary.simpleMessage("无法获取内核信息"),
         "nullLogsDesc": MessageLookupByLibrary.simpleMessage("暂无日志"),
         "nullProfileDesc":
             MessageLookupByLibrary.simpleMessage("没有配置文件,请先添加配置文件"),
-        "nullRequestsDesc": MessageLookupByLibrary.simpleMessage("暂无请求"),
+        "nullRequestsDesc": MessageLookupByLibrary.simpleMessage("未开启代理或者没有请求"),
         "other": MessageLookupByLibrary.simpleMessage("其他"),
         "outboundMode": MessageLookupByLibrary.simpleMessage("出站模式"),
         "override": MessageLookupByLibrary.simpleMessage("覆写"),
         "overrideDesc": MessageLookupByLibrary.simpleMessage("覆写代理相关配置"),
         "password": MessageLookupByLibrary.simpleMessage("密码"),
         "passwordTip": MessageLookupByLibrary.simpleMessage("密码不能为空"),
-        "paste": MessageLookupByLibrary.simpleMessage("粘贴"),
         "pleaseBindWebDAV": MessageLookupByLibrary.simpleMessage("请绑定WebDAV"),
         "pleaseUploadFile": MessageLookupByLibrary.simpleMessage("请上传文件"),
         "pleaseUploadValidQrcode":
@@ -185,7 +177,7 @@ class MessageLookup extends MessageLookupByLibrary {
         "project": MessageLookupByLibrary.simpleMessage("项目"),
         "proxies": MessageLookupByLibrary.simpleMessage("代理"),
         "proxyPort": MessageLookupByLibrary.simpleMessage("代理端口"),
-        "proxyPortDesc": MessageLookupByLibrary.simpleMessage("设置Clash监听端口"),
+        "proxyPortDesc": MessageLookupByLibrary.simpleMessage("设置clash监听端口"),
         "qrcode": MessageLookupByLibrary.simpleMessage("二维码"),
         "qrcodeDesc": MessageLookupByLibrary.simpleMessage("扫描二维码获取配置文件"),
         "recovery": MessageLookupByLibrary.simpleMessage("恢复"),
@@ -216,7 +208,7 @@ class MessageLookup extends MessageLookupByLibrary {
         "tabAnimationDesc":
             MessageLookupByLibrary.simpleMessage("开启后，主页选项卡将添加切换动画"),
         "tcpConcurrent": MessageLookupByLibrary.simpleMessage("TCP并发"),
-        "tcpConcurrentDesc": MessageLookupByLibrary.simpleMessage("开启后允许TCP并发"),
+        "tcpConcurrentDesc": MessageLookupByLibrary.simpleMessage("开启后允许tcp并发"),
         "theme": MessageLookupByLibrary.simpleMessage("主题"),
         "themeColor": MessageLookupByLibrary.simpleMessage("主题色彩"),
         "themeDesc": MessageLookupByLibrary.simpleMessage("设置深色模式，调整色彩"),
@@ -235,7 +227,6 @@ class MessageLookup extends MessageLookupByLibrary {
         "upload": MessageLookupByLibrary.simpleMessage("上传"),
         "url": MessageLookupByLibrary.simpleMessage("URL"),
         "urlDesc": MessageLookupByLibrary.simpleMessage("直接上传配置文件"),
-        "view": MessageLookupByLibrary.simpleMessage("查看"),
         "webDAVConfiguration": MessageLookupByLibrary.simpleMessage("WebDAV配置"),
         "whitelistMode": MessageLookupByLibrary.simpleMessage("白名单模式"),
         "years": MessageLookupByLibrary.simpleMessage("年"),

lib/l10n/l10n.dart

@@ -1170,10 +1170,10 @@ class AppLocalizations {
     );
   }
 
-  /// `Set the Clash listening port`
+  /// `Set the clash listening port`
   String get proxyPortDesc {
     return Intl.message(
-      'Set the Clash listening port',
+      'Set the clash listening port',
       name: 'proxyPortDesc',
       desc: '',
       args: [],
@@ -1670,6 +1670,16 @@ class AppLocalizations {
     );
   }
 
+  /// `Ip check timeout`
+  String get ipCheckTimeout {
+    return Intl.message(
+      'Ip check timeout',
+      name: 'ipCheckTimeout',
+      desc: '',
+      args: [],
+    );
+  }
+
   /// `Search`
   String get search {
     return Intl.message(
@@ -1710,20 +1720,20 @@ class AppLocalizations {
     );
   }
 
-  /// `Once enabled, the Clash kernel can be controlled on port 9090`
+  /// `Once enabled, the clash kernel can be controlled on port 9090`
   String get externalControllerDesc {
     return Intl.message(
-      'Once enabled, the Clash kernel can be controlled on port 9090',
+      'Once enabled, the clash kernel can be controlled on port 9090',
       name: 'externalControllerDesc',
       desc: '',
       args: [],
     );
   }
 
-  /// `When turned on it will be able to receive IPv6 traffic`
+  /// `When turned on it will be able to receive ipv6 traffic`
   String get ipv6Desc {
     return Intl.message(
-      'When turned on it will be able to receive IPv6 traffic',
+      'When turned on it will be able to receive ipv6 traffic',
       name: 'ipv6Desc',
       desc: '',
       args: [],
@@ -1780,20 +1790,20 @@ class AppLocalizations {
     );
   }
 
-  /// `TCP concurrent`
+  /// `Tcp concurrent`
   String get tcpConcurrent {
     return Intl.message(
-      'TCP concurrent',
+      'Tcp concurrent',
       name: 'tcpConcurrent',
       desc: '',
       args: [],
     );
   }
 
-  /// `Enabling it will allow TCP concurrency`
+  /// `Enabling it will allow tcp concurrency`
   String get tcpConcurrentDesc {
     return Intl.message(
-      'Enabling it will allow TCP concurrency',
+      'Enabling it will allow tcp concurrency',
       name: 'tcpConcurrentDesc',
       desc: '',
       args: [],
@@ -1840,6 +1850,16 @@ class AppLocalizations {
     );
   }
 
+  /// `No proxy or no request`
+  String get nullRequestsDesc {
+    return Intl.message(
+      'No proxy or no request',
+      name: 'nullRequestsDesc',
+      desc: '',
+      args: [],
+    );
+  }
+
   /// `Find process`
   String get findProcessMode {
     return Intl.message(
@@ -1869,116 +1889,6 @@ class AppLocalizations {
       args: [],
     );
   }
-
-  /// `Long term effective`
-  String get infiniteTime {
-    return Intl.message(
-      'Long term effective',
-      name: 'infiniteTime',
-      desc: '',
-      args: [],
-    );
-  }
-
-  /// `Expiration time`
-  String get expirationTime {
-    return Intl.message(
-      'Expiration time',
-      name: 'expirationTime',
-      desc: '',
-      args: [],
-    );
-  }
-
-  /// `Connections`
-  String get connections {
-    return Intl.message(
-      'Connections',
-      name: 'connections',
-      desc: '',
-      args: [],
-    );
-  }
-
-  /// `View current connection`
-  String get connectionsDesc {
-    return Intl.message(
-      'View current connection',
-      name: 'connectionsDesc',
-      desc: '',
-      args: [],
-    );
-  }
-
-  /// `No requests`
-  String get nullRequestsDesc {
-    return Intl.message(
-      'No requests',
-      name: 'nullRequestsDesc',
-      desc: '',
-      args: [],
-    );
-  }
-
-  /// `No connections`
-  String get nullConnectionsDesc {
-    return Intl.message(
-      'No connections',
-      name: 'nullConnectionsDesc',
-      desc: '',
-      args: [],
-    );
-  }
-
-  /// `Intranet IP`
-  String get intranetIP {
-    return Intl.message(
-      'Intranet IP',
-      name: 'intranetIP',
-      desc: '',
-      args: [],
-    );
-  }
-
-  /// `View`
-  String get view {
-    return Intl.message(
-      'View',
-      name: 'view',
-      desc: '',
-      args: [],
-    );
-  }
-
-  /// `Cut`
-  String get cut {
-    return Intl.message(
-      'Cut',
-      name: 'cut',
-      desc: '',
-      args: [],
-    );
-  }
-
-  /// `Copy`
-  String get copy {
-    return Intl.message(
-      'Copy',
-      name: 'copy',
-      desc: '',
-      args: [],
-    );
-  }
-
-  /// `Paste`
-  String get paste {
-    return Intl.message(
-      'Paste',
-      name: 'paste',
-      desc: '',
-      args: [],
-    );
-  }
 }
 
 class AppLocalizationDelegate extends LocalizationsDelegate<AppLocalizations> {

lib/main.dart

@@ -61,7 +61,7 @@ Future<void> vpnService() async {
     clashConfig: clashConfig,
   );
 
-  globalState.applyProfile(
+  await globalState.applyProfile(
     appState: appState,
     config: config,
     clashConfig: clashConfig,
@@ -75,7 +75,6 @@ Future<void> vpnService() async {
   handleStart() async {
     await app?.tip(appLocalizations.startVpn);
     await globalState.startSystemProxy(
-      appState: appState,
       config: config,
       clashConfig: clashConfig,
     );

lib/models/app.dart

@@ -22,7 +22,6 @@ class AppState with ChangeNotifier {
   bool _isInit;
   VersionInfo? _versionInfo;
   List<Traffic> _traffics;
-  Traffic _totalTraffic;
   List<Log> _logs;
   String _currentLabel;
   SystemColorSchemes _systemColorSchemes;
@@ -49,7 +48,6 @@ class AppState with ChangeNotifier {
         _sortNum = 0,
         _requests = [],
         _mode = mode,
-        _totalTraffic = Traffic(),
         _delayMap = {},
         _groups = [],
         _isCompatible = isCompatible,
@@ -159,24 +157,11 @@ class AppState with ChangeNotifier {
     }
   }
 
-  addTraffic(Traffic traffic) {
-    _traffics = List.from(_traffics)..add(traffic);
-    const maxLength = 60;
-    if (_traffics.length > maxLength) {
-      _traffics = _traffics.sublist(_traffics.length - maxLength);
-    }
+  addTraffic(Traffic value) {
+    _traffics = List.from(_traffics)..add(value);
     notifyListeners();
   }
 
-  Traffic get totalTraffic => _totalTraffic;
-
-  set totalTraffic(Traffic value) {
-    if (_totalTraffic != value) {
-      _totalTraffic = value;
-      notifyListeners();
-    }
-  }
-
   List<Connection> get requests => _requests;
 
   set requests(List<Connection> value) {
@@ -187,7 +172,7 @@ class AppState with ChangeNotifier {
   }
 
   addRequest(Connection value) {
-    _requests = List.from(_requests)..add(value);
+    _requests.add(value);
     final maxLength = Platform.isAndroid ? 1000 : 60;
     if (_requests.length > maxLength) {
       _requests = _requests.sublist(_requests.length - maxLength);
@@ -205,10 +190,11 @@ class AppState with ChangeNotifier {
   }
 
   addLog(Log log) {
-    _logs = List.from(_logs)..add(log);
-    final maxLength = Platform.isAndroid ? 1000 : 60;
-    if (_logs.length > maxLength) {
-      _logs = _logs.sublist(_logs.length - maxLength);
+    _logs.add(log);
+    if (!Platform.isAndroid) {
+      if (_logs.length > 60) {
+        _logs = _logs.sublist(_logs.length - 60);
+      }
     }
     notifyListeners();
   }

lib/models/config.dart

@@ -1,6 +1,5 @@
 import 'dart:io';
 
-import 'package:collection/collection.dart';
 import 'package:flutter/material.dart';
 import 'package:freezed_annotation/freezed_annotation.dart';
 
@@ -57,9 +56,6 @@ class Config extends ChangeNotifier {
   bool _allowBypass;
   bool _systemProxy;
   DAV? _dav;
-  ProxiesType _proxiesType;
-  ProxyCardType _proxyCardType;
-  int _proxiesColumns;
 
   Config()
       : _profiles = [],
@@ -77,10 +73,7 @@ class Config extends ChangeNotifier {
         _systemProxy = true,
         _accessControl = const AccessControl(),
         _isAnimateToPage = true,
-        _allowBypass = true,
-        _proxyCardType = ProxyCardType.expand,
-        _proxiesType = ProxiesType.tab,
-        _proxiesColumns = 2;
+        _allowBypass = true;
 
   deleteProfileById(String id) {
     _profiles = profiles.where((element) => element.id != id).toList();
@@ -150,34 +143,18 @@ class Config extends ChangeNotifier {
   }
 
   Profile? get currentProfile {
-    final index =
-        profiles.indexWhere((profile) => profile.id == _currentProfileId);
-    return index == -1 ? null : profiles[index];
+    try {
+      return profiles.firstWhere((element) => element.id == _currentProfileId);
+    } catch (_) {
+      return null;
+    }
   }
 
   String? get currentGroupName => currentProfile?.currentGroupName;
 
-  Set<String> get currentUnfoldSet => currentProfile?.unfoldSet ?? {};
-
-  updateCurrentUnfoldSet(Set<String> value) {
-    if (!const SetEquality<String>().equals(currentUnfoldSet, value)) {
-      _setProfile(
-        currentProfile!.copyWith(
-          unfoldSet: value,
-        ),
-      );
-      notifyListeners();
-    }
-  }
-
   updateCurrentGroupName(String groupName) {
-    if (currentProfile != null &&
-        currentProfile!.currentGroupName != groupName) {
-      _setProfile(
-        currentProfile!.copyWith(
-          currentGroupName: groupName,
-        ),
-      );
+    if (currentProfile?.currentGroupName != groupName) {
+      currentProfile?.currentGroupName = groupName;
       notifyListeners();
     }
   }
@@ -187,16 +164,9 @@ class Config extends ChangeNotifier {
   }
 
   updateCurrentSelectedMap(String groupName, String proxyName) {
-    if (currentProfile != null &&
-        currentProfile!.selectedMap[groupName] != proxyName) {
-      final SelectedMap selectedMap = Map.from(
-        currentProfile?.selectedMap ?? {},
-      )..[groupName] = proxyName;
-      _setProfile(
-        currentProfile!.copyWith(
-          selectedMap: selectedMap,
-        ),
-      );
+    if (currentProfile?.selectedMap[groupName] != proxyName) {
+      currentProfile?.selectedMap = Map.from(currentProfile?.selectedMap ?? {})
+        ..[groupName] = proxyName;
       notifyListeners();
     }
   }
@@ -384,36 +354,6 @@ class Config extends ChangeNotifier {
     }
   }
 
-  @JsonKey(defaultValue: ProxiesType.tab)
-  ProxiesType get proxiesType => _proxiesType;
-
-  set proxiesType(ProxiesType value) {
-    if (_proxiesType != value) {
-      _proxiesType = value;
-      notifyListeners();
-    }
-  }
-
-  @JsonKey(defaultValue: ProxyCardType.expand)
-  ProxyCardType get proxyCardType => _proxyCardType;
-
-  set proxyCardType(ProxyCardType value) {
-    if (_proxyCardType != value) {
-      _proxyCardType = value;
-      notifyListeners();
-    }
-  }
-
-  @JsonKey(defaultValue: 2)
-  int get proxiesColumns => _proxiesColumns;
-
-  set proxiesColumns(int value) {
-    if (_proxiesColumns != value) {
-      _proxiesColumns = value;
-      notifyListeners();
-    }
-  }
-
   update([
     Config? config,
     RecoveryOption recoveryOptions = RecoveryOption.all,
@@ -433,7 +373,6 @@ class Config extends ChangeNotifier {
       _autoLaunch = config._autoLaunch;
       _silentLaunch = config._silentLaunch;
       _autoRun = config._autoRun;
-      _proxiesType = config._proxiesType;
       _openLog = config._openLog;
       _themeMode = config._themeMode;
       _locale = config._locale;

lib/models/connection.dart

@@ -23,7 +23,7 @@ class Metadata with _$Metadata {
 }
 
 @freezed
-class Connection with _$Connection {
+class Connection with _$Connection{
   const factory Connection({
     required String id,
     num? upload,
@@ -36,19 +36,3 @@ class Connection with _$Connection {
   factory Connection.fromJson(Map<String, Object?> json) =>
       _$ConnectionFromJson(json);
 }
-
-@freezed
-class ConnectionsAndKeywords with _$ConnectionsAndKeywords {
-  const factory ConnectionsAndKeywords({
-    @Default([]) List<Connection> connections,
-    @Default([]) List<String> keywords,
-  }) = _ConnectionsAndKeywords;
-
-  factory ConnectionsAndKeywords.fromJson(Map<String, Object?> json) =>
-      _$ConnectionsAndKeywordsFromJson(json);
-}
-
-
-extension ConnectionsAndKeywordsExt on ConnectionsAndKeywords{
-  List<Connection> get filteredConnections => connections.where((connection)=> Set.from(connection.chains).containsAll(keywords)).toList();
-}

lib/models/generated/config.g.dart

@@ -34,14 +34,7 @@ Config _$ConfigFromJson(Map<String, dynamic> json) => Config()
   ..isCompatible = json['isCompatible'] as bool? ?? true
   ..autoCheckUpdate = json['autoCheckUpdate'] as bool? ?? true
   ..allowBypass = json['allowBypass'] as bool? ?? true
-  ..systemProxy = json['systemProxy'] as bool? ?? true
-  ..proxiesType =
-      $enumDecodeNullable(_$ProxiesTypeEnumMap, json['proxiesType']) ??
-          ProxiesType.tab
-  ..proxyCardType =
-      $enumDecodeNullable(_$ProxyCardTypeEnumMap, json['proxyCardType']) ??
-          ProxyCardType.expand
-  ..proxiesColumns = (json['proxiesColumns'] as num?)?.toInt() ?? 2;
+  ..systemProxy = json['systemProxy'] as bool? ?? true;
 
 Map<String, dynamic> _$ConfigToJson(Config instance) => <String, dynamic>{
       'profiles': instance.profiles,
@@ -63,9 +56,6 @@ Map<String, dynamic> _$ConfigToJson(Config instance) => <String, dynamic>{
       'autoCheckUpdate': instance.autoCheckUpdate,
       'allowBypass': instance.allowBypass,
       'systemProxy': instance.systemProxy,
-      'proxiesType': _$ProxiesTypeEnumMap[instance.proxiesType]!,
-      'proxyCardType': _$ProxyCardTypeEnumMap[instance.proxyCardType]!,
-      'proxiesColumns': instance.proxiesColumns,
     };
 
 const _$ThemeModeEnumMap = {
@@ -80,16 +70,6 @@ const _$ProxiesSortTypeEnumMap = {
   ProxiesSortType.name: 'name',
 };
 
-const _$ProxiesTypeEnumMap = {
-  ProxiesType.tab: 'tab',
-  ProxiesType.expansion: 'expansion',
-};
-
-const _$ProxyCardTypeEnumMap = {
-  ProxyCardType.expand: 'expand',
-  ProxyCardType.shrink: 'shrink',
-};
-
 _$AccessControlImpl _$$AccessControlImplFromJson(Map<String, dynamic> json) =>
     _$AccessControlImpl(
       mode: $enumDecodeNullable(_$AccessControlModeEnumMap, json['mode']) ??

lib/models/generated/connection.freezed.dart

@@ -589,184 +589,3 @@ abstract class _Connection implements Connection {
   _$$ConnectionImplCopyWith<_$ConnectionImpl> get copyWith =>
       throw _privateConstructorUsedError;
 }
-
-ConnectionsAndKeywords _$ConnectionsAndKeywordsFromJson(
-    Map<String, dynamic> json) {
-  return _ConnectionsAndKeywords.fromJson(json);
-}
-
-/// @nodoc
-mixin _$ConnectionsAndKeywords {
-  List<Connection> get connections => throw _privateConstructorUsedError;
-  List<String> get keywords => throw _privateConstructorUsedError;
-
-  Map<String, dynamic> toJson() => throw _privateConstructorUsedError;
-  @JsonKey(ignore: true)
-  $ConnectionsAndKeywordsCopyWith<ConnectionsAndKeywords> get copyWith =>
-      throw _privateConstructorUsedError;
-}
-
-/// @nodoc
-abstract class $ConnectionsAndKeywordsCopyWith<$Res> {
-  factory $ConnectionsAndKeywordsCopyWith(ConnectionsAndKeywords value,
-          $Res Function(ConnectionsAndKeywords) then) =
-      _$ConnectionsAndKeywordsCopyWithImpl<$Res, ConnectionsAndKeywords>;
-  @useResult
-  $Res call({List<Connection> connections, List<String> keywords});
-}
-
-/// @nodoc
-class _$ConnectionsAndKeywordsCopyWithImpl<$Res,
-        $Val extends ConnectionsAndKeywords>
-    implements $ConnectionsAndKeywordsCopyWith<$Res> {
-  _$ConnectionsAndKeywordsCopyWithImpl(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? connections = null,
-    Object? keywords = null,
-  }) {
-    return _then(_value.copyWith(
-      connections: null == connections
-          ? _value.connections
-          : connections // ignore: cast_nullable_to_non_nullable
-              as List<Connection>,
-      keywords: null == keywords
-          ? _value.keywords
-          : keywords // ignore: cast_nullable_to_non_nullable
-              as List<String>,
-    ) as $Val);
-  }
-}
-
-/// @nodoc
-abstract class _$$ConnectionsAndKeywordsImplCopyWith<$Res>
-    implements $ConnectionsAndKeywordsCopyWith<$Res> {
-  factory _$$ConnectionsAndKeywordsImplCopyWith(
-          _$ConnectionsAndKeywordsImpl value,
-          $Res Function(_$ConnectionsAndKeywordsImpl) then) =
-      __$$ConnectionsAndKeywordsImplCopyWithImpl<$Res>;
-  @override
-  @useResult
-  $Res call({List<Connection> connections, List<String> keywords});
-}
-
-/// @nodoc
-class __$$ConnectionsAndKeywordsImplCopyWithImpl<$Res>
-    extends _$ConnectionsAndKeywordsCopyWithImpl<$Res,
-        _$ConnectionsAndKeywordsImpl>
-    implements _$$ConnectionsAndKeywordsImplCopyWith<$Res> {
-  __$$ConnectionsAndKeywordsImplCopyWithImpl(
-      _$ConnectionsAndKeywordsImpl _value,
-      $Res Function(_$ConnectionsAndKeywordsImpl) _then)
-      : super(_value, _then);
-
-  @pragma('vm:prefer-inline')
-  @override
-  $Res call({
-    Object? connections = null,
-    Object? keywords = null,
-  }) {
-    return _then(_$ConnectionsAndKeywordsImpl(
-      connections: null == connections
-          ? _value._connections
-          : connections // ignore: cast_nullable_to_non_nullable
-              as List<Connection>,
-      keywords: null == keywords
-          ? _value._keywords
-          : keywords // ignore: cast_nullable_to_non_nullable
-              as List<String>,
-    ));
-  }
-}
-
-/// @nodoc
-@JsonSerializable()
-class _$ConnectionsAndKeywordsImpl implements _ConnectionsAndKeywords {
-  const _$ConnectionsAndKeywordsImpl(
-      {final List<Connection> connections = const [],
-      final List<String> keywords = const []})
-      : _connections = connections,
-        _keywords = keywords;
-
-  factory _$ConnectionsAndKeywordsImpl.fromJson(Map<String, dynamic> json) =>
-      _$$ConnectionsAndKeywordsImplFromJson(json);
-
-  final List<Connection> _connections;
-  @override
-  @JsonKey()
-  List<Connection> get connections {
-    if (_connections is EqualUnmodifiableListView) return _connections;
-    // ignore: implicit_dynamic_type
-    return EqualUnmodifiableListView(_connections);
-  }
-
-  final List<String> _keywords;
-  @override
-  @JsonKey()
-  List<String> get keywords {
-    if (_keywords is EqualUnmodifiableListView) return _keywords;
-    // ignore: implicit_dynamic_type
-    return EqualUnmodifiableListView(_keywords);
-  }
-
-  @override
-  String toString() {
-    return 'ConnectionsAndKeywords(connections: $connections, keywords: $keywords)';
-  }
-
-  @override
-  bool operator ==(Object other) {
-    return identical(this, other) ||
-        (other.runtimeType == runtimeType &&
-            other is _$ConnectionsAndKeywordsImpl &&
-            const DeepCollectionEquality()
-                .equals(other._connections, _connections) &&
-            const DeepCollectionEquality().equals(other._keywords, _keywords));
-  }
-
-  @JsonKey(ignore: true)
-  @override
-  int get hashCode => Object.hash(
-      runtimeType,
-      const DeepCollectionEquality().hash(_connections),
-      const DeepCollectionEquality().hash(_keywords));
-
-  @JsonKey(ignore: true)
-  @override
-  @pragma('vm:prefer-inline')
-  _$$ConnectionsAndKeywordsImplCopyWith<_$ConnectionsAndKeywordsImpl>
-      get copyWith => __$$ConnectionsAndKeywordsImplCopyWithImpl<
-          _$ConnectionsAndKeywordsImpl>(this, _$identity);
-
-  @override
-  Map<String, dynamic> toJson() {
-    return _$$ConnectionsAndKeywordsImplToJson(
-      this,
-    );
-  }
-}
-
-abstract class _ConnectionsAndKeywords implements ConnectionsAndKeywords {
-  const factory _ConnectionsAndKeywords(
-      {final List<Connection> connections,
-      final List<String> keywords}) = _$ConnectionsAndKeywordsImpl;
-
-  factory _ConnectionsAndKeywords.fromJson(Map<String, dynamic> json) =
-      _$ConnectionsAndKeywordsImpl.fromJson;
-
-  @override
-  List<Connection> get connections;
-  @override
-  List<String> get keywords;
-  @override
-  @JsonKey(ignore: true)
-  _$$ConnectionsAndKeywordsImplCopyWith<_$ConnectionsAndKeywordsImpl>
-      get copyWith => throw _privateConstructorUsedError;
-}

lib/models/generated/connection.g.dart

@@ -52,23 +52,3 @@ Map<String, dynamic> _$$ConnectionImplToJson(_$ConnectionImpl instance) =>
       'metadata': instance.metadata,
       'chains': instance.chains,
     };
-
-_$ConnectionsAndKeywordsImpl _$$ConnectionsAndKeywordsImplFromJson(
-        Map<String, dynamic> json) =>
-    _$ConnectionsAndKeywordsImpl(
-      connections: (json['connections'] as List<dynamic>?)
-              ?.map((e) => Connection.fromJson(e as Map<String, dynamic>))
-              .toList() ??
-          const [],
-      keywords: (json['keywords'] as List<dynamic>?)
-              ?.map((e) => e as String)
-              .toList() ??
-          const [],
-    );
-
-Map<String, dynamic> _$$ConnectionsAndKeywordsImplToJson(
-        _$ConnectionsAndKeywordsImpl instance) =>
-    <String, dynamic>{
-      'connections': instance.connections,
-      'keywords': instance.keywords,
-    };

lib/models/generated/log.freezed.dart

@@ -1,189 +0,0 @@
-// coverage:ignore-file
-// GENERATED CODE - DO NOT MODIFY BY HAND
-// ignore_for_file: type=lint
-// ignore_for_file: unused_element, deprecated_member_use, deprecated_member_use_from_same_package, use_function_type_syntax_for_parameters, unnecessary_const, avoid_init_to_null, invalid_override_different_default_values_named, prefer_expression_function_bodies, annotate_overrides, invalid_annotation_target, unnecessary_question_mark
-
-part of '../log.dart';
-
-// **************************************************************************
-// FreezedGenerator
-// **************************************************************************
-
-T _$identity<T>(T value) => value;
-
-final _privateConstructorUsedError = UnsupportedError(
-    'It seems like you constructed your class using `MyClass._()`. This constructor is only meant to be used by freezed and you are not supposed to need it nor use it.\nPlease check the documentation here for more information: https://github.com/rrousselGit/freezed#adding-getters-and-methods-to-our-models');
-
-LogsAndKeywords _$LogsAndKeywordsFromJson(Map<String, dynamic> json) {
-  return _LogsAndKeywords.fromJson(json);
-}
-
-/// @nodoc
-mixin _$LogsAndKeywords {
-  List<Log> get logs => throw _privateConstructorUsedError;
-  List<String> get keywords => throw _privateConstructorUsedError;
-
-  Map<String, dynamic> toJson() => throw _privateConstructorUsedError;
-  @JsonKey(ignore: true)
-  $LogsAndKeywordsCopyWith<LogsAndKeywords> get copyWith =>
-      throw _privateConstructorUsedError;
-}
-
-/// @nodoc
-abstract class $LogsAndKeywordsCopyWith<$Res> {
-  factory $LogsAndKeywordsCopyWith(
-          LogsAndKeywords value, $Res Function(LogsAndKeywords) then) =
-      _$LogsAndKeywordsCopyWithImpl<$Res, LogsAndKeywords>;
-  @useResult
-  $Res call({List<Log> logs, List<String> keywords});
-}
-
-/// @nodoc
-class _$LogsAndKeywordsCopyWithImpl<$Res, $Val extends LogsAndKeywords>
-    implements $LogsAndKeywordsCopyWith<$Res> {
-  _$LogsAndKeywordsCopyWithImpl(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? logs = null,
-    Object? keywords = null,
-  }) {
-    return _then(_value.copyWith(
-      logs: null == logs
-          ? _value.logs
-          : logs // ignore: cast_nullable_to_non_nullable
-              as List<Log>,
-      keywords: null == keywords
-          ? _value.keywords
-          : keywords // ignore: cast_nullable_to_non_nullable
-              as List<String>,
-    ) as $Val);
-  }
-}
-
-/// @nodoc
-abstract class _$$LogsAndKeywordsImplCopyWith<$Res>
-    implements $LogsAndKeywordsCopyWith<$Res> {
-  factory _$$LogsAndKeywordsImplCopyWith(_$LogsAndKeywordsImpl value,
-          $Res Function(_$LogsAndKeywordsImpl) then) =
-      __$$LogsAndKeywordsImplCopyWithImpl<$Res>;
-  @override
-  @useResult
-  $Res call({List<Log> logs, List<String> keywords});
-}
-
-/// @nodoc
-class __$$LogsAndKeywordsImplCopyWithImpl<$Res>
-    extends _$LogsAndKeywordsCopyWithImpl<$Res, _$LogsAndKeywordsImpl>
-    implements _$$LogsAndKeywordsImplCopyWith<$Res> {
-  __$$LogsAndKeywordsImplCopyWithImpl(
-      _$LogsAndKeywordsImpl _value, $Res Function(_$LogsAndKeywordsImpl) _then)
-      : super(_value, _then);
-
-  @pragma('vm:prefer-inline')
-  @override
-  $Res call({
-    Object? logs = null,
-    Object? keywords = null,
-  }) {
-    return _then(_$LogsAndKeywordsImpl(
-      logs: null == logs
-          ? _value._logs
-          : logs // ignore: cast_nullable_to_non_nullable
-              as List<Log>,
-      keywords: null == keywords
-          ? _value._keywords
-          : keywords // ignore: cast_nullable_to_non_nullable
-              as List<String>,
-    ));
-  }
-}
-
-/// @nodoc
-@JsonSerializable()
-class _$LogsAndKeywordsImpl implements _LogsAndKeywords {
-  const _$LogsAndKeywordsImpl(
-      {final List<Log> logs = const [], final List<String> keywords = const []})
-      : _logs = logs,
-        _keywords = keywords;
-
-  factory _$LogsAndKeywordsImpl.fromJson(Map<String, dynamic> json) =>
-      _$$LogsAndKeywordsImplFromJson(json);
-
-  final List<Log> _logs;
-  @override
-  @JsonKey()
-  List<Log> get logs {
-    if (_logs is EqualUnmodifiableListView) return _logs;
-    // ignore: implicit_dynamic_type
-    return EqualUnmodifiableListView(_logs);
-  }
-
-  final List<String> _keywords;
-  @override
-  @JsonKey()
-  List<String> get keywords {
-    if (_keywords is EqualUnmodifiableListView) return _keywords;
-    // ignore: implicit_dynamic_type
-    return EqualUnmodifiableListView(_keywords);
-  }
-
-  @override
-  String toString() {
-    return 'LogsAndKeywords(logs: $logs, keywords: $keywords)';
-  }
-
-  @override
-  bool operator ==(Object other) {
-    return identical(this, other) ||
-        (other.runtimeType == runtimeType &&
-            other is _$LogsAndKeywordsImpl &&
-            const DeepCollectionEquality().equals(other._logs, _logs) &&
-            const DeepCollectionEquality().equals(other._keywords, _keywords));
-  }
-
-  @JsonKey(ignore: true)
-  @override
-  int get hashCode => Object.hash(
-      runtimeType,
-      const DeepCollectionEquality().hash(_logs),
-      const DeepCollectionEquality().hash(_keywords));
-
-  @JsonKey(ignore: true)
-  @override
-  @pragma('vm:prefer-inline')
-  _$$LogsAndKeywordsImplCopyWith<_$LogsAndKeywordsImpl> get copyWith =>
-      __$$LogsAndKeywordsImplCopyWithImpl<_$LogsAndKeywordsImpl>(
-          this, _$identity);
-
-  @override
-  Map<String, dynamic> toJson() {
-    return _$$LogsAndKeywordsImplToJson(
-      this,
-    );
-  }
-}
-
-abstract class _LogsAndKeywords implements LogsAndKeywords {
-  const factory _LogsAndKeywords(
-      {final List<Log> logs,
-      final List<String> keywords}) = _$LogsAndKeywordsImpl;
-
-  factory _LogsAndKeywords.fromJson(Map<String, dynamic> json) =
-      _$LogsAndKeywordsImpl.fromJson;
-
-  @override
-  List<Log> get logs;
-  @override
-  List<String> get keywords;
-  @override
-  @JsonKey(ignore: true)
-  _$$LogsAndKeywordsImplCopyWith<_$LogsAndKeywordsImpl> get copyWith =>
-      throw _privateConstructorUsedError;
-}

lib/models/generated/log.g.dart

@@ -23,23 +23,3 @@ const _$LogLevelEnumMap = {
   LogLevel.error: 'error',
   LogLevel.silent: 'silent',
 };
-
-_$LogsAndKeywordsImpl _$$LogsAndKeywordsImplFromJson(
-        Map<String, dynamic> json) =>
-    _$LogsAndKeywordsImpl(
-      logs: (json['logs'] as List<dynamic>?)
-              ?.map((e) => Log.fromJson(e as Map<String, dynamic>))
-              .toList() ??
-          const [],
-      keywords: (json['keywords'] as List<dynamic>?)
-              ?.map((e) => e as String)
-              .toList() ??
-          const [],
-    );
-
-Map<String, dynamic> _$$LogsAndKeywordsImplToJson(
-        _$LogsAndKeywordsImpl instance) =>
-    <String, dynamic>{
-      'logs': instance.logs,
-      'keywords': instance.keywords,
-    };

lib/models/generated/profile.freezed.dart

@@ -1,576 +0,0 @@
-// coverage:ignore-file
-// GENERATED CODE - DO NOT MODIFY BY HAND
-// ignore_for_file: type=lint
-// ignore_for_file: unused_element, deprecated_member_use, deprecated_member_use_from_same_package, use_function_type_syntax_for_parameters, unnecessary_const, avoid_init_to_null, invalid_override_different_default_values_named, prefer_expression_function_bodies, annotate_overrides, invalid_annotation_target, unnecessary_question_mark
-
-part of '../profile.dart';
-
-// **************************************************************************
-// FreezedGenerator
-// **************************************************************************
-
-T _$identity<T>(T value) => value;
-
-final _privateConstructorUsedError = UnsupportedError(
-    'It seems like you constructed your class using `MyClass._()`. This constructor is only meant to be used by freezed and you are not supposed to need it nor use it.\nPlease check the documentation here for more information: https://github.com/rrousselGit/freezed#adding-getters-and-methods-to-our-models');
-
-UserInfo _$UserInfoFromJson(Map<String, dynamic> json) {
-  return _UserInfo.fromJson(json);
-}
-
-/// @nodoc
-mixin _$UserInfo {
-  int get upload => throw _privateConstructorUsedError;
-  int get download => throw _privateConstructorUsedError;
-  int get total => throw _privateConstructorUsedError;
-  int get expire => throw _privateConstructorUsedError;
-
-  Map<String, dynamic> toJson() => throw _privateConstructorUsedError;
-  @JsonKey(ignore: true)
-  $UserInfoCopyWith<UserInfo> get copyWith =>
-      throw _privateConstructorUsedError;
-}
-
-/// @nodoc
-abstract class $UserInfoCopyWith<$Res> {
-  factory $UserInfoCopyWith(UserInfo value, $Res Function(UserInfo) then) =
-      _$UserInfoCopyWithImpl<$Res, UserInfo>;
-  @useResult
-  $Res call({int upload, int download, int total, int expire});
-}
-
-/// @nodoc
-class _$UserInfoCopyWithImpl<$Res, $Val extends UserInfo>
-    implements $UserInfoCopyWith<$Res> {
-  _$UserInfoCopyWithImpl(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? upload = null,
-    Object? download = null,
-    Object? total = null,
-    Object? expire = null,
-  }) {
-    return _then(_value.copyWith(
-      upload: null == upload
-          ? _value.upload
-          : upload // ignore: cast_nullable_to_non_nullable
-              as int,
-      download: null == download
-          ? _value.download
-          : download // ignore: cast_nullable_to_non_nullable
-              as int,
-      total: null == total
-          ? _value.total
-          : total // ignore: cast_nullable_to_non_nullable
-              as int,
-      expire: null == expire
-          ? _value.expire
-          : expire // ignore: cast_nullable_to_non_nullable
-              as int,
-    ) as $Val);
-  }
-}
-
-/// @nodoc
-abstract class _$$UserInfoImplCopyWith<$Res>
-    implements $UserInfoCopyWith<$Res> {
-  factory _$$UserInfoImplCopyWith(
-          _$UserInfoImpl value, $Res Function(_$UserInfoImpl) then) =
-      __$$UserInfoImplCopyWithImpl<$Res>;
-  @override
-  @useResult
-  $Res call({int upload, int download, int total, int expire});
-}
-
-/// @nodoc
-class __$$UserInfoImplCopyWithImpl<$Res>
-    extends _$UserInfoCopyWithImpl<$Res, _$UserInfoImpl>
-    implements _$$UserInfoImplCopyWith<$Res> {
-  __$$UserInfoImplCopyWithImpl(
-      _$UserInfoImpl _value, $Res Function(_$UserInfoImpl) _then)
-      : super(_value, _then);
-
-  @pragma('vm:prefer-inline')
-  @override
-  $Res call({
-    Object? upload = null,
-    Object? download = null,
-    Object? total = null,
-    Object? expire = null,
-  }) {
-    return _then(_$UserInfoImpl(
-      upload: null == upload
-          ? _value.upload
-          : upload // ignore: cast_nullable_to_non_nullable
-              as int,
-      download: null == download
-          ? _value.download
-          : download // ignore: cast_nullable_to_non_nullable
-              as int,
-      total: null == total
-          ? _value.total
-          : total // ignore: cast_nullable_to_non_nullable
-              as int,
-      expire: null == expire
-          ? _value.expire
-          : expire // ignore: cast_nullable_to_non_nullable
-              as int,
-    ));
-  }
-}
-
-/// @nodoc
-@JsonSerializable()
-class _$UserInfoImpl implements _UserInfo {
-  const _$UserInfoImpl(
-      {this.upload = 0, this.download = 0, this.total = 0, this.expire = 0});
-
-  factory _$UserInfoImpl.fromJson(Map<String, dynamic> json) =>
-      _$$UserInfoImplFromJson(json);
-
-  @override
-  @JsonKey()
-  final int upload;
-  @override
-  @JsonKey()
-  final int download;
-  @override
-  @JsonKey()
-  final int total;
-  @override
-  @JsonKey()
-  final int expire;
-
-  @override
-  String toString() {
-    return 'UserInfo(upload: $upload, download: $download, total: $total, expire: $expire)';
-  }
-
-  @override
-  bool operator ==(Object other) {
-    return identical(this, other) ||
-        (other.runtimeType == runtimeType &&
-            other is _$UserInfoImpl &&
-            (identical(other.upload, upload) || other.upload == upload) &&
-            (identical(other.download, download) ||
-                other.download == download) &&
-            (identical(other.total, total) || other.total == total) &&
-            (identical(other.expire, expire) || other.expire == expire));
-  }
-
-  @JsonKey(ignore: true)
-  @override
-  int get hashCode => Object.hash(runtimeType, upload, download, total, expire);
-
-  @JsonKey(ignore: true)
-  @override
-  @pragma('vm:prefer-inline')
-  _$$UserInfoImplCopyWith<_$UserInfoImpl> get copyWith =>
-      __$$UserInfoImplCopyWithImpl<_$UserInfoImpl>(this, _$identity);
-
-  @override
-  Map<String, dynamic> toJson() {
-    return _$$UserInfoImplToJson(
-      this,
-    );
-  }
-}
-
-abstract class _UserInfo implements UserInfo {
-  const factory _UserInfo(
-      {final int upload,
-      final int download,
-      final int total,
-      final int expire}) = _$UserInfoImpl;
-
-  factory _UserInfo.fromJson(Map<String, dynamic> json) =
-      _$UserInfoImpl.fromJson;
-
-  @override
-  int get upload;
-  @override
-  int get download;
-  @override
-  int get total;
-  @override
-  int get expire;
-  @override
-  @JsonKey(ignore: true)
-  _$$UserInfoImplCopyWith<_$UserInfoImpl> get copyWith =>
-      throw _privateConstructorUsedError;
-}
-
-Profile _$ProfileFromJson(Map<String, dynamic> json) {
-  return _Profile.fromJson(json);
-}
-
-/// @nodoc
-mixin _$Profile {
-  String get id => throw _privateConstructorUsedError;
-  String? get label => throw _privateConstructorUsedError;
-  String? get currentGroupName => throw _privateConstructorUsedError;
-  String get url => throw _privateConstructorUsedError;
-  DateTime? get lastUpdateDate => throw _privateConstructorUsedError;
-  Duration get autoUpdateDuration => throw _privateConstructorUsedError;
-  UserInfo? get userInfo => throw _privateConstructorUsedError;
-  bool get autoUpdate => throw _privateConstructorUsedError;
-  Map<String, String> get selectedMap => throw _privateConstructorUsedError;
-  Set<String> get unfoldSet => throw _privateConstructorUsedError;
-
-  Map<String, dynamic> toJson() => throw _privateConstructorUsedError;
-  @JsonKey(ignore: true)
-  $ProfileCopyWith<Profile> get copyWith => throw _privateConstructorUsedError;
-}
-
-/// @nodoc
-abstract class $ProfileCopyWith<$Res> {
-  factory $ProfileCopyWith(Profile value, $Res Function(Profile) then) =
-      _$ProfileCopyWithImpl<$Res, Profile>;
-  @useResult
-  $Res call(
-      {String id,
-      String? label,
-      String? currentGroupName,
-      String url,
-      DateTime? lastUpdateDate,
-      Duration autoUpdateDuration,
-      UserInfo? userInfo,
-      bool autoUpdate,
-      Map<String, String> selectedMap,
-      Set<String> unfoldSet});
-
-  $UserInfoCopyWith<$Res>? get userInfo;
-}
-
-/// @nodoc
-class _$ProfileCopyWithImpl<$Res, $Val extends Profile>
-    implements $ProfileCopyWith<$Res> {
-  _$ProfileCopyWithImpl(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? id = null,
-    Object? label = freezed,
-    Object? currentGroupName = freezed,
-    Object? url = null,
-    Object? lastUpdateDate = freezed,
-    Object? autoUpdateDuration = null,
-    Object? userInfo = freezed,
-    Object? autoUpdate = null,
-    Object? selectedMap = null,
-    Object? unfoldSet = null,
-  }) {
-    return _then(_value.copyWith(
-      id: null == id
-          ? _value.id
-          : id // ignore: cast_nullable_to_non_nullable
-              as String,
-      label: freezed == label
-          ? _value.label
-          : label // ignore: cast_nullable_to_non_nullable
-              as String?,
-      currentGroupName: freezed == currentGroupName
-          ? _value.currentGroupName
-          : currentGroupName // ignore: cast_nullable_to_non_nullable
-              as String?,
-      url: null == url
-          ? _value.url
-          : url // ignore: cast_nullable_to_non_nullable
-              as String,
-      lastUpdateDate: freezed == lastUpdateDate
-          ? _value.lastUpdateDate
-          : lastUpdateDate // ignore: cast_nullable_to_non_nullable
-              as DateTime?,
-      autoUpdateDuration: null == autoUpdateDuration
-          ? _value.autoUpdateDuration
-          : autoUpdateDuration // ignore: cast_nullable_to_non_nullable
-              as Duration,
-      userInfo: freezed == userInfo
-          ? _value.userInfo
-          : userInfo // ignore: cast_nullable_to_non_nullable
-              as UserInfo?,
-      autoUpdate: null == autoUpdate
-          ? _value.autoUpdate
-          : autoUpdate // ignore: cast_nullable_to_non_nullable
-              as bool,
-      selectedMap: null == selectedMap
-          ? _value.selectedMap
-          : selectedMap // ignore: cast_nullable_to_non_nullable
-              as Map<String, String>,
-      unfoldSet: null == unfoldSet
-          ? _value.unfoldSet
-          : unfoldSet // ignore: cast_nullable_to_non_nullable
-              as Set<String>,
-    ) as $Val);
-  }
-
-  @override
-  @pragma('vm:prefer-inline')
-  $UserInfoCopyWith<$Res>? get userInfo {
-    if (_value.userInfo == null) {
-      return null;
-    }
-
-    return $UserInfoCopyWith<$Res>(_value.userInfo!, (value) {
-      return _then(_value.copyWith(userInfo: value) as $Val);
-    });
-  }
-}
-
-/// @nodoc
-abstract class _$$ProfileImplCopyWith<$Res> implements $ProfileCopyWith<$Res> {
-  factory _$$ProfileImplCopyWith(
-          _$ProfileImpl value, $Res Function(_$ProfileImpl) then) =
-      __$$ProfileImplCopyWithImpl<$Res>;
-  @override
-  @useResult
-  $Res call(
-      {String id,
-      String? label,
-      String? currentGroupName,
-      String url,
-      DateTime? lastUpdateDate,
-      Duration autoUpdateDuration,
-      UserInfo? userInfo,
-      bool autoUpdate,
-      Map<String, String> selectedMap,
-      Set<String> unfoldSet});
-
-  @override
-  $UserInfoCopyWith<$Res>? get userInfo;
-}
-
-/// @nodoc
-class __$$ProfileImplCopyWithImpl<$Res>
-    extends _$ProfileCopyWithImpl<$Res, _$ProfileImpl>
-    implements _$$ProfileImplCopyWith<$Res> {
-  __$$ProfileImplCopyWithImpl(
-      _$ProfileImpl _value, $Res Function(_$ProfileImpl) _then)
-      : super(_value, _then);
-
-  @pragma('vm:prefer-inline')
-  @override
-  $Res call({
-    Object? id = null,
-    Object? label = freezed,
-    Object? currentGroupName = freezed,
-    Object? url = null,
-    Object? lastUpdateDate = freezed,
-    Object? autoUpdateDuration = null,
-    Object? userInfo = freezed,
-    Object? autoUpdate = null,
-    Object? selectedMap = null,
-    Object? unfoldSet = null,
-  }) {
-    return _then(_$ProfileImpl(
-      id: null == id
-          ? _value.id
-          : id // ignore: cast_nullable_to_non_nullable
-              as String,
-      label: freezed == label
-          ? _value.label
-          : label // ignore: cast_nullable_to_non_nullable
-              as String?,
-      currentGroupName: freezed == currentGroupName
-          ? _value.currentGroupName
-          : currentGroupName // ignore: cast_nullable_to_non_nullable
-              as String?,
-      url: null == url
-          ? _value.url
-          : url // ignore: cast_nullable_to_non_nullable
-              as String,
-      lastUpdateDate: freezed == lastUpdateDate
-          ? _value.lastUpdateDate
-          : lastUpdateDate // ignore: cast_nullable_to_non_nullable
-              as DateTime?,
-      autoUpdateDuration: null == autoUpdateDuration
-          ? _value.autoUpdateDuration
-          : autoUpdateDuration // ignore: cast_nullable_to_non_nullable
-              as Duration,
-      userInfo: freezed == userInfo
-          ? _value.userInfo
-          : userInfo // ignore: cast_nullable_to_non_nullable
-              as UserInfo?,
-      autoUpdate: null == autoUpdate
-          ? _value.autoUpdate
-          : autoUpdate // ignore: cast_nullable_to_non_nullable
-              as bool,
-      selectedMap: null == selectedMap
-          ? _value._selectedMap
-          : selectedMap // ignore: cast_nullable_to_non_nullable
-              as Map<String, String>,
-      unfoldSet: null == unfoldSet
-          ? _value._unfoldSet
-          : unfoldSet // ignore: cast_nullable_to_non_nullable
-              as Set<String>,
-    ));
-  }
-}
-
-/// @nodoc
-@JsonSerializable()
-class _$ProfileImpl implements _Profile {
-  const _$ProfileImpl(
-      {required this.id,
-      this.label,
-      this.currentGroupName,
-      this.url = "",
-      this.lastUpdateDate,
-      required this.autoUpdateDuration,
-      this.userInfo,
-      this.autoUpdate = true,
-      final Map<String, String> selectedMap = const {},
-      final Set<String> unfoldSet = const {}})
-      : _selectedMap = selectedMap,
-        _unfoldSet = unfoldSet;
-
-  factory _$ProfileImpl.fromJson(Map<String, dynamic> json) =>
-      _$$ProfileImplFromJson(json);
-
-  @override
-  final String id;
-  @override
-  final String? label;
-  @override
-  final String? currentGroupName;
-  @override
-  @JsonKey()
-  final String url;
-  @override
-  final DateTime? lastUpdateDate;
-  @override
-  final Duration autoUpdateDuration;
-  @override
-  final UserInfo? userInfo;
-  @override
-  @JsonKey()
-  final bool autoUpdate;
-  final Map<String, String> _selectedMap;
-  @override
-  @JsonKey()
-  Map<String, String> get selectedMap {
-    if (_selectedMap is EqualUnmodifiableMapView) return _selectedMap;
-    // ignore: implicit_dynamic_type
-    return EqualUnmodifiableMapView(_selectedMap);
-  }
-
-  final Set<String> _unfoldSet;
-  @override
-  @JsonKey()
-  Set<String> get unfoldSet {
-    if (_unfoldSet is EqualUnmodifiableSetView) return _unfoldSet;
-    // ignore: implicit_dynamic_type
-    return EqualUnmodifiableSetView(_unfoldSet);
-  }
-
-  @override
-  String toString() {
-    return 'Profile(id: $id, label: $label, currentGroupName: $currentGroupName, url: $url, lastUpdateDate: $lastUpdateDate, autoUpdateDuration: $autoUpdateDuration, userInfo: $userInfo, autoUpdate: $autoUpdate, selectedMap: $selectedMap, unfoldSet: $unfoldSet)';
-  }
-
-  @override
-  bool operator ==(Object other) {
-    return identical(this, other) ||
-        (other.runtimeType == runtimeType &&
-            other is _$ProfileImpl &&
-            (identical(other.id, id) || other.id == id) &&
-            (identical(other.label, label) || other.label == label) &&
-            (identical(other.currentGroupName, currentGroupName) ||
-                other.currentGroupName == currentGroupName) &&
-            (identical(other.url, url) || other.url == url) &&
-            (identical(other.lastUpdateDate, lastUpdateDate) ||
-                other.lastUpdateDate == lastUpdateDate) &&
-            (identical(other.autoUpdateDuration, autoUpdateDuration) ||
-                other.autoUpdateDuration == autoUpdateDuration) &&
-            (identical(other.userInfo, userInfo) ||
-                other.userInfo == userInfo) &&
-            (identical(other.autoUpdate, autoUpdate) ||
-                other.autoUpdate == autoUpdate) &&
-            const DeepCollectionEquality()
-                .equals(other._selectedMap, _selectedMap) &&
-            const DeepCollectionEquality()
-                .equals(other._unfoldSet, _unfoldSet));
-  }
-
-  @JsonKey(ignore: true)
-  @override
-  int get hashCode => Object.hash(
-      runtimeType,
-      id,
-      label,
-      currentGroupName,
-      url,
-      lastUpdateDate,
-      autoUpdateDuration,
-      userInfo,
-      autoUpdate,
-      const DeepCollectionEquality().hash(_selectedMap),
-      const DeepCollectionEquality().hash(_unfoldSet));
-
-  @JsonKey(ignore: true)
-  @override
-  @pragma('vm:prefer-inline')
-  _$$ProfileImplCopyWith<_$ProfileImpl> get copyWith =>
-      __$$ProfileImplCopyWithImpl<_$ProfileImpl>(this, _$identity);
-
-  @override
-  Map<String, dynamic> toJson() {
-    return _$$ProfileImplToJson(
-      this,
-    );
-  }
-}
-
-abstract class _Profile implements Profile {
-  const factory _Profile(
-      {required final String id,
-      final String? label,
-      final String? currentGroupName,
-      final String url,
-      final DateTime? lastUpdateDate,
-      required final Duration autoUpdateDuration,
-      final UserInfo? userInfo,
-      final bool autoUpdate,
-      final Map<String, String> selectedMap,
-      final Set<String> unfoldSet}) = _$ProfileImpl;
-
-  factory _Profile.fromJson(Map<String, dynamic> json) = _$ProfileImpl.fromJson;
-
-  @override
-  String get id;
-  @override
-  String? get label;
-  @override
-  String? get currentGroupName;
-  @override
-  String get url;
-  @override
-  DateTime? get lastUpdateDate;
-  @override
-  Duration get autoUpdateDuration;
-  @override
-  UserInfo? get userInfo;
-  @override
-  bool get autoUpdate;
-  @override
-  Map<String, String> get selectedMap;
-  @override
-  Set<String> get unfoldSet;
-  @override
-  @JsonKey(ignore: true)
-  _$$ProfileImplCopyWith<_$ProfileImpl> get copyWith =>
-      throw _privateConstructorUsedError;
-}

lib/models/generated/profile.g.dart

@@ -6,49 +6,41 @@ part of '../profile.dart';
 // JsonSerializableGenerator
 // **************************************************************************
 
-_$UserInfoImpl _$$UserInfoImplFromJson(Map<String, dynamic> json) =>
-    _$UserInfoImpl(
-      upload: (json['upload'] as num?)?.toInt() ?? 0,
-      download: (json['download'] as num?)?.toInt() ?? 0,
-      total: (json['total'] as num?)?.toInt() ?? 0,
-      expire: (json['expire'] as num?)?.toInt() ?? 0,
+UserInfo _$UserInfoFromJson(Map<String, dynamic> json) => UserInfo(
+      upload: (json['upload'] as num?)?.toInt(),
+      download: (json['download'] as num?)?.toInt(),
+      total: (json['total'] as num?)?.toInt(),
+      expire: (json['expire'] as num?)?.toInt(),
     );
 
-Map<String, dynamic> _$$UserInfoImplToJson(_$UserInfoImpl instance) =>
-    <String, dynamic>{
+Map<String, dynamic> _$UserInfoToJson(UserInfo instance) => <String, dynamic>{
       'upload': instance.upload,
       'download': instance.download,
       'total': instance.total,
       'expire': instance.expire,
     };
 
-_$ProfileImpl _$$ProfileImplFromJson(Map<String, dynamic> json) =>
-    _$ProfileImpl(
-      id: json['id'] as String,
+Profile _$ProfileFromJson(Map<String, dynamic> json) => Profile(
+      id: json['id'] as String?,
       label: json['label'] as String?,
+      url: json['url'] as String?,
       currentGroupName: json['currentGroupName'] as String?,
-      url: json['url'] as String? ?? "",
-      lastUpdateDate: json['lastUpdateDate'] == null
-          ? null
-          : DateTime.parse(json['lastUpdateDate'] as String),
-      autoUpdateDuration:
-          Duration(microseconds: (json['autoUpdateDuration'] as num).toInt()),
       userInfo: json['userInfo'] == null
           ? null
           : UserInfo.fromJson(json['userInfo'] as Map<String, dynamic>),
-      autoUpdate: json['autoUpdate'] as bool? ?? true,
+      lastUpdateDate: json['lastUpdateDate'] == null
+          ? null
+          : DateTime.parse(json['lastUpdateDate'] as String),
       selectedMap: (json['selectedMap'] as Map<String, dynamic>?)?.map(
-            (k, e) => MapEntry(k, e as String),
-          ) ??
-          const {},
-      unfoldSet: (json['unfoldSet'] as List<dynamic>?)
-              ?.map((e) => e as String)
-              .toSet() ??
-          const {},
+        (k, e) => MapEntry(k, e as String),
+      ),
+      autoUpdateDuration: json['autoUpdateDuration'] == null
+          ? null
+          : Duration(microseconds: (json['autoUpdateDuration'] as num).toInt()),
+      autoUpdate: json['autoUpdate'] as bool? ?? true,
     );
 
-Map<String, dynamic> _$$ProfileImplToJson(_$ProfileImpl instance) =>
-    <String, dynamic>{
+Map<String, dynamic> _$ProfileToJson(Profile instance) => <String, dynamic>{
       'id': instance.id,
       'label': instance.label,
       'currentGroupName': instance.currentGroupName,
@@ -58,5 +50,4 @@ Map<String, dynamic> _$$ProfileImplToJson(_$ProfileImpl instance) =>
       'userInfo': instance.userInfo,
       'autoUpdate': instance.autoUpdate,
       'selectedMap': instance.selectedMap,
-      'unfoldSet': instance.unfoldSet.toList(),
     };

lib/models/generated/selector.freezed.dart

@@ -1730,37 +1730,39 @@ abstract class _ProxiesSelectorState implements ProxiesSelectorState {
 }
 
 /// @nodoc
-mixin _$ProxyGroupSelectorState {
+mixin _$ProxiesTabViewSelectorState {
   ProxiesSortType get proxiesSortType => throw _privateConstructorUsedError;
-  ProxyCardType get proxyCardType => throw _privateConstructorUsedError;
   num get sortNum => throw _privateConstructorUsedError;
-  List<Proxy> get proxies => throw _privateConstructorUsedError;
-  int get columns => throw _privateConstructorUsedError;
+  Group get group => throw _privateConstructorUsedError;
+  ViewMode get viewMode => throw _privateConstructorUsedError;
 
   @JsonKey(ignore: true)
-  $ProxyGroupSelectorStateCopyWith<ProxyGroupSelectorState> get copyWith =>
-      throw _privateConstructorUsedError;
+  $ProxiesTabViewSelectorStateCopyWith<ProxiesTabViewSelectorState>
+      get copyWith => throw _privateConstructorUsedError;
 }
 
 /// @nodoc
-abstract class $ProxyGroupSelectorStateCopyWith<$Res> {
-  factory $ProxyGroupSelectorStateCopyWith(ProxyGroupSelectorState value,
-          $Res Function(ProxyGroupSelectorState) then) =
-      _$ProxyGroupSelectorStateCopyWithImpl<$Res, ProxyGroupSelectorState>;
+abstract class $ProxiesTabViewSelectorStateCopyWith<$Res> {
+  factory $ProxiesTabViewSelectorStateCopyWith(
+          ProxiesTabViewSelectorState value,
+          $Res Function(ProxiesTabViewSelectorState) then) =
+      _$ProxiesTabViewSelectorStateCopyWithImpl<$Res,
+          ProxiesTabViewSelectorState>;
   @useResult
   $Res call(
       {ProxiesSortType proxiesSortType,
-      ProxyCardType proxyCardType,
       num sortNum,
-      List<Proxy> proxies,
-      int columns});
+      Group group,
+      ViewMode viewMode});
+
+  $GroupCopyWith<$Res> get group;
 }
 
 /// @nodoc
-class _$ProxyGroupSelectorStateCopyWithImpl<$Res,
-        $Val extends ProxyGroupSelectorState>
-    implements $ProxyGroupSelectorStateCopyWith<$Res> {
-  _$ProxyGroupSelectorStateCopyWithImpl(this._value, this._then);
+class _$ProxiesTabViewSelectorStateCopyWithImpl<$Res,
+        $Val extends ProxiesTabViewSelectorState>
+    implements $ProxiesTabViewSelectorStateCopyWith<$Res> {
+  _$ProxiesTabViewSelectorStateCopyWithImpl(this._value, this._then);
 
   // ignore: unused_field
   final $Val _value;
@@ -1771,177 +1773,165 @@ class _$ProxyGroupSelectorStateCopyWithImpl<$Res,
   @override
   $Res call({
     Object? proxiesSortType = null,
-    Object? proxyCardType = null,
     Object? sortNum = null,
-    Object? proxies = null,
-    Object? columns = null,
+    Object? group = null,
+    Object? viewMode = null,
   }) {
     return _then(_value.copyWith(
       proxiesSortType: null == proxiesSortType
           ? _value.proxiesSortType
           : proxiesSortType // ignore: cast_nullable_to_non_nullable
               as ProxiesSortType,
-      proxyCardType: null == proxyCardType
-          ? _value.proxyCardType
-          : proxyCardType // ignore: cast_nullable_to_non_nullable
-              as ProxyCardType,
       sortNum: null == sortNum
           ? _value.sortNum
           : sortNum // ignore: cast_nullable_to_non_nullable
               as num,
-      proxies: null == proxies
-          ? _value.proxies
-          : proxies // ignore: cast_nullable_to_non_nullable
-              as List<Proxy>,
-      columns: null == columns
-          ? _value.columns
-          : columns // ignore: cast_nullable_to_non_nullable
-              as int,
+      group: null == group
+          ? _value.group
+          : group // ignore: cast_nullable_to_non_nullable
+              as Group,
+      viewMode: null == viewMode
+          ? _value.viewMode
+          : viewMode // ignore: cast_nullable_to_non_nullable
+              as ViewMode,
     ) as $Val);
   }
+
+  @override
+  @pragma('vm:prefer-inline')
+  $GroupCopyWith<$Res> get group {
+    return $GroupCopyWith<$Res>(_value.group, (value) {
+      return _then(_value.copyWith(group: value) as $Val);
+    });
+  }
 }
 
 /// @nodoc
-abstract class _$$ProxyGroupSelectorStateImplCopyWith<$Res>
-    implements $ProxyGroupSelectorStateCopyWith<$Res> {
-  factory _$$ProxyGroupSelectorStateImplCopyWith(
-          _$ProxyGroupSelectorStateImpl value,
-          $Res Function(_$ProxyGroupSelectorStateImpl) then) =
-      __$$ProxyGroupSelectorStateImplCopyWithImpl<$Res>;
+abstract class _$$ProxiesTabViewSelectorStateImplCopyWith<$Res>
+    implements $ProxiesTabViewSelectorStateCopyWith<$Res> {
+  factory _$$ProxiesTabViewSelectorStateImplCopyWith(
+          _$ProxiesTabViewSelectorStateImpl value,
+          $Res Function(_$ProxiesTabViewSelectorStateImpl) then) =
+      __$$ProxiesTabViewSelectorStateImplCopyWithImpl<$Res>;
   @override
   @useResult
   $Res call(
       {ProxiesSortType proxiesSortType,
-      ProxyCardType proxyCardType,
       num sortNum,
-      List<Proxy> proxies,
-      int columns});
+      Group group,
+      ViewMode viewMode});
+
+  @override
+  $GroupCopyWith<$Res> get group;
 }
 
 /// @nodoc
-class __$$ProxyGroupSelectorStateImplCopyWithImpl<$Res>
-    extends _$ProxyGroupSelectorStateCopyWithImpl<$Res,
-        _$ProxyGroupSelectorStateImpl>
-    implements _$$ProxyGroupSelectorStateImplCopyWith<$Res> {
-  __$$ProxyGroupSelectorStateImplCopyWithImpl(
-      _$ProxyGroupSelectorStateImpl _value,
-      $Res Function(_$ProxyGroupSelectorStateImpl) _then)
+class __$$ProxiesTabViewSelectorStateImplCopyWithImpl<$Res>
+    extends _$ProxiesTabViewSelectorStateCopyWithImpl<$Res,
+        _$ProxiesTabViewSelectorStateImpl>
+    implements _$$ProxiesTabViewSelectorStateImplCopyWith<$Res> {
+  __$$ProxiesTabViewSelectorStateImplCopyWithImpl(
+      _$ProxiesTabViewSelectorStateImpl _value,
+      $Res Function(_$ProxiesTabViewSelectorStateImpl) _then)
       : super(_value, _then);
 
   @pragma('vm:prefer-inline')
   @override
   $Res call({
     Object? proxiesSortType = null,
-    Object? proxyCardType = null,
     Object? sortNum = null,
-    Object? proxies = null,
-    Object? columns = null,
+    Object? group = null,
+    Object? viewMode = null,
   }) {
-    return _then(_$ProxyGroupSelectorStateImpl(
+    return _then(_$ProxiesTabViewSelectorStateImpl(
       proxiesSortType: null == proxiesSortType
           ? _value.proxiesSortType
           : proxiesSortType // ignore: cast_nullable_to_non_nullable
               as ProxiesSortType,
-      proxyCardType: null == proxyCardType
-          ? _value.proxyCardType
-          : proxyCardType // ignore: cast_nullable_to_non_nullable
-              as ProxyCardType,
       sortNum: null == sortNum
           ? _value.sortNum
           : sortNum // ignore: cast_nullable_to_non_nullable
               as num,
-      proxies: null == proxies
-          ? _value._proxies
-          : proxies // ignore: cast_nullable_to_non_nullable
-              as List<Proxy>,
-      columns: null == columns
-          ? _value.columns
-          : columns // ignore: cast_nullable_to_non_nullable
-              as int,
+      group: null == group
+          ? _value.group
+          : group // ignore: cast_nullable_to_non_nullable
+              as Group,
+      viewMode: null == viewMode
+          ? _value.viewMode
+          : viewMode // ignore: cast_nullable_to_non_nullable
+              as ViewMode,
     ));
   }
 }
 
 /// @nodoc
 
-class _$ProxyGroupSelectorStateImpl implements _ProxyGroupSelectorState {
-  const _$ProxyGroupSelectorStateImpl(
+class _$ProxiesTabViewSelectorStateImpl
+    implements _ProxiesTabViewSelectorState {
+  const _$ProxiesTabViewSelectorStateImpl(
       {required this.proxiesSortType,
-      required this.proxyCardType,
       required this.sortNum,
-      required final List<Proxy> proxies,
-      required this.columns})
-      : _proxies = proxies;
+      required this.group,
+      required this.viewMode});
 
   @override
   final ProxiesSortType proxiesSortType;
   @override
-  final ProxyCardType proxyCardType;
-  @override
   final num sortNum;
-  final List<Proxy> _proxies;
   @override
-  List<Proxy> get proxies {
-    if (_proxies is EqualUnmodifiableListView) return _proxies;
-    // ignore: implicit_dynamic_type
-    return EqualUnmodifiableListView(_proxies);
-  }
-
+  final Group group;
   @override
-  final int columns;
+  final ViewMode viewMode;
 
   @override
   String toString() {
-    return 'ProxyGroupSelectorState(proxiesSortType: $proxiesSortType, proxyCardType: $proxyCardType, sortNum: $sortNum, proxies: $proxies, columns: $columns)';
+    return 'ProxiesTabViewSelectorState(proxiesSortType: $proxiesSortType, sortNum: $sortNum, group: $group, viewMode: $viewMode)';
   }
 
   @override
   bool operator ==(Object other) {
     return identical(this, other) ||
         (other.runtimeType == runtimeType &&
-            other is _$ProxyGroupSelectorStateImpl &&
+            other is _$ProxiesTabViewSelectorStateImpl &&
             (identical(other.proxiesSortType, proxiesSortType) ||
                 other.proxiesSortType == proxiesSortType) &&
-            (identical(other.proxyCardType, proxyCardType) ||
-                other.proxyCardType == proxyCardType) &&
             (identical(other.sortNum, sortNum) || other.sortNum == sortNum) &&
-            const DeepCollectionEquality().equals(other._proxies, _proxies) &&
-            (identical(other.columns, columns) || other.columns == columns));
+            (identical(other.group, group) || other.group == group) &&
+            (identical(other.viewMode, viewMode) ||
+                other.viewMode == viewMode));
   }
 
   @override
-  int get hashCode => Object.hash(runtimeType, proxiesSortType, proxyCardType,
-      sortNum, const DeepCollectionEquality().hash(_proxies), columns);
+  int get hashCode =>
+      Object.hash(runtimeType, proxiesSortType, sortNum, group, viewMode);
 
   @JsonKey(ignore: true)
   @override
   @pragma('vm:prefer-inline')
-  _$$ProxyGroupSelectorStateImplCopyWith<_$ProxyGroupSelectorStateImpl>
-      get copyWith => __$$ProxyGroupSelectorStateImplCopyWithImpl<
-          _$ProxyGroupSelectorStateImpl>(this, _$identity);
+  _$$ProxiesTabViewSelectorStateImplCopyWith<_$ProxiesTabViewSelectorStateImpl>
+      get copyWith => __$$ProxiesTabViewSelectorStateImplCopyWithImpl<
+          _$ProxiesTabViewSelectorStateImpl>(this, _$identity);
 }
 
-abstract class _ProxyGroupSelectorState implements ProxyGroupSelectorState {
-  const factory _ProxyGroupSelectorState(
+abstract class _ProxiesTabViewSelectorState
+    implements ProxiesTabViewSelectorState {
+  const factory _ProxiesTabViewSelectorState(
       {required final ProxiesSortType proxiesSortType,
-      required final ProxyCardType proxyCardType,
       required final num sortNum,
-      required final List<Proxy> proxies,
-      required final int columns}) = _$ProxyGroupSelectorStateImpl;
+      required final Group group,
+      required final ViewMode viewMode}) = _$ProxiesTabViewSelectorStateImpl;
 
   @override
   ProxiesSortType get proxiesSortType;
   @override
-  ProxyCardType get proxyCardType;
-  @override
   num get sortNum;
   @override
-  List<Proxy> get proxies;
+  Group get group;
   @override
-  int get columns;
+  ViewMode get viewMode;
   @override
   @JsonKey(ignore: true)
-  _$$ProxyGroupSelectorStateImplCopyWith<_$ProxyGroupSelectorStateImpl>
+  _$$ProxiesTabViewSelectorStateImplCopyWith<_$ProxiesTabViewSelectorStateImpl>
       get copyWith => throw _privateConstructorUsedError;
 }
 

lib/models/log.dart

@@ -1,12 +1,8 @@
-// ignore_for_file: invalid_annotation_target
-
 import 'package:fl_clash/enum/enum.dart';
-import 'package:freezed_annotation/freezed_annotation.dart';
+import 'package:json_annotation/json_annotation.dart';
 
 part 'generated/log.g.dart';
 
-part 'generated/log.freezed.dart';
-
 @JsonSerializable()
 class Log {
   @JsonKey(name: "LogLevel")
@@ -35,22 +31,3 @@ class Log {
     return 'Log{logLevel: $logLevel, payload: $payload, dateTime: $dateTime}';
   }
 }
-
-@freezed
-class LogsAndKeywords with _$LogsAndKeywords {
-  const factory LogsAndKeywords({
-    @Default([]) List<Log> logs,
-    @Default([]) List<String> keywords,
-  }) = _LogsAndKeywords;
-
-  factory LogsAndKeywords.fromJson(Map<String, Object?> json) =>
-      _$LogsAndKeywordsFromJson(json);
-}
-
-extension LogsAndKeywordsExt on LogsAndKeywords {
-  List<Log> get filteredLogs => logs
-      .where(
-        (log) => {log.logLevel.name}.containsAll(keywords),
-      )
-      .toList();
-}

lib/models/profile.dart

@@ -5,28 +5,39 @@ import 'dart:typed_data';
 import 'package:fl_clash/clash/core.dart';
 import 'package:fl_clash/enum/enum.dart';
 import 'package:fl_clash/common/common.dart';
-import 'package:freezed_annotation/freezed_annotation.dart';
+import 'package:json_annotation/json_annotation.dart';
 
 part 'generated/profile.g.dart';
 
-part 'generated/profile.freezed.dart';
-
 typedef SelectedMap = Map<String, String>;
 
-@freezed
-class UserInfo with _$UserInfo {
-  const factory UserInfo({
-    @Default(0) int upload,
-    @Default(0) int download,
-    @Default(0) int total,
-    @Default(0) int expire,
-  }) = _UserInfo;
+@JsonSerializable()
+class UserInfo {
+  int upload;
+  int download;
+  int total;
+  int expire;
 
-  factory UserInfo.fromJson(Map<String, Object?> json) =>
-      _$UserInfoFromJson(json);
+  UserInfo({
+    int? upload,
+    int? download,
+    int? total,
+    int? expire,
+  })  : upload = upload ?? 0,
+        download = download ?? 0,
+        total = total ?? 0,
+        expire = expire ?? 0;
+
+  Map<String, dynamic> toJson() {
+    return _$UserInfoToJson(this);
+  }
+
+  factory UserInfo.fromJson(Map<String, dynamic> json) {
+    return _$UserInfoFromJson(json);
+  }
 
   factory UserInfo.formHString(String? info) {
-    if (info == null) return const UserInfo();
+    if (info == null) return UserInfo();
     final list = info.split(";");
     Map<String, int?> map = {};
     for (final i in list) {
@@ -34,77 +45,73 @@ class UserInfo with _$UserInfo {
       map[keyValue[0]] = int.tryParse(keyValue[1]);
     }
     return UserInfo(
-      upload: map["upload"] ?? 0,
-      download: map["download"] ?? 0,
-      total: map["total"] ?? 0,
-      expire: map["expire"] ?? 0,
+      upload: map["upload"],
+      download: map["download"],
+      total: map["total"],
+      expire: map["expire"],
     );
   }
+
+  @override
+  String toString() {
+    return 'UserInfo{upload: $upload, download: $download, total: $total, expire: $expire}';
+  }
 }
 
-@freezed
-class Profile with _$Profile {
-  const factory Profile({
-    required String id,
-    String? label,
-    String? currentGroupName,
-    @Default("") String url,
-    DateTime? lastUpdateDate,
-    required Duration autoUpdateDuration,
-    UserInfo? userInfo,
-    @Default(true) bool autoUpdate,
-    @Default({}) SelectedMap selectedMap,
-    @Default({}) Set<String> unfoldSet,
-  }) = _Profile;
+@JsonSerializable()
+class Profile {
+  String id;
+  String? label;
+  String? currentGroupName;
+  String? url;
+  DateTime? lastUpdateDate;
+  Duration autoUpdateDuration;
+  UserInfo? userInfo;
+  bool autoUpdate;
+  SelectedMap selectedMap;
 
-  factory Profile.fromJson(Map<String, Object?> json) =>
-      _$ProfileFromJson(json);
+  Profile({
+    String? id,
+    this.label,
+    this.url,
+    this.currentGroupName,
+    this.userInfo,
+    this.lastUpdateDate,
+    SelectedMap? selectedMap,
+    Duration? autoUpdateDuration,
+    this.autoUpdate = true,
+  })  : id = id ?? DateTime.now().millisecondsSinceEpoch.toString(),
+        autoUpdateDuration = autoUpdateDuration ?? defaultUpdateDuration,
+        selectedMap = selectedMap ?? {};
 
-  factory Profile.normal({
-    String? label,
-    String url = '',
-}) {
-    return Profile(
-      label: label,
-      url: url,
-      id: DateTime.now().millisecondsSinceEpoch.toString(),
-      autoUpdateDuration: defaultUpdateDuration,
-    );
-  }
-}
-
-extension ProfileExtension on Profile {
   ProfileType get type =>
-      url.isEmpty == true ? ProfileType.file : ProfileType.url;
-
-  bool get realAutoUpdate =>
-      url.isEmpty == true ? false : autoUpdate;
+      url == null || url?.isEmpty == true ? ProfileType.file : ProfileType.url;
 
   Future<void> checkAndUpdate() async {
     final isExists = await check();
     if (!isExists) {
-      if (url.isNotEmpty) {
-        await update();
+      if (url != null) {
+        return await update();
       }
     }
   }
 
+  Future<void> update() async {
+    final response = await request.getFileResponseForUrl(url!);
+    final disposition = response.headers.value("content-disposition");
+    label ??= other.getFileNameForDisposition(disposition) ?? id;
+    final userinfo = response.headers.value('subscription-userinfo');
+    userInfo = UserInfo.formHString(userinfo);
+    await saveFile(response.data);
+    lastUpdateDate = DateTime.now();
+  }
+
   Future<bool> check() async {
     final profilePath = await appPath.getProfilePath(id);
     return await File(profilePath!).exists();
   }
 
-  Future<Profile> update() async {
-    final response = await request.getFileResponseForUrl(url);
-    final disposition = response.headers.value("content-disposition");
-    final userinfo = response.headers.value('subscription-userinfo');
-    return await copyWith(
-      label: label ?? other.getFileNameForDisposition(disposition) ?? id,
-      userInfo: UserInfo.formHString(userinfo),
-    ).saveFile(response.data);
-  }
-
-  Future<Profile> saveFile(Uint8List bytes) async {
+  Future<void> saveFile(Uint8List bytes) async {
     final message = await clashCore.validateConfig(utf8.decode(bytes));
     if (message.isNotEmpty) {
       throw message;
@@ -116,21 +123,66 @@ extension ProfileExtension on Profile {
       await file.create(recursive: true);
     }
     await file.writeAsBytes(bytes);
-    return copyWith(lastUpdateDate: DateTime.now());
+    lastUpdateDate = DateTime.now();
   }
 
-  Future<Profile> saveFileWithString(String value) async {
-    final message = await clashCore.validateConfig(value);
-    if (message.isNotEmpty) {
-      throw message;
-    }
-    final path = await appPath.getProfilePath(id);
-    final file = File(path!);
-    final isExists = await file.exists();
-    if (!isExists) {
-      await file.create(recursive: true);
-    }
-    await file.writeAsString(value);
-    return copyWith(lastUpdateDate: DateTime.now());
+  Map<String, dynamic> toJson() {
+    return _$ProfileToJson(this);
+  }
+
+  factory Profile.fromJson(Map<String, dynamic> json) {
+    return _$ProfileFromJson(json);
+  }
+
+
+  @override
+  bool operator ==(Object other) =>
+      identical(this, other) ||
+      other is Profile &&
+          runtimeType == other.runtimeType &&
+          id == other.id &&
+          label == other.label &&
+          currentGroupName == other.currentGroupName &&
+          url == other.url &&
+          lastUpdateDate == other.lastUpdateDate &&
+          autoUpdateDuration == other.autoUpdateDuration &&
+          userInfo == other.userInfo &&
+          autoUpdate == other.autoUpdate &&
+          selectedMap == other.selectedMap;
+
+  @override
+  int get hashCode =>
+      id.hashCode ^
+      label.hashCode ^
+      currentGroupName.hashCode ^
+      url.hashCode ^
+      lastUpdateDate.hashCode ^
+      autoUpdateDuration.hashCode ^
+      userInfo.hashCode ^
+      autoUpdate.hashCode ^
+      selectedMap.hashCode;
+
+  Profile copyWith({
+    String? label,
+    String? url,
+    UserInfo? userInfo,
+    String? currentGroupName,
+    String? proxyName,
+    DateTime? lastUpdateDate,
+    Duration? autoUpdateDuration,
+    bool? autoUpdate,
+    SelectedMap? selectedMap,
+  }) {
+    return Profile(
+      id: id,
+      label: label ?? this.label,
+      url: url ?? this.url,
+      currentGroupName: currentGroupName ?? this.currentGroupName,
+      userInfo: userInfo ?? this.userInfo,
+      selectedMap: selectedMap ?? this.selectedMap,
+      lastUpdateDate: lastUpdateDate ?? this.lastUpdateDate,
+      autoUpdateDuration: autoUpdateDuration ?? this.autoUpdateDuration,
+      autoUpdate: autoUpdate ?? this.autoUpdate,
+    );
   }
 }

lib/models/selector.dart

@@ -99,14 +99,13 @@ class ProxiesSelectorState with _$ProxiesSelectorState {
 }
 
 @freezed
-class ProxyGroupSelectorState with _$ProxyGroupSelectorState {
-  const factory ProxyGroupSelectorState({
+class ProxiesTabViewSelectorState with _$ProxiesTabViewSelectorState {
+  const factory ProxiesTabViewSelectorState({
     required ProxiesSortType proxiesSortType,
-    required ProxyCardType proxyCardType,
     required num sortNum,
-    required List<Proxy> proxies,
-    required int columns,
-  }) = _ProxyGroupSelectorState;
+    required Group group,
+    required ViewMode viewMode,
+  }) = _ProxiesTabViewSelectorState;
 }
 
 @freezed

lib/state.dart

@@ -4,7 +4,6 @@ import 'dart:io';
 
 import 'package:animations/animations.dart';
 import 'package:fl_clash/clash/clash.dart';
-import 'package:fl_clash/enum/enum.dart';
 import 'package:fl_clash/widgets/scaffold.dart';
 import 'package:flutter/material.dart';
 
@@ -58,7 +57,6 @@ class GlobalState {
   }
 
   Future<void> startSystemProxy({
-    required AppState appState,
     required Config config,
     required ClashConfig clashConfig,
   }) async {
@@ -75,11 +73,6 @@ class GlobalState {
       args: args,
     );
     startListenUpdate();
-    applyProfile(
-      appState: appState,
-      config: config,
-      clashConfig: clashConfig,
-    );
   }
 
   Future<void> stopSystemProxy() async {
@@ -202,7 +195,6 @@ class GlobalState {
     final traffic = clashCore.getTraffic();
     if (appState != null) {
       appState.addTraffic(traffic);
-      appState.totalTraffic = clashCore.getTotalTraffic();
     }
     if (Platform.isAndroid) {
       final currentProfile = config.currentProfile;
@@ -262,18 +254,6 @@ class GlobalState {
       return null;
     }
   }
-
-  int getColumns(ViewMode viewMode,int currentColumns){
-    final targetColumnsArray = switch (viewMode) {
-      ViewMode.mobile => [2, 1],
-      ViewMode.laptop => [3, 2],
-      ViewMode.desktop => [4, 3],
-    };
-    if (targetColumnsArray.contains(currentColumns)) {
-      return currentColumns;
-    }
-    return targetColumnsArray.first;
-  }
 }
 
 final globalState = GlobalState();

lib/widgets/card.dart

@@ -1,5 +1,4 @@
 import 'package:fl_clash/common/common.dart';
-import 'package:fl_clash/enum/enum.dart';
 import 'package:flutter/material.dart';
 
 import 'text.dart';
@@ -55,7 +54,6 @@ class CommonCard extends StatelessWidget {
   const CommonCard({
     super.key,
     bool? isSelected,
-    this.type = CommonCardType.plain,
     this.onPressed,
     this.info,
     this.selectWidget,
@@ -67,14 +65,10 @@ class CommonCard extends StatelessWidget {
   final Widget? selectWidget;
   final Widget child;
   final Info? info;
-  final CommonCardType type;
 
   BorderSide getBorderSide(BuildContext context, Set<WidgetState> states) {
-    if(type == CommonCardType.filled){
-      return BorderSide.none;
-    }
     final colorScheme = Theme.of(context).colorScheme;
-    final hoverColor = isSelected
+    var hoverColor = isSelected
         ? colorScheme.primary.toLight()
         : colorScheme.primary.toLighter();
     if (states.contains(WidgetState.hovered) ||
@@ -92,28 +86,17 @@ class CommonCard extends StatelessWidget {
 
   Color? getBackgroundColor(BuildContext context, Set<WidgetState> states) {
     final colorScheme = Theme.of(context).colorScheme;
-    switch(type){
-      case CommonCardType.plain:
-        if (isSelected) {
-          return colorScheme.secondaryContainer;
-        }
-        if (states.isEmpty) {
-          return colorScheme.secondaryContainer.toLittle();
-        }
-        return Theme.of(context)
-            .outlinedButtonTheme
-            .style
-            ?.backgroundColor
-            ?.resolve(states);
-      case CommonCardType.filled:
-        if (isSelected) {
-          return colorScheme.secondaryContainer;
-        }
-        if (states.isEmpty) {
-          return colorScheme.surfaceContainerLow;
-        }
-        return colorScheme.surfaceContainer;
+    if (isSelected) {
+      return colorScheme.secondaryContainer;
     }
+    if (states.isEmpty) {
+      return colorScheme.secondaryContainer.toLittle();
+    }
+    return Theme.of(context)
+        .outlinedButtonTheme
+        .style
+        ?.backgroundColor
+        ?.resolve(states);
   }
 
   @override
@@ -153,7 +136,11 @@ class CommonCard extends StatelessWidget {
           (states) => getBorderSide(context, states),
         ),
       ),
-      onPressed: onPressed,
+      onPressed: () {
+        if (onPressed != null) {
+          onPressed!();
+        }
+      },
       child: Builder(
         builder: (_) {
           List<Widget> children = [];

lib/widgets/chip.dart

@@ -1,45 +1,21 @@
-import 'package:fl_clash/enum/enum.dart';
 import 'package:flutter/material.dart';
 
 class CommonChip extends StatelessWidget {
   final String label;
-  final VoidCallback? onPressed;
-  final ChipType type;
-  final Widget? avatar;
 
   const CommonChip({
     super.key,
     required this.label,
-    this.onPressed,
-    this.avatar,
-    this.type = ChipType.action,
   });
 
   @override
   Widget build(BuildContext context) {
-    if (type == ChipType.delete) {
-      return Chip(
-        avatar: avatar,
-        padding: const EdgeInsets.symmetric(
-          vertical: 0,
-          horizontal: 4,
-        ),
-        materialTapTargetSize: MaterialTapTargetSize.shrinkWrap,
-        onDeleted: onPressed ?? () {},
-        side:
-            BorderSide(color: Theme.of(context).dividerColor.withOpacity(0.2)),
-        labelStyle: Theme.of(context).textTheme.bodyMedium,
-        label: Text(label),
-      );
-    }
-    return ActionChip(
+    return Chip(
       materialTapTargetSize: MaterialTapTargetSize.shrinkWrap,
-      avatar: avatar,
       padding: const EdgeInsets.symmetric(
         vertical: 0,
         horizontal: 4,
       ),
-      onPressed: onPressed ?? () {},
       side: BorderSide(color: Theme.of(context).dividerColor.withOpacity(0.2)),
       labelStyle: Theme.of(context).textTheme.bodyMedium,
       label: Text(label),

lib/widgets/null_status.dart

@@ -11,7 +11,7 @@ class NullStatus extends StatelessWidget {
     return Center(
       child: Text(
         label,
-        style: Theme.of(context).textTheme.titleMedium?.toBold,
+        style: Theme.of(context).textTheme.titleMedium?.toBold(),
       ),
     );
   }

lib/widgets/popup_menu.dart

@@ -53,12 +53,6 @@ class _CommonPopupMenuState<T> extends State<CommonPopupMenu<T>> {
     widget.onSelected(value);
   }
 
-  @override
-  void dispose() {
-    groupValue.dispose();
-    super.dispose();
-  }
-
   @override
   Widget build(BuildContext context) {
     return PopupMenuButton<T>(

lib/widgets/scaffold.dart

@@ -7,7 +7,6 @@ import 'package:flutter/services.dart';
 class CommonScaffold extends StatefulWidget {
   final Widget body;
   final Widget? bottomNavigationBar;
-  final Widget? floatingActionButton;
   final String title;
   final Widget? leading;
   final List<Widget>? actions;
@@ -20,7 +19,6 @@ class CommonScaffold extends StatefulWidget {
     this.leading,
     required this.title,
     this.actions,
-    this.floatingActionButton,
     this.automaticallyImplyLeading = true,
   });
 
@@ -88,13 +86,6 @@ class CommonScaffoldState extends State<CommonScaffold> {
     }
   }
 
-  @override
-  void dispose() {
-    _actions.dispose();
-    _floatingActionButton.dispose();
-    super.dispose();
-  }
-
   @override
   void didUpdateWidget(covariant CommonScaffold oldWidget) {
     super.didUpdateWidget(oldWidget);
@@ -125,13 +116,12 @@ class CommonScaffoldState extends State<CommonScaffold> {
   Widget build(BuildContext context) {
     return _platformContainer(
       child: Scaffold(
-        floatingActionButton: widget.floatingActionButton ??
-            ValueListenableBuilder(
-              valueListenable: _floatingActionButton,
-              builder: (_, floatingActionButton, __) {
-                return floatingActionButton ?? Container();
-              },
-            ),
+        floatingActionButton: ValueListenableBuilder(
+          valueListenable: _floatingActionButton,
+          builder: (_, floatingActionButton, __) {
+            return floatingActionButton ?? Container();
+          },
+        ),
         resizeToAvoidBottomInset: true,
         appBar: PreferredSize(
           preferredSize: const Size.fromHeight(kToolbarHeight),

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.8.32
+version: 0.8.24
 environment:
   sdk: '>=3.1.0 <4.0.0'
 
@@ -17,7 +17,7 @@ dependencies:
   provider: ^6.0.5
   window_manager: ^0.3.8
   ffi: ^2.1.0
-  dynamic_color: ^1.7.0
+  dynamic_color: ^1.6.0
   proxy:
     path: plugins/proxy
   launch_at_startup: ^0.2.2
@@ -39,8 +39,6 @@ dependencies:
   webdav_client: ^1.2.2
   dio: ^5.4.3+1
   country_flags: ^2.2.0
-  re_editor: ^0.3.0
-  re_highlight: ^0.0.3
 dev_dependencies:
   flutter_test:
     sdk: flutter