Fix search issues

Fix the issues with the profile add button to cover the edit button

Adapt LoadBalance and Relay

Add arm

Fix android notification icon error

.github/workflows/build.yml

@@ -17,8 +17,8 @@ jobs:
             os: windows-latest
           - platform: linux
             os: ubuntu-latest
-          - platform: macos
-            os: macos-13
+#          - platform: macos
+#            os: macos-13
 
     steps:
       - name: Checkout
@@ -82,6 +82,7 @@ jobs:
 
 
   upload-release:
+    if: ${{ !contains(github.ref, '+') }}
     permissions: write-all
     needs: [ build ]
     runs-on: ubuntu-latest

.gitignore

@@ -31,6 +31,7 @@ migrate_working_dir/
 .pub-cache/
 .pub/
 /build/
+/dist/
 
 # Symbolication related
 app.*.symbols
@@ -44,6 +45,7 @@ app.*.map.json
 /android/app/release
 
 
+
 #libclash
 /libclash/
 

README.md

@@ -34,6 +34,8 @@ 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

README_zh_CN.md

@@ -34,6 +34,8 @@ on Mobile:
 
 💡 基本 Material You 设计, 类[Surfboard](https://github.com/getsurfboard/surfboard)用户界面
 
+☁️ 支持通过WebDAV同步数据
+
 ✨ 支持一键导入订阅, 深色模式
 
 ## Contact

android/app/build.gradle

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

android/app/src/main/AndroidManifest.xml

@@ -1,9 +1,6 @@
 <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" />
@@ -17,12 +14,15 @@
     <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" />
-    <uses-permission android:name="android.permission.QUERY_ALL_PACKAGES" tools:ignore="QueryAllPackagesPermission"/>
+    <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" />
 
     <application
         android:name="${applicationName}"
         android:icon="@mipmap/ic_launcher"
+        android:extractNativeLibs="true"
         android:networkSecurityConfig="@xml/network_security_config"
         android:label="FlClash">
         <activity
@@ -73,7 +73,8 @@
         <service
             android:name=".services.FlClashTileService"
             android:exported="true"
-            android:icon="@drawable/tile_icon"
+            android:icon="@drawable/icon"
+            android:foregroundServiceType="specialUse"
             android:label="FlClash"
             android:permission="android.permission.BIND_QUICK_SETTINGS_TILE">
             <intent-filter>

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

@@ -19,7 +19,6 @@ 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 ->
@@ -43,19 +42,27 @@ 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)
-        if (Build.VERSION.SDK_INT >= 34) {
-            val pendingIntent = PendingIntent.getActivity(
+        val pendingIntent = if (Build.VERSION.SDK_INT >= 31) {
+            PendingIntent.getActivity(
                 this,
                 0,
                 intent,
-                PendingIntent.FLAG_IMMUTABLE
+                PendingIntent.FLAG_IMMUTABLE or PendingIntent.FLAG_UPDATE_CURRENT
             )
-            startActivityAndCollapse(pendingIntent)
         } else {
+            PendingIntent.getActivity(
+                this,
+                0,
+                intent,
+                PendingIntent.FLAG_UPDATE_CURRENT
+            )
+        }
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.UPSIDE_DOWN_CAKE) {
+            startActivityAndCollapse(pendingIntent)
+        }else{
             startActivityAndCollapse(intent)
         }
     }

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

@@ -1,10 +1,9 @@
 package com.follow.clash.services
 
-import android.annotation.SuppressLint
+import android.app.Notification.FOREGROUND_SERVICE_IMMEDIATE
 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
@@ -13,15 +12,13 @@ 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
 
 
-@SuppressLint("WrongConstant")
 class FlClashVpnService : VpnService() {
 
 
@@ -100,10 +97,10 @@ class FlClashVpnService : VpnService() {
     }
 
 
-    private val notificationBuilder by lazy {
+    private val notificationBuilder: NotificationCompat.Builder by lazy {
         val intent = Intent(this, MainActivity::class.java)
 
-        val pendingIntent = if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
+        val pendingIntent = if (Build.VERSION.SDK_INT >= 31) {
             PendingIntent.getActivity(
                 this,
                 0,
@@ -119,43 +116,43 @@ class FlClashVpnService : VpnService() {
             )
         }
 
-        val icon = IconCompat.createWithResource(this, this.applicationInfo.icon)
-
         with(NotificationCompat.Builder(this, CHANNEL)) {
-            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
-                setSmallIcon(icon)
-            }
+            setSmallIcon(R.drawable.ic_stat_name)
             setContentTitle("FlClash")
-            foregroundServiceBehavior = FOREGROUND_SERVICE_IMMEDIATE
             setContentIntent(pendingIntent)
             setCategory(NotificationCompat.CATEGORY_SERVICE)
-            priority = NotificationCompat.PRIORITY_LOW
+            priority = NotificationCompat.PRIORITY_MIN
+            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.S) {
+                foregroundServiceBehavior = FOREGROUND_SERVICE_IMMEDIATE
+            }
             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.UPSIDE_DOWN_CAKE) {
-            startForeground(notificationId, notification, FOREGROUND_SERVICE_TYPE_SPECIAL_USE)
-        } else {
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) {
+            startForeground(notificationId, notification,  FOREGROUND_SERVICE_TYPE_SPECIAL_USE)
+        }else{
             startForeground(notificationId, notification)
         }
     }
 
     private fun stopForeground() {
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) {
-            stopForeground(Service.STOP_FOREGROUND_REMOVE)
+            stopForeground(STOP_FOREGROUND_REMOVE)
         }
     }
 

core/common.go

@@ -325,16 +325,19 @@ func overwriteConfig(targetConfig *config.RawConfig, patchConfig config.RawConfi
 	targetConfig.ExternalUI = ""
 	targetConfig.Interface = ""
 	targetConfig.ExternalUIURL = ""
+	targetConfig.GeodataMode = false
 	//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 {
@@ -350,7 +353,6 @@ 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) {
@@ -409,6 +411,6 @@ func applyConfig(isPatch bool) {
 		patchConfig(cfg.General)
 	} else {
 		executor.ApplyConfig(cfg, true)
-		healthcheck()
+		hcCompatibleProvider(tunnel.Providers())
 	}
 }

core/go.mod

@@ -1,6 +1,6 @@
 module core
 
-go 1.21.0
+go 1.20
 
 replace github.com/metacubex/mihomo => ./Clash.Meta
 

core/go.sum

