Fix android proxy error

Fix submit error
Add windows tun
2024-07-01 20:57:24 +08:00 · 2024-07-01 19:51:11 +08:00 · 2024-07-01 19:41:57 +08:00 · 2024-06-28 21:16:47 +08:00 · 2024-06-28 07:49:06 +08:00 · 2024-06-27 19:39:49 +08:00
59 changed files with 6023 additions and 700 deletions
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -21,11 +21,25 @@ jobs:
            os: macos-13

    steps:
+      - name: Setup Mingw64
+        if: startsWith(matrix.platform,'windows')
+        uses: msys2/setup-msys2@v2
+        with:
+          msystem: mingw64
+          install: mingw-w64-x86_64-gcc
+          update: true
+
+
+      - name: Set Mingw64 Env
+        if: startsWith(matrix.platform,'windows')
+        run: |
+          echo "${{ runner.temp }}\msys64\mingw64\bin" | Out-File -FilePath $env:GITHUB_PATH -Encoding utf8 -Append
+
      - name: Check Matrix
        run: |
-            echo "Running on ${{ matrix.os }}"
-            echo "Arch: ${{ runner.arch }}"
-            gcc --version
+          echo "Running on ${{ matrix.os }}"
+          echo "Arch: ${{ runner.arch }}"
+          gcc --version

      - name: Checkout
        uses: actions/checkout@v4
@@ -52,10 +66,10 @@ jobs:
        if: startsWith(matrix.platform,'android')
        run: |
          echo "${{ secrets.KEYSTORE }}" | base64 --decode > android/app/keystore.jks
-          echo "keyAlias=${{ secrets.KEY_ALIAS }}" >> android/local.properties    
+          echo "keyAlias=${{ secrets.KEY_ALIAS }}" >> android/local.properties
          echo "storePassword=${{ secrets.STORE_PASSWORD }}" >> android/local.properties
          echo "keyPassword=${{ secrets.KEY_PASSWORD }}" >> android/local.properties
-          
+

      - name: Setup Go
        uses: actions/setup-go@v5
--- a/android/app/src/main/AndroidManifest.xml
+++ b/android/app/src/main/AndroidManifest.xml
@@ -22,8 +22,10 @@
    <application
        android:name="${applicationName}"
        android:icon="@mipmap/ic_launcher"
+        android:networkSecurityConfig="@xml/network_security_config"
        android:extractNativeLibs="true"
-        android:label="FlClash">
+        android:label="FlClash"
+        tools:targetApi="n">
        <activity
            android:name="com.follow.clash.MainActivity"
            android:configChanges="orientation|keyboardHidden|keyboard|screenSize|smallestScreenSize|locale|layoutDirection|fontScale|screenLayout|density|uiMode"
--- a/android/app/src/main/kotlin/com/follow/clash/plugins/AppPlugin.kt
+++ b/android/app/src/main/kotlin/com/follow/clash/plugins/AppPlugin.kt
@@ -64,7 +64,6 @@ 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" -> {
@@ -151,7 +150,6 @@ class AppPlugin : FlutterPlugin, MethodChannel.MethodCallHandler, ActivityAware
                val message = call.argument<String>("message")
                tip(message)
                result.success(true)
-
            }

            else -> {
--- a/android/app/src/main/kotlin/com/follow/clash/plugins/ProxyPlugin.kt
+++ b/android/app/src/main/kotlin/com/follow/clash/plugins/ProxyPlugin.kt
@@ -44,6 +44,7 @@ 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) {
@@ -135,7 +136,6 @@ class ProxyPlugin : FlutterPlugin, MethodChannel.MethodCallHandler, ActivityAwar
        GlobalState.runTime = null;
    }

