Fix LoadBalance, Relay load error

Fix build.yml4
Fix build.yml3
2024-06-09 20:53:36 +08:00 · 2024-06-09 19:56:51 +08:00 · 2024-06-09 19:49:51 +08:00 · 2024-06-09 19:49:14 +08:00 · 2024-06-09 19:46:05 +08:00 · 2024-06-09 19:25:14 +08:00
49 changed files with 992 additions and 660 deletions
--- a/.github/workflows/build.yml
+++ b/.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
--- a/.gitignore
+++ b/.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/

--- a/android/app/build.gradle
+++ b/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
--- a/android/app/src/main/AndroidManifest.xml
+++ b/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>
--- a/android/app/src/main/kotlin/com/follow/clash/services/FlClashTileService.kt
+++ b/android/app/src/main/kotlin/com/follow/clash/services/FlClashTileService.kt
@@ -19,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)
        }
    }
--- a/android/app/src/main/kotlin/com/follow/clash/services/FlClashVpnService.kt
+++ b/android/app/src/main/kotlin/com/follow/clash/services/FlClashVpnService.kt
@@ -1,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)
        }
    }

--- a/android/app/src/main/res/drawable-hdpi/ic_stat_name.png
+++ b/android/app/src/main/res/drawable-hdpi/ic_stat_name.png
--- a/android/app/src/main/res/drawable-mdpi/ic_stat_name.png
+++ b/android/app/src/main/res/drawable-mdpi/ic_stat_name.png
--- a/android/app/src/main/res/drawable-xhdpi/ic_stat_name.png
+++ b/android/app/src/main/res/drawable-xhdpi/ic_stat_name.png
--- a/android/app/src/main/res/drawable-xxhdpi/ic_stat_name.png
+++ b/android/app/src/main/res/drawable-xxhdpi/ic_stat_name.png
--- a/android/app/src/main/res/drawable-xxxhdpi/ic_stat_name.png
+++ b/android/app/src/main/res/drawable-xxxhdpi/ic_stat_name.png
--- a/android/app/src/main/res/drawable/icon.png
+++ b/android/app/src/main/res/drawable/icon.png
--- a/android/app/src/main/res/drawable/tile_icon.png
+++ b/android/app/src/main/res/drawable/tile_icon.png
--- a/core/Clash.Meta
+++ b/core/Clash.Meta
--- a/core/common.go
+++ b/core/common.go
@@ -336,8 +336,8 @@ func overwriteConfig(targetConfig *config.RawConfig, patchConfig config.RawConfi
 	targetConfig.Mode = patchConfig.Mode
 	targetConfig.Tun.Enable = patchConfig.Tun.Enable
 	targetConfig.Tun.Device = patchConfig.Tun.Device
-	targetConfig.Tun.DNSHijack = patchConfig.Tun.DNSHijack
-	targetConfig.Tun.Stack = patchConfig.Tun.Stack
+	//targetConfig.Tun.DNSHijack = patchConfig.Tun.DNSHijack
+	//targetConfig.Tun.Stack = patchConfig.Tun.Stack
 	targetConfig.GeodataLoader = "standard"
 	targetConfig.Profile.StoreSelected = false
 	if targetConfig.DNS.Enable == false {
@@ -353,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) {
--- a/core/go.mod
+++ b/core/go.mod
@@ -1,6 +1,6 @@
 module core

-go 1.21.0
+go 1.20

 replace github.com/metacubex/mihomo => ./Clash.Meta

--- a/core/go.sum
+++ b/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=
--- a/core/tun.go
+++ b/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() {
--- a/lib/application.dart
+++ b/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,
--- a/lib/common/datetime.dart
+++ b/lib/common/datetime.dart
@@ -35,4 +35,8 @@ extension DateTimeExtension on DateTime {
    }
    return appLocalizations.just;
  }
-}
+
+  String get show {
+    return toIso8601String().substring(0, 10);
+  }
+}
--- a/lib/common/measure.dart
+++ b/lib/common/measure.dart
@@ -23,6 +23,7 @@ class Measure {
  double? _bodyMediumHeight;
  double? _bodySmallHeight;
  double? _labelSmallHeight;
+  double? _labelMediumHeight;
  double? _titleLargeHeight;
  double? _titleMediumHeight;

@@ -56,6 +57,16 @@ class Measure {
    return _labelSmallHeight!;
  }

+  double get labelMediumHeight {
+    _labelMediumHeight ??= computeTextSize(
+      Text(
+        "",
+        style: context.textTheme.labelMedium,
+      ),
+    ).height;
+    return _labelMediumHeight!;
+  }
+
  double get titleLargeHeight {
    _titleLargeHeight ??= computeTextSize(
      Text(
--- a/lib/common/request.dart
+++ b/lib/common/request.dart
@@ -14,9 +14,6 @@ class Request {
  Request() {
    _dio = Dio(
      BaseOptions(
-        connectTimeout: httpTimeoutDuration,
-        sendTimeout: httpTimeoutDuration,
-        receiveTimeout: httpTimeoutDuration,
        headers: {"User-Agent": coreName},
      ),
    );
@@ -37,7 +34,7 @@ class Request {
      _dio.httpClientAdapter = IOHttpClientAdapter(
        createHttpClient: () {
          final client = HttpClient();
-          if(!_isStart) return client;
+          if (!_isStart) return client;
          client.findProxy = (url) {
            return "PROXY localhost:$_port;DIRECT";
          };
@@ -56,7 +53,7 @@ class Request {
          ),
        )
        .timeout(
-          httpTimeoutDuration,
+          httpTimeoutDuration * 2,
        );
    return response;
  }
@@ -86,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!);
        }
@@ -103,4 +102,4 @@ class Request {
  }
 }

-final request = Request();
+final request = Request();
--- a/lib/common/text.dart
+++ b/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);
  }
--- a/lib/controller.dart
+++ b/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';
@@ -96,7 +97,7 @@ class AppController {
    }
  }

-  updateProfile(String id) async {
+  Future<void> updateProfile(String id) async {
    final profile = config.getCurrentProfileForId(id);
    if (profile != null) {
      final tempProfile = profile.copyWith();
@@ -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);
    }
  }

--- a/lib/enum/enum.dart
+++ b/lib/enum/enum.dart
@@ -1,6 +1,6 @@
 // ignore_for_file: constant_identifier_names

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

 enum GroupName { GLOBAL, Proxy, Auto, Fallback }

--- a/lib/fragments/access.dart
+++ b/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 = 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) {
+    final packages = _results;
+    return _packageList(packages);
+  }
+
+  @override
+  Widget buildSuggestions(BuildContext context) {
+    return _packageList(packages);
+  }
+}
--- a/lib/fragments/config.dart
+++ b/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, __) {
--- a/lib/fragments/dashboard/network_detection.dart
+++ b/lib/fragments/dashboard/network_detection.dart
@@ -1,4 +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';
@@ -16,20 +17,29 @@ class NetworkDetection extends StatefulWidget {
 class _NetworkDetectionState extends State<NetworkDetection> {
  final ipInfoNotifier = ValueNotifier<IpInfo?>(null);
  final timeoutNotifier = ValueNotifier<bool>(false);
+  bool? _preIsStart;
+  CancelToken? cancelToken;

  _checkIp(
    bool isInit,
+    bool isStart,
  ) async {
    if (!isInit) return;
+    if (_preIsStart == false && _preIsStart == isStart) return;
+    if (cancelToken != null) {
+      cancelToken!.cancel();
+      cancelToken = null;
+    }
    ipInfoNotifier.value = null;
-    final ipInfo = await request.checkIp();
+    final ipInfo = await request.checkIp(cancelToken);
    if (ipInfo == null) {
      timeoutNotifier.value = true;
      return;
    } else {
      timeoutNotifier.value = false;
    }
-    ipInfoNotifier.value = await request.checkIp();
+    _preIsStart = isStart;
+    ipInfoNotifier.value = ipInfo;
  }

  _checkIpContainer(Widget child) {
@@ -42,9 +52,7 @@ class _NetworkDetectionState extends State<NetworkDetection> {
        );
      },
      builder: (_, state, __) {
-        _checkIp(
-          state.isInit,
-        );
+        _checkIp(state.isInit, state.isStart);
        return child;
      },
      child: child,
@@ -82,15 +90,30 @@ class _NetworkDetectionState extends State<NetworkDetection> {
                                    width: 24,
                                    height: 24,
                                  )
-                                : TooltipText(
-                                    text: Text(
-                                      appLocalizations.checking,
-                                      maxLines: 1,
-                                      overflow: TextOverflow.ellipsis,
-                                      style: Theme.of(context)
-                                          .textTheme
-                                          .titleMedium,
-                                    ),
+                                : 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,
+                                        ),
+                                      );
+                                    },
                                  ),
                          ),
                        ),