@@ -35,19 +35,16 @@ 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=
@@ -63,7 +60,6 @@ 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=
@@ -73,7 +69,6 @@ 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=
@@ -88,9 +83,7 @@ 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=
@@ -132,7 +125,6 @@ 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=
@@ -154,7 +146,6 @@ 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=
@@ -258,7 +249,6 @@ 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=
@@ -273,7 +263,6 @@ 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=

core/hub.go

@@ -65,12 +65,7 @@ func validateConfig(s *C.char, port C.longlong) {
 	i := int64(port)
 	go func() {
 		bytes := []byte(C.GoString(s))
-		rawConfig, err := config.UnmarshalRawConfig(bytes)
-		if err != nil {
-			bridge.SendToPort(i, err.Error())
-			return
-		}
-		_, err = config.ParseRawConfig(rawConfig)
+		_, err := config.UnmarshalRawConfig(bytes)
 		if err != nil {
 			bridge.SendToPort(i, err.Error())
 			return
@@ -186,7 +181,8 @@ func getTraffic() *C.char {
 }
 
 //export asyncTestDelay
-func asyncTestDelay(s *C.char) {
+func asyncTestDelay(s *C.char, port C.longlong) {
+	i := int64(port)
 	go func() {
 		paramsString := C.GoString(s)
 		var params = &TestDelayParams{}
@@ -210,26 +206,25 @@ func asyncTestDelay(s *C.char) {
 			Name: params.ProxyName,
 		}
 
-		message := bridge.Message{
-			Type: bridge.Delay,
-			Data: delayData,
-		}
-
 		if proxy == nil {
 			delayData.Value = -1
-			bridge.SendMessage(message)
+			data, _ := json.Marshal(delayData)
+			bridge.SendToPort(i, string(data))
 			return
 		}
 
 		delay, err := proxy.URLTest(ctx, constant.DefaultTestURL, expectedStatus)
 		if err != nil || delay == 0 {
 			delayData.Value = -1
-			bridge.SendMessage(message)
+			data, _ := json.Marshal(delayData)
+			bridge.SendToPort(i, string(data))
 			return
 		}
 
 		delayData.Value = int32(delay)
-		bridge.SendMessage(message)
+		data, _ := json.Marshal(delayData)
+		bridge.SendToPort(i, string(data))
+		return
 	}()
 }
 
@@ -379,11 +374,6 @@ 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)

core/tun.go

@@ -17,36 +17,35 @@ var tunLock sync.Mutex
 var tun *t.Tun
 
 //export startTUN
-func startTUN(fd C.int) bool {
-	tunLock.Lock()
-	defer tunLock.Unlock()
+func startTUN(fd C.int) {
+	go func() {
+		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()
-		return false
-	}
+		if err != nil {
+			log.Errorln("startTUN error: %v", err)
+			tempTun.Close()
+		}
 
-	tempTun.Closer = closer
+		tempTun.Closer = closer
 
-	tun = tempTun
-
-	return true
+		tun = tempTun
+	}()
 }
 
 //export updateMarkSocketPort
@@ -61,14 +60,16 @@ func updateMarkSocketPort(markSocketPort C.longlong) bool {
 
 //export stopTun
 func stopTun() {
-	tunLock.Lock()
-	defer tunLock.Unlock()
+	go func() {
+		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() {

lib/application.dart

@@ -160,8 +160,9 @@ class ApplicationState extends State<Application> {
                         AppLocalizations.delegate.supportedLocales,
                     themeMode: state.themeMode,
                     theme: ThemeData(
-                      pageTransitionsTheme: _pageTransitionsTheme,
                       useMaterial3: true,
+                      fontFamily: '',
+                      pageTransitionsTheme: _pageTransitionsTheme,
                       colorScheme: _getAppColorScheme(
                         brightness: Brightness.light,
                         systemColorSchemes: systemColorSchemes,
@@ -170,6 +171,7 @@ class ApplicationState extends State<Application> {
                     ),
                     darkTheme: ThemeData(
                       useMaterial3: true,
+                      fontFamily: '',
                       pageTransitionsTheme: _pageTransitionsTheme,
                       colorScheme: _getAppColorScheme(
                         brightness: Brightness.dark,

lib/clash/core.dart

@@ -156,23 +156,36 @@ class ClashCore {
     return clashFFI.changeProxy(params.toNativeUtf8().cast()) == 1;
   }
 
-  bool delay(String proxyName) {
+  Future<Delay> getDelay(String proxyName) {
     final delayParams = {
       "proxy-name": proxyName,
       "timeout": httpTimeoutDuration.inMilliseconds,
     };
-    clashFFI.asyncTestDelay(json.encode(delayParams).toNativeUtf8().cast());
-    return true;
+    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;
   }
 
   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());

lib/clash/generated/clash_ffi.dart

@@ -977,17 +977,20 @@ 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>)>>(
-          'asyncTestDelay');
-  late final _asyncTestDelay =
-      _asyncTestDelayPtr.asFunction<void Function(ffi.Pointer<ffi.Char>)>();
+  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)>();
 
   ffi.Pointer<ffi.Char> getVersionInfo() {
     return _getVersionInfo();
@@ -1086,14 +1089,6 @@ 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,

lib/common/datetime.dart

@@ -35,4 +35,8 @@ extension DateTimeExtension on DateTime {
     }
     return appLocalizations.just;
   }
-}
+
+  String get show {
+    return toIso8601String().substring(0, 10);
+  }
+}

lib/common/measure.dart

@@ -23,10 +23,11 @@ class Measure {
   double? _bodyMediumHeight;
   double? _bodySmallHeight;
   double? _labelSmallHeight;
+  double? _labelMediumHeight;
   double? _titleLargeHeight;
+  double? _titleMediumHeight;
 
-
-  double get bodyMediumHeight{
+  double get bodyMediumHeight {
     _bodyMediumHeight ??= computeTextSize(
       Text(
         "",
@@ -36,7 +37,7 @@ class Measure {
     return _bodyMediumHeight!;
   }
 
-  double get bodySmallHeight{
+  double get bodySmallHeight {
     _bodySmallHeight ??= computeTextSize(
       Text(
         "",
@@ -46,7 +47,7 @@ class Measure {
     return _bodySmallHeight!;
   }
 
-  double get labelSmallHeight{
+  double get labelSmallHeight {
     _labelSmallHeight ??= computeTextSize(
       Text(
         "",
@@ -56,7 +57,17 @@ class Measure {
     return _labelSmallHeight!;
   }
 
-  double get titleLargeHeight{
+  double get labelMediumHeight {
+    _labelMediumHeight ??= computeTextSize(
+      Text(
+        "",
+        style: context.textTheme.labelMedium,
+      ),
+    ).height;
+    return _labelMediumHeight!;
+  }
+
+  double get titleLargeHeight {
     _titleLargeHeight ??= computeTextSize(
       Text(
         "",
@@ -65,4 +76,14 @@ class Measure {
     ).height;
     return _titleLargeHeight!;
   }
+
+  double get titleMediumHeight {
+    _titleMediumHeight ??= computeTextSize(
+      Text(
+        "",
+        style: context.textTheme.titleMedium,
+      ),
+    ).height;
+    return _titleMediumHeight!;
+  }
 }

lib/common/request.dart

@@ -9,13 +9,11 @@ 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},
       ),
     );
@@ -29,11 +27,14 @@ class Request {
 
   _syncProxy() {
     final port = globalState.appController.clashConfig.mixedPort;
-    if (_port != port) {
+    final isStart = globalState.appController.appState.isStart;
+    if (_port != port || isStart != _isStart) {
       _port = port;
+      _isStart = isStart;
       _dio.httpClientAdapter = IOHttpClientAdapter(
         createHttpClient: () {
           final client = HttpClient();
+          if (!_isStart) return client;
           client.findProxy = (url) {
             return "PROXY localhost:$_port;DIRECT";
           };
@@ -52,7 +53,7 @@ class Request {
           ),
         )
         .timeout(
-          httpTimeoutDuration,
+          httpTimeoutDuration * 2,
         );
     return response;
   }
@@ -82,12 +83,14 @@ class Request {
     "https://ipinfo.io/json/": IpInfo.fromIpInfoIoJson,
   };
 
-  Future<IpInfo> checkIp() async {
+  Future<IpInfo?> checkIp(CancelToken? cancelToken) async {
     for (final source in _ipInfoSources.entries) {
       try {
-        final response = await _dio.get<Map<String, dynamic>>(
-          source.key,
-        );
+        final response = await _dio
+            .get<Map<String, dynamic>>(source.key, cancelToken: cancelToken)
+            .timeout(
+              httpTimeoutDuration,
+            );
         if (response.statusCode == 200 && response.data != null) {
           return source.value(response.data!);
         }
@@ -95,7 +98,7 @@ class Request {
         continue;
       }
     }
-    throw "无法检索ip";
+    return null;
   }
 }
 

lib/common/text.dart

@@ -6,6 +6,11 @@ extension TextStyleExtension on TextStyle {
     return copyWith(color: color?.toLight());
   }
 
+  toLighter() {
+    return copyWith(color: color?.toLighter());
+  }
+
+
   toSoftBold() {
     return copyWith(fontWeight: FontWeight.w500);
   }

lib/controller.dart

@@ -1,5 +1,6 @@
 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';
@@ -39,8 +40,6 @@ class AppController {
         updateRunTime,
         updateTraffic,
       ];
-      clearShowProxyDelay();
-      testShowProxyDelay();
     } else {
       await globalState.stopSystemProxy();
       appState.traffics = [];
@@ -98,10 +97,12 @@ class AppController {
     }
   }
 
-  updateProfile(String id) async {
+  Future<void> updateProfile(String id) async {
     final profile = config.getCurrentProfileForId(id);
     if (profile != null) {
-      await profile.update();
+      final tempProfile = profile.copyWith();
+      await tempProfile.update();
+      config.setProfile(tempProfile);
     }
   }
 
@@ -135,16 +136,25 @@ class AppController {
 
   autoUpdateProfiles() async {
     for (final profile in config.profiles) {
-      if (!profile.autoUpdate) return;
+      if (!profile.autoUpdate) continue;
       final isNotNeedUpdate = profile.lastUpdateDate
           ?.add(
             profile.autoUpdateDuration,
           )
           .isBeforeNow;
-      if (isNotNeedUpdate == false ||
-          profile.url == null ||
-          profile.url!.isEmpty) continue;
-      await profile.update();
+      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);
     }
   }
 
@@ -261,19 +271,6 @@ class AppController {
     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);
   }
@@ -383,22 +380,6 @@ 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;

lib/enum/enum.dart

@@ -1,6 +1,6 @@
 // ignore_for_file: constant_identifier_names
 
-enum GroupType { Selector, URLTest, Fallback }
+enum GroupType { Selector, URLTest, Fallback, LoadBalance, Relay }
 
 enum GroupName { GLOBAL, Proxy, Auto, Fallback }
 

lib/fragments/access.dart

@@ -8,6 +8,13 @@ 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});
 
@@ -83,137 +90,64 @@ class _AccessFragmentState extends State<AccessFragment> {
     );
   }
 
-  Widget _buildSelectedAllButton({
-    required bool isSelectedAll,
-    required List<String> allValueList,
-  }) {
-    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,
-                  ),
-              };
-            }
-          },
-          icon: isSelectedAll
-              ? const Icon(Icons.deselect)
-              : const Icon(Icons.select_all),
-        );
+  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),
     );
   }
 
-  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 _buildSelectedAllButton({
+  //   required bool isSelectedAll,
+  //   required List<String> allValueList,
+  // }) {
+  //   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,
+  //                 ),
+  //             };
+  //           }
+  //         },
+  //         icon: isSelectedAll
+  //             ? const Icon(Icons.deselect)
+  //             : const Icon(Icons.select_all),
+  //       );
+  //     },
+  //   );
+  // }
 
   Widget _buildPackageList() {
     return ValueListenableBuilder(
@@ -252,14 +186,11 @@ class _AccessFragmentState extends State<AccessFragment> {
                 accessControlMode == AccessControlMode.acceptSelected
                     ? acceptPackages
                     : rejectPackages;
-            final currentList =
-                accessControlMode == AccessControlMode.acceptSelected
-                    ? accessControl.acceptList
-                    : accessControl.rejectList;
+            final currentList = accessControl.currentList;
             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();
@@ -272,11 +203,82 @@ class _AccessFragmentState extends State<AccessFragment> {
               status: !isAccessControl,
               child: Column(
                 children: [
-                  _actionHeader(
-                    isAccessControl: isAccessControl,
-                    valueList: valueList,
-                    describe: describe,
-                    packageNameList: packageNameList,
+                  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()),
+                            ],
+                          ),
+                        ],
+                      ),
+                    ),
                   ),
                   Expanded(
                     flex: 1,
@@ -429,3 +431,111 @@ 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 _packageList(packages);
+  }
+
+  @override
+  Widget buildSuggestions(BuildContext context) {
+    final packages = _results;
+    return _packageList(packages);
+  }
+}

lib/fragments/config.dart

@@ -86,25 +86,25 @@ 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 (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();
+      //           },
+      //         ),
+      //       );
+      //     },
+      //   ),
       Selector<Config, bool>(
         selector: (_, config) => config.isCompatible,
         builder: (_, isCompatible, __) {

lib/fragments/dashboard/network_detection.dart

@@ -1,3 +1,5 @@
+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';
@@ -13,118 +15,160 @@ class NetworkDetection extends StatefulWidget {
 }
 
 class _NetworkDetectionState extends State<NetworkDetection> {
-  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,
-        ),
-      );
+  final ipInfoNotifier = ValueNotifier<IpInfo?>(null);
+  final timeoutNotifier = ValueNotifier<bool>(false);
+  bool? _preIsStart;
+  CancelToken? cancelToken;
+
+  _checkIp(
+    bool isInit,
+    bool isStart,
+  ) async {
+    if (!isInit) return;
+    if (_preIsStart == false && _preIsStart == isStart) return;
+    if (cancelToken != null) {
+      cancelToken!.cancel();
+      cancelToken = null;
     }
-    if (delay == 0 || delay == null) {
-      return const AspectRatio(
-        aspectRatio: 1,
-        child: CircularProgressIndicator(
-          strokeCap: StrokeCap.round,
-        ),
-      );
+    ipInfoNotifier.value = null;
+    final ipInfo = await request.checkIp(cancelToken);
+    if (ipInfo == null) {
+      timeoutNotifier.value = true;
+      return;
+    } else {
+      timeoutNotifier.value = false;
     }
-    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,
-          ),
+    _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,
     );
   }
 
   @override
   Widget build(BuildContext context) {
-    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),
+    return _checkIpContainer(
+      ValueListenableBuilder<IpInfo?>(
+        valueListenable: ipInfoNotifier,
+        builder: (_, ipInfo, __) {
+          return CommonCard(
             child: Column(
-              mainAxisSize: MainAxisSize.min,
-              crossAxisAlignment: CrossAxisAlignment.start,
               children: [
                 Flexible(
                   flex: 0,
-                  child: TooltipText(
-                    text: Text(
-                      state.currentProxyName ?? appLocalizations.noProxy,
-                      overflow: TextOverflow.ellipsis,
-                      maxLines: 1,
-                      style: Theme.of(context)
-                          .textTheme
-                          .titleMedium
-                          ?.toSoftBold(),
-                    ),
-                  ),
-                ),
-                const SizedBox(
-                  height: 8,
-                ),
-                Flexible(
                   child: Container(
-                    height: globalState.appController.measure.titleLargeHeight,
-                    alignment: Alignment.centerLeft,
-                    child: FadeBox(
-                      child: _buildDescription(
-                        state.currentProxyName,
-                        state.delay,
-                      ),
+                    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,
+                                        ),
+                                      );
+                                    },
+                                  ),
+                          ),
+                        ),
+                      ],
                     ),
                   ),
                 ),
+                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(
+                                  appLocalizations.ipCheckTimeout,
+                                  style: context.textTheme.titleLarge
+                                      ?.toSoftBold(),
+                                  maxLines: 1,
+                                  overflow: TextOverflow.ellipsis,
+                                );
+                              }
+                              return Container(
+                                padding: const EdgeInsets.all(2),
+                                child: const AspectRatio(
+                                  aspectRatio: 1,
+                                  child: CircularProgressIndicator(),
+                                ),
+                              );
+                            },
+                          ),
+                  ),
+                )
               ],
             ),
           );

lib/fragments/dashboard/start_button.dart

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

lib/fragments/logs.dart

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

lib/fragments/profiles/edit_profile.dart

@@ -1,4 +1,5 @@
 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';
@@ -40,7 +41,7 @@ class _EditProfileState extends State<EditProfile> {
   _handleConfirm() {
     if (!_formKey.currentState!.validate()) return;
     final config = widget.context.read<Config>();
-    final hasUpdate = widget.profile.url != urlController.text;
+    final hasUpdate = urlController.text.isNotEmpty && widget.profile.url != urlController.text;
     widget.profile.url = urlController.text;
     widget.profile.label = labelController.text;
     widget.profile.autoUpdate = autoUpdate;
@@ -82,7 +83,7 @@ class _EditProfileState extends State<EditProfile> {
           },
         ),
       ),
-      if (widget.profile.url != null)...[
+      if (widget.profile.type == ProfileType.url)...[
         ListItem(
           title: TextFormField(
             controller: urlController,

lib/fragments/profiles/profiles.dart

@@ -25,15 +25,7 @@ class ProfilesFragment extends StatefulWidget {
 }
 
 class _ProfilesFragmentState extends State<ProfilesFragment> {
-  _handleDeleteProfile(String id) async {
-    globalState.appController.deleteProfile(id);
-  }
-
-  _handleUpdateProfile(String id) async {
-    context.findAncestorStateOfType<CommonScaffoldState>()?.loadingRun(
-          () => globalState.appController.updateProfile(id),
-        );
-  }
+  final hasPadding = ValueNotifier<bool>(false);
 
   _handleShowAddExtendPage() {
     showExtendPage(
@@ -45,76 +37,6 @@ 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:
@@ -126,33 +48,104 @@ class _ProfilesFragmentState extends State<ProfilesFragment> {
     }
   }
 
-  @override
-  Widget build(BuildContext context) {
-    return FloatLayout(
-      floatingWidget: Container(
-        margin: const EdgeInsets.all(kFloatingActionButtonMargin),
-        child: FloatingActionButton(
+  _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.download),
+          ),
+          const SizedBox(
+            width: 8,
+          )
+        ];
+        commonScaffoldState?.floatingActionButton = FloatingActionButton(
           heroTag: null,
           onPressed: _handleShowAddExtendPage,
-          child: const Icon(Icons.add),
-        ),
-      ),
+          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!;
+      },
       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: _buildGrid(
-              state: state,
-              crossAxisCount: _getColumns(state.viewMode),
+            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,
+                            ),
+                          ),
+                      ],
+                    ),
+                  );
+                },
+              ),
             ),
           );
         },
@@ -161,92 +154,188 @@ class _ProfilesFragmentState extends State<ProfilesFragment> {
   }
 }
 
-class ProfileItem extends StatelessWidget {
+class ProfileItem extends StatefulWidget {
   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
-  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,
+  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,
       ),
-      padding: const EdgeInsets.symmetric(horizontal: 16),
-      trailing: commonPopupMenu,
-      title: Column(
-        mainAxisSize: MainAxisSize.min,
+      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(
         crossAxisAlignment: CrossAxisAlignment.start,
         mainAxisAlignment: MainAxisAlignment.center,
         children: [
-          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(),
-                  ),
-                ),
-              ],
-            ),
-          ),
-          Flexible(
-            child: Container(
-              margin: const EdgeInsets.symmetric(
-                vertical: 8,
+          Row(
+            mainAxisSize: MainAxisSize.max,
+            mainAxisAlignment: MainAxisAlignment.spaceBetween,
+            children: [
+              Text(
+                profile.label ?? profile.id,
+                style: textTheme.titleMedium,
+                maxLines: 1,
+                overflow: TextOverflow.ellipsis,
               ),
-              child: LinearProgressIndicator(
-                minHeight: 6,
-                value: progress,
+              Text(
+                profile.lastUpdateDate?.lastUpdateTimeDesc ?? '',
+                style: textTheme.labelMedium?.toLight(),
               ),
-            ),
+            ],
           ),
-          Flexible(
-            child: Text(
-              "$useShow / $totalShow",
-              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,
+                ),
+              ),
+              Text(
+                "$useShow / $totalShow",
+                style: textTheme.labelMedium?.toLight(),
+              ),
+              const SizedBox(
+                height: 2,
+              ),
+              Row(
+                children: [
+                  Text(
+                    "到期时间:",
+                    style: textTheme.labelMedium?.toLighter(),
+                  ),
+                  const SizedBox(
+                    width: 4,
+                  ),
+                  Text(
+                    expireShow,
+                    style: textTheme.labelMedium?.toLighter(),
+                  ),
+                ],
+              )
+            ],
           ),
         ],
       ),
     );
   }
