Fix quickStart change proxy error

cache
Fix core version
2024-06-05 17:59:21 +08:00 · 2024-06-05 16:19:23 +08:00 · 2024-06-05 14:29:38 +08:00 · 2024-06-05 14:13:04 +08:00 · 2024-06-05 13:42:33 +08:00 · 2024-06-03 14:46:16 +08:00
72 changed files with 1101 additions and 1905 deletions
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -21,12 +21,6 @@ jobs:
            os: macos-13

    steps:
-      - name: Check Matrix
-        run: |
-            echo "Running on ${{ matrix.os }}"
-            echo "Arch: ${{ runner.arch }}"
-            gcc --version
-
      - name: Checkout
        uses: actions/checkout@v4
        with:
@@ -88,7 +82,6 @@ jobs:


  upload-release:
-    if: ${{ !contains(github.ref, '+') }}
    permissions: write-all
    needs: [ build ]
    runs-on: ubuntu-latest
--- a/.gitignore
+++ b/.gitignore
@@ -31,7 +31,6 @@ migrate_working_dir/
 .pub-cache/
 .pub/
 /build/
-/dist/

 # Symbolication related
 app.*.symbols
@@ -45,7 +44,6 @@ app.*.map.json
 /android/app/release


-
 #libclash
 /libclash/

--- a/.gitmodules
+++ b/.gitmodules
@@ -5,4 +5,4 @@
 [submodule "plugins/flutter_distributor"]
 	path = plugins/flutter_distributor
 	url = git@github.com:chen08209/flutter_distributor.git