@@ -126,17 +149,21 @@ class _NetworkDetectionState extends State<NetworkDetection> {
                        : ValueListenableBuilder(
                            valueListenable: timeoutNotifier,
                            builder: (_, timeout, __) {
-                              if(timeout){
+                              if (timeout) {
                                return Text(
-                                  appLocalizations.ipCheckError,
-                                  style: context.textTheme.bodyMedium
+                                  appLocalizations.ipCheckTimeout,
+                                  style: context.textTheme.titleLarge
                                      ?.toSoftBold(),
                                  maxLines: 1,
                                  overflow: TextOverflow.ellipsis,
                                );
                              }
-                              return const SizedBox(
-                                child: CircularProgressIndicator(),
+                              return Container(
+                                padding: const EdgeInsets.all(2),
+                                child: const AspectRatio(
+                                  aspectRatio: 1,
+                                  child: CircularProgressIndicator(),
+                                ),
                              );
                            },
                          ),
--- a/lib/fragments/logs.dart
+++ b/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,
+      )
    ];
  }

--- a/lib/fragments/profiles/edit_profile.dart
+++ b/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';
@@ -82,7 +83,7 @@ class _EditProfileState extends State<EditProfile> {
          },
        ),
      ),
-      if (widget.profile.url != null && widget.profile.url!.isNotEmpty == true)...[
+      if (widget.profile.type == ProfileType.url)...[
        ListItem(
          title: TextFormField(
            controller: urlController,
--- a/lib/fragments/profiles/profiles.dart
+++ b/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,17 +48,47 @@ 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,
@@ -149,11 +101,51 @@ class _ProfilesFragmentState extends State<ProfilesFragment> {
              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,
+                            ),
+                          ),
+                      ],
+                    ),
+                  );
+                },
+              ),
            ),
          );
        },