+
+  @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,
+      ),
+    );
+  }
 }

lib/fragments/proxies.dart

@@ -1,3 +1,4 @@
+import 'package:fl_clash/clash/clash.dart';
 import 'package:fl_clash/state.dart';
 import 'package:flutter/material.dart';
 import 'package:provider/provider.dart';
@@ -50,6 +51,9 @@ class _ProxiesFragmentState extends State<ProxiesFragment>
               selectedValue: proxiesSortType,
             );
           },
+        ),
+        const SizedBox(
+          width: 8,
         )
       ];
     });
@@ -57,72 +61,69 @@ class _ProxiesFragmentState extends State<ProxiesFragment>
 
   @override
   Widget build(BuildContext context) {
-    return DelayTestButtonContainer(
-      child: Selector<AppState, bool>(
-        selector: (_, appState) => appState.currentLabel == 'proxies',
-        builder: (_, isCurrent, child) {
-          if (isCurrent) {
-            _initActions();
-          }
-          return child!;
+    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,
+          );
         },
-        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(
+        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,
+                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(
                   controller: _tabController,
-                  padding: const EdgeInsets.symmetric(horizontal: 16),
-                  dividerColor: Colors.transparent,
-                  isScrollable: true,
-                  tabAlignment: TabAlignment.start,
-                  overlayColor:
-                      const WidgetStatePropertyAll(Colors.transparent),
-                  tabs: [
+                  children: [
                     for (final groupName in state.groupNames)
-                      Tab(
-                        text: groupName,
+                      KeepContainer(
+                        key: ObjectKey(groupName),
+                        child: ProxiesTabView(
+                          groupName: groupName,
+                        ),
                       ),
                   ],
                 ),
-                Expanded(
-                  child: TabBarView(
-                    controller: _tabController,
-                    children: [
-                      for (final groupName in state.groupNames)
-                        KeepContainer(
-                          key: ObjectKey(groupName),
-                          child: ProxiesTabView(
-                            groupName: groupName,
-                          ),
-                        ),
-                    ],
-                  ),
-                )
-              ],
-            );
-          },
-        ),
+              )
+            ],
+          );
+        },
       ),
     );
   }
