Change flutter version

Support windows country flags display

Optimize proxies page and profiles page columns

.github/workflows/build.yml

@@ -15,10 +15,16 @@ jobs:
             os: ubuntu-latest
           - platform: windows
             os: windows-latest
+            arch: amd64
           - platform: linux
             os: ubuntu-latest
+            arch: amd64
           - platform: macos
             os: macos-13
+            arch: amd64
+          - platform: macos
+            os: macos-latest
+            arch: arm64
 
     steps:
       - name: Setup Mingw64
@@ -81,7 +87,7 @@ jobs:
       - name: Setup Flutter
         uses: subosito/flutter-action@v2
         with:
-          flutter-version: '3.x'
+          flutter-version: 3.22.x
           channel: 'stable'
           cache: true
 
@@ -89,13 +95,12 @@ jobs:
         run: flutter pub get
 
       - name: Setup
-        run: |
-          dart setup.dart ${{ matrix.platform }}
+        run: dart setup.dart ${{ matrix.platform }} ${{ matrix.arch && format('--arch {0}', matrix.arch) }}
 
       - name: Upload
         uses: actions/upload-artifact@v4
         with:
-          name: artifact-${{ matrix.platform }}
+          name: artifact-${{ matrix.platform }}${{ matrix.arch && format('-{0}', matrix.arch) }}
           path: ./dist
           retention-days: 1
           overwrite: true
@@ -131,8 +136,29 @@ jobs:
             gitchangelog "${pre}.." >> release.md 2>&1 || echo "Error in gitchangelog"
             echo -e "\n\n</details>" >> release.md
           fi
+
       - name: Release
         uses: softprops/action-gh-release@v2
         with:
           files: ./dist/*
-          body_path: './release.md'
+          body_path: './release.md'
+
+      - name: Create Fdroid Source Dir
+        run: |
+          mkdir -p ./tmp
+          cp ./dist/*android-arm64-v8a* ./tmp/ || true
+          echo "Files copied successfully"
+
+      - name: Push to fdroid repo
+        uses: cpina/github-action-push-to-another-repository@v1.7.2
+        env:
+          SSH_DEPLOY_KEY: ${{ secrets.SSH_DEPLOY_KEY }}
+        with:
+          source-directory: ./tmp/
+          destination-github-username: chen08209
+          destination-repository-name: FlClash-fdroid-repo
+          user-name: 'github-actions[bot]'
+          user-email: 'github-actions[bot]@users.noreply.github.com'
+          target-branch: action-pr
+          commit-message: Update from ${{ github.ref_name }}
+          target-directory: /tmp/

README.md

@@ -38,6 +38,10 @@ on Mobile:
 
 ✨ Support subscription link, Dark mode
 
+## Download
+
+<a href="https://chen08209.github.io/FlClash-fdroid-repo/repo?fingerprint=789D6D32668712EF7672F9E58DEEB15FBD6DCEEC5AE7A4371EA72F2AAE8A12FD"><img alt="Get it on F-Droid" src="snapshots/get-it-on-fdroid.svg" width="200px"/></a> <a href="https://github.com/chen08209/FlClash/releases"><img alt="Get it on GitHub" src="snapshots/get-it-on-github.svg" width="200px"/></a>
+
 ## Contact
 
 [Telegram](https://t.me/+G-veVtwBOl4wODc1)

README_zh_CN.md

@@ -38,6 +38,11 @@ on Mobile:
 
 ✨ 支持一键导入订阅, 深色模式
 
+## Download
+
+<a href="https://chen08209.github.io/FlClash-fdroid-repo/repo?fingerprint=789D6D32668712EF7672F9E58DEEB15FBD6DCEEC5AE7A4371EA72F2AAE8A12FD"><img alt="Get it on F-Droid" src="snapshots/get-it-on-fdroid.svg" width="200px"/></a> <a href="https://github.com/chen08209/FlClash/releases"><img alt="Get it on GitHub" src="snapshots/get-it-on-github.svg" width="200px"/></a>
+
+
 ## Contact
 
 [Telegram](https://t.me/+G-veVtwBOl4wODc1)

android/app/build.gradle

@@ -102,6 +102,9 @@ flutter {
 dependencies {
     implementation 'androidx.core:core-splashscreen:1.0.1'
     implementation 'com.google.code.gson:gson:2.10'
+    implementation("com.android.tools.smali:smali-dexlib2:3.0.7") {
+        exclude group: "com.google.guava", module: "guava"
+    }
 }
 
 

android/app/src/main/AndroidManifest.xml

@@ -24,8 +24,9 @@
         android:icon="@mipmap/ic_launcher"
         android:networkSecurityConfig="@xml/network_security_config"
         android:extractNativeLibs="true"
+        android:enableOnBackInvokedCallback="true"
         android:label="FlClash"
-        tools:targetApi="n">
+        tools:targetApi="tiramisu">
         <activity
             android:name="com.follow.clash.MainActivity"
             android:configChanges="orientation|keyboardHidden|keyboard|screenSize|smallestScreenSize|locale|layoutDirection|fontScale|screenLayout|density|uiMode"
@@ -74,10 +75,11 @@
         <service
             android:name=".services.FlClashTileService"
             android:exported="true"
-            android:icon="@drawable/icon"
+            android:icon="@drawable/ic_stat_name"
             android:foregroundServiceType="specialUse"
             android:label="FlClash"
-            android:permission="android.permission.BIND_QUICK_SETTINGS_TILE">
+            android:permission="android.permission.BIND_QUICK_SETTINGS_TILE"
+            >
             <intent-filter>
                 <action android:name="android.service.quicksettings.action.QS_TILE" />
             </intent-filter>
@@ -85,11 +87,35 @@
                 android:name="android.service.quicksettings.TOGGLEABLE_TILE"
                 android:value="true" />
         </service>
+
+        <provider
+            android:name=".FilesProvider"
+            android:authorities="${applicationId}.files"
+            android:exported="true"
+            android:grantUriPermissions="true"
+            android:permission="android.permission.MANAGE_DOCUMENTS"
+            android:process=":background">
+            <intent-filter>
+                <action android:name="android.content.action.DOCUMENTS_PROVIDER" />
+            </intent-filter>
+        </provider>
+
+        <provider
+            android:name="androidx.core.content.FileProvider"
+            android:authorities="${applicationId}.fileProvider"
+            android:exported="false"
+            android:grantUriPermissions="true">
+            <meta-data
+                android:name="android.support.FILE_PROVIDER_PATHS"
+                android:resource="@xml/file_paths" />
+        </provider>
+
         <service
             android:name=".services.FlClashVpnService"
             android:exported="false"
             android:foregroundServiceType="specialUse"
-            android:permission="android.permission.BIND_VPN_SERVICE">
+            android:permission="android.permission.BIND_VPN_SERVICE"
+            >
             <intent-filter>
                 <action android:name="android.net.VpnService" />
             </intent-filter>

android/app/src/main/kotlin/com/follow/clash/FilesProvider.kt

@@ -0,0 +1,112 @@
+package com.follow.clash
+
+import android.database.Cursor
+import android.database.MatrixCursor
+import android.os.CancellationSignal
+import android.os.ParcelFileDescriptor
+import android.provider.DocumentsContract.Document
+import android.provider.DocumentsContract.Root
+import android.provider.DocumentsProvider
+import java.io.File
+import java.io.FileNotFoundException
+
+
+class FilesProvider : DocumentsProvider() {
+
+    companion object {
+        private const val DEFAULT_ROOT_ID = "0"
+
+        private val DEFAULT_DOCUMENT_COLUMNS = arrayOf(
+            Document.COLUMN_DOCUMENT_ID,
+            Document.COLUMN_DISPLAY_NAME,
+            Document.COLUMN_MIME_TYPE,
+            Document.COLUMN_FLAGS,
+            Document.COLUMN_SIZE,
+        )
+        private val DEFAULT_ROOT_COLUMNS = arrayOf(
+            Root.COLUMN_ROOT_ID,
+            Root.COLUMN_FLAGS,
+            Root.COLUMN_ICON,
+            Root.COLUMN_TITLE,
+            Root.COLUMN_SUMMARY,
+            Root.COLUMN_DOCUMENT_ID
+        )
+    }
+
+    override fun onCreate(): Boolean {
+        return true
+    }
+
+    override fun queryRoots(projection: Array<String>?): Cursor {
+        return MatrixCursor(projection ?: DEFAULT_ROOT_COLUMNS).apply {
+            newRow().apply {
+                add(Root.COLUMN_ROOT_ID, DEFAULT_ROOT_ID)
+                add(Root.COLUMN_FLAGS, Root.FLAG_LOCAL_ONLY)
+                add(Root.COLUMN_ICON, R.mipmap.ic_launcher)
+                add(Root.COLUMN_TITLE, context!!.getString(R.string.fl_clash))
+                add(Root.COLUMN_SUMMARY, "Data")
+                add(Root.COLUMN_DOCUMENT_ID, "/")
+            }
+        }
+    }
+
+
+    override fun queryChildDocuments(
+        parentDocumentId: String,
+        projection: Array<String>?,
+        sortOrder: String?
+    ): Cursor {
+        val result = MatrixCursor(resolveDocumentProjection(projection))
+        val parentFile = if (parentDocumentId == "/") {
+            context?.filesDir
+        } else {
+            File(parentDocumentId)
+        } ?: throw FileNotFoundException("Parent directory not found")
+        parentFile.listFiles()?.forEach { file ->
+            includeFile(result, file)
+        }
+        return result
+    }
+
+    override fun queryDocument(documentId: String, projection: Array<String>?): Cursor {
+        val result = MatrixCursor(resolveDocumentProjection(projection))
+        val file = File(documentId)
+        includeFile(result, file)
+        return result
+    }
+
+    override fun openDocument(
+        documentId: String,
+        mode: String,
+        signal: CancellationSignal?
+    ): ParcelFileDescriptor {
+        val file = File(documentId)
+        val accessMode = ParcelFileDescriptor.parseMode(mode)
+        return ParcelFileDescriptor.open(file, accessMode)
+    }
+
+    private fun includeFile(result: MatrixCursor, file: File) {
+        result.newRow().apply {
+            add(Document.COLUMN_DOCUMENT_ID, file.absolutePath)
+            add(Document.COLUMN_DISPLAY_NAME, file.name)
+            add(Document.COLUMN_SIZE, file.length())
+            add(
+                Document.COLUMN_FLAGS,
+                Document.FLAG_SUPPORTS_WRITE or Document.FLAG_SUPPORTS_DELETE
+            )
+            add(Document.COLUMN_MIME_TYPE, getDocumentType(file))
+        }
+    }
+
+    private fun getDocumentType(file: File): String {
+        return if (file.isDirectory) {
+            Document.MIME_TYPE_DIR
+        } else {
+            "application/octet-stream"
+        }
+    }
+
+    private fun resolveDocumentProjection(projection: Array<String>?): Array<String> {
+        return projection ?: DEFAULT_DOCUMENT_COLUMNS
+    }
+}

android/app/src/main/kotlin/com/follow/clash/GlobalState.kt

@@ -1,6 +1,7 @@
 package com.follow.clash
 
 import android.content.Context
+import android.util.Log
 import androidx.lifecycle.MutableLiveData
 import com.follow.clash.plugins.AppPlugin
 import com.follow.clash.plugins.ProxyPlugin
@@ -44,7 +45,7 @@ object GlobalState {
     fun initServiceEngine(context: Context) {
         if (serviceEngine != null) return
         lock.withLock {
-            if (serviceEngine != null) return
+            destroyServiceEngine()
             serviceEngine = FlutterEngine(context)
             serviceEngine?.plugins?.add(ProxyPlugin())
             serviceEngine?.plugins?.add(AppPlugin())

android/app/src/main/kotlin/com/follow/clash/models/Package.kt

@@ -1,7 +1,10 @@
 package com.follow.clash.models
 
+import java.util.Date
+
 data class Package(
     val packageName: String,
     val label: String,
-    val isSystem:Boolean
+    val isSystem: Boolean,
+    val firstInstallTime: Long,
 )

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

@@ -4,12 +4,16 @@ import android.Manifest
 import android.app.Activity
 import android.app.ActivityManager
 import android.content.Context
+import android.content.Intent
 import android.content.pm.ApplicationInfo
+import android.content.pm.ComponentInfo
 import android.content.pm.PackageManager
 import android.net.ConnectivityManager
 import android.os.Build
 import android.widget.Toast
 import androidx.core.content.ContextCompat.getSystemService
+import com.android.tools.smali.dexlib2.dexbacked.DexBackedDexFile
+import androidx.core.content.FileProvider
 import androidx.core.content.getSystemService
 import com.follow.clash.GlobalState
 import com.follow.clash.extensions.getBase64
@@ -28,7 +32,9 @@ import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.cancel
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.withContext
+import java.io.File
 import java.net.InetSocketAddress
+import java.util.zip.ZipFile
 
 
 class AppPlugin : FlutterPlugin, MethodChannel.MethodCallHandler, ActivityAware {
@@ -46,6 +52,62 @@ class AppPlugin : FlutterPlugin, MethodChannel.MethodCallHandler, ActivityAware
     private var connectivity: ConnectivityManager? = null
 
     private val iconMap = mutableMapOf<String, String?>()
+    private val packages = mutableListOf<Package>()
+
+    private val skipPrefixList = listOf(
+        "com.google",
+        "com.android.chrome",
+        "com.android.vending",
+        "com.microsoft",
+        "com.apple",
+        "com.zhiliaoapp.musically", // Banned by China
+    )
+
+    private val chinaAppPrefixList = listOf(
+        "com.tencent",
+        "com.alibaba",
+        "com.umeng",
+        "com.qihoo",
+        "com.ali",
+        "com.alipay",
+        "com.amap",
+        "com.sina",
+        "com.weibo",
+        "com.vivo",
+        "com.xiaomi",
+        "com.huawei",
+        "com.taobao",
+        "com.secneo",
+        "s.h.e.l.l",
+        "com.stub",
+        "com.kiwisec",
+        "com.secshell",
+        "com.wrapper",
+        "cn.securitystack",
+        "com.mogosec",
+        "com.secoen",
+        "com.netease",
+        "com.mx",
+        "com.qq.e",
+        "com.baidu",
+        "com.bytedance",
+        "com.bugly",
+        "com.miui",
+        "com.oppo",
+        "com.coloros",
+        "com.iqoo",
+        "com.meizu",
+        "com.gionee",
+        "cn.nubia",
+        "com.oplus",
+        "andes.oplus",
+        "com.unionpay",
+        "cn.wps"
+    )
+
+    private val chinaAppRegex by lazy {
+        ("(" + chinaAppPrefixList.joinToString("|").replace(".", "\\.") + ").*").toRegex()
+    }
 
     override fun onAttachedToEngine(flutterPluginBinding: FlutterPlugin.FlutterPluginBinding) {
         scope = CoroutineScope(Dispatchers.Default)
@@ -61,7 +123,7 @@ class AppPlugin : FlutterPlugin, MethodChannel.MethodCallHandler, ActivityAware
     }
 
     private fun tip(message: String?) {
-        if(GlobalState.flutterEngine == null){
+        if (GlobalState.flutterEngine == null) {
             if (toast != null) {
                 toast!!.cancel()
             }
@@ -85,7 +147,13 @@ class AppPlugin : FlutterPlugin, MethodChannel.MethodCallHandler, ActivityAware
 
             "getPackages" -> {
                 scope.launch {
-                    result.success(getPackages())
+                    result.success(getPackagesToJson())
+                }
+            }
+
+            "getChinaPackageNames" -> {
+                scope.launch {
+                    result.success(getChinaPackageNames())
                 }
             }
 
@@ -164,12 +232,56 @@ class AppPlugin : FlutterPlugin, MethodChannel.MethodCallHandler, ActivityAware
                 result.success(true)
             }
 
+            "openFile" -> {
+                val path = call.argument<String>("path")!!
+                openFile(path)
+                result.success(true)
+            }
+
             else -> {
                 result.notImplemented();
             }
         }
     }
 
+    private fun openFile(path: String) {
+        context?.let {
+            val file = File(path)
+            val uri = FileProvider.getUriForFile(
+                it,
+                "${it.packageName}.fileProvider",
+                file
+            )
+
+            val intent = Intent(Intent.ACTION_VIEW).setDataAndType(
+                uri,
+                "text/plain"
+            )
+
+            val flags =
+                Intent.FLAG_GRANT_WRITE_URI_PERMISSION or Intent.FLAG_GRANT_READ_URI_PERMISSION
+
+            val resInfoList = it.packageManager.queryIntentActivities(
+                intent, PackageManager.MATCH_DEFAULT_ONLY
+            )
+
+            for (resolveInfo in resInfoList) {
+                val packageName = resolveInfo.activityInfo.packageName
+                it.grantUriPermission(
+                    packageName,
+                    uri,
+                    flags
+                )
+            }
+
+            try {
+                activity?.startActivity(intent)
+            } catch (e: Exception) {
+                println(e)
+            }
+        }
+    }
+
     private fun updateExcludeFromRecents(value: Boolean?) {
         if (context == null) return
         val am = getSystemService(context!!, ActivityManager::class.java)
@@ -201,26 +313,106 @@ class AppPlugin : FlutterPlugin, MethodChannel.MethodCallHandler, ActivityAware
         return iconMap[packageName]
     }
 
-    private suspend fun getPackages(): String {
-        return withContext(Dispatchers.Default) {
-            val packageManager = context?.packageManager
-            val packages: List<Package>? =
-                packageManager?.getInstalledPackages(PackageManager.GET_META_DATA)?.filter {
-                    it.packageName != context?.packageName
-                            || it.requestedPermissions?.contains(Manifest.permission.INTERNET) == true
-                            || it.packageName == "android"
+    private fun getPackages(): List<Package> {
+        val packageManager = context?.packageManager
+        if (packages.isNotEmpty()) return packages;
+        packageManager?.getInstalledPackages(PackageManager.GET_META_DATA)?.filter {
+            it.packageName != context?.packageName
+                    || it.requestedPermissions?.contains(Manifest.permission.INTERNET) == true
+                    || it.packageName == "android"
 
-                }?.map {
-                    Package(
-                        packageName = it.packageName,
-                        label = it.applicationInfo.loadLabel(packageManager).toString(),
-                        isSystem = (it.applicationInfo.flags and ApplicationInfo.FLAG_SYSTEM) == 1
-                    )
-                }
+        }?.map {
+            Package(
+                packageName = it.packageName,
+                label = it.applicationInfo.loadLabel(packageManager).toString(),
+                isSystem = (it.applicationInfo.flags and ApplicationInfo.FLAG_SYSTEM) == 1,
+                firstInstallTime = it.firstInstallTime
+            )
+        }?.let { packages.addAll(it) }
+        return packages;
+    }
+
+    private suspend fun getPackagesToJson(): String {
+        return withContext(Dispatchers.Default) {
+            Gson().toJson(getPackages())
+        }
+    }
+
+    private suspend fun getChinaPackageNames(): String {
+        return withContext(Dispatchers.Default) {
+            val packages: List<String> =
+                getPackages().map { it.packageName }.filter { isChinaPackage(it) }
             Gson().toJson(packages)
         }
     }
 
+    private fun isChinaPackage(packageName: String): Boolean {
+        val packageManager = context?.packageManager ?: return false
+        skipPrefixList.forEach {
+            if (packageName == it || packageName.startsWith("$it.")) return false
+        }
+        val packageManagerFlags = if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {
+            PackageManager.MATCH_UNINSTALLED_PACKAGES or PackageManager.GET_ACTIVITIES or PackageManager.GET_SERVICES or PackageManager.GET_RECEIVERS or PackageManager.GET_PROVIDERS
+        } else {
+            @Suppress("DEPRECATION")
+            PackageManager.GET_UNINSTALLED_PACKAGES or PackageManager.GET_ACTIVITIES or PackageManager.GET_SERVICES or PackageManager.GET_RECEIVERS or PackageManager.GET_PROVIDERS
+        }
+        if (packageName.matches(chinaAppRegex)) {
+            return true
+        }
+        try {
+            val packageInfo = if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) {
+                packageManager.getPackageInfo(
+                    packageName,
+                    PackageManager.PackageInfoFlags.of(packageManagerFlags.toLong())
+                )
+            } else {
+                @Suppress("DEPRECATION") packageManager.getPackageInfo(
+                    packageName, packageManagerFlags
+                )
+            }
+            mutableListOf<ComponentInfo>().apply {
+                packageInfo.services?.let { addAll(it) }
+                packageInfo.activities?.let { addAll(it) }
+                packageInfo.receivers?.let { addAll(it) }
+                packageInfo.providers?.let { addAll(it) }
+            }.forEach {
+                if (it.name.matches(chinaAppRegex)) return true
+            }
+            ZipFile(File(packageInfo.applicationInfo.publicSourceDir)).use {
+                for (packageEntry in it.entries()) {
+                    if (packageEntry.name.startsWith("firebase-")) return false
+                }
+                for (packageEntry in it.entries()) {
+                    if (!(packageEntry.name.startsWith("classes") && packageEntry.name.endsWith(
+                            ".dex"
+                        ))
+                    ) {
+                        continue
+                    }
+                    if (packageEntry.size > 15000000) {
+                        return true
+                    }
+                    val input = it.getInputStream(packageEntry).buffered()
+                    val dexFile = try {
+                        DexBackedDexFile.fromInputStream(null, input)
+                    } catch (e: Exception) {
+                        return false
+                    }
+                    for (clazz in dexFile.classes) {
+                        val clazzName =
+                            clazz.type.substring(1, clazz.type.length - 1).replace("/", ".")
+                                .replace("$", ".")
+                        if (clazzName.matches(chinaAppRegex)) return true
+                    }
+                }
+            }
+        } catch (_: Exception) {
+            return false
+        }
+        return false
+    }
+
     fun requestGc() {
         channel.invokeMethod("gc", null)
     }
@@ -241,4 +433,4 @@ class AppPlugin : FlutterPlugin, MethodChannel.MethodCallHandler, ActivityAware
         channel.invokeMethod("exit", null)
         activity = null
     }
-}
+}

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

@@ -10,6 +10,7 @@ import android.content.pm.PackageManager
 import android.net.VpnService
 import android.os.Build
 import android.os.IBinder
+import android.util.Log
 import androidx.core.app.ActivityCompat
 import androidx.core.content.ContextCompat
 import com.follow.clash.GlobalState
@@ -131,7 +132,13 @@ class ProxyPlugin : FlutterPlugin, MethodChannel.MethodCallHandler, ActivityAwar
         }
         if (GlobalState.runState.value == RunState.START) return
         GlobalState.runState.value = RunState.START
-        flutterMethodChannel.invokeMethod("started", flClashVpnService?.start(port, props))
+        val intent = VpnService.prepare(context)
+        if (intent != null) {
+            stopVpn()
+            return
+        }
+        val fd = flClashVpnService?.start(port, props)
+        flutterMethodChannel.invokeMethod("started", fd)
     }
 
     private fun stopVpn() {

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

@@ -71,7 +71,7 @@ class FlClashTileService : TileService() {
             if (titlePlugin != null) {
                 titlePlugin.handleStart()
             } else {
-                GlobalState.initServiceEngine(this)
+                GlobalState.initServiceEngine(applicationContext)
             }
         } else if (GlobalState.runState.value == RunState.START) {
             GlobalState.runState.value = RunState.PENDING

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

@@ -11,12 +11,18 @@ import android.net.VpnService
 import android.os.Binder
 import android.os.Build
 import android.os.IBinder
+import android.os.Parcel
+import android.os.RemoteException
+import android.util.Log
 import androidx.core.app.NotificationCompat
 import com.follow.clash.GlobalState
 import com.follow.clash.MainActivity
 import com.follow.clash.R
 import com.follow.clash.models.AccessControlMode
 import com.follow.clash.models.Props
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.launch
 
 
 class FlClashVpnService : VpnService() {
@@ -131,7 +137,7 @@ class FlClashVpnService : VpnService() {
     }
 
     fun initServiceEngine() {
-        GlobalState.initServiceEngine(this)
+        GlobalState.initServiceEngine(applicationContext)
     }
 
     override fun onTrimMemory(level: Int) {
@@ -168,8 +174,23 @@ class FlClashVpnService : VpnService() {
 
     inner class LocalBinder : Binder() {
         fun getService(): FlClashVpnService = this@FlClashVpnService
+
+        override fun onTransact(code: Int, data: Parcel, reply: Parcel?, flags: Int): Boolean {
+            try {
+                val isSuccess = super.onTransact(code, data, reply, flags)
+                if (!isSuccess) {
+                    CoroutineScope(Dispatchers.Main).launch {
+                        GlobalState.getCurrentTitlePlugin()?.handleStop()
+                    }
+                }
+                return isSuccess
+            } catch (e: RemoteException) {
+                throw e
+            }
+        }
     }
 
+
     override fun onBind(intent: Intent): IBinder {
         return binder
     }

android/app/src/main/res/drawable/ic_launcher_foreground.xml

@@ -0,0 +1,25 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="108dp"
+    android:height="108dp"
+    android:viewportWidth="240"
+    android:viewportHeight="240">
+  <group android:scaleX="0.924"
+      android:scaleY="0.924"
+      android:translateX="9.12"
+      android:translateY="9.12">
+    <group android:scaleX="0.63461536"
+        android:scaleY="0.63461536"
+        android:translateX="45.96154"
+        android:translateY="43.846153">
+      <path
+          android:pathData="M60.65,89.6L154.18,35.6A18,18 107.59,0 1,178.77 42.19L178.77,42.19A18,18 107.59,0 1,172.18 66.78L78.65,120.78A18,18 106.67,0 1,54.06 114.19L54.06,114.19A18,18 106.67,0 1,60.65 89.6z"
+          android:fillColor="#6666FB"/>
+      <path
+          android:pathData="M84.65,131.17L131.42,104.17A18,18 107.83,0 1,156 110.76L156,110.76A18,18 107.83,0 1,149.42 135.35L102.65,162.35A18,18 106.67,0 1,78.06 155.76L78.06,155.76A18,18 106.67,0 1,84.65 131.17z"
+          android:fillColor="#336AB6"/>
+      <path
+          android:pathData="M108.65,172.74L108.65,172.74A18,18 116.03,0 1,133.24 179.33L133.24,179.33A18,18 116.03,0 1,126.65 203.92L126.65,203.92A18,18 116.03,0 1,102.06 197.33L102.06,197.33A18,18 116.03,0 1,108.65 172.74z"
+          android:fillColor="#5CA8E9"/>
+    </group>
+  </group>
+</vector>

android/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
     <background android:drawable="@color/ic_launcher_background"/>
-    <foreground android:drawable="@mipmap/ic_launcher_foreground"/>
-    <monochrome android:drawable="@mipmap/ic_launcher_foreground" />
+    <foreground android:drawable="@drawable/ic_launcher_foreground"/>
+    <monochrome android:drawable="@drawable/ic_launcher_foreground" />
 </adaptive-icon>

android/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
     <background android:drawable="@color/ic_launcher_background"/>
-    <foreground android:drawable="@mipmap/ic_launcher_foreground"/>
-    <monochrome android:drawable="@mipmap/ic_launcher_foreground" />
+    <foreground android:drawable="@drawable/ic_launcher_foreground"/>
+    <monochrome android:drawable="@drawable/ic_launcher_foreground" />
 </adaptive-icon>

android/app/src/main/res/values-night-v27/styles.xml

@@ -6,7 +6,7 @@
         <item name="android:windowDrawsSystemBarBackgrounds">false</item>
         <item name="android:windowLayoutInDisplayCutoutMode">shortEdges</item>
         <item name="android:windowSplashScreenBackground" tools:targetApi="s">#121212</item>
-        <item name="android:windowSplashScreenAnimatedIcon" tools:targetApi="s">@mipmap/ic_launcher_foreground</item>
+        <item name="android:windowSplashScreenAnimatedIcon" tools:targetApi="s">@drawable/ic_launcher_foreground</item>
         <item name="postSplashScreenTheme">@style/NormalTheme</item>
     </style>
 </resources>

android/app/src/main/res/values-v27/styles.xml

@@ -6,7 +6,7 @@
         <item name="android:windowDrawsSystemBarBackgrounds">false</item>
         <item name="android:windowLayoutInDisplayCutoutMode">shortEdges</item>
         <item name="android:windowSplashScreenBackground" tools:targetApi="s">@color/ic_launcher_background</item>
-        <item name="android:windowSplashScreenAnimatedIcon" tools:targetApi="s">@mipmap/ic_launcher_foreground</item>
+        <item name="android:windowSplashScreenAnimatedIcon" tools:targetApi="s">@drawable/ic_launcher_foreground</item>
         <item name="postSplashScreenTheme">@style/NormalTheme</item>
     </style>
 </resources>

android/app/src/main/res/values/ic_launcher_background.xml

@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <color name="ic_launcher_background">#EFEFEF</color>
+    <color name="ic_launcher_background">#FAFAFA</color>
 </resources>

android/app/src/main/res/xml/file_paths.xml

@@ -0,0 +1,6 @@
+<paths>
+    <files-path
+        name="files"
+        path="."/>
+</paths>
+

core/common.go

@@ -2,19 +2,24 @@ package main
 
 import "C"
 import (
+	"context"
+	"errors"
 	"github.com/metacubex/mihomo/adapter"
 	"github.com/metacubex/mihomo/adapter/inbound"
 	"github.com/metacubex/mihomo/adapter/outboundgroup"
-	ap "github.com/metacubex/mihomo/adapter/provider"
+	"github.com/metacubex/mihomo/adapter/provider"
+	"github.com/metacubex/mihomo/common/batch"
 	"github.com/metacubex/mihomo/component/dialer"
 	"github.com/metacubex/mihomo/component/resolver"
 	"github.com/metacubex/mihomo/config"
 	"github.com/metacubex/mihomo/constant"
+	cp "github.com/metacubex/mihomo/constant/provider"
 	"github.com/metacubex/mihomo/hub"
 	"github.com/metacubex/mihomo/hub/executor"
 	"github.com/metacubex/mihomo/hub/route"
 	"github.com/metacubex/mihomo/listener"
 	"github.com/metacubex/mihomo/log"
+	rp "github.com/metacubex/mihomo/rules/provider"
 	"github.com/metacubex/mihomo/tunnel"
 	"os"
 	"os/exec"
@@ -26,40 +31,40 @@ import (
 	"time"
 )
 
-type healthCheckSchema struct {
-	Enable         bool   `provider:"enable"`
-	URL            string `provider:"url"`
-	Interval       int    `provider:"interval"`
-	TestTimeout    int    `provider:"timeout,omitempty"`
-	Lazy           bool   `provider:"lazy,omitempty"`
-	ExpectedStatus string `provider:"expected-status,omitempty"`
-}
+//type healthCheckSchema struct {
+//	Enable         bool   `provider:"enable"`
+//	URL            string `provider:"url"`
+//	Interval       int    `provider:"interval"`
+//	TestTimeout    int    `provider:"timeout,omitempty"`
+//	Lazy           bool   `provider:"lazy,omitempty"`
+//	ExpectedStatus string `provider:"expected-status,omitempty"`
+//}
 
-type proxyProviderSchema struct {
-	Type          string `provider:"type"`
-	Path          string `provider:"path,omitempty"`
-	URL           string `provider:"url,omitempty"`
-	Proxy         string `provider:"proxy,omitempty"`
-	Interval      int    `provider:"interval,omitempty"`
-	Filter        string `provider:"filter,omitempty"`
-	ExcludeFilter string `provider:"exclude-filter,omitempty"`
-	ExcludeType   string `provider:"exclude-type,omitempty"`
-	DialerProxy   string `provider:"dialer-proxy,omitempty"`
-
-	HealthCheck healthCheckSchema   `provider:"health-check,omitempty"`
-	Override    ap.OverrideSchema   `provider:"override,omitempty"`
-	Header      map[string][]string `provider:"header,omitempty"`
-}
-
-type ruleProviderSchema struct {
-	Type     string `provider:"type"`
-	Behavior string `provider:"behavior"`
-	Path     string `provider:"path,omitempty"`
-	URL      string `provider:"url,omitempty"`
-	Proxy    string `provider:"proxy,omitempty"`
-	Format   string `provider:"format,omitempty"`
-	Interval int    `provider:"interval,omitempty"`
-}
+//type proxyProviderSchema struct {
+//	Type          string `provider:"type"`
+//	Path          string `provider:"path,omitempty"`
+//	URL           string `provider:"url,omitempty"`
+//	Proxy         string `provider:"proxy,omitempty"`
+//	Interval      int    `provider:"interval,omitempty"`
+//	Filter        string `provider:"filter,omitempty"`
+//	ExcludeFilter string `provider:"exclude-filter,omitempty"`
+//	ExcludeType   string `provider:"exclude-type,omitempty"`
+//	DialerProxy   string `provider:"dialer-proxy,omitempty"`
+//
+//	HealthCheck healthCheckSchema   `provider:"health-check,omitempty"`
+//	Override    ap.OverrideSchema   `provider:"override,omitempty"`
+//	Header      map[string][]string `provider:"header,omitempty"`
+//}
+//
+//type ruleProviderSchema struct {
+//	Type     string `provider:"type"`
+//	Behavior string `provider:"behavior"`
+//	Path     string `provider:"path,omitempty"`
+//	URL      string `provider:"url,omitempty"`
+//	Proxy    string `provider:"proxy,omitempty"`
+//	Format   string `provider:"format,omitempty"`
+//	Interval int    `provider:"interval,omitempty"`
+//}
 
 type ConfigExtendedParams struct {
 	IsPatch      bool              `json:"is-patch"`
@@ -69,9 +74,9 @@ type ConfigExtendedParams struct {
 }
 
 type GenerateConfigParams struct {
-	ProfilePath *string              `json:"profile-path"`
-	Config      config.RawConfig     `json:"config" `
-	Params      ConfigExtendedParams `json:"params"`
+	ProfileId string               `json:"profile-id"`
+	Config    config.RawConfig     `json:"config" `
+	Params    ConfigExtendedParams `json:"params"`
 }
 
 type ChangeProxyParams struct {
@@ -93,9 +98,19 @@ type ExternalProvider struct {
 	Name        string    `json:"name"`
 	Type        string    `json:"type"`
 	VehicleType string    `json:"vehicle-type"`
+	Count       int       `json:"count"`
+	Path        string    `json:"path"`
 	UpdateAt    time.Time `json:"update-at"`
 }
 
+type ExternalProviders []ExternalProvider
+
+func (a ExternalProviders) Len() int           { return len(a) }
+func (a ExternalProviders) Less(i, j int) bool { return a[i].Name < a[j].Name }
+func (a ExternalProviders) Swap(i, j int)      { a[i], a[j] = a[j], a[i] }
+
+var b, _ = batch.New[bool](context.Background(), batch.WithConcurrencyNum[bool](50))
+
 func restartExecutable(execPath string) {
 	var err error
 	executor.Shutdown()
@@ -145,26 +160,108 @@ func removeFile(path string) error {
 	return nil
 }
 
-func getRawConfigWithPath(path *string) *config.RawConfig {
-	if path == nil {
+func getProfilePath(id string) string {
+	return filepath.Join(constant.Path.HomeDir(), "profiles", id+".yaml")
+}
+
+func getProfileProvidersPath(id string) string {
+	return filepath.Join(constant.Path.HomeDir(), "providers", id)
+}
+
+func getRawConfigWithId(id string) *config.RawConfig {
+	path := getProfilePath(id)
+	bytes, err := readFile(path)
+	if err != nil {
+		log.Errorln("profile is not exist")
 		return config.DefaultRawConfig()
-	} else {
-		bytes, err := readFile(*path)
-		if err != nil {
-			log.Errorln("getProfile readFile error %v", err)
-			return config.DefaultRawConfig()
+	}
+	prof, err := config.UnmarshalRawConfig(bytes)
+	if err != nil {
+		log.Errorln("unmarshalRawConfig error %v", err)
+		return config.DefaultRawConfig()
+	}
+	for _, mapping := range prof.ProxyProvider {
+		value, exist := mapping["path"].(string)
+		if !exist {
+			continue
 		}
-		prof, err := config.UnmarshalRawConfig(bytes)
-		if err != nil {
-			log.Errorln("getProfile UnmarshalRawConfig error %v", err)
-			return config.DefaultRawConfig()
+		mapping["path"] = filepath.Join(getProfileProvidersPath(id), value)
+	}
+	for _, mapping := range prof.RuleProvider {
+		value, exist := mapping["path"].(string)
+		if !exist {
+			continue
 		}
-		return prof
+		mapping["path"] = filepath.Join(getProfileProvidersPath(id), value)
+	}
+	return prof
+}
+
+func getExternalProvidersRaw() map[string]cp.Provider {
+	eps := make(map[string]cp.Provider)
+	for n, p := range tunnel.Providers() {
+		if p.VehicleType() != cp.Compatible {
+			eps[n] = p
+		}
+	}
+	for n, p := range tunnel.RuleProviders() {
+		if p.VehicleType() != cp.Compatible {
+			eps[n] = p
+		}
+	}
+	return eps
+}
+
+func toExternalProvider(p cp.Provider) (*ExternalProvider, error) {
+	switch p.(type) {
+	case *provider.ProxySetProvider:
+		psp := p.(*provider.ProxySetProvider)
+		return &ExternalProvider{
+			Name:        psp.Name(),
+			Type:        psp.Type().String(),
+			VehicleType: psp.VehicleType().String(),
+			Count:       psp.Count(),
+			Path:        psp.Vehicle().Path(),
+			UpdateAt:    psp.UpdatedAt,
+		}, nil
+	case *rp.RuleSetProvider:
+		rsp := p.(*rp.RuleSetProvider)
+		return &ExternalProvider{
+			Name:        rsp.Name(),
+			Type:        rsp.Type().String(),
+			VehicleType: rsp.VehicleType().String(),
+			Count:       rsp.Count(),
+			Path:        rsp.Vehicle().Path(),
+			UpdateAt:    rsp.UpdatedAt,
+		}, nil
+	default:
+		return nil, errors.New("not external provider")
 	}
 }
 
-func decorationConfig(profilePath *string, cfg config.RawConfig) *config.RawConfig {
-	prof := getRawConfigWithPath(profilePath)
+func sideUpdateExternalProvider(p cp.Provider, bytes []byte) error {
+	switch p.(type) {
+	case *provider.ProxySetProvider:
+		psp := p.(*provider.ProxySetProvider)
+		elm, same, err := psp.SideUpdate(bytes)
+		if err == nil && !same {
+			psp.OnUpdate(elm)
+		}
+		return nil
+	case rp.RuleSetProvider:
+		rsp := p.(*rp.RuleSetProvider)
+		elm, same, err := rsp.SideUpdate(bytes)
+		if err == nil && !same {
+			rsp.OnUpdate(elm)
+		}
+		return nil
+	default:
+		return errors.New("not external provider")
+	}
+}
+
+func decorationConfig(profileId string, cfg config.RawConfig) *config.RawConfig {
+	prof := getRawConfigWithId(profileId)
 	overwriteConfig(prof, cfg)
 	return prof
 }
@@ -325,8 +422,9 @@ func overwriteConfig(targetConfig *config.RawConfig, patchConfig config.RawConfi
 	//targetConfig.GeodataMode = false
 	targetConfig.IPv6 = patchConfig.IPv6
 	targetConfig.LogLevel = patchConfig.LogLevel
-	//targetConfig.Port = 0
-	//targetConfig.SocksPort = 0
+	targetConfig.Port = 0
+	targetConfig.SocksPort = 0
+	targetConfig.KeepAliveInterval = patchConfig.KeepAliveInterval
 	targetConfig.MixedPort = patchConfig.MixedPort
 	targetConfig.FindProcessMode = patchConfig.FindProcessMode
 	targetConfig.AllowLan = patchConfig.AllowLan
@@ -410,7 +508,7 @@ func patchSelectGroup() {
 
 var applyLock sync.Mutex
 
-func applyConfig() {
+func applyConfig() error {
 	applyLock.Lock()
 	defer applyLock.Unlock()
 	cfg, err := config.ParseRawConfig(currentConfig)
@@ -423,8 +521,11 @@ func applyConfig() {
 	if configParams.IsPatch {
 		patchConfig(cfg.General)
 	} else {
+		closeConnections()
 		runtime.GC()
 		hub.UltraApplyConfig(cfg, true)
 		patchSelectGroup()
 	}
+	externalProviders = getExternalProvidersRaw()
+	return err
 }

core/go.mod

@@ -7,8 +7,8 @@ replace github.com/metacubex/mihomo => ./Clash.Meta
 require (
 	github.com/Kr328/tun2socket v0.0.0-20220414050025-d07c78d06d34
 	github.com/metacubex/mihomo v1.17.1
-	github.com/miekg/dns v1.1.59
-	golang.org/x/net v0.25.0
+	github.com/miekg/dns v1.1.61
+	golang.org/x/net v0.26.0
 	golang.org/x/sync v0.7.0
 )
 
@@ -16,7 +16,6 @@ require (
 	github.com/3andne/restls-client-go v0.1.6 // indirect
 	github.com/RyuaNerin/go-krypto v1.2.4 // indirect
 	github.com/Yawning/aez v0.0.0-20211027044916-e49e68abd344 // indirect
-	github.com/aead/chacha20 v0.0.0-20180709150244-8b13a72661da // indirect
 	github.com/ajg/form v1.5.1 // indirect
 	github.com/andybalholm/brotli v1.0.6 // indirect
 	github.com/bahlo/generic-list-go v0.2.0 // indirect
@@ -31,7 +30,7 @@ require (
 	github.com/ericlagergren/subtle v0.0.0-20220507045147-890d697da010 // indirect
 	github.com/fsnotify/fsnotify v1.7.0 // indirect
 	github.com/gaukas/godicttls v0.0.4 // indirect
-	github.com/go-chi/chi/v5 v5.0.12 // indirect
+	github.com/go-chi/chi/v5 v5.0.14 // indirect
 	github.com/go-chi/cors v1.2.1 // indirect
 	github.com/go-chi/render v1.0.3 // indirect
 	github.com/go-ole/go-ole v1.3.0 // indirect
@@ -44,24 +43,26 @@ require (
 	github.com/google/go-cmp v0.6.0 // indirect
 	github.com/google/pprof v0.0.0-20210407192527-94a9f03dee38 // indirect
 	github.com/hashicorp/yamux v0.1.1 // indirect
-	github.com/insomniacslk/dhcp v0.0.0-20240419123447-f1cffa2c0c49 // indirect
+	github.com/insomniacslk/dhcp v0.0.0-20240529192340-51bc6136a0a6 // indirect
 	github.com/josharian/native v1.1.0 // indirect
-	github.com/klauspost/compress v1.17.4 // indirect
-	github.com/klauspost/cpuid/v2 v2.2.7 // indirect
+	github.com/klauspost/compress v1.17.9 // indirect
+	github.com/klauspost/cpuid/v2 v2.2.8 // indirect
 	github.com/lufia/plan9stats v0.0.0-20211012122336-39d0f177ccd0 // indirect
 	github.com/lunixbochs/struc v0.0.0-20200707160740-784aaebc1d40 // indirect
 	github.com/mailru/easyjson v0.7.7 // indirect
 	github.com/mdlayher/netlink v1.7.2 // indirect
 	github.com/mdlayher/socket v0.4.1 // indirect
+	github.com/metacubex/chacha v0.1.0 // indirect
 	github.com/metacubex/gopacket v1.1.20-0.20230608035415-7e2f98a3e759 // indirect
 	github.com/metacubex/gvisor v0.0.0-20240320004321-933faba989ec // indirect
-	github.com/metacubex/quic-go v0.43.2-0.20240518033621-2c3d14c6b38e // indirect
+	github.com/metacubex/quic-go v0.45.1-0.20240610004319-163fee60637e // indirect
+	github.com/metacubex/randv2 v0.2.0 // indirect
 	github.com/metacubex/sing-quic v0.0.0-20240518034124-7696d3f7da72 // indirect
-	github.com/metacubex/sing-shadowsocks v0.2.6 // indirect
-	github.com/metacubex/sing-shadowsocks2 v0.2.0 // indirect
-	github.com/metacubex/sing-tun v0.2.7-0.20240512075008-89e7c6208eec // indirect
-	github.com/metacubex/sing-vmess v0.1.9-0.20231207122118-72303677451f // indirect
-	github.com/metacubex/sing-wireguard v0.0.0-20240321042214-224f96122a63 // indirect
+	github.com/metacubex/sing-shadowsocks v0.2.7 // indirect
+	github.com/metacubex/sing-shadowsocks2 v0.2.1 // indirect
+	github.com/metacubex/sing-tun v0.2.7-0.20240719141246-19c49ac9589d // indirect
+	github.com/metacubex/sing-vmess v0.1.9-0.20240719134745-1df6fb20bbf9 // indirect
+	github.com/metacubex/sing-wireguard v0.0.0-20240618022557-a6efaa37127a // indirect
 	github.com/metacubex/tfo-go v0.0.0-20240228025757-be1269474a66 // indirect
 	github.com/metacubex/utls v1.6.6 // indirect
 	github.com/mroth/weightedrand/v2 v2.1.0 // indirect
@@ -71,18 +72,20 @@ require (
 	github.com/oschwald/maxminddb-golang v1.12.0 // indirect
 	github.com/pierrec/lz4/v4 v4.1.14 // indirect
 	github.com/power-devops/perfstat v0.0.0-20210106213030-5aafc221ea8c // indirect
-	github.com/puzpuzpuz/xsync/v3 v3.1.0 // indirect
+	github.com/puzpuzpuz/xsync/v3 v3.2.0 // indirect
 	github.com/quic-go/qpack v0.4.0 // indirect
 	github.com/quic-go/qtls-go1-20 v0.4.1 // indirect
 	github.com/sagernet/bbolt v0.0.0-20231014093535-ea5cb2fe9f0a // indirect
-	github.com/sagernet/netlink v0.0.0-20220905062125-8043b4a9aa97 // indirect
-	github.com/sagernet/sing v0.3.8 // indirect
+	github.com/sagernet/fswatch v0.1.1 // indirect
+	github.com/sagernet/netlink v0.0.0-20240612041022-b9a21c07ac6a // indirect
+	github.com/sagernet/nftables v0.3.0-beta.4 // indirect
+	github.com/sagernet/sing v0.5.0-alpha.13 // indirect
 	github.com/sagernet/sing-mux v0.2.1-0.20240124034317-9bfb33698bb6 // indirect
 	github.com/sagernet/sing-shadowtls v0.1.4 // indirect
 	github.com/sagernet/smux v0.0.0-20231208180855-7041f6ea79e7 // indirect
 	github.com/sagernet/wireguard-go v0.0.0-20231209092712-9a439356a62e // indirect
 	github.com/samber/lo v1.39.0 // indirect
-	github.com/shirou/gopsutil/v3 v3.24.4 // indirect
+	github.com/shirou/gopsutil/v3 v3.24.5 // indirect
 	github.com/shoenig/go-m1cpu v0.1.6 // indirect
 	github.com/sina-ghaderi/poly1305 v0.0.0-20220724002748-c5926b03988b // indirect
 	github.com/sina-ghaderi/rabaead v0.0.0-20220730151906-ab6e06b96e8c // indirect
@@ -91,21 +94,21 @@ require (
 	github.com/tklauser/go-sysconf v0.3.12 // indirect
 	github.com/tklauser/numcpus v0.6.1 // indirect
 	github.com/u-root/uio v0.0.0-20230220225925-ffce2a382923 // indirect
-	github.com/vishvananda/netns v0.0.0-20211101163701-50045581ed74 // indirect
+	github.com/vishvananda/netns v0.0.4 // indirect
 	github.com/wk8/go-ordered-map/v2 v2.1.8 // indirect
 	github.com/yusufpapurcu/wmi v1.2.4 // indirect
-	github.com/zhangyunhao116/fastrand v0.4.0 // indirect
+	gitlab.com/go-extension/aes-ccm v0.0.0-20230221065045-e58665ef23c7 // indirect
 	gitlab.com/yawning/bsaes.git v0.0.0-20190805113838-0a714cd429ec // indirect
 	go.uber.org/mock v0.4.0 // indirect
 	go4.org/netipx v0.0.0-20231129151722-fdeea329fbba // indirect
-	golang.org/x/crypto v0.23.0 // indirect
-	golang.org/x/exp v0.0.0-20240506185415-9bf2ced13842 // indirect
-	golang.org/x/mod v0.17.0 // indirect
-	golang.org/x/sys v0.20.0 // indirect
-	golang.org/x/text v0.15.0 // indirect
+	golang.org/x/crypto v0.24.0 // indirect
+	golang.org/x/exp v0.0.0-20240613232115-7f521ea00fb8 // indirect
+	golang.org/x/mod v0.18.0 // indirect
+	golang.org/x/sys v0.22.0 // indirect
+	golang.org/x/text v0.16.0 // indirect
 	golang.org/x/time v0.5.0 // indirect
-	golang.org/x/tools v0.21.0 // indirect
-	google.golang.org/protobuf v1.34.1 // indirect
+	golang.org/x/tools v0.22.0 // indirect
+	google.golang.org/protobuf v1.34.2 // indirect
 	gopkg.in/yaml.v3 v3.0.1 // indirect
 	lukechampine.com/blake3 v1.3.0 // indirect
 )

core/go.sum

@@ -7,8 +7,6 @@ github.com/RyuaNerin/go-krypto v1.2.4 h1:mXuNdK6M317aPV0llW6Xpjbo4moOlPF7Yxz4tb4
 github.com/RyuaNerin/go-krypto v1.2.4/go.mod h1:QqCYkoutU3yInyD9INt2PGolVRsc3W4oraQadVGXJ/8=
 github.com/Yawning/aez v0.0.0-20211027044916-e49e68abd344 h1:cDVUiFo+npB0ZASqnw4q90ylaVAbnYyx0JYqK4YcGok=
 github.com/Yawning/aez v0.0.0-20211027044916-e49e68abd344/go.mod h1:9pIqrY6SXNL8vjRQE5Hd/OL5GyK/9MrGUWs87z/eFfk=
-github.com/aead/chacha20 v0.0.0-20180709150244-8b13a72661da h1:KjTM2ks9d14ZYCvmHS9iAKVt9AyzRSqNU1qabPih5BY=
-github.com/aead/chacha20 v0.0.0-20180709150244-8b13a72661da/go.mod h1:eHEWzANqSiWQsof+nXEI9bUVUyV6F53Fp89EuCh2EAA=
 github.com/ajg/form v1.5.1 h1:t9c7v8JUKu/XxOGBU0yjNpaMloxGEJhUkqFRq0ibGeU=
 github.com/ajg/form v1.5.1/go.mod h1:uL1WgH+h2mgNtvBq0339dVnzXdBETtL2LeUXaIv25UY=
 github.com/andybalholm/brotli v1.0.6 h1:Yf9fFpf49Zrxb9NlQaluyE92/+X7UVHlhMNJN2sxfOI=
@@ -48,8 +46,8 @@ github.com/fsnotify/fsnotify v1.7.0 h1:8JEhPFa5W2WU7YfeZzPNqzMP6Lwt7L2715Ggo0nos
 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-chi/chi/v5 v5.0.12 h1:9euLV5sTrTNTRUU9POmDUvfxyj6LAABLUcEWO+JJb4s=
-github.com/go-chi/chi/v5 v5.0.12/go.mod h1:DslCQbL2OYiznFReuXYUmQ2hGd1aDpCnlMNITLSKoi8=
+github.com/go-chi/chi/v5 v5.0.14 h1:PyEwo2Vudraa0x/Wl6eDRRW2NXBvekgfxyydcM0WGE0=
+github.com/go-chi/chi/v5 v5.0.14/go.mod h1:DslCQbL2OYiznFReuXYUmQ2hGd1aDpCnlMNITLSKoi8=
 github.com/go-chi/cors v1.2.1 h1:xEC8UT3Rlp2QuWNEr4Fs/c2EAGVKBwy/1vHx3bppil4=
 github.com/go-chi/cors v1.2.1/go.mod h1:sSbTewc+6wYHBBCW7ytsFSn836hqM7JxpglAy2Vzc58=
 github.com/go-chi/render v1.0.3 h1:AsXqd2a1/INaIfUSKq3G5uA8weYx20FOsM7uSoCyyt4=
@@ -75,7 +73,6 @@ github.com/golang/protobuf v1.5.3/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiu
 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=
-github.com/google/go-cmp v0.5.9/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
 github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI=
 github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
 github.com/google/pprof v0.0.0-20210407192527-94a9f03dee38 h1:yAJXTCF9TqKcTiHJAE8dj7HMvPfh66eeA2JYW7eFpSE=
@@ -85,16 +82,16 @@ github.com/google/tink/go v1.6.1/go.mod h1:IGW53kTgag+st5yPhKKwJ6u2l+SSp5/v9XF7s
 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=
-github.com/insomniacslk/dhcp v0.0.0-20240419123447-f1cffa2c0c49 h1:/OuvSMGT9+xnyZ+7MZQ1zdngaCCAdPoSw8B/uurZ7pg=
-github.com/insomniacslk/dhcp v0.0.0-20240419123447-f1cffa2c0c49/go.mod h1:KclMyHxX06VrVr0DJmeFSUb1ankt7xTfoOA35pCkoic=
+github.com/insomniacslk/dhcp v0.0.0-20240529192340-51bc6136a0a6 h1:dh8D8FksyMhD64mRMbUhZHWYJfNoNMCxfVq6eexleMw=
+github.com/insomniacslk/dhcp v0.0.0-20240529192340-51bc6136a0a6/go.mod h1:KclMyHxX06VrVr0DJmeFSUb1ankt7xTfoOA35pCkoic=
 github.com/josharian/intern v1.0.0/go.mod h1:5DoeVV0s6jJacbCEi61lwdGj/aVlrQvzHFFd8Hwg//Y=
 github.com/josharian/native v1.0.1-0.20221213033349-c1e37c09b531/go.mod h1:7X/raswPFr05uY3HiLlYeyQntB6OO7E/d2Cu7qoaN2w=
 github.com/josharian/native v1.1.0 h1:uuaP0hAbW7Y4l0ZRQ6C9zfb7Mg1mbFKry/xzDAfmtLA=
 github.com/josharian/native v1.1.0/go.mod h1:7X/raswPFr05uY3HiLlYeyQntB6OO7E/d2Cu7qoaN2w=
-github.com/klauspost/compress v1.17.4 h1:Ej5ixsIri7BrIjBkRZLTo6ghwrEtHFk7ijlczPW4fZ4=
-github.com/klauspost/compress v1.17.4/go.mod h1:/dCuZOvVtNoHsyb+cuJD3itjs3NbnF6KH9zAO4BDxPM=
-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/klauspost/compress v1.17.9 h1:6KIumPrER1LHsvBVuDa0r5xaG0Es51mhhB9BQB2qeMA=
+github.com/klauspost/compress v1.17.9/go.mod h1:Di0epgTjJY877eYKx5yC51cX2A2Vl2ibi7bDH9ttBbw=
+github.com/klauspost/cpuid/v2 v2.2.8 h1:+StwCXwm9PdpiEkPyzBXIy+M9KUb4ODm0Zarf1kS5BM=
+github.com/klauspost/cpuid/v2 v2.2.8/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=
@@ -109,30 +106,34 @@ github.com/mdlayher/netlink v1.7.2 h1:/UtM3ofJap7Vl4QWCPDGXY8d3GIY2UGSDbK+QWmY8/
 github.com/mdlayher/netlink v1.7.2/go.mod h1:xraEF7uJbxLhc5fpHL4cPe221LI2bdttWlU+ZGLfQSw=
 github.com/mdlayher/socket v0.4.1 h1:eM9y2/jlbs1M615oshPQOHZzj6R6wMT7bX5NPiQvn2U=
 github.com/mdlayher/socket v0.4.1/go.mod h1:cAqeGjoufqdxWkD7DkpyS+wcefOtmu5OQ8KuoJGIReA=
+github.com/metacubex/chacha v0.1.0 h1:tg9RSJ18NvL38cCWNyYH1eiG6qDCyyXIaTLQthon0sc=
+github.com/metacubex/chacha v0.1.0/go.mod h1:Djn9bPZxLTXbJFSeyo0/qzEzQI+gUSSzttuzZM75GH8=
 github.com/metacubex/gopacket v1.1.20-0.20230608035415-7e2f98a3e759 h1:cjd4biTvOzK9ubNCCkQ+ldc4YSH/rILn53l/xGBFHHI=
 github.com/metacubex/gopacket v1.1.20-0.20230608035415-7e2f98a3e759/go.mod h1:UHOv2xu+RIgLwpXca7TLrXleEd4oR3sPatW6IF8wU88=
 github.com/metacubex/gvisor v0.0.0-20240320004321-933faba989ec h1:HxreOiFTUrJXJautEo8rnE1uKTVGY8wtZepY1Tii/Nc=
 github.com/metacubex/gvisor v0.0.0-20240320004321-933faba989ec/go.mod h1:8BVmQ+3cxjqzWElafm24rb2Ae4jRI6vAXNXWqWjfrXw=
-github.com/metacubex/quic-go v0.43.2-0.20240518033621-2c3d14c6b38e h1:Nzwe08FNIJpExWpy9iXkG336dN/8nJqn69yijB7vJ8g=
-github.com/metacubex/quic-go v0.43.2-0.20240518033621-2c3d14c6b38e/go.mod h1:uXHODgJFUfUnkkCMWLd5Er6L5QY/LFRZb9LD5jyyhsk=
+github.com/metacubex/quic-go v0.45.1-0.20240610004319-163fee60637e h1:bLYn3GuRvWDcBDAkIv5kUYIhzHwafDVq635BuybnKqI=
+github.com/metacubex/quic-go v0.45.1-0.20240610004319-163fee60637e/go.mod h1:Yza2H7Ax1rxWPUcJx0vW+oAt9EsPuSiyQFhFabUPzwU=
+github.com/metacubex/randv2 v0.2.0 h1:uP38uBvV2SxYfLj53kuvAjbND4RUDfFJjwr4UigMiLs=
+github.com/metacubex/randv2 v0.2.0/go.mod h1:kFi2SzrQ5WuneuoLLCMkABtiBu6VRrMrWFqSPyj2cxY=
 github.com/metacubex/sing-quic v0.0.0-20240518034124-7696d3f7da72 h1:Wr4g1HCb5Z/QIFwFiVNjO2qL+dRu25+Mdn9xtAZZ+ew=
 github.com/metacubex/sing-quic v0.0.0-20240518034124-7696d3f7da72/go.mod h1:g7Mxj7b7zm7YVqD975mk/hSmrb0A0G4bVvIMr2MMzn8=
-github.com/metacubex/sing-shadowsocks v0.2.6 h1:6oEB3QcsFYnNiFeoevcXrCwJ3sAablwVSgtE9R3QeFQ=
-github.com/metacubex/sing-shadowsocks v0.2.6/go.mod h1:zIkMeSnb8Mbf4hdqhw0pjzkn1d99YJ3JQm/VBg5WMTg=
-github.com/metacubex/sing-shadowsocks2 v0.2.0 h1:hqwT/AfI5d5UdPefIzR6onGHJfDXs5zgOM5QSgaM/9A=
-github.com/metacubex/sing-shadowsocks2 v0.2.0/go.mod h1:LCKF6j1P94zN8ZS+LXRK1gmYTVGB3squivBSXAFnOg8=
-github.com/metacubex/sing-tun v0.2.7-0.20240512075008-89e7c6208eec h1:K4Wq3GOdLZ/xcqwyzAt4kmYQrjokyKQ3u/Xh5Yft14U=
-github.com/metacubex/sing-tun v0.2.7-0.20240512075008-89e7c6208eec/go.mod h1:4VsMwZH1IlgPGFK1ZbBomZ/B2MYkTgs2+gnBAr5GOIo=
-github.com/metacubex/sing-vmess v0.1.9-0.20231207122118-72303677451f h1:QjXrHKbTMBip/C+R79bvbfr42xH1gZl3uFb0RELdZiQ=
-github.com/metacubex/sing-vmess v0.1.9-0.20231207122118-72303677451f/go.mod h1:olVkD4FChQ5gKMHG4ZzuD7+fMkJY1G8vwOKpRehjrmY=
-github.com/metacubex/sing-wireguard v0.0.0-20240321042214-224f96122a63 h1:AGyIB55UfQm/0ZH0HtQO9u3l//yjtHUpjeRjjPGfGRI=
-github.com/metacubex/sing-wireguard v0.0.0-20240321042214-224f96122a63/go.mod h1:uY+BYb0UEknLrqvbGcwi9i++KgrKxsurysgI6G1Pveo=
+github.com/metacubex/sing-shadowsocks v0.2.7 h1:9f3Dt2+71TNp0e202llA2ug5h/rkWs2EZxQ5IMpf+9g=
+github.com/metacubex/sing-shadowsocks v0.2.7/go.mod h1:X3x88XtJpBxG0W0/ECOJL6Ib0SJ3xdniAkU/6/RMWU0=
+github.com/metacubex/sing-shadowsocks2 v0.2.1 h1:XIZBXlazp8EEoPp1S0DViAhLkJakjQ2f+AOwwdKKNYg=
+github.com/metacubex/sing-shadowsocks2 v0.2.1/go.mod h1:BhOug03a/RbI7y6hp6q+6ITM1dXjnLTmeWBHSTwvv2Q=
+github.com/metacubex/sing-tun v0.2.7-0.20240719141246-19c49ac9589d h1:iYlepjRCYlPXtELupDL+pQjGqkCnQz4KQOfKImP9sog=
+github.com/metacubex/sing-tun v0.2.7-0.20240719141246-19c49ac9589d/go.mod h1:olbEx9yVcaw5tHTNlRamRoxmMKcvDvcVS1YLnQGzvWE=
+github.com/metacubex/sing-vmess v0.1.9-0.20240719134745-1df6fb20bbf9 h1:OAXiCosqY8xKDp3pqTW3qbrCprZ1l6WkrXSFSCwyY4I=
+github.com/metacubex/sing-vmess v0.1.9-0.20240719134745-1df6fb20bbf9/go.mod h1:olVkD4FChQ5gKMHG4ZzuD7+fMkJY1G8vwOKpRehjrmY=
+github.com/metacubex/sing-wireguard v0.0.0-20240618022557-a6efaa37127a h1:NpSGclHJUYndUwBmyIpFBSoBVg8PoVX7QQKhYg0DjM0=
+github.com/metacubex/sing-wireguard v0.0.0-20240618022557-a6efaa37127a/go.mod h1:uY+BYb0UEknLrqvbGcwi9i++KgrKxsurysgI6G1Pveo=
 github.com/metacubex/tfo-go v0.0.0-20240228025757-be1269474a66 h1:as/aO/fM8nv4W4pOr9EETP6kV/Oaujk3fUNyQSJK61c=
 github.com/metacubex/tfo-go v0.0.0-20240228025757-be1269474a66/go.mod h1:c7bVFM9f5+VzeZ/6Kg77T/jrg1Xp8QpqlSHvG/aXVts=
 github.com/metacubex/utls v1.6.6 h1:3D12YKHTf2Z41UPhQU2dWerNWJ5TVQD9gKoQ+H+iLC8=
 github.com/metacubex/utls v1.6.6/go.mod h1:+WLFUnXjcpdxXCnyX25nggw8C6YonZ8zOK2Zm/oRvdo=
-github.com/miekg/dns v1.1.59 h1:C9EXc/UToRwKLhK5wKU/I4QVsBUc8kE6MkHBkeypWZs=
-github.com/miekg/dns v1.1.59/go.mod h1:nZpewl5p6IvctfgrckopVx2OlSEHPRO/U4SYkRklrEk=
+github.com/miekg/dns v1.1.61 h1:nLxbwF3XxhwVSm8g9Dghm9MHPaUZuqhPiGL+675ZmEs=
+github.com/miekg/dns v1.1.61/go.mod h1:mnAarhS3nWaW+NVP2wTkYVIZyHNJ098SJZUki3eykwQ=
 github.com/mroth/weightedrand/v2 v2.1.0 h1:o1ascnB1CIVzsqlfArQQjeMy1U0NcIbBO5rfd5E/OeU=
 github.com/mroth/weightedrand/v2 v2.1.0/go.mod h1:f2faGsfOGOwc1p94wzHKKZyTpcJUW7OJ/9U4yfiNAOU=
 github.com/oasisprotocol/deoxysii v0.0.0-20220228165953-2091330c22b7 h1:1102pQc2SEPp5+xrS26wEaeb26sZy6k9/ZXlZN+eXE4=
@@ -155,8 +156,8 @@ github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZb
 github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
 github.com/power-devops/perfstat v0.0.0-20210106213030-5aafc221ea8c h1:ncq/mPwQF4JjgDlrVEn3C11VoGHZN7m8qihwgMEtzYw=
 github.com/power-devops/perfstat v0.0.0-20210106213030-5aafc221ea8c/go.mod h1:OmDBASR4679mdNQnz2pUhc2G8CO2JrUAVFDRBDP/hJE=
-github.com/puzpuzpuz/xsync/v3 v3.1.0 h1:EewKT7/LNac5SLiEblJeUu8z5eERHrmRLnMQL2d7qX4=
-github.com/puzpuzpuz/xsync/v3 v3.1.0/go.mod h1:VjzYrABPabuM4KyBh1Ftq6u8nhwY5tBPKP9jpmh0nnA=
+github.com/puzpuzpuz/xsync/v3 v3.2.0 h1:9AzuUeF88YC5bK8u2vEG1Fpvu4wgpM1wfPIExfaaDxQ=
+github.com/puzpuzpuz/xsync/v3 v3.2.0/go.mod h1:VjzYrABPabuM4KyBh1Ftq6u8nhwY5tBPKP9jpmh0nnA=
 github.com/quic-go/qpack v0.4.0 h1:Cr9BXA1sQS2SmDUWjSofMPNKmvF6IiIfDRmgU0w1ZCo=
 github.com/quic-go/qpack v0.4.0/go.mod h1:UZVnYIfi5GRk+zI9UMaCPsmZ2xKJP7XBUvVyT1Knj9A=
 github.com/quic-go/qtls-go1-20 v0.4.1 h1:D33340mCNDAIKBqXuAvexTNMUByrYmFYVfKfDN5nfFs=
@@ -165,11 +166,15 @@ github.com/rogpeppe/go-internal v1.9.0 h1:73kH8U+JUqXU8lRuOHeVHaa/SZPifC7BkcraZV
 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=
-github.com/sagernet/netlink v0.0.0-20220905062125-8043b4a9aa97/go.mod h1:xLnfdiJbSp8rNqYEdIW/6eDO4mVoogml14Bh2hSiFpM=
+github.com/sagernet/fswatch v0.1.1 h1:YqID+93B7VRfqIH3PArW/XpJv5H4OLEVWDfProGoRQs=
+github.com/sagernet/fswatch v0.1.1/go.mod h1:nz85laH0mkQqJfaOrqPpkwtU1znMFNVTpT/5oRsVz/o=
+github.com/sagernet/netlink v0.0.0-20240612041022-b9a21c07ac6a h1:ObwtHN2VpqE0ZNjr6sGeT00J8uU7JF4cNUdb44/Duis=
+github.com/sagernet/netlink v0.0.0-20240612041022-b9a21c07ac6a/go.mod h1:xLnfdiJbSp8rNqYEdIW/6eDO4mVoogml14Bh2hSiFpM=
+github.com/sagernet/nftables v0.3.0-beta.4 h1:kbULlAwAC3jvdGAC1P5Fa3GSxVwQJibNenDW2zaXr8I=
+github.com/sagernet/nftables v0.3.0-beta.4/go.mod h1:OQXAjvjNGGFxaTgVCSTRIhYB5/llyVDeapVoENYBDS8=
 github.com/sagernet/sing v0.2.18/go.mod h1:OL6k2F0vHmEzXz2KW19qQzu172FDgSbUSODylighuVo=
-github.com/sagernet/sing v0.3.8 h1:gm4JKalPhydMYX2zFOTnnd4TXtM/16WFRqSjMepYQQk=
-github.com/sagernet/sing v0.3.8/go.mod h1:+60H3Cm91RnL9dpVGWDPHt0zTQImO9Vfqt9a4rSambI=
+github.com/sagernet/sing v0.5.0-alpha.13 h1:fpR4TFZfu/9V3LbHSAnnnwcaXGMF8ijmAAPoY2WHSKw=
+github.com/sagernet/sing v0.5.0-alpha.13/go.mod h1:ARkL0gM13/Iv5VCZmci/NuoOlePoIsW0m7BWfln/Hak=
 github.com/sagernet/sing-mux v0.2.1-0.20240124034317-9bfb33698bb6 h1:5bCAkvDDzSMITiHFjolBwpdqYsvycdTu71FsMEFXQ14=
 github.com/sagernet/sing-mux v0.2.1-0.20240124034317-9bfb33698bb6/go.mod h1:khzr9AOPocLa+g53dBplwNDz4gdsyx/YM3swtAhlkHQ=
 github.com/sagernet/sing-shadowtls v0.1.4 h1:aTgBSJEgnumzFenPvc+kbD9/W0PywzWevnVpEx6Tw3k=
@@ -180,8 +185,8 @@ github.com/sagernet/wireguard-go v0.0.0-20231209092712-9a439356a62e h1:iGH0RMv2F
 github.com/sagernet/wireguard-go v0.0.0-20231209092712-9a439356a62e/go.mod h1:YbL4TKHRR6APYQv3U2RGfwLDpPYSyWz6oUlpISBEzBE=
 github.com/samber/lo v1.39.0 h1:4gTz1wUhNYLhFSKl6O+8peW0v2F4BCY034GRpU9WnuA=
 github.com/samber/lo v1.39.0/go.mod h1:+m/ZKRl6ClXCE2Lgf3MsQlWfh4bn1bz6CXEOxnEXnEA=
-github.com/shirou/gopsutil/v3 v3.24.4 h1:dEHgzZXt4LMNm+oYELpzl9YCqV65Yr/6SfrvgRBtXeU=
-github.com/shirou/gopsutil/v3 v3.24.4/go.mod h1:lTd2mdiOspcqLgAnr9/nGi71NkeMpWKdmhuxm9GusH8=
+github.com/shirou/gopsutil/v3 v3.24.5 h1:i0t8kL+kQTvpAYToeuiVk3TgDeKOFioZO3Ztz/iZ9pI=
+github.com/shirou/gopsutil/v3 v3.24.5/go.mod h1:bsoOS1aStSs9ErQ1WWfxllSeS1K5D+U30r2NfcubMVk=
 github.com/shoenig/go-m1cpu v0.1.6 h1:nxdKQNcEB6vzgA2E2bvzKIYRuNj7XNJ4S/aRSwKzFtM=
 github.com/shoenig/go-m1cpu v0.1.6/go.mod h1:1JJMcUBvfNwpq05QDQVAnx3gUHr9IYF7GNg9SUEw2VQ=
 github.com/shoenig/test v0.6.4 h1:kVTaSd7WLz5WZ2IaoM0RSzRsUD+m8wRR+5qvntpn4LU=
@@ -195,15 +200,9 @@ github.com/sina-ghaderi/rabbitio v0.0.0-20220730151941-9ce26f4f872e/go.mod h1:+e
 github.com/sirupsen/logrus v1.9.3 h1:dueUQJ1C2q9oE3F7wvmSGAaVtTmUizReu6fjN8uqzbQ=
 github.com/sirupsen/logrus v1.9.3/go.mod h1:naHLuLoDiP4jHNo9R0sCBMtWGeIprob74mVsIT4qYEQ=
 github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
-github.com/stretchr/objx v0.4.0/go.mod h1:YvHI0jy2hoMjB+UWwv71VJQ9isScKT/TqJzVSSt89Yw=
-github.com/stretchr/objx v0.5.0/go.mod h1:Yh+to48EsGEfYuaHDzXPcE3xhTkx73EhmCGUpEOglKo=
-github.com/stretchr/objx v0.5.2/go.mod h1:FRsXN1f5AsAjCGJKqEizvkpNtU+EGNCLh3NxZ/8L+MA=
 github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI=
 github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
 github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
-github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
-github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU=
-github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo=
 github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsTg=
 github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY=
 github.com/tklauser/go-sysconf v0.3.12 h1:0QaGUFOdQaIVdPgfITYzaTegZvdCjmYO52cSFAEVmqU=
@@ -215,14 +214,14 @@ github.com/u-root/uio v0.0.0-20230220225925-ffce2a382923/go.mod h1:eLL9Nub3yfAho
 github.com/vishvananda/netlink v1.1.0/go.mod h1:cTgwzPIzzgDAYoQrMm0EdrjRUBkTqKYppBueQtXaqoE=
 github.com/vishvananda/netns v0.0.0-20191106174202-0a2b9b5464df/go.mod h1:JP3t17pCcGlemwknint6hfoeCVQrEMVwxRLRjXpq+BU=
 github.com/vishvananda/netns v0.0.0-20210104183010-2eb08e3e575f/go.mod h1:DD4vA1DwXk04H54A1oHXtwZmA0grkVMdPxx/VGLCah0=
-github.com/vishvananda/netns v0.0.0-20211101163701-50045581ed74 h1:gga7acRE695APm9hlsSMoOoE65U4/TcqNj90mc69Rlg=
-github.com/vishvananda/netns v0.0.0-20211101163701-50045581ed74/go.mod h1:DD4vA1DwXk04H54A1oHXtwZmA0grkVMdPxx/VGLCah0=
+github.com/vishvananda/netns v0.0.4 h1:Oeaw1EM2JMxD51g9uhtC0D7erkIjgmj8+JZc26m1YX8=
+github.com/vishvananda/netns v0.0.4/go.mod h1:SpkAiCQRtJ6TvvxPnOSyH3BMl6unz3xZlaprSwhNNJM=
 github.com/wk8/go-ordered-map/v2 v2.1.8 h1:5h/BUHu93oj4gIdvHHHGsScSTMijfx5PeYkE/fJgbpc=
 github.com/wk8/go-ordered-map/v2 v2.1.8/go.mod h1:5nJHM5DyteebpVlHnWMV0rPz6Zp7+xBAnxjb1X5vnTw=
 github.com/yusufpapurcu/wmi v1.2.4 h1:zFUKzehAFReQwLys1b/iSMl+JQGSCSjtVqQn9bBrPo0=
 github.com/yusufpapurcu/wmi v1.2.4/go.mod h1:SBZ9tNy3G9/m5Oi98Zks0QjeHVDvuK0qfxQmPyzfmi0=
-github.com/zhangyunhao116/fastrand v0.4.0 h1:86QB6Y+GGgLZRFRDCjMmAS28QULwspK9sgL5d1Bx3H4=
-github.com/zhangyunhao116/fastrand v0.4.0/go.mod h1:vIyo6EyBhjGKpZv6qVlkPl4JVAklpMM4DSKzbAkMguA=
+gitlab.com/go-extension/aes-ccm v0.0.0-20230221065045-e58665ef23c7 h1:UNrDfkQqiEYzdMlNsVvBYOAJWZjdktqFE9tQh5BT2+4=
+gitlab.com/go-extension/aes-ccm v0.0.0-20230221065045-e58665ef23c7/go.mod h1:E+rxHvJG9H6PUdzq9NRG6csuLN3XUx98BfGOVWNYnXs=
 gitlab.com/yawning/bsaes.git v0.0.0-20190805113838-0a714cd429ec h1:FpfFs4EhNehiVfzQttTuxanPIT43FtkkCFypIod8LHo=
 gitlab.com/yawning/bsaes.git v0.0.0-20190805113838-0a714cd429ec/go.mod h1:BZ1RAoRPbCxum9Grlv5aeksu2H8BiKehBYooU2LFiOQ=
 go.uber.org/mock v0.4.0 h1:VcM4ZOtdbR4f6VXfiOpwpVJDL6lCReaZ6mw31wqh7KU=
@@ -231,18 +230,18 @@ go4.org/netipx v0.0.0-20231129151722-fdeea329fbba h1:0b9z3AuHCjxk0x/opv64kcgZLBs
 go4.org/netipx v0.0.0-20231129151722-fdeea329fbba/go.mod h1:PLyyIXexvUFg3Owu6p/WfdlivPbZJsZdgWZlrGope/Y=
 golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
 golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
-golang.org/x/crypto v0.23.0 h1:dIJU/v2J8Mdglj/8rJ6UUOM3Zc9zLZxVZwwxMooUSAI=
-golang.org/x/crypto v0.23.0/go.mod h1:CKFgDieR+mRhux2Lsu27y0fO304Db0wZe70UKqHu0v8=
-golang.org/x/exp v0.0.0-20240506185415-9bf2ced13842 h1:vr/HnozRka3pE4EsMEg1lgkXJkTFJCVUX+S/ZT6wYzM=
-golang.org/x/exp v0.0.0-20240506185415-9bf2ced13842/go.mod h1:XtvwrStGgqGPLc4cjQfWqZHG1YFdYs6swckp8vpsjnc=
+golang.org/x/crypto v0.24.0 h1:mnl8DM0o513X8fdIkmyFE/5hTYxbwYOjDS/+rK6qpRI=
+golang.org/x/crypto v0.24.0/go.mod h1:Z1PMYSOR5nyMcyAVAIQSKCDwalqy85Aqn1x3Ws4L5DM=
+golang.org/x/exp v0.0.0-20240613232115-7f521ea00fb8 h1:yixxcjnhBmY0nkL253HFVIm0JsFHwrHdT3Yh6szTnfY=
+golang.org/x/exp v0.0.0-20240613232115-7f521ea00fb8/go.mod h1:jj3sYF3dwk5D+ghuXyeI3r5MFf+NT2An6/9dOA95KSI=
 golang.org/x/lint v0.0.0-20200302205851-738671d3881b/go.mod h1:3xt1FjdF8hUf6vQPIChWIBhFzV8gjjsPE/fR3IyQdNY=
 golang.org/x/mod v0.1.1-0.20191105210325-c90efee705ee/go.mod h1:QqPTAvyqsEbceGzBzNggFXnrqF1CaUcvgkdR5Ot7KZg=
-golang.org/x/mod v0.17.0 h1:zY54UmvipHiNd+pm+m0x9KhZ9hl1/7QNMyxXbc6ICqA=
-golang.org/x/mod v0.17.0/go.mod h1:hTbmBsO62+eylJbnUtE2MGJUyE7QWk4xUqPFrRgJ+7c=
+golang.org/x/mod v0.18.0 h1:5+9lSbEzPSdWkH32vYPBwEpX8KwDbM52Ud9xBUvNlb0=
+golang.org/x/mod v0.18.0/go.mod h1:hTbmBsO62+eylJbnUtE2MGJUyE7QWk4xUqPFrRgJ+7c=
 golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
 golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
-golang.org/x/net v0.25.0 h1:d/OCCoBEUq33pjydKrGQhw7IlUPI2Oylr+8qLx49kac=
-golang.org/x/net v0.25.0/go.mod h1:JkAGAh7GEvH74S6FOH42FLoXpXbE/aqXSrIQjXgsiwM=
+golang.org/x/net v0.26.0 h1:soB7SVo0PWrY4vPW/+ay0jKDNScG2X9wFeYlXIvJsOQ=
+golang.org/x/net v0.26.0/go.mod h1:5YKkiSynbBIh3p6iOc/vibscux0x38BZDkn8sCUPxHE=
 golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.7.0 h1:YsImfSBoP9QPYL0xyKJPq0gcaJdG3rInoqxTWbfQu9M=
 golang.org/x/sync v0.7.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk=
@@ -262,26 +261,24 @@ golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.8.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.11.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.14.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
-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/sys v0.22.0 h1:RI27ohtqKCnwULzJLqkv897zojh5/DwS/ENaMzUOaWI=
+golang.org/x/sys v0.22.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
+golang.org/x/term v0.21.0 h1:WVXCp+/EBEHOj53Rvu+7KiT/iElMrO8ACK16SMZ3jaA=
+golang.org/x/term v0.21.0/go.mod h1:ooXLefLobQVslOqselCNF4SxFAaoS6KujMbsGzSDmX0=
 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=
+golang.org/x/text v0.16.0 h1:a94ExnEXNtEwYLGJSIUxnWoxoRz/ZcCsV63ROupILh4=
+golang.org/x/text v0.16.0/go.mod h1:GhwF1Be+LQoKShO3cGOHzqOgRrGaYc9AvblQOmPVHnI=
 golang.org/x/time v0.5.0 h1:o7cqy6amK/52YcAKIPlM3a+Fpj35zvRj2TP+e1xFSfk=
 golang.org/x/time v0.5.0/go.mod h1:3BpzKBy/shNhVucY/MWOyx10tF3SFh9QdLuxbVysPQM=
 golang.org/x/tools v0.0.0-20200130002326-2f3ba24bd6e7/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28=
-golang.org/x/tools v0.21.0 h1:qc0xYgIbsSDt9EyWz05J5wfa7LOVW0YTLOXrqdLAWIw=
-golang.org/x/tools v0.21.0/go.mod h1:aiJjzUbINMkxbQROHiO6hDPo2LHcIPhhQsa9DLh0yGk=
+golang.org/x/tools v0.22.0 h1:gqSGLZqv+AI9lIQzniJ0nZDRG5GBPsSi+DRNHWNz6yA=
+golang.org/x/tools v0.22.0/go.mod h1:aCwcsjqvq7Yqt6TNyX7QMU2enbQ/Gt0bo6krSeEri+c=
 golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
-google.golang.org/protobuf v1.34.1 h1:9ddQBjfCyZPOHPUiPxpYESBLc+T8P3E+Vo4IbKZgFWg=
-google.golang.org/protobuf v1.34.1/go.mod h1:c6P6GXX6sHbq/GpV6MGZEdwhWPcYBgnhAHhKbcUYpos=
+google.golang.org/protobuf v1.34.2 h1:6xV6lTsCfpGD21XK49h7MhtcApnLqkfYgPcdHftf6hg=
+google.golang.org/protobuf v1.34.2/go.mod h1:qYOHts0dSfpeUzUFpOMr/WGzszTmLH+DiWniOlNbLDw=
+gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM=
 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

@@ -11,21 +11,19 @@ import (
 	"github.com/metacubex/mihomo/adapter"
 	"github.com/metacubex/mihomo/adapter/outboundgroup"
 	"github.com/metacubex/mihomo/adapter/provider"
-	"github.com/metacubex/mihomo/common/structure"
 	"github.com/metacubex/mihomo/common/utils"
-	"github.com/metacubex/mihomo/component/geodata"
-	"github.com/metacubex/mihomo/component/mmdb"
+	"github.com/metacubex/mihomo/component/updater"
 	"github.com/metacubex/mihomo/config"
 	"github.com/metacubex/mihomo/constant"
 	cp "github.com/metacubex/mihomo/constant/provider"
 	"github.com/metacubex/mihomo/hub/executor"
 	"github.com/metacubex/mihomo/log"
-	rp "github.com/metacubex/mihomo/rules/provider"
 	"github.com/metacubex/mihomo/tunnel"
 	"github.com/metacubex/mihomo/tunnel/statistic"
 	"golang.org/x/net/context"
 	"os"
 	"runtime"
+	"sort"
 	"time"
 	"unsafe"
 )
@@ -34,9 +32,9 @@ var currentConfig = config.DefaultRawConfig()
 
 var configParams = ConfigExtendedParams{}
 
-var isInit = false
+var externalProviders = map[string]cp.Provider{}
 
-var currentProfileName = ""
+var isInit = false
 
 //export initClash
 func initClash(homeDirStr *C.char) bool {
@@ -76,16 +74,6 @@ func forceGc() {
 	}()
 }
 
-//export setCurrentProfileName
-func setCurrentProfileName(s *C.char) {
-	currentProfileName = C.GoString(s)
-}
-
-//export getCurrentProfileName
-func getCurrentProfileName() *C.char {
-	return C.CString(currentProfileName)
-}
-
 //export validateConfig
 func validateConfig(s *C.char, port C.longlong) {
 	i := int64(port)
@@ -112,43 +100,23 @@ func updateConfig(s *C.char, port C.longlong) {
 			return
 		}
 		configParams = params.Params
-		prof := decorationConfig(params.ProfilePath, params.Config)
+		prof := decorationConfig(params.ProfileId, params.Config)
 		currentConfig = prof
-		applyConfig()
+		err = applyConfig()
+		if err != nil {
+			bridge.SendToPort(i, err.Error())
+			return
+		}
 		bridge.SendToPort(i, "")
 	}()
 }
 
 //export clearEffect
 func clearEffect(s *C.char) {
-	path := C.GoString(s)
+	id := C.GoString(s)
 	go func() {
-		rawCfg := getRawConfigWithPath(&path)
-		for _, mapping := range rawCfg.RuleProvider {
-			schema := &ruleProviderSchema{}
-			decoder := structure.NewDecoder(structure.Option{TagName: "provider", WeaklyTypedInput: true})
-			if err := decoder.Decode(mapping, schema); err != nil {
-				return
-			}
-			if schema.Type == "http" {
-				_ = removeFile(constant.Path.Resolve(schema.Path))
-			}
-		}
-		for _, mapping := range rawCfg.ProxyProvider {
-			schema := &proxyProviderSchema{
-				HealthCheck: healthCheckSchema{
-					Lazy: true,
-				},
-			}
-			decoder := structure.NewDecoder(structure.Option{TagName: "provider", WeaklyTypedInput: true})
-			if err := decoder.Decode(mapping, schema); err != nil {
-				return
-			}
-			if schema.Type == "http" {
-				_ = removeFile(constant.Path.Resolve(schema.Path))
-			}
-		}
-		_ = removeFile(path)
+		_ = removeFile(getProfilePath(id))
+		_ = removeFile(getProfileProvidersPath(id))
 	}()
 }
 
@@ -164,35 +132,36 @@ func getProxies() *C.char {
 //export changeProxy
 func changeProxy(s *C.char) {
 	paramsString := C.GoString(s)
-	go func() {
-		var params = &ChangeProxyParams{}
-		err := json.Unmarshal([]byte(paramsString), params)
-		if err != nil {
-			log.Infoln("Unmarshal ChangeProxyParams %v", err)
-		}
-		groupName := *params.GroupName
-		proxyName := *params.ProxyName
-		proxies := tunnel.ProxiesWithProviders()
-		group, ok := proxies[groupName]
-		if !ok {
-			return
-		}
-		adapterProxy := group.(*adapter.Proxy)
-		selector, ok := adapterProxy.ProxyAdapter.(*outboundgroup.Selector)
-		if !ok {
-			return
-		}
-
+	var params = &ChangeProxyParams{}
+	err := json.Unmarshal([]byte(paramsString), params)
+	if err != nil {
+		log.Infoln("Unmarshal ChangeProxyParams %v", err)
+	}
+	groupName := *params.GroupName
+	proxyName := *params.ProxyName
+	proxies := tunnel.ProxiesWithProviders()
+	group, ok := proxies[groupName]
+	if !ok {
+		return
+	}
+	adapterProxy := group.(*adapter.Proxy)
+	selector, ok := adapterProxy.ProxyAdapter.(outboundgroup.SelectAble)
+	if !ok {
+		return
+	}
+	if proxyName == "" {
+		selector.ForceSet(proxyName)
+	} else {
 		err = selector.Set(proxyName)
-		if err == nil {
-			log.Infoln("[Selector] %s selected %s", groupName, proxyName)
-		}
-	}()
+	}
+	if err == nil {
+		log.Infoln("[SelectAble] %s selected %s", groupName, proxyName)
+	}
 }
 
 //export getTraffic
 func getTraffic() *C.char {
-	up, down := statistic.DefaultManager.Now()
+	up, down := statistic.DefaultManager.Current(state.OnlyProxy)
 	traffic := map[string]int64{
 		"up":   up,
 		"down": down,
@@ -207,7 +176,7 @@ func getTraffic() *C.char {
 
 //export getTotalTraffic
 func getTotalTraffic() *C.char {
-	up, down := statistic.DefaultManager.Total()
+	up, down := statistic.DefaultManager.Total(state.OnlyProxy)
 	traffic := map[string]int64{
 		"up":   up,
 		"down": down,
@@ -229,16 +198,16 @@ func resetTraffic() {
 func asyncTestDelay(s *C.char, port C.longlong) {
 	i := int64(port)
 	paramsString := C.GoString(s)
-	go func() {
+	b.Go(paramsString, func() (bool, error) {
 		var params = &TestDelayParams{}
 		err := json.Unmarshal([]byte(paramsString), params)
 		if err != nil {
-			return
+			return false, nil
 		}
 
 		expectedStatus, err := utils.NewUnsignedRanges[uint16]("")
 		if err != nil {
-			return
+			return false, nil
 		}
 
 		ctx, cancel := context.WithTimeout(context.Background(), time.Millisecond*time.Duration(params.Timeout))
@@ -255,7 +224,7 @@ func asyncTestDelay(s *C.char, port C.longlong) {
 			delayData.Value = -1
 			data, _ := json.Marshal(delayData)
 			bridge.SendToPort(i, string(data))
-			return
+			return false, nil
 		}
 
 		delay, err := proxy.URLTest(ctx, constant.DefaultTestURL, expectedStatus)
@@ -263,14 +232,14 @@ func asyncTestDelay(s *C.char, port C.longlong) {
 			delayData.Value = -1
 			data, _ := json.Marshal(delayData)
 			bridge.SendToPort(i, string(data))
-			return
+			return false, nil
 		}
 
 		delayData.Value = int32(delay)
 		data, _ := json.Marshal(delayData)
 		bridge.SendToPort(i, string(data))
-		return
-	}()
+		return false, nil
+	})
 }
 
 //export getVersionInfo
@@ -299,7 +268,7 @@ func getConnections() *C.char {
 }
 
 //export closeConnections
-func closeConnections() bool {
+func closeConnections() {
 	statistic.DefaultManager.Range(func(c statistic.Tracker) bool {
 		err := c.Close()
 		if err != nil {
@@ -307,17 +276,16 @@ func closeConnections() bool {
 		}
 		return true
 	})
-	return true
 }
 
 //export closeConnection
-func closeConnection(id *C.char) bool {
+func closeConnection(id *C.char) {
 	connectionId := C.GoString(id)
-	err := statistic.DefaultManager.Get(connectionId).Close()
-	if err != nil {
-		return false
+	c := statistic.DefaultManager.Get(connectionId)
+	if c == nil {
+		return
 	}
-	return true
+	_ = c.Close()
 }
 
 //export getProviders
@@ -345,78 +313,67 @@ func getProvider(name *C.char) *C.char {
 
 //export getExternalProviders
 func getExternalProviders() *C.char {
-	externalProviders := make([]ExternalProvider, 0)
-	providers := tunnel.Providers()
-	for n, p := range providers {
-		if p.VehicleType() != cp.Compatible {
-			p := p.(*provider.ProxySetProvider)
-			externalProviders = append(externalProviders, ExternalProvider{
-				Name:        n,
-				Type:        p.Type().String(),
-				VehicleType: p.VehicleType().String(),
-				UpdateAt:    p.UpdatedAt,
-			})
+	eps := make([]ExternalProvider, 0)
+	for _, p := range externalProviders {
+		externalProvider, err := toExternalProvider(p)
+		if err != nil {
+			continue
 		}
+		eps = append(eps, *externalProvider)
 	}
-	for n, p := range tunnel.RuleProviders() {
-		if p.VehicleType() != cp.Compatible {
-			p := p.(*rp.RuleSetProvider)
-			externalProviders = append(externalProviders, ExternalProvider{
-				Name:        n,
-				Type:        p.Type().String(),
-				VehicleType: p.VehicleType().String(),
-				UpdateAt:    p.UpdatedAt,
-			})
-		}
-	}
-	data, err := json.Marshal(externalProviders)
+	sort.Sort(ExternalProviders(eps))
+	data, err := json.Marshal(eps)
 	if err != nil {
 		return C.CString("")
 	}
 	return C.CString(string(data))
 }
 
-//export updateExternalProvider
-func updateExternalProvider(providerName *C.char, providerType *C.char, port C.longlong) {
+//export getExternalProvider
+func getExternalProvider(name *C.char) *C.char {
+	externalProviderName := C.GoString(name)
+	externalProvider, exist := externalProviders[externalProviderName]
+	if !exist {
+		return C.CString("")
+	}
+	e, err := toExternalProvider(externalProvider)
+	if err != nil {
+		return C.CString("")
+	}
+	data, err := json.Marshal(e)
+	if err != nil {
+		return C.CString("")
+	}
+	return C.CString(string(data))
+}
+
+//export updateGeoData
+func updateGeoData(geoType *C.char, geoName *C.char, port C.longlong) {
 	i := int64(port)
-	providerNameString := C.GoString(providerName)
-	providerTypeString := C.GoString(providerType)
+	geoTypeString := C.GoString(geoType)
+	geoNameString := C.GoString(geoName)
 	go func() {
-		switch providerTypeString {
-		case "Proxy":
-			providers := tunnel.Providers()
-			err := providers[providerNameString].Update()
-			if err != nil {
-				bridge.SendToPort(i, err.Error())
-				return
-			}
-		case "Rule":
-			providers := tunnel.RuleProviders()
-			err := providers[providerNameString].Update()
-			if err != nil {
-				bridge.SendToPort(i, err.Error())
-				return
-			}
+		switch geoTypeString {
 		case "MMDB":
-			err := mmdb.DownloadMMDB(constant.Path.Resolve(providerNameString))
+			err := updater.UpdateMMDB(constant.Path.Resolve(geoNameString))
 			if err != nil {
 				bridge.SendToPort(i, err.Error())
 				return
 			}
 		case "ASN":
-			err := mmdb.DownloadASN(constant.Path.Resolve(providerNameString))
+			err := updater.UpdateASN(constant.Path.Resolve(geoNameString))
 			if err != nil {
 				bridge.SendToPort(i, err.Error())
 				return
 			}
 		case "GeoIp":
-			err := geodata.DownloadGeoIP(constant.Path.Resolve(providerNameString))
+			err := updater.UpdateGeoIp(constant.Path.Resolve(geoNameString))
 			if err != nil {
 				bridge.SendToPort(i, err.Error())
 				return
 			}
 		case "GeoSite":
-			err := geodata.DownloadGeoSite(constant.Path.Resolve(providerNameString))
+			err := updater.UpdateGeoSite(constant.Path.Resolve(geoNameString))
 			if err != nil {
 				bridge.SendToPort(i, err.Error())
 				return
@@ -426,6 +383,45 @@ func updateExternalProvider(providerName *C.char, providerType *C.char, port C.l
 	}()
 }
 
+//export updateExternalProvider
+func updateExternalProvider(providerName *C.char, port C.longlong) {
+	i := int64(port)
+	providerNameString := C.GoString(providerName)
+	go func() {
+		externalProvider, exist := externalProviders[providerNameString]
+		if !exist {
+			bridge.SendToPort(i, "external provider is not exist")
+			return
+		}
+		err := externalProvider.Update()
+		if err != nil {
+			bridge.SendToPort(i, err.Error())
+			return
+		}
+		bridge.SendToPort(i, "")
+	}()
+}
+
+//export sideLoadExternalProvider
+func sideLoadExternalProvider(providerName *C.char, data *C.char, port C.longlong) {
+	i := int64(port)
+	bytes := []byte(C.GoString(data))
+	providerNameString := C.GoString(providerName)
+	go func() {
+		externalProvider, exist := externalProviders[providerNameString]
+		if !exist {
+			bridge.SendToPort(i, "external provider is not exist")
+			return
+		}
+		err := sideUpdateExternalProvider(externalProvider, bytes)
+		if err != nil {
+			bridge.SendToPort(i, err.Error())
+			return
+		}
+		bridge.SendToPort(i, "")
+	}()
+}
+
 //export initNativeApiBridge
 func initNativeApiBridge(api unsafe.Pointer) {
 	bridge.InitDartApi(api)
@@ -463,7 +459,7 @@ func init() {
 			Data: c,
 		})
 	}
-	executor.DefaultProxyProviderLoadedHook = func(providerName string) {
+	executor.DefaultProviderLoadedHook = func(providerName string) {
 		SendMessage(Message{
 			Type: LoadedMessage,
 			Data: providerName,

core/state.go

@@ -0,0 +1,48 @@
+package main
+
+import "C"
+import (
+	"encoding/json"
+	"fmt"
+)
+
+type AccessControl struct {
+	Mode              string   `json:"mode"`
+	AcceptList        []string `json:"acceptList"`
+	RejectList        []string `json:"rejectList"`
+	IsFilterSystemApp bool     `json:"isFilterSystemApp"`
+}
+
+type AndroidProps struct {
+	AccessControl *AccessControl `json:"accessControl"`
+	AllowBypass   bool           `json:"allowBypass"`
+	SystemProxy   bool           `json:"systemProxy"`
+}
+
+type State struct {
+	AndroidProps
+	CurrentProfileName string `json:"currentProfileName"`
+	MixedPort          int    `json:"mixedPort"`
+	OnlyProxy          bool   `json:"onlyProxy"`
+}
+
+var state State
+
+//export getState
+func getState() *C.char {
+	data, err := json.Marshal(state)
+	if err != nil {
+		fmt.Println("Error:", err)
+		return C.CString("")
+	}
+	return C.CString(string(data))
+}
+
+//export setState
+func setState(s *C.char) {
+	paramsString := C.GoString(s)
+	err := json.Unmarshal([]byte(paramsString), &state)
+	if err != nil {
+		return
+	}
+}

lib/application.dart

@@ -88,7 +88,6 @@ class ApplicationState extends State<Application> {
       }
       await globalState.appController.init();
       globalState.appController.initLink();
-      _updateGroups();
     });
   }
 
@@ -120,72 +119,61 @@ class ApplicationState extends State<Application> {
     });
   }
 
-  _updateGroups() {
-    if (globalState.groupsUpdateTimer != null) {
-      globalState.groupsUpdateTimer?.cancel();
-      globalState.groupsUpdateTimer = null;
-    }
-    globalState.groupsUpdateTimer ??= Timer.periodic(
-      httpTimeoutDuration,
-      (timer) async {
-        await globalState.appController.updateGroups();
-      },
-    );
-  }
-
   @override
   Widget build(context) {
     return AppStateContainer(
-      child: ClashMessageContainer(
-        child: _buildApp(
-          Selector2<AppState, Config, ApplicationSelectorState>(
-            selector: (_, appState, config) => ApplicationSelectorState(
-              locale: config.locale,
-              themeMode: config.themeMode,
-              primaryColor: config.primaryColor,
-            ),
-            builder: (_, state, child) {
-              return DynamicColorBuilder(
-                builder: (lightDynamic, darkDynamic) {
-                  _updateSystemColorSchemes(lightDynamic, darkDynamic);
-                  return MaterialApp(
-                    navigatorKey: globalState.navigatorKey,
-                    localizationsDelegates: const [
-                      AppLocalizations.delegate,
-                      GlobalMaterialLocalizations.delegate,
-                      GlobalCupertinoLocalizations.delegate,
-                      GlobalWidgetsLocalizations.delegate
-                    ],
-                    title: appName,
-                    locale: other.getLocaleForString(state.locale),
-                    supportedLocales:
-                        AppLocalizations.delegate.supportedLocales,
-                    themeMode: state.themeMode,
-                    theme: ThemeData(
-                      useMaterial3: true,
-                      pageTransitionsTheme: _pageTransitionsTheme,
-                      colorScheme: _getAppColorScheme(
-                        brightness: Brightness.light,
-                        systemColorSchemes: systemColorSchemes,
-                        primaryColor: state.primaryColor,
-                      ),
-                    ),
-                    darkTheme: ThemeData(
-                      useMaterial3: true,
-                      pageTransitionsTheme: _pageTransitionsTheme,
-                      colorScheme: _getAppColorScheme(
-                        brightness: Brightness.dark,
-                        systemColorSchemes: systemColorSchemes,
-                        primaryColor: state.primaryColor,
-                      ),
-                    ),
-                    home: child,
-                  );
-                },
-              );
-            },
-            child: const HomePage(),
+      child: ClashContainer(
+        child: Selector2<AppState, Config, ApplicationSelectorState>(
+          selector: (_, appState, config) => ApplicationSelectorState(
+            locale: config.locale,
+            themeMode: config.themeMode,
+            primaryColor: config.primaryColor,
+            prueBlack: config.prueBlack,
           ),
+          builder: (_, state, child) {
+            return DynamicColorBuilder(
+              builder: (lightDynamic, darkDynamic) {
+                _updateSystemColorSchemes(lightDynamic, darkDynamic);
+                return MaterialApp(
+                  navigatorKey: globalState.navigatorKey,
+                  localizationsDelegates: const [
+                    AppLocalizations.delegate,
+                    GlobalMaterialLocalizations.delegate,
+                    GlobalCupertinoLocalizations.delegate,
+                    GlobalWidgetsLocalizations.delegate
+                  ],
+                  builder: (_, child) {
+                    return _buildApp(child!);
+                  },
+                  scrollBehavior: BaseScrollBehavior(),
+                  title: appName,
+                  locale: other.getLocaleForString(state.locale),
+                  supportedLocales: AppLocalizations.delegate.supportedLocales,
+                  themeMode: state.themeMode,
+                  theme: ThemeData(
+                    useMaterial3: true,
+                    pageTransitionsTheme: _pageTransitionsTheme,
+                    colorScheme: _getAppColorScheme(
+                      brightness: Brightness.light,
+                      systemColorSchemes: systemColorSchemes,
+                      primaryColor: state.primaryColor,
+                    ),
+                  ),
+                  darkTheme: ThemeData(
+                    useMaterial3: true,
+                    pageTransitionsTheme: _pageTransitionsTheme,
+                    colorScheme: _getAppColorScheme(
+                      brightness: Brightness.dark,
+                      systemColorSchemes: systemColorSchemes,
+                      primaryColor: state.primaryColor,
+                    ).toPrueBlack(state.prueBlack),
+                  ),
+                  home: child,
+                );
+              },
+            );
+          },
+          child: const HomePage(),
         ),
       ),
     );

lib/clash/core.dart

@@ -100,22 +100,6 @@ class ClashCore {
     );
   }
 
-  setProfileName(String profileName) {
-    final profileNameChar = profileName.toNativeUtf8().cast<Char>();
-    clashFFI.setCurrentProfileName(
-      profileNameChar,
-    );
-    malloc.free(profileNameChar);
-  }
-
-  getProfileName() {
-    final currentProfileNameRaw = clashFFI.getCurrentProfileName();
-    final currentProfileName =
-        currentProfileNameRaw.cast<Utf8>().toDartString();
-    clashFFI.freeCString(currentProfileNameRaw);
-    return currentProfileName;
-  }
-
   Future<List<Group>> getProxiesGroups() {
     final proxiesRaw = clashFFI.getProxies();
     final proxiesRawString = proxiesRaw.cast<Utf8>().toDartString();
@@ -128,8 +112,7 @@ class ClashCore {
         UsedProxy.GLOBAL.name,
         ...(proxies[UsedProxy.GLOBAL.name]["all"] as List).where((e) {
           final proxy = proxies[e] ?? {};
-          return GroupTypeExtension.valueList.contains(proxy['type']) &&
-              proxy['hidden'] != true;
+          return GroupTypeExtension.valueList.contains(proxy['type']);
         })
       ];
       final groupsRaw = groupNames.map((groupName) {
@@ -142,7 +125,11 @@ class ClashCore {
             .toList();
         return group;
       }).toList();
-      return groupsRaw.map((e) => Group.fromJson(e)).toList();
+      return groupsRaw
+          .map(
+            (e) => Group.fromJson(e),
+          )
+          .toList();
     });
   }
 
@@ -162,9 +149,46 @@ class ClashCore {
     });
   }
 
-  Future<String> updateExternalProvider({
+  ExternalProvider? getExternalProvider(String externalProviderName) {
+    final externalProviderNameChar =
+        externalProviderName.toNativeUtf8().cast<Char>();
+    final externalProviderRaw =
+        clashFFI.getExternalProvider(externalProviderNameChar);
+    malloc.free(externalProviderNameChar);
+    final externalProviderRawString =
+        externalProviderRaw.cast<Utf8>().toDartString();
+    clashFFI.freeCString(externalProviderRaw);
+    if(externalProviderRawString.isEmpty) return null;
+    return ExternalProvider.fromJson(json.decode(externalProviderRawString));
+  }
+
+  Future<String> updateGeoData({
+    required String geoType,
+    required String geoName,
+  }) {
+    final completer = Completer<String>();
+    final receiver = ReceivePort();
+    receiver.listen((message) {
+      if (!completer.isCompleted) {
+        completer.complete(message);
+        receiver.close();
+      }
+    });
+    final geoTypeChar = geoType.toNativeUtf8().cast<Char>();
+    final geoNameChar = geoName.toNativeUtf8().cast<Char>();
+    clashFFI.updateGeoData(
+      geoTypeChar,
+      geoNameChar,
+      receiver.sendPort.nativePort,
+    );
+    malloc.free(geoTypeChar);
+    malloc.free(geoNameChar);
+    return completer.future;
+  }
+
+  Future<String> sideLoadExternalProvider({
     required String providerName,
-    required String providerType,
+    required String data,
   }) {
     final completer = Completer<String>();
     final receiver = ReceivePort();
@@ -175,14 +199,34 @@ class ClashCore {
       }
     });
     final providerNameChar = providerName.toNativeUtf8().cast<Char>();
-    final providerTypeChar = providerType.toNativeUtf8().cast<Char>();
-    clashFFI.updateExternalProvider(
+    final dataChar = data.toNativeUtf8().cast<Char>();
+    clashFFI.sideLoadExternalProvider(
+      providerNameChar,
+      dataChar,
+      receiver.sendPort.nativePort,
+    );
+    malloc.free(providerNameChar);
+    malloc.free(dataChar);
+    return completer.future;
+  }
+
+  Future<String> updateExternalProvider({
+    required String providerName,
+  }) {
+    final completer = Completer<String>();
+    final receiver = ReceivePort();
+    receiver.listen((message) {
+      if (!completer.isCompleted) {
+        completer.complete(message);
+        receiver.close();
+      }
+    });
+    final providerNameChar = providerName.toNativeUtf8().cast<Char>();
+    clashFFI.updateExternalProvider(
       providerNameChar,
-      providerTypeChar,
       receiver.sendPort.nativePort,
     );
     malloc.free(providerNameChar);
-    malloc.free(providerTypeChar);
     return completer.future;
   }
 
@@ -213,21 +257,13 @@ class ClashCore {
       receiver.sendPort.nativePort,
     );
     malloc.free(delayParamsChar);
-    Future.delayed(httpTimeoutDuration + moreDuration, () {
-      receiver.close();
-      if (!completer.isCompleted) {
-        completer.complete(
-          Delay(name: proxyName, value: -1),
-        );
-      }
-    });
     return completer.future;
   }
 
-  clearEffect(String path) {
-    final pathChar = path.toNativeUtf8().cast<Char>();
-    clashFFI.clearEffect(pathChar);
-    malloc.free(pathChar);
+  clearEffect(String profileId) {
+    final profileIdChar = profileId.toNativeUtf8().cast<Char>();
+    clashFFI.clearEffect(profileIdChar);
+    malloc.free(profileIdChar);
   }
 
   VersionInfo getVersionInfo() {
@@ -237,6 +273,21 @@ class ClashCore {
     return VersionInfo.fromJson(versionInfo);
   }
 
+  setState(CoreState state) {
+    final stateChar = json.encode(state).toNativeUtf8().cast<Char>();
+    clashFFI.setState(stateChar);
+    malloc.free(stateChar);
+  }
+
+  CoreState getState() {
+    final stateRaw = clashFFI.getState();
+    final state = json.decode(
+      stateRaw.cast<Utf8>().toDartString(),
+    );
+    clashFFI.freeCString(stateRaw);
+    return CoreState.fromJson(state);
+  }
+
   Traffic getTraffic() {
     final trafficRaw = clashFFI.getTraffic();
     final trafficMap = json.decode(trafficRaw.cast<Utf8>().toDartString());
@@ -304,11 +355,15 @@ class ClashCore {
     return connectionsRaw.map((e) => Connection.fromJson(e)).toList();
   }
 
-  closeConnections(String id) {
+  closeConnection(String id) {
     final idChar = id.toNativeUtf8().cast<Char>();
     clashFFI.closeConnection(idChar);
     malloc.free(idChar);
   }
+
+  closeConnections() {
+    clashFFI.closeConnections();
+  }
 }
 
 final clashCore = ClashCore();

lib/clash/generated/clash_ffi.dart

@@ -5190,30 +5190,6 @@ class ClashFFI {
       _lookup<ffi.NativeFunction<ffi.Void Function()>>('forceGc');
   late final _forceGc = _forceGcPtr.asFunction<void Function()>();
 
-  void setCurrentProfileName(
-    ffi.Pointer<ffi.Char> s,
-  ) {
-    return _setCurrentProfileName(
-      s,
-    );
-  }
-
-  late final _setCurrentProfileNamePtr =
-      _lookup<ffi.NativeFunction<ffi.Void Function(ffi.Pointer<ffi.Char>)>>(
-          'setCurrentProfileName');
-  late final _setCurrentProfileName = _setCurrentProfileNamePtr
-      .asFunction<void Function(ffi.Pointer<ffi.Char>)>();
-
-  ffi.Pointer<ffi.Char> getCurrentProfileName() {
-    return _getCurrentProfileName();
-  }
-
-  late final _getCurrentProfileNamePtr =
-      _lookup<ffi.NativeFunction<ffi.Pointer<ffi.Char> Function()>>(
-          'getCurrentProfileName');
-  late final _getCurrentProfileName =
-      _getCurrentProfileNamePtr.asFunction<ffi.Pointer<ffi.Char> Function()>();
-
   void validateConfig(
     ffi.Pointer<ffi.Char> s,
     int port,
@@ -5351,16 +5327,16 @@ class ClashFFI {
   late final _getConnections =
       _getConnectionsPtr.asFunction<ffi.Pointer<ffi.Char> Function()>();
 
-  int closeConnections() {
+  void closeConnections() {
     return _closeConnections();
   }
 
   late final _closeConnectionsPtr =
-      _lookup<ffi.NativeFunction<GoUint8 Function()>>('closeConnections');
+      _lookup<ffi.NativeFunction<ffi.Void Function()>>('closeConnections');
   late final _closeConnections =
-      _closeConnectionsPtr.asFunction<int Function()>();
+      _closeConnectionsPtr.asFunction<void Function()>();
 
-  int closeConnection(
+  void closeConnection(
     ffi.Pointer<ffi.Char> id,
   ) {
     return _closeConnection(
@@ -5369,10 +5345,10 @@ class ClashFFI {
   }
 
   late final _closeConnectionPtr =
-      _lookup<ffi.NativeFunction<GoUint8 Function(ffi.Pointer<ffi.Char>)>>(
+      _lookup<ffi.NativeFunction<ffi.Void Function(ffi.Pointer<ffi.Char>)>>(
           'closeConnection');
   late final _closeConnection =
-      _closeConnectionPtr.asFunction<int Function(ffi.Pointer<ffi.Char>)>();
+      _closeConnectionPtr.asFunction<void Function(ffi.Pointer<ffi.Char>)>();
 
   ffi.Pointer<ffi.Char> getProviders() {
     return _getProviders();
@@ -5409,24 +5385,76 @@ class ClashFFI {
   late final _getExternalProviders =
       _getExternalProvidersPtr.asFunction<ffi.Pointer<ffi.Char> Function()>();
 
+  ffi.Pointer<ffi.Char> getExternalProvider(
+    ffi.Pointer<ffi.Char> name,
+  ) {
+    return _getExternalProvider(
+      name,
+    );
+  }
+
+  late final _getExternalProviderPtr = _lookup<
+      ffi.NativeFunction<
+          ffi.Pointer<ffi.Char> Function(
+              ffi.Pointer<ffi.Char>)>>('getExternalProvider');
+  late final _getExternalProvider = _getExternalProviderPtr
+      .asFunction<ffi.Pointer<ffi.Char> Function(ffi.Pointer<ffi.Char>)>();
+
+  void updateGeoData(
+    ffi.Pointer<ffi.Char> geoType,
+    ffi.Pointer<ffi.Char> geoName,
+    int port,
+  ) {
+    return _updateGeoData(
+      geoType,
+      geoName,
+      port,
+    );
+  }
+
+  late final _updateGeoDataPtr = _lookup<
+      ffi.NativeFunction<
+          ffi.Void Function(ffi.Pointer<ffi.Char>, ffi.Pointer<ffi.Char>,
+              ffi.LongLong)>>('updateGeoData');
+  late final _updateGeoData = _updateGeoDataPtr.asFunction<
+      void Function(ffi.Pointer<ffi.Char>, ffi.Pointer<ffi.Char>, int)>();
+
   void updateExternalProvider(
     ffi.Pointer<ffi.Char> providerName,
-    ffi.Pointer<ffi.Char> providerType,
     int port,
   ) {
     return _updateExternalProvider(
       providerName,
-      providerType,
       port,
     );
   }
 
   late final _updateExternalProviderPtr = _lookup<
+      ffi.NativeFunction<
+          ffi.Void Function(
+              ffi.Pointer<ffi.Char>, ffi.LongLong)>>('updateExternalProvider');
+  late final _updateExternalProvider = _updateExternalProviderPtr
+      .asFunction<void Function(ffi.Pointer<ffi.Char>, int)>();
+
+  void sideLoadExternalProvider(
+    ffi.Pointer<ffi.Char> providerName,
+    ffi.Pointer<ffi.Char> data,
+    int port,
+  ) {
+    return _sideLoadExternalProvider(
+      providerName,
+      data,
+      port,
+    );
+  }
+
+  late final _sideLoadExternalProviderPtr = _lookup<
       ffi.NativeFunction<
           ffi.Void Function(ffi.Pointer<ffi.Char>, ffi.Pointer<ffi.Char>,
-              ffi.LongLong)>>('updateExternalProvider');
-  late final _updateExternalProvider = _updateExternalProviderPtr.asFunction<
-      void Function(ffi.Pointer<ffi.Char>, ffi.Pointer<ffi.Char>, int)>();
+              ffi.LongLong)>>('sideLoadExternalProvider');
+  late final _sideLoadExternalProvider =
+      _sideLoadExternalProviderPtr.asFunction<
+          void Function(ffi.Pointer<ffi.Char>, ffi.Pointer<ffi.Char>, int)>();
 
   void initNativeApiBridge(
     ffi.Pointer<ffi.Void> api,
@@ -5499,6 +5527,29 @@ class ClashFFI {
   late final _setProcessMap =
       _setProcessMapPtr.asFunction<void Function(ffi.Pointer<ffi.Char>)>();
 
+  ffi.Pointer<ffi.Char> getState() {
+    return _getState();
+  }
+
+  late final _getStatePtr =
+      _lookup<ffi.NativeFunction<ffi.Pointer<ffi.Char> Function()>>('getState');
+  late final _getState =
+      _getStatePtr.asFunction<ffi.Pointer<ffi.Char> Function()>();
+
+  void setState(
+    ffi.Pointer<ffi.Char> s,
+  ) {
+    return _setState(
+      s,
+    );
+  }
+
+  late final _setStatePtr =
+      _lookup<ffi.NativeFunction<ffi.Void Function(ffi.Pointer<ffi.Char>)>>(
+          'setState');
+  late final _setState =
+      _setStatePtr.asFunction<void Function(ffi.Pointer<ffi.Char>)>();
+
   void startTUN(
     int fd,
     int port,

lib/common/archive.dart

@@ -0,0 +1,28 @@
+import 'dart:convert';
+import 'dart:io';
+import 'package:archive/archive_io.dart';
+import 'package:path/path.dart';
+
+extension ArchiveExt on Archive {
+  addDirectoryToArchive(String dirPath, String parentPath) {
+    final dir = Directory(dirPath);
+    final entities = dir.listSync(recursive: false);
+    for (final entity in entities) {
+      final relativePath = relative(entity.path, from: parentPath);
+      if (entity is File) {
+        final data = entity.readAsBytesSync();
+        final archiveFile = ArchiveFile(relativePath, data.length, data);
+        addFile(archiveFile);
+      } else if (entity is Directory) {
+        addDirectoryToArchive(entity.path, parentPath);
+      }
+    }
+  }
+
+  add<T>(String name, T raw) {
+    final data = json.encode(raw);
+    addFile(
+      ArchiveFile(name, data.length, data),
+    );
+  }
+}

lib/common/color.dart

@@ -16,4 +16,21 @@ extension ColorExtension on Color {
   toLittle() {
     return withOpacity(0.03);
   }
-}
+
+  Color darken([double amount = .1]) {
+    assert(amount >= 0 && amount <= 1);
+    final hsl = HSLColor.fromColor(this);
+    final hslDark = hsl.withLightness((hsl.lightness - amount).clamp(0.0, 1.0));
+    return hslDark.toColor();
+  }
+}
+
+extension ColorSchemeExtension on ColorScheme {
+  ColorScheme toPrueBlack(bool isPrueBlack) => isPrueBlack
+      ? copyWith(
+          surface: Colors.black,
+          background: Colors.black,
+          surfaceContainer: surfaceContainer.darken(0.05),
+        )
+      : this;
+}

lib/common/common.dart

@@ -24,4 +24,5 @@ export 'function.dart';
 export 'package.dart';
 export 'measure.dart';
 export 'service.dart';
-export 'iterable.dart';
+export 'iterable.dart';
+export 'scroll.dart';

lib/common/constant.dart

@@ -1,11 +1,13 @@
 import 'dart:ui';
 
+import 'package:fl_clash/enum/enum.dart';
 import 'package:fl_clash/models/clash_config.dart';
 import 'package:flutter/material.dart';
+import 'system.dart';
 
 const appName = "FlClash";
 const coreName = "clash.meta";
-const packageName = "FlClash";
+const packageName = "com.follow.clash";
 const httpTimeoutDuration = Duration(milliseconds: 5000);
 const moreDuration = Duration(milliseconds: 100);
 const animateDuration = Duration(milliseconds: 100);
@@ -14,11 +16,16 @@ const mmdbFileName = "geoip.metadb";
 const asnFileName = "ASN.mmdb";
 const geoIpFileName = "GeoIP.dat";
 const geoSiteFileName = "GeoSite.dat";
+final double kHeaderHeight = system.isDesktop ? 40 : 0;
 const GeoXMap defaultGeoXMap = {
-  "mmdb":"https://github.com/MetaCubeX/meta-rules-dat/releases/download/latest/geoip.metadb",
-  "asn":"https://github.com/xishang0128/geoip/releases/download/latest/GeoLite2-ASN.mmdb",
-  "geoip":"https://github.com/MetaCubeX/meta-rules-dat/releases/download/latest/GeoIP.dat",
-  "geosite":"https://github.com/MetaCubeX/meta-rules-dat/releases/download/latest/geosite.dat"
+  "mmdb":
+      "https://github.com/MetaCubeX/meta-rules-dat/releases/download/latest/geoip.metadb",
+  "asn":
+      "https://github.com/xishang0128/geoip/releases/download/latest/GeoLite2-ASN.mmdb",
+  "geoip":
+      "https://github.com/MetaCubeX/meta-rules-dat/releases/download/latest/GeoIP.dat",
+  "geosite":
+      "https://github.com/MetaCubeX/meta-rules-dat/releases/download/latest/geosite.dat"
 };
 const profilesDirectoryName = "profiles";
 const localhost = "127.0.0.1";
@@ -39,4 +46,10 @@ final filter = ImageFilter.blur(
   tileMode: TileMode.mirror,
 );
 
+const viewModeColumnsMap = {
+  ViewMode.mobile: [2, 1],
+  ViewMode.laptop: [3, 2],
+  ViewMode.desktop: [4, 3],
+};
+
 const defaultPrimaryColor = Colors.brown;

lib/common/dav_client.dart

@@ -1,11 +1,8 @@
 import 'dart:async';
-import 'dart:convert';
+import 'dart:typed_data';
 
 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:path/path.dart';
 import 'package:webdav_client/webdav_client.dart';
 
 class DAVClient {
@@ -33,8 +30,6 @@ class DAVClient {
   Future<bool> _ping() async {
     try {
       await client.ping();
-      await client.mkdir("/$appName");
-      await client.mkdir("/$appName/$profilesDirectoryName");
       return true;
     } catch (_) {
       return false;
@@ -43,65 +38,17 @@ class DAVClient {
 
   get root => "/$appName";
 
-  get remoteConfig => "$root/$configKey.json";
+  get backupFile => "$root/backup.zip";
 
-  get remoteClashConfig => "$root/$clashConfigKey.json";
-
-  get remoteProfiles => "$root/$profilesDirectoryName";
-
-  backup() async {
-    final appController = globalState.appController;
-    final config = appController.config;
-    final clashConfig = appController.clashConfig;
+  backup(Uint8List data) async {
     await client.mkdir("$root");
-    client.write(
-      remoteConfig,
-      utf8.encode(
-        json.encode(config.toJson()),
-      ),
-    );
-    client.write(
-      remoteClashConfig,
-      utf8.encode(
-        json.encode(clashConfig.toJson()),
-      ),
-    );
-    await client.remove(remoteProfiles);
-    for (final profile in config.profiles) {
-      final path = await appPath.getProfilePath(profile.id);
-      if (path == null) continue;
-      await client.writeFromFile(
-        path,
-        "$remoteProfiles/${basename(path)}",
-      );
-    }
+    await client.write("$backupFile", data);
     return true;
   }
 
-  recovery({required RecoveryOption recoveryOption}) async {
-    final profiles = await client.readDir(remoteProfiles);
-    final profilesPath = await appPath.getProfilesPath();
-    for (final file in profiles) {
-      await client.read2File(
-        "$remoteProfiles/${file.name}",
-        join(
-          profilesPath,
-          file.name,
-        ),
-      );
-    }
-    final configRaw = utf8.decode((await client.read(remoteConfig)));
-    final clashConfigRaw = utf8.decode(await client.read(remoteClashConfig));
-    final config = Config.fromJson(json.decode(configRaw));
-    final clashConfig = ClashConfig.fromJson(json.decode(clashConfigRaw));
-    if(recoveryOption == RecoveryOption.onlyProfiles){
-      globalState.appController.config.update(config, RecoveryOption.onlyProfiles);
-    }else{
-      globalState.appController.config.update(config, RecoveryOption.all);
-      globalState.appController.clashConfig.update(clashConfig);
-    }
-    await globalState.appController.applyProfile();
-    globalState.appController.savePreferences();
-    return true;
+  Future<List<int>> recovery() async {
+    await client.mkdir("$root");
+    final data = await client.read(backupFile);
+    return data;
   }
 }

lib/common/iterable.dart

@@ -10,4 +10,58 @@ extension IterableExt<T> on Iterable<T> {
       yield iterator.current;
     }
   }
+
+  Iterable<List<T>> chunks(int size) sync* {
+    if (length == 0) return;
+    var iterator = this.iterator;
+    while (iterator.moveNext()) {
+      var chunk = [iterator.current];
+      for (var i = 1; i < size && iterator.moveNext(); i++) {
+        chunk.add(iterator.current);
+      }
+      yield chunk;
+    }
+  }
+
+  Iterable<T> fill(
+    int length, {
+    required T Function(int count) filler,
+  }) sync* {
+    int count = 0;
+    for (var item in this) {
+      yield item;
+      count++;
+      if (count >= length) return;
+    }
+    while (count < length) {
+      yield filler(count);
+      count++;
+    }
+  }
+}
+
+extension DoubleListExt on List<double> {
+  int findInterval(num target) {
+    if (isEmpty) return -1;
+    if (target < first) return -1;
+    if (target >= last) return length - 1;
+
+    int left = 0;
+    int right = length - 1;
+
+    while (left <= right) {
+      int mid = left + (right - left) ~/ 2;
+
+      if (mid == length - 1 ||
+          (this[mid] <= target && target < this[mid + 1])) {
+        return mid;
+      } else if (target < this[mid]) {
+        right = mid - 1;
+      } else {
+        left = mid + 1;
+      }
+    }
+
+    return -1; // 这行理论上不会执行到，但为了完整性保留
+  }
 }

lib/common/navigation.dart

@@ -44,7 +44,7 @@ class Navigation {
         modes: [NavigationItemMode.desktop, NavigationItemMode.more],
       ),
       const NavigationItem(
-        icon: Icon(Icons.swap_vert_circle),
+        icon: Icon(Icons.storage),
         label: "resources",
         description: "resourcesDesc",
         keep: false,

lib/common/other.dart

@@ -1,10 +1,12 @@
 import 'dart:io';
 import 'dart:isolate';
+import 'dart:math';
 import 'dart:typed_data';
 
-import 'package:fl_clash/common/constant.dart';
+import 'package:fl_clash/common/common.dart';
 import 'package:fl_clash/enum/enum.dart';
 import 'package:flutter/material.dart';
+import 'package:lpinyin/lpinyin.dart';
 import 'package:zxing2/qrcode.dart';
 import 'package:image/image.dart' as img;
 
@@ -82,7 +84,7 @@ class Other {
     if (charA == charB) {
       return sortByChar(a.substring(1), b.substring(1));
     } else {
-      return charA.compareTo(charB);
+      return charA.compareToLower(charB);
     }
   }
 
@@ -100,9 +102,9 @@ class Other {
 
   String getTrayIconPath() {
     if (Platform.isWindows) {
-      return "assets/images/app_icon.ico";
+      return "assets/images/icon.ico";
     } else {
-      return "assets/images/launch_icon.png";
+      return "assets/images/icon_monochrome.png";
     }
   }
 
@@ -189,6 +191,24 @@ class Other {
     if (viewWidth <= maxLaptopWidth) return ViewMode.laptop;
     return ViewMode.desktop;
   }
+
+
+  int getProxiesColumns(double viewWidth, ProxiesLayout proxiesLayout) {
+    final columns = max((viewWidth / 300).ceil(), 2);
+    return switch (proxiesLayout) {
+      ProxiesLayout.tight => columns - 1,
+      ProxiesLayout.standard => columns,
+      ProxiesLayout.loose => columns + 1,
+    };
+  }
+
+  int getProfilesColumns(double viewWidth) {
+    return max((viewWidth / 400).floor(), 1);
+  }
+
+  String getBackupFileName() {
+    return "${appName}_backup_${DateTime.now().show}.zip";
+  }
 }
 
 final other = Other();

lib/common/path.dart

@@ -9,6 +9,7 @@ import 'constant.dart';
 class AppPath {
   static AppPath? _instance;
   Completer<Directory> cacheDir = Completer();
+  Completer<Directory> downloadDir = Completer();
 
   // Future<Directory> _createDesktopCacheDir() async {
   //   final path = join(dirname(Platform.resolvedExecutable), 'cache');
@@ -23,6 +24,9 @@ class AppPath {
     getApplicationSupportDirectory().then((value) {
       cacheDir.complete(value);
     });
+    getDownloadsDirectory().then((value) {
+      downloadDir.complete(value);
+    });
     // if (Platform.isAndroid) {
     //   getApplicationSupportDirectory().then((value) {
     //     cacheDir.complete(value);
@@ -39,6 +43,11 @@ class AppPath {
     return _instance!;
   }
 
+  Future<String> getDownloadDirPath() async {
+    final directory = await downloadDir.future;
+    return directory.path;
+  }
+
   Future<String> getHomeDirPath() async {
     final directory = await cacheDir.future;
     return directory.path;

lib/common/picker.dart

@@ -1,22 +1,26 @@
+import 'dart:typed_data';
+
 import 'package:file_picker/file_picker.dart';
 import 'package:fl_clash/common/common.dart';
 import 'package:image_picker/image_picker.dart';
 
 class Picker {
-  Future<PlatformFile?> pickerConfigFile() async {
+  Future<PlatformFile?> pickerFile() async {
     final filePickerResult = await FilePicker.platform.pickFiles(
       withData: true,
       allowMultiple: false,
+      initialDirectory: await appPath.getDownloadDirPath(),
     );
     return filePickerResult?.files.first;
   }
 
-  Future<PlatformFile?> pickerGeoDataFile() async {
-    final filePickerResult = await FilePicker.platform.pickFiles(
-      withData: true,
-      allowMultiple: false,
+  Future<String?> saveFile(String fileName,Uint8List bytes) async {
+    final path = await FilePicker.platform.saveFile(
+      fileName: fileName,
+      initialDirectory: await appPath.getDownloadDirPath(),
+      bytes: bytes,
     );
-    return filePickerResult?.files.first;
+    return path;
   }
 
   Future<String?> pickerConfigQRCode() async {

lib/common/proxy.dart

@@ -15,8 +15,8 @@ class ProxyManager {
 
   DateTime? get startTime => _proxy.startTime;
 
-  Future<bool?> startProxy({required int port, String? args}) async {
-    return await _proxy.startProxy(port, args);
+  Future<bool?> startProxy({required int port}) async {
+    return await _proxy.startProxy(port);
   }
 
   Future<bool?> stopProxy() async {

lib/common/request.dart

@@ -1,4 +1,5 @@
 import 'dart:io';
+import 'dart:math';
 
 import 'package:dio/dio.dart';
 import 'package:dio/io.dart';
@@ -13,20 +14,17 @@ class Request {
 
   Request() {
     _dio = Dio();
-    _dio.options = BaseOptions(
-      headers: {"User-Agent": globalState.appController.clashConfig.globalUa},
-    );
     _dio.interceptors.add(
       InterceptorsWrapper(
         onRequest: (options, handler) {
-          _syncProxy();
+          _updateAdapter();
           return handler.next(options); // 继续请求
         },
       ),
     );
   }
 
-  _syncProxy() {
+  _updateAdapter() {
     final port = globalState.appController.clashConfig.mixedPort;
     final isStart = globalState.appController.appState.isStart;
     if (_port != port || isStart != _isStart) {
@@ -36,11 +34,13 @@ class Request {
         createHttpClient: () {
           final client = HttpClient();
           if (!_isStart) return client;
+          client.userAgent = globalState.appController.clashConfig.globalUa;
           client.findProxy = (url) {
             return "PROXY localhost:$_port;DIRECT";
           };
           return client;
         },
+        validateCertificate: (_, __, ___) => true,
       );
     }
   }
@@ -50,11 +50,14 @@ class Request {
         .get(
           url,
           options: Options(
+            headers: {
+              "User-Agent": globalState.appController.clashConfig.globalUa
+            },
             responseType: ResponseType.bytes,
           ),
         )
         .timeout(
-          httpTimeoutDuration * 2,
+          httpTimeoutDuration * 6,
         );
     return response;
   }
@@ -83,11 +86,14 @@ class Request {
     "https://ipinfo.io/json/": IpInfo.fromIpInfoIoJson,
   };
 
-  Future<IpInfo?> checkIp(CancelToken? cancelToken) async {
-    for (final source in _ipInfoSources.entries) {
+  Future<IpInfo?> checkIp({CancelToken? cancelToken}) async {
+    for (final source in _ipInfoSources.entries.toList()..shuffle(Random())) {
       try {
         final response = await _dio
-            .get<Map<String, dynamic>>(source.key, cancelToken: cancelToken)
+            .get<Map<String, dynamic>>(
+              source.key,
+              cancelToken: cancelToken,
+            )
             .timeout(
               httpTimeoutDuration,
             );

lib/common/scroll.dart

@@ -0,0 +1,27 @@
+import 'dart:ui';
+
+import 'package:fl_clash/common/common.dart';
+import 'package:flutter/material.dart';
+
+class BaseScrollBehavior extends MaterialScrollBehavior {
+  @override
+  Set<PointerDeviceKind> get dragDevices => {
+        PointerDeviceKind.touch,
+        PointerDeviceKind.stylus,
+        PointerDeviceKind.invertedStylus,
+        PointerDeviceKind.trackpad,
+        if (system.isDesktop) PointerDeviceKind.mouse,
+        PointerDeviceKind.unknown,
+      };
+}
+
+class HiddenBarScrollBehavior extends BaseScrollBehavior {
+  @override
+  Widget buildScrollbar(
+    BuildContext context,
+    Widget child,
+    ScrollableDetails details,
+  ) {
+    return child;
+  }
+}

lib/common/string.dart

@@ -2,4 +2,10 @@ extension StringExtension on String {
   bool get isUrl {
     return RegExp(r'^(http|https|ftp)://').hasMatch(this);
   }
+
+  int compareToLower(String other) {
+    return toLowerCase().compareTo(
+      other.toLowerCase(),
+    );
+  }
 }

lib/common/window.dart

@@ -1,5 +1,6 @@
 import 'dart:io';
 
+import 'package:fl_clash/models/config.dart';
 import 'package:flutter/material.dart';
 import 'package:window_manager/window_manager.dart';
 import 'package:windows_single_instance/windows_single_instance.dart';
@@ -8,7 +9,7 @@ import 'protocol.dart';
 import 'system.dart';
 
 class Window {
-  init() async {
+  init(WindowProps props) async {
     if (Platform.isWindows) {
       await WindowsSingleInstance.ensureSingleInstance([], "FlClash");
       protocol.register("clash");
@@ -16,11 +17,22 @@ class Window {
       protocol.register("flclash");
     }
     await windowManager.ensureInitialized();
-    WindowOptions windowOptions = const WindowOptions(
-      size: Size(1000, 600),
-      minimumSize: Size(400, 600),
-      center: true,
+    WindowOptions windowOptions = WindowOptions(
+      size: Size(props.width, props.height),
+      minimumSize: const Size(380, 500),
+      windowButtonVisibility: false,
+      titleBarStyle: TitleBarStyle.hidden,
     );
+    if (props.left != null || props.top != null) {
+      await windowManager.setPosition(
+        Offset(props.left ?? 0, props.top ?? 0),
+      );
+    } else {
+      await windowManager.setAlignment(Alignment.center);
+    }
+    // if(Platform.isWindows){
+    //   await windowManager.setTitleBarStyle(TitleBarStyle.hidden);
+    // }
     await windowManager.waitUntilReadyToShow(windowOptions, () async {
       await windowManager.setPreventClose(true);
     });

lib/controller.dart

@@ -1,8 +1,16 @@
 import 'dart:async';
+import 'dart:convert';
+import 'dart:io';
+import 'dart:isolate';
+import 'dart:math';
 
+import 'package:archive/archive.dart';
+import 'package:fl_clash/common/archive.dart';
 import 'package:fl_clash/enum/enum.dart';
 import 'package:fl_clash/state.dart';
 import 'package:flutter/material.dart';
+import 'package:lpinyin/lpinyin.dart';
+import 'package:path/path.dart';
 import 'package:provider/provider.dart';
 import 'package:url_launcher/url_launcher.dart';
 
@@ -17,6 +25,7 @@ class AppController {
   late ClashConfig clashConfig;
   late Measure measure;
   late Function updateClashConfigDebounce;
+  late Function updateGroupDebounce;
   late Function addCheckIpNumDebounce;
 
   AppController(this.context) {
@@ -29,6 +38,9 @@ class AppController {
     addCheckIpNumDebounce = debounce(() {
       appState.checkIpNum++;
     });
+    updateGroupDebounce = debounce(() async {
+      await updateGroups();
+    });
     measure = Measure.of(context);
   }
 
@@ -45,12 +57,15 @@ class AppController {
         updateRunTime,
         updateTraffic,
       ];
+      if (Platform.isAndroid) return;
+      await applyProfile(isPrue: true);
     } else {
       await globalState.stopSystemProxy();
       clashCore.resetTraffic();
       appState.traffics = [];
       appState.totalTraffic = Traffic();
       appState.runTime = null;
+      addCheckIpNumDebounce();
     }
   }
 
@@ -82,22 +97,22 @@ class AppController {
 
   deleteProfile(String id) async {
     config.deleteProfileById(id);
-    final profilePath = await appPath.getProfilePath(id);
-    if (profilePath == null) return;
-    clashCore.clearEffect(profilePath);
+    clashCore.clearEffect(id);
     if (config.currentProfileId == id) {
       if (config.profiles.isNotEmpty) {
         final updateId = config.profiles.first.id;
         changeProfile(updateId);
       } else {
-        changeProfile(null);
+        updateSystemProxy(false);
       }
     }
   }
 
   Future<void> updateProfile(Profile profile) async {
-    await profile.update();
-    config.setProfile(await profile.update());
+    final newProfile = await profile.update();
+    config.setProfile(
+      newProfile.copyWith(isUpdating: false),
+    );
   }
 
   Future<void> updateClashConfig({bool isPatch = true}) async {
@@ -108,32 +123,30 @@ class AppController {
     );
   }
 
-  Future applyProfile() async {
-    final commonScaffoldState = globalState.homeScaffoldKey.currentState;
-    if (commonScaffoldState?.mounted != true) return;
-    commonScaffoldState?.loadingRun(() async {
+  Future applyProfile({bool isPrue = false}) async {
+    if (isPrue) {
       await globalState.applyProfile(
         appState: appState,
         config: config,
         clashConfig: clashConfig,
       );
-    });
-  }
-
-  Future rawApplyProfile() async {
-    await globalState.applyProfile(
-      appState: appState,
-      config: config,
-      clashConfig: clashConfig,
-    );
+    } else {
+      final commonScaffoldState = globalState.homeScaffoldKey.currentState;
+      if (commonScaffoldState?.mounted != true) return;
+      await commonScaffoldState?.loadingRun(() async {
+        await globalState.applyProfile(
+          appState: appState,
+          config: config,
+          clashConfig: clashConfig,
+        );
+      });
+    }
+    addCheckIpNumDebounce();
   }
 
   changeProfile(String? value) async {
     if (value == config.currentProfileId) return;
     config.currentProfileId = value;
-    await applyProfile();
-    appState.delayMap = {};
-    saveConfigPreferences();
   }
 
   autoUpdateProfiles() async {
@@ -192,6 +205,18 @@ class AppController {
     await preferences.saveClashConfig(clashConfig);
   }
 
+  changeProxy({
+    required String groupName,
+    required String proxyName,
+  }) {
+    globalState.changeProxy(
+      config: config,
+      groupName: groupName,
+      proxyName: proxyName,
+    );
+    addCheckIpNumDebounce();
+  }
+
   handleBackOrExit() async {
     if (config.isMinimizeOnExit) {
       if (system.isDesktop) {
@@ -273,26 +298,6 @@ class AppController {
     if (!config.silentLaunch) {
       window?.show();
     }
-    final commonScaffoldState = globalState.homeScaffoldKey.currentState;
-    if (commonScaffoldState?.mounted == true) {
-      await commonScaffoldState?.loadingRun(() async {
-        await globalState.applyProfile(
-          appState: appState,
-          config: config,
-          clashConfig: clashConfig,
-        );
-      }, title: appLocalizations.init);
-    } else {
-      await globalState.applyProfile(
-        appState: appState,
-        config: config,
-        clashConfig: clashConfig,
-      );
-    }
-    await afterInit();
-  }
-
-  afterInit() async {
     await proxyManager.updateStartTime();
     if (proxyManager.isStart) {
       await updateSystemProxy(true);
@@ -382,7 +387,11 @@ class AppController {
   }
 
   addProfileFormFile() async {
-    final platformFile = await globalState.safeRun(picker.pickerConfigFile);
+    final platformFile = await globalState.safeRun(picker.pickerFile);
+    final bytes = platformFile?.bytes;
+    if (bytes == null) {
+      return null;
+    }
     if (!context.mounted) return;
     globalState.navigatorKey.currentState?.popUntil((route) => route.isFirst);
     toProfiles();
@@ -391,10 +400,6 @@ class AppController {
     final profile = await commonScaffoldState?.loadingRun<Profile?>(
       () async {
         await Future.delayed(const Duration(milliseconds: 300));
-        final bytes = platformFile?.bytes;
-        if (bytes == null) {
-          return null;
-        }
         return await Profile.normal(label: platformFile?.name).saveFile(bytes);
       },
       title: "${appLocalizations.add}${appLocalizations.profile}",
@@ -410,15 +415,6 @@ class AppController {
     addProfileFormURL(url);
   }
 
-  int get columns =>
-      globalState.getColumns(appState.viewMode, config.proxiesColumns);
-
-  changeColumns() {
-    config.proxiesColumns = globalState.getColumns(
-      appState.viewMode,
-      columns - 1,
-    );
-  }
 
   updateViewWidth(double width) {
     WidgetsBinding.instance.addPostFrameCallback((_) {
@@ -429,7 +425,10 @@ class AppController {
   List<Proxy> _sortOfName(List<Proxy> proxies) {
     return List.of(proxies)
       ..sort(
-        (a, b) => other.sortByChar(a.name, b.name),
+        (a, b) => other.sortByChar(
+          PinyinHelper.getPinyin(a.name),
+          PinyinHelper.getPinyin(b.name),
+        ),
       );
   }
 
@@ -460,4 +459,70 @@ class AppController {
       ProxiesSortType.name => _sortOfName(proxies),
     };
   }
+
+  String getCurrentSelectedName(String groupName) {
+    final group = appState.getGroupWithName(groupName);
+    return group?.getCurrentSelectedName(
+            config.currentSelectedMap[groupName] ?? '') ??
+        '';
+  }
+
+  Future<List<int>> backupData() async {
+    final homeDirPath = await appPath.getHomeDirPath();
+    final profilesPath = await appPath.getProfilesPath();
+    final configJson = config.toJson();
+    final clashConfigJson = clashConfig.toJson();
+    return Isolate.run<List<int>>(() async {
+      final archive = Archive();
+      archive.add("config.json", configJson);
+      archive.add("clashConfig.json", clashConfigJson);
+      await archive.addDirectoryToArchive(profilesPath, homeDirPath);
+      final zipEncoder = ZipEncoder();
+      return zipEncoder.encode(archive) ?? [];
+    });
+  }
+
+  recoveryData(
+    List<int> data,
+    RecoveryOption recoveryOption,
+  ) async {
+    final archive = await Isolate.run<Archive>(() {
+      final zipDecoder = ZipDecoder();
+      return zipDecoder.decodeBytes(data);
+    });
+    final homeDirPath = await appPath.getHomeDirPath();
+    final configs =
+        archive.files.where((item) => item.name.endsWith(".json")).toList();
+    final profiles =
+        archive.files.where((item) => !item.name.endsWith(".json"));
+    final configIndex =
+        configs.indexWhere((config) => config.name == "config.json");
+    final clashConfigIndex =
+        configs.indexWhere((config) => config.name == "clashConfig.json");
+    if (configIndex == -1 || clashConfigIndex == -1) throw "invalid backup.zip";
+    final configFile = configs[configIndex];
+    final clashConfigFile = configs[clashConfigIndex];
+    final tempConfig = Config.fromJson(
+      json.decode(
+        utf8.decode(configFile.content),
+      ),
+    );
+    final tempClashConfig = ClashConfig.fromJson(
+      json.decode(
+        utf8.decode(clashConfigFile.content),
+      ),
+    );
+    for (final profile in profiles) {
+      final filePath = join(homeDirPath, profile.name);
+      final file = File(filePath);
+      await file.create(recursive: true);
+      await file.writeAsBytes(profile.content);
+    }
+    if (recoveryOption == RecoveryOption.onlyProfiles) {
+      config.update(tempConfig, RecoveryOption.onlyProfiles);
+    } else {
+      config.update(tempConfig, RecoveryOption.all);
+      clashConfig.update(tempClashConfig);
+    }
+  }
 }

lib/enum/enum.dart

@@ -52,6 +52,8 @@ enum TunStack { gvisor, system, mixed }
 
 enum AccessControlMode { acceptSelected, rejectSelected }
 
+enum AccessSortType { none, name, time }
+
 enum ProfileType { file, url }
 
 enum ResultType { success, error }
@@ -82,6 +84,8 @@ enum ChipType { action, delete }
 
 enum CommonCardType { plain, filled }
 
-enum ProxiesType { tab, expansion }
+enum ProxiesType { tab, list }
 
-enum ProxyCardType { expand, shrink }
+enum ProxiesLayout{ loose, standard, tight }
+
+enum ProxyCardType { expand, shrink, min }

lib/fragments/about.dart

@@ -1,7 +1,20 @@
 import 'package:fl_clash/common/common.dart';
 import 'package:fl_clash/state.dart';
+import 'package:fl_clash/widgets/list.dart';
 import 'package:flutter/material.dart';
-import 'package:url_launcher/url_launcher.dart';
+
+@immutable
+class Contributor {
+  final String avatar;
+  final String name;
+  final String link;
+
+  const Contributor({
+    required this.avatar,
+    required this.name,
+    required this.link,
+  });
+}
 
 class AboutFragment extends StatelessWidget {
   const AboutFragment({super.key});
@@ -9,8 +22,7 @@ class AboutFragment extends StatelessWidget {
   _checkUpdate(BuildContext context) async {
     final commonScaffoldState = context.commonScaffoldState;
     if (commonScaffoldState?.mounted != true) return;
-    final data =
-        await commonScaffoldState?.loadingRun<Map<String, dynamic>?>(
+    final data = await commonScaffoldState?.loadingRun<Map<String, dynamic>?>(
       request.checkForUpdate,
       title: appLocalizations.checkUpdate,
     );
@@ -20,84 +32,40 @@ class AboutFragment extends StatelessWidget {
     );
   }
 
-  @override
-  Widget build(BuildContext context) {
-    return ListView(
-      padding: kMaterialListPadding.copyWith(
-        top: 16,
-        bottom: 16,
-      ),
-      children: [
-        ListTile(
-          title: Column(
-            crossAxisAlignment: CrossAxisAlignment.start,
-            children: [
-              Wrap(
-                spacing: 16,
-                crossAxisAlignment: WrapCrossAlignment.center,
-                children: [
-                  Image.asset(
-                    'assets/images/launch_icon.png',
-                    width: 100,
-                    height: 100,
-                  ),
-                  Column(
-                    crossAxisAlignment: CrossAxisAlignment.start,
-                    children: [
-                      Text(
-                        appName,
-                        style: Theme.of(context).textTheme.headlineSmall,
-                      ),
-                      Text(
-                        globalState.packageInfo.version,
-                        style: Theme.of(context).textTheme.labelLarge,
-                      )
-                    ],
-                  )
-                ],
-              ),
-              const SizedBox(
-                height: 24,
-              ),
-              Text(
-                appLocalizations.desc,
-                style: Theme.of(context).textTheme.bodySmall,
-              ),
-            ],
-          ),
-        ),
-        const SizedBox(
-          height: 12,
-        ),
-        ListTile(
+  List<Widget> _buildMoreSection(BuildContext context) {
+    return generateSection(
+      separated: false,
+      title: appLocalizations.more,
+      items: [
+        ListItem(
           title: Text(appLocalizations.checkUpdate),
           onTap: () {
             _checkUpdate(context);
           },
         ),
-        ListTile(
+        ListItem(
           title: const Text("Telegram"),
           onTap: () {
-            launchUrl(
-              Uri.parse("https://t.me/+G-veVtwBOl4wODc1"),
+            globalState.openUrl(
+              "https://t.me/+G-veVtwBOl4wODc1",
             );
           },
           trailing: const Icon(Icons.launch),
         ),
-        ListTile(
+        ListItem(
           title: Text(appLocalizations.project),
           onTap: () {
-            launchUrl(
-              Uri.parse("https://github.com/$repository"),
+            globalState.openUrl(
+              "https://github.com/$repository",
             );
           },
           trailing: const Icon(Icons.launch),
         ),
-        ListTile(
+        ListItem(
           title: Text(appLocalizations.core),
           onTap: () {
-            launchUrl(
-              Uri.parse("https://github.com/chen08209/Clash.Meta/tree/FlClash"),
+            globalState.openUrl(
+              "https://github.com/chen08209/Clash.Meta/tree/FlClash",
             );
           },
           trailing: const Icon(Icons.launch),
@@ -105,4 +73,139 @@ class AboutFragment extends StatelessWidget {
       ],
     );
   }
+
+  List<Widget> _buildContributorsSection() {
+    const contributors = [
+      Contributor(
+        avatar: "assets/images/avatars/june2.jpg",
+        name: "June2",
+        link: "https://t.me/Jibadong",
+      ),
+      Contributor(
+        avatar: "assets/images/avatars/arue.jpg",
+        name: "Arue",
+        link: "https://t.me/xrcm6868",
+      ),
+    ];
+    return generateSection(
+      separated: false,
+      title: appLocalizations.otherContributors,
+      items: [
+        ListItem(
+          title: SingleChildScrollView(
+            scrollDirection: Axis.horizontal,
+            child: Wrap(
+              spacing: 24,
+              children: [
+                for (final contributor in contributors)
+                  Avatar(
+                    contributor: contributor,
+                  ),
+              ],
+            ),
+          ),
+        )
+      ],
+    );
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    final items = [
+      ListTile(
+        title: Column(
+          crossAxisAlignment: CrossAxisAlignment.start,
+          children: [
+            Wrap(
+              spacing: 16,
+              crossAxisAlignment: WrapCrossAlignment.center,
+              children: [
+                Padding(
+                  padding: const EdgeInsets.all(12),
+                  child: Image.asset(
+                    'assets/images/icon.png',
+                    width: 64,
+                    height: 64,
+                  ),
+                ),
+                Column(
+                  crossAxisAlignment: CrossAxisAlignment.start,
+                  children: [
+                    Text(
+                      appName,
+                      style: Theme.of(context).textTheme.headlineSmall,
+                    ),
+                    Text(
+                      globalState.packageInfo.version,
+                      style: Theme.of(context).textTheme.labelLarge,
+                    )
+                  ],
+                )
+              ],
+            ),
+            const SizedBox(
+              height: 24,
+            ),
+            Text(
+              appLocalizations.desc,
+              style: Theme.of(context).textTheme.bodySmall,
+            ),
+          ],
+        ),
+      ),
+      const SizedBox(
+        height: 12,
+      ),
+      ..._buildContributorsSection(),
+      ..._buildMoreSection(context),
+    ];
+    return Padding(
+      padding: kMaterialListPadding.copyWith(
+        top: 16,
+        bottom: 16,
+      ),
+      child: generateListView(items),
+    );
+  }
+}
+
+class Avatar extends StatelessWidget {
+  final Contributor contributor;
+
+  const Avatar({
+    super.key,
+    required this.contributor,
+  });
+
+  @override
+  Widget build(BuildContext context) {
+    return InkWell(
+      splashColor: Colors.transparent,
+      highlightColor: Colors.transparent,
+      hoverColor: Colors.transparent,
+      child: Column(
+        children: [
+          SizedBox(
+            width: 36,
+            height: 36,
+            child: CircleAvatar(
+              foregroundImage: AssetImage(
+                contributor.avatar,
+              ),
+            ),
+          ),
+          const SizedBox(
+            height: 4,
+          ),
+          Text(
+            contributor.name,
+            style: context.textTheme.bodySmall,
+          )
+        ],
+      ),
+      onTap: () {
+        globalState.openUrl(contributor.link);
+      },
+    );
+  }
 }

lib/fragments/access.dart

@@ -1,4 +1,5 @@
-import 'package:collection/collection.dart';
+import 'dart:convert';
+
 import 'package:fl_clash/enum/enum.dart';
 import 'package:fl_clash/models/models.dart';
 import 'package:fl_clash/plugins/app.dart';
@@ -6,15 +7,9 @@ import 'package:fl_clash/common/common.dart';
 import 'package:fl_clash/state.dart';
 import 'package:fl_clash/widgets/widgets.dart';
 import 'package:flutter/material.dart';
+import 'package:flutter/services.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});
 
@@ -23,198 +18,164 @@ class AccessFragment extends StatefulWidget {
 }
 
 class _AccessFragmentState extends State<AccessFragment> {
-  final packagesListenable = ValueNotifier<List<Package>>([]);
+  List<String> acceptList = [];
+  List<String> rejectList = [];
 
   @override
   void initState() {
     super.initState();
+    _updateInitList();
     WidgetsBinding.instance.addPostFrameCallback((_) {
-      Future.delayed(const Duration(milliseconds: 300), () async {
-        packagesListenable.value = await app?.getPackages() ?? [];
-      });
+      final appState = globalState.appController.appState;
+      if (appState.packages.isEmpty) {
+        Future.delayed(const Duration(milliseconds: 300), () async {
+          appState.packages = await app?.getPackages() ?? [];
+        });
+      }
     });
   }
 
-  @override
-  void dispose() {
-    super.dispose();
-    packagesListenable.dispose();
+  _updateInitList() {
+    final accessControl = globalState.appController.config.accessControl;
+    acceptList = accessControl.acceptList;
+    rejectList = accessControl.rejectList;
   }
 
-  Widget _buildAppProxyModePopup() {
-    final items = [
-      CommonPopupMenuItem(
-        action: AccessControlMode.rejectSelected,
-        label: appLocalizations.blacklistMode,
-      ),
-      CommonPopupMenuItem(
-        action: AccessControlMode.acceptSelected,
-        label: appLocalizations.whitelistMode,
-      ),
-    ];
-    return Selector<Config, AccessControlMode>(
-      selector: (_, config) => config.accessControl.mode,
-      builder: (context, mode, __) {
-        return CommonPopupMenu<AccessControlMode>.radio(
-          icon: Icon(
-            Icons.mode_standby,
-            color: Theme.of(context).colorScheme.onSurfaceVariant,
-          ),
-          items: items,
-          onSelected: (value) {
-            final config = context.read<Config>();
-            config.accessControl = config.accessControl.copyWith(
-              mode: value,
-            );
-          },
-          selectedValue: mode,
-        );
-      },
-    );
-  }
-
-  Widget _buildFilterSystemAppButton() {
-    return Selector<Config, bool>(
-      selector: (_, config) => config.accessControl.isFilterSystemApp,
-      builder: (context, isFilterSystemApp, __) {
-        final tooltip = isFilterSystemApp
-            ? appLocalizations.cancelFilterSystemApp
-            : appLocalizations.filterSystemApp;
-        return IconButton(
-          tooltip: tooltip,
-          onPressed: () {
-            final config = context.read<Config>();
-            config.accessControl = config.accessControl.copyWith(
-              isFilterSystemApp: !isFilterSystemApp,
-            );
-          },
-          icon: isFilterSystemApp
-              ? const Icon(Icons.filter_list_off)
-              : const Icon(Icons.filter_list),
-        );
-      },
-    );
-  }
-
-  Widget _buildSearchButton(List<Package> packages) {
+  Widget _buildSearchButton() {
     return IconButton(
       tooltip: appLocalizations.search,
       onPressed: () {
         showSearch(
           context: context,
           delegate: AccessControlSearchDelegate(
-            packages: packages,
+            acceptList: acceptList,
+            rejectList: rejectList,
           ),
-        ).then((_) => {setState(() {})});
+        ).then((_) => setState(() {
+          _updateInitList();
+        }));
       },
       icon: const Icon(Icons.search),
     );
   }
 
   Widget _buildSelectedAllButton({
-    required bool isAccessControl,
     required bool isSelectedAll,
     required List<String> allValueList,
   }) {
     final tooltip = isSelectedAll
         ? appLocalizations.cancelSelectAll
         : appLocalizations.selectAll;
-    return AbsorbPointer(
-      absorbing: !isAccessControl,
-      child: FloatingActionButton(
-        tooltip: tooltip,
-        onPressed: () {
-          final config = globalState.appController.config;
-          final isAccept =
-              config.accessControl.mode == AccessControlMode.acceptSelected;
-
-          if (isSelectedAll) {
-            config.accessControl = switch (isAccept) {
-              true => config.accessControl.copyWith(
-                  acceptList: [],
-                ),
-              false => config.accessControl.copyWith(
-                  rejectList: [],
-                ),
-            };
-          } else {
-            config.accessControl = switch (isAccept) {
-              true => config.accessControl.copyWith(
-                  acceptList: allValueList,
-                ),
-              false => config.accessControl.copyWith(
-                  rejectList: allValueList,
-                ),
-            };
-          }
-        },
-        child: isSelectedAll
-            ? const Icon(Icons.deselect)
-            : const Icon(Icons.select_all),
-      ),
+    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(
-      valueListenable: packagesListenable,
-      builder: (_, packages, ___) {
-        final accessControl = globalState.appController.config.accessControl;
-        final acceptList = accessControl.acceptList;
-        final rejectList = accessControl.rejectList;
-        final acceptPackages = packages.sorted((a, b) {
-          final isSelectA = acceptList.contains(a.packageName);
-          final isSelectB = acceptList.contains(b.packageName);
-          if (isSelectA && isSelectB) return 0;
-          if (isSelectA) return -1;
-          if (isSelectB) return 1;
-          return 0;
-        });
-        final rejectPackages = packages.sorted((a, b) {
-          final isSelectA = rejectList.contains(a.packageName);
-          final isSelectB = rejectList.contains(b.packageName);
-          if (isSelectA && isSelectB) return 0;
-          if (isSelectA) return -1;
-          if (isSelectB) return 1;
-          return 0;
-        });
-        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 isFilterSystemApp = accessControl.isFilterSystemApp;
-            final accessControlMode = accessControl.mode;
-            final packages =
-                accessControlMode == AccessControlMode.acceptSelected
-                    ? acceptPackages
-                    : rejectPackages;
-            final currentList = accessControl.currentList;
-            final currentPackages = isFilterSystemApp
-                ? packages
-                    .where((element) => element.isSystem == false)
-                    .toList()
-                : packages;
-            final packageNameList =
-                currentPackages.map((e) => e.packageName).toList();
-            final valueList = currentList.intersection(packageNameList);
-            final describe =
-                accessControlMode == AccessControlMode.acceptSelected
-                    ? appLocalizations.accessControlAllowDesc
-                    : appLocalizations.accessControlNotAllowDesc;
-            return DisabledMask(
-              status: !isAccessControl,
-              child: FloatLayout(
-                floatingWidget: FloatWrapper(
-                  child: _buildSelectedAllButton(
-                    isAccessControl: isAccessControl,
-                    isSelectedAll: valueList.length == packageNameList.length,
-                    allValueList: packageNameList,
-                  ),
+  Widget _buildSettingButton() {
+    return IconButton(
+      onPressed: () {
+        showSheet(
+          title: appLocalizations.proxiesSetting,
+          context: context,
+          builder: (_) {
+            return AccessControlWidget(
+              context: context,
+            );
+          },
+        );
+      },
+      icon: const Icon(Icons.tune),
+    );
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    return Selector<Config, bool>(
+      selector: (_, config) => config.isAccessControl,
+      builder: (_, isAccessControl, child) {
+        return Column(
+          mainAxisSize: MainAxisSize.max,
+          children: [
+            Flexible(
+              flex: 0,
+              child: ListItem.switchItem(
+                title: Text(appLocalizations.appAccessControl),
+                delegate: SwitchDelegate(
+                  value: isAccessControl,
+                  onChanged: (isAccessControl) {
+                    final config = context.read<Config>();
+                    config.isAccessControl = isAccessControl;
+                  },
                 ),
+              ),
+            ),
+            const Padding(
+              padding: EdgeInsets.symmetric(horizontal: 16),
+              child: Divider(
+                height: 12,
+              ),
+            ),
+            Flexible(
+              child: child!,
+            ),
+          ],
+        );
+      },
+      child: Selector<AppState, List<Package>>(
+        selector: (_, appState) => appState.packages,
+        builder: (_, packages, ___) {
+          return Selector2<AppState, Config, PackageListSelectorState>(
+            selector: (_, appState, config) => PackageListSelectorState(
+              accessControl: config.accessControl,
+              isAccessControl: config.isAccessControl,
+              packages: appState.packages,
+            ),
+            builder: (context, state, __) {
+              final accessControl = state.accessControl;
+              final isAccessControl = state.isAccessControl;
+              final accessControlMode = accessControl.mode;
+              final packages = state.getList(
+                accessControlMode == AccessControlMode.acceptSelected
+                    ? acceptList
+                    : rejectList,
+              );
+              final currentList = accessControl.currentList;
+              final packageNameList =
+                  packages.map((e) => e.packageName).toList();
+              final valueList = currentList.intersection(packageNameList);
+              final describe =
+                  accessControlMode == AccessControlMode.acceptSelected
+                      ? appLocalizations.accessControlAllowDesc
+                      : appLocalizations.accessControlNotAllowDesc;
+              return DisabledMask(
+                status: !isAccessControl,
                 child: Column(
                   children: [
                     AbsorbPointer(
@@ -285,9 +246,18 @@ class _AccessFragmentState extends State<AccessFragment> {
                               mainAxisAlignment: MainAxisAlignment.end,
                               children: [
                                 Flexible(
-                                    child: _buildSearchButton(currentPackages)),
-                                Flexible(child: _buildFilterSystemAppButton()),
-                                Flexible(child: _buildAppProxyModePopup()),
+                                  child: _buildSearchButton(),
+                                ),
+                                Flexible(
+                                  child: _buildSelectedAllButton(
+                                    isSelectedAll: valueList.length ==
+                                        packageNameList.length,
+                                    allValueList: packageNameList,
+                                  ),
+                                ),
+                                Flexible(
+                                  child: _buildSettingButton(),
+                                ),
                               ],
                             ),
                           ],
@@ -296,92 +266,52 @@ class _AccessFragmentState extends State<AccessFragment> {
                     ),
                     Expanded(
                       flex: 1,
-                      child: FadeBox(
-                        key: const Key("fade_box"),
-                        child: currentPackages.isEmpty
-                            ? const Center(
-                                child: CircularProgressIndicator(),
-                              )
-                            : ListView.builder(
-                                itemCount: currentPackages.length,
-                                itemBuilder: (_, index) {
-                                  final package = currentPackages[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,
-                                        );
-                                      }
-                                    },
-                                  );
-                                },
-                              ),
-                      ),
+                      child: packages.isEmpty
+                          ? const Center(
+                              child: CircularProgressIndicator(),
+                            )
+                          : 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 build(BuildContext context) {
-    return Selector<Config, bool>(
-      selector: (_, config) => config.isAccessControl,
-      builder: (_, isAccessControl, child) {
-        return Column(
-          mainAxisSize: MainAxisSize.max,
-          children: [
-            Flexible(
-              flex: 0,
-              child: ListItem.switchItem(
-                title: Text(appLocalizations.appAccessControl),
-                delegate: SwitchDelegate(
-                  value: isAccessControl,
-                  onChanged: (isAccessControl) {
-                    final config = context.read<Config>();
-                    config.isAccessControl = isAccessControl;
-                  },
-                ),
-              ),
-            ),
-            const Padding(
-              padding: EdgeInsets.symmetric(horizontal: 16),
-              child: Divider(
-                height: 12,
-              ),
-            ),
-            Flexible(
-              child: child!,
-            ),
-          ],
-        );
-      },
-      child: _buildPackageList(),
+              );
+            },
+          );
+        },
+      ),
     );
   }
 }
@@ -448,23 +378,14 @@ class PackageListItem extends StatelessWidget {
 }
 
 class AccessControlSearchDelegate extends SearchDelegate {
-  final List<Package> packages;
+  List<String> acceptList = [];
+  List<String> rejectList = [];
 
   AccessControlSearchDelegate({
-    required this.packages,
+    required this.acceptList,
+    required this.rejectList,
   });
 
-  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 [
@@ -494,26 +415,39 @@ class AccessControlSearchDelegate extends SearchDelegate {
     );
   }
 
-  Widget _packageList(List<Package> packages) {
-    return Selector<Config, PackageListSelectorState>(
-      selector: (_, config) => PackageListSelectorState(
+  Widget _packageList() {
+    final lowQuery = query.toLowerCase();
+    return Selector2<AppState, Config, PackageListSelectorState>(
+      selector: (_, appState, config) => PackageListSelectorState(
+        packages: appState.packages,
         accessControl: config.accessControl,
         isAccessControl: config.isAccessControl,
       ),
       builder: (context, state, __) {
         final accessControl = state.accessControl;
-        final isAccessControl = state.isAccessControl;
         final accessControlMode = accessControl.mode;
+        final packages = state.getList(
+          accessControlMode == AccessControlMode.acceptSelected
+              ? acceptList
+              : rejectList,
+        );
+        final queryPackages = packages
+            .where(
+              (package) =>
+                  package.label.toLowerCase().contains(lowQuery) ||
+                  package.packageName.contains(lowQuery),
+            )
+            .toList();
+        final isAccessControl = state.isAccessControl;
         final currentList = accessControl.currentList;
-        final packageNameList =
-            this.packages.map((e) => e.packageName).toList();
+        final packageNameList = packages.map((e) => e.packageName).toList();
         final valueList = currentList.intersection(packageNameList);
         return DisabledMask(
           status: !isAccessControl,
           child: ListView.builder(
-            itemCount: packages.length,
+            itemCount: queryPackages.length,
             itemBuilder: (_, index) {
-              final package = packages[index];
+              final package = queryPackages[index];
               return PackageListItem(
                 key: Key(package.packageName),
                 package: package,
@@ -551,6 +485,268 @@ class AccessControlSearchDelegate extends SearchDelegate {
 
   @override
   Widget buildSuggestions(BuildContext context) {
-    return _packageList(_results);
+    return _packageList();
+  }
+}
+
+class AccessControlWidget extends StatelessWidget {
+  final BuildContext context;
+
+  const AccessControlWidget({
+    super.key,
+    required this.context,
+  });
+
+  IconData _getIconWithAccessControlMode(AccessControlMode mode) {
+    return switch (mode) {
+      AccessControlMode.acceptSelected => Icons.adjust_outlined,
+      AccessControlMode.rejectSelected => Icons.block_outlined,
+    };
+  }
+
+  String _getTextWithAccessControlMode(AccessControlMode mode) {
+    return switch (mode) {
+      AccessControlMode.acceptSelected => appLocalizations.whitelistMode,
+      AccessControlMode.rejectSelected => appLocalizations.blacklistMode,
+    };
+  }
+
+  String _getTextWithAccessSortType(AccessSortType type) {
+    return switch (type) {
+      AccessSortType.none => appLocalizations.defaultText,
+      AccessSortType.name => appLocalizations.name,
+      AccessSortType.time => appLocalizations.time,
+    };
+  }
+
+  IconData _getIconWithProxiesSortType(AccessSortType type) {
+    return switch (type) {
+      AccessSortType.none => Icons.sort,
+      AccessSortType.name => Icons.sort_by_alpha,
+      AccessSortType.time => Icons.timeline,
+    };
+  }
+
+  String _getTextWithIsFilterSystemApp(bool isFilterSystemApp) {
+    return switch (isFilterSystemApp) {
+      true => appLocalizations.onlyOtherApps,
+      false => appLocalizations.allApps,
+    };
+  }
+
+  List<Widget> _buildModeSetting() {
+    return generateSection(
+      title: appLocalizations.mode,
+      items: [
+        SingleChildScrollView(
+          padding: const EdgeInsets.symmetric(horizontal: 16),
+          scrollDirection: Axis.horizontal,
+          child: Selector<Config, AccessControlMode>(
+            selector: (_, config) => config.accessControl.mode,
+            builder: (_, accessControlMode, __) {
+              return Wrap(
+                spacing: 16,
+                children: [
+                  for (final item in AccessControlMode.values)
+                    SettingInfoCard(
+                      Info(
+                        label: _getTextWithAccessControlMode(item),
+                        iconData: _getIconWithAccessControlMode(item),
+                      ),
+                      isSelected: accessControlMode == item,
+                      onPressed: () {
+                        final config = globalState.appController.config;
+                        config.accessControl = config.accessControl.copyWith(
+                          mode: item,
+                        );
+                      },
+                    )
+                ],
+              );
+            },
+          ),
+        )
+      ],
+    );
+  }
+
+  List<Widget> _buildSortSetting() {
+    return generateSection(
+      title: appLocalizations.sort,
+      items: [
+        SingleChildScrollView(
+          padding: const EdgeInsets.symmetric(horizontal: 16),
+          scrollDirection: Axis.horizontal,
+          child: Selector<Config, AccessSortType>(
+            selector: (_, config) => config.accessControl.sort,
+            builder: (_, accessSortType, __) {
+              return Wrap(
+                spacing: 16,
+                children: [
+                  for (final item in AccessSortType.values)
+                    SettingInfoCard(
+                      Info(
+                        label: _getTextWithAccessSortType(item),
+                        iconData: _getIconWithProxiesSortType(item),
+                      ),
+                      isSelected: accessSortType == item,
+                      onPressed: () {
+                        final config = globalState.appController.config;
+                        config.accessControl = config.accessControl.copyWith(
+                          sort: item,
+                        );
+                      },
+                    ),
+                ],
+              );
+            },
+          ),
+        ),
+      ],
+    );
+  }
+
+  List<Widget> _buildSourceSetting() {
+    return generateSection(
+      title: appLocalizations.source,
+      items: [
+        SingleChildScrollView(
+          padding: const EdgeInsets.symmetric(horizontal: 16),
+          scrollDirection: Axis.horizontal,
+          child: Selector<Config, bool>(
+            selector: (_, config) => config.accessControl.isFilterSystemApp,
+            builder: (_, isFilterSystemApp, __) {
+              return Wrap(
+                spacing: 16,
+                children: [
+                  for (final item in [false, true])
+                    SettingTextCard(
+                      _getTextWithIsFilterSystemApp(item),
+                      isSelected: isFilterSystemApp == item,
+                      onPressed: () {
+                        final config = globalState.appController.config;
+                        config.accessControl = config.accessControl.copyWith(
+                          isFilterSystemApp: item,
+                        );
+                      },
+                    )
+                ],
+              );
+            },
+          ),
+        )
+      ],
+    );
+  }
+
+  _intelligentSelected() async {
+    final appState = globalState.appController.appState;
+    final config = globalState.appController.config;
+    final accessControl = config.accessControl;
+    final packageNames = appState.packages
+        .where(
+          (item) =>
+              accessControl.isFilterSystemApp ? item.isSystem == false : true,
+        )
+        .map((item) => item.packageName);
+    Navigator.of(context).pop();
+    final commonScaffoldState = context.commonScaffoldState;
+    if (commonScaffoldState?.mounted != true) return;
+    final selectedPackageNames =
+        (await commonScaffoldState?.loadingRun<List<String>>(
+              () async {
+                return await app?.getChinaPackageNames() ?? [];
+              },
+            ))
+                ?.toSet() ??
+            {};
+    final acceptList = packageNames
+        .where((item) => !selectedPackageNames.contains(item))
+        .toList();
+    final rejectList = packageNames
+        .where((item) => selectedPackageNames.contains(item))
+        .toList();
+    config.accessControl = accessControl.copyWith(
+      acceptList: acceptList,
+      rejectList: rejectList,
+    );
+  }
+
+  _copyToClipboard() async {
+    await globalState.safeRun(() {
+      final data = globalState.appController.config.accessControl.toJson();
+      Clipboard.setData(
+        ClipboardData(
+          text: json.encode(data),
+        ),
+      );
+    });
+    if (!context.mounted) return;
+    Navigator.of(context).pop();
+  }
+
+  _pasteToClipboard() async {
+    await globalState.safeRun(() async {
+      final config = globalState.appController.config;
+      final data = await Clipboard.getData('text/plain');
+      final text = data?.text;
+      if (text == null) return;
+      config.accessControl = AccessControl.fromJson(
+        json.decode(text),
+      );
+    });
+    if (!context.mounted) return;
+    Navigator.of(context).pop();
+  }
+
+  List<Widget> _buildActionSetting() {
+    return generateSection(
+      title: appLocalizations.action,
+      items: [
+        Padding(
+          padding: const EdgeInsets.symmetric(
+            horizontal: 16,
+          ),
+          child: Wrap(
+            runSpacing: 16,
+            spacing: 16,
+            children: [
+              CommonChip(
+                avatar: const Icon(Icons.auto_awesome),
+                label: appLocalizations.intelligentSelected,
+                onPressed: _intelligentSelected,
+              ),
+              CommonChip(
+                avatar: const Icon(Icons.paste),
+                label: appLocalizations.clipboardImport,
+                onPressed: _pasteToClipboard,
+              ),
+              CommonChip(
+                avatar: const Icon(Icons.content_copy),
+                label: appLocalizations.clipboardExport,
+                onPressed: _copyToClipboard,
+              )
+            ],
+          ),
+        )
+      ],
+    );
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    return Padding(
+      padding: const EdgeInsets.only(bottom: 32),
+      child: Column(
+        mainAxisSize: MainAxisSize.min,
+        crossAxisAlignment: CrossAxisAlignment.start,
+        children: [
+          ..._buildModeSetting(),
+          ..._buildSortSetting(),
+          ..._buildSourceSetting(),
+          ..._buildActionSetting(),
+        ],
+      ),
+    );
   }
 }

lib/fragments/backup_and_recovery.dart

@@ -1,3 +1,5 @@
+import 'dart:typed_data';
+
 import 'package:fl_clash/common/common.dart';
 import 'package:fl_clash/common/dav_client.dart';
 import 'package:fl_clash/enum/enum.dart';
@@ -10,16 +12,9 @@ import 'package:fl_clash/widgets/text.dart';
 import 'package:flutter/material.dart';
 import 'package:provider/provider.dart';
 
-class BackupAndRecovery extends StatefulWidget {
+class BackupAndRecovery extends StatelessWidget {
   const BackupAndRecovery({super.key});
 
-  @override
-  State<BackupAndRecovery> createState() => _BackupAndRecoveryState();
-}
-
-class _BackupAndRecoveryState extends State<BackupAndRecovery> {
-  DAVClient? _client;
-
   _showAddWebDAV(DAV? dav) async {
     await globalState.showCommonDialog<String>(
       child: WebDAVFormDialog(
@@ -28,11 +23,15 @@ class _BackupAndRecoveryState extends State<BackupAndRecovery> {
     );
   }
 
-  _backup() async {
+  _backupOnWebDAV(BuildContext context, DAVClient client) async {
     final commonScaffoldState = context.commonScaffoldState;
-    final res = await commonScaffoldState?.loadingRun<bool>(() async {
-      return await _client?.backup();
-    });
+    final res = await commonScaffoldState?.loadingRun<bool>(
+      () async {
+        final backupData = await globalState.appController.backupData();
+        return await client.backup(Uint8List.fromList(backupData));
+      },
+      title: appLocalizations.backup,
+    );
     if (res != true) return;
     globalState.showMessage(
       title: appLocalizations.backup,
@@ -40,11 +39,20 @@ class _BackupAndRecoveryState extends State<BackupAndRecovery> {
     );
   }
 
-  _recovery(RecoveryOption recoveryOption) async {
+  _recoveryOnWebDAV(
+    BuildContext context,
+    DAVClient client,
+    RecoveryOption recoveryOption,
+  ) async {
     final commonScaffoldState = context.commonScaffoldState;
-    final res = await commonScaffoldState?.loadingRun<bool>(() async {
-      return await _client?.recovery(recoveryOption: recoveryOption);
-    });
+    final res = await commonScaffoldState?.loadingRun<bool>(
+      () async {
+        final data = await client.recovery();
+        await globalState.appController.recoveryData(data, recoveryOption);
+        return true;
+      },
+      title: appLocalizations.recovery,
+    );
     if (res != true) return;
     globalState.showMessage(
       title: appLocalizations.recovery,
@@ -52,12 +60,66 @@ class _BackupAndRecoveryState extends State<BackupAndRecovery> {
     );
   }
 
-  _handleRecovery() async {
+  _handleRecoveryOnWebDAV(BuildContext context, DAVClient client) async {
     final recoveryOption = await globalState.showCommonDialog<RecoveryOption>(
       child: const RecoveryOptionsDialog(),
     );
-    if (recoveryOption == null) return;
-    _recovery(recoveryOption);
+    if (recoveryOption == null || !context.mounted) return;
+    _recoveryOnWebDAV(context, client, recoveryOption);
+  }
+
+  _backupOnLocal(BuildContext context) async {
+    final commonScaffoldState = context.commonScaffoldState;
+    final res = await commonScaffoldState?.loadingRun<bool>(
+      () async {
+        final backupData = await globalState.appController.backupData();
+        final value =  await picker.saveFile(
+          other.getBackupFileName(),
+          Uint8List.fromList(backupData),
+        );
+        if(value == null) return false;
+        return true;
+      },
+      title: appLocalizations.backup,
+    );
+    if (res != true) return;
+    globalState.showMessage(
+      title: appLocalizations.backup,
+      message: TextSpan(text: appLocalizations.backupSuccess),
+    );
+  }
+
+  _recoveryOnLocal(
+    BuildContext context,
+    RecoveryOption recoveryOption,
+  ) async {
+    final file = await picker.pickerFile();
+    final data = file?.bytes;
+    if (data == null || !context.mounted) return;
+    final commonScaffoldState = context.commonScaffoldState;
+    final res = await commonScaffoldState?.loadingRun<bool>(
+      () async {
+        await globalState.appController.recoveryData(
+          List<int>.from(data),
+          recoveryOption,
+        );
+        return true;
+      },
+      title: appLocalizations.recovery,
+    );
+    if (res != true) return;
+    globalState.showMessage(
+      title: appLocalizations.recovery,
+      message: TextSpan(text: appLocalizations.recoverySuccess),
+    );
+  }
+
+  _handleRecoveryOnLocal(BuildContext context) async {
+    final recoveryOption = await globalState.showCommonDialog<RecoveryOption>(
+      child: const RecoveryOptionsDialog(),
+    );
+    if (recoveryOption == null || !context.mounted) return;
+    _recoveryOnLocal(context, recoveryOption);
   }
 
   @override
@@ -65,12 +127,11 @@ class _BackupAndRecoveryState extends State<BackupAndRecovery> {
     return Selector<Config, DAV?>(
       selector: (_, config) => config.dav,
       builder: (_, dav, __) {
-        if (dav == null) {
-          return ListView(
-            children: [
-              ListHeader(
-                title: appLocalizations.account,
-              ),
+        final client = dav != null ? DAVClient(dav) : null;
+        return ListView(
+          children: [
+            ListHeader(title: appLocalizations.remote),
+            if (dav == null)
               ListItem(
                 leading: const Icon(Icons.account_box),
                 title: Text(appLocalizations.noInfo),
@@ -83,96 +144,95 @@ class _BackupAndRecoveryState extends State<BackupAndRecovery> {
                     appLocalizations.bind,
                   ),
                 ),
+              )
+            else ...[
+              ListItem(
+                leading: const Icon(Icons.account_box),
+                title: TooltipText(
+                  text: Text(
+                    dav.user,
+                    maxLines: 1,
+                    overflow: TextOverflow.ellipsis,
+                  ),
+                ),
+                subtitle: Padding(
+                  padding: const EdgeInsets.symmetric(vertical: 4),
+                  child: Row(
+                    crossAxisAlignment: CrossAxisAlignment.center,
+                    children: [
+                      Text(appLocalizations.connectivity),
+                      FutureBuilder<bool>(
+                        future: client!.pingCompleter.future,
+                        builder: (_, snapshot) {
+                          return Center(
+                            child: FadeBox(
+                              child: snapshot.connectionState ==
+                                      ConnectionState.waiting
+                                  ? const SizedBox(
+                                      width: 12,
+                                      height: 12,
+                                      child: CircularProgressIndicator(
+                                        strokeWidth: 1,
+                                      ),
+                                    )
+                                  : Container(
+                                      decoration: BoxDecoration(
+                                        shape: BoxShape.circle,
+                                        color: snapshot.data == true
+                                            ? Colors.green
+                                            : Colors.red,
+                                      ),
+                                      width: 12,
+                                      height: 12,
+                                    ),
+                            ),
+                          );
+                        },
+                      ),
+                    ],
+                  ),
+                ),
+                trailing: FilledButton.tonal(
+                  onPressed: () {
+                    _showAddWebDAV(dav);
+                  },
+                  child: Text(
+                    appLocalizations.edit,
+                  ),
+                ),
+              ),
+              const SizedBox(
+                height: 4,
+              ),
+              ListItem(
+                onTap: () {
+                  _backupOnWebDAV(context, client);
+                },
+                title: Text(appLocalizations.backup),
+                subtitle: Text(appLocalizations.remoteBackupDesc),
+              ),
+              ListItem(
+                onTap: () {
+                  _handleRecoveryOnWebDAV(context, client);
+                },
+                title: Text(appLocalizations.recovery),
+                subtitle: Text(appLocalizations.remoteRecoveryDesc),
               ),
             ],
-          );
-        }
-        _client = DAVClient(dav);
-        final pingFuture = _client!.pingCompleter.future;
-        return ListView(
-          children: [
-            ListHeader(title: appLocalizations.account),
+            ListHeader(title: appLocalizations.local),
             ListItem(
-              leading: const Icon(Icons.account_box),
-              title: TooltipText(
-                text: Text(
-                  dav.user,
-                  maxLines: 1,
-                  overflow: TextOverflow.ellipsis,
-                ),
-              ),
-              subtitle: Padding(
-                padding: const EdgeInsets.symmetric(vertical: 4),
-                child: Row(
-                  crossAxisAlignment: CrossAxisAlignment.center,
-                  children: [
-                    Text(appLocalizations.connectivity),
-                    FutureBuilder<bool>(
-                      future: pingFuture,
-                      builder: (_, snapshot) {
-                        return Center(
-                          child: FadeBox(
-                            key: const Key("fade_box_1"),
-                            child: snapshot.connectionState ==
-                                    ConnectionState.waiting
-                                ? const SizedBox(
-                                    width: 12,
-                                    height: 12,
-                                    child: CircularProgressIndicator(
-                                      strokeWidth: 1,
-                                    ),
-                                  )
-                                : Container(
-                                    decoration: BoxDecoration(
-                                      shape: BoxShape.circle,
-                                      color: snapshot.data == true
-                                          ? Colors.green
-                                          : Colors.red,
-                                    ),
-                                    width: 12,
-                                    height: 12,
-                                  ),
-                          ),
-                        );
-                      },
-                    ),
-                  ],
-                ),
-              ),
-              trailing: FilledButton.tonal(
-                onPressed: () {
-                  _showAddWebDAV(dav);
-                },
-                child: Text(
-                  appLocalizations.edit,
-                ),
-              ),
-            ),
-            FutureBuilder<bool>(
-              future: pingFuture,
-              builder: (_, snapshot) {
-                return FadeBox(
-                  key: const Key("fade_box_2"),
-                  child: snapshot.data == true
-                      ? Column(
-                          children: [
-                            ListHeader(
-                                title: appLocalizations.backupAndRecovery),
-                            ListItem(
-                              onTab: _backup,
-                              title: Text(appLocalizations.backup),
-                              subtitle: Text(appLocalizations.backupDesc),
-                            ),
-                            ListItem(
-                              onTab: _handleRecovery,
-                              title: Text(appLocalizations.recovery),
-                              subtitle: Text(appLocalizations.recoveryDesc),
-                            ),
-                          ],
-                        )
-                      : Container(),
-                );
+              onTap: () {
+                _backupOnLocal(context);
               },
+              title: Text(appLocalizations.backup),
+              subtitle: Text(appLocalizations.localBackupDesc),
+            ),
+            ListItem(
+              onTap: () {
+                _handleRecoveryOnLocal(context);
+              },
+              title: Text(appLocalizations.recovery),
+              subtitle: Text(appLocalizations.localRecoveryDesc),
             ),
           ],
         );
@@ -181,6 +241,50 @@ class _BackupAndRecoveryState extends State<BackupAndRecovery> {
   }
 }
 
+class RecoveryOptionsDialog extends StatefulWidget {
+  const RecoveryOptionsDialog({super.key});
+
+  @override
+  State<RecoveryOptionsDialog> createState() => _RecoveryOptionsDialogState();
+}
+
+class _RecoveryOptionsDialogState extends State<RecoveryOptionsDialog> {
+  _handleOnTab(RecoveryOption? value) {
+    if (value == null) return;
+    Navigator.of(context).pop(value);
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    return AlertDialog(
+      title: Text(appLocalizations.recovery),
+      contentPadding: const EdgeInsets.symmetric(
+        horizontal: 8,
+        vertical: 16,
+      ),
+      content: SizedBox(
+        width: 250,
+        child: Wrap(
+          children: [
+            ListItem(
+              onTap: () {
+                _handleOnTab(RecoveryOption.onlyProfiles);
+              },
+              title: Text(appLocalizations.recoveryProfiles),
+            ),
+            ListItem(
+              onTap: () {
+                _handleOnTab(RecoveryOption.all);
+              },
+              title: Text(appLocalizations.recoveryAll),
+            )
+          ],
+        ),
+      ),
+    );
+  }
+}
+
 class WebDAVFormDialog extends StatefulWidget {
   final DAV? dav;
 
@@ -239,7 +343,7 @@ class _WebDAVFormDialogState extends State<WebDAVFormDialog> {
             children: [
               TextFormField(
                 controller: uriController,
-                maxLines: 2,
+                maxLines: 5,
                 minLines: 1,
                 decoration: InputDecoration(
                   prefixIcon: const Icon(Icons.link),
@@ -314,47 +418,3 @@ class _WebDAVFormDialogState extends State<WebDAVFormDialog> {
     );
   }
 }
-
-class RecoveryOptionsDialog extends StatefulWidget {
-  const RecoveryOptionsDialog({super.key});
-
-  @override
-  State<RecoveryOptionsDialog> createState() => _RecoveryOptionsDialogState();
-}
-
-class _RecoveryOptionsDialogState extends State<RecoveryOptionsDialog> {
-  _handleOnTab(RecoveryOption? value) {
-    if (value == null) return;
-    Navigator.of(context).pop(value);
-  }
-
-  @override
-  Widget build(BuildContext context) {
-    return AlertDialog(
-      title: Text(appLocalizations.recovery),
-      contentPadding: const EdgeInsets.symmetric(
-        horizontal: 8,
-        vertical: 16,
-      ),
-      content: SizedBox(
-        width: 250,
-        child: Wrap(
-          children: [
-            ListItem(
-              onTab: () {
-                _handleOnTab(RecoveryOption.onlyProfiles);
-              },
-              title: Text(appLocalizations.recoveryProfiles),
-            ),
-            ListItem(
-              onTab: () {
-                _handleOnTab(RecoveryOption.all);
-              },
-              title: Text(appLocalizations.recoveryAll),
-            )
-          ],
-        ),
-      ),
-    );
-  }
-}

lib/fragments/config.dart

@@ -137,11 +137,40 @@ class _ConfigFragmentState extends State<ConfigFragment> {
     }
   }
 
+  _updateKeepAliveInterval(int keepAliveInterval) async {
+    final newKeepAliveIntervalString =
+        await globalState.showCommonDialog<String>(
+      child: KeepAliveIntervalFormDialog(
+        keepAliveInterval: keepAliveInterval,
+      ),
+    );
+    if (newKeepAliveIntervalString != null &&
+        newKeepAliveIntervalString != "$keepAliveInterval" &&
+        mounted) {
+      try {
+        final newKeepAliveInterval = int.parse(newKeepAliveIntervalString);
+        if (newKeepAliveInterval <= 0) {
+          throw "Invalid keepAliveInterval";
+        }
+        globalState.appController.clashConfig.keepAliveInterval =
+            newKeepAliveInterval;
+        globalState.appController.updateClashConfigDebounce();
+      } catch (e) {
+        globalState.showMessage(
+          title: appLocalizations.testUrl,
+          message: TextSpan(
+            text: e.toString(),
+          ),
+        );
+      }
+    }
+  }
+
   List<Widget> _buildAppSection() {
     return generateSection(
       title: appLocalizations.app,
       items: [
-        if (Platform.isAndroid)
+        if (Platform.isAndroid) ...[
           Selector<Config, bool>(
             selector: (_, config) => config.allowBypass,
             builder: (_, allowBypass, __) {
@@ -159,7 +188,6 @@ class _ConfigFragmentState extends State<ConfigFragment> {
               );
             },
           ),
-        if (Platform.isAndroid)
           Selector<Config, bool>(
             selector: (_, config) => config.systemProxy,
             builder: (_, systemProxy, __) {
@@ -177,24 +205,59 @@ class _ConfigFragmentState extends State<ConfigFragment> {
               );
             },
           ),
+        ],
         Selector<Config, bool>(
-          selector: (_, config) => config.isCompatible,
-          builder: (_, isCompatible, __) {
+          selector: (_, config) => config.isCloseConnections,
+          builder: (_, isCloseConnections, __) {
             return ListItem.switchItem(
-              leading: const Icon(Icons.expand_outlined),
-              title: Text(appLocalizations.compatible),
-              subtitle: Text(appLocalizations.compatibleDesc),
+              leading: const Icon(Icons.auto_delete_outlined),
+              title: Text(appLocalizations.autoCloseConnections),
+              subtitle: Text(appLocalizations.autoCloseConnectionsDesc),
               delegate: SwitchDelegate(
-                value: isCompatible,
+                value: isCloseConnections,
                 onChanged: (bool value) async {
                   final appController = globalState.appController;
-                  appController.config.isCompatible = value;
-                  await appController.applyProfile();
+                  appController.config.isCloseConnections = value;
                 },
               ),
             );
           },
         ),
+        Selector<Config, bool>(
+          selector: (_, config) => config.onlyProxy,
+          builder: (_, onlyProxy, __) {
+            return ListItem.switchItem(
+              leading: const Icon(Icons.data_usage_outlined),
+              title: Text(appLocalizations.onlyStatisticsProxy),
+              subtitle: Text(appLocalizations.onlyStatisticsProxyDesc),
+              delegate: SwitchDelegate(
+                value: onlyProxy,
+                onChanged: (bool value) async {
+                  final appController = globalState.appController;
+                  appController.config.onlyProxy = value;
+                },
+              ),
+            );
+          },
+        ),
+        // Selector<Config, bool>(
+        //   selector: (_, config) => config.isCompatible,
+        //   builder: (_, isCompatible, __) {
+        //     return ListItem.switchItem(
+        //       leading: const Icon(Icons.expand_outlined),
+        //       title: Text(appLocalizations.compatible),
+        //       subtitle: Text(appLocalizations.compatibleDesc),
+        //       delegate: SwitchDelegate(
+        //         value: isCompatible,
+        //         onChanged: (bool value) async {
+        //           final appController = globalState.appController;
+        //           appController.config.isCompatible = value;
+        //           await appController.applyProfile();
+        //         },
+        //       ),
+        //     );
+        //   },
+        // ),
       ],
     );
   }
@@ -210,7 +273,7 @@ class _ConfigFragmentState extends State<ConfigFragment> {
               leading: const Icon(Icons.info_outline),
               title: Text(appLocalizations.logLevel),
               subtitle: Text(value.name),
-              onTab: () {
+              onTap: () {
                 _showLogLevelDialog(value);
               },
             );
@@ -223,12 +286,25 @@ class _ConfigFragmentState extends State<ConfigFragment> {
               leading: const Icon(Icons.computer_outlined),
               title: const Text("UA"),
               subtitle: Text(value ?? appLocalizations.defaultText),
-              onTab: () {
+              onTap: () {
                 _showUaDialog(value);
               },
             );
           },
         ),
+        Selector<ClashConfig, int>(
+          selector: (_, config) => config.keepAliveInterval,
+          builder: (_, value, __) {
+            return ListItem(
+              leading: const Icon(Icons.timer_outlined),
+              title: Text(appLocalizations.keepAliveIntervalDesc),
+              subtitle: Text("$value ${appLocalizations.seconds}"),
+              onTap: () {
+                _updateKeepAliveInterval(value);
+              },
+            );
+          },
+        ),
         Selector<Config, String>(
           selector: (_, config) => config.testUrl,
           builder: (_, value, __) {
@@ -236,7 +312,7 @@ class _ConfigFragmentState extends State<ConfigFragment> {
               leading: const Icon(Icons.timeline),
               title: Text(appLocalizations.testUrl),
               subtitle: Text(value),
-              onTab: () {
+              onTap: () {
                 _modifyTestUrl(value);
               },
             );
@@ -246,7 +322,7 @@ class _ConfigFragmentState extends State<ConfigFragment> {
           selector: (_, clashConfig) => clashConfig.mixedPort,
           builder: (_, mixedPort, __) {
             return ListItem(
-              onTab: () {
+              onTap: () {
                 _modifyMixedPort(mixedPort);
               },
               leading: const Icon(Icons.adjust_outlined),
@@ -555,3 +631,64 @@ class _TestUrlFormDialogState extends State<TestUrlFormDialog> {
     );
   }
 }
+
+class KeepAliveIntervalFormDialog extends StatefulWidget {
+  final int keepAliveInterval;
+
+  const KeepAliveIntervalFormDialog({
+    super.key,
+    required this.keepAliveInterval,
+  });
+
+  @override
+  State<KeepAliveIntervalFormDialog> createState() =>
+      _KeepAliveIntervalFormDialogState();
+}
+
+class _KeepAliveIntervalFormDialogState
+    extends State<KeepAliveIntervalFormDialog> {
+  late TextEditingController keepAliveIntervalController;
+
+  @override
+  void initState() {
+    super.initState();
+    keepAliveIntervalController =
+        TextEditingController(text: "${widget.keepAliveInterval}");
+  }
+
+  _handleUpdate() async {
+    final keepAliveInterval = keepAliveIntervalController.value.text;
+    if (keepAliveInterval.isEmpty) return;
+    Navigator.of(context).pop<String>(keepAliveInterval);
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    return AlertDialog(
+      title: Text(appLocalizations.keepAliveIntervalDesc),
+      content: SizedBox(
+        width: 300,
+        child: Wrap(
+          runSpacing: 16,
+          children: [
+            TextField(
+              maxLines: 1,
+              minLines: 1,
+              controller: keepAliveIntervalController,
+              decoration: InputDecoration(
+                border: const OutlineInputBorder(),
+                suffixText: appLocalizations.seconds,
+              ),
+            ),
+          ],
+        ),
+      ),
+      actions: [
+        TextButton(
+          onPressed: _handleUpdate,
+          child: Text(appLocalizations.submit),
+        )
+      ],
+    );
+  }
+}

lib/fragments/connections.dart

@@ -1,11 +1,9 @@
 import 'dart:async';
-import 'dart:io';
 
 import 'package:fl_clash/clash/clash.dart';
 import 'package:fl_clash/common/common.dart';
 import 'package:fl_clash/enum/enum.dart';
 import 'package:fl_clash/models/models.dart';
-import 'package:fl_clash/plugins/app.dart';
 import 'package:fl_clash/widgets/widgets.dart';
 import 'package:flutter/material.dart';
 import 'package:provider/provider.dart';
@@ -39,8 +37,9 @@ class _ConnectionsFragmentState extends State<ConnectionsFragment> {
       timer = Timer.periodic(
         const Duration(seconds: 1),
         (timer) {
-          connectionsNotifier.value = connectionsNotifier.value
-              .copyWith(connections: clashCore.getConnections());
+          connectionsNotifier.value = connectionsNotifier.value.copyWith(
+            connections: clashCore.getConnections(),
+          );
         },
       );
     });
@@ -65,7 +64,16 @@ class _ConnectionsFragmentState extends State<ConnectionsFragment> {
           ),
           const SizedBox(
             width: 8,
-          )
+          ),
+          IconButton(
+            onPressed: () {
+              clashCore.closeConnections();
+              connectionsNotifier.value = connectionsNotifier.value.copyWith(
+                connections: clashCore.getConnections(),
+              );
+            },
+            icon: const Icon(Icons.delete_sweep_outlined),
+          ),
         ];
       },
     );
@@ -92,7 +100,7 @@ class _ConnectionsFragmentState extends State<ConnectionsFragment> {
   }
 
   _handleBlockConnection(String id) {
-    clashCore.closeConnections(id);
+    clashCore.closeConnection(id);
     connectionsNotifier.value = connectionsNotifier.value
         .copyWith(connections: clashCore.getConnections());
   }
@@ -162,7 +170,12 @@ class _ConnectionsFragmentState extends State<ConnectionsFragment> {
                       key: Key(connection.id),
                       connection: connection,
                       onClick: _addKeyword,
-                      onBlock: _handleBlockConnection,
+                      trailing: IconButton(
+                        icon: const Icon(Icons.block),
+                        onPressed: () {
+                          _handleBlockConnection(connection.id);
+                        },
+                      ),
                     );
                   },
                   separatorBuilder: (BuildContext context, int index) {
@@ -181,113 +194,6 @@ class _ConnectionsFragmentState extends State<ConnectionsFragment> {
   }
 }
 
-class ConnectionItem extends StatelessWidget {
-  final Connection connection;
-  final Function(String)? onClick;
-  final Function(String)? onBlock;
-
-  const ConnectionItem({
-    super.key,
-    required this.connection,
-    this.onClick,
-    this.onBlock,
-  });
-
-  Future<ImageProvider?> _getPackageIcon(Connection connection) async {
-    return await app?.getPackageIcon(connection.metadata.process);
-  }
-
-  String _getRequestText(Metadata metadata) {
-    var text = "${metadata.network}://";
-    final ips = [
-      metadata.host,
-      metadata.destinationIP,
-    ].where((ip) => ip.isNotEmpty);
-    text += ips.join("/");
-    text += ":${metadata.destinationPort}";
-    return text;
-  }
-
-  String _getSourceText(Connection connection) {
-    final metadata = connection.metadata;
-    if (metadata.process.isEmpty) {
-      return connection.start.lastUpdateTimeDesc;
-    }
-    return "${metadata.process} · ${connection.start.lastUpdateTimeDesc}";
-  }
-
-  @override
-  Widget build(BuildContext context) {
-    return ListItem(
-      padding: const EdgeInsets.symmetric(
-        horizontal: 16,
-        vertical: 4,
-      ),
-      tileTitleAlignment: ListTileTitleAlignment.titleHeight,
-      leading: Platform.isAndroid
-          ? Container(
-              margin: const EdgeInsets.only(top: 4),
-              width: 48,
-              height: 48,
-              child: FutureBuilder<ImageProvider?>(
-                future: _getPackageIcon(connection),
-                builder: (_, snapshot) {
-                  if (!snapshot.hasData && snapshot.data == null) {
-                    return Container();
-                  } else {
-                    return Image(
-                      image: snapshot.data!,
-                      gaplessPlayback: true,
-                      width: 48,
-                      height: 48,
-                    );
-                  }
-                },
-              ),
-            )
-          : null,
-      title: Text(
-        _getRequestText(connection.metadata),
-      ),
-      subtitle: Column(
-        crossAxisAlignment: CrossAxisAlignment.start,
-        children: [
-          const SizedBox(
-            height: 8,
-          ),
-          Text(
-            _getSourceText(connection),
-          ),
-          const SizedBox(
-            height: 8,
-          ),
-          Wrap(
-            runSpacing: 6,
-            spacing: 6,
-            children: [
-              for (final chain in connection.chains)
-                CommonChip(
-                  label: chain,
-                  onPressed: () {
-                    if (onClick == null) return;
-                    onClick!(chain);
-                  },
-                ),
-            ],
-          ),
-        ],
-      ),
-      trailing: IconButton(
-        icon: const Icon(Icons.block),
-        onPressed: () {
-          if (onBlock == null) return;
-          onBlock!(connection.id);
-        },
-      ),
-    );
-  }
-}
-
 class ConnectionsSearchDelegate extends SearchDelegate {
   ValueNotifier<ConnectionsAndKeywords> connectionsNotifier;
 
@@ -333,11 +239,11 @@ class ConnectionsSearchDelegate extends SearchDelegate {
     );
   }
 
-
   _handleBlockConnection(String id) {
-    clashCore.closeConnections(id);
-    connectionsNotifier.value = connectionsNotifier.value
-        .copyWith(connections: clashCore.getConnections());
+    clashCore.closeConnection(id);
+    connectionsNotifier.value = connectionsNotifier.value.copyWith(
+      connections: clashCore.getConnections(),
+    );
   }
 
   @override
@@ -417,7 +323,12 @@ class ConnectionsSearchDelegate extends SearchDelegate {
                     key: Key(connection.id),
                     connection: connection,
                     onClick: _addKeyword,
-                    onBlock: _handleBlockConnection,
+                    trailing: IconButton(
+                      icon: const Icon(Icons.block),
+                      onPressed: () {
+                        _handleBlockConnection(connection.id);
+                      },
+                    ),
                   );
                 },
                 separatorBuilder: (BuildContext context, int index) {

lib/fragments/dashboard/dashboard.dart

@@ -1,10 +1,10 @@
-import 'package:fl_clash/enum/enum.dart';
+import 'dart:math';
+
 import 'package:fl_clash/fragments/dashboard/intranet_ip.dart';
 import 'package:fl_clash/models/models.dart';
 import 'package:flutter/material.dart';
 import 'package:fl_clash/widgets/widgets.dart';
 import 'package:provider/provider.dart';
-
 import 'network_detection.dart';
 import 'outbound_mode.dart';
 import 'start_button.dart';
@@ -29,34 +29,35 @@ class _DashboardFragmentState extends State<DashboardFragment> {
         alignment: Alignment.topCenter,
         child: SingleChildScrollView(
           padding: const EdgeInsets.all(16),
-          child: Selector<AppState, ViewMode>(
-            selector: (_, appState) => appState.viewMode,
-            builder: (_, viewMode, ___) {
-              final isDesktop = viewMode == ViewMode.desktop;
+          child: Selector<AppState, double>(
+            selector: (_, appState) => appState.viewWidth,
+            builder: (_, viewWidth, ___) {
+              // final viewMode = other.getViewMode(viewWidth);
+              // final isDesktop = viewMode == ViewMode.desktop;
               return Grid(
-                crossAxisCount: 12,
+                crossAxisCount: max(4 * ((viewWidth / 350).ceil()), 8),
                 crossAxisSpacing: 16,
                 mainAxisSpacing: 16,
-                children: [
+                children: const [
                   GridItem(
-                    crossAxisCellCount: isDesktop ? 8 : 12,
-                    child: const NetworkSpeed(),
+                    crossAxisCellCount: 8,
+                    child: NetworkSpeed(),
                   ),
                   GridItem(
-                    crossAxisCellCount: isDesktop ? 4 : 6,
-                    child: const OutboundMode(),
+                    crossAxisCellCount: 4,
+                    child: OutboundMode(),
                   ),
                   GridItem(
-                    crossAxisCellCount: isDesktop ? 4 : 6,
-                    child: const NetworkDetection(),
+                    crossAxisCellCount: 4,
+                    child: NetworkDetection(),
                   ),
                   GridItem(
-                    crossAxisCellCount: isDesktop ? 4 : 6,
-                    child: const TrafficUsage(),
+                    crossAxisCellCount: 4,
+                    child: TrafficUsage(),
                   ),
                   GridItem(
-                    crossAxisCellCount: isDesktop ? 4 : 6,
-                    child: const IntranetIP(),
+                    crossAxisCellCount: 4,
+                    child: IntranetIP(),
                   ),
                 ],
               );

lib/fragments/dashboard/network_detection.dart

@@ -1,4 +1,3 @@
-import 'package:country_flags/country_flags.dart';
 import 'package:dio/dio.dart';
 import 'package:fl_clash/common/common.dart';
 import 'package:fl_clash/models/models.dart';
@@ -18,48 +17,44 @@ class _NetworkDetectionState extends State<NetworkDetection> {
   final ipInfoNotifier = ValueNotifier<IpInfo?>(null);
   final timeoutNotifier = ValueNotifier<bool>(false);
   bool? _preIsStart;
-  CancelToken? cancelToken;
   Function? _checkIpDebounce;
+  CancelToken? cancelToken;
 
-  _checkIp(
-    bool isInit,
-    bool isStart,
-  ) async {
+  _checkIp() async {
+    final appState = globalState.appController.appState;
+    final isInit = appState.isInit;
+    final isStart = appState.isStart;
     if (!isInit) return;
     timeoutNotifier.value = false;
     if (_preIsStart == false && _preIsStart == isStart) return;
+    _preIsStart = isStart;
+    ipInfoNotifier.value = null;
     if (cancelToken != null) {
       cancelToken!.cancel();
+      _preIsStart = null;
+      timeoutNotifier.value == false;
       cancelToken = null;
     }
-    ipInfoNotifier.value = null;
-    final ipInfo = await request.checkIp(cancelToken);
+    cancelToken = CancelToken();
+    final ipInfo = await request.checkIp(cancelToken: cancelToken);
     if (ipInfo == null) {
       timeoutNotifier.value = true;
       return;
-    } else {
-      timeoutNotifier.value = false;
     }
-    _preIsStart = isStart;
+    timeoutNotifier.value = false;
     ipInfoNotifier.value = ipInfo;
   }
 
   _checkIpContainer(Widget child) {
-    _checkIpDebounce = debounce(_checkIp);
-    return Selector2<AppState, Config, CheckIpSelectorState>(
-      selector: (_, appState, config) {
-        return CheckIpSelectorState(
-          isInit: appState.isInit,
-          selectedMap: appState.selectedMap,
-          isStart: appState.isStart,
-          checkIpNum: appState.checkIpNum,
-        );
+    return Selector<AppState, num>(
+      selector: (_, appState) {
+        return appState.checkIpNum;
       },
-      builder: (_, state, __) {
+      builder: (_, checkIpNum, child) {
         if (_checkIpDebounce != null) {
-          _checkIpDebounce!([state.isInit, state.isStart]);
+          _checkIpDebounce!();
         }
-        return child;
+        return child!;
       },
       child: child,
     );
@@ -72,8 +67,19 @@ class _NetworkDetectionState extends State<NetworkDetection> {
     timeoutNotifier.dispose();
   }
 
+  String countryCodeToEmoji(String countryCode) {
+    final String code = countryCode.toUpperCase();
+    if (code.length != 2) {
+      return countryCode;
+    }
+    final int firstLetter = code.codeUnitAt(0) - 0x41 + 0x1F1E6;
+    final int secondLetter = code.codeUnitAt(1) - 0x41 + 0x1F1E6;
+    return String.fromCharCode(firstLetter) + String.fromCharCode(secondLetter);
+  }
+
   @override
   Widget build(BuildContext context) {
+    _checkIpDebounce ??= debounce(_checkIp);
     return _checkIpContainer(
       ValueListenableBuilder<IpInfo?>(
         valueListenable: ipInfoNotifier,
@@ -99,10 +105,19 @@ class _NetworkDetectionState extends State<NetworkDetection> {
                           flex: 1,
                           child: FadeBox(
                             child: ipInfo != null
-                                ? CountryFlag.fromCountryCode(
-                                    ipInfo.countryCode,
-                                    width: 24,
-                                    height: 24,
+                                ? Container(
+                                    alignment: Alignment.centerLeft,
+                                    height: globalState.appController.measure
+                                        .titleMediumHeight,
+                                    child: Text(
+                                      countryCodeToEmoji(ipInfo.countryCode),
+                                      style: Theme.of(context)
+                                          .textTheme
+                                          .titleLarge
+                                          ?.copyWith(
+                                            fontFamily: "Twemoji",
+                                          ),
+                                    ),
                                   )
                                 : ValueListenableBuilder(
                                     valueListenable: timeoutNotifier,

lib/fragments/fragments.dart

@@ -1,4 +1,4 @@
-export 'proxies.dart';
+export 'proxies/proxies.dart';
 export 'dashboard/dashboard.dart';
 export 'tools.dart';
 export 'profiles/profiles.dart';

lib/fragments/logs.dart

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

lib/fragments/profiles/add_profile.dart

@@ -48,19 +48,19 @@ class AddProfile extends StatelessWidget {
             leading: const Icon(Icons.qr_code),
             title: Text(appLocalizations.qrcode),
             subtitle: Text(appLocalizations.qrcodeDesc),
-            onTab: _toScan,
+            onTap: _toScan,
           ),
         ListItem(
           leading: const Icon(Icons.upload_file),
           title: Text(appLocalizations.file),
           subtitle: Text(appLocalizations.fileDesc),
-          onTab: _handleAddProfileFormFile,
+          onTap: _handleAddProfileFormFile,
         ),
         ListItem(
           leading: const Icon(Icons.cloud_download),
           title: Text(appLocalizations.url),
           subtitle: Text(appLocalizations.urlDesc),
-          onTab: _toAdd,
+          onTap: _toAdd,
         )
       ],
     );

lib/fragments/profiles/edit_profile.dart

@@ -1,10 +1,15 @@
+import 'dart:io';
+import 'dart:typed_data';
+
 import 'package:fl_clash/common/common.dart';
 import 'package:fl_clash/enum/enum.dart';
 import 'package:fl_clash/models/models.dart';
+import 'package:fl_clash/plugins/app.dart';
 import 'package:fl_clash/state.dart';
 import 'package:fl_clash/widgets/widgets.dart';
 import 'package:flutter/material.dart';
 import 'package:provider/provider.dart';
+import 'package:url_launcher/url_launcher.dart';
 
 class EditProfile extends StatefulWidget {
   final Profile profile;
@@ -26,6 +31,8 @@ class _EditProfileState extends State<EditProfile> {
   late TextEditingController autoUpdateDurationController;
   late bool autoUpdate;
   final GlobalKey<FormState> _formKey = GlobalKey<FormState>();
+  final fileInfoNotifier = ValueNotifier<FileInfo?>(null);
+  Uint8List? fileData;
 
   @override
   void initState() {
@@ -36,12 +43,16 @@ class _EditProfileState extends State<EditProfile> {
     autoUpdateDurationController = TextEditingController(
       text: widget.profile.autoUpdateDuration.inMinutes.toString(),
     );
+    appPath.getProfilePath(widget.profile.id).then((path) async {
+      if (path == null) return;
+      fileInfoNotifier.value = await _getFileInfo(path);
+    });
   }
 
-  _handleConfirm() {
+  _handleConfirm() async {
     if (!_formKey.currentState!.validate()) return;
     final config = widget.context.read<Config>();
-    final profile = widget.profile.copyWith(
+    var profile = widget.profile.copyWith(
       url: urlController.text,
       label: labelController.text,
       autoUpdate: autoUpdate,
@@ -52,7 +63,11 @@ class _EditProfileState extends State<EditProfile> {
       ),
     );
     final hasUpdate = widget.profile.url != profile.url;
-    config.setProfile(profile);
+    if (fileData != null) {
+      config.setProfile(await profile.saveFile(fileData!));
+    } else {
+      config.setProfile(profile);
+    }
     if (hasUpdate) {
       globalState.homeScaffoldKey.currentState?.loadingRun(
         () async {
@@ -62,7 +77,9 @@ class _EditProfileState extends State<EditProfile> {
         },
       );
     }
-    Navigator.of(context).pop();
+    if (mounted) {
+      Navigator.of(context).pop();
+    }
   }
 
   _setAutoUpdate(bool value) {
@@ -72,6 +89,47 @@ class _EditProfileState extends State<EditProfile> {
     });
   }
 
+  Future<FileInfo?> _getFileInfo(path) async {
+    final file = File(path);
+    if (!await file.exists()) {
+      return null;
+    }
+    final lastModified = await file.lastModified();
+    final size = await file.length();
+    return FileInfo(
+      size: size,
+      lastModified: lastModified,
+    );
+  }
+
+  _editProfileFile() async {
+    final profilePath = await appPath.getProfilePath(widget.profile.id);
+    if (profilePath == null) return;
+    globalState.safeRun(() async {
+      if (Platform.isAndroid) {
+        await app?.openFile(
+          profilePath,
+        );
+        return;
+      }
+      await launchUrl(
+        Uri.file(
+          profilePath,
+        ),
+      );
+    });
+  }
+
+  _uploadProfileFile() async {
+    final platformFile = await globalState.safeRun(picker.pickerFile);
+    if (platformFile?.bytes == null) return;
+    fileData = platformFile?.bytes;
+    fileInfoNotifier.value = fileInfoNotifier.value?.copyWith(
+      size: fileData?.length ?? 0,
+      lastModified: DateTime.now(),
+    );
+  }
+
   @override
   Widget build(BuildContext context) {
     final items = [
@@ -141,7 +199,51 @@ class _EditProfileState extends State<EditProfile> {
               },
             ),
           ),
-      ]
+      ],
+      ValueListenableBuilder<FileInfo?>(
+        valueListenable: fileInfoNotifier,
+        builder: (_, fileInfo, __) {
+          return FadeBox(
+            child: fileInfo == null
+                ? Container()
+                : ListItem(
+                    title: Text(
+                      appLocalizations.profile,
+                    ),
+                    subtitle: Column(
+                      crossAxisAlignment: CrossAxisAlignment.start,
+                      children: [
+                        const SizedBox(
+                          height: 4,
+                        ),
+                        Text(
+                          fileInfo.desc,
+                        ),
+                        const SizedBox(
+                          height: 8,
+                        ),
+                        Wrap(
+                          runSpacing: 6,
+                          spacing: 12,
+                          children: [
+                            CommonChip(
+                              avatar: const Icon(Icons.edit),
+                              label: appLocalizations.edit,
+                              onPressed: _editProfileFile,
+                            ),
+                            CommonChip(
+                              avatar: const Icon(Icons.upload),
+                              label: appLocalizations.upload,
+                              onPressed: _uploadProfileFile,
+                            ),
+                          ],
+                        ),
+                      ],
+                    ),
+                  ),
+          );
+        },
+      ),
     ];
     return FloatLayout(
       floatingWidget: FloatWrapper(
@@ -159,7 +261,9 @@ class _EditProfileState extends State<EditProfile> {
             vertical: 16,
           ),
           child: ListView.separated(
-            primary: true,
+            padding: kMaterialListPadding.copyWith(
+              bottom: 72,
+            ),
             itemBuilder: (_, index) {
               return items[index];
             },

lib/fragments/profiles/profiles.dart

@@ -1,6 +1,7 @@
+import 'dart:ui';
+
 import 'package:fl_clash/enum/enum.dart';
 import 'package:fl_clash/fragments/profiles/edit_profile.dart';
-import 'package:fl_clash/fragments/profiles/view_profile.dart';
 import 'package:fl_clash/models/models.dart';
 import 'package:fl_clash/common/common.dart';
 import 'package:fl_clash/state.dart';
@@ -16,7 +17,6 @@ enum ProfileActions {
   edit,
   update,
   delete,
-  view,
 }
 
 class ProfilesFragment extends StatefulWidget {
@@ -27,11 +27,8 @@ class ProfilesFragment extends StatefulWidget {
 }
 
 class _ProfilesFragmentState extends State<ProfilesFragment> {
-  final hasPadding = ValueNotifier<bool>(false);
   Function? applyConfigDebounce;
 
-  List<GlobalObjectKey<_ProfileItemState>> profileItemKeys = [];
-
   _handleShowAddExtendPage() {
     showExtendPage(
       globalState.navigatorKey.currentState!.context,
@@ -42,29 +39,52 @@ class _ProfilesFragmentState extends State<ProfilesFragment> {
     );
   }
 
-  _getColumns(ViewMode viewMode) {
-    switch (viewMode) {
-      case ViewMode.mobile:
-        return 1;
-      case ViewMode.laptop:
-        return 1;
-      case ViewMode.desktop:
-        return 2;
-    }
-  }
-
   _updateProfiles() async {
-    final updateProfiles = profileItemKeys.map<Future>(
-        (key) async => await key.currentState?.updateProfile(false));
+    final appController = globalState.appController;
+    final config = appController.config;
+    final profiles = appController.config.profiles;
+    final messages = [];
+    final updateProfiles = profiles.map<Future>(
+      (profile) async {
+        config.setProfile(
+          profile.copyWith(isUpdating: true),
+        );
+        try {
+          await appController.updateProfile(profile);
+          if (profile.id == appController.config.currentProfile?.id) {
+            appController.applyProfile(isPrue: true);
+          }
+        } catch (e) {
+          messages.add("${profile.label ?? profile.id}: $e \n");
+          config.setProfile(
+            profile.copyWith(
+              isUpdating: false,
+            ),
+          );
+        }
+      },
+    );
+    final titleMedium = context.textTheme.titleMedium;
     await Future.wait(updateProfiles);
+    if (messages.isNotEmpty) {
+      globalState.showMessage(
+        title: appLocalizations.tip,
+        message: TextSpan(
+          children: [
+            for (final message in messages)
+              TextSpan(text: message, style: titleMedium)
+          ],
+        ),
+      );
+    }
   }
 
   _initScaffoldState() {
     WidgetsBinding.instance.addPostFrameCallback(
       (_) {
+        if (!mounted) return;
         final commonScaffoldState =
             context.findAncestorStateOfType<CommonScaffoldState>();
-        if (!context.mounted) return;
         commonScaffoldState?.actions = [
           IconButton(
             onPressed: () {
@@ -74,36 +94,27 @@ class _ProfilesFragmentState extends State<ProfilesFragment> {
           ),
           const SizedBox(
             width: 8,
-          )
+          ),
+          IconButton(
+            onPressed: () {
+              final profiles = globalState.appController.config.profiles;
+              showSheet(
+                title: appLocalizations.profilesSort,
+                context: context,
+                builder: (_) => SizedBox(
+                  height: 400,
+                  child: ReorderableProfiles(profiles: profiles),
+                ),
+              );
+            },
+            icon: const Icon(Icons.sort),
+            iconSize: 26,
+          ),
         ];
       },
     );
   }
 
-  @override
-  void initState() {
-    super.initState();
-  }
-
-  @override
-  void dispose() {
-    super.dispose();
-    hasPadding.dispose();
-  }
-
-  _changeProfile(String? id) async {
-    final appController = globalState.appController;
-    final config = appController.config;
-    if (id == config.currentProfileId) return;
-    config.currentProfileId = id;
-    applyConfigDebounce ??= debounce<Function()>(() async {
-      await appController.applyProfile();
-      appController.appState.delayMap = {};
-      appController.saveConfigPreferences();
-    });
-    applyConfigDebounce!();
-  }
-
   @override
   Widget build(BuildContext context) {
     return FloatLayout(
@@ -128,7 +139,7 @@ class _ProfilesFragmentState extends State<ProfilesFragment> {
           selector: (_, appState, config) => ProfilesSelectorState(
             profiles: config.profiles,
             currentProfileId: config.currentProfileId,
-            viewMode: appState.viewMode,
+            columns: other.getProfilesColumns(appState.viewWidth),
           ),
           builder: (context, state, child) {
             if (state.profiles.isEmpty) {
@@ -136,51 +147,30 @@ class _ProfilesFragmentState extends State<ProfilesFragment> {
                 label: appLocalizations.nullProfileDesc,
               );
             }
-            profileItemKeys = state.profiles
-                .map(
-                    (profile) => GlobalObjectKey<_ProfileItemState>(profile.id))
-                .toList();
-            final columns = _getColumns(state.viewMode);
             return Align(
               alignment: Alignment.topCenter,
-              child: NotificationListener<ScrollNotification>(
-                onNotification: (scrollNotification) {
-                  WidgetsBinding.instance.addPostFrameCallback(
-                    (_) {
-                      hasPadding.value =
-                          scrollNotification.metrics.maxScrollExtent > 0;
-                    },
-                  );
-                  return true;
-                },
-                child: ValueListenableBuilder(
-                  valueListenable: hasPadding,
-                  builder: (_, hasPadding, __) {
-                    return SingleChildScrollView(
-                      padding: EdgeInsets.only(
-                        left: 16,
-                        right: 16,
-                        top: 16,
-                        bottom: 16 + (hasPadding ? 56 : 0),
+              child: SingleChildScrollView(
+                padding: const EdgeInsets.only(
+                  left: 16,
+                  right: 16,
+                  top: 16,
+                  bottom: 88,
+                ),
+                child: Grid(
+                  mainAxisSpacing: 16,
+                  crossAxisSpacing: 16,
+                  crossAxisCount: state.columns,
+                  children: [
+                    for (int i = 0; i < state.profiles.length; i++)
+                      GridItem(
+                        child: ProfileItem(
+                          key: Key(state.profiles[i].id),
+                          profile: state.profiles[i],
+                          groupValue: state.currentProfileId,
+                          onChanged: globalState.appController.changeProfile,
+                        ),
                       ),
-                      child: Grid(
-                        mainAxisSpacing: 16,
-                        crossAxisSpacing: 16,
-                        crossAxisCount: columns,
-                        children: [
-                          for (int i = 0; i < state.profiles.length; i++)
-                            GridItem(
-                              child: ProfileItem(
-                                key: profileItemKeys[i],
-                                profile: state.profiles[i],
-                                groupValue: state.currentProfileId,
-                                onChanged: _changeProfile,
-                              ),
-                            ),
-                        ],
-                      ),
-                    );
-                  },
+                  ],
                 ),
               ),
             );
@@ -191,7 +181,7 @@ class _ProfilesFragmentState extends State<ProfilesFragment> {
   }
 }
 
-class ProfileItem extends StatefulWidget {
+class ProfileItem extends StatelessWidget {
   final Profile profile;
   final String? groupValue;
   final void Function(String? value) onChanged;
@@ -203,294 +193,330 @@ class ProfileItem extends StatefulWidget {
     required this.onChanged,
   });
 
-  @override
-  State<ProfileItem> createState() => _ProfileItemState();
-}
-
-class _ProfileItemState extends State<ProfileItem> {
-  final isUpdating = ValueNotifier<bool>(false);
-
-  _handleDeleteProfile() async {
-    globalState.appController.deleteProfile(widget.profile.id);
+  _handleDeleteProfile(BuildContext context) async {
+    globalState.showMessage(
+      title: appLocalizations.tip,
+      message: TextSpan(
+        text: appLocalizations.deleteProfileTip,
+      ),
+      onTab: () async {
+        await globalState.appController.deleteProfile(profile.id);
+        if (context.mounted) {
+          Navigator.of(context).pop();
+        }
+      },
+    );
   }
 
   _handleUpdateProfile() async {
     await globalState.safeRun<void>(updateProfile);
   }
 
-  Future updateProfile([isSingle = true]) async {
-    isUpdating.value = true;
-    try {
-      final appController = globalState.appController;
-      await appController.updateProfile(widget.profile);
-      if (widget.profile.id == appController.config.currentProfile?.id &&
-          !appController.appState.isStart) {
-        globalState.appController.rawApplyProfile();
-      }
-    } catch (e) {
-      isUpdating.value = false;
-      if (!isSingle) {
-        return e.toString();
-      } else {
+  Future updateProfile() async {
+    final appController = globalState.appController;
+    final config = appController.config;
+    if (profile.type == ProfileType.file) return;
+    await globalState.safeRun(() async {
+      try {
+        config.setProfile(
+          profile.copyWith(
+            isUpdating: true,
+          ),
+        );
+        await appController.updateProfile(profile);
+        if (profile.id == appController.config.currentProfile?.id) {
+          appController.applyProfile(isPrue: true);
+        }
+      } catch (e) {
+        config.setProfile(
+          profile.copyWith(
+            isUpdating: false,
+          ),
+        );
         rethrow;
       }
-    }
-    isUpdating.value = false;
-    return null;
+    });
   }
 
-  _handleShowEditExtendPage() {
+  _handleShowEditExtendPage(BuildContext context) {
     showExtendPage(
       context,
       body: EditProfile(
-        profile: widget.profile,
+        profile: profile,
         context: context,
       ),
       title: "${appLocalizations.edit}${appLocalizations.profile}",
     );
   }
 
-  _handleViewProfile() {
-    Navigator.of(context).push(
-      MaterialPageRoute(
-        builder: (context) => ViewProfile(
-          profile: widget.profile,
-        ),
+  List<Widget> _buildUserInfo(BuildContext context, UserInfo userInfo) {
+    final use = userInfo.upload + userInfo.download;
+    final total = userInfo.total;
+    if (total == 0) {
+      return [];
+    }
+    final useShow = TrafficValue(value: use).show;
+    final totalShow = TrafficValue(value: total).show;
+    final progress = total == 0 ? 0.0 : use / total;
+    final expireShow = userInfo.expire == 0
+        ? appLocalizations.infiniteTime
+        : DateTime.fromMillisecondsSinceEpoch(userInfo.expire * 1000).show;
+    return [
+      LinearProgressIndicator(
+        minHeight: 6,
+        value: progress,
+        backgroundColor: context.colorScheme.primary.toSoft(),
       ),
-    );
+      const SizedBox(
+        height: 8,
+      ),
+      Text(
+        "$useShow / $totalShow · $expireShow",
+        style: context.textTheme.labelMedium?.toLight,
+      ),
+      const SizedBox(
+        height: 4,
+      ),
+    ];
   }
 
-  _buildTitle(Profile profile) {
-    final textTheme = context.textTheme;
-    return Container(
-      padding: const EdgeInsets.symmetric(vertical: 4),
-      child: Column(
-        crossAxisAlignment: CrossAxisAlignment.start,
-        mainAxisAlignment: MainAxisAlignment.center,
-        children: [
-          Row(
-            mainAxisSize: MainAxisSize.max,
-            mainAxisAlignment: MainAxisAlignment.spaceBetween,
-            children: [
-              Text(
-                profile.label ?? profile.id,
-                style: textTheme.titleMedium,
-                maxLines: 1,
-                overflow: TextOverflow.ellipsis,
-              ),
-              Text(
-                profile.lastUpdateDate?.lastUpdateTimeDesc ?? '',
-                style: textTheme.labelMedium?.toLight,
-              ),
-            ],
-          ),
-          Builder(builder: (context) {
-            final userInfo = profile.userInfo ?? const UserInfo();
-            final use = userInfo.upload + userInfo.download;
-            final total = userInfo.total;
-            final useShow = TrafficValue(value: use).show;
-            final totalShow = TrafficValue(value: total).show;
-            final progress = total == 0 ? 0.0 : use / total;
-            final expireShow = userInfo.expire == 0
-                ? appLocalizations.infiniteTime
-                : DateTime.fromMillisecondsSinceEpoch(userInfo.expire * 1000)
-                    .show;
-            return Column(
-              mainAxisSize: MainAxisSize.min,
-              crossAxisAlignment: CrossAxisAlignment.start,
-              mainAxisAlignment: MainAxisAlignment.center,
-              children: [
-                Container(
-                  margin: const EdgeInsets.symmetric(
-                    vertical: 8,
-                  ),
-                  child: LinearProgressIndicator(
-                    minHeight: 6,
-                    value: progress,
-                  ),
-                ),
-                Text(
-                  "$useShow / $totalShow",
-                  style: textTheme.labelMedium?.toLight,
-                ),
-                const SizedBox(
-                  height: 2,
-                ),
-                Row(
-                  children: [
-                    Text(
-                      appLocalizations.expirationTime,
-                      style: textTheme.labelMedium?.toLighter,
-                    ),
-                    const SizedBox(
-                      width: 4,
-                    ),
-                    Text(
-                      expireShow,
-                      style: textTheme.labelMedium?.toLighter,
-                    ),
-                  ],
-                )
-              ],
-            );
-            // final child = switch (userInfo != null) {
-            //   true => () {
-            //       final use = userInfo!.upload + userInfo.download;
-            //       final total = userInfo.total;
-            //       final useShow = TrafficValue(value: use).show;
-            //       final totalShow = TrafficValue(value: total).show;
-            //       final progress = total == 0 ? 0.0 : use / total;
-            //       final expireShow = userInfo.expire == 0
-            //           ? appLocalizations.infiniteTime
-            //           : DateTime.fromMillisecondsSinceEpoch(
-            //                   userInfo.expire * 1000)
-            //               .show;
-            //       return Column(
-            //         mainAxisSize: MainAxisSize.min,
-            //         crossAxisAlignment: CrossAxisAlignment.start,
-            //         mainAxisAlignment: MainAxisAlignment.center,
-            //         children: [
-            //           Container(
-            //             margin: const EdgeInsets.symmetric(
-            //               vertical: 8,
-            //             ),
-            //             child: LinearProgressIndicator(
-            //               minHeight: 6,
-            //               value: progress,
-            //             ),
-            //           ),
-            //           Text(
-            //             "$useShow / $totalShow",
-            //             style: textTheme.labelMedium?.toLight(),
-            //           ),
-            //           const SizedBox(
-            //             height: 2,
-            //           ),
-            //           Row(
-            //             children: [
-            //               Text(
-            //                 appLocalizations.expirationTime,
-            //                 style: textTheme.labelMedium?.toLighter(),
-            //               ),
-            //               const SizedBox(
-            //                 width: 4,
-            //               ),
-            //               Text(
-            //                 expireShow,
-            //                 style: textTheme.labelMedium?.toLighter(),
-            //               ),
-            //             ],
-            //           )
-            //         ],
-            //       );
-            //     }(),
-            //   false => Column(
-            //       children: [
-            //         Padding(
-            //           padding: const EdgeInsets.only(top: 8),
-            //           child: CommonChip(
-            //             onPressed: _handleViewProfile,
-            //             avatar: const Icon(Icons.remove_red_eye),
-            //             label: appLocalizations.view,
-            //           ),
-            //         ),
-            //       ],
-            //     ),
-            // };
-            // final measure = globalState.appController.measure;
-            // final height = 6 + 8 * 2 + 2 + measure.labelMediumHeight * 2;
-            // return SizedBox(
-            //   height: height,
-            //   child: child,
-            // );
-          }),
-        ],
+  List<Widget> _buildUrlProfileInfo(BuildContext context) {
+    final userInfo = profile.userInfo;
+    return [
+      const SizedBox(
+        height: 8,
       ),
-    );
+      if (userInfo != null) ..._buildUserInfo(context, userInfo),
+      Text(
+        profile.lastUpdateDate?.lastUpdateTimeDesc ?? "",
+        style: context.textTheme.labelMedium?.toLight,
+      ),
+    ];
   }
 
-  @override
-  void dispose() {
-    isUpdating.dispose();
-    super.dispose();
+  List<Widget> _buildFileProfileInfo(BuildContext context) {
+    return [
+      const SizedBox(
+        height: 8,
+      ),
+      Text(
+        profile.lastUpdateDate?.lastUpdateTimeDesc ?? "",
+        style: context.textTheme.labelMedium?.toLight,
+      ),
+    ];
   }
 
   @override
   Widget build(BuildContext context) {
-    final profile = widget.profile;
-    final groupValue = widget.groupValue;
-    final onChanged = widget.onChanged;
     return CommonCard(
-      child: ListItem.radio(
+      isSelected: profile.id == groupValue,
+      onPressed: () {
+        onChanged(profile.id);
+      },
+      child: ListItem(
         key: Key(profile.id),
         horizontalTitleGap: 16,
-        delegate: RadioDelegate<String?>(
-          value: profile.id,
-          groupValue: groupValue,
-          onChanged: onChanged,
-        ),
         padding: const EdgeInsets.symmetric(horizontal: 16),
         trailing: SizedBox(
-          height: 48,
-          width: 48,
-          child: ValueListenableBuilder(
-            valueListenable: isUpdating,
-            builder: (_, isUpdating, ___) {
-              return FadeBox(
-                  child: isUpdating
-                      ? const Padding(
-                          padding: EdgeInsets.all(8),
-                          child: CircularProgressIndicator(),
-                        )
-                      : CommonPopupMenu<ProfileActions>(
-                          items: [
-                            CommonPopupMenuItem(
-                              action: ProfileActions.edit,
-                              label: appLocalizations.edit,
-                              iconData: Icons.edit,
-                            ),
-                            if (profile.type == ProfileType.url)
-                              CommonPopupMenuItem(
-                                action: ProfileActions.update,
-                                label: appLocalizations.update,
-                                iconData: Icons.sync,
-                              ),
-                            CommonPopupMenuItem(
-                              action: ProfileActions.view,
-                              label: appLocalizations.view,
-                              iconData: Icons.visibility,
-                            ),
-                            CommonPopupMenuItem(
-                              action: ProfileActions.delete,
-                              label: appLocalizations.delete,
-                              iconData: Icons.delete,
-                            ),
-                          ],
-                          onSelected: (ProfileActions? action) async {
-                            switch (action) {
-                              case ProfileActions.edit:
-                                _handleShowEditExtendPage();
-                                break;
-                              case ProfileActions.delete:
-                                _handleDeleteProfile();
-                                break;
-                              case ProfileActions.update:
-                                _handleUpdateProfile();
-                                break;
-                              case ProfileActions.view:
-                                _handleViewProfile();
-                                break;
-                              case null:
-                                break;
-                            }
-                          },
-                        ));
-            },
+          height: 40,
+          width: 40,
+          child: FadeBox(
+            child: profile.isUpdating
+                ? const Padding(
+                    padding: EdgeInsets.all(8),
+                    child: CircularProgressIndicator(),
+                  )
+                : CommonPopupMenu<ProfileActions>(
+                    items: [
+                      CommonPopupMenuItem(
+                        action: ProfileActions.edit,
+                        label: appLocalizations.edit,
+                        iconData: Icons.edit,
+                      ),
+                      if (profile.type == ProfileType.url)
+                        CommonPopupMenuItem(
+                          action: ProfileActions.update,
+                          label: appLocalizations.update,
+                          iconData: Icons.sync,
+                        ),
+                      CommonPopupMenuItem(
+                        action: ProfileActions.delete,
+                        label: appLocalizations.delete,
+                        iconData: Icons.delete,
+                      ),
+                    ],
+                    onSelected: (ProfileActions? action) async {
+                      switch (action) {
+                        case ProfileActions.edit:
+                          _handleShowEditExtendPage(context);
+                          break;
+                        case ProfileActions.delete:
+                          _handleDeleteProfile(context);
+                          break;
+                        case ProfileActions.update:
+                          _handleUpdateProfile();
+                          break;
+                        case null:
+                          break;
+                      }
+                    },
+                  ),
+          ),
+        ),
+        title: Container(
+          padding: const EdgeInsets.symmetric(vertical: 4),
+          child: Column(
+            crossAxisAlignment: CrossAxisAlignment.start,
+            mainAxisAlignment: MainAxisAlignment.center,
+            children: [
+              Text(
+                profile.label ?? profile.id,
+                style: context.textTheme.titleMedium,
+                maxLines: 1,
+                overflow: TextOverflow.ellipsis,
+              ),
+              Column(
+                mainAxisSize: MainAxisSize.min,
+                crossAxisAlignment: CrossAxisAlignment.start,
+                mainAxisAlignment: MainAxisAlignment.center,
+                children: [
+                  ...switch (profile.type) {
+                    ProfileType.file => _buildFileProfileInfo(context),
+                    ProfileType.url => _buildUrlProfileInfo(context),
+                  },
+                ],
+              ),
+            ],
           ),
         ),
-        title: _buildTitle(profile),
         tileTitleAlignment: ListTileTitleAlignment.titleHeight,
       ),
     );
   }
 }
+
+class ReorderableProfiles extends StatefulWidget {
+  final List<Profile> profiles;
+
+  const ReorderableProfiles({
+    super.key,
+    required this.profiles,
+  });
+
+  @override
+  State<ReorderableProfiles> createState() => _ReorderableProfilesState();
+}
+
+class _ReorderableProfilesState extends State<ReorderableProfiles> {
+  late List<Profile> profiles;
+
+  @override
+  void initState() {
+    super.initState();
+    profiles = List.from(widget.profiles);
+  }
+
+  Widget proxyDecorator(
+    Widget child,
+    int index,
+    Animation<double> animation,
+  ) {
+    final profile = profiles[index];
+    return AnimatedBuilder(
+      animation: animation,
+      builder: (_, Widget? child) {
+        final double animValue = Curves.easeInOut.transform(animation.value);
+        final double scale = lerpDouble(1, 1.02, animValue)!;
+        return Transform.scale(
+          scale: scale,
+          child: child,
+        );
+      },
+      child: Container(
+        key: Key(profile.id),
+        padding: const EdgeInsets.symmetric(vertical: 4),
+        child: CommonCard(
+          type: CommonCardType.filled,
+          child: ListTile(
+            contentPadding: const EdgeInsets.only(
+              right: 44,
+              left: 16,
+            ),
+            title: Text(profile.label ?? profile.id),
+          ),
+        ),
+      ),
+    );
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    return Column(
+      mainAxisSize: MainAxisSize.min,
+      children: [
+        Expanded(
+          flex: 1,
+          child: ReorderableListView.builder(
+            buildDefaultDragHandles: false,
+            padding: const EdgeInsets.all(12),
+            proxyDecorator: proxyDecorator,
+            onReorder: (int oldIndex, int newIndex) {
+              if (oldIndex == newIndex) return;
+              setState(() {
+                if (oldIndex < newIndex) {
+                  newIndex -= 1;
+                }
+                final profile = profiles.removeAt(oldIndex);
+                profiles.insert(newIndex, profile);
+              });
+            },
+            itemBuilder: (_, index) {
+              final profile = profiles[index];
+              return Container(
+                key: Key(profile.id),
+                padding: const EdgeInsets.symmetric(vertical: 4),
+                child: CommonCard(
+                  type: CommonCardType.filled,
+                  child: ListTile(
+                    contentPadding: const EdgeInsets.only(
+                      right: 16,
+                      left: 16,
+                    ),
+                    title: Text(profile.label ?? profile.id),
+                    trailing: ReorderableDragStartListener(
+                      index: index,
+                      child: const Icon(Icons.drag_handle),
+                    ),
+                  ),
+                ),
+              );
+            },
+            itemCount: profiles.length,
+          ),
+        ),
+        Padding(
+          padding: const EdgeInsets.symmetric(
+            vertical: 8,
+            horizontal: 12,
+          ),
+          child: Row(
+            mainAxisAlignment: MainAxisAlignment.end,
+            children: [
+              IconButton(
+                onPressed: () {
+                  Navigator.of(context).pop();
+                  globalState.appController.config.profiles = profiles;
+                },
+                icon: const Icon(
+                  Icons.check,
+                ),
+                iconSize: 32,
+                padding: const EdgeInsets.all(8),
+              ),
+            ],
+          ),
+        ),
+      ],
+    );
+  }
+}

lib/fragments/profiles/view_profile.dart

@@ -7,7 +7,7 @@ import 'package:fl_clash/widgets/scaffold.dart';
 import 'package:flutter/material.dart';
 import 'package:re_editor/re_editor.dart';
 import 'package:re_highlight/languages/yaml.dart';
-import 'package:re_highlight/styles/intellij-light.dart';
+import 'package:re_highlight/styles/atom-one-light.dart';
 
 class ViewProfile extends StatefulWidget {
   final Profile profile;
@@ -23,29 +23,27 @@ class ViewProfile extends StatefulWidget {
 
 class _ViewProfileState extends State<ViewProfile> {
   bool readOnly = true;
-  CodeLineEditingController? controller;
-  final contentNotifier = ValueNotifier<String>("");
+  final CodeLineEditingController _controller = CodeLineEditingController();
   final key = GlobalKey<CommonScaffoldState>();
+  final _focusNode = FocusNode();
+  String? rawText;
 
   @override
   void initState() {
     super.initState();
-    WidgetsBinding.instance.addPostFrameCallback((_) async {
-      final profilePath = await appPath.getProfilePath(widget.profile.id);
-      if (profilePath == null) {
-        return;
-      }
-      final file = File(profilePath);
-      final text = await file.readAsString();
-      contentNotifier.value = text;
+    appPath.getProfilePath(widget.profile.id).then((path) async {
+      if (path == null) return;
+      final file = File(path);
+      rawText = await file.readAsString();
+      _controller.text = rawText ?? "";
     });
   }
 
   @override
   void dispose() {
     super.dispose();
-    contentNotifier.dispose();
-    controller?.dispose();
+    _controller.dispose();
+    _focusNode.dispose();
   }
 
   Profile get profile => widget.profile;
@@ -56,16 +54,9 @@ class _ViewProfileState extends State<ViewProfile> {
         readOnly = false;
       });
     } else {
-      final text = controller?.text;
-      if (text == null || text == contentNotifier.value) {
-        setState(() {
-          readOnly = true;
-        });
-        return;
-      }
-      contentNotifier.value = text;
+      if (_controller.text == rawText) return;
       final newProfile = await key.currentState?.loadingRun<Profile>(() async {
-        return await profile.saveFileWithString(text);
+        return await profile.saveFileWithString(_controller.text);
       });
       if (newProfile == null) return;
       globalState.appController.config.setProfile(newProfile);
@@ -81,74 +72,67 @@ class _ViewProfileState extends State<ViewProfile> {
       key: key,
       actions: [
         IconButton(
-          onPressed: controller?.undo,
+          onPressed: _controller.undo,
           icon: const Icon(Icons.undo),
         ),
         IconButton(
-          onPressed: controller?.redo,
+          onPressed: _controller.redo,
           icon: const Icon(Icons.redo),
         ),
-        if (!widget.profile.realAutoUpdate)
-          IconButton(
-            onPressed: _handleChangeReadOnly,
-            icon: readOnly ? const Icon(Icons.edit) : const Icon(Icons.save),
-          ),
-        const SizedBox(
-          width: 8,
-        )
+        IconButton(
+          onPressed: _handleChangeReadOnly,
+          icon: readOnly ? const Icon(Icons.edit) : const Icon(Icons.save),
+        ),
       ],
-      body: ValueListenableBuilder(
-        valueListenable: contentNotifier,
-        builder: (_, value, __) {
-          if (value.isEmpty) return Container();
-          controller = CodeLineEditingController.fromText(value);
-          return CodeEditor(
-            autofocus: false,
-            readOnly: readOnly,
-            scrollbarBuilder: (context, child, details) {
-              return Scrollbar(
-                controller: details.controller,
-                thickness: 8,
-                radius: const Radius.circular(2),
-                interactive: true,
-                child: child,
-              );
-            },
-            showCursorWhenReadOnly: false,
-            controller: controller,
-            toolbarController:
-                !readOnly ? const ContextMenuControllerImpl() : null,
-            shortcutsActivatorsBuilder:
-                const DefaultCodeShortcutsActivatorsBuilder(),
-            indicatorBuilder:
-                (context, editingController, chunkController, notifier) {
-              return Row(
-                children: [
-                  DefaultCodeLineNumber(
-                    controller: editingController,
-                    notifier: notifier,
-                  ),
-                  DefaultCodeChunkIndicator(
-                    width: 20,
-                    controller: chunkController,
-                    notifier: notifier,
-                  )
-                ],
-              );
-            },
-            style: CodeEditorStyle(
-              fontSize: 14,
-              codeTheme: CodeHighlightTheme(
-                languages: {
-                  'yaml': CodeHighlightThemeMode(
-                    mode: langYaml,
-                  )
-                },
-                theme: intellijLightTheme,
-              ),
-            ),
+      body: CodeEditor(
+        readOnly: readOnly,
+        focusNode: _focusNode,
+        scrollbarBuilder: (context, child, details) {
+          return Scrollbar(
+            controller: details.controller,
+            thickness: 8,
+            radius: const Radius.circular(2),
+            interactive: true,
+            child: child,
           );
         },
+        showCursorWhenReadOnly: false,
+        controller: _controller,
+        shortcutsActivatorsBuilder:
+            const DefaultCodeShortcutsActivatorsBuilder(),
+        indicatorBuilder: (
+          context,
+          editingController,
+          chunkController,
+          notifier,
+        ) {
+          return Row(
+            children: [
+              DefaultCodeLineNumber(
+                controller: editingController,
+                notifier: notifier,
+              ),
+              DefaultCodeChunkIndicator(
+                width: 20,
+                controller: chunkController,
+                notifier: notifier,
+              )
+            ],
+          );
+        },
+        toolbarController:
+            !readOnly ? ContextMenuControllerImpl(_focusNode) : null,
+        style: CodeEditorStyle(
+          fontSize: 14,
+          codeTheme: CodeHighlightTheme(
+            languages: {
+              'yaml': CodeHighlightThemeMode(
+                mode: langYaml,
+              )
+            },
+            theme: atomOneLightTheme,
+          ),
+        ),
       ),
       title: widget.profile.label ?? widget.profile.id,
     );
@@ -164,10 +148,38 @@ class ContextMenuItemWidget extends PopupMenuItem<void> {
 }
 
 class ContextMenuControllerImpl implements SelectionToolbarController {
-  const ContextMenuControllerImpl();
+  OverlayEntry? _overlayEntry;
+
+  final FocusNode focusNode;
+
+  ContextMenuControllerImpl(
+    this.focusNode,
+  );
+
+  _removeOverLayEntry() {
+    _overlayEntry?.remove();
+    _overlayEntry = null;
+  }
 
   @override
-  void hide(BuildContext context) {}
+  void hide(BuildContext context) {
+    // _removeOverLayEntry();
+  }
+
+  _handleCut(CodeLineEditingController controller) {
+    controller.cut();
+    _removeOverLayEntry();
+  }
+
+  _handleCopy(CodeLineEditingController controller) async {
+    await controller.copy();
+    _removeOverLayEntry();
+  }
+
+  _handlePaste(CodeLineEditingController controller) {
+    controller.paste();
+    _removeOverLayEntry();
+  }
 
   @override
   void show({
@@ -181,27 +193,40 @@ class ContextMenuControllerImpl implements SelectionToolbarController {
     if (controller.selectedText.isEmpty) {
       return;
     }
-    showMenu(
-      context: context,
-      position: RelativeRect.fromSize(
-        (anchors.secondaryAnchor ?? anchors.primaryAnchor) &
-            const Size(150, double.infinity),
-        MediaQuery.of(context).size,
-      ),
-      items: [
-        ContextMenuItemWidget(
-          text: appLocalizations.cut,
-          onTap: controller.cut,
-        ),
-        ContextMenuItemWidget(
-          text: appLocalizations.copy,
-          onTap: controller.copy,
-        ),
-        ContextMenuItemWidget(
-          text: appLocalizations.paste,
-          onTap: controller.paste,
-        ),
-      ],
+    _removeOverLayEntry();
+    final relativeRect = RelativeRect.fromSize(
+      (anchors.primaryAnchor) &
+          const Size(150, double.infinity),
+      MediaQuery.of(context).size,
     );
+    _overlayEntry ??= OverlayEntry(
+      builder: (context) => ValueListenableBuilder<CodeLineEditingValue>(
+        valueListenable: controller,
+        builder: (_, __, child) {
+          if (controller.selectedText.isEmpty) {
+            _removeOverLayEntry();
+          }
+          return child!;
+        },
+        child: Positioned(
+          left: relativeRect.left,
+          top: relativeRect.top,
+          child: Material(
+            color: Colors.transparent,
+            child: GestureDetector(
+              onTap: () {
+                FocusScope.of(context).requestFocus(focusNode);
+              },
+              child: Container(
+                width: 200,
+                height: 200,
+                color: Colors.green,
+              ),
+            ),
+          ),
+        ),
+      ),
+    );
+    Overlay.of(context).insert(_overlayEntry!);
   }
 }

lib/fragments/proxies.dart

@@ -1,824 +0,0 @@
-import 'dart:math';
-
-import 'package:collection/collection.dart';
-import 'package:fl_clash/clash/core.dart';
-import 'package:fl_clash/common/common.dart';
-import 'package:fl_clash/enum/enum.dart';
-import 'package:fl_clash/models/models.dart';
-import 'package:fl_clash/state.dart';
-import 'package:fl_clash/widgets/widgets.dart';
-import 'package:flutter/material.dart';
-import 'package:provider/provider.dart';
-
-class ProxiesFragment extends StatefulWidget {
-  const ProxiesFragment({super.key});
-
-  @override
-  State<ProxiesFragment> createState() => _ProxiesFragmentState();
-}
-
-class _ProxiesFragmentState extends State<ProxiesFragment> {
-  _initActions() {
-    WidgetsBinding.instance.addPostFrameCallback((timeStamp) {
-      final commonScaffoldState =
-          context.findAncestorStateOfType<CommonScaffoldState>();
-      final items = [
-        CommonPopupMenuItem(
-          action: ProxiesSortType.none,
-          label: appLocalizations.defaultSort,
-          iconData: Icons.reorder,
-        ),
-        CommonPopupMenuItem(
-          action: ProxiesSortType.delay,
-          label: appLocalizations.delaySort,
-          iconData: Icons.network_ping,
-        ),
-        CommonPopupMenuItem(
-          action: ProxiesSortType.name,
-          label: appLocalizations.nameSort,
-          iconData: Icons.sort_by_alpha,
-        ),
-      ];
-      commonScaffoldState?.actions = [
-        Selector<Config, ProxiesType>(
-          selector: (_, config) => config.proxiesType,
-          builder: (_, proxiesType, __) {
-            return IconButton(
-              icon: Icon(
-                switch (proxiesType) {
-                  ProxiesType.tab => Icons.view_list,
-                  ProxiesType.expansion => Icons.view_carousel,
-                },
-              ),
-              onPressed: () {
-                final config = globalState.appController.config;
-                config.proxiesType = config.proxiesType == ProxiesType.tab
-                    ? ProxiesType.expansion
-                    : ProxiesType.tab;
-              },
-            );
-          },
-        ),
-        IconButton(
-          icon: const Icon(
-            Icons.view_column,
-          ),
-          onPressed: () {
-            globalState.appController.changeColumns();
-          },
-        ),
-        IconButton(
-          icon: const Icon(Icons.transform_sharp),
-          onPressed: () {
-            final config = globalState.appController.config;
-            config.proxyCardType = config.proxyCardType == ProxyCardType.expand
-                ? ProxyCardType.shrink
-                : ProxyCardType.expand;
-          },
-        ),
-        Selector<Config, ProxiesSortType>(
-          selector: (_, config) => config.proxiesSortType,
-          builder: (_, proxiesSortType, __) {
-            return CommonPopupMenu<ProxiesSortType>.radio(
-              items: items,
-              icon: const Icon(Icons.sort_sharp),
-              onSelected: (value) {
-                final config = context.read<Config>();
-                config.proxiesSortType = value;
-              },
-              selectedValue: proxiesSortType,
-            );
-          },
-        ),
-        const SizedBox(
-          width: 8,
-        )
-      ];
-    });
-  }
-
-  @override
-  Widget build(BuildContext context) {
-    return Selector<AppState, bool>(
-      selector: (_, appState) => appState.currentLabel == 'proxies',
-      builder: (_, isCurrent, child) {
-        if (isCurrent) {
-          _initActions();
-        }
-        return child!;
-      },
-      child: Selector<Config, ProxiesType>(
-        selector: (_, config) => config.proxiesType,
-        builder: (_, proxiesType, __) {
-          return switch (proxiesType) {
-            ProxiesType.tab => const ProxiesTabFragment(),
-            ProxiesType.expansion => const ProxiesExpansionPanelFragment(),
-          };
-        },
-      ),
-    );
-  }
-}
-
-class ProxiesTabFragment extends StatefulWidget {
-  const ProxiesTabFragment({super.key});
-
-  @override
-  State<ProxiesTabFragment> createState() => _ProxiesTabFragmentState();
-}
-
-class _ProxiesTabFragmentState extends State<ProxiesTabFragment>
-    with TickerProviderStateMixin {
-  TabController? _tabController;
-
-  _handleTabControllerChange() {
-    final indexIsChanging = _tabController?.indexIsChanging ?? false;
-    if (indexIsChanging) return;
-    final index = _tabController?.index;
-    if (index == null) return;
-    final appController = globalState.appController;
-    final currentGroups = appController.appState.currentGroups;
-    if (currentGroups.length > index) {
-      appController.config.updateCurrentGroupName(currentGroups[index].name);
-    }
-  }
-
-  @override
-  void dispose() {
-    super.dispose();
-    _tabController?.dispose();
-  }
-
-  @override
-  Widget build(BuildContext context) {
-    return Selector2<AppState, Config, ProxiesSelectorState>(
-      selector: (_, appState, config) {
-        final currentGroups = appState.currentGroups;
-        final groupNames = currentGroups.map((e) => e.name).toList();
-        return ProxiesSelectorState(
-          groupNames: groupNames,
-          currentGroupName: config.currentGroupName,
-        );
-      },
-      shouldRebuild: (prev, next) {
-        if (!const ListEquality<String>()
-            .equals(prev.groupNames, next.groupNames)) {
-          _tabController?.removeListener(_handleTabControllerChange);
-          _tabController?.dispose();
-          _tabController = null;
-          return true;
-        }
-        return false;
-      },
-      builder: (_, state, __) {
-        final index = state.groupNames.indexWhere(
-          (item) => item == state.currentGroupName,
-        );
-        _tabController ??= TabController(
-          length: state.groupNames.length,
-          initialIndex: index == -1 ? 0 : index,
-          vsync: this,
-        )..addListener(_handleTabControllerChange);
-        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,
-                children: [
-                  for (final groupName in state.groupNames)
-                    KeepContainer(
-                      key: ObjectKey(groupName),
-                      child: ProxyGroupView(
-                        groupName: groupName,
-                        type: ProxiesType.tab,
-                      ),
-                    ),
-                ],
-              ),
-            )
-          ],
-        );
-      },
-    );
-  }
-}
-
-class ProxiesExpansionPanelFragment extends StatefulWidget {
-  const ProxiesExpansionPanelFragment({super.key});
-
-  @override
-  State<ProxiesExpansionPanelFragment> createState() =>
-      _ProxiesExpansionPanelFragmentState();
-}
-
-class _ProxiesExpansionPanelFragmentState
-    extends State<ProxiesExpansionPanelFragment> {
-  @override
-  Widget build(BuildContext context) {
-    return Selector2<AppState, Config, ProxiesSelectorState>(
-      selector: (_, appState, config) {
-        final currentGroups = appState.currentGroups;
-        final groupNames = currentGroups.map((e) => e.name).toList();
-        return ProxiesSelectorState(
-          groupNames: groupNames,
-          currentGroupName: config.currentGroupName,
-        );
-      },
-      builder: (_, state, __) {
-        return ListView.separated(
-          padding: const EdgeInsets.all(16),
-          itemCount: state.groupNames.length,
-          itemBuilder: (_, index) {
-            final groupName = state.groupNames[index];
-            return ProxyGroupView(
-              key: PageStorageKey(groupName),
-              groupName: groupName,
-              type: ProxiesType.expansion,
-            );
-          },
-          separatorBuilder: (BuildContext context, int index) {
-            return const SizedBox(
-              height: 16,
-            );
-          },
-        );
-      },
-    );
-  }
-}
-
-class ProxyGroupView extends StatefulWidget {
-  final String groupName;
-  final ProxiesType type;
-
-  const ProxyGroupView({
-    super.key,
-    required this.groupName,
-    required this.type,
-  });
-
-  @override
-  State<ProxyGroupView> createState() => _ProxyGroupViewState();
-}
-
-class _ProxyGroupViewState extends State<ProxyGroupView> {
-  var isLock = false;
-  final scrollController = ScrollController();
-  var isEnd = false;
-
-  String get groupName => widget.groupName;
-
-  ProxiesType get type => widget.type;
-
-  double _getItemHeight(ProxyCardType proxyCardType) {
-    final isExpand = proxyCardType == ProxyCardType.expand;
-    final measure = globalState.appController.measure;
-    final baseHeight =
-        12 * 2 + measure.bodyMediumHeight * 2 + measure.bodySmallHeight + 8;
-    return isExpand ? baseHeight + measure.labelSmallHeight + 8 : baseHeight;
-  }
-
-  _delayTest(List<Proxy> proxies) async {
-    if (isLock) return;
-    isLock = true;
-    final appController = globalState.appController;
-    for (final proxy in proxies) {
-      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);
-    appController.appState.sortNum++;
-    isLock = false;
-  }
-
-  Widget _currentProxyNameBuilder({
-    required Widget Function(String) builder,
-  }) {
-    return Selector2<AppState, Config, String>(
-      selector: (_, appState, config) {
-        final group = appState.getGroupWithName(groupName)!;
-        return config.currentSelectedMap[groupName] ?? group.now ?? '';
-      },
-      builder: (_, value, ___) {
-        return builder(value);
-      },
-    );
-  }
-
-  Widget _buildTabGroupView({
-    required List<Proxy> proxies,
-    required int columns,
-    required ProxyCardType proxyCardType,
-  }) {
-    final sortedProxies = globalState.appController.getSortProxies(
-      proxies,
-    );
-    return DelayTestButtonContainer(
-      onClick: () async {
-        await _delayTest(
-          proxies,
-        );
-      },
-      child: Align(
-        alignment: Alignment.topCenter,
-        child: GridView.builder(
-          padding: const EdgeInsets.all(16),
-          gridDelegate: SliverGridDelegateWithFixedCrossAxisCount(
-            crossAxisCount: columns,
-            mainAxisSpacing: 8,
-            crossAxisSpacing: 8,
-            mainAxisExtent: _getItemHeight(proxyCardType),
-          ),
-          itemCount: sortedProxies.length,
-          itemBuilder: (_, index) {
-            final proxy = sortedProxies[index];
-            return _currentProxyNameBuilder(builder: (value) {
-              return ProxyCard(
-                type: proxyCardType,
-                key: ValueKey('$groupName.${proxy.name}'),
-                isSelected: value == proxy.name,
-                proxy: proxy,
-                groupName: groupName,
-              );
-            });
-          },
-        ),
-      ),
-    );
-  }
-
-  Widget _buildExpansionGroupView({
-    required List<Proxy> proxies,
-    required int columns,
-    required ProxyCardType proxyCardType,
-  }) {
-    final sortedProxies = globalState.appController.getSortProxies(
-      proxies,
-    );
-    final group =
-        globalState.appController.appState.getGroupWithName(groupName)!;
-    final itemHeight = _getItemHeight(proxyCardType);
-    final innerHeight = context.appSize.height - 200;
-    final lines = (sortedProxies.length / columns).ceil();
-    final minLines =
-        innerHeight >= 200 ? (innerHeight / itemHeight).floor() : 3;
-    final height = (itemHeight + 8) * min(lines, minLines) - 8;
-    return Selector<Config, Set<String>>(
-      selector: (_, config) => config.currentUnfoldSet,
-      builder: (_, currentUnfoldSet, __) {
-        return CommonCard(
-          child: ExpansionTile(
-            childrenPadding: const EdgeInsets.all(8),
-            initiallyExpanded: currentUnfoldSet.contains(groupName),
-            iconColor: context.colorScheme.onSurfaceVariant,
-            onExpansionChanged: (value) {
-              final tempUnfoldSet = Set<String>.from(currentUnfoldSet);
-              if (value) {
-                tempUnfoldSet.add(groupName);
-              } else {
-                tempUnfoldSet.remove(groupName);
-              }
-              globalState.appController.config.updateCurrentUnfoldSet(
-                tempUnfoldSet,
-              );
-            },
-            controlAffinity: ListTileControlAffinity.trailing,
-            title: Row(
-              mainAxisSize: MainAxisSize.min,
-              mainAxisAlignment: MainAxisAlignment.spaceBetween,
-              children: [
-                Flexible(
-                  flex: 1,
-                  child: Column(
-                    mainAxisSize: MainAxisSize.min,
-                    crossAxisAlignment: CrossAxisAlignment.start,
-                    children: [
-                      Text(groupName),
-                      const SizedBox(
-                        height: 4,
-                      ),
-                      Flexible(
-                        flex: 1,
-                        child: Row(
-                          mainAxisSize: MainAxisSize.min,
-                          mainAxisAlignment: MainAxisAlignment.start,
-                          crossAxisAlignment: CrossAxisAlignment.center,
-                          children: [
-                            Text(
-                              group.type.name,
-                              style: context.textTheme.labelMedium?.toLight,
-                            ),
-                            Flexible(
-                              flex: 1,
-                              child: _currentProxyNameBuilder(
-                                builder: (value) {
-                                  return Row(
-                                    mainAxisSize: MainAxisSize.min,
-                                    mainAxisAlignment: MainAxisAlignment.start,
-                                    crossAxisAlignment:
-                                        CrossAxisAlignment.center,
-                                    children: [
-                                      if (value.isNotEmpty) ...[
-                                        Icon(
-                                          Icons.arrow_right,
-                                          color: context
-                                              .colorScheme.onSurfaceVariant,
-                                        ),
-                                        Flexible(
-                                          flex: 1,
-                                          child: Text(
-                                            overflow: TextOverflow.ellipsis,
-                                            value,
-                                            style: context
-                                                .textTheme.labelMedium?.toLight,
-                                          ),
-                                        ),
-                                      ]
-                                    ],
-                                  );
-                                },
-                              ),
-                            ),
-                          ],
-                        ),
-                      ),
-                      const SizedBox(
-                        height: 4,
-                      ),
-                    ],
-                  ),
-                ),
-                IconButton(
-                  icon: Icon(
-                    Icons.network_ping,
-                    size: 20,
-                    color: context.colorScheme.onSurfaceVariant,
-                  ),
-                  onPressed: () {
-                    _delayTest(sortedProxies);
-                  },
-                ),
-              ],
-            ),
-            shape: const RoundedRectangleBorder(
-              side: BorderSide.none,
-            ),
-            collapsedShape: const RoundedRectangleBorder(
-              side: BorderSide.none,
-            ),
-            children: [
-              SizedBox(
-                height: height,
-                child: GridView.builder(
-                  key: widget.key,
-                  controller: scrollController,
-                  gridDelegate: SliverGridDelegateWithFixedCrossAxisCount(
-                    crossAxisCount: columns,
-                    mainAxisSpacing: 8,
-                    crossAxisSpacing: 8,
-                    mainAxisExtent: _getItemHeight(proxyCardType),
-                  ),
-                  itemCount: sortedProxies.length,
-                  itemBuilder: (_, index) {
-                    final proxy = sortedProxies[index];
-                    return _currentProxyNameBuilder(
-                      builder: (value) {
-                        return ProxyCard(
-                          style: CommonCardType.filled,
-                          type: proxyCardType,
-                          isSelected: value == proxy.name,
-                          key: ValueKey('$groupName.${proxy.name}'),
-                          proxy: proxy,
-                          groupName: groupName,
-                        );
-                      },
-                    );
-                  },
-                ),
-              ),
-            ],
-          ),
-        );
-      },
-    );
-  }
-
-  @override
-  void dispose() {
-    super.dispose();
-    scrollController.dispose();
-  }
-
-  @override
-  Widget build(BuildContext context) {
-    return Selector2<AppState, Config, ProxyGroupSelectorState>(
-      selector: (_, appState, config) {
-        final group = appState.getGroupWithName(groupName)!;
-        return ProxyGroupSelectorState(
-          proxyCardType: config.proxyCardType,
-          proxiesSortType: config.proxiesSortType,
-          columns: globalState.appController.columns,
-          sortNum: appState.sortNum,
-          proxies: group.all,
-        );
-      },
-      builder: (_, state, __) {
-        final proxies = state.proxies;
-        final columns = state.columns;
-        final proxyCardType = state.proxyCardType;
-        return switch (type) {
-          ProxiesType.tab => _buildTabGroupView(
-              proxies: proxies,
-              columns: columns,
-              proxyCardType: proxyCardType,
-            ),
-          ProxiesType.expansion => _buildExpansionGroupView(
-              proxies: proxies,
-              columns: columns,
-              proxyCardType: proxyCardType,
-            ),
-        };
-      },
-    );
-  }
-}
-
-class DelayTestButtonContainer extends StatefulWidget {
-  final Widget child;
-  final Future Function() onClick;
-
-  const DelayTestButtonContainer({
-    super.key,
-    required this.child,
-    required this.onClick,
-  });
-
-  @override
-  State<DelayTestButtonContainer> createState() =>
-      _DelayTestButtonContainerState();
-}
-
-class _DelayTestButtonContainerState extends State<DelayTestButtonContainer>
-    with SingleTickerProviderStateMixin {
-  late AnimationController _controller;
-  late Animation<double> _scale;
-
-  _healthcheck() async {
-    _controller.forward();
-    await widget.onClick();
-    _controller.reverse();
-  }
-
-  @override
-  void initState() {
-    super.initState();
-    _controller = AnimationController(
-      vsync: this,
-      duration: const Duration(
-        milliseconds: 200,
-      ),
-    );
-    _scale = Tween<double>(
-      begin: 1.0,
-      end: 0.0,
-    ).animate(
-      CurvedAnimation(
-        parent: _controller,
-        curve: const Interval(
-          0,
-          1,
-        ),
-      ),
-    );
-  }
-
-  @override
-  void dispose() {
-    _controller.dispose();
-    super.dispose();
-  }
-
-  @override
-  Widget build(BuildContext context) {
-    _controller.reverse();
-    return FloatLayout(
-      floatingWidget: FloatWrapper(
-        child: AnimatedBuilder(
-          animation: _controller.view,
-          builder: (_, child) {
-            return SizedBox(
-              width: 56,
-              height: 56,
-              child: Transform.scale(
-                scale: _scale.value,
-                child: child,
-              ),
-            );
-          },
-          child: FloatingActionButton(
-            heroTag: null,
-            onPressed: _healthcheck,
-            child: const Icon(Icons.network_ping),
-          ),
-        ),
-      ),
-      child: widget.child,
-    );
-  }
-}
-
-class ProxyCard extends StatelessWidget {
-  final String groupName;
-  final Proxy proxy;
-  final bool isSelected;
-  final CommonCardType style;
-  final ProxyCardType type;
-
-  const ProxyCard({
-    super.key,
-    required this.groupName,
-    required this.proxy,
-    required this.isSelected,
-    this.style = CommonCardType.plain,
-    required this.type,
-  });
-
-  Measure get measure => globalState.appController.measure;
-
-  Widget _buildDelayText() {
-    return SizedBox(
-      height: measure.labelSmallHeight,
-      child: Selector<AppState, int?>(
-        selector: (context, appState) => appState.getDelay(
-          proxy.name,
-        ),
-        builder: (context, delay, __) {
-          return FadeBox(
-            child: Builder(
-              builder: (_) {
-                if (delay == null) {
-                  return Container();
-                }
-                if (delay == 0) {
-                  return SizedBox(
-                    height: measure.labelSmallHeight,
-                    width: measure.labelSmallHeight,
-                    child: const CircularProgressIndicator(
-                      strokeWidth: 2,
-                    ),
-                  );
-                }
-                return Text(
-                  delay > 0 ? '$delay ms' : "Timeout",
-                  style: context.textTheme.labelSmall?.copyWith(
-                    overflow: TextOverflow.ellipsis,
-                    color: other.getDelayColor(
-                      delay,
-                    ),
-                  ),
-                );
-              },
-            ),
-          );
-        },
-      ),
-    );
-  }
-
-  Widget _buildProxyNameText(BuildContext context) {
-    return SizedBox(
-      height: measure.bodyMediumHeight * 2,
-      child: Text(
-        proxy.name,
-        maxLines: 2,
-        style: context.textTheme.bodyMedium?.copyWith(
-          overflow: TextOverflow.ellipsis,
-        ),
-      ),
-    );
-  }
-
-  _changeProxy(BuildContext context) {
-    final appController = globalState.appController;
-    final group = appController.appState.getGroupWithName(groupName)!;
-    if (group.type != GroupType.Selector) {
-      globalState.showSnackBar(
-        context,
-        message: appLocalizations.notSelectedTip,
-      );
-      return;
-    }
-    globalState.appController.config.updateCurrentSelectedMap(
-      groupName,
-      proxy.name,
-    );
-    clashCore.changeProxy(
-      ChangeProxyParams(
-        groupName: groupName,
-        proxyName: proxy.name,
-      ),
-    );
-  }
-
-  @override
-  Widget build(BuildContext context) {
-    final measure = globalState.appController.measure;
-    final delayText = _buildDelayText();
-    final proxyNameText = _buildProxyNameText(context);
-    return CommonCard(
-      type: style,
-      key: key,
-      onPressed: () {
-        _changeProxy(context);
-      },
-      isSelected: isSelected,
-      child: Container(
-        padding: const EdgeInsets.all(12),
-        child: Column(
-          mainAxisSize: MainAxisSize.min,
-          crossAxisAlignment: CrossAxisAlignment.start,
-          children: [
-            proxyNameText,
-            const SizedBox(
-              height: 8,
-            ),
-            if (type == ProxyCardType.expand) ...[
-              SizedBox(
-                height: measure.bodySmallHeight,
-                child: Selector<AppState, String>(
-                  selector: (context, appState) => appState.getDesc(
-                    proxy.type,
-                    proxy.name,
-                  ),
-                  builder: (_, desc, __) {
-                    return TooltipText(
-                      text: Text(
-                        desc,
-                        style: context.textTheme.bodySmall?.copyWith(
-                          overflow: TextOverflow.ellipsis,
-                          color: context.textTheme.bodySmall?.color?.toLight(),
-                        ),
-                      ),
-                    );
-                  },
-                ),
-              ),
-              const SizedBox(
-                height: 8,
-              ),
-              delayText,
-            ] else
-              SizedBox(
-                height: measure.bodySmallHeight,
-                child: Row(
-                  mainAxisAlignment: MainAxisAlignment.spaceBetween,
-                  crossAxisAlignment: CrossAxisAlignment.center,
-                  children: [
-                    Flexible(
-                      flex: 1,
-                      child: TooltipText(
-                        text: Text(
-                          proxy.type,
-                          style: context.textTheme.bodySmall?.copyWith(
-                            overflow: TextOverflow.ellipsis,
-                            color:
-                                context.textTheme.bodySmall?.color?.toLight(),
-                          ),
-                        ),
-                      ),
-                    ),
-                    delayText,
-                  ],
-                ),
-              )
-          ],
-        ),
-      ),
-    );
-  }
-}

lib/fragments/proxies/card.dart

@@ -0,0 +1,244 @@
+import 'package:fl_clash/common/common.dart';
+import 'package:fl_clash/enum/enum.dart';
+import 'package:fl_clash/fragments/proxies/common.dart';
+import 'package:fl_clash/models/models.dart';
+import 'package:fl_clash/state.dart';
+import 'package:fl_clash/widgets/widgets.dart';
+import 'package:flutter/material.dart';
+import 'package:provider/provider.dart';
+
+class ProxyCard extends StatelessWidget {
+  final String groupName;
+  final Proxy proxy;
+  final GroupType groupType;
+  final CommonCardType style;
+  final ProxyCardType type;
+
+  const ProxyCard({
+    super.key,
+    required this.groupName,
+    required this.proxy,
+    required this.groupType,
+    this.style = CommonCardType.plain,
+    required this.type,
+  });
+
+  Measure get measure => globalState.appController.measure;
+
+  Widget _buildDelayText() {
+    return SizedBox(
+      height: measure.labelSmallHeight,
+      child: Selector<AppState, int?>(
+        selector: (context, appState) => appState.getDelay(
+          proxy.name,
+        ),
+        builder: (context, delay, __) {
+          return FadeBox(
+            child: Builder(
+              builder: (_) {
+                if (delay == null) {
+                  return Container();
+                }
+                if (delay == 0) {
+                  return SizedBox(
+                    height: measure.labelSmallHeight,
+                    width: measure.labelSmallHeight,
+                    child: const CircularProgressIndicator(
+                      strokeWidth: 2,
+                    ),
+                  );
+                }
+                return Text(
+                  delay > 0 ? '$delay ms' : "Timeout",
+                  style: context.textTheme.labelSmall?.copyWith(
+                    overflow: TextOverflow.ellipsis,
+                    color: other.getDelayColor(
+                      delay,
+                    ),
+                  ),
+                );
+              },
+            ),
+          );
+        },
+      ),
+    );
+  }
+
+  Widget _buildProxyNameText(BuildContext context) {
+    if (type == ProxyCardType.min) {
+      return SizedBox(
+        height: measure.bodyMediumHeight * 1,
+        child: EmojiText(
+          proxy.name,
+          maxLines: 1,
+          overflow: TextOverflow.ellipsis,
+          style: context.textTheme.bodyMedium,
+        ),
+      );
+    } else {
+      return SizedBox(
+        height: measure.bodyMediumHeight * 2,
+        child: EmojiText(
+          proxy.name,
+          maxLines: 2,
+          overflow: TextOverflow.ellipsis,
+          style: context.textTheme.bodyMedium,
+        ),
+      );
+    }
+  }
+
+  _changeProxy(BuildContext context) async {
+    final appController = globalState.appController;
+    final isUrlTest = groupType == GroupType.URLTest;
+    final isSelector = groupType == GroupType.Selector;
+    if (isUrlTest || isSelector) {
+      final currentProxyName =
+          appController.config.currentSelectedMap[groupName];
+      final nextProxyName = switch (isUrlTest) {
+        true => currentProxyName == proxy.name ? "" : proxy.name,
+        false => proxy.name,
+      };
+      appController.config.updateCurrentSelectedMap(
+        groupName,
+        nextProxyName,
+      );
+      appController.changeProxy(
+        groupName: groupName,
+        proxyName: nextProxyName,
+      );
+      await appController.updateGroupDebounce();
+      return;
+    }
+    globalState.showSnackBar(
+      context,
+      message: appLocalizations.notSelectedTip,
+    );
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    final measure = globalState.appController.measure;
+    final delayText = _buildDelayText();
+    final proxyNameText = _buildProxyNameText(context);
+    return currentGroupProxyNameBuilder(
+      groupName: groupName,
+      builder: (currentGroupName) {
+        return Stack(
+          children: [
+            CommonCard(
+              type: style,
+              key: key,
+              onPressed: () {
+                _changeProxy(context);
+              },
+              isSelected: currentGroupName == proxy.name,
+              child: Container(
+                padding: const EdgeInsets.all(12),
+                child: Column(
+                  mainAxisSize: MainAxisSize.min,
+                  crossAxisAlignment: CrossAxisAlignment.start,
+                  children: [
+                    proxyNameText,
+                    const SizedBox(
+                      height: 8,
+                    ),
+                    if (type == ProxyCardType.expand) ...[
+                      SizedBox(
+                        height: measure.bodySmallHeight,
+                        child: Selector<AppState, String>(
+                          selector: (context, appState) => appState.getDesc(
+                            proxy.type,
+                            proxy.name,
+                          ),
+                          builder: (_, desc, __) {
+                            return EmojiText(
+                              desc,
+                              overflow: TextOverflow.ellipsis,
+                              style: context.textTheme.bodySmall?.copyWith(
+                                color: context.textTheme.bodySmall?.color
+                                    ?.toLight(),
+                              ),
+                            );
+                          },
+                        ),
+                      ),
+                      const SizedBox(
+                        height: 8,
+                      ),
+                      delayText,
+                    ] else
+                      SizedBox(
+                        height: measure.bodySmallHeight,
+                        child: Row(
+                          mainAxisAlignment: MainAxisAlignment.spaceBetween,
+                          crossAxisAlignment: CrossAxisAlignment.center,
+                          children: [
+                            Flexible(
+                              flex: 1,
+                              child: TooltipText(
+                                text: Text(
+                                  proxy.type,
+                                  style: context.textTheme.bodySmall?.copyWith(
+                                    overflow: TextOverflow.ellipsis,
+                                    color: context.textTheme.bodySmall?.color
+                                        ?.toLight(),
+                                  ),
+                                ),
+                              ),
+                            ),
+                            delayText,
+                          ],
+                        ),
+                      ),
+                  ],
+                ),
+              ),
+            ),
+            if (groupType == GroupType.URLTest)
+              Selector<Config, String>(
+                selector: (_, config) {
+                  final selectedProxyName =
+                      config.currentSelectedMap[groupName];
+                  return selectedProxyName ?? '';
+                },
+                builder: (_, value, __) {
+                  if (value != proxy.name) return Container();
+                  return Positioned.fill(
+                    child: Container(
+                      alignment: Alignment.topRight,
+                      margin: const EdgeInsets.all(8),
+                      child: Container(
+                        padding: const EdgeInsets.all(4),
+                        decoration: BoxDecoration(
+                          shape: BoxShape.circle,
+                          color:
+                              Theme.of(context).colorScheme.secondaryContainer,
+                        ),
+                        child: const SelectIcon(),
+                      ),
+                    ),
+                  );
+                },
+                child: Positioned.fill(
+                  child: Container(
+                    alignment: Alignment.topRight,
+                    margin: const EdgeInsets.all(8),
+                    child: Container(
+                      padding: const EdgeInsets.all(4),
+                      decoration: BoxDecoration(
+                        shape: BoxShape.circle,
+                        color: Theme.of(context).colorScheme.secondaryContainer,
+                      ),
+                      child: const SelectIcon(),
+                    ),
+                  ),
+                ),
+              )
+          ],
+        );
+      },
+    );
+  }
+}

lib/fragments/proxies/common.dart

@@ -0,0 +1,76 @@
+import 'dart:math';
+
+import 'package:fl_clash/clash/clash.dart';
+import 'package:fl_clash/common/other.dart';
+import 'package:fl_clash/enum/enum.dart';
+import 'package:fl_clash/models/models.dart';
+import 'package:fl_clash/state.dart';
+import 'package:flutter/material.dart';
+import 'package:provider/provider.dart';
+
+Widget currentGroupProxyNameBuilder({
+  required String groupName,
+  required Widget Function(String currentGroupName) builder,
+}) {
+  return Selector2<AppState, Config, String>(
+    selector: (_, appState, config) {
+      final group = appState.getGroupWithName(groupName);
+      final selectedProxyName = config.currentSelectedMap[groupName];
+      return group?.getCurrentSelectedName(selectedProxyName ?? "") ?? "";
+    },
+    builder: (_, currentGroupName, ___) {
+      return builder(currentGroupName);
+    },
+  );
+}
+
+double get listHeaderHeight {
+  final measure = globalState.appController.measure;
+  return 24 + measure.titleMediumHeight + 4 + measure.bodyMediumHeight;
+}
+
+double getItemHeight(ProxyCardType proxyCardType) {
+  final measure = globalState.appController.measure;
+  final baseHeight =
+      12 * 2 + measure.bodyMediumHeight * 2 + measure.bodySmallHeight + 8;
+  return switch (proxyCardType) {
+    ProxyCardType.expand => baseHeight + measure.labelSmallHeight + 8,
+    ProxyCardType.shrink => baseHeight,
+    ProxyCardType.min => baseHeight - measure.bodyMediumHeight,
+  };
+}
+
+delayTest(List<Proxy> proxies) async {
+  final appController = globalState.appController;
+  final delayProxies = proxies.map<Future>((proxy) async {
+    final proxyName = appController.appState.getRealProxyName(proxy.name);
+    globalState.appController.setDelay(
+      Delay(
+        name: proxyName,
+        value: 0,
+      ),
+    );
+    globalState.appController.setDelay(await clashCore.getDelay(proxyName));
+  });
+  await Future.wait(delayProxies);
+  appController.appState.sortNum++;
+}
+
+double getScrollToSelectedOffset({
+  required String groupName,
+  required List<Proxy> proxies,
+}) {
+  final appController = globalState.appController;
+  final columns = other.getProxiesColumns(
+    appController.appState.viewWidth,
+    appController.config.proxiesLayout,
+  );
+  final proxyCardType = appController.config.proxyCardType;
+  final selectedName = appController.getCurrentSelectedName(groupName);
+  final findSelectedIndex = proxies.indexWhere(
+    (proxy) => proxy.name == selectedName,
+  );
+  final selectedIndex = findSelectedIndex != -1 ? findSelectedIndex : 0;
+  final rows = (selectedIndex / columns).floor();
+  return max(rows * (getItemHeight(proxyCardType) + 8) - 8, 0);
+}

lib/fragments/proxies/list.dart

@@ -0,0 +1,525 @@
+import 'package:collection/collection.dart';
+import 'package:fl_clash/common/common.dart';
+import 'package:fl_clash/enum/enum.dart';
+import 'package:fl_clash/models/models.dart';
+import 'package:fl_clash/state.dart';
+import 'package:fl_clash/widgets/card.dart';
+import 'package:fl_clash/widgets/text.dart';
+import 'package:flutter/material.dart';
+import 'package:provider/provider.dart';
+
+import 'card.dart';
+import 'common.dart';
+
+typedef GroupNameProxiesMap = Map<String, List<Proxy>>;
+
+class ProxiesListFragment extends StatefulWidget {
+  const ProxiesListFragment({super.key});
+
+  @override
+  State<ProxiesListFragment> createState() => _ProxiesListFragmentState();
+}
+
+class _ProxiesListFragmentState extends State<ProxiesListFragment> {
+  final _controller = ScrollController();
+  final _headerStateNotifier = ValueNotifier<ProxiesListHeaderSelectorState>(
+    const ProxiesListHeaderSelectorState(
+      offset: 0,
+      currentIndex: 0,
+    ),
+  );
+  List<double> _headerOffset = [];
+  GroupNameProxiesMap _lastGroupNameProxiesMap = {};
+
+  @override
+  void initState() {
+    super.initState();
+    _controller.addListener(_adjustHeader);
+  }
+
+  _adjustHeader() {
+    final offset = _controller.offset;
+    final index = _headerOffset.findInterval(offset);
+    final currentIndex = index;
+    double headerOffset = 0.0;
+    if (index + 1 <= _headerOffset.length - 1) {
+      final endOffset = _headerOffset[index + 1];
+      final startOffset = endOffset - listHeaderHeight - 8;
+      if (offset > startOffset && offset < endOffset) {
+        headerOffset = offset - startOffset;
+      }
+    }
+    _headerStateNotifier.value = _headerStateNotifier.value.copyWith(
+      currentIndex: currentIndex,
+      offset: headerOffset,
+    );
+  }
+
+  double _getListItemHeight(Type type, ProxyCardType proxyCardType) {
+    return switch (type) {
+      const (SizedBox) => 8,
+      const (ListHeader) => listHeaderHeight,
+      Type() => getItemHeight(proxyCardType),
+    };
+  }
+
+  @override
+  void dispose() {
+    super.dispose();
+    _headerStateNotifier.dispose();
+    _controller.removeListener(_adjustHeader);
+    _controller.dispose();
+  }
+
+  _handleChange(Set<String> currentUnfoldSet, String groupName) {
+    final tempUnfoldSet = Set<String>.from(currentUnfoldSet);
+    if (tempUnfoldSet.contains(groupName)) {
+      tempUnfoldSet.remove(groupName);
+    } else {
+      tempUnfoldSet.add(groupName);
+    }
+    globalState.appController.config.updateCurrentUnfoldSet(
+      tempUnfoldSet,
+    );
+    WidgetsBinding.instance.addPostFrameCallback((_) {
+      _adjustHeader();
+    });
+  }
+
+  List<double> _getItemHeightList(
+    List<Widget> items,
+    ProxyCardType proxyCardType,
+  ) {
+    final itemHeightList = <double>[];
+    List<double> headerOffset = [];
+    double currentHeight = 0;
+    for (final item in items) {
+      if (item.runtimeType == ListHeader) {
+        headerOffset.add(currentHeight);
+      }
+      final itemHeight = _getListItemHeight(item.runtimeType, proxyCardType);
+      itemHeightList.add(itemHeight);
+      currentHeight = currentHeight + itemHeight;
+    }
+    _headerOffset = headerOffset;
+    return itemHeightList;
+  }
+
+  List<Widget> _buildItems({
+    required List<String> groupNames,
+    required int columns,
+    required Set<String> currentUnfoldSet,
+    required ProxyCardType type,
+  }) {
+    final items = <Widget>[];
+    final GroupNameProxiesMap groupNameProxiesMap = {};
+    for (final groupName in groupNames) {
+      final group =
+          globalState.appController.appState.getGroupWithName(groupName)!;
+      final isExpand = currentUnfoldSet.contains(groupName);
+      items.addAll([
+        ListHeader(
+          onScrollToSelected: _scrollToGroupSelected,
+          key: Key(groupName),
+          isExpand: isExpand,
+          group: group,
+          onChange: (String groupName) {
+            _handleChange(currentUnfoldSet, groupName);
+          },
+        ),
+        const SizedBox(
+          height: 8,
+        ),
+      ]);
+      if (isExpand) {
+        final sortedProxies = globalState.appController.getSortProxies(
+          group.all,
+        );
+        groupNameProxiesMap[groupName] = sortedProxies;
+        final chunks = sortedProxies.chunks(columns);
+        final rows = chunks.map<Widget>((proxies) {
+          final children = proxies
+              .map<Widget>(
+                (proxy) => Flexible(
+                  child: ProxyCard(
+                    type: type,
+                    groupType: group.type,
+                    key: ValueKey('$groupName.${proxy.name}'),
+                    proxy: proxy,
+                    groupName: groupName,
+                  ),
+                ),
+              )
+              .fill(
+                columns,
+                filler: (_) => const Flexible(
+                  child: SizedBox(),
+                ),
+              )
+              .separated(
+                const SizedBox(
+                  width: 8,
+                ),
+              );
+
+          return Row(
+            children: children.toList(),
+          );
+        }).separated(
+          const SizedBox(
+            height: 8,
+          ),
+        );
+        items.addAll(
+          [
+            ...rows,
+            const SizedBox(
+              height: 8,
+            ),
+          ],
+        );
+      }
+    }
+    _lastGroupNameProxiesMap = groupNameProxiesMap;
+    return items;
+  }
+
+  _buildHeader({
+    required String groupName,
+    required Set<String> currentUnfoldSet,
+  }) {
+    final group =
+        globalState.appController.appState.getGroupWithName(groupName)!;
+    final isExpand = currentUnfoldSet.contains(groupName);
+    return SizedBox(
+      height: listHeaderHeight,
+      child: ListHeader(
+        onScrollToSelected: _scrollToGroupSelected,
+        key: Key(groupName),
+        isExpand: isExpand,
+        group: group,
+        onChange: (String groupName) {
+          _handleChange(currentUnfoldSet, groupName);
+        },
+      ),
+    );
+  }
+
+  _scrollToGroupSelected(String groupName) {
+    if (_controller.position.maxScrollExtent == 0) {
+      return;
+    }
+    final appController = globalState.appController;
+    final currentGroups = appController.appState.currentGroups;
+    final groupNames = currentGroups.map((e) => e.name).toList();
+    final findIndex = groupNames.indexWhere((item) => item == groupName);
+    final index = findIndex != -1 ? findIndex : 0;
+    final currentInitOffset = _headerOffset[index];
+    final proxies = _lastGroupNameProxiesMap[groupName];
+    _controller.animateTo(
+      currentInitOffset +
+          getScrollToSelectedOffset(
+            groupName: groupName,
+            proxies: proxies ?? [],
+          ),
+      duration: const Duration(milliseconds: 300),
+      curve: Curves.easeIn,
+    );
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    return Selector2<AppState, Config, ProxiesListSelectorState>(
+      selector: (_, appState, config) {
+        final currentGroups = appState.currentGroups;
+        final groupNames = currentGroups.map((e) => e.name).toList();
+        return ProxiesListSelectorState(
+          groupNames: groupNames,
+          currentUnfoldSet: config.currentUnfoldSet,
+          proxyCardType: config.proxyCardType,
+          proxiesSortType: config.proxiesSortType,
+          columns: other.getProxiesColumns(
+            appState.viewWidth,
+            config.proxiesLayout,
+          ),
+          sortNum: appState.sortNum,
+        );
+      },
+      shouldRebuild: (prev, next) {
+        if (!const ListEquality<String>()
+            .equals(prev.groupNames, next.groupNames)) {
+          _headerStateNotifier.value = const ProxiesListHeaderSelectorState(
+            offset: 0,
+            currentIndex: 0,
+          );
+        }
+        return prev != next;
+      },
+      builder: (_, state, __) {
+        final items = _buildItems(
+          groupNames: state.groupNames,
+          currentUnfoldSet: state.currentUnfoldSet,
+          columns: state.columns,
+          type: state.proxyCardType,
+        );
+        final itemsOffset = _getItemHeightList(items, state.proxyCardType);
+        return Scrollbar(
+          controller: _controller,
+          thumbVisibility: true,
+          trackVisibility: true,
+          thickness: 8,
+          radius: const Radius.circular(8),
+          interactive: true,
+          child: Stack(
+            children: [
+              Positioned.fill(
+                child: ScrollConfiguration(
+                  behavior: HiddenBarScrollBehavior(),
+                  child: ListView.builder(
+                    padding: const EdgeInsets.all(16),
+                    controller: _controller,
+                    itemExtentBuilder: (index, __) {
+                      return itemsOffset[index];
+                    },
+                    itemCount: items.length,
+                    itemBuilder: (_, index) {
+                      return items[index];
+                    },
+                  ),
+                ),
+              ),
+              LayoutBuilder(builder: (_, container) {
+                return ValueListenableBuilder(
+                  valueListenable: _headerStateNotifier,
+                  builder: (_, headerState, ___) {
+                    final index =
+                        headerState.currentIndex > state.groupNames.length - 1
+                            ? 0
+                            : headerState.currentIndex;
+                    return Stack(
+                      children: [
+                        Positioned(
+                          top: -headerState.offset,
+                          child: Container(
+                            width: container.maxWidth,
+                            color: context.colorScheme.surface,
+                            padding: const EdgeInsets.only(
+                              top: 16,
+                              left: 16,
+                              right: 16,
+                              bottom: 8,
+                            ),
+                            child: _buildHeader(
+                              groupName: state.groupNames[index],
+                              currentUnfoldSet: state.currentUnfoldSet,
+                            ),
+                          ),
+                        ),
+                      ],
+                    );
+                  },
+                );
+              }),
+            ],
+          ),
+        );
+      },
+    );
+  }
+}
+
+class ListHeader extends StatefulWidget {
+  final Group group;
+
+  final Function(String groupName) onChange;
+  final Function(String groupName) onScrollToSelected;
+  final bool isExpand;
+
+  const ListHeader({
+    super.key,
+    required this.group,
+    required this.onChange,
+    required this.onScrollToSelected,
+    required this.isExpand,
+  });
+
+  @override
+  State<ListHeader> createState() => _ListHeaderState();
+}
+
+class _ListHeaderState extends State<ListHeader>
+    with SingleTickerProviderStateMixin {
+  late AnimationController _animationController;
+  late Animation<double> _iconTurns;
+  var isLock = false;
+
+  String get groupName => widget.group.name;
+
+  String get groupType => widget.group.type.name;
+
+  bool get isExpand => widget.isExpand;
+
+  _delayTest(List<Proxy> proxies) async {
+    if (isLock) return;
+    isLock = true;
+    await delayTest(proxies);
+    isLock = false;
+  }
+
+  _handleChange(String groupName) {
+    if (isExpand) {
+      _animationController.reverse();
+    } else {
+      _animationController.forward();
+    }
+    widget.onChange(groupName);
+  }
+
+  @override
+  void initState() {
+    super.initState();
+    _animationController = AnimationController(
+      duration: const Duration(milliseconds: 200),
+      vsync: this,
+    );
+    _iconTurns = _animationController.drive(
+      Tween<double>(begin: 0.0, end: 0.5),
+    );
+    if (isExpand) {
+      _animationController.value = 1.0;
+    }
+  }
+
+  @override
+  void dispose() {
+    _animationController.dispose();
+    super.dispose();
+  }
+
+  @override
+  void didUpdateWidget(ListHeader oldWidget) {
+    super.didUpdateWidget(oldWidget);
+    if (oldWidget.isExpand != widget.isExpand) {
+      if (isExpand) {
+        _animationController.value = 1.0;
+      } else {
+        _animationController.value = 0.0;
+      }
+    }
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    return CommonCard(
+      key: widget.key,
+      type: CommonCardType.filled,
+      child: Container(
+        padding: const EdgeInsets.all(12),
+        child: Row(
+          mainAxisAlignment: MainAxisAlignment.spaceBetween,
+          children: [
+            Flexible(
+              child: Column(
+                mainAxisSize: MainAxisSize.min,
+                crossAxisAlignment: CrossAxisAlignment.start,
+                children: [
+                  Text(
+                    groupName,
+                    style: context.textTheme.titleMedium,
+                  ),
+                  const SizedBox(
+                    height: 4,
+                  ),
+                  Flexible(
+                    flex: 1,
+                    child: Row(
+                      mainAxisSize: MainAxisSize.min,
+                      mainAxisAlignment: MainAxisAlignment.start,
+                      crossAxisAlignment: CrossAxisAlignment.center,
+                      children: [
+                        Text(
+                          groupType,
+                          style: context.textTheme.labelMedium?.toLight,
+                        ),
+                        Flexible(
+                          flex: 1,
+                          child: currentGroupProxyNameBuilder(
+                            groupName: groupName,
+                            builder: (currentGroupName) {
+                              return Row(
+                                mainAxisSize: MainAxisSize.min,
+                                mainAxisAlignment: MainAxisAlignment.start,
+                                crossAxisAlignment: CrossAxisAlignment.center,
+                                children: [
+                                  if (currentGroupName.isNotEmpty) ...[
+                                    Flexible(
+                                      flex: 1,
+                                      child: EmojiText(
+                                        overflow: TextOverflow.ellipsis,
+                                        " · $currentGroupName",
+                                        style: context
+                                            .textTheme.labelMedium?.toLight,
+                                      ),
+                                    ),
+                                  ]
+                                ],
+                              );
+                            },
+                          ),
+                        ),
+                      ],
+                    ),
+                  ),
+                ],
+              ),
+            ),
+            Row(
+              children: [
+                if (isExpand) ...[
+                  IconButton(
+                    onPressed: () {
+                      widget.onScrollToSelected(groupName);
+                    },
+                    icon: const Icon(
+                      Icons.adjust,
+                    ),
+                  ),
+                  IconButton(
+                    onPressed: () {
+                      _delayTest(widget.group.all);
+                    },
+                    icon: const Icon(
+                      Icons.network_ping,
+                    ),
+                  ),
+                  const SizedBox(
+                    width: 4,
+                  ),
+                ],
+                AnimatedBuilder(
+                  animation: _animationController.view,
+                  builder: (_, __) {
+                    return IconButton.filledTonal(
+                      onPressed: () {
+                        _handleChange(groupName);
+                      },
+                      icon: RotationTransition(
+                        turns: _iconTurns,
+                        child: const Icon(
+                          Icons.expand_more,
+                        ),
+                      ),
+                    );
+                  },
+                )
+              ],
+            )
+          ],
+        ),
+      ),
+      onPressed: () {
+        _handleChange(groupName);
+      },
+    );
+  }
+}

lib/fragments/proxies/providers.dart

@@ -0,0 +1,208 @@
+import 'dart:convert';
+import 'dart:io';
+
+import 'package:fl_clash/clash/clash.dart';
+import 'package:fl_clash/common/common.dart';
+import 'package:fl_clash/models/app.dart';
+import 'package:fl_clash/models/ffi.dart';
+import 'package:fl_clash/state.dart';
+import 'package:fl_clash/widgets/widgets.dart';
+import 'package:flutter/material.dart';
+import 'package:provider/provider.dart';
+
+typedef UpdatingMap = Map<String, bool>;
+
+class Providers extends StatefulWidget {
+  const Providers({
+    super.key,
+  });
+
+  @override
+  State<Providers> createState() => _ProvidersState();
+}
+
+class _ProvidersState extends State<Providers> {
+  @override
+  void initState() {
+    super.initState();
+    WidgetsBinding.instance.addPostFrameCallback(
+      (_) {
+        final commonScaffoldState =
+            context.findAncestorStateOfType<CommonScaffoldState>();
+        commonScaffoldState?.actions = [
+          IconButton(
+            onPressed: () {
+              _updateProviders();
+            },
+            icon: const Icon(
+              Icons.sync,
+            ),
+          )
+        ];
+      },
+    );
+  }
+
+  _updateProviders() async {
+    final appState = globalState.appController.appState;
+    final providers = globalState.appController.appState.providers;
+    final updateProviders = providers.map<Future>(
+      (provider) async {
+        appState.setProvider(
+          provider.copyWith(isUpdating: true),
+        );
+        await clashCore.updateExternalProvider(
+          providerName: provider.name,
+        );
+        appState.setProvider(
+          clashCore.getExternalProvider(provider.name),
+        );
+      },
+    );
+    await Future.wait(updateProviders);
+    await globalState.appController.updateGroupDebounce();
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    return Selector<AppState, List<ExternalProvider>>(
+      selector: (_, appState) => appState.providers,
+      builder: (_, providers, ___) {
+        return ListView.separated(
+          itemBuilder: (_, index) {
+            return ProviderItem(
+              provider: providers[index],
+            );
+          },
+          separatorBuilder: (_, index) {
+            return const Divider(
+              height: 0,
+            );
+          },
+          itemCount: providers.length,
+        );
+      },
+    );
+  }
+}
+
+class ProviderItem extends StatelessWidget {
+  final ExternalProvider provider;
+
+  const ProviderItem({
+    super.key,
+    required this.provider,
+  });
+
+  _handleUpdateProvider() async {
+    await globalState.safeRun<void>(() async {
+      final appState = globalState.appController.appState;
+      if (provider.vehicleType != "HTTP") return;
+      await globalState.safeRun(() async {
+        appState.setProvider(
+          provider.copyWith(
+            isUpdating: true,
+          ),
+        );
+        final message = await clashCore.updateExternalProvider(
+          providerName: provider.name,
+        );
+        if (message.isNotEmpty) throw message;
+      });
+      appState.setProvider(
+        clashCore.getExternalProvider(provider.name),
+      );
+    });
+    await globalState.appController.updateGroupDebounce();
+  }
+
+  _handleSideLoadProvider() async {
+    await globalState.safeRun<void>(() async {
+      final platformFile = await picker.pickerFile();
+      final appState = globalState.appController.appState;
+      final bytes = platformFile?.bytes;
+      if (bytes == null) return;
+      final file = await File(provider.path).create(recursive: true);
+      await file.writeAsBytes(bytes);
+      final providerName = provider.name;
+      var message = await clashCore.sideLoadExternalProvider(
+        providerName: providerName,
+        data: utf8.decode(bytes),
+      );
+      if (message.isNotEmpty) throw message;
+      appState.setProvider(
+        clashCore.getExternalProvider(provider.name),
+      );
+      if (message.isNotEmpty) throw message;
+    });
+    await globalState.appController.updateGroupDebounce();
+  }
+
+  String _buildProviderDesc() {
+    final baseInfo =
+        "${provider.type}(${provider.vehicleType}) ·  ${provider.updateAt.lastUpdateTimeDesc}";
+    final count = provider.count;
+    return switch (count == 0) {
+      true => baseInfo,
+      false => "$baseInfo  ·  $count${appLocalizations.entries}",
+    };
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    return ListItem(
+      padding: const EdgeInsets.symmetric(
+        horizontal: 16,
+        vertical: 4,
+      ),
+      title: Text(provider.name),
+      subtitle: Column(
+        crossAxisAlignment: CrossAxisAlignment.start,
+        children: [
+          const SizedBox(
+            height: 4,
+          ),
+          Text(
+            _buildProviderDesc(),
+          ),
+          Text(
+            provider.path,
+            style: context.textTheme.bodyMedium?.toLight,
+          ),
+          const SizedBox(
+            height: 8,
+          ),
+          Wrap(
+            runSpacing: 6,
+            spacing: 12,
+            children: [
+              CommonChip(
+                avatar: const Icon(Icons.upload),
+                label: appLocalizations.upload,
+                onPressed: _handleSideLoadProvider,
+              ),
+              if (provider.vehicleType == "HTTP")
+                CommonChip(
+                  avatar: const Icon(Icons.sync),
+                  label: appLocalizations.sync,
+                  onPressed: _handleUpdateProvider,
+                ),
+            ],
+          ),
+        ],
+      ),
+      trailing: SizedBox(
+        height: 48,
+        width: 48,
+        child: FadeBox(
+          child: provider.isUpdating
+              ? const Padding(
+                  padding: EdgeInsets.all(8),
+                  child: CircularProgressIndicator(),
+                )
+              : const SizedBox(),
+        ),
+      ),
+    );
+  }
+}

lib/fragments/proxies/proxies.dart

@@ -0,0 +1,100 @@
+import 'package:fl_clash/common/app_localizations.dart';
+import 'package:fl_clash/enum/enum.dart';
+import 'package:fl_clash/fragments/proxies/list.dart';
+import 'package:fl_clash/models/models.dart';
+import 'package:fl_clash/widgets/widgets.dart';
+import 'package:flutter/material.dart';
+import 'package:provider/provider.dart';
+
+import 'providers.dart';
+import 'setting.dart';
+import 'tab.dart';
+
+class ProxiesFragment extends StatefulWidget {
+  const ProxiesFragment({super.key});
+
+  @override
+  State<ProxiesFragment> createState() => _ProxiesFragmentState();
+}
+
+class _ProxiesFragmentState extends State<ProxiesFragment> {
+  final GlobalKey<ProxiesTabFragmentState> _proxiesTabKey = GlobalKey();
+
+  _initActions(ProxiesType proxiesType, bool hasProvider) {
+    WidgetsBinding.instance.addPostFrameCallback((timeStamp) {
+      final commonScaffoldState =
+          context.findAncestorStateOfType<CommonScaffoldState>();
+      commonScaffoldState?.actions = [
+        if (hasProvider) ...[
+          IconButton(
+            onPressed: () {
+              showExtendPage(
+                forceNotSide: true,
+                extendPageWidth: 360,
+                context,
+                body: const Providers(),
+                title: appLocalizations.externalResources,
+              );
+            },
+            icon: const Icon(
+              Icons.swap_vert_circle_outlined,
+            ),
+          ),
+          const SizedBox(
+            width: 8,
+          ),
+        ],
+        if (proxiesType == ProxiesType.tab) ...[
+          IconButton(
+            onPressed: () {
+              _proxiesTabKey.currentState?.scrollToGroupSelected();
+            },
+            icon: const Icon(
+              Icons.adjust_outlined,
+            ),
+          ),
+          const SizedBox(
+            width: 8,
+          )
+        ],
+        IconButton(
+          onPressed: () {
+            showSheet(
+              title: appLocalizations.proxiesSetting,
+              context: context,
+              builder: (context) {
+                return const ProxiesSettingWidget();
+              },
+            );
+          },
+          icon: const Icon(
+            Icons.tune,
+          ),
+        )
+      ];
+    });
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    return Selector<Config, ProxiesType>(
+      selector: (_, config) => config.proxiesType,
+      builder: (_, proxiesType, __) {
+        return ProxiesActionsBuilder(
+          builder: (state, child) {
+            if (state.isCurrent) {
+              _initActions(proxiesType, state.hasProvider);
+            }
+            return child!;
+          },
+          child: switch (proxiesType) {
+            ProxiesType.tab => ProxiesTabFragment(
+                key: _proxiesTabKey,
+              ),
+            ProxiesType.list => const ProxiesListFragment(),
+          },
+        );
+      },
+    );
+  }
+}

lib/fragments/proxies/setting.dart

@@ -0,0 +1,192 @@
+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';
+import 'package:flutter/material.dart';
+import 'package:intl/intl.dart';
+import 'package:provider/provider.dart';
+
+class ProxiesSettingWidget extends StatelessWidget {
+  const ProxiesSettingWidget({super.key});
+
+  IconData _getIconWithProxiesType(ProxiesType type) {
+    return switch (type) {
+      ProxiesType.tab => Icons.view_carousel,
+      ProxiesType.list => Icons.view_list,
+    };
+  }
+
+  IconData _getIconWithProxiesSortType(ProxiesSortType type) {
+    return switch (type) {
+      ProxiesSortType.none => Icons.sort,
+      ProxiesSortType.delay => Icons.network_ping,
+      ProxiesSortType.name => Icons.sort_by_alpha,
+    };
+  }
+
+  String _getStringProxiesSortType(ProxiesSortType type) {
+    return switch (type) {
+      ProxiesSortType.none => appLocalizations.defaultText,
+      ProxiesSortType.delay => appLocalizations.delay,
+      ProxiesSortType.name => appLocalizations.name,
+    };
+  }
+
+  String getTextForProxiesLayout(ProxiesLayout proxiesLayout) {
+    return switch (proxiesLayout) {
+      ProxiesLayout.tight => appLocalizations.tight,
+      ProxiesLayout.standard => appLocalizations.standard,
+      ProxiesLayout.loose => appLocalizations.loose,
+    };
+  }
+
+  List<Widget> _buildStyleSetting() {
+    return generateSection(
+      title: appLocalizations.style,
+      items: [
+        SingleChildScrollView(
+          padding: const EdgeInsets.symmetric(horizontal: 16),
+          scrollDirection: Axis.horizontal,
+          child: Selector<Config, ProxiesType>(
+            selector: (_, config) => config.proxiesType,
+            builder: (_, proxiesType, __) {
+              final config = globalState.appController.config;
+              return Wrap(
+                spacing: 16,
+                children: [
+                  for (final item in ProxiesType.values)
+                    SettingInfoCard(
+                      Info(
+                        label: Intl.message(item.name),
+                        iconData: _getIconWithProxiesType(item),
+                      ),
+                      isSelected: proxiesType == item,
+                      onPressed: () {
+                        config.proxiesType = item;
+                      },
+                    )
+                ],
+              );
+            },
+          ),
+        )
+      ],
+    );
+  }
+
+  List<Widget> _buildSortSetting() {
+    return generateSection(
+      title: appLocalizations.sort,
+      items: [
+        SingleChildScrollView(
+          padding: const EdgeInsets.symmetric(horizontal: 16),
+          scrollDirection: Axis.horizontal,
+          child: Selector<Config, ProxiesSortType>(
+            selector: (_, config) => config.proxiesSortType,
+            builder: (_, proxiesSortType, __) {
+              final config = globalState.appController.config;
+              return Wrap(
+                spacing: 16,
+                children: [
+                  for (final item in ProxiesSortType.values)
+                    SettingInfoCard(
+                      Info(
+                        label: _getStringProxiesSortType(item),
+                        iconData: _getIconWithProxiesSortType(item),
+                      ),
+                      isSelected: proxiesSortType == item,
+                      onPressed: () {
+                        config.proxiesSortType = item;
+                      },
+                    ),
+                ],
+              );
+            },
+          ),
+        ),
+      ],
+    );
+  }
+
+  List<Widget> _buildSizeSetting() {
+    return generateSection(
+      title: appLocalizations.size,
+      items: [
+        SingleChildScrollView(
+          padding: const EdgeInsets.symmetric(horizontal: 16),
+          scrollDirection: Axis.horizontal,
+          child: Selector<Config, ProxyCardType>(
+            selector: (_, config) => config.proxyCardType,
+            builder: (_, proxyCardType, __) {
+              final config = globalState.appController.config;
+              return Wrap(
+                spacing: 16,
+                children: [
+                  for (final item in ProxyCardType.values)
+                    SettingTextCard(
+                      Intl.message(item.name),
+                      isSelected: item == proxyCardType,
+                      onPressed: () {
+                        config.proxyCardType = item;
+                      },
+                    )
+                ],
+              );
+            },
+          ),
+        )
+      ],
+    );
+  }
+
+  List<Widget> _buildLayoutSetting() {
+    return generateSection(
+      title: appLocalizations.layout,
+      items: [
+        SingleChildScrollView(
+          padding: const EdgeInsets.symmetric(
+            horizontal: 16,
+          ),
+          scrollDirection: Axis.horizontal,
+          child: Selector< Config, ProxiesLayout>(
+            selector: (_, config) => config.proxiesLayout,
+            builder: (_, proxiesLayout, __) {
+              final config = globalState.appController.config;
+              return Wrap(
+                spacing: 16,
+                children: [
+                  for (final item in ProxiesLayout.values)
+                    SettingTextCard(
+                      getTextForProxiesLayout(item),
+                      isSelected: item == proxiesLayout,
+                      onPressed: () {
+                        config.proxiesLayout = item;
+                      },
+                    )
+                ],
+              );
+            },
+          ),
+        ),
+      ],
+    );
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    return Padding(
+      padding: const EdgeInsets.only(bottom: 32),
+      child: Column(
+        mainAxisSize: MainAxisSize.min,
+        crossAxisAlignment: CrossAxisAlignment.start,
+        children: [
+          ..._buildStyleSetting(),
+          ..._buildSortSetting(),
+          ..._buildLayoutSetting(),
+          ..._buildSizeSetting(),
+        ],
+      ),
+    );
+  }
+}

lib/fragments/proxies/tab.dart

@@ -0,0 +1,422 @@
+import 'package:collection/collection.dart';
+import 'package:fl_clash/common/common.dart';
+import 'package:fl_clash/enum/enum.dart';
+import 'package:fl_clash/models/models.dart';
+import 'package:fl_clash/state.dart';
+import 'package:fl_clash/widgets/widgets.dart';
+import 'package:flutter/material.dart';
+import 'package:provider/provider.dart';
+
+import 'card.dart';
+import 'common.dart';
+
+typedef GroupNameKeyMap = Map<String, GlobalObjectKey<ProxyGroupViewState>>;
+
+class ProxiesTabFragment extends StatefulWidget {
+  const ProxiesTabFragment({super.key});
+
+  @override
+  State<ProxiesTabFragment> createState() => ProxiesTabFragmentState();
+}
+
+class ProxiesTabFragmentState extends State<ProxiesTabFragment>
+    with TickerProviderStateMixin {
+  TabController? _tabController;
+  final _hasMoreButtonNotifier = ValueNotifier<bool>(false);
+  GroupNameKeyMap _keyMap = {};
+
+  @override
+  void dispose() {
+    super.dispose();
+    _tabController?.dispose();
+  }
+
+  scrollToGroupSelected() {
+    final currentGroupName = globalState.appController.config.currentGroupName;
+    _keyMap[currentGroupName]?.currentState?.scrollToSelected();
+  }
+
+  _buildMoreButton() {
+    return Selector<AppState, bool>(
+      selector: (_, appState) => appState.viewMode == ViewMode.mobile,
+      builder: (_, value, ___) {
+        return IconButton(
+          onPressed: _showMoreMenu,
+          icon: value
+              ? const Icon(
+                  Icons.expand_more,
+                )
+              : const Icon(
+                  Icons.chevron_right,
+                ),
+        );
+      },
+    );
+  }
+
+  _showMoreMenu() {
+    showSheet(
+      context: context,
+      width: 380,
+      isScrollControlled: false,
+      builder: (context) {
+        return SingleChildScrollView(
+          padding: const EdgeInsets.all(16),
+          child: Selector2<AppState, Config, ProxiesSelectorState>(
+            selector: (_, appState, config) {
+              final currentGroups = appState.currentGroups;
+              final groupNames = currentGroups.map((e) => e.name).toList();
+              return ProxiesSelectorState(
+                groupNames: groupNames,
+                currentGroupName: config.currentGroupName,
+              );
+            },
+            builder: (_, state, __) {
+              return SizedBox(
+                width: double.infinity,
+                child: Wrap(
+                  alignment: WrapAlignment.center,
+                  runSpacing: 8,
+                  spacing: 8,
+                  children: [
+                    for (final groupName in state.groupNames)
+                      SettingTextCard(
+                        groupName,
+                        onPressed: () {
+                          final index = state.groupNames
+                              .indexWhere((item) => item == groupName);
+                          if (index == -1) return;
+                          _tabController?.animateTo(index);
+                          globalState.appController.config
+                              .updateCurrentGroupName(
+                            groupName,
+                          );
+                          Navigator.of(context).pop();
+                        },
+                        isSelected: groupName == state.currentGroupName,
+                      )
+                  ],
+                ),
+              );
+            },
+          ),
+        );
+      },
+      title: appLocalizations.proxyGroup,
+    );
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    return Selector2<AppState, Config, ProxiesSelectorState>(
+      selector: (_, appState, config) {
+        final currentGroups = appState.currentGroups;
+        final groupNames = currentGroups.map((e) => e.name).toList();
+        return ProxiesSelectorState(
+          groupNames: groupNames,
+          currentGroupName: config.currentGroupName,
+        );
+      },
+      shouldRebuild: (prev, next) {
+        if (!const ListEquality<String>()
+            .equals(prev.groupNames, next.groupNames)) {
+          _tabController?.dispose();
+          _tabController = null;
+          return true;
+        }
+        return false;
+      },
+      builder: (_, state, __) {
+        final index = state.groupNames.indexWhere(
+          (item) => item == state.currentGroupName,
+        );
+        _tabController ??= TabController(
+          length: state.groupNames.length,
+          initialIndex: index == -1 ? 0 : index,
+          vsync: this,
+        );
+        GroupNameKeyMap keyMap = {};
+        final children = state.groupNames.map((groupName) {
+          keyMap[groupName] = GlobalObjectKey(groupName);
+          return KeepContainer(
+            child: ProxyGroupView(
+              key: keyMap[groupName],
+              groupName: groupName,
+            ),
+          );
+        }).toList();
+        _keyMap = keyMap;
+        return Column(
+          mainAxisAlignment: MainAxisAlignment.start,
+          crossAxisAlignment: CrossAxisAlignment.start,
+          children: [
+            NotificationListener<ScrollMetricsNotification>(
+              onNotification: (scrollNotification) {
+                _hasMoreButtonNotifier.value =
+                    scrollNotification.metrics.maxScrollExtent > 0;
+                return true;
+              },
+              child: ValueListenableBuilder(
+                valueListenable: _hasMoreButtonNotifier,
+                builder: (_, value, child) {
+                  return Stack(
+                    alignment: AlignmentDirectional.centerStart,
+                    children: [
+                      TabBar(
+                        controller: _tabController,
+                        padding: EdgeInsets.only(
+                          left: 16,
+                          right: 16 + (value ? 16 : 0),
+                        ),
+                        onTap: (index) {
+                          final appController = globalState.appController;
+                          final currentGroups =
+                              appController.appState.currentGroups;
+                          if (currentGroups.length > index) {
+                            appController.config.updateCurrentGroupName(
+                              currentGroups[index].name,
+                            );
+                          }
+                        },
+                        dividerColor: Colors.transparent,
+                        isScrollable: true,
+                        tabAlignment: TabAlignment.start,
+                        overlayColor:
+                            const WidgetStatePropertyAll(Colors.transparent),
+                        tabs: [
+                          for (final groupName in state.groupNames)
+                            Tab(
+                              text: groupName,
+                            ),
+                        ],
+                      ),
+                      if (value)
+                        Positioned(
+                          right: 0,
+                          child: child!,
+                        ),
+                    ],
+                  );
+                },
+                child: Container(
+                  decoration: BoxDecoration(
+                    gradient: LinearGradient(
+                        begin: Alignment.centerLeft,
+                        end: Alignment.centerRight,
+                        colors: [
+                          context.colorScheme.surface.withOpacity(0.1),
+                          context.colorScheme.surface,
+                        ],
+                        stops: const [
+                          0.0,
+                          0.1
+                        ]),
+                  ),
+                  child: _buildMoreButton(),
+                ),
+              ),
+            ),
+            Expanded(
+              child: TabBarView(
+                controller: _tabController,
+                children: children,
+              ),
+            )
+          ],
+        );
+      },
+    );
+  }
+}
+
+class ProxyGroupView extends StatefulWidget {
+  final String groupName;
+
+  const ProxyGroupView({
+    super.key,
+    required this.groupName,
+  });
+
+  @override
+  State<ProxyGroupView> createState() => ProxyGroupViewState();
+}
+
+class ProxyGroupViewState extends State<ProxyGroupView> {
+  var isLock = false;
+  final _controller = ScrollController();
+  List<Proxy> _lastProxies = [];
+
+  String get groupName => widget.groupName;
+
+  _delayTest(List<Proxy> proxies) async {
+    if (isLock) return;
+    isLock = true;
+    await delayTest(proxies);
+    isLock = false;
+  }
+
+  @override
+  void dispose() {
+    super.dispose();
+    _controller.dispose();
+  }
+
+  scrollToSelected() {
+    if (_controller.position.maxScrollExtent == 0) {
+      return;
+    }
+    _controller.animateTo(
+      16 +
+          getScrollToSelectedOffset(
+            groupName: groupName,
+            proxies: _lastProxies,
+          ),
+      duration: const Duration(milliseconds: 300),
+      curve: Curves.easeIn,
+    );
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    return Selector2<AppState, Config, ProxyGroupSelectorState>(
+      selector: (_, appState, config) {
+        final group = appState.getGroupWithName(groupName)!;
+        return ProxyGroupSelectorState(
+          proxyCardType: config.proxyCardType,
+          proxiesSortType: config.proxiesSortType,
+          columns: other.getProxiesColumns(
+            appState.viewWidth,
+            config.proxiesLayout,
+          ),
+          sortNum: appState.sortNum,
+          proxies: group.all,
+          groupType: group.type,
+        );
+      },
+      builder: (_, state, __) {
+        final proxies = state.proxies;
+        final columns = state.columns;
+        final proxyCardType = state.proxyCardType;
+        final sortedProxies = globalState.appController.getSortProxies(
+          proxies,
+        );
+        _lastProxies = sortedProxies;
+        return DelayTestButtonContainer(
+          onClick: () async {
+            await _delayTest(
+              proxies,
+            );
+          },
+          child: Align(
+            alignment: Alignment.topCenter,
+            child: GridView.builder(
+              controller: _controller,
+              padding: const EdgeInsets.all(16),
+              gridDelegate: SliverGridDelegateWithFixedCrossAxisCount(
+                crossAxisCount: columns,
+                mainAxisSpacing: 8,
+                crossAxisSpacing: 8,
+                mainAxisExtent: getItemHeight(proxyCardType),
+              ),
+              itemCount: sortedProxies.length,
+              itemBuilder: (_, index) {
+                final proxy = sortedProxies[index];
+                return ProxyCard(
+                  groupType: state.groupType,
+                  type: proxyCardType,
+                  key: ValueKey('$groupName.${proxy.name}'),
+                  proxy: proxy,
+                  groupName: groupName,
+                );
+              },
+            ),
+          ),
+        );
+      },
+    );
+  }
+}
+
+class DelayTestButtonContainer extends StatefulWidget {
+  final Widget child;
+  final Future Function() onClick;
+
+  const DelayTestButtonContainer({
+    super.key,
+    required this.child,
+    required this.onClick,
+  });
+
+  @override
+  State<DelayTestButtonContainer> createState() =>
+      _DelayTestButtonContainerState();
+}
+
+class _DelayTestButtonContainerState extends State<DelayTestButtonContainer>
+    with SingleTickerProviderStateMixin {
+  late AnimationController _controller;
+  late Animation<double> _scale;
+
+  _healthcheck() async {
+    _controller.forward();
+    await widget.onClick();
+    _controller.reverse();
+  }
+
+  @override
+  void initState() {
+    super.initState();
+    _controller = AnimationController(
+      vsync: this,
+      duration: const Duration(
+        milliseconds: 200,
+      ),
+    );
+    _scale = Tween<double>(
+      begin: 1.0,
+      end: 0.0,
+    ).animate(
+      CurvedAnimation(
+        parent: _controller,
+        curve: const Interval(
+          0,
+          1,
+        ),
+      ),
+    );
+  }
+
+  @override
+  void dispose() {
+    _controller.dispose();
+    super.dispose();
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    _controller.reverse();
+    return FloatLayout(
+      floatingWidget: FloatWrapper(
+        child: AnimatedBuilder(
+          animation: _controller.view,
+          builder: (_, child) {
+            return SizedBox(
+              width: 56,
+              height: 56,
+              child: Transform.scale(
+                scale: _scale.value,
+                child: child,
+              ),
+            );
+          },
+          child: FloatingActionButton(
+            heroTag: null,
+            onPressed: _healthcheck,
+            child: const Icon(Icons.network_ping),
+          ),
+        ),
+      ),
+      child: widget.child,
+    );
+  }
+}

lib/fragments/requests.dart

@@ -1,11 +1,9 @@
 import 'dart:async';
-import 'dart:io';
 
 import 'package:collection/collection.dart';
 import 'package:fl_clash/common/common.dart';
 import 'package:fl_clash/enum/enum.dart';
 import 'package:fl_clash/models/models.dart';
-import 'package:fl_clash/plugins/app.dart';
 import 'package:fl_clash/state.dart';
 import 'package:fl_clash/widgets/widgets.dart';
 import 'package:flutter/material.dart';
@@ -68,9 +66,6 @@ class _RequestsFragmentState extends State<RequestsFragment> {
             },
             icon: const Icon(Icons.search),
           ),
-          const SizedBox(
-            width: 8,
-          )
         ];
       },
     );
@@ -156,7 +151,7 @@ class _RequestsFragmentState extends State<RequestsFragment> {
                   controller: _scrollController,
                   itemBuilder: (_, index) {
                     final connection = connections[index];
-                    return RequestItem(
+                    return ConnectionItem(
                       key: Key(connection.id),
                       connection: connection,
                       onClick: _addKeyword,
@@ -178,104 +173,6 @@ class _RequestsFragmentState extends State<RequestsFragment> {
   }
 }
 
-class RequestItem extends StatelessWidget {
-  final Connection connection;
-  final Function(String)? onClick;
-
-  const RequestItem({
-    super.key,
-    required this.connection,
-    this.onClick,
-  });
-
-  Future<ImageProvider?> _getPackageIcon(Connection connection) async {
-    return await app?.getPackageIcon(connection.metadata.process);
-  }
-
-  String _getRequestText(Metadata metadata) {
-    var text = "${metadata.network}://";
-    final ips = [
-      metadata.host,
-      metadata.destinationIP,
-    ].where((ip) => ip.isNotEmpty);
-    text += ips.join("/");
-    text += ":${metadata.destinationPort}";
-    return text;
-  }
-
-  String _getSourceText(Connection connection) {
-    final metadata = connection.metadata;
-    if (metadata.process.isEmpty) {
-      return connection.start.lastUpdateTimeDesc;
-    }
-    return "${metadata.process} · ${connection.start.lastUpdateTimeDesc}";
-  }
-
-  @override
-  Widget build(BuildContext context) {
-    return ListItem(
-      padding: const EdgeInsets.symmetric(
-        horizontal: 16,
-        vertical: 4,
-      ),
-      tileTitleAlignment: ListTileTitleAlignment.titleHeight,
-      leading: Platform.isAndroid
-          ? Container(
-              margin: const EdgeInsets.only(top: 4),
-              width: 48,
-              height: 48,
-              child: FutureBuilder<ImageProvider?>(
-                future: _getPackageIcon(connection),
-                builder: (_, snapshot) {
-                  if (!snapshot.hasData && snapshot.data == null) {
-                    return Container();
-                  } else {
-                    return Image(
-                      image: snapshot.data!,
-                      gaplessPlayback: true,
-                      width: 48,
-                      height: 48,
-                    );
-                  }
-                },
-              ),
-            )
-          : null,
-      title: Text(
-        _getRequestText(connection.metadata),
-      ),
-      subtitle: Column(
-        crossAxisAlignment: CrossAxisAlignment.start,
-        children: [
-          const SizedBox(
-            height: 8,
-          ),
-          Text(
-            _getSourceText(connection),
-          ),
-          const SizedBox(
-            height: 8,
-          ),
-          Wrap(
-            runSpacing: 6,
-            spacing: 6,
-            children: [
-              for (final chain in connection.chains)
-                CommonChip(
-                  label: chain,
-                  onPressed: () {
-                    if (onClick == null) return;
-                    onClick!(chain);
-                  },
-                ),
-            ],
-          ),
-        ],
-      ),
-    );
-  }
-}
-
 class RequestsSearchDelegate extends SearchDelegate {
   ValueNotifier<ConnectionsAndKeywords> requestsNotifier;
 
@@ -394,7 +291,7 @@ class RequestsSearchDelegate extends SearchDelegate {
               child: ListView.separated(
                 itemBuilder: (_, index) {
                   final connection = _results[index];
-                  return RequestItem(
+                  return ConnectionItem(
                     key: Key(connection.id),
                     connection: connection,
                     onClick: (value) {

lib/fragments/resources.dart

@@ -22,91 +22,11 @@ class GeoItem {
   });
 }
 
-@immutable
-class FileInfo {
-  final String size;
-  final DateTime lastModified;
-
-  const FileInfo({
-    required this.size,
-    required this.lastModified,
-  });
-}
-
-class Resources extends StatefulWidget {
+class Resources extends StatelessWidget {
   const Resources({super.key});
 
   @override
-  State<Resources> createState() => _ResourcesState();
-}
-
-class _ResourcesState extends State<Resources> {
-  List<ExternalProvider> externalProviders = [];
-
-  List<GlobalObjectKey<_ProviderItemState>> providerItemKeys = [];
-
-  @override
-  void initState() {
-    super.initState();
-    WidgetsBinding.instance.addPostFrameCallback((_) {
-      _syncExternalProviders();
-    });
-  }
-
-  _syncExternalProviders() async {
-    externalProviders = await clashCore.getExternalProviders();
-    if (mounted) {
-      setState(() {});
-    }
-  }
-
-  _updateProviders() async {
-    final updateProviders = providerItemKeys.map<Future>(
-      (key) async => await key.currentState?.updateProvider(false),
-    );
-    await Future.wait(updateProviders);
-    _syncExternalProviders();
-  }
-
-  List<Widget> _buildExternalProviderSection() {
-    List<GlobalObjectKey<_ProviderItemState>> keys = [];
-    final res = generateInfoSection(
-      info: Info(
-        iconData: Icons.source,
-        label: appLocalizations.externalResources,
-      ),
-      actions: [
-        IconButton.filledTonal(
-          onPressed: () {
-            _updateProviders();
-          },
-          padding: const EdgeInsets.all(4),
-          iconSize: 20,
-          icon: const Icon(
-            Icons.sync,
-          ),
-        )
-      ],
-      items: externalProviders.map(
-        (externalProvider) {
-          final key =
-              GlobalObjectKey<_ProviderItemState>(externalProvider.name);
-          keys.add(key);
-          return ProviderItem(
-            key: key,
-            provider: externalProvider,
-            onUpdated: () {
-              _syncExternalProviders();
-            },
-          );
-        },
-      ),
-    );
-    providerItemKeys = keys;
-    return res;
-  }
-
-  List<Widget> _buildGeoDataSection() {
+  Widget build(BuildContext context) {
     const geoItems = <GeoItem>[
       GeoItem(
         label: "GeoIp",
@@ -122,26 +42,19 @@ class _ResourcesState extends State<Resources> {
       GeoItem(label: "ASN", fileName: asnFileName, key: "asn"),
     ];
 
-    return generateInfoSection(
-      info: Info(
-        iconData: Icons.storage,
-        label: appLocalizations.geoData,
-      ),
-      items: geoItems.map(
-        (geoItem) => GeoDataListItem(
+    return ListView.separated(
+      itemBuilder: (_, index) {
+        final geoItem = geoItems[index];
+        return GeoDataListItem(
           geoItem: geoItem,
-        ),
-      ),
-    );
-  }
-
-  @override
-  Widget build(BuildContext context) {
-    return generateListView(
-      [
-        ..._buildGeoDataSection(),
-        ..._buildExternalProviderSection(),
-      ],
+        );
+      },
+      separatorBuilder: (BuildContext context, int index) {
+        return const Divider(
+          height: 0,
+        );
+      },
+      itemCount: geoItems.length,
     );
   }
 }
@@ -196,27 +109,11 @@ class _GeoDataListItemState extends State<GeoDataListItem> {
     final lastModified = await file.lastModified();
     final size = await file.length();
     return FileInfo(
-      size: TrafficValue(value: size).show,
+      size: size,
       lastModified: lastModified,
     );
   }
 
-  // _uploadGeoFile(String fileName) async {
-  //   final res = await picker.pickerGeoDataFile();
-  //   if (res == null || res.bytes == null) return;
-  //   final homePath = await appPath.getHomeDirPath();
-  //   final file = File(join(homePath, fileName));
-  //   await file.writeAsBytes(
-  //     res.bytes!,
-  //     flush: true,
-  //   );
-  //   setState(() {});
-  // }
-
-  String _buildFileInfoDesc(FileInfo fileInfo) {
-    return "${fileInfo.size}  ·  ${fileInfo.lastModified.lastUpdateTimeDesc}";
-  }
-
   Widget _buildSubtitle(String url) {
     return Column(
       crossAxisAlignment: CrossAxisAlignment.start,
@@ -240,7 +137,7 @@ class _GeoDataListItemState extends State<GeoDataListItem> {
                         ),
                       )
                     : Text(
-                        _buildFileInfoDesc(snapshot.data!),
+                        snapshot.data!.desc,
                       ),
               ),
             );
@@ -253,9 +150,6 @@ class _GeoDataListItemState extends State<GeoDataListItem> {
         const SizedBox(
           height: 8,
         ),
-        const SizedBox(
-          height: 8,
-        ),
         Wrap(
           runSpacing: 6,
           spacing: 12,
@@ -288,9 +182,9 @@ class _GeoDataListItemState extends State<GeoDataListItem> {
   updateGeoDateItem() async {
     isUpdating.value = true;
     try {
-      final message = await clashCore.updateExternalProvider(
-        providerName: geoItem.fileName,
-        providerType: geoItem.label,
+      final message = await clashCore.updateGeoData(
+        geoName: geoItem.fileName,
+        geoType: geoItem.label,
       );
       if (message.isNotEmpty) throw message;
     } catch (e) {
@@ -342,117 +236,6 @@ class _GeoDataListItemState extends State<GeoDataListItem> {
   }
 }
 
-class ProviderItem extends StatefulWidget {
-  final ExternalProvider provider;
-  final Function onUpdated;
-
-  const ProviderItem({
-    super.key,
-    required this.provider,
-    required this.onUpdated,
-  });
-
-  @override
-  State<ProviderItem> createState() => _ProviderItemState();
-}
-
-class _ProviderItemState extends State<ProviderItem> {
-  final isUpdating = ValueNotifier<bool>(false);
-
-  ExternalProvider get provider => widget.provider;
-
-  _handleUpdateProfile() async {
-    await globalState.safeRun<void>(updateProvider);
-    widget.onUpdated();
-  }
-
-  updateProvider([isSingle = true]) async {
-    if (provider.vehicleType != "HTTP") return;
-    isUpdating.value = true;
-    try {
-      final message = await clashCore.updateExternalProvider(
-        providerName: provider.name,
-        providerType: provider.type,
-      );
-      if (message.isNotEmpty) throw message;
-    } catch (e) {
-      isUpdating.value = false;
-      if (!isSingle) {
-        return e.toString();
-      } else {
-        rethrow;
-      }
-    }
-    isUpdating.value = false;
-    return null;
-  }
-
-  String _buildProviderDesc() {
-    return "${provider.type} (${provider.vehicleType})  ·  ${provider.updateAt.lastUpdateTimeDesc}";
-  }
-
-  @override
-  void dispose() {
-    super.dispose();
-    isUpdating.dispose();
-  }
-
-  Widget _buildSubtitle() {
-    return Column(
-      crossAxisAlignment: CrossAxisAlignment.start,
-      children: [
-        const SizedBox(
-          height: 4,
-        ),
-        Text(
-          _buildProviderDesc(),
-        ),
-        if (provider.vehicleType == "HTTP") ...[
-          const SizedBox(
-            height: 8,
-          ),
-          CommonChip(
-            avatar: const Icon(Icons.sync),
-            label: appLocalizations.sync,
-            onPressed: () {
-              _handleUpdateProfile();
-            },
-          ),
-        ],
-      ],
-    );
-  }
-
-  @override
-  Widget build(BuildContext context) {
-    return ListItem(
-      padding: const EdgeInsets.symmetric(
-        horizontal: 16,
-        vertical: 4,
-      ),
-      title: Text(provider.name),
-      subtitle: _buildSubtitle(),
-      trailing: SizedBox(
-        height: 48,
-        width: 48,
-        child: ValueListenableBuilder(
-          valueListenable: isUpdating,
-          builder: (_, isUpdating, ___) {
-            return FadeBox(
-              child: isUpdating
-                  ? const Padding(
-                      padding: EdgeInsets.all(8),
-                      child: CircularProgressIndicator(),
-                    )
-                  : const SizedBox(),
-            );
-          },
-        ),
-      ),
-    );
-  }
-}
-
 class UpdateGeoUrlFormDialog extends StatefulWidget {
   final String title;
   final String url;
@@ -510,4 +293,4 @@ class _UpdateGeoUrlFormDialogState extends State<UpdateGeoUrlFormDialog> {
       ],
     );
   }
-}
+}

lib/fragments/theme.dart

@@ -21,8 +21,71 @@ class ThemeModeItem {
 class ThemeFragment extends StatelessWidget {
   const ThemeFragment({super.key});
 
+  @override
+  Widget build(BuildContext context) {
+    final previewCard = Padding(
+      padding: const EdgeInsets.symmetric(horizontal: 16),
+      child: CommonCard(
+        onPressed: () {},
+        info: Info(
+          label: appLocalizations.preview,
+          iconData: Icons.looks,
+        ),
+        child: Container(
+          height: 200,
+        ),
+      ),
+    );
+    return SingleChildScrollView(
+      child: Column(
+        mainAxisSize: MainAxisSize.min,
+        children: [
+          previewCard,
+          const ThemeColorsBox(),
+        ],
+      ),
+    );
+  }
+}
+
+class ItemCard extends StatelessWidget {
+  final Widget child;
+  final Info info;
+
+  const ItemCard({
+    super.key,
+    required this.info,
+    required this.child,
+  });
+
+  @override
+  Widget build(BuildContext context) {
+    return Padding(
+      padding: const EdgeInsets.only(
+        top: 16,
+      ),
+      child: Wrap(
+        runSpacing: 16,
+        children: [
+          InfoHeader(
+            info: info,
+          ),
+          child,
+        ],
+      ),
+    );
+  }
+}
+
+class ThemeColorsBox extends StatefulWidget {
+  const ThemeColorsBox({super.key});
+
+  @override
+  State<ThemeColorsBox> createState() => _ThemeColorsBoxState();
+}
+
+class _ThemeColorsBoxState extends State<ThemeColorsBox> {
   Widget _themeModeCheckBox({
-    required BuildContext context,
     bool? isSelected,
     required ThemeModeItem themeModeItem,
   }) {
@@ -32,7 +95,7 @@ class ThemeFragment extends StatelessWidget {
         globalState.appController.config.themeMode = themeModeItem.themeMode;
       },
       child: Padding(
-        padding: const EdgeInsets.symmetric(horizontal:16),
+        padding: const EdgeInsets.symmetric(horizontal: 16),
         child: Row(
           mainAxisSize: MainAxisSize.min,
           mainAxisAlignment: MainAxisAlignment.start,
@@ -55,7 +118,6 @@ class ThemeFragment extends StatelessWidget {
   }
 
   Widget _primaryColorCheckBox({
-    required BuildContext context,
     bool? isSelected,
     Color? color,
   }) {
@@ -68,28 +130,8 @@ class ThemeFragment extends StatelessWidget {
     );
   }
 
-  Widget _itemCard({
-    required BuildContext context,
-    required Info info,
-    required Widget child,
-  }) {
-    return Padding(
-      padding: const EdgeInsets.only(
-        top: 16,
-      ),
-      child: Wrap(
-        runSpacing: 16,
-        children: [
-          InfoHeader(
-            info: info,
-          ),
-          child,
-        ],
-      ),
-    );
-  }
-
-  Widget _getThemeCard(BuildContext context) {
+  @override
+  Widget build(BuildContext context) {
     List<ThemeModeItem> themeModeItems = [
       ThemeModeItem(
         iconData: Icons.auto_mode,
@@ -118,8 +160,7 @@ class ThemeFragment extends StatelessWidget {
     ];
     return Column(
       children: [
-        _itemCard(
-          context: context,
+        ItemCard(
           info: Info(
             label: appLocalizations.themeMode,
             iconData: Icons.brightness_high,
@@ -137,7 +178,6 @@ class ThemeFragment extends StatelessWidget {
                     final themeModeItem = themeModeItems[index];
                     return _themeModeCheckBox(
                       isSelected: themeMode == themeModeItem.themeMode,
-                      context: context,
                       themeModeItem: themeModeItem,
                     );
                   },
@@ -151,8 +191,7 @@ class ThemeFragment extends StatelessWidget {
             },
           ),
         ),
-        _itemCard(
-          context: context,
+        ItemCard(
           info: Info(
             label: appLocalizations.themeColor,
             iconData: Icons.palette,
@@ -172,7 +211,6 @@ class ThemeFragment extends StatelessWidget {
                   itemBuilder: (_, index) {
                     final primaryColor = primaryColors[index];
                     return _primaryColorCheckBox(
-                      context: context,
                       isSelected: currentPrimaryColor == primaryColor?.value,
                       color: primaryColor,
                     );
@@ -188,33 +226,28 @@ class ThemeFragment extends StatelessWidget {
             ),
           ),
         ),
+        Padding(
+          padding: const EdgeInsets.symmetric(vertical: 16),
+          child: Selector<Config, bool>(
+            selector: (_, config) => config.prueBlack,
+            builder: (_, value, ___) {
+              return ListItem.switchItem(
+                leading: Icon(
+                  Icons.contrast,
+                  color: context.colorScheme.primary,
+                ),
+                title: Text(appLocalizations.prueBlackMode),
+                delegate: SwitchDelegate(
+                  value: value,
+                  onChanged: (value){
+                    globalState.appController.config.prueBlack = value;
+                  }
+                ),
+              );
+            },
+          ),
+        )
       ],
     );
   }
-
-  @override
-  Widget build(BuildContext context) {
-    final themeCard = _getThemeCard(context);
-    final previewCard = Padding(
-      padding: const EdgeInsets.symmetric(horizontal: 16),
-      child: CommonCard(
-        info: Info(
-          label: appLocalizations.preview,
-          iconData: Icons.looks,
-        ),
-        child: Container(
-          height: 200,
-        ),
-      ),
-    );
-    return SingleChildScrollView(
-      child: Column(
-        mainAxisSize: MainAxisSize.min,
-        children: [
-          previewCard,
-          themeCard,
-        ],
-      ),
-    );
-  }
 }

lib/l10n/arb/intl_en.arb

@@ -66,6 +66,7 @@
   "hours": "Hours",
   "days": "Days",
   "minutes": "Minutes",
+  "seconds": "Seconds",
   "ago": " Ago",
   "just": "Just",
   "qrcode": "QR code",
@@ -130,12 +131,10 @@
   "notSelectedTip": "The current proxy group cannot be selected.",
   "tip": "tip",
   "backupAndRecovery": "Backup and Recovery",
-  "backupAndRecoveryDesc": "Sync data by WebDAV",
+  "backupAndRecoveryDesc": "Sync data via WebDAV or file",
   "account": "Account",
   "backup": "Backup",
-  "backupDesc": "Backup local data to WebDAV",
   "recovery": "Recovery",
-  "recoveryDesc": "Recovery data from WebDAV",
   "recoveryProfiles": "Only recovery profiles",
   "recoveryAll": "Recovery all data",
   "recoverySuccess": "Recovery success",
@@ -177,14 +176,14 @@
   "geodataLoader": "Geo Low Memory Mode",
   "geodataLoaderDesc": "Enabling will use the Geo low memory loader",
   "requests": "Requests",
-  "requestsDesc": "View recently requested data",
+  "requestsDesc": "View recently request records",
   "findProcessMode": "Find process",
   "findProcessModeDesc": "There is a risk of flashback after opening",
   "init": "Init",
   "infiniteTime": "Long term effective",
   "expirationTime": "Expiration time",
   "connections": "Connections",
-  "connectionsDesc": "View current connection",
+  "connectionsDesc": "View current connections data",
   "nullRequestsDesc": "No requests",
   "nullConnectionsDesc": "No connections",
   "intranetIP": "Intranet IP",
@@ -195,5 +194,52 @@
   "testUrl": "Test url",
   "sync": "Sync",
   "exclude": "Hidden from recent tasks",
-  "excludeDesc": "When the app is in the background, the app is hidden from the recent task"
+  "excludeDesc": "When the app is in the background, the app is hidden from the recent task",
+  "oneColumn": "One column",
+  "twoColumns": "Two columns",
+  "threeColumns": "Three columns",
+  "fourColumns": "Four columns",
+  "expand": "Standard",
+  "shrink": "Shrink",
+  "min": "Min",
+  "tab": "Tab",
+  "list": "List",
+  "delay": "Delay",
+  "style": "Style",
+  "size": "Size",
+  "sort": "Sort",
+  "columns": "Columns",
+  "proxiesSetting": "Proxies setting",
+  "proxyGroup": "Proxy group",
+  "go": "Go",
+  "externalLink": "External link",
+  "otherContributors": "Other contributors",
+  "autoCloseConnections": "Auto lose connections",
+  "autoCloseConnectionsDesc": "Auto close connections after change node",
+  "onlyStatisticsProxy": "Only statistics proxy",
+  "onlyStatisticsProxyDesc": "When turned on, only statistics proxy traffic",
+  "deleteProfileTip": "Sure you want to delete the current profile?",
+  "prueBlackMode": "Prue black mode",
+  "keepAliveIntervalDesc": "Tcp keep alive interval",
+  "entries": " entries",
+  "local": "Local",
+  "remote": "Remote",
+  "remoteBackupDesc": "Backup local data to WebDAV",
+  "remoteRecoveryDesc": "Recovery data from WebDAV",
+  "localBackupDesc": "Backup local data to local",
+  "localRecoveryDesc": "Recovery data from file",
+  "mode": "Mode",
+  "time": "Time",
+  "source": "Source",
+  "allApps": "All apps",
+  "onlyOtherApps": "Only third-party apps",
+  "action": "Action",
+  "intelligentSelected": "Intelligent selection",
+  "clipboardImport": "Clipboard import",
+  "clipboardExport": "Export clipboard",
+  "layout": "Layout",
+  "tight": "Tight",
+  "standard": "Standard",
+  "loose": "Loose",
+  "profilesSort": "Profiles sort"
 }