@@ -162,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,
+      ),
+    );
+  }
 }
--- a/lib/fragments/proxies.dart
+++ b/lib/fragments/proxies.dart
@@ -51,6 +51,9 @@ class _ProxiesFragmentState extends State<ProxiesFragment>
              selectedValue: proxiesSortType,
            );
          },
+        ),
+        const SizedBox(
+          width: 8,
        )
      ];
    });
@@ -196,10 +199,15 @@ 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: proxy.name, value: 0),
+        Delay(
+          name: proxyName,
+          value: 0,
+        ),
      );
-      clashCore.getDelay(proxy.name).then((delay) {
+      clashCore.getDelay(proxyName).then((delay) {
        globalState.appController.setDelay(delay);
      });
    }
@@ -431,7 +439,7 @@ class _DelayTestButtonContainerState extends State<DelayTestButtonContainer>
    _controller = AnimationController(
      vsync: this,
      duration: const Duration(
-        milliseconds: 1200,
+        milliseconds: 200,
      ),
    );
    _scale = Tween<double>(
@@ -443,7 +451,6 @@ class _DelayTestButtonContainerState extends State<DelayTestButtonContainer>
        curve: const Interval(
          0,
          1,
-          curve: Curves.elasticInOut,
        ),
      ),
    );
--- a/lib/l10n/arb/intl_en.arb
+++ b/lib/l10n/arb/intl_en.arb
@@ -159,5 +159,7 @@
  "externalResources": "External resources",
  "checking": "Checking...",
  "country": "Country",