@@ -196,6 +197,23 @@ 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>(
@@ -213,25 +231,32 @@ class ProxiesTabView extends StatelessWidget {
           state.group.all,
           state.proxiesSortType,
         );
-        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),
+        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,
+                );
+              },
             ),
-            itemCount: proxies.length,
-            itemBuilder: (_, index) {
-              final proxy = proxies[index];
-              return ProxyCard(
-                key: ValueKey('$groupName.${proxy.name}'),
-                proxy: proxy,
-                groupName: groupName,
-              );
-            },
           ),
         );
       },
@@ -384,10 +409,12 @@ 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
@@ -401,12 +428,9 @@ class _DelayTestButtonContainerState extends State<DelayTestButtonContainer>
   late Animation<double> _scale;
 
   _healthcheck() async {
-    if (globalState.healthcheckLock) return;
     _controller.forward();
-    globalState.appController.healthcheck();
-    Future.delayed(httpTimeoutDuration + moreDuration, () {
-      _controller.reverse();
-    });
+    await widget.onClick();
+    _controller.reverse();
   }
 
   @override
@@ -415,7 +439,7 @@ class _DelayTestButtonContainerState extends State<DelayTestButtonContainer>
     _controller = AnimationController(
       vsync: this,
       duration: const Duration(
-        milliseconds: 600,
+        milliseconds: 200,
       ),
     );
     _scale = Tween<double>(
@@ -427,7 +451,6 @@ class _DelayTestButtonContainerState extends State<DelayTestButtonContainer>
         curve: const Interval(
           0,
           1,
-          curve: Curves.elasticInOut,
         ),
       ),
     );