-    @SuppressLint("ForegroundServiceType")
    private fun startForeground() {
        if (GlobalState.runState.value != RunState.START) return
        flClashVpnService?.startForeground(title, content)
@@ -152,13 +152,14 @@ class ProxyPlugin : FlutterPlugin, MethodChannel.MethodCallHandler, ActivityAwar
            if (permission == PackageManager.PERMISSION_GRANTED) {
                startForeground()
            } else {
-                activity?.let {
-                    ActivityCompat.requestPermissions(
-                        it,
-                        arrayOf(Manifest.permission.POST_NOTIFICATIONS),
-                        NOTIFICATION_PERMISSION_REQUEST_CODE
-                    )
-                }
+                if (isBlockNotification) return
+                if (activity == null) return
+                ActivityCompat.requestPermissions(
+                    activity!!,
+                    arrayOf(Manifest.permission.POST_NOTIFICATIONS),
+                    NOTIFICATION_PERMISSION_REQUEST_CODE
+                )
+
            }
        } else {
            startForeground()
@@ -192,11 +193,14 @@ class ProxyPlugin : FlutterPlugin, MethodChannel.MethodCallHandler, ActivityAwar
        grantResults: IntArray
    ): Boolean {
        if (requestCode == NOTIFICATION_PERMISSION_REQUEST_CODE) {
-            if (grantResults.isNotEmpty() && grantResults[0] == PackageManager.PERMISSION_GRANTED) {
-                startForeground()
+            isBlockNotification = true
+            if (grantResults.isNotEmpty()) {
+                if (grantResults[0] == PackageManager.PERMISSION_GRANTED) {
+                    startForeground()
+                }
            }
        }
-        return true;
+        return false;
    }


--- a/android/app/src/main/res/xml/network_security_config.xml
+++ b/android/app/src/main/res/xml/network_security_config.xml
@@ -7,4 +7,8 @@
            <certificates src="user" />
        </trust-anchors>
    </base-config>
+    <domain-config cleartextTrafficPermitted="true">
+        <domain includeSubdomains="true">localhost</domain>
+        <domain includeSubdomains="true">127.0.0.1</domain>
+    </domain-config>
 </network-security-config>
--- a/core/Clash.Meta
+++ b/core/Clash.Meta
--- a/core/common.go
+++ b/core/common.go
@@ -340,8 +340,8 @@ func overwriteConfig(targetConfig *config.RawConfig, patchConfig config.RawConfi
 	targetConfig.Mode = patchConfig.Mode
 	targetConfig.Tun.Enable = patchConfig.Tun.Enable
 	targetConfig.Tun.Device = patchConfig.Tun.Device
-	//targetConfig.Tun.DNSHijack = patchConfig.Tun.DNSHijack
-	//targetConfig.Tun.Stack = patchConfig.Tun.Stack
+	targetConfig.Tun.DNSHijack = patchConfig.Tun.DNSHijack
+	targetConfig.Tun.Stack = patchConfig.Tun.Stack
 	targetConfig.GeodataLoader = patchConfig.GeodataLoader
 	targetConfig.Profile.StoreSelected = false
 	if targetConfig.DNS.Enable == false {
@@ -396,7 +396,6 @@ func applyConfig(isPatch bool) {
 	if isPatch {
 		patchConfig(cfg.General)
 	} else {
-		executor.Shutdown()
 		runtime.GC()
 		hub.UltraApplyConfig(cfg, true)
 	}
--- a/core/dart-bridge/lib.go
+++ b/core/dart-bridge/lib.go
@@ -1,6 +1,7 @@
 package dart_bridge

 /*
+#include <stdlib.h>
 #include "stdint.h"
 #include "include/dart_api_dl.h"
 #include "include/dart_api_dl.c"
@@ -28,6 +29,7 @@ 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)
--- a/core/hub.go
+++ b/core/hub.go
@@ -1,5 +1,8 @@
 package main

+/*
+#include <stdlib.h>
+*/
 import "C"
 import (
 	bridge "core/dart-bridge"
@@ -71,8 +74,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())
@@ -85,8 +88,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 {
@@ -147,30 +150,32 @@ func getProxies() *C.char {
 }

 //export changeProxy
-func changeProxy(s *C.char) bool {
+func changeProxy(s *C.char) {
+	paramsString := C.GoString(s)
 	go func() {
-		paramsString := C.GoString(s)
 		var params = &ChangeProxyParams{}
 		err := json.Unmarshal([]byte(paramsString), params)
 		if err != nil {
 			log.Infoln("Unmarshal ChangeProxyParams %v", err)
 		}
+		groupName := *params.GroupName
+		proxyName := *params.ProxyName
 		proxies := tunnel.ProxiesWithProviders()
-		proxy := proxies[*params.GroupName]
-		if proxy == nil {
+		group := proxies[groupName]
+		if group == nil {
 			return
 		}
-		log.Infoln("change proxy %s", proxy.Name())
-		adapterProxy := proxy.(*adapter.Proxy)
+		adapterProxy := group.(*adapter.Proxy)
 		selector, ok := adapterProxy.ProxyAdapter.(*outboundgroup.Selector)
 		if !ok {
 			return
 		}
-		if err := selector.Set(*params.ProxyName); err != nil {
-			return
+
+		err = selector.Set(proxyName)
+		if err == nil {
+			log.Infoln("[Selector] %s selected %s", groupName, proxyName)
 		}
 	}()
-	return true
 }

 //export getTraffic
@@ -211,8 +216,8 @@ func resetTraffic() {
 //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 {
@@ -296,7 +301,6 @@ 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
@@ -307,10 +311,13 @@ 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 {
-		return C.CString("")
+		msg = C.CString("")
+		return msg
 	}
-	return C.CString(string(data))
+	msg = C.CString(string(data))
+	return msg
 }

 //export getProvider
@@ -360,10 +367,9 @@ 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()
@@ -409,6 +415,11 @@ 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{
--- a/core/platform/limit.go
+++ b/core/platform/limit.go
@@ -0,0 +1,42 @@
+//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
+}
--- a/core/process.go
+++ b/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 {
--- a/core/tun.go
+++ b/core/tun.go
@@ -4,7 +4,9 @@ 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"
@@ -16,6 +18,21 @@ import (
 var tunLock sync.Mutex
 var tun *t.Tun

+type FdMap struct {
+	m sync.Map
+}
+
+func (cm *FdMap) Store(key int) {
+	cm.m.Store(key, struct{}{})
+}
+
+func (cm *FdMap) Load(key int) bool {
+	_, ok := cm.m.Load(key)
+	return ok
+}
+
+var fdMap FdMap
+
 //export startTUN
 func startTUN(fd C.int) {
 	go func() {
@@ -59,13 +76,40 @@ func stopTun() {
 	}()
 }

+var errBlocked = errors.New("blocked")
+
+//export setFdMap
+func setFdMap(fd C.long) {
+	fdInt := int(fd)
+	go func() {
+		fdMap.Store(fdInt)
+	}()
+}
+
 func init() {
 	dialer.DefaultSocketHook = func(network, address string, conn syscall.RawConn) error {
+		if platform.ShouldBlockConnection() {
+			return errBlocked
+		}
 		return conn.Control(func(fd uintptr) {
+			fdInt := int(fd)
+			//timeout := time.After(100 * time.Millisecond)
 			if tun != nil {
-				tun.MarkSocket(int(fd))
-				time.Sleep(time.Millisecond * 100)
+				tun.MarkSocket(fdInt)
+				time.Sleep(100 * time.Millisecond)
 			}
+			//for {
+			//	select {
+			//	case <-timeout:
+			//		return
+			//	default:
+			//		exists := fdMap.Load(fdInt)
+			//		if exists {
+			//			return
+			//		}
+			//		time.Sleep(20 * time.Millisecond)
+			//	}
+			//}
 		})
 	}
 }
--- a/lib/application.dart
+++ b/lib/application.dart
@@ -130,7 +130,6 @@ class ApplicationState extends State<Application> {
      httpTimeoutDuration,
      (timer) async {
        await globalState.appController.updateGroups();
-        globalState.appController.appState.sortNum++;
      },
    );
  }
@@ -165,7 +164,6 @@ class ApplicationState extends State<Application> {
                    themeMode: state.themeMode,
                    theme: ThemeData(
                      useMaterial3: true,
-                      fontFamily: '',
                      pageTransitionsTheme: _pageTransitionsTheme,
                      colorScheme: _getAppColorScheme(
                        brightness: Brightness.light,
@@ -175,7 +173,6 @@ class ApplicationState extends State<Application> {
                    ),
                    darkTheme: ThemeData(
                      useMaterial3: true,
-                      fontFamily: '',
                      pageTransitionsTheme: _pageTransitionsTheme,
                      colorScheme: _getAppColorScheme(
                        brightness: Brightness.dark,
--- a/lib/clash/core.dart
+++ b/lib/clash/core.dart
@@ -45,10 +45,10 @@ class ClashCore {
  }

  bool init(String homeDir) {
-    return clashFFI.initClash(
-      homeDir.toNativeUtf8().cast(),
-    ) ==
-        1;
+    final homeDirChar = homeDir.toNativeUtf8().cast<Char>();
+    final isInit = clashFFI.initClash(homeDirChar) == 1;
+    malloc.free(homeDirChar);
+    return isInit;
  }

  shutdown() {
@@ -67,10 +67,12 @@ class ClashCore {
        receiver.close();
      }
    });
+    final dataChar = data.toNativeUtf8().cast<Char>();
    clashFFI.validateConfig(
-      data.toNativeUtf8().cast(),
+      dataChar,
      receiver.sendPort.nativePort,
    );
+    malloc.free(dataChar);
    return completer.future;
  }

@@ -84,20 +86,23 @@ class ClashCore {
      }
    });
    final params = json.encode(updateConfigParams);
+    final paramsChar = params.toNativeUtf8().cast<Char>();
    clashFFI.updateConfig(
-      params.toNativeUtf8().cast(),
+      paramsChar,
      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 [];
+      if (proxiesRawString.isEmpty) return [];
+      final proxies = (json.decode(proxiesRawString) ?? {}) as Map;
+      if (proxies.isEmpty) return [];
      final groupNames = [
        UsedProxy.GLOBAL.name,
        ...(proxies[UsedProxy.GLOBAL.name]["all"] as List).where((e) {
@@ -111,7 +116,8 @@ class ClashCore {
        group["all"] = ((group["all"] ?? []) as List)
            .map(
              (name) => proxies[name],
-        )
+            )
+            .where((proxy) => proxy != null)
            .toList();
        return group;
      }).toList();
@@ -122,14 +128,15 @@ class ClashCore {
  Future<List<ExternalProvider>> getExternalProviders() {
    final externalProvidersRaw = clashFFI.getExternalProviders();
    final externalProvidersRawString =
-    externalProvidersRaw.cast<Utf8>().toDartString();
+        externalProvidersRaw.cast<Utf8>().toDartString();
+    clashFFI.freeCString(externalProvidersRaw);
    return Isolate.run<List<ExternalProvider>>(() {
      final externalProviders =
-      (json.decode(externalProvidersRawString) as List<dynamic>)
-          .map(
-            (item) => ExternalProvider.fromJson(item),
-      )
-          .toList();
+          (json.decode(externalProvidersRawString) as List<dynamic>)
+              .map(
+                (item) => ExternalProvider.fromJson(item),
+              )
+              .toList();
      return externalProviders;
    });
  }
@@ -146,17 +153,24 @@ class ClashCore {
        receiver.close();
      }
    });
+    final providerNameChar = providerName.toNativeUtf8().cast<Char>();
+    final providerTypeChar = providerType.toNativeUtf8().cast<Char>();
    clashFFI.updateExternalProvider(
-      providerName.toNativeUtf8().cast(),
-      providerType.toNativeUtf8().cast(),
+      providerNameChar,
+      providerTypeChar,
      receiver.sendPort.nativePort,
    );
+    malloc.free(providerNameChar);
+    malloc.free(providerTypeChar);
    return completer.future;
  }

  bool changeProxy(ChangeProxyParams changeProxyParams) {
    final params = json.encode(changeProxyParams);
-    return clashFFI.changeProxy(params.toNativeUtf8().cast()) == 1;
+    final paramsChar = params.toNativeUtf8().cast<Char>();
+    final isInit = clashFFI.changeProxy(paramsChar) == 1;
+    malloc.free(paramsChar);
+    return isInit;
  }

  Future<Delay> getDelay(String proxyName) {
@@ -172,13 +186,16 @@ class ClashCore {
        receiver.close();
      }
    });
+    final delayParamsChar =
+        json.encode(delayParams).toNativeUtf8().cast<Char>();
    clashFFI.asyncTestDelay(
-      json.encode(delayParams).toNativeUtf8().cast(),
+      delayParamsChar,
      receiver.sendPort.nativePort,
    );
+    malloc.free(delayParamsChar);
    Future.delayed(httpTimeoutDuration + moreDuration, () {
      receiver.close();
-      if(!completer.isCompleted){
+      if (!completer.isCompleted) {
        completer.complete(
          Delay(name: proxyName, value: -1),
        );
@@ -188,28 +205,33 @@ class ClashCore {
  }

  clearEffect(String path) {
-    clashFFI.clearEffect(path.toNativeUtf8().cast());
+    final pathChar = path.toNativeUtf8().cast<Char>();
+    clashFFI.clearEffect(pathChar);
+    malloc.free(pathChar);
  }

  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(){
+  void resetTraffic() {
    clashFFI.resetTraffic();
  }

@@ -234,7 +256,14 @@ class ClashCore {
  }

  void setProcessMap(ProcessMapItem processMapItem) {
-    clashFFI.setProcessMap(json.encode(processMapItem).toNativeUtf8().cast());
+    final processMapItemChar =
+        json.encode(processMapItem).toNativeUtf8().cast<Char>();
+    clashFFI.setProcessMap(processMapItemChar);
+    malloc.free(processMapItemChar);
+  }
+
+  void setFdMap(int fd) {
+    clashFFI.setFdMap(fd);
  }

  // DateTime? getRunTime() {
@@ -246,13 +275,16 @@ class ClashCore {
  List<Connection> getConnections() {
    final connectionsDataRaw = clashFFI.getConnections();
    final connectionsData =
-    json.decode(connectionsDataRaw.cast<Utf8>().toDartString()) as Map;
+        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) {
-    clashFFI.closeConnection(id.toNativeUtf8().cast());
+    final idChar = id.toNativeUtf8().cast<Char>();
+    clashFFI.closeConnection(idChar);
+    malloc.free(idChar);
  }
 }

--- a/lib/clash/generated/clash_ffi.dart
+++ b/lib/clash/generated/clash_ffi.dart
--- a/lib/common/android.dart
+++ b/lib/common/android.dart
@@ -7,7 +7,6 @@ class Android {
  init() async {
    app?.onExit = () {
      clashCore.shutdown();
-      print("adsadda==>");
      exit(0);
    };
  }
--- a/lib/common/constant.dart
+++ b/lib/common/constant.dart
@@ -7,6 +7,7 @@ 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";
--- a/lib/common/context.dart
+++ b/lib/common/context.dart
@@ -7,8 +7,12 @@ extension BuildContextExtension on BuildContext {
    return findAncestorStateOfType<CommonScaffoldState>();
  }

+  Size get appSize{
+    return MediaQuery.of(this).size;
+  }
+
  double get width {
-    return MediaQuery.of(this).size.width;
+    return appSize.width;
  }

  ColorScheme get colorScheme => Theme.of(this).colorScheme;
--- a/lib/common/package.dart
+++ b/lib/common/package.dart
@@ -1,22 +1,35 @@
 import 'dart:async';
+import 'dart:io';

 import 'package:package_info_plus/package_info_plus.dart';

-class AppPackage{
+import 'common.dart';

+class AppPackage {
  static AppPackage? _instance;
+
  Completer<PackageInfo> packageInfoCompleter = Completer();

  AppPackage._internal() {
-     PackageInfo.fromPlatform().then(
-          (value) => packageInfoCompleter.complete(value),
+    PackageInfo.fromPlatform().then(
+      (value) => packageInfoCompleter.complete(value),
    );
  }

+  Future<String> getUa() async {
+    final packageInfo = await packageInfoCompleter.future;
+    final uas = [
+      "$appName/v${packageInfo.version}",
+      "clash-verge/v1.6.6",
+      "Platform/${Platform.operatingSystem}",
+    ];
+    return uas.join(" ");
+  }
+
  factory AppPackage() {
    _instance ??= AppPackage._internal();
    return _instance!;
  }
 }

-final appPackage = AppPackage();
+final appPackage = AppPackage();
--- a/lib/common/request.dart
+++ b/lib/common/request.dart
@@ -2,21 +2,20 @@ import 'dart:io';

 import 'package:dio/dio.dart';
 import 'package:dio/io.dart';
-import 'package:fl_clash/common/common.dart';
 import 'package:fl_clash/models/ip.dart';
 import 'package:fl_clash/state.dart';

+import 'constant.dart';
+import 'other.dart';
+import 'package.dart';
+
 class Request {
  late final Dio _dio;
  int? _port;
  bool _isStart = false;

  Request() {
-    _dio = Dio(
-      BaseOptions(
-        headers: {"User-Agent": coreName},
-      ),
-    );
+    _dio = Dio();
    _dio.interceptors.add(InterceptorsWrapper(
      onRequest: (options, handler) {
        _syncProxy();
@@ -45,10 +44,14 @@ class Request {
  }

  Future<Response> getFileResponseForUrl(String url) async {
+    final ua = await appPackage.getUa();
    final response = await _dio
        .get(
          url,
          options: Options(
+            headers: {
+              "User-Agent": ua,
+            },
            responseType: ResponseType.bytes,
          ),
        )
--- a/lib/common/text.dart
+++ b/lib/common/text.dart
@@ -2,20 +2,13 @@ import 'package:flutter/material.dart';
 import 'color.dart';

 extension TextStyleExtension on TextStyle {
-  toLight() {
-    return copyWith(color: color?.toLight());
-  }
+  TextStyle get toLight => copyWith(color: color?.toLight());

-  toLighter() {
-    return copyWith(color: color?.toLighter());
-  }
+  TextStyle get toLighter => copyWith(color: color?.toLighter());

+  TextStyle get toSoftBold => copyWith(fontWeight: FontWeight.w500);

-  toSoftBold() {
-    return copyWith(fontWeight: FontWeight.w500);
-  }
+  TextStyle get toBold => copyWith(fontWeight: FontWeight.bold);

-  toBold() {
-    return copyWith(fontWeight: FontWeight.bold);
-  }
-}
+  TextStyle get toMinus => copyWith(fontSize: fontSize! - 2);
+}
--- a/lib/controller.dart
+++ b/lib/controller.dart
@@ -1,7 +1,6 @@
 import 'dart:async';

 import 'package:fl_clash/enum/enum.dart';
-import 'package:fl_clash/plugins/app.dart';
 import 'package:fl_clash/state.dart';
 import 'package:flutter/material.dart';
 import 'package:provider/provider.dart';
@@ -267,6 +266,7 @@ class AppController {
  }

  init() async {
+    updateLogStatus();
    if (!config.silentLaunch) {
      window?.show();
    }
@@ -290,14 +290,13 @@ class AppController {
  }

  afterInit() async {
-    if (config.autoRun) {
+    await proxyManager.updateStartTime();
+    if (proxyManager.isStart) {
      await updateSystemProxy(true);
    } else {
-      await proxyManager.updateStartTime();
-      await updateSystemProxy(proxyManager.isStart);
+      await updateSystemProxy(config.autoRun);
    }
    autoUpdateProfiles();
-    updateLogStatus();
    autoCheckUpdate();
  }

@@ -360,7 +359,9 @@ class AppController {
  }

  addProfileFormURL(String url) async {
-    globalState.navigatorKey.currentState?.popUntil((route) => route.isFirst);
+    if (globalState.navigatorKey.currentState?.canPop() ?? false) {
+      globalState.navigatorKey.currentState?.popUntil((route) => route.isFirst);
+    }
    toProfiles();
    final commonScaffoldState = globalState.homeScaffoldKey.currentState;
    if (commonScaffoldState?.mounted != true) return;
@@ -406,9 +407,54 @@ 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),
+    };
+  }
 }
--- a/lib/enum/enum.dart
+++ b/lib/enum/enum.dart
@@ -65,7 +65,10 @@ enum RecoveryOption {
  onlyProfiles,
 }

-enum ChipType {
-  action,
-  delete,
-}
+enum ChipType { action, delete }
+
+enum CommonCardType { plain, filled }
+
+enum ProxiesType { tab, expansion }
+
+enum ProxyCardType { expand, shrink }
--- a/lib/fragments/config.dart
+++ b/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,
@@ -337,7 +337,7 @@ class _ConfigFragmentState extends State<ConfigFragment> {

  Widget _buildMoreSection() {
    final items = [
-      if (false)
+      if (system.isDesktop)
        Selector<ClashConfig, bool>(
          selector: (_, clashConfig) => clashConfig.tun.enable,
          builder: (_, tunEnable, __) {
@@ -361,7 +361,7 @@ class _ConfigFragmentState extends State<ConfigFragment> {
    ];
    if(items.isEmpty) return Container();
    return Section(
-      title: appLocalizations.general,
+      title: appLocalizations.more,
      child: Column(
        children: [
          for (final item in items) ...[
--- a/lib/fragments/connections.dart
+++ b/lib/fragments/connections.dart
@@ -198,7 +198,7 @@ class ConnectionItem extends StatelessWidget {
  }

  String _getRequestText(Metadata metadata) {
-    var text = "${metadata.network}:://";
+    var text = "${metadata.network}://";
    final ips = [
      metadata.host,
      metadata.destinationIP,
--- a/lib/fragments/dashboard/core_info.dart
+++ b/lib/fragments/dashboard/core_info.dart
@@ -13,6 +13,7 @@ class CoreInfo extends StatelessWidget {
      selector: (_, appState) => appState.versionInfo,
      builder: (_, versionInfo, __) {
        return CommonCard(
+          onPressed: () {},
          info: Info(
            label: appLocalizations.coreInfo,
            iconData: Icons.memory,
@@ -31,7 +32,7 @@ class CoreInfo extends StatelessWidget {
                    style: context
                        .textTheme
                        .titleMedium
-                        ?.toSoftBold(),
+                        ?.toSoftBold,
                  ),
                ),
                const SizedBox(
@@ -44,7 +45,7 @@ class CoreInfo extends StatelessWidget {
                    style: context
                        .textTheme
                        .titleLarge
-                        ?.toSoftBold(),
+                        ?.toSoftBold,
                  ),
                ),
              ],
--- a/lib/fragments/dashboard/dashboard.dart
+++ b/lib/fragments/dashboard/dashboard.dart
@@ -56,7 +56,7 @@ class _DashboardFragmentState extends State<DashboardFragment> {
                  ),
                  GridItem(
                    crossAxisCellCount: isDesktop ? 4 : 6,
-                    child: const IntranetIp(),
+                    child: const IntranetIP(),
                  ),
                ],
              );
--- a/lib/fragments/dashboard/intranet_ip.dart
+++ b/lib/fragments/dashboard/intranet_ip.dart
@@ -5,21 +5,21 @@ 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});
+class IntranetIP extends StatefulWidget {
+  const IntranetIP({super.key});

  @override
-  State<IntranetIp> createState() => _IntranetIpState();
+  State<IntranetIP> createState() => _IntranetIPState();
 }

-class _IntranetIpState extends State<IntranetIp> {
+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.type == InternetAddressType.IPv4 && !address.isLoopback) {
+        if (!address.isLoopback) {
          return address.address;
        }
      }
@@ -45,12 +45,15 @@ class _IntranetIpState extends State<IntranetIp> {
  Widget build(BuildContext context) {
    return CommonCard(
      info: Info(
-        label: appLocalizations.intranetIp,
+        label: appLocalizations.intranetIP,
        iconData: Icons.devices,
      ),
+      onPressed: (){
+
+      },
      child: Container(
        padding: const EdgeInsets.all(16).copyWith(top: 0),
-        height: globalState.appController.measure.titleLargeHeight + 16,
+        height: globalState.appController.measure.titleLargeHeight + 24 - 2,
        child: ValueListenableBuilder(
          valueListenable: ipNotifier,
          builder: (_, value, __) {
@@ -65,7 +68,7 @@ class _IntranetIpState extends State<IntranetIp> {
                          child: TooltipText(
                            text: Text(
                              value,
-                              style: context.textTheme.titleLarge?.toSoftBold(),
+                              style: context.textTheme.titleLarge?.toSoftBold.toMinus,
                              maxLines: 1,
                              overflow: TextOverflow.ellipsis,
                            ),
@@ -74,8 +77,11 @@ class _IntranetIpState extends State<IntranetIp> {
                      ],
                    )
                  : const Padding(
-                      padding: EdgeInsets.all(4),
-                      child: CircularProgressIndicator(),
+                      padding: EdgeInsets.all(2),
+                      child: AspectRatio(
+                        aspectRatio: 1,
+                        child: CircularProgressIndicator(),
+                      ),
                    ),
            );
          },
--- a/lib/fragments/dashboard/network_detection.dart
+++ b/lib/fragments/dashboard/network_detection.dart
@@ -78,6 +78,7 @@ class _NetworkDetectionState extends State<NetworkDetection> {
        valueListenable: ipInfoNotifier,
        builder: (_, ipInfo, __) {
          return CommonCard(
+            onPressed: () {},
            child: Column(
              children: [
                Flexible(
@@ -134,8 +135,9 @@ class _NetworkDetectionState extends State<NetworkDetection> {
                  ),
                ),
                Container(
-                  height:
-                      globalState.appController.measure.titleLargeHeight + 24,
+                  height: globalState.appController.measure.titleLargeHeight +
+                      24 -
+                      2,
                  alignment: Alignment.centerLeft,
                  padding: const EdgeInsets.all(16).copyWith(top: 0),
                  child: FadeBox(
@@ -150,7 +152,7 @@ class _NetworkDetectionState extends State<NetworkDetection> {
                                  text: Text(
                                    ipInfo.ip,
                                    style: context.textTheme.titleLarge
-                                        ?.toSoftBold(),
+                                        ?.toSoftBold.toMinus,
                                    maxLines: 1,
                                    overflow: TextOverflow.ellipsis,
                                  ),
@@ -164,9 +166,10 @@ class _NetworkDetectionState extends State<NetworkDetection> {
                              if (timeout) {
                                return Text(
                                  "timeout",
-                                  style: context.textTheme.titleMedium
+                                  style: context.textTheme.titleLarge
                                      ?.copyWith(color: Colors.red)
-                                      .toSoftBold(),
+                                      .toSoftBold
+                                      .toMinus,
                                  maxLines: 1,
                                  overflow: TextOverflow.ellipsis,
                                );
--- a/lib/fragments/dashboard/network_speed.dart
+++ b/lib/fragments/dashboard/network_speed.dart
@@ -47,8 +47,8 @@ class _NetworkSpeedState extends State<NetworkSpeed> {
    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 +75,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,6 +111,7 @@ class _NetworkSpeedState extends State<NetworkSpeed> {
  @override
  Widget build(BuildContext context) {
    return CommonCard(
+      onPressed: () {},
      info: Info(
        label: appLocalizations.networkSpeed,
        iconData: Icons.speed,
--- a/lib/fragments/dashboard/outbound_mode.dart
+++ b/lib/fragments/dashboard/outbound_mode.dart
@@ -33,6 +33,7 @@ class OutboundMode extends StatelessWidget {
      selector: (_, clashConfig) => clashConfig.mode,
      builder: (_, mode, __) {
        return CommonCard(
+          onPressed: () {},
          info: Info(
            label: appLocalizations.outboundMode,
            iconData: Icons.call_split,
@@ -67,7 +68,7 @@ class OutboundMode extends StatelessWidget {
                          .of(context)
                          .textTheme
                          .titleMedium
-                          ?.toSoftBold(),
+                          ?.toSoftBold,
                    ),
                  ),
              ],
--- a/lib/fragments/dashboard/start_button.dart
+++ b/lib/fragments/dashboard/start_button.dart
@@ -13,19 +13,17 @@ class StartButton extends StatefulWidget {

 class _StartButtonState extends State<StartButton>
    with SingleTickerProviderStateMixin {
-  bool isStart = false;
-  bool isInit = false;
  late AnimationController _controller;
+  bool isStart = false;

  @override
  void initState() {
-    isStart = globalState.appController.appState.isStart;
+    super.initState();
    _controller = AnimationController(
      vsync: this,
-      value: isStart ? 1 : 0,
+      value: 0,
      duration: const Duration(milliseconds: 200),
    );
-    super.initState();
  }

  @override
@@ -35,9 +33,12 @@ class _StartButtonState extends State<StartButton>
  }

  handleSwitchStart() {
-    isStart = !isStart;
-    updateController();
-    updateSystemProxy();
+    final appController = globalState.appController;
+    if (isStart == appController.appState.isStart) {
+      isStart = !isStart;
+      updateController();
+      appController.updateSystemProxy(isStart);
+    }
  }

  updateController() {
@@ -48,11 +49,18 @@ class _StartButtonState extends State<StartButton>
    }
  }

-  updateSystemProxy() {
-    WidgetsBinding.instance.addPostFrameCallback((_) async {
-      final appController = globalState.appController;
-      await appController.updateSystemProxy(isStart);
-    });
+  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,
+    );
  }

  @override
@@ -72,8 +80,7 @@ class _StartButtonState extends State<StartButton>
                    other.getTimeDifference(
                      DateTime.now(),
                    ),
-                    style:
-                        Theme.of(context).textTheme.titleMedium?.toSoftBold(),
+                    style: Theme.of(context).textTheme.titleMedium?.toSoftBold,
                  ),
                )
                .width +
@@ -119,24 +126,14 @@ class _StartButtonState extends State<StartButton>
          child: child,
        );
      },
-      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?>(
+      child: _updateControllerContainer(
+        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,
            );
          },
        ),
--- a/lib/fragments/dashboard/traffic_usage.dart
+++ b/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,6 +51,7 @@ class TrafficUsage extends StatelessWidget {
  @override
  Widget build(BuildContext context) {
    return CommonCard(
+      onPressed: () {},
      info: Info(
        label: appLocalizations.trafficUsage,
        iconData: Icons.data_saver_off,
--- a/lib/fragments/profiles/add_profile.dart
+++ b/lib/fragments/profiles/add_profile.dart
@@ -25,7 +25,9 @@ class AddProfile extends StatelessWidget {
    final url = await Navigator.of(context)
        .push<String>(MaterialPageRoute(builder: (_) => const ScanPage()));
    if (url != null) {
-      _handleAddProfileFormURL(url);
+      WidgetsBinding.instance.addPostFrameCallback((_){
+        _handleAddProfileFormURL(url);
+      });
    }
  }

@@ -91,7 +93,8 @@ class _URLFormDialogState extends State<URLFormDialog> {
          runSpacing: 16,
          children: [
            TextField(
-              maxLines: null,
+              maxLines: 5,
+              minLines: 1,
              controller: urlController,
              decoration: InputDecoration(
                border: const OutlineInputBorder(),
--- a/lib/fragments/profiles/edit_profile.dart
+++ b/lib/fragments/profiles/edit_profile.dart
@@ -94,7 +94,8 @@ class _EditProfileState extends State<EditProfile> {
        ListItem(
          title: TextFormField(
            controller: urlController,
-            maxLines: null,
+            maxLines: 5,
+            minLines: 1,
            decoration: InputDecoration(
              border: const OutlineInputBorder(),
              labelText: appLocalizations.url,
--- a/lib/fragments/profiles/profiles.dart
+++ b/lib/fragments/profiles/profiles.dart
@@ -3,6 +3,7 @@ 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/plugins/app.dart';
 import 'package:fl_clash/state.dart';
 import 'package:fl_clash/widgets/widgets.dart';
 import 'package:flutter/material.dart';
@@ -28,6 +29,7 @@ class ProfilesFragment extends StatefulWidget {

 class _ProfilesFragmentState extends State<ProfilesFragment> {
  final hasPadding = ValueNotifier<bool>(false);
+  Function? applyConfigDebounce;

  List<GlobalObjectKey<_ProfileItemState>> profileItemKeys = [];

@@ -55,7 +57,7 @@ class _ProfilesFragmentState extends State<ProfilesFragment> {
  _updateProfiles() async {
    final updateProfiles = profileItemKeys.map<Future>(
        (key) async => await key.currentState?.updateProfile(false));
-    final result = await Future.wait(updateProfiles);
+    await Future.wait(updateProfiles);
  }

  _initScaffoldState() {
@@ -86,12 +88,30 @@ class _ProfilesFragmentState extends State<ProfilesFragment> {
    );
  }

+  @override
+  void initState() {
+    super.initState();
+  }
+
  @override
  void dispose() {
    super.dispose();
    hasPadding.dispose();
  }

+  _changeProfile(String? id) async {
+    final appController = globalState.appController;
+    final config = appController.config;
+    if (id == config.currentProfileId) return;
+    config.currentProfileId = id;
+    applyConfigDebounce ??= debounce<Function()>(() async {
+      await appController.applyProfile();
+      appController.appState.delayMap = {};
+      appController.saveConfigPreferences();
+    });
+    applyConfigDebounce!();
+  }
+
  @override
  Widget build(BuildContext context) {
    return Selector<AppState, bool>(
@@ -154,8 +174,7 @@ class _ProfilesFragmentState extends State<ProfilesFragment> {
                              key: profileItemKeys[i],
                              profile: state.profiles[i],
                              groupValue: state.currentProfileId,
-                              onChanged:
-                                  globalState.appController.changeProfile,
+                              onChanged: _changeProfile,
                            ),
                          ),
                      ],
@@ -253,7 +272,7 @@ class _ProfileItemState extends State<ProfileItem> {
              ),
              Text(
                profile.lastUpdateDate?.lastUpdateTimeDesc ?? '',
-                style: textTheme.labelMedium?.toLight(),
+                style: textTheme.labelMedium?.toLight,
              ),
            ],
          ),
@@ -284,7 +303,7 @@ class _ProfileItemState extends State<ProfileItem> {
                ),
                Text(
                  "$useShow / $totalShow",
-                  style: textTheme.labelMedium?.toLight(),
+                  style: textTheme.labelMedium?.toLight,
                ),
                const SizedBox(
                  height: 2,
@@ -293,14 +312,14 @@ class _ProfileItemState extends State<ProfileItem> {
                  children: [
                    Text(
                      appLocalizations.expirationTime,
-                      style: textTheme.labelMedium?.toLighter(),
+                      style: textTheme.labelMedium?.toLighter,
                    ),
                    const SizedBox(
                      width: 4,
                    ),
                    Text(
                      expireShow,
-                      style: textTheme.labelMedium?.toLighter(),
+                      style: textTheme.labelMedium?.toLighter,
                    ),
                  ],
                )
@@ -437,16 +456,16 @@ class _ProfileItemState extends State<ProfileItem> {
                                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,
                            ),
-                            CommonPopupMenuItem(
-                              action: ProfileActions.view,
-                              label: "查看",
-                              iconData: Icons.visibility,
-                            ),
                          ],
                          onSelected: (ProfileActions? action) async {
                            switch (action) {
--- a/lib/fragments/proxies.dart
+++ b/lib/fragments/proxies.dart
--- a/lib/fragments/requests.dart
+++ b/lib/fragments/requests.dart
@@ -193,7 +193,7 @@ class RequestItem extends StatelessWidget {
  }

  String _getRequestText(Metadata metadata) {
-    var text = "${metadata.network}:://";
+    var text = "${metadata.network}://";
    final ips = [
      metadata.host,
      metadata.destinationIP,
--- a/lib/l10n/arb/intl_en.arb
+++ b/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,20 +161,19 @@
  "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",
@@ -187,8 +186,8 @@
  "connections": "Connections",
  "connectionsDesc": "View current connection",
  "nullRequestsDesc": "No requests",
-  "nullConnectionsDesc": "No Connections",
-  "intranetIp": "Intranet IP",
+  "nullConnectionsDesc": "No connections",
+  "intranetIP": "Intranet IP",
  "view": "View",
  "cut": "Cut",
  "copy": "Copy",
--- a/lib/l10n/arb/intl_zh_CN.arb
+++ b/lib/l10n/arb/intl_zh_CN.arb
@@ -111,7 +111,7 @@
  "noMoreInfoDesc": "暂无更多信息",
  "profileParseErrorDesc": "配置文件解析错误",
  "proxyPort": "代理端口",
-  "proxyPortDesc": "设置clash监听端口",
+  "proxyPortDesc": "设置Clash监听端口",
  "port": "端口",
  "logLevel": "日志等级",
  "show": "显示",
@@ -161,20 +161,19 @@
  "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": "请求",
@@ -188,7 +187,7 @@
  "connectionsDesc": "查看当前连接",
  "nullRequestsDesc": "暂无请求",
  "nullConnectionsDesc": "暂无连接",
-  "intranetIp": "内网 IP",
+  "intranetIP": "内网 IP",
  "view": "查看",
  "cut": "剪切",
  "copy": "复制",
--- a/lib/l10n/intl/messages_en.dart
+++ b/lib/l10n/intl/messages_en.dart
@@ -127,7 +127,7 @@ class MessageLookup extends MessageLookupByLibrary {
        "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"),
@@ -152,11 +152,9 @@ class MessageLookup extends MessageLookupByLibrary {
        "infiniteTime":
            MessageLookupByLibrary.simpleMessage("Long term effective"),
        "init": MessageLookupByLibrary.simpleMessage("Init"),
-        "intranetIp": MessageLookupByLibrary.simpleMessage("Intranet IP"),
-        "ipCheckTimeout":
-            MessageLookupByLibrary.simpleMessage("Ip check timeout"),
+        "intranetIP": MessageLookupByLibrary.simpleMessage("Intranet IP"),
        "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"),
@@ -186,7 +184,7 @@ class MessageLookup extends MessageLookupByLibrary {
        "notSelectedTip": MessageLookupByLibrary.simpleMessage(
            "The current proxy group cannot be selected."),
        "nullConnectionsDesc":
-            MessageLookupByLibrary.simpleMessage("No Connections"),
+            MessageLookupByLibrary.simpleMessage("No connections"),
        "nullCoreInfoDesc":
            MessageLookupByLibrary.simpleMessage("Unable to obtain core info"),
        "nullLogsDesc": MessageLookupByLibrary.simpleMessage("No logs"),
@@ -230,7 +228,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"),
@@ -268,9 +266,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(
--- a/lib/l10n/intl/messages_zh_CN.dart
+++ b/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("局域网代理"),
@@ -104,7 +104,7 @@ class MessageLookup extends MessageLookupByLibrary {
        "expirationTime": MessageLookupByLibrary.simpleMessage("到期时间"),
        "externalController": MessageLookupByLibrary.simpleMessage("外部控制器"),
        "externalControllerDesc":
-            MessageLookupByLibrary.simpleMessage("开启后将可以通过9090端口控制clash内核"),
+            MessageLookupByLibrary.simpleMessage("开启后将可以通过9090端口控制Clash内核"),
        "externalResources": MessageLookupByLibrary.simpleMessage("外部资源"),
        "file": MessageLookupByLibrary.simpleMessage("文件"),
        "fileDesc": MessageLookupByLibrary.simpleMessage("直接上传配置文件"),
@@ -123,9 +123,8 @@ class MessageLookup extends MessageLookupByLibrary {
        "importFromURL": MessageLookupByLibrary.simpleMessage("从URL导入"),
        "infiniteTime": MessageLookupByLibrary.simpleMessage("长期有效"),
        "init": MessageLookupByLibrary.simpleMessage("初始化"),
-        "intranetIp": MessageLookupByLibrary.simpleMessage("内网 IP"),
-        "ipCheckTimeout": MessageLookupByLibrary.simpleMessage("Ip检测超时"),
-        "ipv6Desc": MessageLookupByLibrary.simpleMessage("开启后将可以接收ipv6流量"),
+        "intranetIP": MessageLookupByLibrary.simpleMessage("内网 IP"),
+        "ipv6Desc": MessageLookupByLibrary.simpleMessage("开启后将可以接收IPv6流量"),
        "just": MessageLookupByLibrary.simpleMessage("刚刚"),
        "language": MessageLookupByLibrary.simpleMessage("语言"),
        "light": MessageLookupByLibrary.simpleMessage("浅色"),
@@ -186,7 +185,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("恢复"),
@@ -217,7 +216,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("设置深色模式，调整色彩"),
--- a/lib/l10n/l10n.dart
+++ b/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,16 +1670,6 @@ 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(
@@ -1720,20 +1710,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: [],
@@ -1790,20 +1780,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: [],
@@ -1930,10 +1920,10 @@ class AppLocalizations {
    );
  }

-  /// `No Connections`
+  /// `No connections`
  String get nullConnectionsDesc {
    return Intl.message(
-      'No Connections',
+      'No connections',
      name: 'nullConnectionsDesc',
      desc: '',
      args: [],
@@ -1941,10 +1931,10 @@ class AppLocalizations {
  }

  /// `Intranet IP`
-  String get intranetIp {
+  String get intranetIP {
    return Intl.message(
      'Intranet IP',
-      name: 'intranetIp',
+      name: 'intranetIP',
      desc: '',
      args: [],
    );
--- a/lib/main.dart
+++ b/lib/main.dart
@@ -49,11 +49,15 @@ Future<void> vpnService() async {
    isCompatible: config.isCompatible,
    selectedMap: config.currentSelectedMap,
  );
-  clashMessage.addListener(ClashMessageListenerWithVpn(onTun: (String fd) {
-    proxyManager.setProtect(
-      int.parse(fd),
-    );
-  }));
+  clashMessage.addListener(
+    ClashMessageListenerWithVpn(
+      onTun: (String fd) async {
+        final fdInt = int.parse(fd);
+        await proxyManager.setProtect(fdInt);
+        clashCore.setFdMap(fdInt);
+      },
+    ),
+  );

  await globalState.init(
    appState: appState,
--- a/lib/models/app.dart
+++ b/lib/models/app.dart
@@ -123,9 +123,10 @@ class AppState with ChangeNotifier {
    final index = groups.indexWhere((element) => element.name == proxyName);
    if (index == -1) return proxyName;
    final group = groups[index];
-    return getRealProxyName(selectedMap.containsKey(proxyName)
-        ? selectedMap[proxyName]
-        : group.now);
+    return getRealProxyName((selectedMap.containsKey(proxyName)
+            ? selectedMap[proxyName]
+            : group.now)) ??
+        proxyName;
  }

  String? get showProxyName {
--- a/lib/models/clash_config.dart
+++ b/lib/models/clash_config.dart
@@ -1,5 +1,7 @@
 // ignore_for_file: invalid_annotation_target

+import 'dart:io';
+
 import 'package:fl_clash/common/common.dart';
 import 'package:fl_clash/common/constant.dart';
 import 'package:flutter/material.dart';
@@ -235,7 +237,12 @@ class ClashConfig extends ChangeNotifier {
    }
  }

-  Tun get tun => _tun;
+  Tun get tun {
+    if (Platform.isAndroid) {
+      return _tun.copyWith(enable: false);
+    }
+    return _tun;
+  }

  set tun(Tun value) {
    if (_tun != value) {
@@ -282,9 +289,4 @@ class ClashConfig extends ChangeNotifier {
  factory ClashConfig.fromJson(Map<String, dynamic> json) {
    return _$ClashConfigFromJson(json);
  }
-
-  @override
-  String toString() {
-    return 'ClashConfig{_mixedPort: $_mixedPort, _allowLan: $_allowLan, _mode: $_mode, _logLevel: $_logLevel, _tun: $_tun, _dns: $_dns, _rules: $_rules}';
-  }
 }
--- a/lib/models/config.dart
+++ b/lib/models/config.dart
@@ -1,5 +1,6 @@
 import 'dart:io';

+import 'package:collection/collection.dart';
 import 'package:flutter/material.dart';
 import 'package:freezed_annotation/freezed_annotation.dart';

@@ -56,6 +57,9 @@ class Config extends ChangeNotifier {
  bool _allowBypass;
  bool _systemProxy;
  DAV? _dav;
+  ProxiesType _proxiesType;
+  ProxyCardType _proxyCardType;
+  int _proxiesColumns;

  Config()
      : _profiles = [],
@@ -73,7 +77,10 @@ class Config extends ChangeNotifier {
        _systemProxy = true,
        _accessControl = const AccessControl(),
        _isAnimateToPage = true,
-        _allowBypass = true;
+        _allowBypass = true,
+        _proxyCardType = ProxyCardType.expand,
+        _proxiesType = ProxiesType.tab,
+        _proxiesColumns = 2;

  deleteProfileById(String id) {
    _profiles = profiles.where((element) => element.id != id).toList();
@@ -150,6 +157,19 @@ class Config extends ChangeNotifier {

  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) {
@@ -364,6 +384,36 @@ 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,
@@ -383,6 +433,7 @@ 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;
--- a/lib/models/generated/config.g.dart
+++ b/lib/models/generated/config.g.dart
@@ -34,7 +34,14 @@ 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;
+  ..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;

 Map<String, dynamic> _$ConfigToJson(Config instance) => <String, dynamic>{
      'profiles': instance.profiles,
@@ -56,6 +63,9 @@ 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 = {
@@ -70,6 +80,16 @@ 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']) ??
--- a/lib/models/generated/profile.freezed.dart
+++ b/lib/models/generated/profile.freezed.dart
@@ -222,6 +222,7 @@ mixin _$Profile {
  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)
@@ -242,7 +243,8 @@ abstract class $ProfileCopyWith<$Res> {
      Duration autoUpdateDuration,
      UserInfo? userInfo,
      bool autoUpdate,
-      Map<String, String> selectedMap});
+      Map<String, String> selectedMap,
+      Set<String> unfoldSet});

  $UserInfoCopyWith<$Res>? get userInfo;
 }
@@ -269,6 +271,7 @@ class _$ProfileCopyWithImpl<$Res, $Val extends Profile>
    Object? userInfo = freezed,
    Object? autoUpdate = null,
    Object? selectedMap = null,
+    Object? unfoldSet = null,
  }) {
    return _then(_value.copyWith(
      id: null == id
@@ -307,6 +310,10 @@ class _$ProfileCopyWithImpl<$Res, $Val extends Profile>
          ? _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);
  }

@@ -339,7 +346,8 @@ abstract class _$$ProfileImplCopyWith<$Res> implements $ProfileCopyWith<$Res> {
      Duration autoUpdateDuration,
      UserInfo? userInfo,
      bool autoUpdate,
-      Map<String, String> selectedMap});
+      Map<String, String> selectedMap,
+      Set<String> unfoldSet});

  @override
  $UserInfoCopyWith<$Res>? get userInfo;
@@ -365,6 +373,7 @@ class __$$ProfileImplCopyWithImpl<$Res>
    Object? userInfo = freezed,
    Object? autoUpdate = null,
    Object? selectedMap = null,
+    Object? unfoldSet = null,
  }) {
    return _then(_$ProfileImpl(
      id: null == id
@@ -403,6 +412,10 @@ class __$$ProfileImplCopyWithImpl<$Res>
          ? _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>,
    ));
  }
 }
@@ -419,8 +432,10 @@ class _$ProfileImpl implements _Profile {
      required this.autoUpdateDuration,
      this.userInfo,
      this.autoUpdate = true,
-      final Map<String, String> selectedMap = const {}})
-      : _selectedMap = selectedMap;
+      final Map<String, String> selectedMap = const {},
+      final Set<String> unfoldSet = const {}})
+      : _selectedMap = selectedMap,
+        _unfoldSet = unfoldSet;

  factory _$ProfileImpl.fromJson(Map<String, dynamic> json) =>
      _$$ProfileImplFromJson(json);
@@ -452,9 +467,18 @@ class _$ProfileImpl implements _Profile {
    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)';
+    return 'Profile(id: $id, label: $label, currentGroupName: $currentGroupName, url: $url, lastUpdateDate: $lastUpdateDate, autoUpdateDuration: $autoUpdateDuration, userInfo: $userInfo, autoUpdate: $autoUpdate, selectedMap: $selectedMap, unfoldSet: $unfoldSet)';
  }

  @override
@@ -476,7 +500,9 @@ class _$ProfileImpl implements _Profile {
            (identical(other.autoUpdate, autoUpdate) ||
                other.autoUpdate == autoUpdate) &&
            const DeepCollectionEquality()
-                .equals(other._selectedMap, _selectedMap));
+                .equals(other._selectedMap, _selectedMap) &&
+            const DeepCollectionEquality()
+                .equals(other._unfoldSet, _unfoldSet));
  }

  @JsonKey(ignore: true)
@@ -491,7 +517,8 @@ class _$ProfileImpl implements _Profile {
      autoUpdateDuration,
      userInfo,
      autoUpdate,
-      const DeepCollectionEquality().hash(_selectedMap));
+      const DeepCollectionEquality().hash(_selectedMap),
+      const DeepCollectionEquality().hash(_unfoldSet));

  @JsonKey(ignore: true)
  @override
@@ -517,7 +544,8 @@ abstract class _Profile implements Profile {
      required final Duration autoUpdateDuration,
      final UserInfo? userInfo,
      final bool autoUpdate,
-      final Map<String, String> selectedMap}) = _$ProfileImpl;
+      final Map<String, String> selectedMap,
+      final Set<String> unfoldSet}) = _$ProfileImpl;

  factory _Profile.fromJson(Map<String, dynamic> json) = _$ProfileImpl.fromJson;

@@ -540,6 +568,8 @@ abstract class _Profile implements Profile {
  @override
  Map<String, String> get selectedMap;
  @override
+  Set<String> get unfoldSet;
+  @override
  @JsonKey(ignore: true)
  _$$ProfileImplCopyWith<_$ProfileImpl> get copyWith =>
      throw _privateConstructorUsedError;
--- a/lib/models/generated/profile.g.dart
+++ b/lib/models/generated/profile.g.dart
@@ -41,6 +41,10 @@ _$ProfileImpl _$$ProfileImplFromJson(Map<String, dynamic> json) =>
            (k, e) => MapEntry(k, e as String),
          ) ??
          const {},
+      unfoldSet: (json['unfoldSet'] as List<dynamic>?)
+              ?.map((e) => e as String)
+              .toSet() ??
+          const {},
    );

 Map<String, dynamic> _$$ProfileImplToJson(_$ProfileImpl instance) =>
@@ -54,4 +58,5 @@ Map<String, dynamic> _$$ProfileImplToJson(_$ProfileImpl instance) =>
      'userInfo': instance.userInfo,
      'autoUpdate': instance.autoUpdate,
      'selectedMap': instance.selectedMap,
+      'unfoldSet': instance.unfoldSet.toList(),
    };
--- a/lib/models/generated/selector.freezed.dart
+++ b/lib/models/generated/selector.freezed.dart
@@ -1730,39 +1730,37 @@ abstract class _ProxiesSelectorState implements ProxiesSelectorState {
 }

 /// @nodoc
-mixin _$ProxiesTabViewSelectorState {
+mixin _$ProxyGroupSelectorState {
  ProxiesSortType get proxiesSortType => throw _privateConstructorUsedError;
+  ProxyCardType get proxyCardType => throw _privateConstructorUsedError;
  num get sortNum => throw _privateConstructorUsedError;
-  Group get group => throw _privateConstructorUsedError;
-  ViewMode get viewMode => throw _privateConstructorUsedError;
+  List<Proxy> get proxies => throw _privateConstructorUsedError;
+  int get columns => throw _privateConstructorUsedError;

  @JsonKey(ignore: true)
-  $ProxiesTabViewSelectorStateCopyWith<ProxiesTabViewSelectorState>
-      get copyWith => throw _privateConstructorUsedError;
+  $ProxyGroupSelectorStateCopyWith<ProxyGroupSelectorState> get copyWith =>
+      throw _privateConstructorUsedError;
 }

 /// @nodoc
-abstract class $ProxiesTabViewSelectorStateCopyWith<$Res> {
-  factory $ProxiesTabViewSelectorStateCopyWith(
-          ProxiesTabViewSelectorState value,
-          $Res Function(ProxiesTabViewSelectorState) then) =
-      _$ProxiesTabViewSelectorStateCopyWithImpl<$Res,
-          ProxiesTabViewSelectorState>;
+abstract class $ProxyGroupSelectorStateCopyWith<$Res> {
+  factory $ProxyGroupSelectorStateCopyWith(ProxyGroupSelectorState value,
+          $Res Function(ProxyGroupSelectorState) then) =
+      _$ProxyGroupSelectorStateCopyWithImpl<$Res, ProxyGroupSelectorState>;
  @useResult
  $Res call(
      {ProxiesSortType proxiesSortType,
+      ProxyCardType proxyCardType,
      num sortNum,
-      Group group,
-      ViewMode viewMode});
-
-  $GroupCopyWith<$Res> get group;
+      List<Proxy> proxies,
+      int columns});
 }

 /// @nodoc
-class _$ProxiesTabViewSelectorStateCopyWithImpl<$Res,
-        $Val extends ProxiesTabViewSelectorState>
-    implements $ProxiesTabViewSelectorStateCopyWith<$Res> {
-  _$ProxiesTabViewSelectorStateCopyWithImpl(this._value, this._then);
+class _$ProxyGroupSelectorStateCopyWithImpl<$Res,
+        $Val extends ProxyGroupSelectorState>
+    implements $ProxyGroupSelectorStateCopyWith<$Res> {
+  _$ProxyGroupSelectorStateCopyWithImpl(this._value, this._then);

  // ignore: unused_field
  final $Val _value;
@@ -1773,165 +1771,177 @@ class _$ProxiesTabViewSelectorStateCopyWithImpl<$Res,
  @override
  $Res call({
    Object? proxiesSortType = null,
+    Object? proxyCardType = null,
    Object? sortNum = null,
-    Object? group = null,
-    Object? viewMode = null,
+    Object? proxies = null,
+    Object? columns = 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,
-      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,
+      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,
    ) 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 _$$ProxiesTabViewSelectorStateImplCopyWith<$Res>
-    implements $ProxiesTabViewSelectorStateCopyWith<$Res> {
-  factory _$$ProxiesTabViewSelectorStateImplCopyWith(
-          _$ProxiesTabViewSelectorStateImpl value,
-          $Res Function(_$ProxiesTabViewSelectorStateImpl) then) =
-      __$$ProxiesTabViewSelectorStateImplCopyWithImpl<$Res>;
+abstract class _$$ProxyGroupSelectorStateImplCopyWith<$Res>
+    implements $ProxyGroupSelectorStateCopyWith<$Res> {
+  factory _$$ProxyGroupSelectorStateImplCopyWith(
+          _$ProxyGroupSelectorStateImpl value,
+          $Res Function(_$ProxyGroupSelectorStateImpl) then) =
+      __$$ProxyGroupSelectorStateImplCopyWithImpl<$Res>;
  @override
  @useResult
  $Res call(
      {ProxiesSortType proxiesSortType,
+      ProxyCardType proxyCardType,
      num sortNum,
-      Group group,
-      ViewMode viewMode});
-
-  @override
-  $GroupCopyWith<$Res> get group;
+      List<Proxy> proxies,
+      int columns});
 }

 /// @nodoc
-class __$$ProxiesTabViewSelectorStateImplCopyWithImpl<$Res>
-    extends _$ProxiesTabViewSelectorStateCopyWithImpl<$Res,
-        _$ProxiesTabViewSelectorStateImpl>
-    implements _$$ProxiesTabViewSelectorStateImplCopyWith<$Res> {
-  __$$ProxiesTabViewSelectorStateImplCopyWithImpl(
-      _$ProxiesTabViewSelectorStateImpl _value,
-      $Res Function(_$ProxiesTabViewSelectorStateImpl) _then)
+class __$$ProxyGroupSelectorStateImplCopyWithImpl<$Res>
+    extends _$ProxyGroupSelectorStateCopyWithImpl<$Res,
+        _$ProxyGroupSelectorStateImpl>
+    implements _$$ProxyGroupSelectorStateImplCopyWith<$Res> {
+  __$$ProxyGroupSelectorStateImplCopyWithImpl(
+      _$ProxyGroupSelectorStateImpl _value,
+      $Res Function(_$ProxyGroupSelectorStateImpl) _then)
      : super(_value, _then);

  @pragma('vm:prefer-inline')
  @override
  $Res call({
    Object? proxiesSortType = null,
+    Object? proxyCardType = null,
    Object? sortNum = null,
-    Object? group = null,
-    Object? viewMode = null,
+    Object? proxies = null,
+    Object? columns = null,
  }) {
-    return _then(_$ProxiesTabViewSelectorStateImpl(
+    return _then(_$ProxyGroupSelectorStateImpl(
      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,
-      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,
+      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,
    ));
  }
 }

 /// @nodoc

-class _$ProxiesTabViewSelectorStateImpl
-    implements _ProxiesTabViewSelectorState {
-  const _$ProxiesTabViewSelectorStateImpl(
+class _$ProxyGroupSelectorStateImpl implements _ProxyGroupSelectorState {
+  const _$ProxyGroupSelectorStateImpl(
      {required this.proxiesSortType,
+      required this.proxyCardType,
      required this.sortNum,
-      required this.group,
-      required this.viewMode});
+      required final List<Proxy> proxies,
+      required this.columns})
+      : _proxies = proxies;

  @override
  final ProxiesSortType proxiesSortType;
  @override
+  final ProxyCardType proxyCardType;
+  @override
  final num sortNum;
+  final List<Proxy> _proxies;
  @override
-  final Group group;
+  List<Proxy> get proxies {
+    if (_proxies is EqualUnmodifiableListView) return _proxies;
+    // ignore: implicit_dynamic_type
+    return EqualUnmodifiableListView(_proxies);
+  }
+
  @override
-  final ViewMode viewMode;
+  final int columns;

  @override
  String toString() {
-    return 'ProxiesTabViewSelectorState(proxiesSortType: $proxiesSortType, sortNum: $sortNum, group: $group, viewMode: $viewMode)';
+    return 'ProxyGroupSelectorState(proxiesSortType: $proxiesSortType, proxyCardType: $proxyCardType, sortNum: $sortNum, proxies: $proxies, columns: $columns)';
  }

  @override
  bool operator ==(Object other) {
    return identical(this, other) ||
        (other.runtimeType == runtimeType &&
-            other is _$ProxiesTabViewSelectorStateImpl &&
+            other is _$ProxyGroupSelectorStateImpl &&
            (identical(other.proxiesSortType, proxiesSortType) ||
                other.proxiesSortType == proxiesSortType) &&
+            (identical(other.proxyCardType, proxyCardType) ||
+                other.proxyCardType == proxyCardType) &&
            (identical(other.sortNum, sortNum) || other.sortNum == sortNum) &&
-            (identical(other.group, group) || other.group == group) &&
-            (identical(other.viewMode, viewMode) ||
-                other.viewMode == viewMode));
+            const DeepCollectionEquality().equals(other._proxies, _proxies) &&
+            (identical(other.columns, columns) || other.columns == columns));
  }

  @override
-  int get hashCode =>
-      Object.hash(runtimeType, proxiesSortType, sortNum, group, viewMode);
+  int get hashCode => Object.hash(runtimeType, proxiesSortType, proxyCardType,
+      sortNum, const DeepCollectionEquality().hash(_proxies), columns);

  @JsonKey(ignore: true)
  @override
  @pragma('vm:prefer-inline')
-  _$$ProxiesTabViewSelectorStateImplCopyWith<_$ProxiesTabViewSelectorStateImpl>
-      get copyWith => __$$ProxiesTabViewSelectorStateImplCopyWithImpl<
-          _$ProxiesTabViewSelectorStateImpl>(this, _$identity);
+  _$$ProxyGroupSelectorStateImplCopyWith<_$ProxyGroupSelectorStateImpl>
+      get copyWith => __$$ProxyGroupSelectorStateImplCopyWithImpl<
+          _$ProxyGroupSelectorStateImpl>(this, _$identity);
 }

-abstract class _ProxiesTabViewSelectorState
-    implements ProxiesTabViewSelectorState {
-  const factory _ProxiesTabViewSelectorState(
+abstract class _ProxyGroupSelectorState implements ProxyGroupSelectorState {
+  const factory _ProxyGroupSelectorState(
      {required final ProxiesSortType proxiesSortType,
+      required final ProxyCardType proxyCardType,
      required final num sortNum,
-      required final Group group,
-      required final ViewMode viewMode}) = _$ProxiesTabViewSelectorStateImpl;
+      required final List<Proxy> proxies,
+      required final int columns}) = _$ProxyGroupSelectorStateImpl;

  @override
  ProxiesSortType get proxiesSortType;
  @override
+  ProxyCardType get proxyCardType;
+  @override
  num get sortNum;
  @override
-  Group get group;
+  List<Proxy> get proxies;
  @override
-  ViewMode get viewMode;
+  int get columns;
  @override
  @JsonKey(ignore: true)
-  _$$ProxiesTabViewSelectorStateImplCopyWith<_$ProxiesTabViewSelectorStateImpl>
+  _$$ProxyGroupSelectorStateImplCopyWith<_$ProxyGroupSelectorStateImpl>
      get copyWith => throw _privateConstructorUsedError;
 }

--- a/lib/models/profile.dart
+++ b/lib/models/profile.dart
@@ -54,6 +54,7 @@ class Profile with _$Profile {
    UserInfo? userInfo,
    @Default(true) bool autoUpdate,
    @Default({}) SelectedMap selectedMap,
+    @Default({}) Set<String> unfoldSet,
  }) = _Profile;

  factory Profile.fromJson(Map<String, Object?> json) =>
--- a/lib/models/selector.dart
+++ b/lib/models/selector.dart
@@ -99,13 +99,14 @@ class ProxiesSelectorState with _$ProxiesSelectorState {
 }

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

@freezed
--- a/lib/state.dart
+++ b/lib/state.dart
@@ -4,6 +4,7 @@ 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';

@@ -42,13 +43,14 @@ class GlobalState {
  }) async {
    final profilePath = await appPath.getProfilePath(config.currentProfileId);
    await config.currentProfile?.checkAndUpdate();
-    debugPrint("update config");
-    final res = await clashCore.updateConfig(UpdateConfigParams(
-      profilePath: profilePath,
-      config: clashConfig,
-      isPatch: isPatch,
-      isCompatible: config.isCompatible,
-    ));
+    final res = await clashCore.updateConfig(
+      UpdateConfigParams(
+        profilePath: profilePath,
+        config: clashConfig,
+        isPatch: isPatch,
+        isCompatible: config.isCompatible,
+      ),
+    );
    if (res.isNotEmpty) throw res;
  }

@@ -261,6 +263,18 @@ 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();
--- a/lib/widgets/card.dart
+++ b/lib/widgets/card.dart
@@ -1,4 +1,5 @@
 import 'package:fl_clash/common/common.dart';
+import 'package:fl_clash/enum/enum.dart';
 import 'package:flutter/material.dart';

 import 'text.dart';
@@ -54,6 +55,7 @@ class CommonCard extends StatelessWidget {
  const CommonCard({
    super.key,
    bool? isSelected,
+    this.type = CommonCardType.plain,
    this.onPressed,
    this.info,
    this.selectWidget,
@@ -65,10 +67,14 @@ 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;
-    var hoverColor = isSelected
+    final hoverColor = isSelected
        ? colorScheme.primary.toLight()
        : colorScheme.primary.toLighter();
    if (states.contains(WidgetState.hovered) ||
@@ -86,17 +92,28 @@ class CommonCard extends StatelessWidget {

  Color? getBackgroundColor(BuildContext context, Set<WidgetState> states) {
    final colorScheme = Theme.of(context).colorScheme;
-    if (isSelected) {
-      return colorScheme.secondaryContainer;
+    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 (states.isEmpty) {
-      return colorScheme.secondaryContainer.toLittle();
-    }
-    return Theme.of(context)
-        .outlinedButtonTheme
-        .style
-        ?.backgroundColor
-        ?.resolve(states);
  }

  @override
@@ -136,11 +153,7 @@ class CommonCard extends StatelessWidget {
          (states) => getBorderSide(context, states),
        ),
      ),
-      onPressed: () {
-        if (onPressed != null) {
-          onPressed!();
-        }
-      },
+      onPressed: onPressed,
      child: Builder(
        builder: (_) {
          List<Widget> children = [];
--- a/lib/widgets/chip.dart
+++ b/lib/widgets/chip.dart
@@ -17,12 +17,17 @@ class CommonChip extends StatelessWidget {

  @override
  Widget build(BuildContext context) {
-    if(type == ChipType.delete){
+    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)),
+        side:
+            BorderSide(color: Theme.of(context).dividerColor.withOpacity(0.2)),
        labelStyle: Theme.of(context).textTheme.bodyMedium,
        label: Text(label),
      );
@@ -30,6 +35,10 @@ class CommonChip extends StatelessWidget {
    return ActionChip(
      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,
--- a/lib/widgets/clash_message_container.dart
+++ b/lib/widgets/clash_message_container.dart
@@ -51,8 +51,10 @@ class _ClashMessageContainerState extends State<ClashMessageContainer>
  }

  @override
-  void onTun(String fd) {
-    proxyManager.setProtect(int.parse(fd));
+  Future<void> onTun(String fd) async {
+    final fdInt = int.parse(fd);
+    await proxyManager.setProtect(fdInt);
+    clashCore.setFdMap(fdInt);
    super.onTun(fd);
  }

@@ -73,10 +75,4 @@ class _ClashMessageContainerState extends State<ClashMessageContainer>
    globalState.appController.appState.addRequest(connection);
    super.onRequest(connection);
  }
-
-  @override
-  void onRun(String runTime) async {
-    // proxy?.updateStartTime();
-    super.onRun(runTime);
-  }
 }
--- a/lib/widgets/null_status.dart
+++ b/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,
      ),
    );
  }
--- a/pubspec.yaml
+++ b/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.26
+version: 0.8.33+202407012
 environment:
  sdk: '>=3.1.0 <4.0.0'
Author	SHA1	Message	Date
chen08209	6dcb466fd3	Fix android proxy error	2024-07-01 20:57:24 +08:00
chen08209	acbcec358b	Fix submit error	2024-07-01 19:51:11 +08:00
chen08209	a923549ddf	Add windows tun Optimize android proxy Optimize change profile Update application ua Optimize delay test	2024-07-01 19:41:57 +08:00
chen08209	07bd21580b	Fix android repeated request notification issues	2024-06-28 21:16:47 +08:00
chen08209	57ceb64a5e	Fix memory overflow issues	2024-06-28 07:49:06 +08:00
chen08209	713e83d9d8	Optimize proxies expansion panel 2 Fix android scan qrcode error	2024-06-27 19:39:49 +08:00
chen08209	5e3b0e4929	Optimize proxies expansion panel Fix text error	2024-06-27 15:54:10 +08:00
chen08209	0389b6eb29	Optimize proxy Optimize delayed sorting performance Add expansion panel proxies page Support to adjust the proxy card size Support to adjust proxies columns number	2024-06-26 16:04:30 +08:00
chen08209	8f22cbf746	Fix autoRun show issues Fix Android 10 issues Optimize ip show	2024-06-23 03:07:52 +08:00