-	branch = FlClash
+	branch = main
--- a/README.md
+++ b/README.md
@@ -34,8 +34,6 @@ on Mobile:

 💡 Based on Material You Design, [Surfboard](https://github.com/getsurfboard/surfboard)-like UI

-☁️ Supports data sync via WebDAV
-
 ✨ Support subscription link, Dark mode

 ## Contact
--- a/README_zh_CN.md
+++ b/README_zh_CN.md
@@ -34,8 +34,6 @@ on Mobile:

 💡 基本 Material You 设计, 类[Surfboard](https://github.com/getsurfboard/surfboard)用户界面

-☁️ 支持通过WebDAV同步数据
-
 ✨ 支持一键导入订阅, 深色模式

 ## Contact
--- a/android/app/build.gradle
+++ b/android/app/build.gradle
@@ -62,7 +62,7 @@ android {

    defaultConfig {
        applicationId "com.follow.clash"
-        minSdkVersion 24
+        minSdkVersion 21
        targetSdkVersion 34
        versionCode flutterVersionCode.toInteger()
        versionName flutterVersionName
--- a/android/app/src/main/AndroidManifest.xml
+++ b/android/app/src/main/AndroidManifest.xml
@@ -1,6 +1,9 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
    xmlns:tools="http://schemas.android.com/tools">

+    <uses-feature
+            android:name="android.software.leanback"
+            android:required="false" />
    <uses-feature
            android:name="android.hardware.touchscreen"
            android:required="false" />
@@ -14,15 +17,12 @@
    <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" />
    <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
    <uses-permission android:name="android.permission.CHANGE_NETWORK_STATE" />
-    <uses-permission android:name="android.permission.FOREGROUND_SERVICE_SPECIAL_USE"
-        tools:ignore="SystemPermissionTypo" />
-    <uses-permission android:name="android.permission.QUERY_ALL_PACKAGES"
-        tools:ignore="QueryAllPackagesPermission" />
+    <uses-permission android:name="android.permission.FOREGROUND_SERVICE_SPECIAL_USE" />
+    <uses-permission android:name="android.permission.QUERY_ALL_PACKAGES" tools:ignore="QueryAllPackagesPermission"/>

    <application
        android:name="${applicationName}"
        android:icon="@mipmap/ic_launcher"
-        android:extractNativeLibs="true"
        android:networkSecurityConfig="@xml/network_security_config"
        android:label="FlClash">
        <activity
@@ -73,8 +73,7 @@
        <service
            android:name=".services.FlClashTileService"
            android:exported="true"
-            android:icon="@drawable/icon"
-            android:foregroundServiceType="specialUse"
+            android:icon="@drawable/tile_icon"
            android:label="FlClash"
            android:permission="android.permission.BIND_QUICK_SETTINGS_TILE">
            <intent-filter>
--- a/android/app/src/main/kotlin/com/follow/clash/models/AccessControl.kt
+++ b/android/app/src/main/kotlin/com/follow/clash/models/AccessControl.kt
@@ -10,8 +10,3 @@ data class AccessControl(
    val acceptList: List<String>,
    val rejectList: List<String>,
 )
-
-data class Props (
-    val accessControl: AccessControl?,
-    val allowBypass: Boolean?,
-)
--- a/android/app/src/main/kotlin/com/follow/clash/plugins/ProxyPlugin.kt
+++ b/android/app/src/main/kotlin/com/follow/clash/plugins/ProxyPlugin.kt
@@ -17,7 +17,6 @@ import androidx.core.content.ContextCompat
 import com.follow.clash.GlobalState
 import com.follow.clash.RunState
 import com.follow.clash.models.AccessControl
-import com.follow.clash.models.Props
 import com.follow.clash.services.FlClashVpnService
 import com.google.gson.Gson
 import io.flutter.embedding.android.FlutterActivity
@@ -42,7 +41,7 @@ class ProxyPlugin : FlutterPlugin, MethodChannel.MethodCallHandler, ActivityAwar
    private var flClashVpnService: FlClashVpnService? = null
    private var isBound = false
    private var port: Int? = null
-    private var props: Props? = null
+    private var accessControl: AccessControl? = null
    private lateinit var title: String
    private lateinit var content: String

@@ -74,8 +73,8 @@ class ProxyPlugin : FlutterPlugin, MethodChannel.MethodCallHandler, ActivityAwar
        "StartProxy" -> {
            port = call.argument<Int>("port")
            val args = call.argument<String>("args")
-            props =
-                if (args != null) Gson().fromJson(args, Props::class.java) else null
+            accessControl =
+                if (args != null) Gson().fromJson(args, AccessControl::class.java) else null
            handleStartVpn()
            result.success(true)
        }
@@ -122,7 +121,7 @@ class ProxyPlugin : FlutterPlugin, MethodChannel.MethodCallHandler, ActivityAwar

    private fun startVpn(port: Int) {
        if (GlobalState.runState.value == RunState.START) return;
-        flClashVpnService?.start(port, props)
+        flClashVpnService?.start(port, accessControl)
        GlobalState.runState.value = RunState.START
        GlobalState.runTime = Date()
        startAfter()
--- a/android/app/src/main/kotlin/com/follow/clash/services/FlClashTileService.kt
+++ b/android/app/src/main/kotlin/com/follow/clash/services/FlClashTileService.kt
@@ -19,6 +19,7 @@ import io.flutter.embedding.engine.FlutterEngine
 import io.flutter.embedding.engine.dart.DartExecutor


+@RequiresApi(Build.VERSION_CODES.N)
 class FlClashTileService : TileService() {

    private val observer = Observer<RunState> { runState ->
@@ -42,27 +43,19 @@ class FlClashTileService : TileService() {
        GlobalState.runState.observeForever(observer)
    }

+    @SuppressLint("StartActivityAndCollapseDeprecated")
    private fun activityTransfer() {
        val intent = Intent(this, TempActivity::class.java)
        intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
-        val pendingIntent = if (Build.VERSION.SDK_INT >= 31) {
-            PendingIntent.getActivity(
+        if (Build.VERSION.SDK_INT >= 34) {
+            val pendingIntent = PendingIntent.getActivity(
                this,
                0,
                intent,
-                PendingIntent.FLAG_IMMUTABLE or PendingIntent.FLAG_UPDATE_CURRENT
+                PendingIntent.FLAG_IMMUTABLE
            )
-        } else {
-            PendingIntent.getActivity(
-                this,
-                0,
-                intent,
-                PendingIntent.FLAG_UPDATE_CURRENT
-            )
-        }
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.UPSIDE_DOWN_CAKE) {
            startActivityAndCollapse(pendingIntent)
-        }else{
+        } else {
            startActivityAndCollapse(intent)
        }
    }
--- a/android/app/src/main/kotlin/com/follow/clash/services/FlClashVpnService.kt
+++ b/android/app/src/main/kotlin/com/follow/clash/services/FlClashVpnService.kt
@@ -1,9 +1,10 @@
 package com.follow.clash.services

-import android.app.Notification.FOREGROUND_SERVICE_IMMEDIATE
+import android.annotation.SuppressLint
 import android.app.NotificationChannel
 import android.app.NotificationManager
 import android.app.PendingIntent
+import android.app.Service
 import android.content.Intent
 import android.content.pm.ServiceInfo.FOREGROUND_SERVICE_TYPE_SPECIAL_USE
 import android.net.ProxyInfo
@@ -12,14 +13,15 @@ import android.os.Binder
 import android.os.Build
 import android.os.IBinder
 import androidx.core.app.NotificationCompat
+import androidx.core.app.NotificationCompat.FOREGROUND_SERVICE_IMMEDIATE
+import androidx.core.graphics.drawable.IconCompat
 import com.follow.clash.GlobalState
 import com.follow.clash.MainActivity
-import com.follow.clash.R
 import com.follow.clash.models.AccessControl
 import com.follow.clash.models.AccessControlMode
-import com.follow.clash.models.Props


+@SuppressLint("WrongConstant")
 class FlClashVpnService : VpnService() {


@@ -52,12 +54,12 @@ class FlClashVpnService : VpnService() {
        return START_STICKY
    }

-    fun start(port: Int, props: Props?) {
+    fun start(port: Int, accessControl: AccessControl?) {
        fd = with(Builder()) {
            addAddress("172.16.0.1", 30)
            setMtu(9000)
            addRoute("0.0.0.0", 0)
-            props?.accessControl?.let { accessControl ->
+            if (accessControl != null) {
                when (accessControl.mode) {
                    AccessControlMode.acceptSelected -> {
                        (accessControl.acceptList + packageName).forEach {
@@ -78,9 +80,7 @@ class FlClashVpnService : VpnService() {
            if (Build.VERSION.SDK_INT >= 29) {
                setMetered(false)
            }
-            if (props?.allowBypass == true) {
-                allowBypass()
-            }
+            allowBypass()
            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) {
                setHttpProxy(
                    ProxyInfo.buildDirectProxy(
@@ -100,10 +100,10 @@ class FlClashVpnService : VpnService() {
    }


-    private val notificationBuilder: NotificationCompat.Builder by lazy {
+    private val notificationBuilder by lazy {
        val intent = Intent(this, MainActivity::class.java)

-        val pendingIntent = if (Build.VERSION.SDK_INT >= 31) {
+        val pendingIntent = if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
            PendingIntent.getActivity(
                this,
                0,
@@ -119,34 +119,34 @@ class FlClashVpnService : VpnService() {
            )
        }

+        val icon = IconCompat.createWithResource(this, this.applicationInfo.icon)
+
        with(NotificationCompat.Builder(this, CHANNEL)) {
-            setSmallIcon(R.drawable.ic_stat_name)
+            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
+                setSmallIcon(icon)
+            }
            setContentTitle("FlClash")
+            foregroundServiceBehavior = FOREGROUND_SERVICE_IMMEDIATE
            setContentIntent(pendingIntent)
            setCategory(NotificationCompat.CATEGORY_SERVICE)
-            priority = NotificationCompat.PRIORITY_MIN
-            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.S) {
-                foregroundServiceBehavior = FOREGROUND_SERVICE_IMMEDIATE
-            }
+            priority = NotificationCompat.PRIORITY_LOW
            setOngoing(true)
            setShowWhen(false)
            setOnlyAlertOnce(true)
-            setAutoCancel(true);
        }
    }

-
+    @SuppressLint("ForegroundServiceType", "WrongConstant")
    fun startForeground(title: String, content: String) {
        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
            val channel =
                NotificationChannel(CHANNEL, "FlClash", NotificationManager.IMPORTANCE_LOW)
            val manager = getSystemService(NotificationManager::class.java)
            manager.createNotificationChannel(channel)
-            channel.setShowBadge(false)
        }
        val notification =
            notificationBuilder.setContentTitle(title).setContentText(content).build()
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) {
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.UPSIDE_DOWN_CAKE) {
            startForeground(notificationId, notification, FOREGROUND_SERVICE_TYPE_SPECIAL_USE)
        } else {
            startForeground(notificationId, notification)
@@ -155,7 +155,7 @@ class FlClashVpnService : VpnService() {

    private fun stopForeground() {
        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) {
-            stopForeground(STOP_FOREGROUND_REMOVE)
+            stopForeground(Service.STOP_FOREGROUND_REMOVE)
        }
    }

--- a/android/app/src/main/res/drawable-hdpi/ic_stat_name.png
+++ b/android/app/src/main/res/drawable-hdpi/ic_stat_name.png
--- a/android/app/src/main/res/drawable-mdpi/ic_stat_name.png
+++ b/android/app/src/main/res/drawable-mdpi/ic_stat_name.png
--- a/android/app/src/main/res/drawable-xhdpi/ic_stat_name.png
+++ b/android/app/src/main/res/drawable-xhdpi/ic_stat_name.png
--- a/android/app/src/main/res/drawable-xxhdpi/ic_stat_name.png
+++ b/android/app/src/main/res/drawable-xxhdpi/ic_stat_name.png
--- a/android/app/src/main/res/drawable-xxxhdpi/ic_stat_name.png
+++ b/android/app/src/main/res/drawable-xxxhdpi/ic_stat_name.png
--- a/android/app/src/main/res/drawable/icon.png
+++ b/android/app/src/main/res/drawable/icon.png
--- a/android/app/src/main/res/drawable/tile_icon.png
+++ b/android/app/src/main/res/drawable/tile_icon.png
--- a/android/app/src/main/res/values-night/styles.xml
+++ b/android/app/src/main/res/values-night/styles.xml
@@ -4,6 +4,7 @@
    <style name="LaunchTheme" parent="@android:style/Theme.Black.NoTitleBar">
        <!-- Show a splash screen on the activity. Automatically removed when
             the Flutter engine draws its first frame -->
+        <item name="android:windowBackground">@mipmap/ic_launcher_foreground</item>
    </style>
    <!-- Theme applied to the Android Window as soon as the process has started.
         This theme determines the color of the Android Window while your
--- a/android/app/src/main/res/values/styles.xml
+++ b/android/app/src/main/res/values/styles.xml
@@ -4,6 +4,7 @@
    <style name="LaunchTheme" parent="@android:style/Theme.Light.NoTitleBar">
        <!-- Show a splash screen on the activity. Automatically removed when
             the Flutter engine draws its first frame -->
+        <item name="android:windowBackground">@mipmap/ic_launcher_foreground</item>
    </style>
    <!-- Theme applied to the Android Window as soon as the process has started.
         This theme determines the color of the Android Window while your
--- a/core/Clash.Meta
+++ b/core/Clash.Meta
--- a/core/common.go
+++ b/core/common.go
@@ -321,23 +321,20 @@ func generateProxyGroupAndRule(proxyGroup *[]map[string]any, rule *[]string) {
 }

 func overwriteConfig(targetConfig *config.RawConfig, patchConfig config.RawConfig, compatible bool) {
-	targetConfig.ExternalController = patchConfig.ExternalController
+	targetConfig.ExternalController = ""
 	targetConfig.ExternalUI = ""
 	targetConfig.Interface = ""
 	targetConfig.ExternalUIURL = ""
-	targetConfig.GeodataMode = false
-	targetConfig.IPv6 = patchConfig.IPv6
+	//targetConfig.IPv6 = patchConfig.IPv6
 	targetConfig.LogLevel = patchConfig.LogLevel
-	targetConfig.Port = 0
-	targetConfig.SocksPort = 0
-	targetConfig.MixedPort = patchConfig.MixedPort
 	targetConfig.FindProcessMode = process.FindProcessAlways
 	targetConfig.AllowLan = patchConfig.AllowLan
+	targetConfig.MixedPort = patchConfig.MixedPort
 	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 = "standard"
 	targetConfig.Profile.StoreSelected = false
 	if targetConfig.DNS.Enable == false {
@@ -353,6 +350,7 @@ func overwriteConfig(targetConfig *config.RawConfig, patchConfig config.RawConfi
 		targetConfig.RuleProvider = make(map[string]map[string]any)
 		generateProxyGroupAndRule(&targetConfig.ProxyGroup, &targetConfig.Rule)
 	}
+
 }

 func patchConfig(general *config.General) {
@@ -411,6 +409,6 @@ func applyConfig(isPatch bool) {
 		patchConfig(cfg.General)
 	} else {
 		executor.ApplyConfig(cfg, true)
-		hcCompatibleProvider(tunnel.Providers())
+		healthcheck()
 	}
 }
--- a/core/go.sum
+++ b/core/go.sum
@@ -35,16 +35,19 @@ github.com/ericlagergren/aegis v0.0.0-20230312195928-b4ce538b56f9/go.mod h1:hkIF
 github.com/ericlagergren/polyval v0.0.0-20220411101811-e25bc10ba391 h1:8j2RH289RJplhA6WfdaPqzg1MjH2K8wX5e0uhAxrw2g=
 github.com/ericlagergren/polyval v0.0.0-20220411101811-e25bc10ba391/go.mod h1:K2R7GhgxrlJzHw2qiPWsCZXf/kXEJN9PLnQK73Ll0po=
 github.com/ericlagergren/saferand v0.0.0-20220206064634-960a4dd2bc5c h1:RUzBDdZ+e/HEe2Nh8lYsduiPAZygUfVXJn0Ncj5sHMg=
+github.com/ericlagergren/saferand v0.0.0-20220206064634-960a4dd2bc5c/go.mod h1:ETASDWf/FmEb6Ysrtd1QhjNedUU/ZQxBCRLh60bQ/UI=
 github.com/ericlagergren/siv v0.0.0-20220507050439-0b757b3aa5f1 h1:tlDMEdcPRQKBEz5nGDMvswiajqh7k8ogWRlhRwKy5mY=
 github.com/ericlagergren/siv v0.0.0-20220507050439-0b757b3aa5f1/go.mod h1:4RfsapbGx2j/vU5xC/5/9qB3kn9Awp1YDiEnN43QrJ4=
 github.com/ericlagergren/subtle v0.0.0-20220507045147-890d697da010 h1:fuGucgPk5dN6wzfnxl3D0D3rVLw4v2SbBT9jb4VnxzA=
 github.com/ericlagergren/subtle v0.0.0-20220507045147-890d697da010/go.mod h1:JtBcj7sBuTTRupn7c2bFspMDIObMJsVK8TeUvpShPok=
 github.com/frankban/quicktest v1.14.5 h1:dfYrrRyLtiqT9GyKXgdh+k4inNeTvmGbuSgZ3lx3GhA=
+github.com/frankban/quicktest v1.14.5/go.mod h1:4ptaffx2x8+WTWXmUCuVU6aPUX1/Mz7zb5vbUoiM6w0=
 github.com/fsnotify/fsnotify v1.7.0 h1:8JEhPFa5W2WU7YfeZzPNqzMP6Lwt7L2715Ggo0nosvA=
 github.com/fsnotify/fsnotify v1.7.0/go.mod h1:40Bi/Hjc2AVfZrqy+aj+yEI+/bRxZnMJyTJwOpGvigM=
 github.com/gaukas/godicttls v0.0.4 h1:NlRaXb3J6hAnTmWdsEKb9bcSBD6BvcIjdGdeb0zfXbk=
 github.com/gaukas/godicttls v0.0.4/go.mod h1:l6EenT4TLWgTdwslVb4sEMOCf7Bv0JAK67deKr9/NCI=
 github.com/go-logr/logr v1.2.4 h1:g01GSCwiDw2xSZfjJ2/T9M+S6pFdcNtFYsp+Y43HYDQ=
+github.com/go-logr/logr v1.2.4/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A=
 github.com/go-ole/go-ole v1.2.6/go.mod h1:pprOEPIfldk/42T2oK7lQ4v4JSDwmV0As9GaiUsvbm0=
 github.com/go-ole/go-ole v1.3.0 h1:Dt6ye7+vXGIKZ7Xtk4s6/xVdGDQynvom7xCFEdWr6uE=
 github.com/go-ole/go-ole v1.3.0/go.mod h1:5LS6F96DhAwUc7C+1HLexzMXY1xGRSryjyPPKW6zv78=
@@ -60,6 +63,7 @@ github.com/gofrs/uuid/v5 v5.2.0 h1:qw1GMx6/y8vhVsx626ImfKMuS5CvJmhIKKtuyvfajMM=
 github.com/gofrs/uuid/v5 v5.2.0/go.mod h1:CDOjlDMVAtN56jqyRUZh58JT31Tiw7/oQyEXZV+9bD8=
 github.com/golang/protobuf v1.3.1/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
 github.com/golang/protobuf v1.5.3 h1:KhyjKVUg7Usr/dYsdSqoFveMYd5ko72D+zANwlG1mmg=
+github.com/golang/protobuf v1.5.3/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY=
 github.com/google/btree v1.1.2 h1:xf4v41cLI2Z6FxbKm+8Bu+m8ifhj15JuZ9sa0jZCMUU=
 github.com/google/btree v1.1.2/go.mod h1:qOPhT0dTNdNzV6Z/lhRX0YXUafgPLFUh+gZMl761Gm4=
 github.com/google/go-cmp v0.5.6/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
@@ -69,6 +73,7 @@ github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeN
 github.com/google/pprof v0.0.0-20210407192527-94a9f03dee38 h1:yAJXTCF9TqKcTiHJAE8dj7HMvPfh66eeA2JYW7eFpSE=
 github.com/google/pprof v0.0.0-20210407192527-94a9f03dee38/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE=
 github.com/google/tink/go v1.6.1 h1:t7JHqO8Ath2w2ig5vjwQYJzhGEZymedQc90lQXUBa4I=
+github.com/google/tink/go v1.6.1/go.mod h1:IGW53kTgag+st5yPhKKwJ6u2l+SSp5/v9XF7spovjlY=
 github.com/hashicorp/yamux v0.1.1 h1:yrQxtgseBDrq9Y652vSRDvsKCJKOUD+GzTS4Y0Y8pvE=
 github.com/hashicorp/yamux v0.1.1/go.mod h1:CtWFDAQgb7dxtzFs4tWbplKIe2jSi3+5vKbgIO0SLnQ=
 github.com/ianlancetaylor/demangle v0.0.0-20200824232613-28f6c0f3b639/go.mod h1:aSSvb/t6k1mPoxDqO4vJh6VOCGPwU4O0C2/Eqndh1Sc=
@@ -83,7 +88,9 @@ github.com/klauspost/compress v1.17.4/go.mod h1:/dCuZOvVtNoHsyb+cuJD3itjs3NbnF6K
 github.com/klauspost/cpuid/v2 v2.2.7 h1:ZWSB3igEs+d0qvnxR/ZBzXVmxkgt8DdzP6m9pfuVLDM=
 github.com/klauspost/cpuid/v2 v2.2.7/go.mod h1:Lcz8mBdAVJIBVzewtcLocK12l3Y+JytZYpaMropDUws=
 github.com/kr/pretty v0.3.1 h1:flRD4NNwYAUpkphVc1HcthR4KEIFJ65n8Mw5qdRn3LE=
+github.com/kr/pretty v0.3.1/go.mod h1:hoEshYVHaxMs3cyo3Yncou5ZscifuDolrwPKZanG3xk=
 github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY=
+github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE=
 github.com/lufia/plan9stats v0.0.0-20211012122336-39d0f177ccd0 h1:6E+4a0GO5zZEnZ81pIr0yLvtUWk2if982qA3F3QD6H4=
 github.com/lufia/plan9stats v0.0.0-20211012122336-39d0f177ccd0/go.mod h1:zJYVVT2jmtg6P3p1VtQj7WsuWi/y4VnjVBn7F8KPB3I=
 github.com/lunixbochs/struc v0.0.0-20200707160740-784aaebc1d40 h1:EnfXoSqDfSNJv0VBNqY/88RNnhSGYkrHaO0mmFGbVsc=
@@ -125,6 +132,7 @@ github.com/oasisprotocol/deoxysii v0.0.0-20220228165953-2091330c22b7/go.mod h1:U
 github.com/onsi/ginkgo/v2 v2.9.5 h1:+6Hr4uxzP4XIUyAkg61dWBw8lb/gc4/X5luuxN/EC+Q=
 github.com/onsi/ginkgo/v2 v2.9.5/go.mod h1:tvAoo1QUJwNEU2ITftXTpR7R1RbCzoZUOs3RonqW57k=
 github.com/onsi/gomega v1.27.6 h1:ENqfyGeS5AX/rlXDd/ETokDz93u0YufY1Pgxuy/PvWE=
+github.com/onsi/gomega v1.27.6/go.mod h1:PIQNjfQwkP3aQAH7lf7j87O/5FiNr+ZR8+ipb+qQlhg=
 github.com/openacid/errors v0.8.1/go.mod h1:GUQEJJOJE3W9skHm8E8Y4phdl2LLEN8iD7c5gcGgdx0=
 github.com/openacid/low v0.1.21 h1:Tr2GNu4N/+rGRYdOsEHOE89cxUIaDViZbVmKz29uKGo=
 github.com/openacid/low v0.1.21/go.mod h1:q+MsKI6Pz2xsCkzV4BLj7NR5M4EX0sGz5AqotpZDVh0=
@@ -146,6 +154,7 @@ github.com/quic-go/qpack v0.4.0/go.mod h1:UZVnYIfi5GRk+zI9UMaCPsmZ2xKJP7XBUvVyT1
 github.com/quic-go/qtls-go1-20 v0.4.1 h1:D33340mCNDAIKBqXuAvexTNMUByrYmFYVfKfDN5nfFs=
 github.com/quic-go/qtls-go1-20 v0.4.1/go.mod h1:X9Nh97ZL80Z+bX/gUXMbipO6OxdiDi58b/fMC9mAL+k=
 github.com/rogpeppe/go-internal v1.9.0 h1:73kH8U+JUqXU8lRuOHeVHaa/SZPifC7BkcraZVejAe8=
+github.com/rogpeppe/go-internal v1.9.0/go.mod h1:WtVeX8xhTBvf0smdhujwtBcq4Qrzq/fJaraNFVN+nFs=
 github.com/sagernet/bbolt v0.0.0-20231014093535-ea5cb2fe9f0a h1:+NkI2670SQpQWvkkD2QgdTuzQG263YZ+2emfpeyGqW0=
 github.com/sagernet/bbolt v0.0.0-20231014093535-ea5cb2fe9f0a/go.mod h1:63s7jpZqcDAIpj8oI/1v4Izok+npJOHACFCU6+huCkM=
 github.com/sagernet/netlink v0.0.0-20220905062125-8043b4a9aa97 h1:iL5gZI3uFp0X6EslacyapiRz7LLSJyr4RajF/BhMVyE=
@@ -249,6 +258,7 @@ golang.org/x/sys v0.19.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
 golang.org/x/sys v0.20.0 h1:Od9JTbYCk261bKm4M/mw7AklTlFYIa0bIp9BgSm1S8Y=
 golang.org/x/sys v0.20.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
 golang.org/x/term v0.20.0 h1:VnkxpohqXaOBYJtBmEppKUG6mXpi+4O6purfc2+sMhw=
+golang.org/x/term v0.20.0/go.mod h1:8UkIAJTvZgivsXaD6/pH6U9ecQzZ45awqEOzuCvwpFY=
 golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
 golang.org/x/text v0.15.0 h1:h1V/4gjBv8v9cjcR6+AR5+/cIYK5N/WAgiv4xlsEtAk=
 golang.org/x/text v0.15.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU=
@@ -263,6 +273,7 @@ google.golang.org/protobuf v1.34.1 h1:9ddQBjfCyZPOHPUiPxpYESBLc+T8P3E+Vo4IbKZgFW
 google.golang.org/protobuf v1.34.1/go.mod h1:c6P6GXX6sHbq/GpV6MGZEdwhWPcYBgnhAHhKbcUYpos=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127 h1:qIbj1fsPNlZgppZ+VLlY7N33q108Sa+fhmuc+sWQYwY=
+gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
 gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
 gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
--- a/core/hub.go
+++ b/core/hub.go
@@ -65,7 +65,12 @@ func validateConfig(s *C.char, port C.longlong) {
 	i := int64(port)
 	go func() {
 		bytes := []byte(C.GoString(s))
-		_, err := config.UnmarshalRawConfig(bytes)
+		rawConfig, err := config.UnmarshalRawConfig(bytes)
+		if err != nil {
+			bridge.SendToPort(i, err.Error())
+			return
+		}
+		_, err = config.ParseRawConfig(rawConfig)
 		if err != nil {
 			bridge.SendToPort(i, err.Error())
 			return
@@ -181,8 +186,7 @@ func getTraffic() *C.char {
 }

 //export asyncTestDelay
-func asyncTestDelay(s *C.char, port C.longlong) {
-	i := int64(port)
+func asyncTestDelay(s *C.char) {
 	go func() {
 		paramsString := C.GoString(s)
 		var params = &TestDelayParams{}
@@ -206,25 +210,26 @@ func asyncTestDelay(s *C.char, port C.longlong) {
 			Name: params.ProxyName,
 		}

+		message := bridge.Message{
+			Type: bridge.Delay,
+			Data: delayData,
+		}
+
 		if proxy == nil {
 			delayData.Value = -1
-			data, _ := json.Marshal(delayData)
-			bridge.SendToPort(i, string(data))
+			bridge.SendMessage(message)
 			return
 		}

 		delay, err := proxy.URLTest(ctx, constant.DefaultTestURL, expectedStatus)
 		if err != nil || delay == 0 {
 			delayData.Value = -1
-			data, _ := json.Marshal(delayData)
-			bridge.SendToPort(i, string(data))
+			bridge.SendMessage(message)
 			return
 		}

 		delayData.Value = int32(delay)
-		data, _ := json.Marshal(delayData)
-		bridge.SendToPort(i, string(data))
-		return
+		bridge.SendMessage(message)
 	}()
 }

@@ -374,6 +379,11 @@ func updateExternalProvider(providerName *C.char, providerType *C.char, port C.l
 	}()
 }

+//export healthcheck
+func healthcheck() {
+	hcCompatibleProvider(tunnel.Providers())
+}
+
 //export initNativeApiBridge
 func initNativeApiBridge(api unsafe.Pointer, port C.longlong) {
 	bridge.InitDartApi(api)
--- a/core/tun.go
+++ b/core/tun.go
@@ -17,35 +17,36 @@ var tunLock sync.Mutex
 var tun *t.Tun

 //export startTUN
-func startTUN(fd C.int) {
-	go func() {
-		tunLock.Lock()
-		defer tunLock.Unlock()
+func startTUN(fd C.int) bool {
+	tunLock.Lock()
+	defer tunLock.Unlock()

-		if tun != nil {
-			tun.Close()
-			tun = nil
-		}
-		f := int(fd)
-		gateway := "172.16.0.1/30"
-		portal := "172.16.0.2"
-		dns := "0.0.0.0"
+	if tun != nil {
+		tun.Close()
+		tun = nil
+	}
+	f := int(fd)
+	gateway := "172.16.0.1/30"
+	portal := "172.16.0.2"
+	dns := "0.0.0.0"

-		tempTun := &t.Tun{Closed: false, Limit: semaphore.NewWeighted(4)}
+	tempTun := &t.Tun{Closed: false, Limit: semaphore.NewWeighted(4)}

-		closer, err := t.Start(f, gateway, portal, dns)
+	closer, err := t.Start(f, gateway, portal, dns)

-		applyConfig(true)
+	applyConfig(true)

-		if err != nil {
-			log.Errorln("startTUN error: %v", err)
-			tempTun.Close()
-		}
+	if err != nil {
+		log.Errorln("startTUN error: %v", err)
+		tempTun.Close()
+		return false
+	}

-		tempTun.Closer = closer
+	tempTun.Closer = closer

-		tun = tempTun
-	}()
+	tun = tempTun
+
+	return true
 }

 //export updateMarkSocketPort
@@ -60,16 +61,14 @@ func updateMarkSocketPort(markSocketPort C.longlong) bool {

 //export stopTun
 func stopTun() {
-	go func() {
-		tunLock.Lock()
-		defer tunLock.Unlock()
+	tunLock.Lock()
+	defer tunLock.Unlock()

-		if tun != nil {
-			tun.Close()
-			applyConfig(true)
-			tun = nil
-		}
-	}()
+	if tun != nil {
+		tun.Close()
+		applyConfig(true)
+		tun = nil
+	}
 }

 func init() {
--- a/lib/application.dart
+++ b/lib/application.dart
@@ -82,7 +82,7 @@ class ApplicationState extends State<Application> {
    super.initState();
    globalState.appController = AppController(context);
    WidgetsBinding.instance.addPostFrameCallback((timeStamp) async {
-      await globalState.appController.init();
+      globalState.appController.afterInit();
      globalState.appController.initLink();
      _updateGroups();
    });
@@ -160,9 +160,8 @@ class ApplicationState extends State<Application> {
                        AppLocalizations.delegate.supportedLocales,
                    themeMode: state.themeMode,
                    theme: ThemeData(
-                      useMaterial3: true,
-                      fontFamily: '',
                      pageTransitionsTheme: _pageTransitionsTheme,
+                      useMaterial3: true,
                      colorScheme: _getAppColorScheme(
                        brightness: Brightness.light,
                        systemColorSchemes: systemColorSchemes,
@@ -171,7 +170,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
@@ -156,36 +156,23 @@ class ClashCore {
    return clashFFI.changeProxy(params.toNativeUtf8().cast()) == 1;
  }

-  Future<Delay> getDelay(String proxyName) {
+  bool delay(String proxyName) {
    final delayParams = {
      "proxy-name": proxyName,
      "timeout": httpTimeoutDuration.inMilliseconds,
    };
-    final completer = Completer<Delay>();
-    final receiver = ReceivePort();
-    receiver.listen((message) {
-      if (!completer.isCompleted) {
-        completer.complete(Delay.fromJson(json.decode(message)));
-        receiver.close();
-      }
-    });
-    clashFFI.asyncTestDelay(
-      json.encode(delayParams).toNativeUtf8().cast(),
-      receiver.sendPort.nativePort,
-    );
-    Future.delayed(httpTimeoutDuration + moreDuration, () {
-      receiver.close();
-      completer.complete(
-        Delay(name: proxyName, value: -1),
-      );
-    });
-    return completer.future;
+    clashFFI.asyncTestDelay(json.encode(delayParams).toNativeUtf8().cast());
+    return true;
  }

  clearEffect(String path) {
    clashFFI.clearEffect(path.toNativeUtf8().cast());
  }

+  healthcheck() {
+    clashFFI.healthcheck();
+  }
+
  VersionInfo getVersionInfo() {
    final versionInfoRaw = clashFFI.getVersionInfo();
    final versionInfo = json.decode(versionInfoRaw.cast<Utf8>().toDartString());
--- a/lib/clash/generated/clash_ffi.dart
+++ b/lib/clash/generated/clash_ffi.dart
@@ -977,20 +977,17 @@ class ClashFFI {

  void asyncTestDelay(
    ffi.Pointer<ffi.Char> s,
-    int port,
  ) {
    return _asyncTestDelay(
      s,
-      port,
    );
  }

-  late final _asyncTestDelayPtr = _lookup<
-      ffi.NativeFunction<
-          ffi.Void Function(
-              ffi.Pointer<ffi.Char>, ffi.LongLong)>>('asyncTestDelay');
-  late final _asyncTestDelay = _asyncTestDelayPtr
-      .asFunction<void Function(ffi.Pointer<ffi.Char>, int)>();
+  late final _asyncTestDelayPtr =
+      _lookup<ffi.NativeFunction<ffi.Void Function(ffi.Pointer<ffi.Char>)>>(
+          'asyncTestDelay');
+  late final _asyncTestDelay =
+      _asyncTestDelayPtr.asFunction<void Function(ffi.Pointer<ffi.Char>)>();

  ffi.Pointer<ffi.Char> getVersionInfo() {
    return _getVersionInfo();
@@ -1089,6 +1086,14 @@ class ClashFFI {
  late final _updateExternalProvider = _updateExternalProviderPtr.asFunction<
      void Function(ffi.Pointer<ffi.Char>, ffi.Pointer<ffi.Char>, int)>();

+  void healthcheck() {
+    return _healthcheck();
+  }
+
+  late final _healthcheckPtr =
+      _lookup<ffi.NativeFunction<ffi.Void Function()>>('healthcheck');
+  late final _healthcheck = _healthcheckPtr.asFunction<void Function()>();
+
  void initNativeApiBridge(
    ffi.Pointer<ffi.Void> api,
    int port,
--- a/lib/common/constant.dart
+++ b/lib/common/constant.dart
@@ -18,7 +18,6 @@ const configKey = "config";
 const listItemPadding = EdgeInsets.symmetric(horizontal: 16);
 const double dialogCommonWidth = 300;
 const repository = "chen08209/FlClash";
-const defaultExternalController = "127.0.0.1:9090";
 const maxMobileWidth = 600;
 const maxLaptopWidth = 840;
 final filter = ImageFilter.blur(
--- a/lib/common/datetime.dart
+++ b/lib/common/datetime.dart
@@ -35,8 +35,4 @@ extension DateTimeExtension on DateTime {
    }
    return appLocalizations.just;
  }
-
-  String get show {
-    return toIso8601String().substring(0, 10);
-  }
-}
+}
--- a/lib/common/ip.dart
+++ b/lib/common/ip.dart
--- a/lib/common/measure.dart
+++ b/lib/common/measure.dart
@@ -23,11 +23,10 @@ class Measure {
  double? _bodyMediumHeight;
  double? _bodySmallHeight;
  double? _labelSmallHeight;
-  double? _labelMediumHeight;
  double? _titleLargeHeight;
-  double? _titleMediumHeight;

-  double get bodyMediumHeight {
+
+  double get bodyMediumHeight{
    _bodyMediumHeight ??= computeTextSize(
      Text(
        "",
@@ -37,7 +36,7 @@ class Measure {
    return _bodyMediumHeight!;
  }

-  double get bodySmallHeight {
+  double get bodySmallHeight{
    _bodySmallHeight ??= computeTextSize(
      Text(
        "",
@@ -47,7 +46,7 @@ class Measure {
    return _bodySmallHeight!;
  }

-  double get labelSmallHeight {
+  double get labelSmallHeight{
    _labelSmallHeight ??= computeTextSize(
      Text(
        "",
@@ -57,17 +56,7 @@ class Measure {
    return _labelSmallHeight!;
  }

-  double get labelMediumHeight {
-    _labelMediumHeight ??= computeTextSize(
-      Text(
-        "",
-        style: context.textTheme.labelMedium,
-      ),
-    ).height;
-    return _labelMediumHeight!;
-  }
-
-  double get titleLargeHeight {
+  double get titleLargeHeight{
    _titleLargeHeight ??= computeTextSize(
      Text(
        "",
@@ -76,14 +65,4 @@ class Measure {
    ).height;
    return _titleLargeHeight!;
  }
-
-  double get titleMediumHeight {
-    _titleMediumHeight ??= computeTextSize(
-      Text(
-        "",
-        style: context.textTheme.titleMedium,
-      ),
-    ).height;
-    return _titleMediumHeight!;
-  }
 }
--- a/lib/common/picker.dart
+++ b/lib/common/picker.dart
@@ -10,7 +10,8 @@ class Picker {
    if (Platform.isAndroid) {
      filePickerResult = await FilePicker.platform.pickFiles(
        withData: true,
-        allowMultiple: false,
+        type: FileType.custom,
+        allowedExtensions: ['txt', 'conf'],
      );
    } else {
      filePickerResult = await FilePicker.platform.pickFiles(
--- a/lib/common/request.dart
+++ b/lib/common/request.dart
@@ -9,11 +9,13 @@ import 'package:fl_clash/state.dart';
 class Request {
  late final Dio _dio;
  int? _port;
-  bool _isStart = false;

  Request() {
    _dio = Dio(
      BaseOptions(
+        connectTimeout: httpTimeoutDuration,
+        sendTimeout: httpTimeoutDuration,
+        receiveTimeout: httpTimeoutDuration,
        headers: {"User-Agent": coreName},
      ),
    );
@@ -27,14 +29,11 @@ class Request {

  _syncProxy() {
    final port = globalState.appController.clashConfig.mixedPort;
-    final isStart = globalState.appController.appState.isStart;
-    if (_port != port || isStart != _isStart) {
+    if (_port != port) {
      _port = port;
-      _isStart = isStart;
      _dio.httpClientAdapter = IOHttpClientAdapter(
        createHttpClient: () {
          final client = HttpClient();
-          if (!_isStart) return client;
          client.findProxy = (url) {
            return "PROXY localhost:$_port;DIRECT";
          };
@@ -53,7 +52,7 @@ class Request {
          ),
        )
        .timeout(
-          httpTimeoutDuration * 2,
+          httpTimeoutDuration,
        );
    return response;
  }
@@ -83,14 +82,12 @@ class Request {
    "https://ipinfo.io/json/": IpInfo.fromIpInfoIoJson,
  };

-  Future<IpInfo?> checkIp(CancelToken? cancelToken) async {
+  Future<IpInfo> checkIp() async {
    for (final source in _ipInfoSources.entries) {
      try {
-        final response = await _dio
-            .get<Map<String, dynamic>>(source.key, cancelToken: cancelToken)
-            .timeout(
-              httpTimeoutDuration,
-            );
+        final response = await _dio.get<Map<String, dynamic>>(
+          source.key,
+        );
        if (response.statusCode == 200 && response.data != null) {
          return source.value(response.data!);
        }
@@ -98,7 +95,7 @@ class Request {
        continue;
      }
    }
-    return null;
+    throw "无法检索ip";
  }
 }

--- a/lib/common/text.dart
+++ b/lib/common/text.dart
@@ -6,11 +6,6 @@ extension TextStyleExtension on TextStyle {
    return copyWith(color: color?.toLight());
  }

-  toLighter() {
-    return copyWith(color: color?.toLighter());
-  }
-
-
  toSoftBold() {
    return copyWith(fontWeight: FontWeight.w500);
  }
--- a/lib/controller.dart
+++ b/lib/controller.dart
@@ -1,6 +1,5 @@
 import 'dart:async';

-import 'package:fl_clash/enum/enum.dart';
 import 'package:fl_clash/state.dart';
 import 'package:flutter/material.dart';
 import 'package:provider/provider.dart';
@@ -40,6 +39,8 @@ class AppController {
        updateRunTime,
        updateTraffic,
      ];
+      clearShowProxyDelay();
+      testShowProxyDelay();
    } else {
      await globalState.stopSystemProxy();
      appState.traffics = [];
@@ -97,12 +98,10 @@ class AppController {
    }
  }

-  Future<void> updateProfile(String id) async {
+  updateProfile(String id) async {
    final profile = config.getCurrentProfileForId(id);
    if (profile != null) {
-      final tempProfile = profile.copyWith();
-      await tempProfile.update();
-      config.setProfile(tempProfile);
+      await profile.update();
    }
  }

@@ -136,25 +135,16 @@ class AppController {

  autoUpdateProfiles() async {
    for (final profile in config.profiles) {
-      if (!profile.autoUpdate) continue;
+      if (!profile.autoUpdate) return;
      final isNotNeedUpdate = profile.lastUpdateDate
          ?.add(
            profile.autoUpdateDuration,
          )
          .isBeforeNow;
-      if (isNotNeedUpdate == false || profile.type == ProfileType.file) {
-        continue;
-      }
-      await updateProfile(profile.id);
-    }
-  }
-
-  updateProfiles() async {
-    for (final profile in config.profiles) {
-      if (profile.type == ProfileType.file) {
-        continue;
-      }
-      await updateProfile(profile.id);
+      if (isNotNeedUpdate == false ||
+          profile.url == null ||
+          profile.url!.isEmpty) continue;
+      await profile.update();
    }
  }

@@ -256,29 +246,6 @@ class AppController {
    }
  }

-  init() async {
-    if (!config.silentLaunch) {
-      window?.show();
-    }
-    final commonScaffoldState = globalState.homeScaffoldKey.currentState;
-    if(commonScaffoldState?.mounted == true){
-      await commonScaffoldState?.loadingRun(() async {
-        await globalState.applyProfile(
-          appState: appState,
-          config: config,
-          clashConfig: clashConfig,
-        );
-      });
-    }else{
-      await globalState.applyProfile(
-        appState: appState,
-        config: config,
-        clashConfig: clashConfig,
-      );
-    }
-    await afterInit();
-  }
-
  afterInit() async {
    if (config.autoRun) {
      await updateSystemProxy(true);
@@ -288,9 +255,25 @@ class AppController {
    }
    autoUpdateProfiles();
    updateLogStatus();
+    if (!config.silentLaunch) {
+      window?.show();
+    }
    autoCheckUpdate();
  }

+  healthcheck() {
+    if (globalState.healthcheckLock) return;
+    for (final delay in appState.delayMap.entries) {
+      setDelay(
+        Delay(
+          name: delay.key,
+          value: 0,
+        ),
+      );
+    }
+    clashCore.healthcheck();
+  }
+
  setDelay(Delay delay) {
    appState.setDelay(delay);
  }
@@ -400,6 +383,22 @@ class AppController {
    addProfileFormURL(url);
  }

+  clearShowProxyDelay() {
+    final showProxyDelay = appState.getRealProxyName(appState.showProxyName);
+    if (showProxyDelay != null) {
+      appState.setDelay(
+        Delay(name: showProxyDelay, value: null),
+      );
+    }
+  }
+
+  testShowProxyDelay() {
+    final showProxyDelay = appState.getRealProxyName(appState.showProxyName);
+    if (showProxyDelay != null) {
+      globalState.updateCurrentDelay(showProxyDelay);
+    }
+  }
+
  updateViewWidth(double width) {
    WidgetsBinding.instance.addPostFrameCallback((_) {
      appState.viewWidth = width;
--- a/lib/enum/enum.dart
+++ b/lib/enum/enum.dart
@@ -1,6 +1,6 @@
 // ignore_for_file: constant_identifier_names

-enum GroupType { Selector, URLTest, Fallback, LoadBalance, Relay }
+enum GroupType { Selector, URLTest, Fallback }

 enum GroupName { GLOBAL, Proxy, Auto, Fallback }

--- a/lib/fragments/access.dart
+++ b/lib/fragments/access.dart
@@ -8,13 +8,6 @@ import 'package:fl_clash/widgets/widgets.dart';
 import 'package:flutter/material.dart';
 import 'package:provider/provider.dart';

-extension AccessControlExtension on AccessControl {
-  List<String> get currentList => switch (mode) {
-        AccessControlMode.acceptSelected => acceptList,
-        AccessControlMode.rejectSelected => rejectList,
-      };
-}
-
 class AccessFragment extends StatefulWidget {
  const AccessFragment({super.key});

@@ -90,70 +83,136 @@ class _AccessFragmentState extends State<AccessFragment> {
    );
  }

-  Widget _buildSearchButton(List<Package> packages) {
-    return IconButton(
-      tooltip: appLocalizations.search,
-      onPressed: () {
-        showSearch(
-          context: context,
-          delegate: AccessControlSearchDelegate(
-            packages: packages,
-          ),
-        ).then((_) => {setState(() {})});
-      },
-      icon: const Icon(Icons.search),
-    );
-  }
-
-  _buildSelectedAllButton({
-    required bool isAccessControl,
+  Widget _buildSelectedAllButton({
    required bool isSelectedAll,
    required List<String> allValueList,
  }) {
-    WidgetsBinding.instance.addPostFrameCallback((_) {
-      final tooltip = isSelectedAll
-          ? appLocalizations.cancelSelectAll
-          : appLocalizations.selectAll;
-      final commonScaffoldState =
-          context.findAncestorStateOfType<CommonScaffoldState>();
-      commonScaffoldState?.floatingActionButton = DisabledMask(
-        status: !isAccessControl,
-        child: AbsorbPointer(
-          absorbing: !isAccessControl,
-          child: FloatingActionButton (
-            tooltip: tooltip,
-            onPressed: () {
-              final config = globalState.appController.config;
-              final isAccept =
-                  config.accessControl.mode == AccessControlMode.acceptSelected;
+    return Builder(
+      builder: (context) {
+        final tooltip = isSelectedAll
+            ? appLocalizations.cancelSelectAll
+            : appLocalizations.selectAll;
+        return IconButton(
+          tooltip: tooltip,
+          onPressed: () {
+            final config = globalState.appController.config;
+            final isAccept =
+                config.accessControl.mode == AccessControlMode.acceptSelected;

-              if (isSelectedAll) {
-                config.accessControl = switch (isAccept) {
-                  true => config.accessControl.copyWith(
-                      acceptList: [],
-                    ),
-                  false => config.accessControl.copyWith(
-                      rejectList: [],
-                    ),
-                };
-              } else {
-                config.accessControl = switch (isAccept) {
-                  true => config.accessControl.copyWith(
-                      acceptList: allValueList,
-                    ),
-                  false => config.accessControl.copyWith(
-                      rejectList: allValueList,
-                    ),
-                };
-              }
-            },
-            child: isSelectedAll
-                ? const Icon(Icons.deselect)
-                : const Icon(Icons.select_all),
-          ),
+            if (isSelectedAll) {
+              config.accessControl = switch (isAccept) {
+                true => config.accessControl.copyWith(
+                    acceptList: [],
+                  ),
+                false => config.accessControl.copyWith(
+                    rejectList: [],
+                  ),
+              };
+            } else {
+              config.accessControl = switch (isAccept) {
+                true => config.accessControl.copyWith(
+                    acceptList: allValueList,
+                  ),
+                false => config.accessControl.copyWith(
+                    rejectList: allValueList,
+                  ),
+              };
+            }
+          },
+          icon: isSelectedAll
+              ? const Icon(Icons.deselect)
+              : const Icon(Icons.select_all),
+        );
+      },
+    );
+  }
+
+  Widget _actionHeader({
+    required bool isAccessControl,
+    required List<String> valueList,
+    required String describe,
+    required List<String> packageNameList,
+  }) {
+    return AbsorbPointer(
+      absorbing: !isAccessControl,
+      child: Padding(
+        padding: const EdgeInsets.only(
+          top: 4,
+          bottom: 4,
+          left: 16,
+          right: 8,
        ),
-      );
-    });
+        child: Row(
+          mainAxisAlignment: MainAxisAlignment.spaceBetween,
+          mainAxisSize: MainAxisSize.max,
+          children: [
+            Expanded(
+              child: IntrinsicHeight(
+                child: Column(
+                  mainAxisSize: MainAxisSize.max,
+                  crossAxisAlignment: CrossAxisAlignment.start,
+                  children: [
+                    Expanded(
+                      child: Row(
+                        children: [
+                          Flexible(
+                            child: Text(
+                              appLocalizations.selected,
+                              style: Theme.of(context)
+                                  .textTheme
+                                  .labelLarge
+                                  ?.copyWith(
+                                    color:
+                                        Theme.of(context).colorScheme.primary,
+                                  ),
+                            ),
+                          ),
+                          const Flexible(
+                            child: SizedBox(
+                              width: 8,
+                            ),
+                          ),
+                          Flexible(
+                            child: Text(
+                              "${valueList.length}",
+                              style: Theme.of(context)
+                                  .textTheme
+                                  .labelLarge
+                                  ?.copyWith(
+                                    color:
+                                        Theme.of(context).colorScheme.primary,
+                                  ),
+                            ),
+                          ),
+                        ],
+                      ),
+                    ),
+                    Flexible(
+                      child: Text(describe),
+                    )
+                  ],
+                ),
+              ),
+            ),
+            Row(
+              mainAxisSize: MainAxisSize.min,
+              mainAxisAlignment: MainAxisAlignment.end,
+              children: [
+                Flexible(
+                  child: _buildSelectedAllButton(
+                    isSelectedAll: const ListEquality<String>()
+                        .equals(valueList, packageNameList),
+                    allValueList: packageNameList,
+                  ),
+                ),
+                Flexible(child: _buildFilterSystemAppButton()),
+                Flexible(child: _buildAppProxyModePopup()),
+              ],
+            ),
+          ],
+        ),
+      ),
+    );
  }

  Widget _buildPackageList() {
@@ -193,11 +252,14 @@ class _AccessFragmentState extends State<AccessFragment> {
                accessControlMode == AccessControlMode.acceptSelected
                    ? acceptPackages
                    : rejectPackages;
-            final currentList = accessControl.currentList;
+            final currentList =
+                accessControlMode == AccessControlMode.acceptSelected
+                    ? accessControl.acceptList
+                    : accessControl.rejectList;
            final currentPackages = isFilterSystemApp
                ? packages
-                    .where((element) => element.isSystem == false)
-                    .toList()
+                .where((element) => element.isSystem == false)
+                .toList()
                : packages;
            final packageNameList =
                currentPackages.map((e) => e.packageName).toList();
@@ -206,91 +268,15 @@ class _AccessFragmentState extends State<AccessFragment> {
                accessControlMode == AccessControlMode.acceptSelected
                    ? appLocalizations.accessControlAllowDesc
                    : appLocalizations.accessControlNotAllowDesc;
-            _buildSelectedAllButton(
-              isAccessControl: isAccessControl,
-              isSelectedAll: valueList.length == packageNameList.length,
-              allValueList: packageNameList,
-            );
            return DisabledMask(
              status: !isAccessControl,
              child: Column(
                children: [
-                  AbsorbPointer(
-                    absorbing: !isAccessControl,
-                    child: Padding(
-                      padding: const EdgeInsets.only(
-                        top: 4,
-                        bottom: 4,
-                        left: 16,
-                        right: 8,
-                      ),
-                      child: Row(
-                        mainAxisAlignment: MainAxisAlignment.spaceBetween,
-                        mainAxisSize: MainAxisSize.max,
-                        children: [
-                          Expanded(
-                            child: IntrinsicHeight(
-                              child: Column(
-                                mainAxisSize: MainAxisSize.max,
-                                crossAxisAlignment: CrossAxisAlignment.start,
-                                children: [
-                                  Expanded(
-                                    child: Row(
-                                      children: [
-                                        Flexible(
-                                          child: Text(
-                                            appLocalizations.selected,
-                                            style: Theme.of(context)
-                                                .textTheme
-                                                .labelLarge
-                                                ?.copyWith(
-                                                  color: Theme.of(context)
-                                                      .colorScheme
-                                                      .primary,
-                                                ),
-                                          ),
-                                        ),
-                                        const Flexible(
-                                          child: SizedBox(
-                                            width: 8,
-                                          ),
-                                        ),
-                                        Flexible(
-                                          child: Text(
-                                            "${valueList.length}",
-                                            style: Theme.of(context)
-                                                .textTheme
-                                                .labelLarge
-                                                ?.copyWith(
-                                                  color: Theme.of(context)
-                                                      .colorScheme
-                                                      .primary,
-                                                ),
-                                          ),
-                                        ),
-                                      ],
-                                    ),
-                                  ),
-                                  Flexible(
-                                    child: Text(describe),
-                                  )
-                                ],
-                              ),
-                            ),
-                          ),
-                          Row(
-                            mainAxisSize: MainAxisSize.min,
-                            mainAxisAlignment: MainAxisAlignment.end,
-                            children: [
-                              Flexible(
-                                  child: _buildSearchButton(currentPackages)),
-                              Flexible(child: _buildFilterSystemAppButton()),
-                              Flexible(child: _buildAppProxyModePopup()),
-                            ],
-                          ),
-                        ],
-                      ),
-                    ),
+                  _actionHeader(
+                    isAccessControl: isAccessControl,
+                    valueList: valueList,
+                    describe: describe,
+                    packageNameList: packageNameList,
                  ),
                  Expanded(
                    flex: 1,
@@ -443,111 +429,3 @@ class PackageListItem extends StatelessWidget {
    );
  }
 }
-
-class AccessControlSearchDelegate extends SearchDelegate {
-  final List<Package> packages;
-
-  AccessControlSearchDelegate({
-    required this.packages,
-  });
-
-  List<Package> get _results {
-    final lowQuery = query.toLowerCase();
-    return packages
-        .where(
-          (package) =>
-              package.label.toLowerCase().contains(lowQuery) ||
-              package.packageName.contains(lowQuery),
-        )
-        .toList();
-  }
-
-  @override
-  List<Widget>? buildActions(BuildContext context) {
-    return [
-      IconButton(
-        onPressed: () {
-          if (query.isEmpty) {
-            close(context, null);
-            return;
-          }
-          query = '';
-        },
-        icon: const Icon(Icons.clear),
-      ),
-      const SizedBox(
-        width: 8,
-      )
-    ];
-  }
-
-  @override
-  Widget? buildLeading(BuildContext context) {
-    return IconButton(
-      onPressed: () {
-        close(context, null);
-      },
-      icon: const Icon(Icons.arrow_back),
-    );
-  }
-
-  Widget _packageList(List<Package> packages) {
-    return Selector<Config, PackageListSelectorState>(
-      selector: (_, config) => PackageListSelectorState(
-        accessControl: config.accessControl,
-        isAccessControl: config.isAccessControl,
-      ),
-      builder: (context, state, __) {
-        final accessControl = state.accessControl;
-        final isAccessControl = state.isAccessControl;
-        final accessControlMode = accessControl.mode;
-        final currentList = accessControl.currentList;
-        final packageNameList =
-            this.packages.map((e) => e.packageName).toList();
-        final valueList = currentList.intersection(packageNameList);
-        return DisabledMask(
-          status: !isAccessControl,
-          child: ListView.builder(
-            itemCount: packages.length,
-            itemBuilder: (_, index) {
-              final package = packages[index];
-              return PackageListItem(
-                key: Key(package.packageName),
-                package: package,
-                value: valueList.contains(package.packageName),
-                isActive: isAccessControl,
-                onChanged: (value) {
-                  if (value == true) {
-                    valueList.add(package.packageName);
-                  } else {
-                    valueList.remove(package.packageName);
-                  }
-                  final config = globalState.appController.config;
-                  if (accessControlMode == AccessControlMode.acceptSelected) {
-                    config.accessControl = config.accessControl.copyWith(
-                      acceptList: valueList,
-                    );
-                  } else {
-                    config.accessControl = config.accessControl.copyWith(
-                      rejectList: valueList,
-                    );
-                  }
-                },
-              );
-            },
-          ),
-        );
-      },
-    );
-  }
-
-  @override
-  Widget buildResults(BuildContext context) {
-    return buildSuggestions(context);
-  }
-
-  @override
-  Widget buildSuggestions(BuildContext context) {
-    return _packageList(_results);
-  }
-}
--- a/lib/fragments/config.dart
+++ b/lib/fragments/config.dart
@@ -1,5 +1,3 @@
-import 'dart:io';
-
 import 'package:fl_clash/common/common.dart';
 import 'package:fl_clash/enum/enum.dart';
 import 'package:fl_clash/models/models.dart';
@@ -56,8 +54,8 @@ class _ConfigFragmentState extends State<ConfigFragment> {
            onTab: () {
              _modifyMixedPort(mixedPort);
            },
-            padding: const EdgeInsets.symmetric(horizontal: 16, vertical: 4),
-            leading: const Icon(Icons.adjust_outlined),
+            padding: const EdgeInsets.symmetric(horizontal: 16,vertical: 4),
+            leading: const Icon(Icons.adjust),
            title: Text(appLocalizations.proxyPort),
            trailing: FilledButton.tonal(
              onPressed: () {
@@ -70,24 +68,6 @@ class _ConfigFragmentState extends State<ConfigFragment> {
          );
        },
      ),
-      Selector<ClashConfig, bool>(
-        selector: (_, clashConfig) => clashConfig.ipv6,
-        builder: (_, ipv6, __) {
-          return ListItem.switchItem(
-            leading: const Icon(Icons.water_outlined),
-            title: const Text("Ipv6"),
-            subtitle: Text(appLocalizations.ipv6Desc),
-            delegate: SwitchDelegate(
-              value: ipv6,
-              onChanged: (bool value) async {
-                final appController = globalState.appController;
-                appController.clashConfig.ipv6 = value;
-                appController.updateClashConfigDebounce();
-              },
-            ),
-          );
-        },
-      ),
      Selector<ClashConfig, bool>(
        selector: (_, clashConfig) => clashConfig.allowLan,
        builder: (_, allowLan, __) {
@@ -106,38 +86,20 @@ class _ConfigFragmentState extends State<ConfigFragment> {
          );
        },
      ),
-      // if (system.isDesktop)
-      //   Selector<ClashConfig, bool>(
-      //     selector: (_, clashConfig) => clashConfig.tun.enable,
-      //     builder: (_, tunEnable, __) {
-      //       return ListItem.switchItem(
-      //         leading: const Icon(Icons.support),
-      //         title: Text(appLocalizations.tun),
-      //         subtitle: Text(appLocalizations.tunDesc),
-      //         delegate: SwitchDelegate(
-      //           value: tunEnable,
-      //           onChanged: (bool value) async {
-      //             final clashConfig = context.read<ClashConfig>();
-      //             clashConfig.tun = Tun(enable: value);
-      //             globalState.appController.updateClashConfigDebounce();
-      //           },
-      //         ),
-      //       );
-      //     },
-      //   ),
-      if (Platform.isAndroid)
-        Selector<Config, bool>(
-          selector: (_, config) => config.allowBypass,
-          builder: (_, allowBypass, __) {
+      if (system.isDesktop)
+        Selector<ClashConfig, bool>(
+          selector: (_, clashConfig) => clashConfig.tun.enable,
+          builder: (_, tunEnable, __) {
            return ListItem.switchItem(
-              leading: const Icon(Icons.double_arrow),
-              title: Text(appLocalizations.allowBypass),
-              subtitle: Text(appLocalizations.allowBypassDesc),
+              leading: const Icon(Icons.support),
+              title: Text(appLocalizations.tun),
+              subtitle: Text(appLocalizations.tunDesc),
              delegate: SwitchDelegate(
-                value: allowBypass,
+                value: tunEnable,
                onChanged: (bool value) async {
-                  final appController = globalState.appController;
-                  appController.config.allowBypass = value;
+                  final clashConfig = context.read<ClashConfig>();
+                  clashConfig.tun = Tun(enable: value);
+                  globalState.appController.updateClashConfigDebounce();
                },
              ),
            );
@@ -147,7 +109,7 @@ class _ConfigFragmentState extends State<ConfigFragment> {
        selector: (_, config) => config.isCompatible,
        builder: (_, isCompatible, __) {
          return ListItem.switchItem(
-            leading: const Icon(Icons.expand_outlined),
+            leading: const Icon(Icons.expand),
            title: Text(appLocalizations.compatible),
            subtitle: Text(appLocalizations.compatibleDesc),
            delegate: SwitchDelegate(
@@ -163,39 +125,25 @@ class _ConfigFragmentState extends State<ConfigFragment> {
          );
        },
      ),
-      // Selector<ClashConfig, bool>(
-      //   selector: (_, clashConfig) => clashConfig.externalController.isNotEmpty,
-      //   builder: (_, hasExternalController, __) {
-      //     return ListItem.switchItem(
-      //       leading: const Icon(Icons.api_outlined),
-      //       title: Text(appLocalizations.externalController),
-      //       subtitle: Text(appLocalizations.externalControllerDesc),
-      //       delegate: SwitchDelegate(
-      //         value: hasExternalController,
-      //         onChanged: (bool value) async {
-      //           final appController = globalState.appController;
-      //           appController.clashConfig.externalController =
-      //               value ? defaultExternalController : '';
-      //           await appController.updateClashConfig(
-      //             isPatch: false,
-      //           );
-      //         },
-      //       ),
-      //     );
-      //   },
-      // ),
      Padding(
        padding: kMaterialListPadding,
        child: Selector<ClashConfig, LogLevel>(
          selector: (_, clashConfig) => clashConfig.logLevel,
          builder: (_, value, __) {
            return ListItem(
-              leading: const Icon(Icons.info_outline),
+              leading: const Icon(Icons.feedback),
              title: Text(appLocalizations.logLevel),
              trailing: SizedBox(
                height: 48,
                child: DropdownMenu<LogLevel>(
                  width: 124,
+                  inputDecorationTheme: const InputDecorationTheme(
+                    filled: true,
+                    contentPadding: EdgeInsets.symmetric(
+                      vertical: 5,
+                      horizontal: 16,
+                    ),
+                  ),
                  initialSelection: value,
                  dropdownMenuEntries: [
                    for (final logLevel in LogLevel.values)
--- a/lib/fragments/dashboard/network_detection.dart
+++ b/lib/fragments/dashboard/network_detection.dart
@@ -1,5 +1,3 @@
-import 'package:country_flags/country_flags.dart';
-import 'package:dio/dio.dart';
 import 'package:fl_clash/common/common.dart';
 import 'package:fl_clash/models/models.dart';
 import 'package:fl_clash/state.dart';
@@ -15,162 +13,118 @@ class NetworkDetection extends StatefulWidget {
 }

 class _NetworkDetectionState extends State<NetworkDetection> {
-  final ipInfoNotifier = ValueNotifier<IpInfo?>(null);
-  final timeoutNotifier = ValueNotifier<bool>(false);
-  bool? _preIsStart;
-  CancelToken? cancelToken;
-
-  _checkIp(
-    bool isInit,
-    bool isStart,
-  ) async {
-    if (!isInit) return;
-    timeoutNotifier.value = false;
-    if (_preIsStart == false && _preIsStart == isStart) return;
-    if (cancelToken != null) {
-      cancelToken!.cancel();
-      cancelToken = null;
+  Widget _buildDescription(String? currentProxyName, int? delay) {
+    if (currentProxyName == null) {
+      return TooltipText(
+        text: Text(
+          appLocalizations.noProxyDesc,
+          style: Theme.of(context).textTheme.titleMedium?.copyWith(
+                color: Theme.of(context).colorScheme.secondary,
+              ),
+          overflow: TextOverflow.ellipsis,
+        ),
+      );
    }
-    ipInfoNotifier.value = null;
-    final ipInfo = await request.checkIp(cancelToken);
-    if (ipInfo == null) {
-      timeoutNotifier.value = true;
-      return;
-    } else {
-      timeoutNotifier.value = false;
+    if (delay == 0 || delay == null) {
+      return const AspectRatio(
+        aspectRatio: 1,
+        child: CircularProgressIndicator(
+          strokeCap: StrokeCap.round,
+        ),
+      );
    }
-    _preIsStart = isStart;
-    ipInfoNotifier.value = ipInfo;
-  }
-
-  _checkIpContainer(Widget child) {
-    return Selector2<AppState, Config, CheckIpSelectorState>(
-      selector: (_, appState, config) {
-        return CheckIpSelectorState(
-          isInit: appState.isInit,
-          selectedMap: appState.selectedMap,
-          isStart: appState.isStart,
-        );
-      },
-      builder: (_, state, __) {
-        _checkIp(state.isInit, state.isStart);
-        return child;
-      },
-      child: child,
+    if (delay > 0) {
+      return Row(
+        mainAxisAlignment: MainAxisAlignment.start,
+        crossAxisAlignment: CrossAxisAlignment.center,
+        children: [
+          TooltipText(
+            text: Text(
+              "$delay",
+              overflow: TextOverflow.ellipsis,
+              maxLines: 1,
+              style: context.textTheme.titleLarge
+                  ?.copyWith(
+                    color: context.colorScheme.primary,
+                  )
+                  .toSoftBold(),
+            ),
+          ),
+          const Flexible(
+            child: SizedBox(
+              width: 4,
+            ),
+          ),
+          Flexible(
+            flex: 0,
+            child: Text(
+              'ms',
+              style: Theme.of(context).textTheme.bodyMedium?.toLight(),
+            ),
+          ),
+        ],
+      );
+    }
+    return Text(
+      "Timeout",
+      style: Theme.of(context).textTheme.titleMedium?.copyWith(
+            color: Colors.red,
+          ),
    );
  }

  @override
  Widget build(BuildContext context) {
-    return _checkIpContainer(
-      ValueListenableBuilder<IpInfo?>(
-        valueListenable: ipInfoNotifier,
-        builder: (_, ipInfo, __) {
-          return CommonCard(
+    return CommonCard(
+      info: Info(
+        iconData: Icons.network_check,
+        label: appLocalizations.networkDetection,
+      ),
+      child: Selector<AppState, NetworkDetectionSelectorState>(
+        selector: (_, appState) {
+          return NetworkDetectionSelectorState(
+            currentProxyName: appState.showProxyName,
+            delay: appState.getDelay(
+              appState.showProxyName,
+            ),
+          );
+        },
+        builder: (_, state, __) {
+          return Container(
+            padding: const EdgeInsets.all(16).copyWith(top: 0),
            child: Column(
+              mainAxisSize: MainAxisSize.min,
+              crossAxisAlignment: CrossAxisAlignment.start,
              children: [
                Flexible(
                  flex: 0,
-                  child: Container(
-                    padding: const EdgeInsets.all(16),
-                    child: Row(
-                      children: [
-                        Icon(
-                          Icons.network_check,
-                          color: Theme.of(context).colorScheme.primary,
-                        ),
-                        const SizedBox(
-                          width: 8,
-                        ),
-                        Flexible(
-                          flex: 1,
-                          child: FadeBox(
-                            child: ipInfo != null
-                                ? CountryFlag.fromCountryCode(
-                                    ipInfo.countryCode,
-                                    width: 24,
-                                    height: 24,
-                                  )
-                                : ValueListenableBuilder(
-                                    valueListenable: timeoutNotifier,
-                                    builder: (_, timeout, __) {
-                                      if (timeout) {
-                                        return Text(
-                                          appLocalizations.checkError,
-                                          style: Theme.of(context)
-                                              .textTheme
-                                              .titleMedium,
-                                          maxLines: 1,
-                                          overflow: TextOverflow.ellipsis,
-                                        );
-                                      }
-                                      return TooltipText(
-                                        text: Text(
-                                          appLocalizations.checking,
-                                          maxLines: 1,
-                                          overflow: TextOverflow.ellipsis,
-                                          style: Theme.of(context)
-                                              .textTheme
-                                              .titleMedium,
-                                        ),
-                                      );
-                                    },
-                                  ),
-                          ),
-                        ),
-                      ],
+                  child: TooltipText(
+                    text: Text(
+                      state.currentProxyName ?? appLocalizations.noProxy,
+                      overflow: TextOverflow.ellipsis,
+                      maxLines: 1,
+                      style: Theme.of(context)
+                          .textTheme
+                          .titleMedium
+                          ?.toSoftBold(),
                    ),
                  ),
                ),
-                Container(
-                  height:
-                      globalState.appController.measure.titleLargeHeight + 24,
-                  alignment: Alignment.centerLeft,
-                  padding: const EdgeInsets.all(16).copyWith(top: 0),
-                  child: FadeBox(
-                    child: ipInfo != null
-                        ? Column(
-                            crossAxisAlignment: CrossAxisAlignment.start,
-                            mainAxisSize: MainAxisSize.min,
-                            children: [
-                              Flexible(
-                                flex: 1,
-                                child: TooltipText(
-                                  text: Text(
-                                    ipInfo.ip,
-                                    style: context.textTheme.titleLarge
-                                        ?.toSoftBold(),
-                                    maxLines: 1,
-                                    overflow: TextOverflow.ellipsis,
-                                  ),
-                                ),
-                              ),
-                            ],
-                          )
-                        : ValueListenableBuilder(
-                            valueListenable: timeoutNotifier,
-                            builder: (_, timeout, __) {
-                              if (timeout) {
-                                return Text(
-                                  "timeout",
-                                  style: context.textTheme.titleMedium
-                                      ?.copyWith(color: Colors.red)
-                                      .toSoftBold(),
-                                  maxLines: 1,
-                                  overflow: TextOverflow.ellipsis,
-                                );
-                              }
-                              return Container(
-                                padding: const EdgeInsets.all(2),
-                                child: const AspectRatio(
-                                  aspectRatio: 1,
-                                  child: CircularProgressIndicator(),
-                                ),
-                              );
-                            },
-                          ),
+                const SizedBox(
+                  height: 8,
+                ),
+                Flexible(
+                  child: Container(
+                    height: globalState.appController.measure.titleLargeHeight,
+                    alignment: Alignment.centerLeft,
+                    child: FadeBox(
+                      child: _buildDescription(
+                        state.currentProxyName,
+                        state.delay,
+                      ),
+                    ),
                  ),
-                )
+                ),
              ],
            ),
          );
--- a/lib/fragments/dashboard/start_button.dart
+++ b/lib/fragments/dashboard/start_button.dart
@@ -19,7 +19,7 @@ class _StartButtonState extends State<StartButton>

  @override
  void initState() {
-    isStart = globalState.appController.appState.isStart;
+    isStart = context.read<AppState>().runTime != null;
    _controller = AnimationController(
      vsync: this,
      value: isStart ? 1 : 0,
@@ -48,11 +48,9 @@ class _StartButtonState extends State<StartButton>
    }
  }

-  updateSystemProxy() {
-    WidgetsBinding.instance.addPostFrameCallback((_) async {
-      final appController = globalState.appController;
-      await appController.updateSystemProxy(isStart);
-    });
+  updateSystemProxy() async {
+    final appController = globalState.appController;
+    await appController.updateSystemProxy(isStart);
  }

  @override
--- a/lib/fragments/logs.dart
+++ b/lib/fragments/logs.dart
@@ -56,9 +56,6 @@ class _LogsFragmentState extends State<LogsFragment> {
            );
          },
          icon: const Icon(Icons.search),
-        ),
-        const SizedBox(
-          width: 8,
        )
      ];
    });
@@ -142,9 +139,6 @@ class LogsSearchDelegate extends SearchDelegate {
        },
        icon: const Icon(Icons.clear),
      ),
-      const SizedBox(
-        width: 8,
-      )
    ];
  }

--- a/lib/fragments/profiles/edit_profile.dart
+++ b/lib/fragments/profiles/edit_profile.dart
@@ -1,5 +1,4 @@
 import 'package:fl_clash/common/common.dart';
-import 'package:fl_clash/enum/enum.dart';
 import 'package:fl_clash/models/models.dart';
 import 'package:fl_clash/state.dart';
 import 'package:fl_clash/widgets/widgets.dart';
@@ -41,7 +40,7 @@ class _EditProfileState extends State<EditProfile> {
  _handleConfirm() {
    if (!_formKey.currentState!.validate()) return;
    final config = widget.context.read<Config>();
-    final hasUpdate = urlController.text.isNotEmpty && widget.profile.url != urlController.text;
+    final hasUpdate = widget.profile.url != urlController.text;
    widget.profile.url = urlController.text;
    widget.profile.label = labelController.text;
    widget.profile.autoUpdate = autoUpdate;
@@ -83,7 +82,7 @@ class _EditProfileState extends State<EditProfile> {
          },
        ),
      ),
-      if (widget.profile.type == ProfileType.url)...[
+      if (widget.profile.url != null)...[
        ListItem(
          title: TextFormField(
            controller: urlController,
--- a/lib/fragments/profiles/profiles.dart
+++ b/lib/fragments/profiles/profiles.dart
@@ -25,7 +25,15 @@ class ProfilesFragment extends StatefulWidget {
 }

 class _ProfilesFragmentState extends State<ProfilesFragment> {
-  final hasPadding = ValueNotifier<bool>(false);
+  _handleDeleteProfile(String id) async {
+    globalState.appController.deleteProfile(id);
+  }
+
+  _handleUpdateProfile(String id) async {
+    context.findAncestorStateOfType<CommonScaffoldState>()?.loadingRun(
+          () => globalState.appController.updateProfile(id),
+        );
+  }

  _handleShowAddExtendPage() {
    showExtendPage(
@@ -37,6 +45,76 @@ class _ProfilesFragmentState extends State<ProfilesFragment> {
    );
  }

+  _handleShowEditExtendPage(Profile profile) {
+    showExtendPage(
+      context,
+      body: EditProfile(
+        profile: profile.copyWith(),
+        context: context,
+      ),
+      title: "${appLocalizations.edit}${appLocalizations.profile}",
+    );
+  }
+
+  _buildGrid({
+    required ProfilesSelectorState state,
+    int crossAxisCount = 1,
+  }) {
+    return SingleChildScrollView(
+      padding: crossAxisCount > 1
+          ? const EdgeInsets.symmetric(horizontal: 16)
+          : EdgeInsets.zero,
+      child: Grid.baseGap(
+        crossAxisCount: crossAxisCount,
+        children: [
+          for (final profile in state.profiles)
+            GridItem(
+              child: ProfileItem(
+                profile: profile,
+                commonPopupMenu: CommonPopupMenu<ProfileActions>(
+                  items: [
+                    CommonPopupMenuItem(
+                      action: ProfileActions.edit,
+                      label: appLocalizations.edit,
+                      iconData: Icons.edit,
+                    ),
+                    if (profile.url != null)
+                      CommonPopupMenuItem(
+                        action: ProfileActions.update,
+                        label: appLocalizations.update,
+                        iconData: Icons.sync,
+                      ),
+                    CommonPopupMenuItem(
+                      action: ProfileActions.delete,
+                      label: appLocalizations.delete,
+                      iconData: Icons.delete,
+                    ),
+                  ],
+                  onSelected: (ProfileActions? action) async {
+                    switch (action) {
+                      case ProfileActions.edit:
+                        _handleShowEditExtendPage(profile);
+                        break;
+                      case ProfileActions.delete:
+                        _handleDeleteProfile(profile.id);
+                        break;
+                      case ProfileActions.update:
+                        _handleUpdateProfile(profile.id);
+                        break;
+                      case null:
+                        break;
+                    }
+                  },
+                ),
+                groupValue: state.currentProfileId,
+                onChanged: globalState.appController.changeProfile,
+              ),
+            ),
+        ],
+      ),
+    );
+  }
+
  _getColumns(ViewMode viewMode) {
    switch (viewMode) {
      case ViewMode.mobile:
@@ -48,104 +126,33 @@ class _ProfilesFragmentState extends State<ProfilesFragment> {
    }
  }

-  _initScaffoldState() {
-    WidgetsBinding.instance.addPostFrameCallback(
-      (_) {
-        final commonScaffoldState =
-            context.findAncestorStateOfType<CommonScaffoldState>();
-        commonScaffoldState?.actions = [
-          IconButton(
-            onPressed: () {
-              commonScaffoldState.loadingRun<void>(
-                () async {
-                  await globalState.appController.updateProfiles();
-                },
-              );
-            },
-            icon: const Icon(Icons.sync),
-          ),
-          const SizedBox(
-            width: 8,
-          )
-        ];
-        commonScaffoldState?.floatingActionButton = FloatingActionButton(
-          heroTag: null,
-          onPressed: _handleShowAddExtendPage,
-          child: const Icon(
-            Icons.add,
-          ),
-        );
-      },
-    );
-  }
-
  @override
  Widget build(BuildContext context) {
-    return Selector<AppState, bool>(
-      selector: (_, appState) => appState.currentLabel == 'profiles',
-      builder: (_, isCurrent, child) {
-        if (isCurrent) {
-          _initScaffoldState();
-        }
-        return child!;
-      },
+    return FloatLayout(
+      floatingWidget: Container(
+        margin: const EdgeInsets.all(kFloatingActionButtonMargin),
+        child: FloatingActionButton(
+          heroTag: null,
+          onPressed: _handleShowAddExtendPage,
+          child: const Icon(Icons.add),
+        ),
+      ),
      child: Selector2<AppState, Config, ProfilesSelectorState>(
        selector: (_, appState, config) => ProfilesSelectorState(
-          profiles: config.profiles,
-          currentProfileId: config.currentProfileId,
-          viewMode: appState.viewMode,
-        ),
+            profiles: config.profiles,
+            currentProfileId: config.currentProfileId,
+            viewMode: appState.viewMode),
        builder: (context, state, child) {
          if (state.profiles.isEmpty) {
            return NullStatus(
              label: appLocalizations.nullProfileDesc,
            );
          }
-          final columns = _getColumns(state.viewMode);
-          final isMobile = state.viewMode == ViewMode.mobile;
          return Align(
            alignment: Alignment.topCenter,
-            child: NotificationListener<ScrollNotification>(
-              onNotification: (scrollNotification) {
-                WidgetsBinding.instance.addPostFrameCallback((_) {
-                  hasPadding.value =
-                      scrollNotification.metrics.maxScrollExtent > 0;
-                });
-                return true;
-              },
-              child: ValueListenableBuilder(
-                valueListenable: hasPadding,
-                builder: (_, hasPadding, __) {
-                  return SingleChildScrollView(
-                    padding: !isMobile
-                        ? EdgeInsets.only(
-                            left: 16,
-                            right: 16,
-                            top: 16,
-                            bottom: 16 + (hasPadding ? 56 : 0),
-                          )
-                        : EdgeInsets.only(
-                            bottom: 0 + (hasPadding ? 56 : 0),
-                          ),
-                    child: Grid(
-                      mainAxisSpacing: isMobile ? 8 : 16,
-                      crossAxisSpacing: 16,
-                      crossAxisCount: columns,
-                      children: [
-                        for (final profile in state.profiles)
-                          GridItem(
-                            child: ProfileItem(
-                              profile: profile,
-                              groupValue: state.currentProfileId,
-                              onChanged:
-                                  globalState.appController.changeProfile,
-                            ),
-                          ),
-                      ],
-                    ),
-                  );
-                },
-              ),
+            child: _buildGrid(
+              state: state,
+              crossAxisCount: _getColumns(state.viewMode),
            ),
          );
        },
@@ -154,188 +161,92 @@ class _ProfilesFragmentState extends State<ProfilesFragment> {
  }
 }

-class ProfileItem extends StatefulWidget {
+class ProfileItem extends StatelessWidget {
  final Profile profile;
  final String? groupValue;
+  final CommonPopupMenu commonPopupMenu;
  final void Function(String? value) onChanged;

  const ProfileItem({
    super.key,
    required this.profile,
+    required this.commonPopupMenu,
    required this.groupValue,
    required this.onChanged,
  });

  @override
-  State<ProfileItem> createState() => _ProfileItemState();
-}
-
-class _ProfileItemState extends State<ProfileItem> {
-  final isUpdating = ValueNotifier<bool>(false);
-
-  _handleDeleteProfile(String id) async {
-    globalState.appController.deleteProfile(id);
-  }
-
-  _handleUpdateProfile(String id) async {
-    isUpdating.value = true;
-    await globalState.safeRun<void>(() async {
-      await globalState.appController.updateProfile(id);
-    });
-    isUpdating.value = false;
-  }
-
-  _handleShowEditExtendPage(
-    Profile profile,
-  ) {
-    showExtendPage(
-      context,
-      body: EditProfile(
-        profile: profile.copyWith(),
-        context: context,
+  Widget build(BuildContext context) {
+    String useShow;
+    String totalShow;
+    double progress;
+    final userInfo = profile.userInfo;
+    if (userInfo == null) {
+      useShow = "Infinite";
+      totalShow = "Infinite";
+      progress = 1;
+    } else {
+      final use = userInfo.upload + userInfo.download;
+      final total = userInfo.total;
+      useShow = TrafficValue(value: use).show;
+      totalShow = TrafficValue(value: total).show;
+      progress = total == 0 ? 0.0 : use / total;
+    }
+    return ListItem.radio(
+      horizontalTitleGap: 16,
+      delegate: RadioDelegate<String?>(
+        value: profile.id,
+        groupValue: groupValue,
+        onChanged: onChanged,
      ),
-      title: "${appLocalizations.edit}${appLocalizations.profile}",
-    );
-  }
-
-  _buildTitle(Profile profile) {
-    final textTheme = context.textTheme;
-    final userInfo = profile.userInfo ?? UserInfo();
-    final use = userInfo.upload + userInfo.download;
-    final total = userInfo.total;
-    final useShow = TrafficValue(value: use).show;
-    final totalShow = TrafficValue(value: total).show;
-    final progress = total == 0 ? 0.0 : use / total;
-    final expireShow = userInfo.expire == 0
-        ? "长期有效"
-        : DateTime.fromMillisecondsSinceEpoch(userInfo.expire * 1000).show;
-    return Container(
-      padding: const EdgeInsets.symmetric(vertical: 4),
-      child: Column(
+      padding: const EdgeInsets.symmetric(horizontal: 16),
+      trailing: commonPopupMenu,
+      title: Column(
+        mainAxisSize: MainAxisSize.min,
        crossAxisAlignment: CrossAxisAlignment.start,
        mainAxisAlignment: MainAxisAlignment.center,
        children: [
-          Row(
-            mainAxisSize: MainAxisSize.max,
-            mainAxisAlignment: MainAxisAlignment.spaceBetween,
-            children: [
-              Text(
-                profile.label ?? profile.id,
-                style: textTheme.titleMedium,
-                maxLines: 1,
-                overflow: TextOverflow.ellipsis,
-              ),
-              Text(
-                profile.lastUpdateDate?.lastUpdateTimeDesc ?? '',
-                style: textTheme.labelMedium?.toLight(),
-              ),
-            ],
+          Flexible(
+            child: Row(
+              mainAxisSize: MainAxisSize.max,
+              mainAxisAlignment: MainAxisAlignment.spaceBetween,
+              children: [
+                Flexible(
+                  child: Text(
+                    profile.label ?? profile.id,
+                    style: Theme.of(context).textTheme.titleMedium,
+                    maxLines: 1,
+                    overflow: TextOverflow.ellipsis,
+                  ),
+                ),
+                Flexible(
+                  child: Text(
+                    profile.lastUpdateDate?.lastUpdateTimeDesc ?? '',
+                    style: Theme.of(context).textTheme.labelMedium?.toLight(),
+                  ),
+                ),
+              ],
+            ),
          ),
-          Column(
-            mainAxisSize: MainAxisSize.min,
-            crossAxisAlignment: CrossAxisAlignment.start,
-            mainAxisAlignment: MainAxisAlignment.center,
-            children: [
-              Container(
-                margin: const EdgeInsets.symmetric(
-                  vertical: 8,
-                ),
-                child: LinearProgressIndicator(
-                  minHeight: 6,
-                  value: progress,
-                ),
+          Flexible(
+            child: Container(
+              margin: const EdgeInsets.symmetric(
+                vertical: 8,
              ),
-              Text(
-                "$useShow / $totalShow",
-                style: textTheme.labelMedium?.toLight(),
+              child: LinearProgressIndicator(
+                minHeight: 6,
+                value: progress,
              ),
-              const SizedBox(
-                height: 2,
-              ),
-              Row(
-                children: [
-                  Text(
-                    "到期时间:",
-                    style: textTheme.labelMedium?.toLighter(),
-                  ),
-                  const SizedBox(
-                    width: 4,
-                  ),
-                  Text(
-                    expireShow,
-                    style: textTheme.labelMedium?.toLighter(),
-                  ),
-                ],
-              )
-            ],
+            ),
+          ),
+          Flexible(
+            child: Text(
+              "$useShow / $totalShow",
+              style: Theme.of(context).textTheme.labelMedium?.toLight(),
+            ),
          ),
        ],
      ),
    );
  }
-
-  @override
-  Widget build(BuildContext context) {
-    final profile = widget.profile;
-    final groupValue = widget.groupValue;
-    final onChanged = widget.onChanged;
-    return Selector<AppState, ViewMode>(
-      selector: (_, appState) => appState.viewMode,
-      builder: (_, viewMode, child) {
-        if (viewMode == ViewMode.mobile) {
-          return child!;
-        }
-        return CommonCard(
-          child: child!,
-        );
-      },
-      child: ListItem.radio(
-        key: Key(profile.id),
-        horizontalTitleGap: 16,
-        delegate: RadioDelegate<String?>(
-          value: profile.id,
-          groupValue: groupValue,
-          onChanged: onChanged,
-        ),
-        padding: const EdgeInsets.symmetric(horizontal: 16),
-        trailing: CommonPopupMenu<ProfileActions>(
-          items: [
-            CommonPopupMenuItem(
-              action: ProfileActions.edit,
-              label: appLocalizations.edit,
-              iconData: Icons.edit,
-            ),
-            if (profile.type == ProfileType.url)
-              CommonPopupMenuItem(
-                action: ProfileActions.update,
-                label: appLocalizations.update,
-                iconData: Icons.sync,
-              ),
-            CommonPopupMenuItem(
-              action: ProfileActions.delete,
-              label: appLocalizations.delete,
-              iconData: Icons.delete,
-            ),
-          ],
-          onSelected: (ProfileActions? action) async {
-            switch (action) {
-              case ProfileActions.edit:
-                _handleShowEditExtendPage(profile);
-                break;
-              case ProfileActions.delete:
-                _handleDeleteProfile(profile.id);
-                break;
-              case ProfileActions.update:
-                _handleUpdateProfile(profile.id);
-                break;
-              case null:
-                break;
-            }
-          },
-        ),
-        title: _buildTitle(profile),
-        tileTitleAlignment: ListTileTitleAlignment.titleHeight,
-      ),
-    );
-  }
 }
--- a/lib/fragments/proxies.dart
+++ b/lib/fragments/proxies.dart
@@ -1,4 +1,3 @@
-import 'package:fl_clash/clash/clash.dart';
 import 'package:fl_clash/state.dart';
 import 'package:flutter/material.dart';
 import 'package:provider/provider.dart';
@@ -51,9 +50,6 @@ class _ProxiesFragmentState extends State<ProxiesFragment>
              selectedValue: proxiesSortType,
            );
          },
-        ),
-        const SizedBox(
-          width: 8,
        )
      ];
    });
@@ -61,69 +57,72 @@ class _ProxiesFragmentState extends State<ProxiesFragment>

  @override
  Widget build(BuildContext context) {
-    return Selector<AppState, bool>(
-      selector: (_, appState) => appState.currentLabel == 'proxies',
-      builder: (_, isCurrent, child) {
-        if (isCurrent) {
-          _initActions();
-        }
-        return child!;
-      },
-      child: Selector3<AppState, Config, ClashConfig, ProxiesSelectorState>(
-        selector: (_, appState, config, clashConfig) {
-          final currentGroups = appState.currentGroups;
-          final groupNames = currentGroups.map((e) => e.name).toList();
-          return ProxiesSelectorState(
-            groupNames: groupNames,
-          );
-        },
-        shouldRebuild: (prev, next) {
-          if (prev.groupNames.length != next.groupNames.length) {
-            _tabController?.dispose();
-            _tabController = null;
+    return DelayTestButtonContainer(
+      child: Selector<AppState, bool>(
+        selector: (_, appState) => appState.currentLabel == 'proxies',
+        builder: (_, isCurrent, child) {
+          if (isCurrent) {
+            _initActions();
          }
-          return prev != next;
+          return child!;
        },
-        builder: (_, state, __) {
-          _tabController ??= TabController(
-            length: state.groupNames.length,
-            vsync: this,
-          );
-          return Column(
-            mainAxisAlignment: MainAxisAlignment.start,
-            crossAxisAlignment: CrossAxisAlignment.start,
-            children: [
-              TabBar(
-                controller: _tabController,
-                padding: const EdgeInsets.symmetric(horizontal: 16),
-                dividerColor: Colors.transparent,
-                isScrollable: true,
-                tabAlignment: TabAlignment.start,
-                overlayColor: const WidgetStatePropertyAll(Colors.transparent),
-                tabs: [
-                  for (final groupName in state.groupNames)
-                    Tab(
-                      text: groupName,
-                    ),
-                ],
-              ),
-              Expanded(
-                child: TabBarView(
+        child: Selector3<AppState, Config, ClashConfig, ProxiesSelectorState>(
+          selector: (_, appState, config, clashConfig) {
+            final currentGroups = appState.currentGroups;
+            final groupNames = currentGroups.map((e) => e.name).toList();
+            return ProxiesSelectorState(
+              groupNames: groupNames,
+            );
+          },
+          shouldRebuild: (prev, next) {
+            if (prev.groupNames.length != next.groupNames.length) {
+              _tabController?.dispose();
+              _tabController = null;
+            }
+            return prev != next;
+          },
+          builder: (_, state, __) {
+            _tabController ??= TabController(
+              length: state.groupNames.length,
+              vsync: this,
+            );
+            return Column(
+              mainAxisAlignment: MainAxisAlignment.start,
+              crossAxisAlignment: CrossAxisAlignment.start,
+              children: [
+                TabBar(
                  controller: _tabController,
-                  children: [
+                  padding: const EdgeInsets.symmetric(horizontal: 16),
+                  dividerColor: Colors.transparent,
+                  isScrollable: true,
+                  tabAlignment: TabAlignment.start,
+                  overlayColor:
+                      const WidgetStatePropertyAll(Colors.transparent),
+                  tabs: [
                    for (final groupName in state.groupNames)
-                      KeepContainer(
-                        key: ObjectKey(groupName),
-                        child: ProxiesTabView(
-                          groupName: groupName,
-                        ),
+                      Tab(
+                        text: groupName,
                      ),
                  ],
                ),
-              )
-            ],
-          );
-        },
+                Expanded(
+                  child: TabBarView(
+                    controller: _tabController,
+                    children: [
+                      for (final groupName in state.groupNames)
+                        KeepContainer(
+                          key: ObjectKey(groupName),
+                          child: ProxiesTabView(
+                            groupName: groupName,
+                          ),
+                        ),
+                    ],
+                  ),
+                )
+              ],
+            );
+          },
+        ),
      ),
    );
  }
@@ -197,23 +196,6 @@ class ProxiesTabView extends StatelessWidget {
    }
  }

-  _delayTest(List<Proxy> proxies) async {
-    for (final proxy in proxies) {
-      final appController = globalState.appController;
-      final proxyName = appController.appState.getRealProxyName(proxy.name) ?? proxy.name;
-      globalState.appController.setDelay(
-        Delay(
-          name: proxyName,
-          value: 0,
-        ),
-      );
-      clashCore.getDelay(proxyName).then((delay) {
-        globalState.appController.setDelay(delay);
-      });
-    }
-    await Future.delayed(httpTimeoutDuration + moreDuration);
-  }
-
  @override
  Widget build(BuildContext context) {
    return Selector2<AppState, Config, ProxiesTabViewSelectorState>(
@@ -231,32 +213,25 @@ class ProxiesTabView extends StatelessWidget {
          state.group.all,
          state.proxiesSortType,
        );
-        return DelayTestButtonContainer(
-          onClick: () async {
-            await _delayTest(
-              state.group.all,
-            );
-          },
-          child: Align(
-            alignment: Alignment.topCenter,
-            child: GridView.builder(
-              padding: const EdgeInsets.all(16),
-              gridDelegate: SliverGridDelegateWithFixedCrossAxisCount(
-                crossAxisCount: _getColumns(state.viewMode),
-                mainAxisSpacing: 8,
-                crossAxisSpacing: 8,
-                mainAxisExtent: _getItemHeight(context),
-              ),
-              itemCount: proxies.length,
-              itemBuilder: (_, index) {
-                final proxy = proxies[index];
-                return ProxyCard(
-                  key: ValueKey('$groupName.${proxy.name}'),
-                  proxy: proxy,
-                  groupName: groupName,
-                );
-              },
+        return Align(
+          alignment: Alignment.topCenter,
+          child: GridView.builder(
+            padding: const EdgeInsets.all(16),
+            gridDelegate: SliverGridDelegateWithFixedCrossAxisCount(
+              crossAxisCount: _getColumns(state.viewMode),
+              mainAxisSpacing: 8,
+              crossAxisSpacing: 8,
+              mainAxisExtent: _getItemHeight(context),
            ),
+            itemCount: proxies.length,
+            itemBuilder: (_, index) {
+              final proxy = proxies[index];
+              return ProxyCard(
+                key: ValueKey('$groupName.${proxy.name}'),
+                proxy: proxy,
+                groupName: groupName,
+              );
+            },
          ),
        );
      },
@@ -409,12 +384,10 @@ class ProxyCard extends StatelessWidget {

 class DelayTestButtonContainer extends StatefulWidget {
  final Widget child;
-  final Future Function() onClick;

  const DelayTestButtonContainer({
    super.key,
    required this.child,
-    required this.onClick,
  });

  @override
@@ -428,9 +401,12 @@ class _DelayTestButtonContainerState extends State<DelayTestButtonContainer>
  late Animation<double> _scale;

  _healthcheck() async {
+    if (globalState.healthcheckLock) return;
    _controller.forward();
-    await widget.onClick();
-    _controller.reverse();
+    globalState.appController.healthcheck();
+    Future.delayed(httpTimeoutDuration + moreDuration, () {
+      _controller.reverse();
+    });
  }

  @override
@@ -439,7 +415,7 @@ class _DelayTestButtonContainerState extends State<DelayTestButtonContainer>
    _controller = AnimationController(
      vsync: this,
      duration: const Duration(
-        milliseconds: 200,
+        milliseconds: 600,
      ),
    );
    _scale = Tween<double>(
@@ -451,6 +427,7 @@ class _DelayTestButtonContainerState extends State<DelayTestButtonContainer>
        curve: const Interval(
          0,
          1,
+          curve: Curves.elasticInOut,
        ),
      ),
    );
@@ -464,7 +441,6 @@ class _DelayTestButtonContainerState extends State<DelayTestButtonContainer>

  @override
  Widget build(BuildContext context) {
-    _controller.reverse();
    return FloatLayout(
      floatingWidget: FloatWrapper(
        child: AnimatedBuilder(
--- a/lib/l10n/arb/intl_en.arb
+++ b/lib/l10n/arb/intl_en.arb
@@ -156,15 +156,5 @@
  "goDownload": "Go to download",
  "unknown": "Unknown",
  "geoData": "GeoData",
-  "externalResources": "External resources",
-  "checking": "Checking...",
-  "country": "Country",
-  "checkError": "Check error",
-  "ipCheckTimeout": "Ip check timeout",
-  "search": "Search",
-  "allowBypass": "Allow applications to bypass VPN",
-  "allowBypassDesc": "Enabled to some applications can bypass VPN",
-  "externalController": "ExternalController",
-  "externalControllerDesc": "Enabled to control the clash on port 9090",
-  "ipv6Desc": "Enabled to will allow it to receive ipv6 traffic"
+  "externalResources": "External resources"
 }
--- a/lib/l10n/arb/intl_zh_CN.arb
+++ b/lib/l10n/arb/intl_zh_CN.arb
@@ -156,15 +156,5 @@
  "goDownload": "前往下载",
  "unknown": "未知",
  "geoData": "地理数据",
-  "externalResources": "外部资源",
-  "checking": "检测中...",
-  "country": "区域",
-  "checkError": "检测失败",
-  "ipCheckTimeout": "Ip检测超时",
-  "search": "搜索",
-  "allowBypass": "允许应用绕过vpn",
-  "allowBypassDesc": "开启后部分应用可绕过VPN",
-  "externalController": "外部控制器",
-  "externalControllerDesc": "开启后可通过9090端口控制clash内核",
-  "ipv6Desc": "开启后将可以接收ipv6流量"
+  "externalResources": "外部资源"
 }
--- a/lib/l10n/intl/messages_en.dart
+++ b/lib/l10n/intl/messages_en.dart
@@ -40,10 +40,6 @@ class MessageLookup extends MessageLookupByLibrary {
        "addressTip": MessageLookupByLibrary.simpleMessage(
            "Please enter a valid WebDAV address"),
        "ago": MessageLookupByLibrary.simpleMessage(" Ago"),
-        "allowBypass": MessageLookupByLibrary.simpleMessage(
-            "Allow applications to bypass VPN"),
-        "allowBypassDesc": MessageLookupByLibrary.simpleMessage(
-            "Enabled to some applications can bypass VPN"),
        "allowLan": MessageLookupByLibrary.simpleMessage("AllowLan"),
        "allowLanDesc": MessageLookupByLibrary.simpleMessage(
            "Allow access proxy through the LAN"),
@@ -80,12 +76,10 @@ class MessageLookup extends MessageLookupByLibrary {
            MessageLookupByLibrary.simpleMessage("Cancel filter system app"),
        "cancelSelectAll":
            MessageLookupByLibrary.simpleMessage("Cancel select all"),
-        "checkError": MessageLookupByLibrary.simpleMessage("Check error"),
        "checkUpdate":
            MessageLookupByLibrary.simpleMessage("Check for updates"),
        "checkUpdateError": MessageLookupByLibrary.simpleMessage(
            "The current application is already the latest version"),
-        "checking": MessageLookupByLibrary.simpleMessage("Checking..."),
        "compatible":
            MessageLookupByLibrary.simpleMessage("Compatibility mode"),
        "compatibleDesc": MessageLookupByLibrary.simpleMessage(
@@ -94,7 +88,6 @@ class MessageLookup extends MessageLookupByLibrary {
        "connectivity": MessageLookupByLibrary.simpleMessage("Connectivity："),
        "core": MessageLookupByLibrary.simpleMessage("Core"),
        "coreInfo": MessageLookupByLibrary.simpleMessage("Core info"),
-        "country": MessageLookupByLibrary.simpleMessage("Country"),
        "create": MessageLookupByLibrary.simpleMessage("Create"),
        "dark": MessageLookupByLibrary.simpleMessage("Dark"),
        "dashboard": MessageLookupByLibrary.simpleMessage("Dashboard"),
@@ -116,10 +109,6 @@ class MessageLookup extends MessageLookupByLibrary {
        "edit": MessageLookupByLibrary.simpleMessage("Edit"),
        "en": MessageLookupByLibrary.simpleMessage("English"),
        "exit": MessageLookupByLibrary.simpleMessage("Exit"),
-        "externalController":
-            MessageLookupByLibrary.simpleMessage("ExternalController"),
-        "externalControllerDesc": MessageLookupByLibrary.simpleMessage(
-            "Enabled to control the clash on port 9090"),
        "externalResources":
            MessageLookupByLibrary.simpleMessage("External resources"),
        "file": MessageLookupByLibrary.simpleMessage("File"),
@@ -133,10 +122,6 @@ class MessageLookup extends MessageLookupByLibrary {
        "hours": MessageLookupByLibrary.simpleMessage("Hours"),
        "importFromURL":
            MessageLookupByLibrary.simpleMessage("Import from URL"),
-        "ipCheckTimeout":
-            MessageLookupByLibrary.simpleMessage("Ip check timeout"),
-        "ipv6Desc": MessageLookupByLibrary.simpleMessage(
-            "Enabled to will allow it to receive ipv6 traffic"),
        "just": MessageLookupByLibrary.simpleMessage("Just"),
        "language": MessageLookupByLibrary.simpleMessage("Language"),
        "light": MessageLookupByLibrary.simpleMessage("Light"),
@@ -222,7 +207,6 @@ class MessageLookup extends MessageLookupByLibrary {
            "External resource related info"),
        "rule": MessageLookupByLibrary.simpleMessage("Rule"),
        "save": MessageLookupByLibrary.simpleMessage("Save"),
-        "search": MessageLookupByLibrary.simpleMessage("Search"),
        "selectAll": MessageLookupByLibrary.simpleMessage("Select all"),
        "selected": MessageLookupByLibrary.simpleMessage("Selected"),
        "settings": MessageLookupByLibrary.simpleMessage("Settings"),
--- a/lib/l10n/intl/messages_zh_CN.dart
+++ b/lib/l10n/intl/messages_zh_CN.dart
@@ -36,9 +36,6 @@ class MessageLookup extends MessageLookupByLibrary {
        "addressHelp": MessageLookupByLibrary.simpleMessage("WebDAV服务器地址"),
        "addressTip": MessageLookupByLibrary.simpleMessage("请输入有效的WebDAV地址"),
        "ago": MessageLookupByLibrary.simpleMessage("前"),
-        "allowBypass": MessageLookupByLibrary.simpleMessage("允许应用绕过vpn"),
-        "allowBypassDesc":
-            MessageLookupByLibrary.simpleMessage("开启后部分应用可绕过VPN"),
        "allowLan": MessageLookupByLibrary.simpleMessage("局域网代理"),
        "allowLanDesc": MessageLookupByLibrary.simpleMessage("允许通过局域网访问代理"),
        "appAccessControl": MessageLookupByLibrary.simpleMessage("应用访问控制"),
@@ -66,10 +63,8 @@ class MessageLookup extends MessageLookupByLibrary {
        "cancelFilterSystemApp":
            MessageLookupByLibrary.simpleMessage("取消过滤系统应用"),
        "cancelSelectAll": MessageLookupByLibrary.simpleMessage("取消全选"),
-        "checkError": MessageLookupByLibrary.simpleMessage("检测失败"),
        "checkUpdate": MessageLookupByLibrary.simpleMessage("检查更新"),
        "checkUpdateError": MessageLookupByLibrary.simpleMessage("当前应用已经是最新版了"),
-        "checking": MessageLookupByLibrary.simpleMessage("检测中..."),
        "compatible": MessageLookupByLibrary.simpleMessage("兼容模式"),
        "compatibleDesc":
            MessageLookupByLibrary.simpleMessage("开启将失去部分应用能力，获得全量的Clash的支持"),
@@ -77,7 +72,6 @@ class MessageLookup extends MessageLookupByLibrary {
        "connectivity": MessageLookupByLibrary.simpleMessage("连通性："),
        "core": MessageLookupByLibrary.simpleMessage("内核"),
        "coreInfo": MessageLookupByLibrary.simpleMessage("内核信息"),
-        "country": MessageLookupByLibrary.simpleMessage("区域"),
        "create": MessageLookupByLibrary.simpleMessage("创建"),
        "dark": MessageLookupByLibrary.simpleMessage("深色"),
        "dashboard": MessageLookupByLibrary.simpleMessage("仪表盘"),
@@ -96,9 +90,6 @@ class MessageLookup extends MessageLookupByLibrary {
        "edit": MessageLookupByLibrary.simpleMessage("编辑"),
        "en": MessageLookupByLibrary.simpleMessage("英语"),
        "exit": MessageLookupByLibrary.simpleMessage("退出"),
-        "externalController": MessageLookupByLibrary.simpleMessage("外部控制器"),
-        "externalControllerDesc":
-            MessageLookupByLibrary.simpleMessage("开启后可通过9090端口控制clash内核"),
        "externalResources": MessageLookupByLibrary.simpleMessage("外部资源"),
        "file": MessageLookupByLibrary.simpleMessage("文件"),
        "fileDesc": MessageLookupByLibrary.simpleMessage("直接上传配置文件"),
@@ -108,8 +99,6 @@ class MessageLookup extends MessageLookupByLibrary {
        "goDownload": MessageLookupByLibrary.simpleMessage("前往下载"),
        "hours": MessageLookupByLibrary.simpleMessage("小时"),
        "importFromURL": MessageLookupByLibrary.simpleMessage("从URL导入"),
-        "ipCheckTimeout": MessageLookupByLibrary.simpleMessage("Ip检测超时"),
-        "ipv6Desc": MessageLookupByLibrary.simpleMessage("开启后将可以接收ipv6流量"),
        "just": MessageLookupByLibrary.simpleMessage("刚刚"),
        "language": MessageLookupByLibrary.simpleMessage("语言"),
        "light": MessageLookupByLibrary.simpleMessage("浅色"),
@@ -178,7 +167,6 @@ class MessageLookup extends MessageLookupByLibrary {
        "resourcesDesc": MessageLookupByLibrary.simpleMessage("外部资源相关信息"),
        "rule": MessageLookupByLibrary.simpleMessage("规则"),
        "save": MessageLookupByLibrary.simpleMessage("保存"),
-        "search": MessageLookupByLibrary.simpleMessage("搜索"),
        "selectAll": MessageLookupByLibrary.simpleMessage("全选"),
        "selected": MessageLookupByLibrary.simpleMessage("已选择"),
        "settings": MessageLookupByLibrary.simpleMessage("设置"),
--- a/lib/l10n/l10n.dart
+++ b/lib/l10n/l10n.dart
@@ -1629,106 +1629,6 @@ class AppLocalizations {
      args: [],
    );
  }
-
-  /// `Checking...`
-  String get checking {
-    return Intl.message(
-      'Checking...',
-      name: 'checking',
-      desc: '',
-      args: [],
-    );
-  }
-
-  /// `Country`
-  String get country {
-    return Intl.message(
-      'Country',
-      name: 'country',
-      desc: '',
-      args: [],
-    );
-  }
-
-  /// `Check error`
-  String get checkError {
-    return Intl.message(
-      'Check error',
-      name: 'checkError',
-      desc: '',
-      args: [],
-    );
-  }
-
-  /// `Ip check timeout`
-  String get ipCheckTimeout {
-    return Intl.message(
-      'Ip check timeout',
-      name: 'ipCheckTimeout',
-      desc: '',
-      args: [],
-    );
-  }
-
-  /// `Search`
-  String get search {
-    return Intl.message(
-      'Search',
-      name: 'search',
-      desc: '',
-      args: [],
-    );
-  }
-
-  /// `Allow applications to bypass VPN`
-  String get allowBypass {
-    return Intl.message(
-      'Allow applications to bypass VPN',
-      name: 'allowBypass',
-      desc: '',
-      args: [],
-    );
-  }
-
-  /// `Enabled to some applications can bypass VPN`
-  String get allowBypassDesc {
-    return Intl.message(
-      'Enabled to some applications can bypass VPN',
-      name: 'allowBypassDesc',
-      desc: '',
-      args: [],
-    );
-  }
-
-  /// `ExternalController`
-  String get externalController {
-    return Intl.message(
-      'ExternalController',
-      name: 'externalController',
-      desc: '',
-      args: [],
-    );
-  }
-
-  /// `Enabled to control the clash on port 9090`
-  String get externalControllerDesc {
-    return Intl.message(
-      'Enabled to control the clash on port 9090',
-      name: 'externalControllerDesc',
-      desc: '',
-      args: [],
-    );
-  }
-
-  /// `Enabled to will allow it to receive ipv6 traffic`
-  String get ipv6Desc {
-    return Intl.message(
-      'Enabled to will allow it to receive ipv6 traffic',
-      name: 'ipv6Desc',
-      desc: '',
-      args: [],
-    );
-  }
 }

 class AppLocalizationDelegate extends LocalizationsDelegate<AppLocalizations> {
--- a/lib/main.dart
+++ b/lib/main.dart
@@ -22,16 +22,16 @@ Future<void> main() async {
    isCompatible: config.isCompatible,
    selectedMap: config.currentSelectedMap,
  );
-  appState.navigationItems = navigation.getItems(
-    openLogs: config.openLogs,
-    hasProxies: false,
-  );
  await globalState.init(
    appState: appState,
    config: config,
    clashConfig: clashConfig,
  );
-
+  globalState.updateNavigationItems(
+    appState: appState,
+    config: config,
+    clashConfig: clashConfig,
+  );
  runAppWithPreferences(
    const Application(),
    appState: appState,
@@ -61,16 +61,6 @@ Future<void> vpnService() async {
    clashConfig: clashConfig,
  );

-  if (appState.isInit) {
-    await globalState.applyProfile(
-      appState: appState,
-      config: config,
-      clashConfig: clashConfig,
-    );
-  } else {
-    exit(0);
-  }
-
  final appLocalizations = await AppLocalizations.load(
    other.getLocaleForString(config.locale) ??
        WidgetsBinding.instance.platformDispatcher.locale,
--- a/lib/models/app.dart
+++ b/lib/models/app.dart
@@ -89,8 +89,6 @@ class AppState with ChangeNotifier {
    }
  }

-  bool get isStart => _runTime != null;
-
  int? get runTime => _runTime;

  set runTime(int? value) {
@@ -107,7 +105,7 @@ class AppState with ChangeNotifier {
    } else {
      final index = groups.indexWhere((element) => element.name == proxyName);
      if (index == -1) return type;
-      return "$type(${groups[index].now ?? '*'})";
+      return "$type(${groups[index].now})";
    }
  }

@@ -168,7 +166,7 @@ class AppState with ChangeNotifier {

  addLog(Log log) {
    _logs.add(log);
-    if (_logs.length > 60) {
+    if(_logs.length > 60){
      _logs = _logs.sublist(_logs.length - 60);
    }
    notifyListeners();
--- a/lib/models/clash_config.dart
+++ b/lib/models/clash_config.dart
@@ -108,8 +108,6 @@ class Dns {
 class ClashConfig extends ChangeNotifier {
  int _mixedPort;
  bool _allowLan;
-  bool _ipv6;
-  String _externalController;
  Mode _mode;
  LogLevel _logLevel;
  Tun _tun;
@@ -120,19 +118,15 @@ class ClashConfig extends ChangeNotifier {
    int? mixedPort,
    Mode? mode,
    bool? allowLan,
-    bool? ipv6,
    LogLevel? logLevel,
-    String? externalController,
    Tun? tun,
    Dns? dns,
    List<String>? rules,
  })  : _mixedPort = mixedPort ?? 7890,
        _mode = mode ?? Mode.rule,
-        _ipv6 = ipv6 ?? false,
        _allowLan = allowLan ?? false,
        _logLevel = logLevel ?? LogLevel.info,
        _tun = tun ?? const Tun(),
-        _externalController = externalController ?? '',
        _dns = dns ?? Dns(),
        _rules = rules ?? [];

@@ -175,26 +169,6 @@ class ClashConfig extends ChangeNotifier {
    }
  }

-  @JsonKey(name: "external-controller", defaultValue: '')
-  String get externalController => _externalController;
-
-  set externalController(String value) {
-    if (_externalController != value) {
-      _externalController = value;
-      notifyListeners();
-    }
-  }
-
-  @JsonKey(defaultValue: false)
-  bool get ipv6 => _ipv6;
-
-  set ipv6(bool value) {
-    if (_ipv6 != value) {
-      _ipv6 = value;
-      notifyListeners();
-    }
-  }
-
  Tun get tun => _tun;

  set tun(Tun value) {
--- a/lib/models/config.dart
+++ b/lib/models/config.dart
@@ -8,7 +8,6 @@ import '../common/common.dart';
 import 'models.dart';

 part 'generated/config.g.dart';
-
 part 'generated/config.freezed.dart';

@freezed
@@ -24,17 +23,6 @@ class AccessControl with _$AccessControl {
      _$AccessControlFromJson(json);
 }

-@freezed
-class Props with _$Props {
-  const factory Props({
-    AccessControl? accessControl,
-    bool? allowBypass,
-  }) = _Props;
-
-  factory Props.fromJson(Map<String, Object?> json) =>
-      _$PropsFromJson(json);
-}
-
@JsonSerializable()
 class Config extends ChangeNotifier {
  List<Profile> _profiles;
@@ -53,7 +41,6 @@ class Config extends ChangeNotifier {
  AccessControl _accessControl;
  bool _isAnimateToPage;
  bool _autoCheckUpdate;
-  bool _allowBypass;
  DAV? _dav;

  Config()
@@ -70,8 +57,7 @@ class Config extends ChangeNotifier {
        _isAccessControl = false,
        _autoCheckUpdate = true,
        _accessControl = const AccessControl(),
-        _isAnimateToPage = true,
-        _allowBypass = true;
+        _isAnimateToPage = true;

  deleteProfileById(String id) {
    _profiles = profiles.where((element) => element.id != id).toList();
@@ -319,22 +305,8 @@ class Config extends ChangeNotifier {
    }
  }

-  @JsonKey(defaultValue: true)
-  bool get allowBypass {
-    return _allowBypass;
-  }
-
-  set allowBypass(bool value) {
-    if (_allowBypass != value) {
-      _allowBypass = value;
-      notifyListeners();
-    }
-  }
-
-  update([
-    Config? config,
-    RecoveryOption recoveryOptions = RecoveryOption.all,
-  ]) {
+  update(
+      [Config? config, RecoveryOption recoveryOptions = RecoveryOption.all]) {
    if (config != null) {
      _profiles = config._profiles;
      for (final profile in config._profiles) {
@@ -353,7 +325,6 @@ class Config extends ChangeNotifier {
      _openLog = config._openLog;
      _themeMode = config._themeMode;
      _locale = config._locale;
-      _allowBypass = config._allowBypass;
      _primaryColor = config._primaryColor;
      _proxiesSortType = config._proxiesSortType;
      _isMinimizeOnExit = config._isMinimizeOnExit;
--- a/lib/models/generated/clash_config.g.dart
+++ b/lib/models/generated/clash_config.g.dart
@@ -40,7 +40,6 @@ ClashConfig _$ClashConfigFromJson(Map<String, dynamic> json) => ClashConfig(
      mode: $enumDecodeNullable(_$ModeEnumMap, json['mode']),
      allowLan: json['allow-lan'] as bool?,
      logLevel: $enumDecodeNullable(_$LogLevelEnumMap, json['log-level']),
-      externalController: json['external-controller'] as String? ?? '',
      tun: json['tun'] == null
          ? null
          : Tun.fromJson(json['tun'] as Map<String, dynamic>),
@@ -57,7 +56,6 @@ Map<String, dynamic> _$ClashConfigToJson(ClashConfig instance) =>
      'mode': _$ModeEnumMap[instance.mode]!,
      'allow-lan': instance.allowLan,
      'log-level': _$LogLevelEnumMap[instance.logLevel]!,
-      'external-controller': instance.externalController,
      'tun': instance.tun,
      'dns': instance.dns,
      'rules': instance.rules,
--- a/lib/models/generated/config.freezed.dart
+++ b/lib/models/generated/config.freezed.dart
@@ -239,172 +239,3 @@ abstract class _AccessControl implements AccessControl {
  _$$AccessControlImplCopyWith<_$AccessControlImpl> get copyWith =>
      throw _privateConstructorUsedError;
 }
-
-Props _$PropsFromJson(Map<String, dynamic> json) {
-  return _Props.fromJson(json);
-}
-
-/// @nodoc
-mixin _$Props {
-  AccessControl? get accessControl => throw _privateConstructorUsedError;
-  bool? get allowBypass => throw _privateConstructorUsedError;
-
-  Map<String, dynamic> toJson() => throw _privateConstructorUsedError;
-  @JsonKey(ignore: true)
-  $PropsCopyWith<Props> get copyWith => throw _privateConstructorUsedError;
-}
-
-/// @nodoc
-abstract class $PropsCopyWith<$Res> {
-  factory $PropsCopyWith(Props value, $Res Function(Props) then) =
-      _$PropsCopyWithImpl<$Res, Props>;
-  @useResult
-  $Res call({AccessControl? accessControl, bool? allowBypass});
-
-  $AccessControlCopyWith<$Res>? get accessControl;
-}
-
-/// @nodoc
-class _$PropsCopyWithImpl<$Res, $Val extends Props>
-    implements $PropsCopyWith<$Res> {
-  _$PropsCopyWithImpl(this._value, this._then);
-
-  // ignore: unused_field
-  final $Val _value;
-  // ignore: unused_field
-  final $Res Function($Val) _then;
-
-  @pragma('vm:prefer-inline')
-  @override
-  $Res call({
-    Object? accessControl = freezed,
-    Object? allowBypass = freezed,
-  }) {
-    return _then(_value.copyWith(
-      accessControl: freezed == accessControl
-          ? _value.accessControl
-          : accessControl // ignore: cast_nullable_to_non_nullable
-              as AccessControl?,
-      allowBypass: freezed == allowBypass
-          ? _value.allowBypass
-          : allowBypass // ignore: cast_nullable_to_non_nullable
-              as bool?,
-    ) as $Val);
-  }
-
-  @override
-  @pragma('vm:prefer-inline')
-  $AccessControlCopyWith<$Res>? get accessControl {
-    if (_value.accessControl == null) {
-      return null;
-    }
-
-    return $AccessControlCopyWith<$Res>(_value.accessControl!, (value) {
-      return _then(_value.copyWith(accessControl: value) as $Val);
-    });
-  }
-}
-
-/// @nodoc
-abstract class _$$PropsImplCopyWith<$Res> implements $PropsCopyWith<$Res> {
-  factory _$$PropsImplCopyWith(
-          _$PropsImpl value, $Res Function(_$PropsImpl) then) =
-      __$$PropsImplCopyWithImpl<$Res>;
-  @override
-  @useResult
-  $Res call({AccessControl? accessControl, bool? allowBypass});
-
-  @override
-  $AccessControlCopyWith<$Res>? get accessControl;
-}
-
-/// @nodoc
-class __$$PropsImplCopyWithImpl<$Res>
-    extends _$PropsCopyWithImpl<$Res, _$PropsImpl>
-    implements _$$PropsImplCopyWith<$Res> {
-  __$$PropsImplCopyWithImpl(
-      _$PropsImpl _value, $Res Function(_$PropsImpl) _then)
-      : super(_value, _then);
-
-  @pragma('vm:prefer-inline')
-  @override
-  $Res call({
-    Object? accessControl = freezed,
-    Object? allowBypass = freezed,
-  }) {
-    return _then(_$PropsImpl(
-      accessControl: freezed == accessControl
-          ? _value.accessControl
-          : accessControl // ignore: cast_nullable_to_non_nullable
-              as AccessControl?,
-      allowBypass: freezed == allowBypass
-          ? _value.allowBypass
-          : allowBypass // ignore: cast_nullable_to_non_nullable
-              as bool?,
-    ));
-  }
-}
-
-/// @nodoc
-@JsonSerializable()
-class _$PropsImpl implements _Props {
-  const _$PropsImpl({this.accessControl, this.allowBypass});
-
-  factory _$PropsImpl.fromJson(Map<String, dynamic> json) =>
-      _$$PropsImplFromJson(json);
-
-  @override
-  final AccessControl? accessControl;
-  @override
-  final bool? allowBypass;
-
-  @override
-  String toString() {
-    return 'Props(accessControl: $accessControl, allowBypass: $allowBypass)';
-  }
-
-  @override
-  bool operator ==(Object other) {
-    return identical(this, other) ||
-        (other.runtimeType == runtimeType &&
-            other is _$PropsImpl &&
-            (identical(other.accessControl, accessControl) ||
-                other.accessControl == accessControl) &&
-            (identical(other.allowBypass, allowBypass) ||
-                other.allowBypass == allowBypass));
-  }
-
-  @JsonKey(ignore: true)
-  @override
-  int get hashCode => Object.hash(runtimeType, accessControl, allowBypass);
-
-  @JsonKey(ignore: true)
-  @override
-  @pragma('vm:prefer-inline')
-  _$$PropsImplCopyWith<_$PropsImpl> get copyWith =>
-      __$$PropsImplCopyWithImpl<_$PropsImpl>(this, _$identity);
-
-  @override
-  Map<String, dynamic> toJson() {
-    return _$$PropsImplToJson(
-      this,
-    );
-  }
-}
-
-abstract class _Props implements Props {
-  const factory _Props(
-      {final AccessControl? accessControl,
-      final bool? allowBypass}) = _$PropsImpl;
-
-  factory _Props.fromJson(Map<String, dynamic> json) = _$PropsImpl.fromJson;
-
-  @override
-  AccessControl? get accessControl;
-  @override
-  bool? get allowBypass;
-  @override
-  @JsonKey(ignore: true)
-  _$$PropsImplCopyWith<_$PropsImpl> get copyWith =>
-      throw _privateConstructorUsedError;
-}
--- a/lib/models/generated/config.g.dart
+++ b/lib/models/generated/config.g.dart
@@ -31,9 +31,8 @@ Config _$ConfigFromJson(Map<String, dynamic> json) => Config()
      ? null
      : DAV.fromJson(json['dav'] as Map<String, dynamic>)
  ..isAnimateToPage = json['isAnimateToPage'] as bool? ?? true
-  ..isCompatible = json['isCompatible'] as bool? ?? true
-  ..autoCheckUpdate = json['autoCheckUpdate'] as bool? ?? true
-  ..allowBypass = json['allowBypass'] as bool? ?? true;
+  ..isCompatible = json['isCompatible'] as bool? ?? false
+  ..autoCheckUpdate = json['autoCheckUpdate'] as bool? ?? true;

 Map<String, dynamic> _$ConfigToJson(Config instance) => <String, dynamic>{
      'profiles': instance.profiles,
@@ -53,7 +52,6 @@ Map<String, dynamic> _$ConfigToJson(Config instance) => <String, dynamic>{
      'isAnimateToPage': instance.isAnimateToPage,
      'isCompatible': instance.isCompatible,
      'autoCheckUpdate': instance.autoCheckUpdate,
-      'allowBypass': instance.allowBypass,
    };

 const _$ThemeModeEnumMap = {
@@ -95,17 +93,3 @@ const _$AccessControlModeEnumMap = {
  AccessControlMode.acceptSelected: 'acceptSelected',
  AccessControlMode.rejectSelected: 'rejectSelected',
 };
-
-_$PropsImpl _$$PropsImplFromJson(Map<String, dynamic> json) => _$PropsImpl(
-      accessControl: json['accessControl'] == null
-          ? null
-          : AccessControl.fromJson(
-              json['accessControl'] as Map<String, dynamic>),
-      allowBypass: json['allowBypass'] as bool?,
-    );
-
-Map<String, dynamic> _$$PropsImplToJson(_$PropsImpl instance) =>
-    <String, dynamic>{
-      'accessControl': instance.accessControl,
-      'allowBypass': instance.allowBypass,
-    };
--- a/lib/models/generated/proxy.g.dart
+++ b/lib/models/generated/proxy.g.dart
@@ -28,8 +28,6 @@ const _$GroupTypeEnumMap = {
  GroupType.Selector: 'Selector',
  GroupType.URLTest: 'URLTest',
  GroupType.Fallback: 'Fallback',
-  GroupType.LoadBalance: 'LoadBalance',
-  GroupType.Relay: 'Relay',
 };

 _$ProxyImpl _$$ProxyImplFromJson(Map<String, dynamic> json) => _$ProxyImpl(
--- a/lib/models/generated/selector.freezed.dart
+++ b/lib/models/generated/selector.freezed.dart
@@ -157,30 +157,34 @@ abstract class _StartButtonSelectorState implements StartButtonSelectorState {
 }

 /// @nodoc
-mixin _$CheckIpSelectorState {
+mixin _$UpdateCurrentDelaySelectorState {
+  String? get currentProxyName => throw _privateConstructorUsedError;
+  bool get isCurrent => throw _privateConstructorUsedError;
+  int? get delay => throw _privateConstructorUsedError;
  bool get isInit => throw _privateConstructorUsedError;
-  bool get isStart => throw _privateConstructorUsedError;
-  Map<String, String> get selectedMap => throw _privateConstructorUsedError;

  @JsonKey(ignore: true)
-  $CheckIpSelectorStateCopyWith<CheckIpSelectorState> get copyWith =>
-      throw _privateConstructorUsedError;
+  $UpdateCurrentDelaySelectorStateCopyWith<UpdateCurrentDelaySelectorState>
+      get copyWith => throw _privateConstructorUsedError;
 }

 /// @nodoc
-abstract class $CheckIpSelectorStateCopyWith<$Res> {
-  factory $CheckIpSelectorStateCopyWith(CheckIpSelectorState value,
-          $Res Function(CheckIpSelectorState) then) =
-      _$CheckIpSelectorStateCopyWithImpl<$Res, CheckIpSelectorState>;
+abstract class $UpdateCurrentDelaySelectorStateCopyWith<$Res> {
+  factory $UpdateCurrentDelaySelectorStateCopyWith(
+          UpdateCurrentDelaySelectorState value,
+          $Res Function(UpdateCurrentDelaySelectorState) then) =
+      _$UpdateCurrentDelaySelectorStateCopyWithImpl<$Res,
+          UpdateCurrentDelaySelectorState>;
  @useResult
-  $Res call({bool isInit, bool isStart, Map<String, String> selectedMap});
+  $Res call(
+      {String? currentProxyName, bool isCurrent, int? delay, bool isInit});
 }

 /// @nodoc
-class _$CheckIpSelectorStateCopyWithImpl<$Res,
-        $Val extends CheckIpSelectorState>
-    implements $CheckIpSelectorStateCopyWith<$Res> {
-  _$CheckIpSelectorStateCopyWithImpl(this._value, this._then);
+class _$UpdateCurrentDelaySelectorStateCopyWithImpl<$Res,
+        $Val extends UpdateCurrentDelaySelectorState>
+    implements $UpdateCurrentDelaySelectorStateCopyWith<$Res> {
+  _$UpdateCurrentDelaySelectorStateCopyWithImpl(this._value, this._then);

  // ignore: unused_field
  final $Val _value;
@@ -190,136 +194,154 @@ class _$CheckIpSelectorStateCopyWithImpl<$Res,
  @pragma('vm:prefer-inline')
  @override
  $Res call({
+    Object? currentProxyName = freezed,
+    Object? isCurrent = null,
+    Object? delay = freezed,
    Object? isInit = null,
-    Object? isStart = null,
-    Object? selectedMap = null,
  }) {
    return _then(_value.copyWith(
+      currentProxyName: freezed == currentProxyName
+          ? _value.currentProxyName
+          : currentProxyName // ignore: cast_nullable_to_non_nullable
+              as String?,
+      isCurrent: null == isCurrent
+          ? _value.isCurrent
+          : isCurrent // ignore: cast_nullable_to_non_nullable
+              as bool,
+      delay: freezed == delay
+          ? _value.delay
+          : delay // ignore: cast_nullable_to_non_nullable
+              as int?,
      isInit: null == isInit
          ? _value.isInit
          : isInit // ignore: cast_nullable_to_non_nullable
              as bool,
-      isStart: null == isStart
-          ? _value.isStart
-          : isStart // ignore: cast_nullable_to_non_nullable
-              as bool,
-      selectedMap: null == selectedMap
-          ? _value.selectedMap
-          : selectedMap // ignore: cast_nullable_to_non_nullable
-              as Map<String, String>,
    ) as $Val);
  }
 }

 /// @nodoc
-abstract class _$$CheckIpSelectorStateImplCopyWith<$Res>
-    implements $CheckIpSelectorStateCopyWith<$Res> {
-  factory _$$CheckIpSelectorStateImplCopyWith(_$CheckIpSelectorStateImpl value,
-          $Res Function(_$CheckIpSelectorStateImpl) then) =
-      __$$CheckIpSelectorStateImplCopyWithImpl<$Res>;
+abstract class _$$UpdateCurrentDelaySelectorStateImplCopyWith<$Res>
+    implements $UpdateCurrentDelaySelectorStateCopyWith<$Res> {
+  factory _$$UpdateCurrentDelaySelectorStateImplCopyWith(
+          _$UpdateCurrentDelaySelectorStateImpl value,
+          $Res Function(_$UpdateCurrentDelaySelectorStateImpl) then) =
+      __$$UpdateCurrentDelaySelectorStateImplCopyWithImpl<$Res>;
  @override
  @useResult
-  $Res call({bool isInit, bool isStart, Map<String, String> selectedMap});
+  $Res call(
+      {String? currentProxyName, bool isCurrent, int? delay, bool isInit});
 }

 /// @nodoc
-class __$$CheckIpSelectorStateImplCopyWithImpl<$Res>
-    extends _$CheckIpSelectorStateCopyWithImpl<$Res, _$CheckIpSelectorStateImpl>
-    implements _$$CheckIpSelectorStateImplCopyWith<$Res> {
-  __$$CheckIpSelectorStateImplCopyWithImpl(_$CheckIpSelectorStateImpl _value,
-      $Res Function(_$CheckIpSelectorStateImpl) _then)
+class __$$UpdateCurrentDelaySelectorStateImplCopyWithImpl<$Res>
+    extends _$UpdateCurrentDelaySelectorStateCopyWithImpl<$Res,
+        _$UpdateCurrentDelaySelectorStateImpl>
+    implements _$$UpdateCurrentDelaySelectorStateImplCopyWith<$Res> {
+  __$$UpdateCurrentDelaySelectorStateImplCopyWithImpl(
+      _$UpdateCurrentDelaySelectorStateImpl _value,
+      $Res Function(_$UpdateCurrentDelaySelectorStateImpl) _then)
      : super(_value, _then);

  @pragma('vm:prefer-inline')
  @override
  $Res call({
+    Object? currentProxyName = freezed,
+    Object? isCurrent = null,
+    Object? delay = freezed,
    Object? isInit = null,
-    Object? isStart = null,
-    Object? selectedMap = null,
  }) {
-    return _then(_$CheckIpSelectorStateImpl(
+    return _then(_$UpdateCurrentDelaySelectorStateImpl(
+      currentProxyName: freezed == currentProxyName
+          ? _value.currentProxyName
+          : currentProxyName // ignore: cast_nullable_to_non_nullable
+              as String?,
+      isCurrent: null == isCurrent
+          ? _value.isCurrent
+          : isCurrent // ignore: cast_nullable_to_non_nullable
+              as bool,
+      delay: freezed == delay
+          ? _value.delay
+          : delay // ignore: cast_nullable_to_non_nullable
+              as int?,
      isInit: null == isInit
          ? _value.isInit
          : isInit // ignore: cast_nullable_to_non_nullable
              as bool,
-      isStart: null == isStart
-          ? _value.isStart
-          : isStart // ignore: cast_nullable_to_non_nullable
-              as bool,
-      selectedMap: null == selectedMap
-          ? _value._selectedMap
-          : selectedMap // ignore: cast_nullable_to_non_nullable
-              as Map<String, String>,
    ));
  }
 }

 /// @nodoc

-class _$CheckIpSelectorStateImpl implements _CheckIpSelectorState {
-  const _$CheckIpSelectorStateImpl(
-      {required this.isInit,
-      required this.isStart,
-      required final Map<String, String> selectedMap})
-      : _selectedMap = selectedMap;
+class _$UpdateCurrentDelaySelectorStateImpl
+    implements _UpdateCurrentDelaySelectorState {
+  const _$UpdateCurrentDelaySelectorStateImpl(
+      {required this.currentProxyName,
+      required this.isCurrent,
+      required this.delay,
+      required this.isInit});

+  @override
+  final String? currentProxyName;
+  @override
+  final bool isCurrent;
+  @override
+  final int? delay;
  @override
  final bool isInit;
-  @override
-  final bool isStart;
-  final Map<String, String> _selectedMap;
-  @override
-  Map<String, String> get selectedMap {
-    if (_selectedMap is EqualUnmodifiableMapView) return _selectedMap;
-    // ignore: implicit_dynamic_type
-    return EqualUnmodifiableMapView(_selectedMap);
-  }

  @override
  String toString() {
-    return 'CheckIpSelectorState(isInit: $isInit, isStart: $isStart, selectedMap: $selectedMap)';
+    return 'UpdateCurrentDelaySelectorState(currentProxyName: $currentProxyName, isCurrent: $isCurrent, delay: $delay, isInit: $isInit)';
  }

  @override
  bool operator ==(Object other) {
    return identical(this, other) ||
        (other.runtimeType == runtimeType &&
-            other is _$CheckIpSelectorStateImpl &&
-            (identical(other.isInit, isInit) || other.isInit == isInit) &&
-            (identical(other.isStart, isStart) || other.isStart == isStart) &&
-            const DeepCollectionEquality()
-                .equals(other._selectedMap, _selectedMap));
+            other is _$UpdateCurrentDelaySelectorStateImpl &&
+            (identical(other.currentProxyName, currentProxyName) ||
+                other.currentProxyName == currentProxyName) &&
+            (identical(other.isCurrent, isCurrent) ||
+                other.isCurrent == isCurrent) &&
+            (identical(other.delay, delay) || other.delay == delay) &&
+            (identical(other.isInit, isInit) || other.isInit == isInit));
  }

  @override
-  int get hashCode => Object.hash(runtimeType, isInit, isStart,
-      const DeepCollectionEquality().hash(_selectedMap));
+  int get hashCode =>
+      Object.hash(runtimeType, currentProxyName, isCurrent, delay, isInit);

  @JsonKey(ignore: true)
  @override
  @pragma('vm:prefer-inline')
-  _$$CheckIpSelectorStateImplCopyWith<_$CheckIpSelectorStateImpl>
-      get copyWith =>
-          __$$CheckIpSelectorStateImplCopyWithImpl<_$CheckIpSelectorStateImpl>(
-              this, _$identity);
+  _$$UpdateCurrentDelaySelectorStateImplCopyWith<
+          _$UpdateCurrentDelaySelectorStateImpl>
+      get copyWith => __$$UpdateCurrentDelaySelectorStateImplCopyWithImpl<
+          _$UpdateCurrentDelaySelectorStateImpl>(this, _$identity);
 }

-abstract class _CheckIpSelectorState implements CheckIpSelectorState {
-  const factory _CheckIpSelectorState(
-          {required final bool isInit,
-          required final bool isStart,
-          required final Map<String, String> selectedMap}) =
-      _$CheckIpSelectorStateImpl;
+abstract class _UpdateCurrentDelaySelectorState
+    implements UpdateCurrentDelaySelectorState {
+  const factory _UpdateCurrentDelaySelectorState(
+      {required final String? currentProxyName,
+      required final bool isCurrent,
+      required final int? delay,
+      required final bool isInit}) = _$UpdateCurrentDelaySelectorStateImpl;

+  @override
+  String? get currentProxyName;
+  @override
+  bool get isCurrent;
+  @override
+  int? get delay;
  @override
  bool get isInit;
  @override
-  bool get isStart;
-  @override
-  Map<String, String> get selectedMap;
-  @override
  @JsonKey(ignore: true)
-  _$$CheckIpSelectorStateImplCopyWith<_$CheckIpSelectorStateImpl>
+  _$$UpdateCurrentDelaySelectorStateImplCopyWith<
+          _$UpdateCurrentDelaySelectorStateImpl>
      get copyWith => throw _privateConstructorUsedError;
 }

--- a/lib/models/ip.dart
+++ b/lib/models/ip.dart
@@ -62,9 +62,4 @@ class IpInfo {
      _ => throw const FormatException("invalid json"),
    };
  }
-
-  @override
-  String toString() {
-    return 'IpInfo{ip: $ip, countryCode: $countryCode}';
-  }
 }
--- a/lib/models/profile.dart
+++ b/lib/models/profile.dart
@@ -16,17 +16,16 @@ class UserInfo {
  int upload;
  int download;
  int total;
-  int expire;
+  int? expire;

  UserInfo({
    int? upload,
    int? download,
    int? total,
-    int? expire,
+    this.expire,
  })  : upload = upload ?? 0,
        download = download ?? 0,
-        total = total ?? 0,
-        expire = expire ?? 0;
+        total = total ?? 0;

  Map<String, dynamic> toJson() {
    return _$UserInfoToJson(this);
@@ -38,10 +37,10 @@ class UserInfo {

  factory UserInfo.formHString(String? info) {
    if (info == null) return UserInfo();
-    final list = info.split(";");
+    var list = info.split(";");
    Map<String, int?> map = {};
-    for (final i in list) {
-      final keyValue = i.trim().split("=");
+    for (var i in list) {
+      var keyValue = i.trim().split("=");
      map[keyValue[0]] = int.tryParse(keyValue[1]);
    }
    return UserInfo(
@@ -84,8 +83,7 @@ class Profile {
        autoUpdateDuration = autoUpdateDuration ?? defaultUpdateDuration,
        selectedMap = selectedMap ?? {};

-  ProfileType get type =>
-      url == null || url?.isEmpty == true ? ProfileType.file : ProfileType.url;
+  ProfileType get type => url == null ? ProfileType.file : ProfileType.url;

  Future<void> checkAndUpdate() async {
    final isExists = await check();
@@ -97,6 +95,9 @@ class Profile {
  }

  Future<void> update() async {
+    if (url == null) {
+      throw appLocalizations.unableToUpdateCurrentProfileDesc;
+    }
    final response = await request.getFileResponseForUrl(url!);
    final disposition = response.headers.value("content-disposition");
    label ??= other.getFileNameForDisposition(disposition) ?? id;
--- a/lib/models/selector.dart
+++ b/lib/models/selector.dart
@@ -1,7 +1,10 @@
 import 'package:fl_clash/enum/enum.dart';
-import 'package:fl_clash/models/models.dart';
 import 'package:flutter/material.dart';
 import 'package:freezed_annotation/freezed_annotation.dart';
+import 'config.dart';
+import 'navigation.dart';
+import 'profile.dart';
+import 'proxy.dart';

 part 'generated/selector.freezed.dart';

@@ -14,12 +17,13 @@ class StartButtonSelectorState with _$StartButtonSelectorState {
 }

@freezed
-class CheckIpSelectorState with _$CheckIpSelectorState {
-  const factory CheckIpSelectorState({
+class UpdateCurrentDelaySelectorState with _$UpdateCurrentDelaySelectorState {
+  const factory UpdateCurrentDelaySelectorState({
+    required String? currentProxyName,
+    required bool isCurrent,
+    required int? delay,
    required bool isInit,
-    required bool isStart,
-    required SelectedMap selectedMap,
-  }) = _CheckIpSelectorState;
+  }) = _UpdateCurrentDelaySelectorState;
 }

@freezed
@@ -49,23 +53,24 @@ class ApplicationSelectorState with _$ApplicationSelectorState {
 }

@freezed
-class TrayContainerSelectorState with _$TrayContainerSelectorState {
+class TrayContainerSelectorState with _$TrayContainerSelectorState{
  const factory TrayContainerSelectorState({
    required Mode mode,
    required bool autoLaunch,
    required bool isRun,
    required String? locale,
-  }) = _TrayContainerSelectorState;
+  })=_TrayContainerSelectorState;
 }

@freezed
-class UpdateNavigationsSelector with _$UpdateNavigationsSelector {
+class UpdateNavigationsSelector with _$UpdateNavigationsSelector{
  const factory UpdateNavigationsSelector({
    required bool openLogs,
    required bool hasProxies,
  }) = _UpdateNavigationsSelector;
 }

+
@freezed
 class HomeSelectorState with _$HomeSelectorState {
  const factory HomeSelectorState({
@@ -84,21 +89,21 @@ class HomeBodySelectorState with _$HomeBodySelectorState {
 }

@freezed
-class ProxiesCardSelectorState with _$ProxiesCardSelectorState {
+class ProxiesCardSelectorState with _$ProxiesCardSelectorState{
  const factory ProxiesCardSelectorState({
    required bool isSelected,
  }) = _ProxiesCardSelectorState;
 }

@freezed
-class ProxiesSelectorState with _$ProxiesSelectorState {
+class ProxiesSelectorState with _$ProxiesSelectorState{
  const factory ProxiesSelectorState({
    required List<String> groupNames,
  }) = _ProxiesSelectorState;
 }

@freezed
-class ProxiesTabViewSelectorState with _$ProxiesTabViewSelectorState {
+class ProxiesTabViewSelectorState with _$ProxiesTabViewSelectorState{
  const factory ProxiesTabViewSelectorState({
    required ProxiesSortType proxiesSortType,
    required num sortNum,
@@ -120,4 +125,4 @@ class PackageListSelectorState with _$PackageListSelectorState {
    required AccessControl accessControl,
    required bool isAccessControl,
  }) = _PackageListSelectorState;
-}
+}
--- a/lib/pages/scan.dart
+++ b/lib/pages/scan.dart
@@ -107,9 +107,6 @@ class _ScanPageState extends State<ScanPage> with WidgetsBindingObserver {
                    case TorchState.unavailable:
                      icon = const Icon(Icons.flash_off);
                      backgroundColor = Colors.transparent;
-                    case TorchState.auto:
-                      icon = const Icon(Icons.flash_auto);
-                      backgroundColor = Colors.orange;
                  }
                  return Container(
                    margin: const EdgeInsets.symmetric(horizontal: 8),
--- a/lib/state.dart
+++ b/lib/state.dart
@@ -13,6 +13,7 @@ import 'common/common.dart';

 class GlobalState {
  Timer? timer;
+  Function? healthcheckLockDebounce;
  Timer? groupsUpdateTimer;
  Function? updateCurrentDelayDebounce;
  PageController? pageController;
@@ -21,6 +22,7 @@ class GlobalState {
  late AppController appController;
  GlobalKey<CommonScaffoldState> homeScaffoldKey = GlobalKey();
  List<Function> updateFunctionLists = [];
+  bool healthcheckLock = false;

  startListenUpdate() {
    if (timer != null && timer!.isActive == true) return;
@@ -61,14 +63,8 @@ class GlobalState {
    required Config config,
    required ClashConfig clashConfig,
  }) async {
-    final args = config.isAccessControl
-        ? json.encode(
-            Props(
-              accessControl: config.accessControl,
-              allowBypass: config.allowBypass,
-            ),
-          )
-        : null;
+    final args =
+        config.isAccessControl ? json.encode(config.accessControl) : null;
    await proxyManager.startProxy(
      port: clashConfig.mixedPort,
      args: args,
@@ -111,6 +107,12 @@ class GlobalState {
        clashConfig: clashConfig,
      );
    }
+    if (!appState.isInit) return;
+    await applyProfile(
+      appState: appState,
+      config: config,
+      clashConfig: clashConfig,
+    );
    updateCoreVersionInfo(appState);
  }

@@ -133,6 +135,19 @@ class GlobalState {
    });
  }

+  updateNavigationItems({
+    required AppState appState,
+    required Config config,
+    required ClashConfig clashConfig,
+  }) {
+    final group = appState.currentGroups;
+    final hasProfile = config.profiles.isNotEmpty;
+    appState.navigationItems = navigation.getItems(
+      openLogs: config.openLogs,
+      hasProxies: group.isNotEmpty && hasProfile,
+    );
+  }
+
  Future<void> updateGroups(AppState appState) async {
    appState.groups = await clashCore.getProxiesGroups();
  }
@@ -238,6 +253,20 @@ class GlobalState {
    );
  }

+  void updateCurrentDelay(
+    String? proxyName,
+  ) {
+    updateCurrentDelayDebounce ??= debounce<Function(String?)>((proxyName) {
+      if (proxyName != null) {
+        debugPrint("[delay]=====> $proxyName");
+        clashCore.delay(
+          proxyName,
+        );
+      }
+    });
+    updateCurrentDelayDebounce!([proxyName]);
+  }
+
  Future<T?> safeRun<T>(
    FutureOr<T> Function() futureFunction, {
    String? title,
--- a/lib/widgets/clash_message_container.dart
+++ b/lib/widgets/clash_message_container.dart
@@ -38,8 +38,16 @@ class _ClashMessageContainerState extends State<ClashMessageContainer>

  @override
  void onDelay(Delay delay) {
+    globalState.healthcheckLock = true;
    final appController = globalState.appController;
    appController.setDelay(delay);
+    globalState.healthcheckLockDebounce ??= debounce<Function()>(
+      () async {
+        globalState.healthcheckLock = false;
+      },
+      milliseconds: 5000,
+    );
+    globalState.healthcheckLockDebounce!();
    super.onDelay(delay);
  }

--- a/lib/widgets/list.dart
+++ b/lib/widgets/list.dart
@@ -71,7 +71,6 @@ class ListItem<T> extends StatelessWidget {
  final Widget title;
  final Widget? subtitle;
  final EdgeInsets padding;
-  final ListTileTitleAlignment tileTitleAlignment;
  final bool? prue;
  final Widget? trailing;
  final Delegate delegate;
@@ -88,7 +87,6 @@ class ListItem<T> extends StatelessWidget {
    this.horizontalTitleGap,
    this.prue,
    this.onTab,
-    this.tileTitleAlignment = ListTileTitleAlignment.center,
  }) : delegate = const Delegate();

  const ListItem.open({
@@ -101,7 +99,6 @@ class ListItem<T> extends StatelessWidget {
    required OpenDelegate this.delegate,
    this.horizontalTitleGap,
    this.prue,
-    this.tileTitleAlignment = ListTileTitleAlignment.center,
  }) : onTab = null;

  const ListItem.next({
@@ -114,7 +111,6 @@ class ListItem<T> extends StatelessWidget {
    required NextDelegate this.delegate,
    this.horizontalTitleGap,
    this.prue,
-    this.tileTitleAlignment = ListTileTitleAlignment.center,
  }) : onTab = null;

  const ListItem.checkbox({
@@ -126,7 +122,6 @@ class ListItem<T> extends StatelessWidget {
    required CheckboxDelegate this.delegate,
    this.horizontalTitleGap,
    this.prue,
-    this.tileTitleAlignment = ListTileTitleAlignment.center,
  })  : trailing = null,
        onTab = null;

@@ -139,7 +134,6 @@ class ListItem<T> extends StatelessWidget {
    required SwitchDelegate this.delegate,
    this.horizontalTitleGap,
    this.prue,
-    this.tileTitleAlignment = ListTileTitleAlignment.center,
  })  : trailing = null,
        onTab = null;

@@ -152,7 +146,6 @@ class ListItem<T> extends StatelessWidget {
    required RadioDelegate<T> this.delegate,
    this.horizontalTitleGap = 8,
    this.prue,
-    this.tileTitleAlignment = ListTileTitleAlignment.center,
  })  : leading = null,
        onTab = null;

@@ -200,7 +193,6 @@ class ListItem<T> extends StatelessWidget {
      horizontalTitleGap: horizontalTitleGap,
      title: title,
      subtitle: subtitle,
-      titleAlignment: tileTitleAlignment,
      onTap: onTab,
      trailing: trailing ?? this.trailing,
      contentPadding: padding,
--- a/lib/widgets/scaffold.dart
+++ b/lib/widgets/scaffold.dart
@@ -49,7 +49,6 @@ class CommonScaffold extends StatefulWidget {

 class CommonScaffoldState extends State<CommonScaffold> {
  final ValueNotifier<List<Widget>> _actions = ValueNotifier([]);
-  final ValueNotifier<Widget?> _floatingActionButton = ValueNotifier(null);

  final ValueNotifier<bool> _loading = ValueNotifier(false);

@@ -59,16 +58,11 @@ class CommonScaffoldState extends State<CommonScaffold> {
    }
  }

-  set floatingActionButton(Widget? actions) {
-    if (_floatingActionButton.value != actions) {
-      _floatingActionButton.value = actions;
-    }
-  }
-
  Future<T?> loadingRun<T>(
    Future<T> Function() futureFunction, {
    String? title,
  }) async {
+    if (_loading.value == true) return null;
    _loading.value = true;
    try {
      final res = await futureFunction();
@@ -91,7 +85,6 @@ class CommonScaffoldState extends State<CommonScaffold> {
    super.didUpdateWidget(oldWidget);
    if (oldWidget.title != widget.title) {
      _actions.value = [];
-      _floatingActionButton.value = null;
    }
  }

@@ -116,12 +109,6 @@ class CommonScaffoldState extends State<CommonScaffold> {
  Widget build(BuildContext context) {
    return _platformContainer(
      child: Scaffold(
-        floatingActionButton: ValueListenableBuilder(
-          valueListenable: _floatingActionButton,
-          builder: (_, floatingActionButton, __) {
-            return floatingActionButton ?? Container();
-          },
-        ),
        appBar: PreferredSize(
          preferredSize: const Size.fromHeight(kToolbarHeight),
          child: Stack(
--- a/plugins/flutter_distributor
+++ b/plugins/flutter_distributor
--- a/pubspec.lock
+++ b/pubspec.lock
--- 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.20
+version: 0.8.11
 environment:
  sdk: '>=3.1.0 <4.0.0'

@@ -17,14 +17,14 @@ dependencies:
  provider: ^6.0.5
  window_manager: ^0.3.8
  ffi: ^2.1.0
-  dynamic_color: ^1.6.0
+  dynamic_color: ^1.7.0
  proxy:
    path: plugins/proxy
  launch_at_startup: ^0.2.2
  windows_single_instance: ^1.0.1
  json_annotation: ^4.9.0
  file_picker: ^8.0.3
-  mobile_scanner: ^5.1.1
+  mobile_scanner: 5.0.1
  app_links: ^3.5.0
  win32_registry: ^1.1.2
  tray_manager: ^0.2.1
@@ -38,7 +38,6 @@ dependencies:
  image: ^4.1.7
  webdav_client: ^1.2.2
  dio: ^5.4.3+1
-  country_flags: ^2.2.0
 dev_dependencies:
  flutter_test:
    sdk: flutter
--- a/setup.dart
+++ b/setup.dart
@@ -12,7 +12,10 @@ enum PlatformType {
  macos,
 }

-enum Arch { amd64, arm64, arm }
+enum Arch {
+  amd64,
+  arm64,
+}

 class BuildLibItem {
  PlatformType platform;
@@ -61,11 +64,6 @@ class Build {
          arch: Arch.amd64,
          archName: 'amd64',
        ),
-        BuildLibItem(
-          platform: PlatformType.android,
-          arch: Arch.arm,
-          archName: 'armeabi-v7a',
-        ),
        BuildLibItem(
          platform: PlatformType.android,
          arch: Arch.arm64,
@@ -336,7 +334,7 @@ class BuildCommand extends Command {
    final archName = argResults?['arch'];
    final currentArches =
        arches.where((element) => element.name == archName).toList();
-    final arch = currentArches.isEmpty ? null : currentArches.first;
+    final arch = currentArches.isEmpty ? null : arches.first;
    await _buildLib(arch);
    if (build != "all") {
      return;
@@ -359,11 +357,10 @@ class BuildCommand extends Command {
        break;
      case PlatformType.android:
        final targetMap = {
-          Arch.arm: "android-arm",
-          Arch.arm64: "android-arm64",
          Arch.amd64: "android-x64",
+          Arch.arm64: "android-arm64"
        };
-        final defaultArches = [Arch.arm, Arch.arm64, Arch.amd64];
+        final defaultArches = [Arch.amd64, Arch.arm64];
        final defaultTargets = defaultArches
            .where((element) => arch == null ? true : element == arch)
            .map((e) => targetMap[e])
--- a/test/command_test.dart
+++ b/test/command_test.dart
@@ -1,4 +1,5 @@
 // ignore_for_file: avoid_print
+
 void main() async {
  String input = """
 您
Author	SHA1	Message	Date
chen08209	513ee9ff7a	Fix quickStart change proxy error	2024-06-05 17:59:21 +08:00
chen08209	ddad3e40b9	cache	2024-06-05 16:19:23 +08:00
chen08209	eb9c3232ec	Fix core version	2024-06-05 14:29:38 +08:00
chen08209	e8c9c619bf	Fix core version	2024-06-05 14:13:04 +08:00
chen08209	17cd0cf1ed	Update file_picker Add resources page Optimize more detail	2024-06-05 13:42:33 +08:00
chen08209	925c331498	Add access selected sorted	2024-06-03 14:46:16 +08:00
chen08209	0512d692f2	Fix notification duplicate creation issue Fix AccessControl click issue	2024-06-03 11:43:41 +08:00
chen08209	844ce8ffb0	Fix Linux unable to open	2024-05-31 22:12:06 +08:00
chen08209	d2588596df	Update README.md 3	2024-05-31 15:40:47 +08:00
chen08209	0e999e3deb	Create LICENSE (cherry picked from commit `3ef3190785`)	2024-05-31 15:11:45 +08:00
chen08209	8109bbf46c	Update README.md 2 (cherry picked from commit `b1c763fcfa`)	2024-05-31 15:11:45 +08:00
chen08209	32ea45e5ea	Update README.md (cherry picked from commit `9452ffa514`)	2024-05-31 15:11:44 +08:00
chen08209	ecce17ad75	optimize checkUpdate	2024-05-31 09:59:18 +08:00
chen08209	96738090cf	Fix submit error (cherry picked from commit `fd3040283c`)	2024-05-31 09:09:05 +08:00
chen08209	4a8ea37142	add WebDAV add Auto check updates Optimize more details	2024-05-30 17:06:53 +08:00
chen08209	a5fdb90da5	optimize delayTest	2024-05-17 19:54:26 +08:00
chen08209	f9722cc761	upgrade flutter version (cherry picked from commit `9a07c785f2`)	2024-05-17 09:35:22 +08:00
chen08209	f01fb2ed1d	Update kernel Add import profile via QR code image	2024-05-15 20:19:50 +08:00
chen08209	74f4481071	Add compatibility mode and adapt clash scheme.	2024-05-11 14:08:13 +08:00
chen08209	9018f512ae	Reconstruction application proxy logic	2024-05-07 17:59:11 +08:00
chen08209	265fc4a701	Fix Tab destroy error	2024-05-06 19:03:49 +08:00
chen08209	755974fc9e	Optimize repeat healthcheck	2024-05-06 17:15:42 +08:00
chen08209	ba8eab4fc9	Optimize Direct mode ui	2024-05-06 15:26:38 +08:00
chen08209	f5cb46710f	Optimize Healthcheck	2024-05-06 14:31:20 +08:00
chen08209	6483e80416	Remove proxies position animation, improve performance Add Telegram Link	2024-05-06 14:31:19 +08:00
chen08209	535e6dc3a5	Update healthcheck policy	2024-05-06 14:31:19 +08:00
chen08209	ad86c20cfb	New Check URLTest	2024-05-05 21:40:12 +08:00
chen08209	665330e17a	Fix the problem of invalid auto-selection	2024-05-05 16:13:52 +08:00
chen08209	0eb001e717	New Async UpdateConfig	2024-05-05 03:12:45 +08:00
chen08209	a563991d74	add changeProfileDebounce	2024-05-04 21:51:40 +08:00
chen08209	3e2a30008c	Update Workflow	2024-05-04 16:50:37 +08:00
chen08209	ff68d573d6	Fix ChangeProfile block	2024-05-04 16:39:21 +08:00
chen08209	3223fca7ba	Fix Release Message Error (cherry picked from commit `aef50fe0e3`)	2024-05-04 16:38:03 +08:00
chen08209	006f9127fc	Update Selector 2 (cherry picked from commit `fc0767ed25`)	2024-05-04 16:37:59 +08:00
chen08209	a2709e155c	Update Version (cherry picked from commit `dbf1724cca`)	2024-05-04 16:37:57 +08:00
chen08209	684fa7b58e	Fix Proxies Select Error (cherry picked from commit `909aa4038e`)	2024-05-04 16:37:55 +08:00
chen08209	03b4da54b5	Fix the problem that the proxy group is empty in global mode. (cherry picked from commit `2d0a7d8d46`)	2024-05-04 16:37:54 +08:00
chen08209	a904b55d11	Fix the problem that the proxy group is empty in global mode. (cherry picked from commit `ca96cd1d82`)	2024-05-04 16:37:54 +08:00
chen08209	d711935e2e	Add ProxyProvider2 (cherry picked from commit `91ab1e5dac`)	2024-05-04 16:37:53 +08:00
chen08209	98b1496eff	Add ProxyProvider (cherry picked from commit `b3a5f74df8`)	2024-05-03 21:28:41 +08:00
chen08209	442c32b6eb	Update Version	2024-05-03 15:32:12 +08:00
chen08209	949a2aaac3	Update ProxyGroup Sort	2024-05-03 14:31:10 +08:00
chen08209	c77463f337	Fix Android quickStart VpnService some problems	2024-05-02 00:46:42 +08:00
chen08209	00377d6070	Update version	2024-05-01 23:39:21 +08:00
chen08209	f393b4b3e9	Set Android notification low importance	2024-05-01 23:29:32 +08:00
chen08209	75e6cfde15	Add Telegram in README_zh_CN.md (cherry picked from commit `8a188a37c9`)	2024-05-01 21:52:22 +08:00
chen08209	7bfe5617d9	Add Telegram	2024-05-01 21:49:18 +08:00
chen08209	97cc96c243	Fix the issue that VpnService can't be closed correctly in special cases	2024-05-01 21:29:54 +08:00
chen08209	1821ee2f61	Fix the problem that TileService is not destroyed correctly in some cases Adjust tab animation defaults	2024-05-01 15:13:09 +08:00