@@ -441,6 +464,7 @@ class _DelayTestButtonContainerState extends State<DelayTestButtonContainer>
 
   @override
   Widget build(BuildContext context) {
+    _controller.reverse();
     return FloatLayout(
       floatingWidget: FloatWrapper(
         child: AnimatedBuilder(

lib/l10n/arb/intl_en.arb

@@ -156,5 +156,10 @@
   "goDownload": "Go to download",
   "unknown": "Unknown",
   "geoData": "GeoData",
-  "externalResources": "External resources"
+  "externalResources": "External resources",
+  "checking": "Checking...",
+  "country": "Country",
+  "checkError": "Check error",
+  "ipCheckTimeout": "Ip check timeout",
+  "search": "Search"
 }

lib/l10n/arb/intl_zh_CN.arb

@@ -156,5 +156,10 @@
   "goDownload": "前往下载",
   "unknown": "未知",
   "geoData": "地理数据",
-  "externalResources": "外部资源"
+  "externalResources": "外部资源",
+  "checking": "检测中...",
+  "country": "区域",
+  "checkError": "检测失败",
+  "ipCheckTimeout": "Ip检测超时",
+  "search": "搜索"
 }

lib/l10n/intl/messages_en.dart

@@ -76,10 +76,12 @@ 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(
@@ -88,6 +90,7 @@ 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"),
@@ -122,6 +125,8 @@ class MessageLookup extends MessageLookupByLibrary {
         "hours": MessageLookupByLibrary.simpleMessage("Hours"),
         "importFromURL":
             MessageLookupByLibrary.simpleMessage("Import from URL"),
+        "ipCheckTimeout":
+            MessageLookupByLibrary.simpleMessage("Ip check timeout"),
         "just": MessageLookupByLibrary.simpleMessage("Just"),
         "language": MessageLookupByLibrary.simpleMessage("Language"),
         "light": MessageLookupByLibrary.simpleMessage("Light"),
@@ -207,6 +212,7 @@ 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"),

lib/l10n/intl/messages_zh_CN.dart

@@ -63,8 +63,10 @@ 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的支持"),
@@ -72,6 +74,7 @@ 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("仪表盘"),
@@ -99,6 +102,7 @@ class MessageLookup extends MessageLookupByLibrary {
         "goDownload": MessageLookupByLibrary.simpleMessage("前往下载"),
         "hours": MessageLookupByLibrary.simpleMessage("小时"),
         "importFromURL": MessageLookupByLibrary.simpleMessage("从URL导入"),
+        "ipCheckTimeout": MessageLookupByLibrary.simpleMessage("Ip检测超时"),
         "just": MessageLookupByLibrary.simpleMessage("刚刚"),
         "language": MessageLookupByLibrary.simpleMessage("语言"),
         "light": MessageLookupByLibrary.simpleMessage("浅色"),
@@ -167,6 +171,7 @@ 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("设置"),

lib/l10n/l10n.dart

@@ -1629,6 +1629,56 @@ 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: [],
+    );
+  }
 }
 
 class AppLocalizationDelegate extends LocalizationsDelegate<AppLocalizations> {

lib/models/app.dart

@@ -89,6 +89,8 @@ class AppState with ChangeNotifier {
     }
   }
 
+  bool get isStart => _runTime != null;
+
   int? get runTime => _runTime;
 
   set runTime(int? value) {
@@ -105,7 +107,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 ?? '*'})";
     }
   }
 