-  "ipCheckError": "Ip check timeout"
+  "checkError": "Check error",
+  "ipCheckTimeout": "Ip check timeout",
+  "search": "Search"
 }
--- a/lib/l10n/arb/intl_zh_CN.arb
+++ b/lib/l10n/arb/intl_zh_CN.arb
@@ -159,5 +159,7 @@
  "externalResources": "外部资源",
  "checking": "检测中...",
  "country": "区域",
-  "ipCheckError": "Ip检测超时"
+  "checkError": "检测失败",
+  "ipCheckTimeout": "Ip检测超时",
+  "search": "搜索"
 }
--- a/lib/l10n/intl/messages_en.dart
+++ b/lib/l10n/intl/messages_en.dart
@@ -76,6 +76,7 @@ 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(
@@ -124,7 +125,7 @@ class MessageLookup extends MessageLookupByLibrary {
        "hours": MessageLookupByLibrary.simpleMessage("Hours"),
        "importFromURL":
            MessageLookupByLibrary.simpleMessage("Import from URL"),
-        "ipCheckError":
+        "ipCheckTimeout":
            MessageLookupByLibrary.simpleMessage("Ip check timeout"),
        "just": MessageLookupByLibrary.simpleMessage("Just"),
        "language": MessageLookupByLibrary.simpleMessage("Language"),
@@ -211,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"),
--- a/lib/l10n/intl/messages_zh_CN.dart
+++ b/lib/l10n/intl/messages_zh_CN.dart
@@ -63,6 +63,7 @@ class MessageLookup extends MessageLookupByLibrary {
        "cancelFilterSystemApp":
            MessageLookupByLibrary.simpleMessage("取消过滤系统应用"),
        "cancelSelectAll": MessageLookupByLibrary.simpleMessage("取消全选"),
+        "checkError": MessageLookupByLibrary.simpleMessage("检测失败"),
        "checkUpdate": MessageLookupByLibrary.simpleMessage("检查更新"),
        "checkUpdateError": MessageLookupByLibrary.simpleMessage("当前应用已经是最新版了"),
        "checking": MessageLookupByLibrary.simpleMessage("检测中..."),
@@ -101,7 +102,7 @@ class MessageLookup extends MessageLookupByLibrary {
        "goDownload": MessageLookupByLibrary.simpleMessage("前往下载"),
        "hours": MessageLookupByLibrary.simpleMessage("小时"),
        "importFromURL": MessageLookupByLibrary.simpleMessage("从URL导入"),
-        "ipCheckError": MessageLookupByLibrary.simpleMessage("Ip检测超时"),
+        "ipCheckTimeout": MessageLookupByLibrary.simpleMessage("Ip检测超时"),
        "just": MessageLookupByLibrary.simpleMessage("刚刚"),
        "language": MessageLookupByLibrary.simpleMessage("语言"),
        "light": MessageLookupByLibrary.simpleMessage("浅色"),
@@ -170,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("设置"),
--- a/lib/l10n/l10n.dart
+++ b/lib/l10n/l10n.dart
@@ -1650,11 +1650,31 @@ class AppLocalizations {
    );
  }

+  /// `Check error`
+  String get checkError {
+    return Intl.message(
+      'Check error',
+      name: 'checkError',
+      desc: '',
+      args: [],
+    );
+  }
+
  /// `Ip check timeout`
-  String get ipCheckError {
+  String get ipCheckTimeout {
    return Intl.message(
      'Ip check timeout',
-      name: 'ipCheckError',
+      name: 'ipCheckTimeout',
+      desc: '',
+      args: [],
+    );
+  }
+
+  /// `Search`
+  String get search {
+    return Intl.message(
+      'Search',
+      name: 'search',
      desc: '',
      args: [],
    );
--- a/lib/models/app.dart
+++ b/lib/models/app.dart
@@ -107,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 ?? '*'})";
    }
  }

--- a/lib/models/config.dart
+++ b/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
--- a/lib/models/generated/clash_config.freezed.dart
+++ b/lib/models/generated/clash_config.freezed.dart
@@ -135,7 +135,7 @@ class _$TunImpl implements _Tun {
  const _$TunImpl(
      {this.enable = false,
      this.device = appName,
-      this.stack = TunStack.mixed,
+      this.stack = TunStack.gvisor,
      @JsonKey(name: "dns-hijack")
      final List<String> dnsHijack = const ["any:53"]})
      : _dnsHijack = dnsHijack;
--- a/lib/models/generated/clash_config.g.dart
+++ b/lib/models/generated/clash_config.g.dart
@@ -79,7 +79,7 @@ _$TunImpl _$$TunImplFromJson(Map<String, dynamic> json) => _$TunImpl(
      enable: json['enable'] as bool? ?? false,
      device: json['device'] as String? ?? appName,
      stack: $enumDecodeNullable(_$TunStackEnumMap, json['stack']) ??
-          TunStack.mixed,
+          TunStack.gvisor,
      dnsHijack: (json['dns-hijack'] as List<dynamic>?)
              ?.map((e) => e as String)
              .toList() ??
--- a/lib/models/generated/proxy.g.dart
+++ b/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(
--- a/lib/models/profile.dart
+++ b/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();
--- a/lib/widgets/list.dart
+++ b/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,
--- a/lib/widgets/scaffold.dart
+++ b/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(
--- a/plugins/flutter_distributor
+++ b/plugins/flutter_distributor
--- a/pubspec.lock
+++ b/pubspec.lock
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -1,7 +1,7 @@
 name: fl_clash
 description: A multi-platform proxy client based on ClashMeta, simple and easy to use, open-source and ad-free.
 publish_to: 'none'
-version: 0.8.13
+version: 0.8.17
 environment:
  sdk: '>=3.1.0 <4.0.0'

--- a/setup.dart
+++ b/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])
Author	SHA1	Message	Date
chen08209	7acf9c6db3	Fix LoadBalance, Relay load error	2024-06-09 20:53:36 +08:00
chen08209	8074547fb4	Fix build.yml4	2024-06-09 19:56:51 +08:00
chen08209	8a01e04871	Fix build.yml3	2024-06-09 19:49:51 +08:00
chen08209	7ddcdd9828	Fix build.yml2	2024-06-09 19:49:14 +08:00
chen08209	d89ed076fd	Fix build.yml	2024-06-09 19:46:05 +08:00
chen08209	f4c3b06cd5	Add search function at access control Fix the issues with the profile add button to cover the edit button Adapt LoadBalance and Relay Add arm Fix android notification icon error	2024-06-09 19:25:14 +08:00
chen08209	c65746709d	Add one-click update all profiles Add expire show	2024-06-08 15:43:28 +08:00
chen08209	d2d9bdab02	Temp remove tun mode	2024-06-06 22:58:32 +08:00
chen08209	d0f8444b6d	Remove macos in workflow	2024-06-06 22:29:26 +08:00
chen08209	fccabfbe27	Change go version	2024-06-06 22:04:29 +08:00
chen08209	e9bb97c6ce	Update Version Fix tun unable to open	2024-06-06 17:36:49 +08:00