@@ -166,7 +168,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();

lib/models/config.dart

@@ -8,6 +8,7 @@ import '../common/common.dart';
 import 'models.dart';
 
 part 'generated/config.g.dart';
+
 part 'generated/config.freezed.dart';
 
 @freezed

lib/models/generated/config.g.dart

@@ -31,7 +31,7 @@ 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? ?? false
+  ..isCompatible = json['isCompatible'] as bool? ?? true
   ..autoCheckUpdate = json['autoCheckUpdate'] as bool? ?? true;
 
 Map<String, dynamic> _$ConfigToJson(Config instance) => <String, dynamic>{

lib/models/generated/proxy.g.dart

@@ -28,6 +28,8 @@ const _$GroupTypeEnumMap = {
   GroupType.Selector: 'Selector',
   GroupType.URLTest: 'URLTest',
   GroupType.Fallback: 'Fallback',
+  GroupType.LoadBalance: 'LoadBalance',
+  GroupType.Relay: 'Relay',
 };
 
 _$ProxyImpl _$$ProxyImplFromJson(Map<String, dynamic> json) => _$ProxyImpl(

lib/models/generated/selector.freezed.dart

@@ -157,34 +157,30 @@ abstract class _StartButtonSelectorState implements StartButtonSelectorState {
 }
 
 /// @nodoc
-mixin _$UpdateCurrentDelaySelectorState {
-  String? get currentProxyName => throw _privateConstructorUsedError;
-  bool get isCurrent => throw _privateConstructorUsedError;
-  int? get delay => throw _privateConstructorUsedError;
+mixin _$CheckIpSelectorState {
   bool get isInit => throw _privateConstructorUsedError;
+  bool get isStart => throw _privateConstructorUsedError;
+  Map<String, String> get selectedMap => throw _privateConstructorUsedError;
 
   @JsonKey(ignore: true)
-  $UpdateCurrentDelaySelectorStateCopyWith<UpdateCurrentDelaySelectorState>
-      get copyWith => throw _privateConstructorUsedError;
+  $CheckIpSelectorStateCopyWith<CheckIpSelectorState> get copyWith =>
+      throw _privateConstructorUsedError;
 }
 
 /// @nodoc
-abstract class $UpdateCurrentDelaySelectorStateCopyWith<$Res> {
-  factory $UpdateCurrentDelaySelectorStateCopyWith(
-          UpdateCurrentDelaySelectorState value,
-          $Res Function(UpdateCurrentDelaySelectorState) then) =
-      _$UpdateCurrentDelaySelectorStateCopyWithImpl<$Res,
-          UpdateCurrentDelaySelectorState>;
+abstract class $CheckIpSelectorStateCopyWith<$Res> {
+  factory $CheckIpSelectorStateCopyWith(CheckIpSelectorState value,
+          $Res Function(CheckIpSelectorState) then) =
+      _$CheckIpSelectorStateCopyWithImpl<$Res, CheckIpSelectorState>;
   @useResult
-  $Res call(
-      {String? currentProxyName, bool isCurrent, int? delay, bool isInit});
+  $Res call({bool isInit, bool isStart, Map<String, String> selectedMap});
 }
 
 /// @nodoc
-class _$UpdateCurrentDelaySelectorStateCopyWithImpl<$Res,
-        $Val extends UpdateCurrentDelaySelectorState>
-    implements $UpdateCurrentDelaySelectorStateCopyWith<$Res> {
-  _$UpdateCurrentDelaySelectorStateCopyWithImpl(this._value, this._then);
+class _$CheckIpSelectorStateCopyWithImpl<$Res,
+        $Val extends CheckIpSelectorState>
+    implements $CheckIpSelectorStateCopyWith<$Res> {
+  _$CheckIpSelectorStateCopyWithImpl(this._value, this._then);
 
   // ignore: unused_field
   final $Val _value;
@@ -194,154 +190,136 @@ class _$UpdateCurrentDelaySelectorStateCopyWithImpl<$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 _$$UpdateCurrentDelaySelectorStateImplCopyWith<$Res>
-    implements $UpdateCurrentDelaySelectorStateCopyWith<$Res> {
-  factory _$$UpdateCurrentDelaySelectorStateImplCopyWith(
-          _$UpdateCurrentDelaySelectorStateImpl value,
-          $Res Function(_$UpdateCurrentDelaySelectorStateImpl) then) =
-      __$$UpdateCurrentDelaySelectorStateImplCopyWithImpl<$Res>;
+abstract class _$$CheckIpSelectorStateImplCopyWith<$Res>
+    implements $CheckIpSelectorStateCopyWith<$Res> {
+  factory _$$CheckIpSelectorStateImplCopyWith(_$CheckIpSelectorStateImpl value,
+          $Res Function(_$CheckIpSelectorStateImpl) then) =
+      __$$CheckIpSelectorStateImplCopyWithImpl<$Res>;
   @override
   @useResult
-  $Res call(
-      {String? currentProxyName, bool isCurrent, int? delay, bool isInit});
+  $Res call({bool isInit, bool isStart, Map<String, String> selectedMap});
 }
 
 /// @nodoc
-class __$$UpdateCurrentDelaySelectorStateImplCopyWithImpl<$Res>
-    extends _$UpdateCurrentDelaySelectorStateCopyWithImpl<$Res,
-        _$UpdateCurrentDelaySelectorStateImpl>
-    implements _$$UpdateCurrentDelaySelectorStateImplCopyWith<$Res> {
-  __$$UpdateCurrentDelaySelectorStateImplCopyWithImpl(
-      _$UpdateCurrentDelaySelectorStateImpl _value,
-      $Res Function(_$UpdateCurrentDelaySelectorStateImpl) _then)
+class __$$CheckIpSelectorStateImplCopyWithImpl<$Res>
+    extends _$CheckIpSelectorStateCopyWithImpl<$Res, _$CheckIpSelectorStateImpl>
+    implements _$$CheckIpSelectorStateImplCopyWith<$Res> {
+  __$$CheckIpSelectorStateImplCopyWithImpl(_$CheckIpSelectorStateImpl _value,
+      $Res Function(_$CheckIpSelectorStateImpl) _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(_$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?,
+    return _then(_$CheckIpSelectorStateImpl(
       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 _$UpdateCurrentDelaySelectorStateImpl
-    implements _UpdateCurrentDelaySelectorState {
-  const _$UpdateCurrentDelaySelectorStateImpl(
-      {required this.currentProxyName,
-      required this.isCurrent,
-      required this.delay,
-      required this.isInit});
+class _$CheckIpSelectorStateImpl implements _CheckIpSelectorState {
+  const _$CheckIpSelectorStateImpl(
+      {required this.isInit,
+      required this.isStart,
+      required final Map<String, String> selectedMap})
+      : _selectedMap = selectedMap;
 
-  @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 'UpdateCurrentDelaySelectorState(currentProxyName: $currentProxyName, isCurrent: $isCurrent, delay: $delay, isInit: $isInit)';
+    return 'CheckIpSelectorState(isInit: $isInit, isStart: $isStart, selectedMap: $selectedMap)';
   }
 
   @override
   bool operator ==(Object other) {
     return identical(this, other) ||
         (other.runtimeType == runtimeType &&
-            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));
+            other is _$CheckIpSelectorStateImpl &&
+            (identical(other.isInit, isInit) || other.isInit == isInit) &&
+            (identical(other.isStart, isStart) || other.isStart == isStart) &&
+            const DeepCollectionEquality()
+                .equals(other._selectedMap, _selectedMap));
   }
 
   @override
-  int get hashCode =>
-      Object.hash(runtimeType, currentProxyName, isCurrent, delay, isInit);
+  int get hashCode => Object.hash(runtimeType, isInit, isStart,
+      const DeepCollectionEquality().hash(_selectedMap));
 
   @JsonKey(ignore: true)
   @override
   @pragma('vm:prefer-inline')
-  _$$UpdateCurrentDelaySelectorStateImplCopyWith<
-          _$UpdateCurrentDelaySelectorStateImpl>
-      get copyWith => __$$UpdateCurrentDelaySelectorStateImplCopyWithImpl<
-          _$UpdateCurrentDelaySelectorStateImpl>(this, _$identity);
+  _$$CheckIpSelectorStateImplCopyWith<_$CheckIpSelectorStateImpl>
+      get copyWith =>
+          __$$CheckIpSelectorStateImplCopyWithImpl<_$CheckIpSelectorStateImpl>(
+              this, _$identity);
 }
 
-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;
+abstract class _CheckIpSelectorState implements CheckIpSelectorState {
+  const factory _CheckIpSelectorState(
+          {required final bool isInit,
+          required final bool isStart,
+          required final Map<String, String> selectedMap}) =
+      _$CheckIpSelectorStateImpl;
 
-  @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)
-  _$$UpdateCurrentDelaySelectorStateImplCopyWith<
-          _$UpdateCurrentDelaySelectorStateImpl>
+  _$$CheckIpSelectorStateImplCopyWith<_$CheckIpSelectorStateImpl>
       get copyWith => throw _privateConstructorUsedError;
 }
 

lib/models/ip.dart

@@ -62,4 +62,9 @@ class IpInfo {
       _ => throw const FormatException("invalid json"),
     };
   }
+
+  @override
+  String toString() {
+    return 'IpInfo{ip: $ip, countryCode: $countryCode}';
+  }
 }

lib/models/profile.dart

@@ -16,16 +16,17 @@ class UserInfo {
   int upload;
   int download;
   int total;
-  int? expire;
+  int expire;
 
   UserInfo({
     int? upload,
     int? download,
     int? total,
-    this.expire,
+    int? expire,
   })  : upload = upload ?? 0,
         download = download ?? 0,
-        total = total ?? 0;
+        total = total ?? 0,
+        expire = expire ?? 0;
 
   Map<String, dynamic> toJson() {
     return _$UserInfoToJson(this);
@@ -37,10 +38,10 @@ class UserInfo {
 
   factory UserInfo.formHString(String? info) {
     if (info == null) return UserInfo();
-    var list = info.split(";");
+    final list = info.split(";");
     Map<String, int?> map = {};
-    for (var i in list) {
-      var keyValue = i.trim().split("=");
+    for (final i in list) {
+      final keyValue = i.trim().split("=");
       map[keyValue[0]] = int.tryParse(keyValue[1]);
     }
     return UserInfo(
@@ -83,7 +84,8 @@ class Profile {
         autoUpdateDuration = autoUpdateDuration ?? defaultUpdateDuration,
         selectedMap = selectedMap ?? {};
 
-  ProfileType get type => url == null ? ProfileType.file : ProfileType.url;
+  ProfileType get type =>
+      url == null || url?.isEmpty == true ? ProfileType.file : ProfileType.url;
 
   Future<void> checkAndUpdate() async {
     final isExists = await check();
@@ -95,9 +97,6 @@ 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;

lib/models/selector.dart

@@ -1,10 +1,7 @@
 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';
 
@@ -17,13 +14,12 @@ class StartButtonSelectorState with _$StartButtonSelectorState {
 }
 
 @freezed
-class UpdateCurrentDelaySelectorState with _$UpdateCurrentDelaySelectorState {
-  const factory UpdateCurrentDelaySelectorState({
-    required String? currentProxyName,
-    required bool isCurrent,
-    required int? delay,
+class CheckIpSelectorState with _$CheckIpSelectorState {
+  const factory CheckIpSelectorState({
     required bool isInit,
-  }) = _UpdateCurrentDelaySelectorState;
+    required bool isStart,
+    required SelectedMap selectedMap,
+  }) = _CheckIpSelectorState;
 }
 
 @freezed
@@ -53,24 +49,23 @@ 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({
@@ -89,21 +84,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,
@@ -125,4 +120,4 @@ class PackageListSelectorState with _$PackageListSelectorState {
     required AccessControl accessControl,
     required bool isAccessControl,
   }) = _PackageListSelectorState;
-}
+}

lib/state.dart

@@ -13,7 +13,6 @@ import 'common/common.dart';
 
 class GlobalState {
   Timer? timer;
-  Function? healthcheckLockDebounce;
   Timer? groupsUpdateTimer;
   Function? updateCurrentDelayDebounce;
   PageController? pageController;
@@ -22,7 +21,6 @@ class GlobalState {
   late AppController appController;
   GlobalKey<CommonScaffoldState> homeScaffoldKey = GlobalKey();
   List<Function> updateFunctionLists = [];
-  bool healthcheckLock = false;
 
   startListenUpdate() {
     if (timer != null && timer!.isActive == true) return;
@@ -253,20 +251,6 @@ 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,

lib/widgets/clash_message_container.dart

@@ -38,16 +38,8 @@ 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);
   }
 

lib/widgets/list.dart

@@ -71,6 +71,7 @@ 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;
@@ -87,6 +88,7 @@ class ListItem<T> extends StatelessWidget {
     this.horizontalTitleGap,
     this.prue,
     this.onTab,
+    this.tileTitleAlignment = ListTileTitleAlignment.center,
   }) : delegate = const Delegate();
 
   const ListItem.open({
@@ -99,6 +101,7 @@ class ListItem<T> extends StatelessWidget {
     required OpenDelegate this.delegate,
     this.horizontalTitleGap,
     this.prue,
+    this.tileTitleAlignment = ListTileTitleAlignment.center,
   }) : onTab = null;
 
   const ListItem.next({
@@ -111,6 +114,7 @@ class ListItem<T> extends StatelessWidget {
     required NextDelegate this.delegate,
     this.horizontalTitleGap,
     this.prue,
+    this.tileTitleAlignment = ListTileTitleAlignment.center,
   }) : onTab = null;
 
   const ListItem.checkbox({
@@ -122,6 +126,7 @@ class ListItem<T> extends StatelessWidget {
     required CheckboxDelegate this.delegate,
     this.horizontalTitleGap,
     this.prue,
+    this.tileTitleAlignment = ListTileTitleAlignment.center,
   })  : trailing = null,
         onTab = null;
 
@@ -134,6 +139,7 @@ class ListItem<T> extends StatelessWidget {
     required SwitchDelegate this.delegate,
     this.horizontalTitleGap,
     this.prue,
+    this.tileTitleAlignment = ListTileTitleAlignment.center,
   })  : trailing = null,
         onTab = null;
 
@@ -146,6 +152,7 @@ class ListItem<T> extends StatelessWidget {
     required RadioDelegate<T> this.delegate,
     this.horizontalTitleGap = 8,
     this.prue,
+    this.tileTitleAlignment = ListTileTitleAlignment.center,
   })  : leading = null,
         onTab = null;
 
@@ -193,6 +200,7 @@ class ListItem<T> extends StatelessWidget {
       horizontalTitleGap: horizontalTitleGap,
       title: title,
       subtitle: subtitle,
+      titleAlignment: tileTitleAlignment,
       onTap: onTab,
       trailing: trailing ?? this.trailing,
       contentPadding: padding,

lib/widgets/scaffold.dart

@@ -49,6 +49,7 @@ 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);
 
@@ -58,11 +59,16 @@ 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();
@@ -85,6 +91,7 @@ class CommonScaffoldState extends State<CommonScaffold> {
     super.didUpdateWidget(oldWidget);
     if (oldWidget.title != widget.title) {
       _actions.value = [];
+      _floatingActionButton.value = null;
     }
   }
 
@@ -109,6 +116,12 @@ 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(

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.11
+version: 0.8.18
 environment:
   sdk: '>=3.1.0 <4.0.0'
 
@@ -38,6 +38,7 @@ 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

setup.dart

@@ -12,10 +12,7 @@ enum PlatformType {
   macos,
 }
 
-enum Arch {
-  amd64,
-  arm64,
-}
+enum Arch { amd64, arm64, arm }
 
 class BuildLibItem {
   PlatformType platform;
@@ -64,6 +61,11 @@ class Build {
           arch: Arch.amd64,
           archName: 'amd64',
         ),
+        BuildLibItem(
+          platform: PlatformType.android,
+          arch: Arch.arm,
+          archName: 'armeabi-v7a',
+        ),
         BuildLibItem(
           platform: PlatformType.android,
           arch: Arch.arm64,
@@ -334,7 +336,7 @@ class BuildCommand extends Command {
     final archName = argResults?['arch'];
     final currentArches =
         arches.where((element) => element.name == archName).toList();
-    final arch = currentArches.isEmpty ? null : arches.first;
+    final arch = currentArches.isEmpty ? null : currentArches.first;
     await _buildLib(arch);
     if (build != "all") {
       return;
@@ -357,10 +359,11 @@ 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.amd64, Arch.arm64];
+        final defaultArches = [Arch.arm, Arch.arm64, Arch.amd64];
         final defaultTargets = defaultArches
             .where((element) => arch == null ? true : element == arch)
             .map((e) => targetMap[e])

test/command_test.dart

@@ -1,5 +1,4 @@
 // ignore_for_file: avoid_print
-
 void main() async {
   String input = """
 您