Fix android notification icon error

2024-06-08 22:51:58 +08:00
130 changed files with 3067 additions and 14191 deletions
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -3,7 +3,7 @@ name: build
 on:
  push:
    tags:
-      - 'v*'
+      - '*'

 jobs:
  build:
@@ -17,30 +17,10 @@ jobs:
            os: windows-latest
          - platform: linux
            os: ubuntu-latest
-          - platform: macos
-            os: macos-13
+#          - platform: macos
+#            os: macos-13

    steps:
-      - name: Setup Mingw64
-        if: startsWith(matrix.platform,'windows')
-        uses: msys2/setup-msys2@v2
-        with:
-          msystem: mingw64
-          install: mingw-w64-x86_64-gcc
-          update: true
-
-
-      - name: Set Mingw64 Env
-        if: startsWith(matrix.platform,'windows')
-        run: |
-          echo "${{ runner.temp }}\msys64\mingw64\bin" | Out-File -FilePath $env:GITHUB_PATH -Encoding utf8 -Append
-
-      - name: Check Matrix
-        run: |
-          echo "Running on ${{ matrix.os }}"
-          echo "Arch: ${{ runner.arch }}"
-          gcc --version
-
      - name: Checkout
        uses: actions/checkout@v4
        with:
@@ -66,10 +46,10 @@ jobs:
        if: startsWith(matrix.platform,'android')
        run: |
          echo "${{ secrets.KEYSTORE }}" | base64 --decode > android/app/keystore.jks
-          echo "keyAlias=${{ secrets.KEY_ALIAS }}" >> android/local.properties
+          echo "keyAlias=${{ secrets.KEY_ALIAS }}" >> android/local.properties    
          echo "storePassword=${{ secrets.STORE_PASSWORD }}" >> android/local.properties
          echo "keyPassword=${{ secrets.KEY_PASSWORD }}" >> android/local.properties
-
+          

      - name: Setup Go
        uses: actions/setup-go@v5
@@ -102,7 +82,7 @@ jobs:


  upload-release:
-    if: ${{ !contains(github.ref, '+') }}
+    if: ${{ !endsWith(github.ref, '-debug') }}
    permissions: write-all
    needs: [ build ]
    runs-on: ubuntu-latest
--- a/.gitmodules
+++ b/.gitmodules
@@ -5,4 +5,4 @@
 [submodule "plugins/flutter_distributor"]
 	path = plugins/flutter_distributor
 	url = git@github.com:chen08209/flutter_distributor.git
-	branch = FlClash
+	branch = main
--- a/android/app/build.gradle
+++ b/android/app/build.gradle
@@ -62,7 +62,7 @@ android {

    defaultConfig {
        applicationId "com.follow.clash"
-        minSdkVersion 21
+        minSdkVersion 24
        targetSdkVersion 34
        versionCode flutterVersionCode.toInteger()
        versionName flutterVersionName
--- a/android/app/src/main/AndroidManifest.xml
+++ b/android/app/src/main/AndroidManifest.xml
@@ -23,9 +23,7 @@
        android:name="${applicationName}"
        android:icon="@mipmap/ic_launcher"
        android:networkSecurityConfig="@xml/network_security_config"
-        android:extractNativeLibs="true"
-        android:label="FlClash"
-        tools:targetApi="n">
+        android:label="FlClash">
        <activity
            android:name="com.follow.clash.MainActivity"
            android:configChanges="orientation|keyboardHidden|keyboard|screenSize|smallestScreenSize|locale|layoutDirection|fontScale|screenLayout|density|uiMode"
--- a/android/app/src/main/kotlin/com/follow/clash/GlobalState.kt
+++ b/android/app/src/main/kotlin/com/follow/clash/GlobalState.kt
@@ -1,15 +1,9 @@
 package com.follow.clash

-import android.content.Context
 import androidx.lifecycle.MutableLiveData
-import com.follow.clash.plugins.AppPlugin
-import com.follow.clash.plugins.ProxyPlugin
 import com.follow.clash.plugins.TilePlugin
-import io.flutter.FlutterInjector
 import io.flutter.embedding.engine.FlutterEngine
-import io.flutter.embedding.engine.dart.DartExecutor
-import java.util.concurrent.locks.ReentrantLock
-import kotlin.concurrent.withLock
+import java.util.Date

 enum class RunState {
    START,
@@ -17,46 +11,13 @@ enum class RunState {
    STOP
 }

-
-object GlobalState {
-
-    private val lock = ReentrantLock()
-
-    val runState: MutableLiveData<RunState> = MutableLiveData<RunState>(RunState.STOP)
-    var flutterEngine: FlutterEngine? = null
-    private var serviceEngine: FlutterEngine? = null
-
-    fun getCurrentAppPlugin(): AppPlugin? {
-        val currentEngine = if (flutterEngine != null) flutterEngine else serviceEngine
-        return currentEngine?.plugins?.get(AppPlugin::class.java) as AppPlugin?
-    }
-
-    fun getCurrentTitlePlugin(): TilePlugin? {
-        val currentEngine = if (flutterEngine != null) flutterEngine else serviceEngine
-        return currentEngine?.plugins?.get(TilePlugin::class.java) as TilePlugin?
-    }
-
-    fun destroyServiceEngine() {
-        serviceEngine?.destroy()
-        serviceEngine = null
-    }
-
-    fun initServiceEngine(context: Context) {
-        if (serviceEngine != null) return
-        lock.withLock {
-            if (serviceEngine != null) return
-            serviceEngine = FlutterEngine(context)
-            serviceEngine?.plugins?.add(ProxyPlugin())
-            serviceEngine?.plugins?.add(AppPlugin())
-            serviceEngine?.plugins?.add(TilePlugin())
-            val vpnService = DartExecutor.DartEntrypoint(
-                FlutterInjector.instance().flutterLoader().findAppBundlePath(),
-                "vpnService"
-            )
-            serviceEngine?.dartExecutor?.executeDartEntrypoint(
-                vpnService,
-            )
-        }
+class GlobalState {
+    companion object {
+        val runState: MutableLiveData<RunState> = MutableLiveData<RunState>(RunState.STOP)
+        var runTime: Date? = null
+        var flutterEngine: FlutterEngine? = null
+        fun getCurrentTilePlugin(): TilePlugin? =
+            flutterEngine?.plugins?.get(TilePlugin::class.java) as TilePlugin?
    }
 }

--- a/android/app/src/main/kotlin/com/follow/clash/MainActivity.kt
+++ b/android/app/src/main/kotlin/com/follow/clash/MainActivity.kt
@@ -10,6 +10,7 @@ import io.flutter.embedding.engine.FlutterEngine
 class MainActivity : FlutterActivity() {

    override fun configureFlutterEngine(flutterEngine: FlutterEngine) {
+        GlobalState.flutterEngine?.destroy()
        super.configureFlutterEngine(flutterEngine)
        flutterEngine.plugins.add(AppPlugin())
        flutterEngine.plugins.add(ProxyPlugin())
--- a/android/app/src/main/kotlin/com/follow/clash/extensions/Drawable.kt
+++ b/android/app/src/main/kotlin/com/follow/clash/extensions/Drawable.kt
@@ -1,18 +1,17 @@
 package com.follow.clash.extensions

+import java.net.InetSocketAddress
+
 import android.graphics.Bitmap
 import android.graphics.drawable.Drawable
 import android.system.OsConstants.IPPROTO_TCP
 import android.system.OsConstants.IPPROTO_UDP
 import android.util.Base64
-import java.net.URL
 import androidx.core.graphics.drawable.toBitmap
 import com.follow.clash.models.Metadata
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.withContext
 import java.io.ByteArrayOutputStream
-import java.net.InetAddress
-import java.net.InetSocketAddress


 suspend fun Drawable.getBase64(): String {
@@ -30,8 +29,3 @@ fun Metadata.getProtocol(): Int? {
    if (network.startsWith("udp")) return IPPROTO_UDP
    return null
 }
-
-fun String.getInetSocketAddress(): InetSocketAddress {
-    val url = URL("https://$this")
-    return InetSocketAddress(InetAddress.getByName(url.host), url.port)
-}
--- a/android/app/src/main/kotlin/com/follow/clash/models/AccessControl.kt
+++ b/android/app/src/main/kotlin/com/follow/clash/models/AccessControl.kt
@@ -10,9 +10,3 @@ data class AccessControl(
    val acceptList: List<String>,
    val rejectList: List<String>,
 )
-
-data class Props(
-    val accessControl: AccessControl?,
-    val allowBypass: Boolean?,
-    val systemProxy: Boolean?,
-)
--- a/android/app/src/main/kotlin/com/follow/clash/models/Metadata.kt
+++ b/android/app/src/main/kotlin/com/follow/clash/models/Metadata.kt
@@ -1,15 +1,11 @@
 package com.follow.clash.models

-data class Process(
-    val id: Int,
-    val metadata: Metadata,
-)
-
 data class Metadata(
    val network: String,
    val sourceIP: String,
    val sourcePort: Int,
    val destinationIP: String,
    val destinationPort: Int,
+    val remoteDestination: String,
    val host: String
 )
--- a/android/app/src/main/kotlin/com/follow/clash/plugins/AppPlugin.kt
+++ b/android/app/src/main/kotlin/com/follow/clash/plugins/AppPlugin.kt
@@ -2,27 +2,24 @@ package com.follow.clash.plugins

 import android.Manifest
 import android.app.Activity
-import android.app.ActivityManager
 import android.content.Context
 import android.content.pm.ApplicationInfo
 import android.content.pm.PackageManager
 import android.net.ConnectivityManager
 import android.os.Build
 import android.widget.Toast
-import androidx.core.content.ContextCompat.getSystemService
+import androidx.annotation.RequiresApi
 import androidx.core.content.getSystemService
-import com.follow.clash.GlobalState
 import com.follow.clash.extensions.getBase64
 import com.follow.clash.extensions.getProtocol
+import com.follow.clash.models.Metadata
 import com.follow.clash.models.Package
-import com.follow.clash.models.Process
 import com.google.gson.Gson
 import io.flutter.embedding.engine.plugins.FlutterPlugin
 import io.flutter.embedding.engine.plugins.activity.ActivityAware
 import io.flutter.embedding.engine.plugins.activity.ActivityPluginBinding
 import io.flutter.plugin.common.MethodCall
 import io.flutter.plugin.common.MethodChannel
-import io.flutter.plugin.common.MethodChannel.Result
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.cancel
@@ -30,7 +27,6 @@ import kotlinx.coroutines.launch
 import kotlinx.coroutines.withContext
 import java.net.InetSocketAddress

-
 class AppPlugin : FlutterPlugin, MethodChannel.MethodCallHandler, ActivityAware {

    private var activity: Activity? = null
@@ -48,41 +44,31 @@ class AppPlugin : FlutterPlugin, MethodChannel.MethodCallHandler, ActivityAware
    private val iconMap = mutableMapOf<String, String?>()

    override fun onAttachedToEngine(flutterPluginBinding: FlutterPlugin.FlutterPluginBinding) {
-        scope = CoroutineScope(Dispatchers.Default)
        context = flutterPluginBinding.applicationContext;
        channel = MethodChannel(flutterPluginBinding.binaryMessenger, "app")
        channel.setMethodCallHandler(this)
-
    }

    override fun onDetachedFromEngine(binding: FlutterPlugin.FlutterPluginBinding) {
        channel.setMethodCallHandler(null)
-        scope.cancel()
    }

    private fun tip(message: String?) {
-        if(GlobalState.flutterEngine == null){
-            if (toast != null) {
-                toast!!.cancel()
-            }
-            toast = Toast.makeText(context, message, Toast.LENGTH_SHORT)
-            toast!!.show()
+        if (toast != null) {
+            toast!!.cancel()
        }
+        toast = Toast.makeText(context, message, Toast.LENGTH_SHORT)
+        toast!!.show()
    }

-    override fun onMethodCall(call: MethodCall, result: Result) {
+    @RequiresApi(Build.VERSION_CODES.Q)
+    override fun onMethodCall(call: MethodCall, result: MethodChannel.Result) {
        when (call.method) {
            "moveTaskToBack" -> {
                activity?.moveTaskToBack(true)
                result.success(true);
            }

-            "updateExcludeFromRecents" -> {
-                val value = call.argument<Boolean>("value")
-                updateExcludeFromRecents(value)
-                result.success(true);
-            }
-
            "getPackages" -> {
                scope.launch {
                    result.success(getPackages())
@@ -92,34 +78,21 @@ class AppPlugin : FlutterPlugin, MethodChannel.MethodCallHandler, ActivityAware
            "getPackageIcon" -> {
                scope.launch {
                    val packageName = call.argument<String>("packageName")
-                    if (packageName == null) {
+                    if (packageName != null) {
+                        result.success(getPackageIcon(packageName))
+                    } else {
                        result.success(null)
-                        return@launch
-                    }
-                    val packageIcon = getPackageIcon(packageName)
-                    packageIcon.let {
-                        if (it != null) {
-                            result.success(it)
-                            return@launch
-                        }
-                        if (iconMap["default"] == null) {
-                            iconMap["default"] =
-                                context?.packageManager?.defaultActivityIcon?.getBase64()
-                        }
-                        result.success(iconMap["default"])
-                        return@launch
                    }
                }
            }

-            "resolverProcess" -> {
+            "getPackageName" -> {
                val data = call.argument<String>("data")
-                val process =
+                val metadata =
                    if (data != null) Gson().fromJson(
                        data,
-                        Process::class.java
+                        Metadata::class.java
                    ) else null
-                val metadata = process?.metadata
                val protocol = metadata?.getProtocol()
                if (protocol == null) {
                    result.success(null)
@@ -127,27 +100,17 @@ class AppPlugin : FlutterPlugin, MethodChannel.MethodCallHandler, ActivityAware
                }
                scope.launch {
                    withContext(Dispatchers.Default) {
-                        if (Build.VERSION.SDK_INT < Build.VERSION_CODES.Q) {
-                            result.success(null)
-                            return@withContext
-                        }
-                        if (context == null) {
-                            result.success(null)
-                            return@withContext
-                        }
+                        if (context == null) result.success(null)
+                        val source = InetSocketAddress(metadata.sourceIP, metadata.sourcePort)
+                        val target = InetSocketAddress(
+                            metadata.host.ifEmpty { metadata.destinationIP },
+                            metadata.destinationPort
+                        )
                        if (connectivity == null) {
                            connectivity = context!!.getSystemService<ConnectivityManager>()
                        }
-                        val src = InetSocketAddress(metadata.sourceIP, metadata.sourcePort)
-                        val dst = InetSocketAddress(
-                            metadata.destinationIP.ifEmpty { metadata.host },
-                            metadata.destinationPort
-                        )
-                        val uid = try {
-                            connectivity?.getConnectionOwnerUid(protocol, src, dst)
-                        } catch (_: Exception) {
-                            null
-                        }
+                        val uid =
+                            connectivity?.getConnectionOwnerUid(protocol, source, target)
                        if (uid == null || uid == -1) {
                            result.success(null)
                            return@withContext
@@ -162,6 +125,7 @@ class AppPlugin : FlutterPlugin, MethodChannel.MethodCallHandler, ActivityAware
                val message = call.argument<String>("message")
                tip(message)
                result.success(true)
+
            }

            else -> {
@@ -170,39 +134,16 @@ class AppPlugin : FlutterPlugin, MethodChannel.MethodCallHandler, ActivityAware
        }
    }

-    private fun updateExcludeFromRecents(value: Boolean?) {
-        if (context == null) return
-        val am = getSystemService(context!!, ActivityManager::class.java)
-        val task = am?.appTasks?.firstOrNull {
-            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) {
-                it.taskInfo.taskId == activity?.taskId
-            } else {
-                it.taskInfo.id == activity?.taskId
-            }
-        }
-
-        when (value) {
-            true -> task?.setExcludeFromRecents(value)
-            false -> task?.setExcludeFromRecents(value)
-            null -> task?.setExcludeFromRecents(false)
-        }
-    }
-
    private suspend fun getPackageIcon(packageName: String): String? {
        val packageManager = context?.packageManager
        if (iconMap[packageName] == null) {
-            iconMap[packageName] = try {
-                packageManager?.getApplicationIcon(packageName)?.getBase64()
-            } catch (_: Exception) {
-                null
-            }
-
+            iconMap[packageName] = packageManager?.getApplicationIcon(packageName)?.getBase64()
        }
        return iconMap[packageName]
    }

    private suspend fun getPackages(): String {
-        return withContext(Dispatchers.Default) {
+        return withContext(Dispatchers.Default){
            val packageManager = context?.packageManager
            val packages: List<Package>? =
                packageManager?.getInstalledPackages(PackageManager.GET_META_DATA)?.filter {
@@ -221,16 +162,13 @@ class AppPlugin : FlutterPlugin, MethodChannel.MethodCallHandler, ActivityAware
        }
    }

-    fun requestGc() {
-        channel.invokeMethod("gc", null)
-    }
-
    override fun onAttachedToActivity(binding: ActivityPluginBinding) {
        activity = binding.activity;
+        scope = CoroutineScope(Dispatchers.Default)
    }

    override fun onDetachedFromActivityForConfigChanges() {
-        activity = null
+        activity = null;
    }

    override fun onReattachedToActivityForConfigChanges(binding: ActivityPluginBinding) {
@@ -239,6 +177,7 @@ class AppPlugin : FlutterPlugin, MethodChannel.MethodCallHandler, ActivityAware

    override fun onDetachedFromActivity() {
        channel.invokeMethod("exit", null)
-        activity = null
+        scope.cancel()
+        activity = null;
    }
 }
--- a/android/app/src/main/kotlin/com/follow/clash/plugins/ProxyPlugin.kt
+++ b/android/app/src/main/kotlin/com/follow/clash/plugins/ProxyPlugin.kt
@@ -1,6 +1,7 @@
 package com.follow.clash.plugins

 import android.Manifest
+import android.annotation.SuppressLint
 import android.app.Activity
 import android.content.ComponentName
 import android.content.Context
@@ -8,13 +9,14 @@ import android.content.Intent
 import android.content.ServiceConnection
 import android.content.pm.PackageManager
 import android.net.VpnService
-import android.os.Build
+import android.os.Build.VERSION
+import android.os.Build.VERSION_CODES
 import android.os.IBinder
 import androidx.core.app.ActivityCompat
 import androidx.core.content.ContextCompat
 import com.follow.clash.GlobalState
 import com.follow.clash.RunState
-import com.follow.clash.models.Props
+import com.follow.clash.models.AccessControl
 import com.follow.clash.services.FlClashVpnService
 import com.google.gson.Gson
 import io.flutter.embedding.android.FlutterActivity
@@ -23,36 +25,37 @@ import io.flutter.embedding.engine.plugins.activity.ActivityAware
 import io.flutter.embedding.engine.plugins.activity.ActivityPluginBinding
 import io.flutter.plugin.common.MethodCall
 import io.flutter.plugin.common.MethodChannel
+import java.util.Date


 class ProxyPlugin : FlutterPlugin, MethodChannel.MethodCallHandler, ActivityAware {

-    private lateinit var flutterMethodChannel: MethodChannel

    val VPN_PERMISSION_REQUEST_CODE = 1001
    val NOTIFICATION_PERMISSION_REQUEST_CODE = 1002

+    private lateinit var flutterMethodChannel: MethodChannel
+
    private var activity: Activity? = null
    private var context: Context? = null
    private var flClashVpnService: FlClashVpnService? = null
-    private var port: Int = 7890
-    private var props: Props? = null
-    private var isBlockNotification: Boolean = false
-    private var isStart: Boolean = false
+    private var isBound = false
+    private var port: Int? = null
+    private var accessControl: AccessControl? = null
+    private lateinit var title: String
+    private lateinit var content: String

    private val connection = object : ServiceConnection {
        override fun onServiceConnected(className: ComponentName, service: IBinder) {
            val binder = service as FlClashVpnService.LocalBinder
            flClashVpnService = binder.getService()
-            if (isStart) {
-                startVpn()
-            } else {
-                flClashVpnService?.initServiceEngine()
-            }
+            port?.let { startVpn(it) }
+            isBound = true
        }

-        override fun onServiceDisconnected(arg: ComponentName) {
+        override fun onServiceDisconnected(arg0: ComponentName) {
            flClashVpnService = null
+            isBound = false
        }
    }

@@ -67,29 +70,21 @@ class ProxyPlugin : FlutterPlugin, MethodChannel.MethodCallHandler, ActivityAwar
    }

    override fun onMethodCall(call: MethodCall, result: MethodChannel.Result) = when (call.method) {
-        "initService" -> {
-            isStart = false
-            initService()
-            requestNotificationsPermission()
-            result.success(true)
-        }
-
-        "startProxy" -> {
-            isStart = true
-            port = call.argument<Int>("port")!!
+        "StartProxy" -> {
+            port = call.argument<Int>("port")
            val args = call.argument<String>("args")
-            props =
-                if (args != null) Gson().fromJson(args, Props::class.java) else null
-            startVpn()
+            accessControl =
+                if (args != null) Gson().fromJson(args, AccessControl::class.java) else null
+            handleStartVpn()
            result.success(true)
        }

-        "stopProxy" -> {
+        "StopProxy" -> {
            stopVpn()
            result.success(true)
        }

-        "setProtect" -> {
+        "SetProtect" -> {
            val fd = call.argument<Int>("fd")
            if (fd != null) {
                flClashVpnService?.protect(fd)
@@ -99,10 +94,14 @@ class ProxyPlugin : FlutterPlugin, MethodChannel.MethodCallHandler, ActivityAwar
            }
        }

+        "GetRunTimeStamp" -> {
+            result.success(GlobalState.runTime?.time)
+        }
+
        "startForeground" -> {
-            val title = call.argument<String>("title") as String
-            val content = call.argument<String>("content") as String
-            startForeground(title, content)
+            title = call.argument<String>("title") as String
+            content = call.argument<String>("content") as String
+            requestNotificationsPermission()
            result.success(true)
        }

@@ -111,41 +110,65 @@ class ProxyPlugin : FlutterPlugin, MethodChannel.MethodCallHandler, ActivityAwar
        }
    }

-    private fun initService() {
+    private fun handleStartVpn() {
        val intent = VpnService.prepare(context)
        if (intent != null) {
            activity?.startActivityForResult(intent, VPN_PERMISSION_REQUEST_CODE)
        } else {
-            if (flClashVpnService != null) {
-                flClashVpnService!!.initServiceEngine()
-            } else {
-                bindService()
-            }
+            bindService()
        }
    }

-    private fun startVpn() {
-        if (flClashVpnService == null) {
-            bindService()
-            return
-        }
-        if (GlobalState.runState.value == RunState.START) return
+    private fun startVpn(port: Int) {
+        if (GlobalState.runState.value == RunState.START) return;
+        flClashVpnService?.start(port, accessControl)
        GlobalState.runState.value = RunState.START
-        flutterMethodChannel.invokeMethod("started", flClashVpnService?.start(port, props))
+        GlobalState.runTime = Date()
+        startAfter()
    }

    private fun stopVpn() {
        if (GlobalState.runState.value == RunState.STOP) return
-        GlobalState.runState.value = RunState.STOP
        flClashVpnService?.stop()
-        GlobalState.destroyServiceEngine()
+        unbindService()
+        GlobalState.runState.value = RunState.STOP;
+        GlobalState.runTime = null;
    }

-    private fun startForeground(title: String, content: String) {
+    @SuppressLint("ForegroundServiceType")
+    private fun startForeground() {
        if (GlobalState.runState.value != RunState.START) return
        flClashVpnService?.startForeground(title, content)
    }

+    private fun requestNotificationsPermission() {
+        if (VERSION.SDK_INT >= VERSION_CODES.TIRAMISU) {
+            val permission = context?.let {
+                ContextCompat.checkSelfPermission(
+                    it,
+                    Manifest.permission.POST_NOTIFICATIONS
+                )
+            }
+            if (permission == PackageManager.PERMISSION_GRANTED) {
+                startForeground()
+            } else {
+                activity?.let {
+                    ActivityCompat.requestPermissions(
+                        it,
+                        arrayOf(Manifest.permission.POST_NOTIFICATIONS),
+                        NOTIFICATION_PERMISSION_REQUEST_CODE
+                    )
+                }
+            }
+        } else {
+            startForeground()
+        }
+    }
+
+    private fun startAfter() {
+        flutterMethodChannel.invokeMethod("startAfter", flClashVpnService?.fd)
+    }
+
    override fun onAttachedToActivity(binding: ActivityPluginBinding) {
        activity = binding.activity
        binding.addActivityResultListener(::onActivityResult)
@@ -160,7 +183,7 @@ class ProxyPlugin : FlutterPlugin, MethodChannel.MethodCallHandler, ActivityAwar
                stopVpn()
            }
        }
-        return true
+        return true;
    }

    private fun onRequestPermissionsResultListener(
@@ -169,33 +192,16 @@ class ProxyPlugin : FlutterPlugin, MethodChannel.MethodCallHandler, ActivityAwar
        grantResults: IntArray
    ): Boolean {
        if (requestCode == NOTIFICATION_PERMISSION_REQUEST_CODE) {
-            isBlockNotification = true
+            if (grantResults.isNotEmpty() && grantResults[0] == PackageManager.PERMISSION_GRANTED) {
+                startForeground()
+            }
        }
-        return false
+        return true;
    }

-    private fun requestNotificationsPermission() {
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) {
-            val permission = context?.let {
-                ContextCompat.checkSelfPermission(
-                    it,
-                    Manifest.permission.POST_NOTIFICATIONS
-                )
-            }
-            if (permission != PackageManager.PERMISSION_GRANTED) {
-                if (isBlockNotification) return
-                if (activity == null) return
-                ActivityCompat.requestPermissions(
-                    activity!!,
-                    arrayOf(Manifest.permission.POST_NOTIFICATIONS),
-                    NOTIFICATION_PERMISSION_REQUEST_CODE
-                )
-            }
-        }
-    }

    override fun onDetachedFromActivityForConfigChanges() {
-        activity = null
+        activity = null;
    }

    override fun onReattachedToActivityForConfigChanges(binding: ActivityPluginBinding) {
@@ -203,6 +209,7 @@ class ProxyPlugin : FlutterPlugin, MethodChannel.MethodCallHandler, ActivityAwar
    }

    override fun onDetachedFromActivity() {
+        stopVpn()
        activity = null
    }

@@ -210,4 +217,11 @@ class ProxyPlugin : FlutterPlugin, MethodChannel.MethodCallHandler, ActivityAwar
        val intent = Intent(context, FlClashVpnService::class.java)
        context?.bindService(intent, connection, Context.BIND_AUTO_CREATE)
    }
+
+    private fun unbindService() {
+        if (isBound) {
+            context?.unbindService(connection)
+            isBound = false
+        }
+    }
 }
--- a/android/app/src/main/kotlin/com/follow/clash/plugins/TilePlugin.kt
+++ b/android/app/src/main/kotlin/com/follow/clash/plugins/TilePlugin.kt
@@ -1,4 +1,3 @@
-
 package com.follow.clash.plugins

 import io.flutter.embedding.engine.plugins.FlutterPlugin
--- a/android/app/src/main/kotlin/com/follow/clash/services/FlClashTileService.kt
+++ b/android/app/src/main/kotlin/com/follow/clash/services/FlClashTileService.kt
@@ -1,9 +1,9 @@
 package com.follow.clash.services

+import android.annotation.SuppressLint
 import android.app.PendingIntent
 import android.content.Intent
 import android.os.Build
-import android.os.IBinder
 import android.service.quicksettings.Tile
 import android.service.quicksettings.TileService
 import androidx.annotation.RequiresApi
@@ -11,9 +11,14 @@ import androidx.lifecycle.Observer
 import com.follow.clash.GlobalState
 import com.follow.clash.RunState
 import com.follow.clash.TempActivity
+import com.follow.clash.plugins.AppPlugin
+import com.follow.clash.plugins.ProxyPlugin
+import com.follow.clash.plugins.TilePlugin
+import io.flutter.FlutterInjector
+import io.flutter.embedding.engine.FlutterEngine
+import io.flutter.embedding.engine.dart.DartExecutor


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

    private val observer = Observer<RunState> { runState ->
@@ -39,7 +44,7 @@ class FlClashTileService : TileService() {

    private fun activityTransfer() {
        val intent = Intent(this, TempActivity::class.java)
-        intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK or Intent.FLAG_ACTIVITY_MULTIPLE_TASK)
+        intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
        val pendingIntent = if (Build.VERSION.SDK_INT >= 31) {
            PendingIntent.getActivity(
                this,
@@ -57,25 +62,42 @@ class FlClashTileService : TileService() {
        }
        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.UPSIDE_DOWN_CAKE) {
            startActivityAndCollapse(pendingIntent)
-        } else {
+        }else{
            startActivityAndCollapse(intent)
        }
    }

+    private var flutterEngine: FlutterEngine? = null;
+
+    private fun initFlutterEngine() {
+        flutterEngine = FlutterEngine(this)
+        flutterEngine?.plugins?.add(ProxyPlugin())
+        flutterEngine?.plugins?.add(TilePlugin())
+        flutterEngine?.plugins?.add(AppPlugin())
+        GlobalState.flutterEngine = flutterEngine
+        if (flutterEngine?.dartExecutor?.isExecutingDart != true) {
+            val vpnService = DartExecutor.DartEntrypoint(
+                FlutterInjector.instance().flutterLoader().findAppBundlePath(),
+                "vpnService"
+            )
+            flutterEngine?.dartExecutor?.executeDartEntrypoint(vpnService)
+        }
+    }
+
    override fun onClick() {
        super.onClick()
        activityTransfer()
+        val currentTilePlugin = GlobalState.getCurrentTilePlugin()
        if (GlobalState.runState.value == RunState.STOP) {
            GlobalState.runState.value = RunState.PENDING
-            val titlePlugin = GlobalState.getCurrentTitlePlugin()
-            if (titlePlugin != null) {
-                titlePlugin.handleStart()
-            } else {
-                GlobalState.initServiceEngine(this)
+            if(currentTilePlugin == null){
+                initFlutterEngine()
+            }else{
+                currentTilePlugin.handleStart()
            }
-        } else if (GlobalState.runState.value == RunState.START) {
+        } else if(GlobalState.runState.value == RunState.START){
            GlobalState.runState.value = RunState.PENDING
-            GlobalState.getCurrentTitlePlugin()?.handleStop()
+            currentTilePlugin?.handleStop()
        }

    }
--- a/android/app/src/main/kotlin/com/follow/clash/services/FlClashVpnService.kt
+++ b/android/app/src/main/kotlin/com/follow/clash/services/FlClashVpnService.kt
@@ -15,13 +15,16 @@ 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.AccessControl
 import com.follow.clash.models.AccessControlMode
-import com.follow.clash.models.Props


 class FlClashVpnService : VpnService() {
+
+
    private val CHANNEL = "FlClash"

+    var fd: Int? = null
    private val notificationId: Int = 1

    private val passList = listOf(
@@ -44,17 +47,16 @@ class FlClashVpnService : VpnService() {
        "192.168.*"
    )

-    override fun onCreate() {
-        super.onCreate()
-        initServiceEngine()
+    override fun onStartCommand(intent: Intent?, flags: Int, startId: Int): Int {
+        return START_STICKY
    }

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

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

@@ -114,6 +115,7 @@ class FlClashVpnService : VpnService() {
                PendingIntent.FLAG_UPDATE_CURRENT
            )
        }
+
        with(NotificationCompat.Builder(this, CHANNEL)) {
            setSmallIcon(R.drawable.ic_stat_name)
            setContentTitle("FlClash")
@@ -126,34 +128,24 @@ class FlClashVpnService : VpnService() {
            setOngoing(true)
            setShowWhen(false)
            setOnlyAlertOnce(true)
-            setAutoCancel(true)
+            setAutoCancel(true);
        }
    }

-    fun initServiceEngine() {
-        GlobalState.initServiceEngine(this)
-    }
-
-    override fun onTrimMemory(level: Int) {
-        super.onTrimMemory(level)
-        GlobalState.getCurrentAppPlugin()?.requestGc()
-    }

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

    override fun onUnbind(intent: Intent?): Boolean {
+        GlobalState.getCurrentTilePlugin()?.handleStop();
        return super.onUnbind(intent)
    }

--- a/android/app/src/main/res/values-night/styles.xml
+++ b/android/app/src/main/res/values-night/styles.xml
@@ -4,6 +4,7 @@
    <style name="LaunchTheme" parent="@android:style/Theme.Black.NoTitleBar">
        <!-- Show a splash screen on the activity. Automatically removed when
             the Flutter engine draws its first frame -->
+        <item name="android:windowBackground">@mipmap/ic_launcher_foreground</item>
    </style>
    <!-- Theme applied to the Android Window as soon as the process has started.
         This theme determines the color of the Android Window while your
--- a/android/app/src/main/res/values/styles.xml
+++ b/android/app/src/main/res/values/styles.xml
@@ -4,6 +4,7 @@
    <style name="LaunchTheme" parent="@android:style/Theme.Light.NoTitleBar">
        <!-- Show a splash screen on the activity. Automatically removed when
             the Flutter engine draws its first frame -->
+        <item name="android:windowBackground">@mipmap/ic_launcher_foreground</item>
    </style>
    <!-- Theme applied to the Android Window as soon as the process has started.
         This theme determines the color of the Android Window while your
--- a/android/app/src/main/res/xml/network_security_config.xml
+++ b/android/app/src/main/res/xml/network_security_config.xml
@@ -7,8 +7,4 @@
            <certificates src="user" />
        </trust-anchors>
    </base-config>
-    <domain-config cleartextTrafficPermitted="true">
-        <domain includeSubdomains="true">localhost</domain>
-        <domain includeSubdomains="true">127.0.0.1</domain>
-    </domain-config>
 </network-security-config>
--- a/assets/data/GeoIP.dat
+++ b/assets/data/GeoIP.dat
--- a/core/Clash.Meta
+++ b/core/Clash.Meta
--- a/core/common.go
+++ b/core/common.go
@@ -2,20 +2,19 @@ package main

 import "C"
 import (
-	"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/component/dialer"
+	"github.com/metacubex/mihomo/component/process"
 	"github.com/metacubex/mihomo/component/resolver"
 	"github.com/metacubex/mihomo/config"
-	"github.com/metacubex/mihomo/constant"
-	"github.com/metacubex/mihomo/hub"
+	"github.com/metacubex/mihomo/constant/provider"
+	"github.com/metacubex/mihomo/dns"
 	"github.com/metacubex/mihomo/hub/executor"
-	"github.com/metacubex/mihomo/hub/route"
 	"github.com/metacubex/mihomo/listener"
 	"github.com/metacubex/mihomo/log"
 	"github.com/metacubex/mihomo/tunnel"
+	"math"
 	"os"
 	"os/exec"
 	"path/filepath"
@@ -61,17 +60,11 @@ type ruleProviderSchema struct {
 	Interval int    `provider:"interval,omitempty"`
 }

-type ConfigExtendedParams struct {
-	IsPatch      bool              `json:"is-patch"`
-	IsCompatible bool              `json:"is-compatible"`
-	SelectedMap  map[string]string `json:"selected-map"`
-	TestURL      *string           `json:"test-url"`
-}
-
 type GenerateConfigParams struct {
-	ProfilePath *string              `json:"profile-path"`
-	Config      config.RawConfig     `json:"config" `
-	Params      ConfigExtendedParams `json:"params"`
+	ProfilePath  *string           `json:"profile-path"`
+	Config       *config.RawConfig `json:"config" `
+	IsPatch      *bool             `json:"is-patch"`
+	IsCompatible *bool             `json:"is-compatible"`
 }

 type ChangeProxyParams struct {
@@ -84,8 +77,20 @@ type TestDelayParams struct {
 	Timeout   int64  `json:"timeout"`
 }

-type ProcessMapItem struct {
-	Id    int64  `json:"id"`
+type Delay struct {
+	Name  string `json:"name"`
+	Value int32  `json:"value"`
+}
+
+type Process struct {
+	Uid     uint32 `json:"uid"`
+	Network string `json:"network"`
+	Source  string `json:"source"`
+	Target  string `json:"target"`
+}
+
+type Now struct {
+	Name  string `json:"name"`
 	Value string `json:"value"`
 }

@@ -163,9 +168,9 @@ func getRawConfigWithPath(path *string) *config.RawConfig {
 	}
 }

-func decorationConfig(profilePath *string, cfg config.RawConfig) *config.RawConfig {
+func decorationConfig(profilePath *string, cfg config.RawConfig, compatible bool) *config.RawConfig {
 	prof := getRawConfigWithPath(profilePath)
-	overwriteConfig(prof, cfg)
+	overwriteConfig(prof, cfg, compatible)
 	return prof
 }

@@ -315,39 +320,35 @@ func generateProxyGroupAndRule(proxyGroup *[]map[string]any, rule *[]string) {
 	*rule = computedRule
 }

-func overwriteConfig(targetConfig *config.RawConfig, patchConfig config.RawConfig) {
-	targetConfig.ExternalController = patchConfig.ExternalController
+func overwriteConfig(targetConfig *config.RawConfig, patchConfig config.RawConfig, compatible bool) {
+	targetConfig.ExternalController = ""
 	targetConfig.ExternalUI = ""
 	targetConfig.Interface = ""
 	targetConfig.ExternalUIURL = ""
-	targetConfig.TCPConcurrent = patchConfig.TCPConcurrent
-	targetConfig.UnifiedDelay = patchConfig.UnifiedDelay
-	//targetConfig.GeodataMode = false
-	targetConfig.IPv6 = patchConfig.IPv6
+	targetConfig.GeodataMode = false
+	//targetConfig.IPv6 = patchConfig.IPv6
 	targetConfig.LogLevel = patchConfig.LogLevel
-	//targetConfig.Port = 0
-	//targetConfig.SocksPort = 0
+	targetConfig.Port = 0
+	targetConfig.SocksPort = 0
 	targetConfig.MixedPort = patchConfig.MixedPort
-	targetConfig.FindProcessMode = patchConfig.FindProcessMode
+	targetConfig.FindProcessMode = process.FindProcessAlways
 	targetConfig.AllowLan = patchConfig.AllowLan
 	targetConfig.Mode = patchConfig.Mode
 	targetConfig.Tun.Enable = patchConfig.Tun.Enable
 	targetConfig.Tun.Device = patchConfig.Tun.Device
 	targetConfig.Tun.DNSHijack = patchConfig.Tun.DNSHijack
 	targetConfig.Tun.Stack = patchConfig.Tun.Stack
-	targetConfig.GeodataLoader = patchConfig.GeodataLoader
+	targetConfig.GeodataLoader = "standard"
 	targetConfig.Profile.StoreSelected = false
-	targetConfig.GeoXUrl = patchConfig.GeoXUrl
-	targetConfig.GlobalUA = patchConfig.GlobalUA
 	if targetConfig.DNS.Enable == false {
 		targetConfig.DNS = patchConfig.DNS
 	}
-	//if runtime.GOOS == "android" {
-	//	targetConfig.DNS.NameServer = append(targetConfig.DNS.NameServer, "dhcp://"+dns.SystemDNSPlaceholder)
-	//} else if runtime.GOOS == "windows" {
-	//	targetConfig.DNS.NameServer = append(targetConfig.DNS.NameServer, dns.SystemDNSPlaceholder)
-	//}
-	if configParams.IsCompatible == false {
+	if runtime.GOOS == "android" {
+		targetConfig.DNS.NameServer = append(targetConfig.DNS.NameServer, "dhcp://"+dns.SystemDNSPlaceholder)
+	} else if runtime.GOOS == "windows" {
+		targetConfig.DNS.NameServer = append(targetConfig.DNS.NameServer, dns.SystemDNSPlaceholder)
+	}
+	if compatible == false {
 		targetConfig.ProxyProvider = make(map[string]map[string]any)
 		targetConfig.RuleProvider = make(map[string]map[string]any)
 		generateProxyGroupAndRule(&targetConfig.ProxyGroup, &targetConfig.Rule)
@@ -356,17 +357,14 @@ func overwriteConfig(targetConfig *config.RawConfig, patchConfig config.RawConfi

 func patchConfig(general *config.General) {
 	log.Infoln("[Apply] patch")
-	route.ReStartServer(general.ExternalController)
 	listener.SetAllowLan(general.AllowLan)
 	inbound.SetSkipAuthPrefixes(general.SkipAuthPrefixes)
 	inbound.SetAllowedIPs(general.LanAllowedIPs)
 	inbound.SetDisAllowedIPs(general.LanDisAllowedIPs)
 	listener.SetBindAddress(general.BindAddress)
 	tunnel.SetSniffing(general.Sniffing)
-	tunnel.SetFindProcessMode(general.FindProcessMode)
 	dialer.SetTcpConcurrent(general.TCPConcurrent)
 	dialer.DefaultInterface.Store(general.Interface)
-	adapter.UnifiedDelay.Store(general.UnifiedDelay)
 	listener.ReCreateHTTP(general.Port, tunnel.Tunnel)
 	listener.ReCreateSocks(general.SocksPort, tunnel.Tunnel)
 	listener.ReCreateRedir(general.RedirPort, tunnel.Tunnel)
@@ -379,52 +377,40 @@ func patchConfig(general *config.General) {
 	listener.ReCreateTuic(general.TuicServer, tunnel.Tunnel)
 	tunnel.SetMode(general.Mode)
 	log.SetLevel(general.LogLevel)
-
 	resolver.DisableIPv6 = !general.IPv6
 }

-func patchSelectGroup() {
-	mapping := configParams.SelectedMap
-	if mapping == nil {
-		return
-	}
-	for name, proxy := range tunnel.ProxiesWithProviders() {
-		outbound, ok := proxy.(*adapter.Proxy)
-		if !ok {
-			continue
+const concurrentCount = math.MaxInt
+
+func hcCompatibleProvider(proxyProviders map[string]provider.ProxyProvider) {
+	wg := sync.WaitGroup{}
+	ch := make(chan struct{}, concurrentCount)
+	for _, proxyProvider := range proxyProviders {
+		proxyProvider := proxyProvider
+		if proxyProvider.VehicleType() == provider.Compatible {
+			log.Infoln("Start initial Compatible provider %s", proxyProvider.Name())
+			wg.Add(1)
+			ch <- struct{}{}
+			go func() {
+				defer func() { <-ch; wg.Done() }()
+				if err := proxyProvider.Initial(); err != nil {
+					log.Errorln("initial Compatible provider %s error: %v", proxyProvider.Name(), err)
+				}
+			}()
 		}

-		selector, ok := outbound.ProxyAdapter.(outboundgroup.SelectAble)
-		if !ok {
-			continue
-		}
-
-		selected, exist := mapping[name]
-		if !exist {
-			continue
-		}
-
-		selector.ForceSet(selected)
 	}
 }

-var applyLock sync.Mutex
-
-func applyConfig() {
-	applyLock.Lock()
-	defer applyLock.Unlock()
+func applyConfig(isPatch bool) {
 	cfg, err := config.ParseRawConfig(currentConfig)
 	if err != nil {
 		cfg, _ = config.ParseRawConfig(config.DefaultRawConfig())
 	}
-	if configParams.TestURL != nil {
-		constant.DefaultTestURL = *configParams.TestURL
-	}
-	if configParams.IsPatch {
+	if isPatch {
 		patchConfig(cfg.General)
 	} else {
-		runtime.GC()
-		hub.UltraApplyConfig(cfg, true)
-		patchSelectGroup()
+		executor.ApplyConfig(cfg, true)
+		hcCompatibleProvider(tunnel.Providers())
 	}
 }
--- a/core/dart-bridge/lib.go
+++ b/core/dart-bridge/lib.go
@@ -1,7 +1,6 @@
 package dart_bridge

 /*
-#include <stdlib.h>
 #include "stdint.h"
 #include "include/dart_api_dl.h"
 #include "include/dart_api_dl.c"
@@ -25,16 +24,14 @@ func InitDartApi(api unsafe.Pointer) {
 	}
 }

-func SendToPort(port int64, msg string) bool {
+func SendToPort(port int64, msg string) {
 	var obj C.Dart_CObject
 	obj._type = C.Dart_CObject_kString
 	msgString := C.CString(msg)
-	defer C.free(unsafe.Pointer(msgString))
 	ptr := unsafe.Pointer(&obj.value[0])
 	*(**C.char)(ptr) = msgString
 	isSuccess := C.GoDart_PostCObject(C.Dart_Port_DL(port), &obj)
 	if !isSuccess {
-		return false
+		fmt.Println("ERROR: post to port ", port, " failed", msg)
 	}
-	return true
 }
--- a/core/dart-bridge/message.go
+++ b/core/dart-bridge/message.go
@@ -0,0 +1,29 @@
+package dart_bridge
+
+import "encoding/json"
+
+var Port *int64
+
+type MessageType string
+
+const (
+	Log     MessageType = "log"
+	Tun     MessageType = "tun"
+	Delay   MessageType = "delay"
+	Now     MessageType = "now"
+	Process MessageType = "process"
+)
+
+type Message struct {
+	Type MessageType `json:"type"`
+	Data interface{} `json:"data"`
+}
+
+func (message *Message) Json() string {
+	data, _ := json.Marshal(message)
+	return string(data)
+}
+
+func SendMessage(message Message) {
+	SendToPort(*Port, message.Json())
+}
--- a/core/go.mod
+++ b/core/go.mod
@@ -1,6 +1,6 @@
 module core

-go 1.21.0
+go 1.20

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

@@ -17,7 +17,6 @@ require (
 	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
 	github.com/buger/jsonparser v1.1.1 // indirect
@@ -31,9 +30,6 @@ 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/cors v1.2.1 // indirect
-	github.com/go-chi/render v1.0.3 // indirect
 	github.com/go-ole/go-ole v1.3.0 // indirect
 	github.com/go-task/slim-sprig v0.0.0-20230315185526-52ccab3ef572 // indirect
 	github.com/gobwas/httphead v0.1.0 // indirect
--- a/core/go.sum
+++ b/core/go.sum
@@ -9,8 +9,6 @@ github.com/Yawning/aez v0.0.0-20211027044916-e49e68abd344 h1:cDVUiFo+npB0ZASqnw4
 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=
 github.com/andybalholm/brotli v1.0.6/go.mod h1:fO7iG3H7G2nSZ7m0zPUDn85XEX2GTukHGRSepvi9Eig=
 github.com/bahlo/generic-list-go v0.2.0 h1:5sz/EEAK+ls5wF+NeqDpk5+iNdMDXrh3z3nPnH1Wvgk=
@@ -37,25 +35,16 @@ github.com/ericlagergren/aegis v0.0.0-20230312195928-b4ce538b56f9/go.mod h1:hkIF
 github.com/ericlagergren/polyval v0.0.0-20220411101811-e25bc10ba391 h1:8j2RH289RJplhA6WfdaPqzg1MjH2K8wX5e0uhAxrw2g=
 github.com/ericlagergren/polyval v0.0.0-20220411101811-e25bc10ba391/go.mod h1:K2R7GhgxrlJzHw2qiPWsCZXf/kXEJN9PLnQK73Ll0po=
 github.com/ericlagergren/saferand v0.0.0-20220206064634-960a4dd2bc5c h1:RUzBDdZ+e/HEe2Nh8lYsduiPAZygUfVXJn0Ncj5sHMg=
-github.com/ericlagergren/saferand v0.0.0-20220206064634-960a4dd2bc5c/go.mod h1:ETASDWf/FmEb6Ysrtd1QhjNedUU/ZQxBCRLh60bQ/UI=
 github.com/ericlagergren/siv v0.0.0-20220507050439-0b757b3aa5f1 h1:tlDMEdcPRQKBEz5nGDMvswiajqh7k8ogWRlhRwKy5mY=
 github.com/ericlagergren/siv v0.0.0-20220507050439-0b757b3aa5f1/go.mod h1:4RfsapbGx2j/vU5xC/5/9qB3kn9Awp1YDiEnN43QrJ4=
 github.com/ericlagergren/subtle v0.0.0-20220507045147-890d697da010 h1:fuGucgPk5dN6wzfnxl3D0D3rVLw4v2SbBT9jb4VnxzA=
 github.com/ericlagergren/subtle v0.0.0-20220507045147-890d697da010/go.mod h1:JtBcj7sBuTTRupn7c2bFspMDIObMJsVK8TeUvpShPok=
 github.com/frankban/quicktest v1.14.5 h1:dfYrrRyLtiqT9GyKXgdh+k4inNeTvmGbuSgZ3lx3GhA=
-github.com/frankban/quicktest v1.14.5/go.mod h1:4ptaffx2x8+WTWXmUCuVU6aPUX1/Mz7zb5vbUoiM6w0=
 github.com/fsnotify/fsnotify v1.7.0 h1:8JEhPFa5W2WU7YfeZzPNqzMP6Lwt7L2715Ggo0nosvA=
 github.com/fsnotify/fsnotify v1.7.0/go.mod h1:40Bi/Hjc2AVfZrqy+aj+yEI+/bRxZnMJyTJwOpGvigM=
 github.com/gaukas/godicttls v0.0.4 h1:NlRaXb3J6hAnTmWdsEKb9bcSBD6BvcIjdGdeb0zfXbk=
 github.com/gaukas/godicttls v0.0.4/go.mod h1:l6EenT4TLWgTdwslVb4sEMOCf7Bv0JAK67deKr9/NCI=
-github.com/go-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/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=
-github.com/go-chi/render v1.0.3/go.mod h1:/gr3hVkmYR0YlEy3LxCuVRFzEu9Ruok+gFqbIofjao0=
 github.com/go-logr/logr v1.2.4 h1:g01GSCwiDw2xSZfjJ2/T9M+S6pFdcNtFYsp+Y43HYDQ=
-github.com/go-logr/logr v1.2.4/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A=
 github.com/go-ole/go-ole v1.2.6/go.mod h1:pprOEPIfldk/42T2oK7lQ4v4JSDwmV0As9GaiUsvbm0=
 github.com/go-ole/go-ole v1.3.0 h1:Dt6ye7+vXGIKZ7Xtk4s6/xVdGDQynvom7xCFEdWr6uE=
 github.com/go-ole/go-ole v1.3.0/go.mod h1:5LS6F96DhAwUc7C+1HLexzMXY1xGRSryjyPPKW6zv78=
@@ -71,7 +60,6 @@ github.com/gofrs/uuid/v5 v5.2.0 h1:qw1GMx6/y8vhVsx626ImfKMuS5CvJmhIKKtuyvfajMM=
 github.com/gofrs/uuid/v5 v5.2.0/go.mod h1:CDOjlDMVAtN56jqyRUZh58JT31Tiw7/oQyEXZV+9bD8=
 github.com/golang/protobuf v1.3.1/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
 github.com/golang/protobuf v1.5.3 h1:KhyjKVUg7Usr/dYsdSqoFveMYd5ko72D+zANwlG1mmg=
-github.com/golang/protobuf v1.5.3/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY=
 github.com/google/btree v1.1.2 h1:xf4v41cLI2Z6FxbKm+8Bu+m8ifhj15JuZ9sa0jZCMUU=
 github.com/google/btree v1.1.2/go.mod h1:qOPhT0dTNdNzV6Z/lhRX0YXUafgPLFUh+gZMl761Gm4=
 github.com/google/go-cmp v0.5.6/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
@@ -81,7 +69,6 @@ github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeN
 github.com/google/pprof v0.0.0-20210407192527-94a9f03dee38 h1:yAJXTCF9TqKcTiHJAE8dj7HMvPfh66eeA2JYW7eFpSE=
 github.com/google/pprof v0.0.0-20210407192527-94a9f03dee38/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE=
 github.com/google/tink/go v1.6.1 h1:t7JHqO8Ath2w2ig5vjwQYJzhGEZymedQc90lQXUBa4I=
-github.com/google/tink/go v1.6.1/go.mod h1:IGW53kTgag+st5yPhKKwJ6u2l+SSp5/v9XF7spovjlY=
 github.com/hashicorp/yamux v0.1.1 h1:yrQxtgseBDrq9Y652vSRDvsKCJKOUD+GzTS4Y0Y8pvE=
 github.com/hashicorp/yamux v0.1.1/go.mod h1:CtWFDAQgb7dxtzFs4tWbplKIe2jSi3+5vKbgIO0SLnQ=
 github.com/ianlancetaylor/demangle v0.0.0-20200824232613-28f6c0f3b639/go.mod h1:aSSvb/t6k1mPoxDqO4vJh6VOCGPwU4O0C2/Eqndh1Sc=
@@ -96,9 +83,7 @@ github.com/klauspost/compress v1.17.4/go.mod h1:/dCuZOvVtNoHsyb+cuJD3itjs3NbnF6K
 github.com/klauspost/cpuid/v2 v2.2.7 h1:ZWSB3igEs+d0qvnxR/ZBzXVmxkgt8DdzP6m9pfuVLDM=
 github.com/klauspost/cpuid/v2 v2.2.7/go.mod h1:Lcz8mBdAVJIBVzewtcLocK12l3Y+JytZYpaMropDUws=
 github.com/kr/pretty v0.3.1 h1:flRD4NNwYAUpkphVc1HcthR4KEIFJ65n8Mw5qdRn3LE=
-github.com/kr/pretty v0.3.1/go.mod h1:hoEshYVHaxMs3cyo3Yncou5ZscifuDolrwPKZanG3xk=
 github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY=
-github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE=
 github.com/lufia/plan9stats v0.0.0-20211012122336-39d0f177ccd0 h1:6E+4a0GO5zZEnZ81pIr0yLvtUWk2if982qA3F3QD6H4=
 github.com/lufia/plan9stats v0.0.0-20211012122336-39d0f177ccd0/go.mod h1:zJYVVT2jmtg6P3p1VtQj7WsuWi/y4VnjVBn7F8KPB3I=
 github.com/lunixbochs/struc v0.0.0-20200707160740-784aaebc1d40 h1:EnfXoSqDfSNJv0VBNqY/88RNnhSGYkrHaO0mmFGbVsc=
@@ -140,7 +125,6 @@ github.com/oasisprotocol/deoxysii v0.0.0-20220228165953-2091330c22b7/go.mod h1:U
 github.com/onsi/ginkgo/v2 v2.9.5 h1:+6Hr4uxzP4XIUyAkg61dWBw8lb/gc4/X5luuxN/EC+Q=
 github.com/onsi/ginkgo/v2 v2.9.5/go.mod h1:tvAoo1QUJwNEU2ITftXTpR7R1RbCzoZUOs3RonqW57k=
 github.com/onsi/gomega v1.27.6 h1:ENqfyGeS5AX/rlXDd/ETokDz93u0YufY1Pgxuy/PvWE=
-github.com/onsi/gomega v1.27.6/go.mod h1:PIQNjfQwkP3aQAH7lf7j87O/5FiNr+ZR8+ipb+qQlhg=
 github.com/openacid/errors v0.8.1/go.mod h1:GUQEJJOJE3W9skHm8E8Y4phdl2LLEN8iD7c5gcGgdx0=
 github.com/openacid/low v0.1.21 h1:Tr2GNu4N/+rGRYdOsEHOE89cxUIaDViZbVmKz29uKGo=
 github.com/openacid/low v0.1.21/go.mod h1:q+MsKI6Pz2xsCkzV4BLj7NR5M4EX0sGz5AqotpZDVh0=
@@ -162,7 +146,6 @@ github.com/quic-go/qpack v0.4.0/go.mod h1:UZVnYIfi5GRk+zI9UMaCPsmZ2xKJP7XBUvVyT1
 github.com/quic-go/qtls-go1-20 v0.4.1 h1:D33340mCNDAIKBqXuAvexTNMUByrYmFYVfKfDN5nfFs=
 github.com/quic-go/qtls-go1-20 v0.4.1/go.mod h1:X9Nh97ZL80Z+bX/gUXMbipO6OxdiDi58b/fMC9mAL+k=
 github.com/rogpeppe/go-internal v1.9.0 h1:73kH8U+JUqXU8lRuOHeVHaa/SZPifC7BkcraZVejAe8=
-github.com/rogpeppe/go-internal v1.9.0/go.mod h1:WtVeX8xhTBvf0smdhujwtBcq4Qrzq/fJaraNFVN+nFs=
 github.com/sagernet/bbolt v0.0.0-20231014093535-ea5cb2fe9f0a h1:+NkI2670SQpQWvkkD2QgdTuzQG263YZ+2emfpeyGqW0=
 github.com/sagernet/bbolt v0.0.0-20231014093535-ea5cb2fe9f0a/go.mod h1:63s7jpZqcDAIpj8oI/1v4Izok+npJOHACFCU6+huCkM=
 github.com/sagernet/netlink v0.0.0-20220905062125-8043b4a9aa97 h1:iL5gZI3uFp0X6EslacyapiRz7LLSJyr4RajF/BhMVyE=
@@ -266,7 +249,6 @@ golang.org/x/sys v0.19.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
 golang.org/x/sys v0.20.0 h1:Od9JTbYCk261bKm4M/mw7AklTlFYIa0bIp9BgSm1S8Y=
 golang.org/x/sys v0.20.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
 golang.org/x/term v0.20.0 h1:VnkxpohqXaOBYJtBmEppKUG6mXpi+4O6purfc2+sMhw=
-golang.org/x/term v0.20.0/go.mod h1:8UkIAJTvZgivsXaD6/pH6U9ecQzZ45awqEOzuCvwpFY=
 golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
 golang.org/x/text v0.15.0 h1:h1V/4gjBv8v9cjcR6+AR5+/cIYK5N/WAgiv4xlsEtAk=
 golang.org/x/text v0.15.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU=
@@ -281,7 +263,6 @@ google.golang.org/protobuf v1.34.1 h1:9ddQBjfCyZPOHPUiPxpYESBLc+T8P3E+Vo4IbKZgFW
 google.golang.org/protobuf v1.34.1/go.mod h1:c6P6GXX6sHbq/GpV6MGZEdwhWPcYBgnhAHhKbcUYpos=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127 h1:qIbj1fsPNlZgppZ+VLlY7N33q108Sa+fhmuc+sWQYwY=
-gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
 gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
 gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
--- a/core/hub.go
+++ b/core/hub.go
@@ -1,8 +1,5 @@
 package main

-/*
-#include <stdlib.h>
-*/
 import "C"
 import (
 	bridge "core/dart-bridge"
@@ -13,7 +10,6 @@ import (
 	"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/config"
 	"github.com/metacubex/mihomo/constant"
@@ -32,12 +28,8 @@ import (

 var currentConfig = config.DefaultRawConfig()

-var configParams = ConfigExtendedParams{}
-
 var isInit = false

-var currentProfileName = ""
-
 //export initClash
 func initClash(homeDirStr *C.char) bool {
 	if !isInit {
@@ -68,29 +60,11 @@ func shutdownClash() bool {
 	return true
 }

-//export forceGc
-func forceGc() {
-	go func() {
-		log.Infoln("[APP] request force GC")
-		runtime.GC()
-	}()
-}
-
-//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)
-	bytes := []byte(C.GoString(s))
 	go func() {
+		bytes := []byte(C.GoString(s))
 		_, err := config.UnmarshalRawConfig(bytes)
 		if err != nil {
 			bridge.SendToPort(i, err.Error())
@@ -103,18 +77,21 @@ func validateConfig(s *C.char, port C.longlong) {
 //export updateConfig
 func updateConfig(s *C.char, port C.longlong) {
 	i := int64(port)
-	paramsString := C.GoString(s)
 	go func() {
+		paramsString := C.GoString(s)
 		var params = &GenerateConfigParams{}
 		err := json.Unmarshal([]byte(paramsString), params)
 		if err != nil {
 			bridge.SendToPort(i, err.Error())
 			return
 		}
-		configParams = params.Params
-		prof := decorationConfig(params.ProfilePath, params.Config)
+		prof := decorationConfig(params.ProfilePath, *params.Config, *params.IsCompatible)
 		currentConfig = prof
-		applyConfig()
+		if *params.IsPatch {
+			applyConfig(true)
+		} else {
+			applyConfig(false)
+		}
 		bridge.SendToPort(i, "")
 	}()
 }
@@ -162,32 +139,30 @@ func getProxies() *C.char {
 }

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

 //export getTraffic
@@ -205,31 +180,11 @@ func getTraffic() *C.char {
 	return C.CString(string(data))
 }

-//export getTotalTraffic
-func getTotalTraffic() *C.char {
-	up, down := statistic.DefaultManager.Total()
-	traffic := map[string]int64{
-		"up":   up,
-		"down": down,
-	}
-	data, err := json.Marshal(traffic)
-	if err != nil {
-		fmt.Println("Error:", err)
-		return C.CString("")
-	}
-	return C.CString(string(data))
-}
-
-//export resetTraffic
-func resetTraffic() {
-	statistic.DefaultManager.ResetStatistic()
-}
-
 //export asyncTestDelay
 func asyncTestDelay(s *C.char, port C.longlong) {
 	i := int64(port)
-	paramsString := C.GoString(s)
 	go func() {
+		paramsString := C.GoString(s)
 		var params = &TestDelayParams{}
 		err := json.Unmarshal([]byte(paramsString), params)
 		if err != nil {
@@ -313,6 +268,7 @@ func closeConnections() bool {
 //export closeConnection
 func closeConnection(id *C.char) bool {
 	connectionId := C.GoString(id)
+
 	err := statistic.DefaultManager.Get(connectionId).Close()
 	if err != nil {
 		return false
@@ -323,13 +279,10 @@ func closeConnection(id *C.char) bool {
 //export getProviders
 func getProviders() *C.char {
 	data, err := json.Marshal(tunnel.Providers())
-	var msg *C.char
 	if err != nil {
-		msg = C.CString("")
-		return msg
+		return C.CString("")
 	}
-	msg = C.CString(string(data))
-	return msg
+	return C.CString(string(data))
 }

 //export getProvider
@@ -379,9 +332,10 @@ func getExternalProviders() *C.char {
 //export updateExternalProvider
 func updateExternalProvider(providerName *C.char, providerType *C.char, port C.longlong) {
 	i := int64(port)
-	providerNameString := C.GoString(providerName)
-	providerTypeString := C.GoString(providerType)
 	go func() {
+		providerNameString := C.GoString(providerName)
+		providerTypeString := C.GoString(providerType)
+
 		switch providerTypeString {
 		case "Proxy":
 			providers := tunnel.Providers()
@@ -397,49 +351,34 @@ func updateExternalProvider(providerName *C.char, providerType *C.char, port C.l
 				bridge.SendToPort(i, err.Error())
 				return
 			}
-		case "MMDB":
+		case "GeoIp":
 			err := mmdb.DownloadMMDB(constant.Path.Resolve(providerNameString))
 			if err != nil {
 				bridge.SendToPort(i, err.Error())
 				return
 			}
+		case "GeoSite":
+			err := mmdb.DownloadGeoSite(constant.Path.Resolve(providerNameString))
+			if err != nil {
+				bridge.SendToPort(i, err.Error())
+				return
+			}
 		case "ASN":
 			err := mmdb.DownloadASN(constant.Path.Resolve(providerNameString))
 			if err != nil {
 				bridge.SendToPort(i, err.Error())
 				return
 			}
-		case "GeoIp":
-			err := geodata.DownloadGeoIP(constant.Path.Resolve(providerNameString))
-			if err != nil {
-				bridge.SendToPort(i, err.Error())
-				return
-			}
-		case "GeoSite":
-			err := geodata.DownloadGeoSite(constant.Path.Resolve(providerNameString))
-			if err != nil {
-				bridge.SendToPort(i, err.Error())
-				return
-			}
 		}
 		bridge.SendToPort(i, "")
 	}()
 }

 //export initNativeApiBridge
-func initNativeApiBridge(api unsafe.Pointer) {
+func initNativeApiBridge(api unsafe.Pointer, port C.longlong) {
 	bridge.InitDartApi(api)
-}
-
-//export initMessage
-func initMessage(port C.longlong) {
 	i := int64(port)
-	Port = i
-}
-
-//export freeCString
-func freeCString(s *C.char) {
-	C.free(unsafe.Pointer(s))
+	bridge.Port = &i
 }

 func init() {
@@ -452,21 +391,9 @@ func init() {
 		} else {
 			delayData.Value = int32(delay)
 		}
-		SendMessage(Message{
-			Type: DelayMessage,
+		bridge.SendMessage(bridge.Message{
+			Type: bridge.Delay,
 			Data: delayData,
 		})
 	}
-	statistic.DefaultRequestNotify = func(c statistic.Tracker) {
-		SendMessage(Message{
-			Type: RequestMessage,
-			Data: c,
-		})
-	}
-	executor.DefaultProxyProviderLoadedHook = func(providerName string) {
-		SendMessage(Message{
-			Type: LoadedMessage,
-			Data: providerName,
-		})
-	}
 }
--- a/core/log.go
+++ b/core/log.go
@@ -2,6 +2,7 @@ package main

 import "C"
 import (
+	bridge "core/dart-bridge"
 	"github.com/metacubex/mihomo/common/observable"
 	"github.com/metacubex/mihomo/log"
 )
@@ -17,14 +18,11 @@ func startLog() {
 	logSubscriber = log.Subscribe()
 	go func() {
 		for logData := range logSubscriber {
-			if logData.LogLevel < log.Level() {
-				continue
-			}
-			message := &Message{
-				Type: LogMessage,
+			message := &bridge.Message{
+				Type: bridge.Log,
 				Data: logData,
 			}
-			SendMessage(*message)
+			bridge.SendMessage(*message)
 		}
 	}()
 }
--- a/core/message.go
+++ b/core/message.go
@@ -1,77 +0,0 @@
-package main
-
-import (
-	bridge "core/dart-bridge"
-	"encoding/json"
-	"github.com/metacubex/mihomo/constant"
-)
-
-var Port int64
-var ServicePort int64
-
-type MessageType string
-
-const (
-	LogMessage     MessageType = "log"
-	ProtectMessage MessageType = "protect"
-	DelayMessage   MessageType = "delay"
-	ProcessMessage MessageType = "process"
-	RequestMessage MessageType = "request"
-	StartedMessage MessageType = "started"
-	LoadedMessage  MessageType = "loaded"
-)
-
-type Delay struct {
-	Name  string `json:"name"`
-	Value int32  `json:"value"`
-}
-
-type Process struct {
-	Id       int64              `json:"id"`
-	Metadata *constant.Metadata `json:"metadata"`
-}
-
-type Message struct {
-	Type MessageType `json:"type"`
-	Data interface{} `json:"data"`
-}
-
-func (message *Message) Json() (string, error) {
-	data, err := json.Marshal(message)
-	return string(data), err
-}
-
-func SendMessage(message Message) {
-	s, err := message.Json()
-	if err != nil {
-		return
-	}
-	if handler, ok := messageHandlers[message.Type]; ok {
-		handler(s)
-	} else {
-		sendToPort(s)
-	}
-}
-
-var messageHandlers = map[MessageType]func(string) bool{
-	ProtectMessage: sendToServicePort,
-	ProcessMessage: sendToServicePort,
-	StartedMessage: conditionalSend,
-	LoadedMessage:  conditionalSend,
-}
-
-func sendToPort(s string) bool {
-	return bridge.SendToPort(Port, s)
-}
-
-func sendToServicePort(s string) bool {
-	return bridge.SendToPort(ServicePort, s)
-}
-
-func conditionalSend(s string) bool {
-	isSuccess := sendToPort(s)
-	if !isSuccess {
-		return sendToServicePort(s)
-	}
-	return isSuccess
-}
--- a/core/platform/limit.go
+++ b/core/platform/limit.go
@@ -1,42 +0,0 @@
-//go:build android
-
-package platform
-
-import "syscall"
-
-var nullFd int
-var maxFdCount int
-
-func init() {
-	fd, err := syscall.Open("/dev/null", syscall.O_WRONLY, 0644)
-	if err != nil {
-		panic(err.Error())
-	}
-
-	nullFd = fd
-
-	var limit syscall.Rlimit
-
-	if err := syscall.Getrlimit(syscall.RLIMIT_NOFILE, &limit); err != nil {
-		maxFdCount = 1024
-	} else {
-		maxFdCount = int(limit.Cur)
-	}
-
-	maxFdCount = maxFdCount / 4 * 3
-}
-
-func ShouldBlockConnection() bool {
-	fd, err := syscall.Dup(nullFd)
-	if err != nil {
-		return true
-	}
-
-	_ = syscall.Close(fd)
-
-	if fd > maxFdCount {
-		return true
-	}
-
-	return false
-}
--- a/core/process.go
+++ b/core/process.go
@@ -1,81 +1,3 @@
 //go:build android

 package main
-
-import "C"
-import (
-	"encoding/json"
-	"errors"
-	"github.com/metacubex/mihomo/component/process"
-	"github.com/metacubex/mihomo/constant"
-	"sync"
-	"sync/atomic"
-	"time"
-)
-
-type ProcessMap struct {
-	m sync.Map
-}
-
-func (cm *ProcessMap) Store(key int64, value string) {
-	cm.m.Store(key, value)
-}
-
-func (cm *ProcessMap) Load(key int64) (string, bool) {
-	value, ok := cm.m.Load(key)
-	if !ok || value == nil {
-		return "", false
-	}
-	return value.(string), true
-}
-
-var counter int64 = 0
-
-var processMap ProcessMap
-
-func init() {
-	process.DefaultPackageNameResolver = func(metadata *constant.Metadata) (string, error) {
-		if metadata == nil {
-			return "", process.ErrInvalidNetwork
-		}
-		id := atomic.AddInt64(&counter, 1)
-
-		timeout := time.After(200 * time.Millisecond)
-
-		SendMessage(Message{
-			Type: ProcessMessage,
-			Data: Process{
-				Id:       id,
-				Metadata: metadata,
-			},
-		})
-
-		for {
-			select {
-			case <-timeout:
-				return "", errors.New("package resolver timeout")
-			default:
-				value, exists := processMap.Load(id)
-				if exists {
-					return value, nil
-				}
-				time.Sleep(20 * time.Millisecond)
-			}
-		}
-	}
-}
-
-//export setProcessMap
-func setProcessMap(s *C.char) {
-	if s == nil {
-		return
-	}
-	paramsString := C.GoString(s)
-	go func() {
-		var processMapItem = &ProcessMapItem{}
-		err := json.Unmarshal([]byte(paramsString), processMapItem)
-		if err == nil {
-			processMap.Store(processMapItem.Id, processMapItem.Value)
-		}
-	}()
-}
--- a/core/tun.go
+++ b/core/tun.go
@@ -4,42 +4,20 @@ package main

 import "C"
 import (
-	"core/platform"
 	t "core/tun"
-	"errors"
 	"github.com/metacubex/mihomo/component/dialer"
 	"github.com/metacubex/mihomo/log"
 	"golang.org/x/sync/semaphore"
-	"strconv"
 	"sync"
-	"sync/atomic"
 	"syscall"
 	"time"
 )

 var tunLock sync.Mutex
 var tun *t.Tun
-var runTime *time.Time
-
-type FdMap struct {
-	m sync.Map
-}
-
-func (cm *FdMap) Store(key int64) {
-	cm.m.Store(key, struct{}{})
-}
-
-func (cm *FdMap) Load(key int64) bool {
-	_, ok := cm.m.Load(key)
-	return ok
-}
-
-var fdMap FdMap

 //export startTUN
-func startTUN(fd C.int, port C.longlong) {
-	i := int64(port)
-	ServicePort = i
+func startTUN(fd C.int) {
 	go func() {
 		tunLock.Lock()
 		defer tunLock.Unlock()
@@ -48,7 +26,6 @@ func startTUN(fd C.int, port C.longlong) {
 			tun.Close()
 			tun = nil
 		}
-
 		f := int(fd)
 		gateway := "172.16.0.1/30"
 		portal := "172.16.0.2"
@@ -58,6 +35,8 @@ func startTUN(fd C.int, port C.longlong) {

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

+		applyConfig(true)
+
 		if err != nil {
 			log.Errorln("startTUN error: %v", err)
 			tempTun.Close()
@@ -66,24 +45,17 @@ func startTUN(fd C.int, port C.longlong) {
 		tempTun.Closer = closer

 		tun = tempTun
-
-		now := time.Now()
-
-		runTime = &now
-
-		SendMessage(Message{
-			Type: StartedMessage,
-			Data: strconv.FormatInt(runTime.UnixMilli(), 10),
-		})
 	}()
 }

-//export getRunTime
-func getRunTime() *C.char {
-	if runTime == nil {
-		return C.CString("")
-	}
-	return C.CString(strconv.FormatInt(runTime.UnixMilli(), 10))
+//export updateMarkSocketPort
+func updateMarkSocketPort(markSocketPort C.longlong) bool {
+	tunLock.Lock()
+	defer tunLock.Unlock()
+	//if tun != nil {
+	//	tun.MarkSocketPort = int64(markSocketPort)
+	//}
+	return true
 }

 //export stopTun
@@ -92,69 +64,20 @@ func stopTun() {
 		tunLock.Lock()
 		defer tunLock.Unlock()

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

-var errBlocked = errors.New("blocked")
-
-//export setFdMap
-func setFdMap(fd C.long) {
-	fdInt := int64(fd)
-	go func() {
-		fdMap.Store(fdInt)
-	}()
-}
-
-type Fd struct {
-	Id    int64 `json:"id"`
-	Value int64 `json:"value"`
-}
-
-func markSocket(fd Fd) {
-	SendMessage(Message{
-		Type: ProtectMessage,
-		Data: fd,
-	})
-}
-
-var fdCounter int64 = 0
-
 func init() {
 	dialer.DefaultSocketHook = func(network, address string, conn syscall.RawConn) error {
-		if platform.ShouldBlockConnection() {
-			return errBlocked
-		}
 		return conn.Control(func(fd uintptr) {
-			if tun == nil {
-				return
-			}
-
-			fdInt := int64(fd)
-			timeout := time.After(100 * time.Millisecond)
-			id := atomic.AddInt64(&fdCounter, 1)
-
-			markSocket(Fd{
-				Id:    id,
-				Value: fdInt,
-			})
-
-			for {
-				select {
-				case <-timeout:
-					return
-				default:
-					exists := fdMap.Load(id)
-					if exists {
-						return
-					}
-					time.Sleep(10 * time.Millisecond)
-				}
+			if tun != nil {
+				tun.MarkSocket(int(fd))
+				time.Sleep(time.Millisecond * 100)
 			}
 		})
 	}
--- a/core/tun/tun.go
+++ b/core/tun/tun.go
@@ -5,6 +5,7 @@ package tun
 import "C"
 import (
 	"context"
+	bridge "core/dart-bridge"
 	"encoding/binary"
 	"github.com/Kr328/tun2socket"
 	"github.com/Kr328/tun2socket/nat"
@@ -18,6 +19,7 @@ import (
 	"io"
 	"net"
 	"os"
+	"strconv"
 	"time"
 )

@@ -184,3 +186,19 @@ func Start(fd int, gateway, portal, dns string) (io.Closer, error) {

 	return stack, nil
 }
+
+func (t *Tun) MarkSocket(fd int) {
+	_ = t.Limit.Acquire(context.Background(), 1)
+	defer t.Limit.Release(1)
+
+	if t.Closed {
+		return
+	}
+
+	message := &bridge.Message{
+		Type: bridge.Tun,
+		Data: strconv.Itoa(fd),
+	}
+
+	bridge.SendMessage(*message)
+}
--- a/lib/application.dart
+++ b/lib/application.dart
@@ -82,11 +82,7 @@ class ApplicationState extends State<Application> {
    super.initState();
    globalState.appController = AppController(context);
    WidgetsBinding.instance.addPostFrameCallback((timeStamp) async {
-      final currentContext = globalState.navigatorKey.currentContext;
-      if (currentContext != null) {
-        globalState.appController = AppController(currentContext);
-      }
-      await globalState.appController.init();
+      globalState.appController.afterInit();
      globalState.appController.initLink();
      _updateGroups();
    });
@@ -115,6 +111,7 @@ class ApplicationState extends State<Application> {
      lightColorScheme: lightDynamic,
      darkColorScheme: darkDynamic,
    );
+
    WidgetsBinding.instance.addPostFrameCallback((_) {
      globalState.appController.updateSystemColorSchemes(systemColorSchemes);
    });
@@ -129,6 +126,7 @@ class ApplicationState extends State<Application> {
      httpTimeoutDuration,
      (timer) async {
        await globalState.appController.updateGroups();
+        globalState.appController.appState.sortNum++;
      },
    );
  }
@@ -163,6 +161,7 @@ class ApplicationState extends State<Application> {
                    themeMode: state.themeMode,
                    theme: ThemeData(
                      useMaterial3: true,
+                      fontFamily: '',
                      pageTransitionsTheme: _pageTransitionsTheme,
                      colorScheme: _getAppColorScheme(
                        brightness: Brightness.light,
@@ -172,6 +171,7 @@ class ApplicationState extends State<Application> {
                    ),
                    darkTheme: ThemeData(
                      useMaterial3: true,
+                      fontFamily: '',
                      pageTransitionsTheme: _pageTransitionsTheme,
                      colorScheme: _getAppColorScheme(
                        brightness: Brightness.dark,
--- a/lib/clash/core.dart
+++ b/lib/clash/core.dart
@@ -35,6 +35,7 @@ class ClashCore {
    clashFFI = ClashFFI(lib);
    clashFFI.initNativeApiBridge(
      NativeApi.initializeApiDLData,
+      receiver.sendPort.nativePort,
    );
  }

@@ -44,10 +45,10 @@ class ClashCore {
  }

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

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

@@ -85,51 +84,23 @@ class ClashCore {
      }
    });
    final params = json.encode(updateConfigParams);
-    final paramsChar = params.toNativeUtf8().cast<Char>();
    clashFFI.updateConfig(
-      paramsChar,
+      params.toNativeUtf8().cast(),
      receiver.sendPort.nativePort,
    );
-    malloc.free(paramsChar);
    return completer.future;
  }

-  initMessage() {
-    clashFFI.initMessage(
-      receiver.sendPort.nativePort,
-    );
-  }
-
-  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();
-    clashFFI.freeCString(proxiesRaw);
    return Isolate.run<List<Group>>(() {
-      if (proxiesRawString.isEmpty) return [];
-      final proxies = (json.decode(proxiesRawString) ?? {}) as Map;
-      if (proxies.isEmpty) return [];
+      final proxies = json.decode(proxiesRawString);
      final groupNames = [
        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;
+          final proxy = proxies[e];
+          return GroupTypeExtension.valueList.contains(proxy['type']);
        })
      ];
      final groupsRaw = groupNames.map((groupName) {
@@ -138,7 +109,6 @@ class ClashCore {
            .map(
              (name) => proxies[name],
            )
-            .where((proxy) => proxy != null)
            .toList();
        return group;
      }).toList();
@@ -150,7 +120,6 @@ class ClashCore {
    final externalProvidersRaw = clashFFI.getExternalProviders();
    final externalProvidersRawString =
        externalProvidersRaw.cast<Utf8>().toDartString();
-    clashFFI.freeCString(externalProvidersRaw);
    return Isolate.run<List<ExternalProvider>>(() {
      final externalProviders =
          (json.decode(externalProvidersRawString) as List<dynamic>)
@@ -174,23 +143,17 @@ class ClashCore {
        receiver.close();
      }
    });
-    final providerNameChar = providerName.toNativeUtf8().cast<Char>();
-    final providerTypeChar = providerType.toNativeUtf8().cast<Char>();
    clashFFI.updateExternalProvider(
-      providerNameChar,
-      providerTypeChar,
+      providerName.toNativeUtf8().cast(),
+      providerType.toNativeUtf8().cast(),
      receiver.sendPort.nativePort,
    );
-    malloc.free(providerNameChar);
-    malloc.free(providerTypeChar);
    return completer.future;
  }

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

  Future<Delay> getDelay(String proxyName) {
@@ -206,55 +169,35 @@ class ClashCore {
        receiver.close();
      }
    });
-    final delayParamsChar =
-        json.encode(delayParams).toNativeUtf8().cast<Char>();
    clashFFI.asyncTestDelay(
-      delayParamsChar,
+      json.encode(delayParams).toNativeUtf8().cast(),
      receiver.sendPort.nativePort,
    );
-    malloc.free(delayParamsChar);
    Future.delayed(httpTimeoutDuration + moreDuration, () {
      receiver.close();
-      if (!completer.isCompleted) {
-        completer.complete(
-          Delay(name: proxyName, value: -1),
-        );
-      }
+      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);
+    clashFFI.clearEffect(path.toNativeUtf8().cast());
  }

  VersionInfo getVersionInfo() {
    final versionInfoRaw = clashFFI.getVersionInfo();
    final versionInfo = json.decode(versionInfoRaw.cast<Utf8>().toDartString());
-    clashFFI.freeCString(versionInfoRaw);
    return VersionInfo.fromJson(versionInfo);
  }

  Traffic getTraffic() {
    final trafficRaw = clashFFI.getTraffic();
    final trafficMap = json.decode(trafficRaw.cast<Utf8>().toDartString());
-    clashFFI.freeCString(trafficRaw);
    return Traffic.fromMap(trafficMap);
  }

-  Traffic getTotalTraffic() {
-    final trafficRaw = clashFFI.getTotalTraffic();
-    final trafficMap = json.decode(trafficRaw.cast<Utf8>().toDartString());
-    clashFFI.freeCString(trafficRaw);
-    return Traffic.fromMap(trafficMap);
-  }
-
-  void resetTraffic() {
-    clashFFI.resetTraffic();
-  }
-
  void startLog() {
    clashFFI.startLog();
  }
@@ -263,52 +206,21 @@ class ClashCore {
    clashFFI.stopLog();
  }

-  startTun(int fd, int port) {
-    if (!Platform.isAndroid) return;
-    clashFFI.startTUN(fd, port);
-  }
-
-  requestGc() {
-    clashFFI.forceGc();
+  startTun(int fd) {
+    clashFFI.startTUN(fd);
  }

  void stopTun() {
    clashFFI.stopTun();
  }

-  void setProcessMap(ProcessMapItem processMapItem) {
-    final processMapItemChar =
-        json.encode(processMapItem).toNativeUtf8().cast<Char>();
-    clashFFI.setProcessMap(processMapItemChar);
-    malloc.free(processMapItemChar);
-  }
-
-  void setFdMap(int fd) {
-    clashFFI.setFdMap(fd);
-  }
-
-  DateTime? getRunTime() {
-    final runTimeRaw = clashFFI.getRunTime();
-    final runTimeString = runTimeRaw.cast<Utf8>().toDartString();
-    clashFFI.freeCString(runTimeRaw);
-    if (runTimeString.isEmpty) return null;
-    return DateTime.fromMillisecondsSinceEpoch(int.parse(runTimeString));
-  }
-
  List<Connection> getConnections() {
    final connectionsDataRaw = clashFFI.getConnections();
    final connectionsData =
        json.decode(connectionsDataRaw.cast<Utf8>().toDartString()) as Map;
-    clashFFI.freeCString(connectionsDataRaw);
    final connectionsRaw = connectionsData['connections'] as List? ?? [];
    return connectionsRaw.map((e) => Connection.fromJson(e)).toList();
  }
-
-  closeConnections(String id) {
-    final idChar = id.toNativeUtf8().cast<Char>();
-    clashFFI.closeConnection(idChar);
-    malloc.free(idChar);
-  }
 }

 final clashCore = ClashCore();
--- a/lib/clash/generated/clash_ffi.dart
+++ b/lib/clash/generated/clash_ffi.dart
--- a/lib/clash/message.dart
+++ b/lib/clash/message.dart
@@ -7,6 +7,18 @@ import 'package:flutter/foundation.dart';

 import 'core.dart';

+abstract mixin class ClashMessageListener {
+  void onLog(Log log) {}
+
+  void onTun(String fd) {}
+
+  void onDelay(Delay delay) {}
+
+  void onProcess(Metadata metadata) {}
+
+  void onNow(Now now) {}
+}
+
 class ClashMessage {
  StreamSubscription? subscription;

@@ -16,23 +28,23 @@ class ClashMessage {
      subscription = null;
    }
    subscription = ClashCore.receiver.listen((message) {
-      final m = AppMessage.fromJson(json.decode(message));
-      for (final AppMessageListener listener in _listeners) {
+      final m = Message.fromJson(json.decode(message));
+      for (final ClashMessageListener listener in _listeners) {
        switch (m.type) {
-          case AppMessageType.log:
+          case MessageType.log:
            listener.onLog(Log.fromJson(m.data));
            break;
-          case AppMessageType.delay:
+          case MessageType.tun:
+            listener.onTun(m.data);
+            break;
+          case MessageType.delay:
            listener.onDelay(Delay.fromJson(m.data));
            break;
-          case AppMessageType.request:
-            listener.onRequest(Connection.fromJson(m.data));
+          case MessageType.process:
+            listener.onProcess(Metadata.fromJson(m.data));
            break;
-          case AppMessageType.started:
-            listener.onStarted(m.data);
-            break;
-          case AppMessageType.loaded:
-            listener.onLoaded(m.data);
+          case MessageType.now:
+            listener.onNow(Now.fromJson(m.data));
            break;
        }
      }
@@ -41,18 +53,18 @@ class ClashMessage {

  static final ClashMessage instance = ClashMessage._();

-  final ObserverList<AppMessageListener> _listeners =
-      ObserverList<AppMessageListener>();
+  final ObserverList<ClashMessageListener> _listeners =
+      ObserverList<ClashMessageListener>();

  bool get hasListeners {
    return _listeners.isNotEmpty;
  }

-  void addListener(AppMessageListener listener) {
+  void addListener(ClashMessageListener listener) {
    _listeners.add(listener);
  }

-  void removeListener(AppMessageListener listener) {
+  void removeListener(ClashMessageListener listener) {
    _listeners.remove(listener);
  }
 }
--- a/lib/clash/service.dart
+++ b/lib/clash/service.dart
@@ -17,7 +17,6 @@ class ClashService {
    }
    const geoFileNameList = [
      mmdbFileName,
-      geoIpFileName,
      geoSiteFileName,
      asnFileName,
    ];
--- a/lib/common/android.dart
+++ b/lib/common/android.dart
@@ -1,10 +1,14 @@
 import 'dart:io';

+import 'package:fl_clash/clash/clash.dart';
 import 'package:fl_clash/plugins/app.dart';

 class Android {
  init() async {
-    app?.onExit = () {};
+    app?.onExit = () {
+      clashCore.shutdown();
+      exit(0);
+    };
  }
 }

--- a/lib/common/common.dart
+++ b/lib/common/common.dart
@@ -22,6 +22,4 @@ export 'string.dart';
 export 'app_localizations.dart';
 export 'function.dart';
 export 'package.dart';
-export 'measure.dart';
-export 'service.dart';
-export 'iterable.dart';
+export 'measure.dart';
--- a/lib/common/constant.dart
+++ b/lib/common/constant.dart
@@ -1,6 +1,5 @@
 import 'dart:ui';

-import 'package:fl_clash/models/clash_config.dart';
 import 'package:flutter/material.dart';

 const appName = "FlClash";
@@ -8,18 +7,10 @@ const coreName = "clash.meta";
 const packageName = "FlClash";
 const httpTimeoutDuration = Duration(milliseconds: 5000);
 const moreDuration = Duration(milliseconds: 100);
-const animateDuration = Duration(milliseconds: 100);
 const defaultUpdateDuration = Duration(days: 1);
 const mmdbFileName = "geoip.metadb";
-const asnFileName = "ASN.mmdb";
-const geoIpFileName = "GeoIP.dat";
 const geoSiteFileName = "GeoSite.dat";
-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"
-};
+const asnFileName = "ASN.mmdb";
 const profilesDirectoryName = "profiles";
 const localhost = "127.0.0.1";
 const clashConfigKey = "clash_config";
@@ -27,12 +18,8 @@ const configKey = "config";
 const listItemPadding = EdgeInsets.symmetric(horizontal: 16);
 const double dialogCommonWidth = 300;
 const repository = "chen08209/FlClash";
-const defaultExternalController = "127.0.0.1:9090";
 const maxMobileWidth = 600;
 const maxLaptopWidth = 840;
-const geodataLoaderMemconservative = "memconservative";
-const geodataLoaderStandard = "standard";
-const defaultTestUrl = "https://www.gstatic.com/generate_204";
 final filter = ImageFilter.blur(
  sigmaX: 5,
  sigmaY: 5,
--- a/lib/common/context.dart
+++ b/lib/common/context.dart
@@ -7,12 +7,8 @@ extension BuildContextExtension on BuildContext {
    return findAncestorStateOfType<CommonScaffoldState>();
  }

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

  ColorScheme get colorScheme => Theme.of(this).colorScheme;
--- a/lib/common/iterable.dart
+++ b/lib/common/iterable.dart
@@ -1,13 +0,0 @@
-extension IterableExt<T> on Iterable<T> {
-  Iterable<T> separated(T separator) sync* {
-    final iterator = this.iterator;
-    if (!iterator.moveNext()) return;
-
-    yield iterator.current;
-
-    while (iterator.moveNext()) {
-      yield separator;
-      yield iterator.current;
-    }
-  }
-}
--- a/lib/common/navigation.dart
+++ b/lib/common/navigation.dart
@@ -29,20 +29,6 @@ class Navigation {
        label: "profiles",
        fragment: ProfilesFragment(),
      ),
-      const NavigationItem(
-        icon:  Icon(Icons.view_timeline),
-        label: "requests",
-        fragment:  RequestsFragment(),
-        description: "requestsDesc",
-        modes: [NavigationItemMode.desktop, NavigationItemMode.more],
-      ),
-      const NavigationItem(
-        icon:  Icon(Icons.ballot),
-        label: "connections",
-        fragment:  ConnectionsFragment(),
-        description: "connectionsDesc",
-        modes: [NavigationItemMode.desktop, NavigationItemMode.more],
-      ),
      const NavigationItem(
        icon: Icon(Icons.swap_vert_circle),
        label: "resources",
--- a/lib/common/other.dart
+++ b/lib/common/other.dart
@@ -39,9 +39,6 @@ class Other {
    }
    final diff = timeStamp / 1000;
    final inHours = (diff / 3600).floor();
-    if (inHours > 99) {
-      return "99:59:59";
-    }
    final inMinutes = (diff / 60 % 60).floor();
    final inSeconds = (diff % 60).floor();

@@ -174,7 +171,7 @@ class Other {
  }

  List<String> parseReleaseBody(String? body) {
-    if (body == null) return [];
+    if(body == null) return [];
    const pattern = r'- (.+?)\. \[.+?\]';
    final regex = RegExp(pattern);
    return regex
@@ -184,7 +181,7 @@ class Other {
        .toList();
  }

-  ViewMode getViewMode(double viewWidth) {
+  ViewMode getViewMode(double viewWidth){
    if (viewWidth <= maxMobileWidth) return ViewMode.mobile;
    if (viewWidth <= maxLaptopWidth) return ViewMode.laptop;
    return ViewMode.desktop;
--- a/lib/common/package.dart
+++ b/lib/common/package.dart
@@ -1,13 +1,22 @@
-import 'dart:io';
+import 'dart:async';

 import 'package:package_info_plus/package_info_plus.dart';

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

-extension PackageInfoExtension on PackageInfo {
-  String get ua => [
-        "$appName/v$version",
-        "clash-verge",
-        "Platform/${Platform.operatingSystem}",
-      ].join(" ");
+  static AppPackage? _instance;
+  Completer<PackageInfo> packageInfoCompleter = Completer();
+
+  AppPackage._internal() {
+     PackageInfo.fromPlatform().then(
+          (value) => packageInfoCompleter.complete(value),
+    );
+  }
+
+  factory AppPackage() {
+    _instance ??= AppPackage._internal();
+    return _instance!;
+  }
 }
+
+final appPackage = AppPackage();
--- a/lib/common/path.dart
+++ b/lib/common/path.dart
@@ -8,30 +8,12 @@ import 'constant.dart';

 class AppPath {
  static AppPath? _instance;
-  Completer<Directory> cacheDir = Completer();
-
-  // Future<Directory> _createDesktopCacheDir() async {
-  //   final path = join(dirname(Platform.resolvedExecutable), 'cache');
-  //   final dir = Directory(path);
-  //   if (await dir.exists()) {
-  //     await dir.create(recursive: true);
-  //   }
-  //   return dir;
-  // }
+  Completer<Directory> applicationSupportDirectoryCompleter = Completer();

  AppPath._internal() {
-    getApplicationSupportDirectory().then((value) {
-      cacheDir.complete(value);
-    });
-    // if (Platform.isAndroid) {
-    //   getApplicationSupportDirectory().then((value) {
-    //     cacheDir.complete(value);
-    //   });
-    // } else {
-    //   _createDesktopCacheDir().then((value) {
-    //     cacheDir.complete(value);
-    //   });
-    // }
+    getApplicationSupportDirectory().then(
+      (value) => applicationSupportDirectoryCompleter.complete(value),
+    );
  }

  factory AppPath() {
@@ -40,12 +22,12 @@ class AppPath {
  }

  Future<String> getHomeDirPath() async {
-    final directory = await cacheDir.future;
+    final directory = await applicationSupportDirectoryCompleter.future;
    return directory.path;
  }

  Future<String> getProfilesPath() async {
-    final directory = await cacheDir.future;
+    final directory = await applicationSupportDirectoryCompleter.future;
    return join(directory.path, profilesDirectoryName);
  }

--- a/lib/common/picker.dart
+++ b/lib/common/picker.dart
@@ -1,22 +1,30 @@
+import 'dart:io';
+
 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 {
-    final filePickerResult = await FilePicker.platform.pickFiles(
-      withData: true,
-      allowMultiple: false,
-    );
-    return filePickerResult?.files.first;
-  }
-
-  Future<PlatformFile?> pickerGeoDataFile() async {
-    final filePickerResult = await FilePicker.platform.pickFiles(
-      withData: true,
-      allowMultiple: false,
-    );
-    return filePickerResult?.files.first;
+    FilePickerResult? filePickerResult;
+    if (Platform.isAndroid) {
+      filePickerResult = await FilePicker.platform.pickFiles(
+        withData: true,
+        type: FileType.custom,
+        allowedExtensions: ['txt', 'conf'],
+      );
+    } else {
+      filePickerResult = await FilePicker.platform.pickFiles(
+        withData: true,
+        type: FileType.custom,
+        allowedExtensions: ['yaml', 'txt', 'conf'],
+      );
+    }
+    final file = filePickerResult?.files.first;
+    if (file == null) {
+      return null;
+    }
+    return file;
  }

  Future<String?> pickerConfigQRCode() async {
--- a/lib/common/proxy.dart
+++ b/lib/common/proxy.dart
@@ -28,6 +28,20 @@ class ProxyManager {
    return await (_proxy as Proxy).updateStartTime();
  }

+  Future<bool?> setProtect(int fd) async {
+    if (_proxy is! Proxy) return null;
+    return await (_proxy as Proxy).setProtect(fd);
+  }
+
+  Future<bool?> startForeground({
+    required String title,
+    required String content,
+  }) async {
+    if (_proxy is! Proxy) return null;
+    return await (_proxy as Proxy)
+        .startForeground(title: title, content: content);
+  }
+
  factory ProxyManager() {
    _instance ??= ProxyManager._internal();
    return _instance!;
--- a/lib/common/request.dart
+++ b/lib/common/request.dart
@@ -12,18 +12,17 @@ class Request {
  bool _isStart = false;

  Request() {
-    _dio = Dio();
-    _dio.options = BaseOptions(
-      headers: {"User-Agent": globalState.appController.clashConfig.globalUa},
-    );
-    _dio.interceptors.add(
-      InterceptorsWrapper(
-        onRequest: (options, handler) {
-          _syncProxy();
-          return handler.next(options); // 继续请求
-        },
+    _dio = Dio(
+      BaseOptions(
+        headers: {"User-Agent": coreName},
      ),
    );
+    _dio.interceptors.add(InterceptorsWrapper(
+      onRequest: (options, handler) {
+        _syncProxy();
+        return handler.next(options); // 继续请求
+      },
+    ));
  }

  _syncProxy() {
@@ -69,7 +68,8 @@ class Request {
    if (response.statusCode != 200) return null;
    final data = response.data as Map<String, dynamic>;
    final remoteVersion = data['tag_name'];
-    final version = globalState.packageInfo.version;
+    final packageInfo = await appPackage.packageInfoCompleter.future;
+    final version = packageInfo.version;
    final hasUpdate =
        other.compareVersions(remoteVersion.replaceAll('v', ''), version) > 0;
    if (!hasUpdate) return null;
--- a/lib/common/service.dart
+++ b/lib/common/service.dart
@@ -1,110 +0,0 @@
-import 'dart:ffi';
-import 'dart:io';
-import 'package:ffi/ffi.dart';
-import 'package:win32/win32.dart';
-
-typedef CreateServiceNative = IntPtr Function(
-  IntPtr hSCManager,
-  Pointer<Utf16> lpServiceName,
-  Pointer<Utf16> lpDisplayName,
-  Uint32 dwDesiredAccess,
-  Uint32 dwServiceType,
-  Uint32 dwStartType,
-  Uint32 dwErrorControl,
-  Pointer<Utf16> lpBinaryPathName,
-  Pointer<Utf16> lpLoadOrderGroup,
-  Pointer<Uint32> lpdwTagId,
-  Pointer<Utf16> lpDependencies,
-  Pointer<Utf16> lpServiceStartName,
-  Pointer<Utf16> lpPassword,
-);
-
-typedef CreateServiceDart = int Function(
-  int hSCManager,
-  Pointer<Utf16> lpServiceName,
-  Pointer<Utf16> lpDisplayName,
-  int dwDesiredAccess,
-  int dwServiceType,
-  int dwStartType,
-  int dwErrorControl,
-  Pointer<Utf16> lpBinaryPathName,
-  Pointer<Utf16> lpLoadOrderGroup,
-  Pointer<Uint32> lpdwTagId,
-  Pointer<Utf16> lpDependencies,
-  Pointer<Utf16> lpServiceStartName,
-  Pointer<Utf16> lpPassword,
-);
-
-const _SERVICE_ALL_ACCESS = 0xF003F;
-
-const _SERVICE_WIN32_OWN_PROCESS = 0x00000010;
-
-const _SERVICE_AUTO_START = 0x00000002;
-
-const _SERVICE_ERROR_NORMAL = 0x00000001;
-
-typedef GetLastErrorNative = Uint32 Function();
-typedef GetLastErrorDart = int Function();
-
-class Service {
-  static Service? _instance;
-  late DynamicLibrary _advapi32;
-
-  Service._internal() {
-    _advapi32 = DynamicLibrary.open('advapi32.dll');
-  }
-
-  factory Service() {
-    _instance ??= Service._internal();
-    return _instance!;
-  }
-
-  Future<void> createService() async {
-    final int scManager = OpenSCManager(nullptr, nullptr, _SERVICE_ALL_ACCESS);
-    if (scManager == 0) return;
-    final serviceName = 'FlClash Service'.toNativeUtf16();
-    final displayName = 'FlClash Service'.toNativeUtf16();
-    final binaryPathName = "C:\\Application\\Clash.Verge_1.6.6_x64_portable\\resources\\clash-verge-service.exe".toNativeUtf16();
-    final createService =
-        _advapi32.lookupFunction<CreateServiceNative, CreateServiceDart>(
-      'CreateServiceW',
-    );
-    final getLastError = DynamicLibrary.open('kernel32.dll')
-        .lookupFunction<GetLastErrorNative, GetLastErrorDart>('GetLastError');
-
-    final serviceHandle = createService(
-      scManager,
-      serviceName,
-      displayName,
-      _SERVICE_ALL_ACCESS,
-      _SERVICE_WIN32_OWN_PROCESS,
-      _SERVICE_AUTO_START,
-      _SERVICE_ERROR_NORMAL,
-      binaryPathName,
-      nullptr,
-      nullptr,
-      nullptr,
-      nullptr,
-      nullptr,
-    );
-
-    print("serviceHandle $serviceHandle");
-
-    final errorCode = GetLastError();
-    print('Error code: $errorCode');
-
-    final result = StartService(serviceHandle, 0, nullptr);
-
-    if (result == 0) {
-      print('Failed to start the service.');
-    } else {
-      print('Service started successfully.');
-    }
-
-    calloc.free(serviceName);
-    calloc.free(displayName);
-    calloc.free(binaryPathName);
-  }
-}
-
-final service = Platform.isWindows ? Service() : null;
--- a/lib/common/string.dart
+++ b/lib/common/string.dart
@@ -1,5 +1,10 @@
 extension StringExtension on String {
  bool get isUrl {
-    return RegExp(r'^(http|https|ftp)://').hasMatch(this);
+    try {
+      Uri.parse(this);
+      return true;
+    } catch (e) {
+      return false;
+    }
  }
 }
--- a/lib/common/text.dart
+++ b/lib/common/text.dart
@@ -2,13 +2,20 @@ import 'package:flutter/material.dart';
 import 'color.dart';

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

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

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

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

-  TextStyle get toMinus => copyWith(fontSize: fontSize! - 2);
-}
+  toBold() {
+    return copyWith(fontWeight: FontWeight.bold);
+  }
+}
--- a/lib/controller.dart
+++ b/lib/controller.dart
@@ -17,7 +17,6 @@ class AppController {
  late ClashConfig clashConfig;
  late Measure measure;
  late Function updateClashConfigDebounce;
-  late Function addCheckIpNumDebounce;

  AppController(this.context) {
    appState = context.read<AppState>();
@@ -26,16 +25,12 @@ class AppController {
    updateClashConfigDebounce = debounce<Function()>(() async {
      await updateClashConfig();
    });
-    addCheckIpNumDebounce = debounce(() {
-      appState.checkIpNum++;
-    });
    measure = Measure.of(context);
  }

  Future<void> updateSystemProxy(bool isStart) async {
    if (isStart) {
      await globalState.startSystemProxy(
-        appState: appState,
        config: config,
        clashConfig: clashConfig,
      );
@@ -47,9 +42,7 @@ class AppController {
      ];
    } else {
      await globalState.stopSystemProxy();
-      clashCore.resetTraffic();
      appState.traffics = [];
-      appState.totalTraffic = Traffic();
      appState.runTime = null;
    }
  }
@@ -70,10 +63,19 @@ class AppController {

  updateTraffic() {
    globalState.updateTraffic(
+      config: config,
      appState: appState,
    );
  }

+  changeProxy() {
+    globalState.changeProxy(
+      appState: appState,
+      config: config,
+      clashConfig: clashConfig,
+    );
+  }
+
  addProfile(Profile profile) async {
    config.setProfile(profile);
    if (config.currentProfileId != null) return;
@@ -95,9 +97,13 @@ class AppController {
    }
  }

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

  Future<void> updateClashConfig({bool isPatch = true}) async {
@@ -120,14 +126,6 @@ class AppController {
    });
  }

-  Future rawApplyProfile() async {
-    await globalState.applyProfile(
-      appState: appState,
-      config: config,
-      clashConfig: clashConfig,
-    );
-  }
-
  changeProfile(String? value) async {
    if (value == config.currentProfileId) return;
    config.currentProfileId = value;
@@ -147,16 +145,7 @@ class AppController {
      if (isNotNeedUpdate == false || profile.type == ProfileType.file) {
        continue;
      }
-      try {
-        updateProfile(profile);
-      } catch (e) {
-        appState.addLog(
-          Log(
-            logLevel: LogLevel.info,
-            payload: e.toString(),
-          ),
-        );
-      }
+      await updateProfile(profile.id);
    }
  }

@@ -165,7 +154,7 @@ class AppController {
      if (profile.type == ProfileType.file) {
        continue;
      }
-      await updateProfile(profile);
+      await updateProfile(profile.id);
    }
  }

@@ -233,21 +222,20 @@ class AppController {
      final tagName = data['tag_name'];
      final body = data['body'];
      final submits = other.parseReleaseBody(body);
-      final textTheme = context.textTheme;
      globalState.showMessage(
        title: appLocalizations.discoverNewVersion,
        message: TextSpan(
          text: "$tagName \n",
-          style: textTheme.headlineSmall,
+          style: context.textTheme.headlineSmall,
          children: [
            TextSpan(
              text: "\n",
-              style: textTheme.bodyMedium,
+              style: context.textTheme.bodyMedium,
            ),
            for (final submit in submits)
              TextSpan(
                text: "- $submit \n",
-                style: textTheme.bodyMedium,
+                style: context.textTheme.bodyMedium,
              ),
          ],
        ),
@@ -268,38 +256,18 @@ class AppController {
    }
  }

-  init() async {
+  afterInit() async {
+    if (config.autoRun) {
+      await updateSystemProxy(true);
+    } else {
+      await proxyManager.updateStartTime();
+      await updateSystemProxy(proxyManager.isStart);
+    }
+    autoUpdateProfiles();
    updateLogStatus();
    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);
-    } else {
-      await updateSystemProxy(config.autoRun);
-    }
-    autoUpdateProfiles();
    autoCheckUpdate();
  }

@@ -362,17 +330,17 @@ class AppController {
  }

  addProfileFormURL(String url) async {
-    if (globalState.navigatorKey.currentState?.canPop() ?? false) {
-      globalState.navigatorKey.currentState?.popUntil((route) => route.isFirst);
-    }
+    globalState.navigatorKey.currentState?.popUntil((route) => route.isFirst);
    toProfiles();
    final commonScaffoldState = globalState.homeScaffoldKey.currentState;
    if (commonScaffoldState?.mounted != true) return;
    final profile = await commonScaffoldState?.loadingRun<Profile>(
      () async {
-        return await Profile.normal(
+        final profile = Profile(
          url: url,
-        ).update();
+        );
+        await profile.update();
+        return profile;
      },
      title: "${appLocalizations.add}${appLocalizations.profile}",
    );
@@ -395,7 +363,9 @@ class AppController {
        if (bytes == null) {
          return null;
        }
-        return await Profile.normal(label: platformFile?.name).saveFile(bytes);
+        final profile = Profile(label: platformFile?.name);
+        await profile.saveFile(bytes);
+        return profile;
      },
      title: "${appLocalizations.add}${appLocalizations.profile}",
    );
@@ -410,54 +380,9 @@ class AppController {
    addProfileFormURL(url);
  }

-  int get columns =>
-      globalState.getColumns(appState.viewMode, config.proxiesColumns);
-
-  changeColumns() {
-    config.proxiesColumns = globalState.getColumns(
-      appState.viewMode,
-      columns - 1,
-    );
-  }
-
  updateViewWidth(double width) {
    WidgetsBinding.instance.addPostFrameCallback((_) {
      appState.viewWidth = width;
    });
  }
-
-  List<Proxy> _sortOfName(List<Proxy> proxies) {
-    return List.of(proxies)
-      ..sort(
-        (a, b) => other.sortByChar(a.name, b.name),
-      );
-  }
-
-  List<Proxy> _sortOfDelay(List<Proxy> proxies) {
-    return proxies = List.of(proxies)
-      ..sort(
-        (a, b) {
-          final aDelay = appState.getDelay(a.name);
-          final bDelay = appState.getDelay(b.name);
-          if (aDelay == null && bDelay == null) {
-            return 0;
-          }
-          if (aDelay == null || aDelay == -1) {
-            return 1;
-          }
-          if (bDelay == null || bDelay == -1) {
-            return -1;
-          }
-          return aDelay.compareTo(bDelay);
-        },
-      );
-  }
-
-  List<Proxy> getSortProxies(List<Proxy> proxies) {
-    return switch (config.proxiesSortType) {
-      ProxiesSortType.none => proxies,
-      ProxiesSortType.delay => _sortOfDelay(proxies),
-      ProxiesSortType.name => _sortOfName(proxies),
-    };
-  }
 }
--- a/lib/enum/enum.dart
+++ b/lib/enum/enum.dart
@@ -1,6 +1,6 @@
 // ignore_for_file: constant_identifier_names

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

 enum GroupName { GLOBAL, Proxy, Auto, Fallback }

@@ -56,32 +56,9 @@ enum ProfileType { file, url }

 enum ResultType { success, error }

-enum AppMessageType {
-  log,
-  delay,
-  request,
-  started,
-  loaded,
-}
-
-enum ServiceMessageType {
-  protect,
-  process,
-  started,
-  loaded,
-}
-
-enum FindProcessMode { always, off }
+enum MessageType { log, tun, delay, process, now }

 enum RecoveryOption {
  all,
  onlyProfiles,
-}
-
-enum ChipType { action, delete }
-
-enum CommonCardType { plain, filled }
-
-enum ProxiesType { tab, expansion }
-
-enum ProxyCardType { expand, shrink }
+}
--- a/lib/fragments/about.dart
+++ b/lib/fragments/about.dart
@@ -1,6 +1,7 @@
 import 'package:fl_clash/common/common.dart';
 import 'package:fl_clash/state.dart';
 import 'package:flutter/material.dart';
+import 'package:package_info_plus/package_info_plus.dart';
 import 'package:url_launcher/url_launcher.dart';

 class AboutFragment extends StatelessWidget {
@@ -48,9 +49,16 @@ class AboutFragment extends StatelessWidget {
                        appName,
                        style: Theme.of(context).textTheme.headlineSmall,
                      ),
-                      Text(
-                        globalState.packageInfo.version,
-                        style: Theme.of(context).textTheme.labelLarge,
+                      FutureBuilder<PackageInfo>(
+                        future: appPackage.packageInfoCompleter.future,
+                        builder: (_, package) {
+                          final version = package.data?.version;
+                          if (version == null) return Container();
+                          return Text(
+                            version,
+                            style: Theme.of(context).textTheme.labelLarge,
+                          );
+                        },
                      )
                    ],
                  )
--- a/lib/fragments/access.dart
+++ b/lib/fragments/access.dart
@@ -8,13 +8,6 @@ import 'package:fl_clash/widgets/widgets.dart';
 import 'package:flutter/material.dart';
 import 'package:provider/provider.dart';

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

@@ -35,12 +28,6 @@ class _AccessFragmentState extends State<AccessFragment> {
    });
  }

-  @override
-  void dispose() {
-    super.dispose();
-    packagesListenable.dispose();
-  }
-
  Widget _buildAppProxyModePopup() {
    final items = [
      CommonPopupMenuItem(
@@ -96,61 +83,134 @@ class _AccessFragmentState extends State<AccessFragment> {
    );
  }

-  Widget _buildSearchButton(List<Package> packages) {
-    return IconButton(
-      tooltip: appLocalizations.search,
-      onPressed: () {
-        showSearch(
-          context: context,
-          delegate: AccessControlSearchDelegate(
-            packages: packages,
-          ),
-        ).then((_) => {setState(() {})});
-      },
-      icon: const Icon(Icons.search),
-    );
-  }
-
  Widget _buildSelectedAllButton({
-    required bool isAccessControl,
    required bool isSelectedAll,
    required List<String> allValueList,
  }) {
-    final tooltip = isSelectedAll
-        ? appLocalizations.cancelSelectAll
-        : appLocalizations.selectAll;
+    return Builder(
+      builder: (context) {
+        final tooltip = isSelectedAll
+            ? appLocalizations.cancelSelectAll
+            : appLocalizations.selectAll;
+        return IconButton(
+          tooltip: tooltip,
+          onPressed: () {
+            final config = globalState.appController.config;
+            final isAccept =
+                config.accessControl.mode == AccessControlMode.acceptSelected;
+
+            if (isSelectedAll) {
+              config.accessControl = switch (isAccept) {
+                true => config.accessControl.copyWith(
+                    acceptList: [],
+                  ),
+                false => config.accessControl.copyWith(
+                    rejectList: [],
+                  ),
+              };
+            } else {
+              config.accessControl = switch (isAccept) {
+                true => config.accessControl.copyWith(
+                    acceptList: allValueList,
+                  ),
+                false => config.accessControl.copyWith(
+                    rejectList: allValueList,
+                  ),
+              };
+            }
+          },
+          icon: isSelectedAll
+              ? const Icon(Icons.deselect)
+              : const Icon(Icons.select_all),
+        );
+      },
+    );
+  }
+
+  Widget _actionHeader({
+    required bool isAccessControl,
+    required List<String> valueList,
+    required String describe,
+    required List<String> packageNameList,
+  }) {
    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: [],
+      child: Padding(
+        padding: const EdgeInsets.only(
+          top: 4,
+          bottom: 4,
+          left: 16,
+          right: 8,
+        ),
+        child: Row(
+          mainAxisAlignment: MainAxisAlignment.spaceBetween,
+          mainAxisSize: MainAxisSize.max,
+          children: [
+            Expanded(
+              child: IntrinsicHeight(
+                child: Column(
+                  mainAxisSize: MainAxisSize.max,
+                  crossAxisAlignment: CrossAxisAlignment.start,
+                  children: [
+                    Expanded(
+                      child: Row(
+                        children: [
+                          Flexible(
+                            child: Text(
+                              appLocalizations.selected,
+                              style: Theme.of(context)
+                                  .textTheme
+                                  .labelLarge
+                                  ?.copyWith(
+                                    color:
+                                        Theme.of(context).colorScheme.primary,
+                                  ),
+                            ),
+                          ),
+                          const Flexible(
+                            child: SizedBox(
+                              width: 8,
+                            ),
+                          ),
+                          Flexible(
+                            child: Text(
+                              "${valueList.length}",
+                              style: Theme.of(context)
+                                  .textTheme
+                                  .labelLarge
+                                  ?.copyWith(
+                                    color:
+                                        Theme.of(context).colorScheme.primary,
+                                  ),
+                            ),
+                          ),
+                        ],
+                      ),
+                    ),
+                    Flexible(
+                      child: Text(describe),
+                    )
+                  ],
                ),
-              false => config.accessControl.copyWith(
-                  rejectList: [],
+              ),
+            ),
+            Row(
+              mainAxisSize: MainAxisSize.min,
+              mainAxisAlignment: MainAxisAlignment.end,
+              children: [
+                Flexible(
+                  child: _buildSelectedAllButton(
+                    isSelectedAll: const ListEquality<String>()
+                        .equals(valueList, packageNameList),
+                    allValueList: packageNameList,
+                  ),
                ),
-            };
-          } 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),
+                Flexible(child: _buildFilterSystemAppButton()),
+                Flexible(child: _buildAppProxyModePopup()),
+              ],
+            ),
+          ],
+        ),
      ),
    );
  }
@@ -192,11 +252,14 @@ class _AccessFragmentState extends State<AccessFragment> {
                accessControlMode == AccessControlMode.acceptSelected
                    ? acceptPackages
                    : rejectPackages;
-            final currentList = accessControl.currentList;
+            final currentList =
+                accessControlMode == AccessControlMode.acceptSelected
+                    ? accessControl.acceptList
+                    : accessControl.rejectList;
            final currentPackages = isFilterSystemApp
                ? packages
-                    .where((element) => element.isSystem == false)
-                    .toList()
+                .where((element) => element.isSystem == false)
+                .toList()
                : packages;
            final packageNameList =
                currentPackages.map((e) => e.packageName).toList();
@@ -207,139 +270,59 @@ class _AccessFragmentState extends State<AccessFragment> {
                    : appLocalizations.accessControlNotAllowDesc;
            return DisabledMask(
              status: !isAccessControl,
-              child: FloatLayout(
-                floatingWidget: FloatWrapper(
-                  child: _buildSelectedAllButton(
+              child: Column(
+                children: [
+                  _actionHeader(
                    isAccessControl: isAccessControl,
-                    isSelectedAll: valueList.length == packageNameList.length,
-                    allValueList: packageNameList,
+                    valueList: valueList,
+                    describe: describe,
+                    packageNameList: packageNameList,
                  ),
-                ),
-                child: Column(
-                  children: [
-                    AbsorbPointer(
-                      absorbing: !isAccessControl,
-                      child: Padding(
-                        padding: const EdgeInsets.only(
-                          top: 4,
-                          bottom: 4,
-                          left: 16,
-                          right: 8,
-                        ),
-                        child: Row(
-                          mainAxisAlignment: MainAxisAlignment.spaceBetween,
-                          mainAxisSize: MainAxisSize.max,
-                          children: [
-                            Expanded(
-                              child: IntrinsicHeight(
-                                child: Column(
-                                  mainAxisSize: MainAxisSize.max,
-                                  crossAxisAlignment: CrossAxisAlignment.start,
-                                  children: [
-                                    Expanded(
-                                      child: Row(
-                                        children: [
-                                          Flexible(
-                                            child: Text(
-                                              appLocalizations.selected,
-                                              style: Theme.of(context)
-                                                  .textTheme
-                                                  .labelLarge
-                                                  ?.copyWith(
-                                                    color: Theme.of(context)
-                                                        .colorScheme
-                                                        .primary,
-                                                  ),
-                                            ),
-                                          ),
-                                          const Flexible(
-                                            child: SizedBox(
-                                              width: 8,
-                                            ),
-                                          ),
-                                          Flexible(
-                                            child: Text(
-                                              "${valueList.length}",
-                                              style: Theme.of(context)
-                                                  .textTheme
-                                                  .labelLarge
-                                                  ?.copyWith(
-                                                    color: Theme.of(context)
-                                                        .colorScheme
-                                                        .primary,
-                                                  ),
-                                            ),
-                                          ),
-                                        ],
-                                      ),
-                                    ),
-                                    Flexible(
-                                      child: Text(describe),
-                                    )
-                                  ],
-                                ),
-                              ),
+                  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,
+                                      );
+                                    }
+                                  },
+                                );
+                              },
                            ),
-                            Row(
-                              mainAxisSize: MainAxisSize.min,
-                              mainAxisAlignment: MainAxisAlignment.end,
-                              children: [
-                                Flexible(
-                                    child: _buildSearchButton(currentPackages)),
-                                Flexible(child: _buildFilterSystemAppButton()),
-                                Flexible(child: _buildAppProxyModePopup()),
-                              ],
-                            ),
-                          ],
-                        ),
-                      ),
                    ),
-                    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,
-                                        );
-                                      }
-                                    },
-                                  );
-                                },
-                              ),
-                      ),
-                    ),
-                  ],
-                ),
+                  ),
+                ],
              ),
            );
          },
@@ -446,111 +429,3 @@ class PackageListItem extends StatelessWidget {
    );
  }
 }
-
-class AccessControlSearchDelegate extends SearchDelegate {
-  final List<Package> packages;
-
-  AccessControlSearchDelegate({
-    required this.packages,
-  });
-
-  List<Package> get _results {
-    final lowQuery = query.toLowerCase();
-    return packages
-        .where(
-          (package) =>
-              package.label.toLowerCase().contains(lowQuery) ||
-              package.packageName.contains(lowQuery),
-        )
-        .toList();
-  }
-
-  @override
-  List<Widget>? buildActions(BuildContext context) {
-    return [
-      IconButton(
-        onPressed: () {
-          if (query.isEmpty) {
-            close(context, null);
-            return;
-          }
-          query = '';
-        },
-        icon: const Icon(Icons.clear),
-      ),
-      const SizedBox(
-        width: 8,
-      )
-    ];
-  }
-
-  @override
-  Widget? buildLeading(BuildContext context) {
-    return IconButton(
-      onPressed: () {
-        close(context, null);
-      },
-      icon: const Icon(Icons.arrow_back),
-    );
-  }
-
-  Widget _packageList(List<Package> packages) {
-    return Selector<Config, PackageListSelectorState>(
-      selector: (_, config) => PackageListSelectorState(
-        accessControl: config.accessControl,
-        isAccessControl: config.isAccessControl,
-      ),
-      builder: (context, state, __) {
-        final accessControl = state.accessControl;
-        final isAccessControl = state.isAccessControl;
-        final accessControlMode = accessControl.mode;
-        final currentList = accessControl.currentList;
-        final packageNameList =
-            this.packages.map((e) => e.packageName).toList();
-        final valueList = currentList.intersection(packageNameList);
-        return DisabledMask(
-          status: !isAccessControl,
-          child: ListView.builder(
-            itemCount: packages.length,
-            itemBuilder: (_, index) {
-              final package = packages[index];
-              return PackageListItem(
-                key: Key(package.packageName),
-                package: package,
-                value: valueList.contains(package.packageName),
-                isActive: isAccessControl,
-                onChanged: (value) {
-                  if (value == true) {
-                    valueList.add(package.packageName);
-                  } else {
-                    valueList.remove(package.packageName);
-                  }
-                  final config = globalState.appController.config;
-                  if (accessControlMode == AccessControlMode.acceptSelected) {
-                    config.accessControl = config.accessControl.copyWith(
-                      acceptList: valueList,
-                    );
-                  } else {
-                    config.accessControl = config.accessControl.copyWith(
-                      rejectList: valueList,
-                    );
-                  }
-                },
-              );
-            },
-          ),
-        );
-      },
-    );
-  }
-
-  @override
-  Widget buildResults(BuildContext context) {
-    return buildSuggestions(context);
-  }
-
-  @override
-  Widget buildSuggestions(BuildContext context) {
-    return _packageList(_results);
-  }
-}
--- a/lib/fragments/application_setting.dart
+++ b/lib/fragments/application_setting.dart
@@ -89,24 +89,6 @@ class ApplicationSettingFragment extends StatelessWidget {
          );
        },
      ),
-      if (Platform.isAndroid)
-        Selector<Config, bool>(
-          selector: (_, config) => config.isExclude,
-          builder: (_, isExclude, child) {
-            return ListItem.switchItem(
-              leading: const Icon(Icons.visibility_off),
-              title: Text(appLocalizations.exclude),
-              subtitle: Text(appLocalizations.excludeDesc),
-              delegate: SwitchDelegate(
-                value: isExclude,
-                onChanged: (value) {
-                  final config = context.read<Config>();
-                  config.isExclude = value;
-                },
-              ),
-            );
-          },
-        ),
      if (Platform.isAndroid)
        Selector<Config, bool>(
          selector: (_, config) => config.isAnimateToPage,
--- a/lib/fragments/backup_and_recovery.dart
+++ b/lib/fragments/backup_and_recovery.dart
@@ -6,6 +6,7 @@ import 'package:fl_clash/models/dav.dart';
 import 'package:fl_clash/state.dart';
 import 'package:fl_clash/widgets/fade_box.dart';
 import 'package:fl_clash/widgets/list.dart';
+import 'package:fl_clash/widgets/section.dart';
 import 'package:fl_clash/widgets/text.dart';
 import 'package:flutter/material.dart';
 import 'package:provider/provider.dart';
@@ -33,9 +34,9 @@ class _BackupAndRecoveryState extends State<BackupAndRecovery> {
    final res = await commonScaffoldState?.loadingRun<bool>(() async {
      return await _client?.backup();
    });
-    if (res != true) return;
+    if(res != true) return;
    globalState.showMessage(
-      title: appLocalizations.backup,
+      title: appLocalizations.recovery,
      message: TextSpan(text: appLocalizations.backupSuccess),
    );
  }
@@ -45,7 +46,7 @@ class _BackupAndRecoveryState extends State<BackupAndRecovery> {
    final res = await commonScaffoldState?.loadingRun<bool>(() async {
      return await _client?.recovery(recoveryOption: recoveryOption);
    });
-    if (res != true) return;
+    if(res != true) return;
    globalState.showMessage(
      title: appLocalizations.recovery,
      message: TextSpan(text: appLocalizations.recoverySuccess),
@@ -68,22 +69,26 @@ class _BackupAndRecoveryState extends State<BackupAndRecovery> {
        if (dav == null) {
          return ListView(
            children: [
-              ListHeader(
+              Section(
                title: appLocalizations.account,
-              ),
-              ListItem(
-                leading: const Icon(Icons.account_box),
-                title: Text(appLocalizations.noInfo),
-                subtitle: Text(appLocalizations.pleaseBindWebDAV),
-                trailing: FilledButton.tonal(
-                  onPressed: () {
-                    _showAddWebDAV(dav);
+                child: Builder(
+                  builder: (_) {
+                    return ListItem(
+                      leading: const Icon(Icons.account_box),
+                      title: Text(appLocalizations.noInfo),
+                      subtitle: Text(appLocalizations.pleaseBindWebDAV),
+                      trailing: FilledButton.tonal(
+                        onPressed: () {
+                          _showAddWebDAV(dav);
+                        },
+                        child: Text(
+                          appLocalizations.bind,
+                        ),
+                      ),
+                    );
                  },
-                  child: Text(
-                    appLocalizations.bind,
-                  ),
                ),
-              ),
+              )
            ],
          );
        }
@@ -91,60 +96,62 @@ class _BackupAndRecoveryState extends State<BackupAndRecovery> {
        final pingFuture = _client!.pingCompleter.future;
        return ListView(
          children: [
-            ListHeader(title: appLocalizations.account),
-            ListItem(
-              leading: const Icon(Icons.account_box),
-              title: TooltipText(
-                text: Text(
-                  dav.user,
-                  maxLines: 1,
-                  overflow: TextOverflow.ellipsis,
+            Section(
+              title: appLocalizations.account,
+              child: 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,
+                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,
                                    ),
-                                  )
-                                : 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,
+                trailing: FilledButton.tonal(
+                  onPressed: () {
+                    _showAddWebDAV(dav);
+                  },
+                  child: Text(
+                    appLocalizations.edit,
+                  ),
                ),
              ),
            ),
@@ -154,21 +161,22 @@ class _BackupAndRecoveryState extends State<BackupAndRecovery> {
                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),
-                            ),
-                          ],
+                      ? Section(
+                          title: appLocalizations.backupAndRecovery,
+                          child: Column(
+                            children: [
+                              ListItem(
+                                onTab: _backup,
+                                title: Text(appLocalizations.backup),
+                                subtitle: Text(appLocalizations.backupDesc),
+                              ),
+                              ListItem(
+                                onTab: _handleRecovery,
+                                title: Text(appLocalizations.recovery),
+                                subtitle: Text(appLocalizations.recoveryDesc),
+                              ),
+                            ],
+                          ),
                        )
                      : Container(),
                );
@@ -220,12 +228,6 @@ class _WebDAVFormDialogState extends State<WebDAVFormDialog> {
    Navigator.pop(context);
  }

-  @override
-  void dispose() {
-    super.dispose();
-    _obscureController.dispose();
-  }
-
  @override
  Widget build(BuildContext context) {
    return AlertDialog(
--- a/lib/fragments/config.dart
+++ b/lib/fragments/config.dart
@@ -1,5 +1,3 @@
-import 'dart:io';
-
 import 'package:fl_clash/common/common.dart';
 import 'package:fl_clash/enum/enum.dart';
 import 'package:fl_clash/models/models.dart';
@@ -39,409 +37,141 @@ class _ConfigFragmentState extends State<ConfigFragment> {
    }
  }

-  _showLogLevelDialog(LogLevel value) {
-    globalState.showCommonDialog(
-      child: AlertDialog(
-        title: Text(appLocalizations.logLevel),
-        contentPadding: const EdgeInsets.symmetric(
-          horizontal: 8,
-          vertical: 16,
-        ),
-        content: SizedBox(
-          width: 250,
-          child: Wrap(
-            children: [
-              for (final logLevel in LogLevel.values)
-                ListItem.radio(
-                  delegate: RadioDelegate<LogLevel>(
-                    value: logLevel,
-                    groupValue: value,
-                    onChanged: (LogLevel? value) {
-                      if (value == null) {
-                        return;
-                      }
-                      final appController = globalState.appController;
-                      appController.clashConfig.logLevel = value;
-                      appController.updateClashConfigDebounce();
-                      Navigator.of(context).pop();
-                    },
-                  ),
-                  title: Text(logLevel.name),
-                )
-            ],
-          ),
-        ),
-      ),
-    );
-  }
-
-  _showUaDialog(String? value) {
-    const uas = [
-      null,
-      "clash-verge/v1.6.6",
-      "ClashforWindows/0.19.23",
-    ];
-    globalState.showCommonDialog(
-      child: AlertDialog(
-        title: const Text("UA"),
-        contentPadding: const EdgeInsets.symmetric(
-          horizontal: 8,
-          vertical: 16,
-        ),
-        content: SizedBox(
-          width: 250,
-          child: Wrap(
-            children: [
-              for (final ua in uas)
-                ListItem.radio(
-                  delegate: RadioDelegate<String?>(
-                    value: ua,
-                    groupValue: value,
-                    onChanged: (String? value) {
-                      final appController = globalState.appController;
-                      appController.clashConfig.globalRealUa = value;
-                      appController.updateClashConfigDebounce();
-                      Navigator.of(context).pop();
-                    },
-                  ),
-                  title: Text(ua ?? appLocalizations.defaultText),
-                )
-            ],
-          ),
-        ),
-      ),
-    );
-  }
-
-  _modifyTestUrl(String testUrl) async {
-    final newTestUrl = await globalState.showCommonDialog<String>(
-      child: TestUrlFormDialog(
-        testUrl: testUrl,
-      ),
-    );
-    if (newTestUrl != null && newTestUrl != testUrl && mounted) {
-      try {
-        if (!newTestUrl.isUrl) {
-          throw "Invalid url";
-        }
-        globalState.appController.config.testUrl = newTestUrl;
-        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)
-          Selector<Config, bool>(
-            selector: (_, config) => config.allowBypass,
-            builder: (_, allowBypass, __) {
-              return ListItem.switchItem(
-                leading: const Icon(Icons.arrow_forward_outlined),
-                title: Text(appLocalizations.allowBypass),
-                subtitle: Text(appLocalizations.allowBypassDesc),
-                delegate: SwitchDelegate(
-                  value: allowBypass,
-                  onChanged: (bool value) async {
-                    final appController = globalState.appController;
-                    appController.config.allowBypass = value;
-                  },
-                ),
-              );
-            },
-          ),
-        if (Platform.isAndroid)
-          Selector<Config, bool>(
-            selector: (_, config) => config.systemProxy,
-            builder: (_, systemProxy, __) {
-              return ListItem.switchItem(
-                leading: const Icon(Icons.settings_ethernet),
-                title: Text(appLocalizations.systemProxy),
-                subtitle: Text(appLocalizations.systemProxyDesc),
-                delegate: SwitchDelegate(
-                  value: systemProxy,
-                  onChanged: (bool value) async {
-                    final appController = globalState.appController;
-                    appController.config.systemProxy = 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();
-                },
-              ),
-            );
-          },
-        ),
-      ],
-    );
-  }
-
-  List<Widget> _buildGeneralSection() {
-    return generateSection(
-      title: appLocalizations.general,
-      items: [
-        Selector<ClashConfig, LogLevel>(
-          selector: (_, clashConfig) => clashConfig.logLevel,
-          builder: (_, value, __) {
-            return ListItem(
-              leading: const Icon(Icons.info_outline),
-              title: Text(appLocalizations.logLevel),
-              subtitle: Text(value.name),
-              onTab: () {
-                _showLogLevelDialog(value);
-              },
-            );
-          },
-        ),
-        Selector<ClashConfig, String?>(
-          selector: (_, clashConfig) => clashConfig.globalRealUa,
-          builder: (_, value, __) {
-            return ListItem(
-              leading: const Icon(Icons.computer_outlined),
-              title: const Text("UA"),
-              subtitle: Text(value ?? appLocalizations.defaultText),
-              onTab: () {
-                _showUaDialog(value);
-              },
-            );
-          },
-        ),
-        Selector<Config, String>(
-          selector: (_, config) => config.testUrl,
-          builder: (_, value, __) {
-            return ListItem(
-              leading: const Icon(Icons.timeline),
-              title: Text(appLocalizations.testUrl),
-              subtitle: Text(value),
-              onTab: () {
-                _modifyTestUrl(value);
-              },
-            );
-          },
-        ),
-        Selector<ClashConfig, int>(
-          selector: (_, clashConfig) => clashConfig.mixedPort,
-          builder: (_, mixedPort, __) {
-            return ListItem(
-              onTab: () {
-                _modifyMixedPort(mixedPort);
-              },
-              leading: const Icon(Icons.adjust_outlined),
-              title: Text(appLocalizations.proxyPort),
-              subtitle: Text(appLocalizations.proxyPortDesc),
-              trailing: FilledButton.tonal(
-                onPressed: () {
-                  _modifyMixedPort(mixedPort);
-                },
-                child: Text(
-                  "$mixedPort",
-                ),
-              ),
-            );
-          },
-        ),
-        Selector<ClashConfig, bool>(
-          selector: (_, clashConfig) => clashConfig.ipv6,
-          builder: (_, ipv6, __) {
-            return ListItem.switchItem(
-              leading: const Icon(Icons.water_outlined),
-              title: const Text("IPv6"),
-              subtitle: Text(appLocalizations.ipv6Desc),
-              delegate: SwitchDelegate(
-                value: ipv6,
-                onChanged: (bool value) async {
-                  final appController = globalState.appController;
-                  appController.clashConfig.ipv6 = value;
-                  appController.updateClashConfigDebounce();
-                },
-              ),
-            );
-          },
-        ),
-        Selector<ClashConfig, bool>(
-          selector: (_, clashConfig) => clashConfig.allowLan,
-          builder: (_, allowLan, __) {
-            return ListItem.switchItem(
-              leading: const Icon(Icons.device_hub),
-              title: Text(appLocalizations.allowLan),
-              subtitle: Text(appLocalizations.allowLanDesc),
-              delegate: SwitchDelegate(
-                value: allowLan,
-                onChanged: (bool value) async {
-                  final clashConfig = context.read<ClashConfig>();
-                  clashConfig.allowLan = value;
-                  globalState.appController.updateClashConfigDebounce();
-                },
-              ),
-            );
-          },
-        ),
-        Selector<ClashConfig, bool>(
-          selector: (_, clashConfig) => clashConfig.unifiedDelay,
-          builder: (_, unifiedDelay, __) {
-            return ListItem.switchItem(
-              leading: const Icon(Icons.compress_outlined),
-              title: Text(appLocalizations.unifiedDelay),
-              subtitle: Text(appLocalizations.unifiedDelayDesc),
-              delegate: SwitchDelegate(
-                value: unifiedDelay,
-                onChanged: (bool value) async {
-                  final appController = globalState.appController;
-                  appController.clashConfig.unifiedDelay = value;
-                  appController.updateClashConfigDebounce();
-                },
-              ),
-            );
-          },
-        ),
-        Selector<ClashConfig, bool>(
-          selector: (_, clashConfig) =>
-              clashConfig.findProcessMode == FindProcessMode.always,
-          builder: (_, findProcess, __) {
-            return ListItem.switchItem(
-              leading: const Icon(Icons.polymer_outlined),
-              title: Text(appLocalizations.findProcessMode),
-              subtitle: Text(appLocalizations.findProcessModeDesc),
-              delegate: SwitchDelegate(
-                value: findProcess,
-                onChanged: (bool value) async {
-                  final appController = globalState.appController;
-                  appController.clashConfig.findProcessMode =
-                      value ? FindProcessMode.always : FindProcessMode.off;
-                  appController.updateClashConfigDebounce();
-                },
-              ),
-            );
-          },
-        ),
-        Selector<ClashConfig, bool>(
-          selector: (_, clashConfig) => clashConfig.tcpConcurrent,
-          builder: (_, tcpConcurrent, __) {
-            return ListItem.switchItem(
-              leading: const Icon(Icons.double_arrow_outlined),
-              title: Text(appLocalizations.tcpConcurrent),
-              subtitle: Text(appLocalizations.tcpConcurrentDesc),
-              delegate: SwitchDelegate(
-                value: tcpConcurrent,
-                onChanged: (bool value) async {
-                  final appController = globalState.appController;
-                  appController.clashConfig.tcpConcurrent = value;
-                  appController.updateClashConfigDebounce();
-                },
-              ),
-            );
-          },
-        ),
-        Selector<ClashConfig, bool>(
-          selector: (_, clashConfig) =>
-              clashConfig.geodataLoader == geodataLoaderMemconservative,
-          builder: (_, memconservative, __) {
-            return ListItem.switchItem(
-              leading: const Icon(Icons.memory),
-              title: Text(appLocalizations.geodataLoader),
-              subtitle: Text(appLocalizations.geodataLoaderDesc),
-              delegate: SwitchDelegate(
-                value: memconservative,
-                onChanged: (bool value) async {
-                  final appController = globalState.appController;
-                  appController.clashConfig.geodataLoader = value
-                      ? geodataLoaderMemconservative
-                      : geodataLoaderStandard;
-                  appController.updateClashConfigDebounce();
-                },
-              ),
-            );
-          },
-        ),
-        Selector<ClashConfig, bool>(
-          selector: (_, clashConfig) =>
-              clashConfig.externalController.isNotEmpty,
-          builder: (_, hasExternalController, __) {
-            return ListItem.switchItem(
-              leading: const Icon(Icons.api_outlined),
-              title: Text(appLocalizations.externalController),
-              subtitle: Text(appLocalizations.externalControllerDesc),
-              delegate: SwitchDelegate(
-                value: hasExternalController,
-                onChanged: (bool value) async {
-                  final appController = globalState.appController;
-                  appController.clashConfig.externalController =
-                      value ? defaultExternalController : '';
-                  appController.updateClashConfigDebounce();
-                },
-              ),
-            );
-          },
-        ),
-      ],
-    );
-  }
-
-  List<Widget> _buildMoreSection() {
-    return generateSection(
-      title: appLocalizations.more,
-      items: [
-        if (system.isDesktop)
-          Selector<ClashConfig, bool>(
-            selector: (_, clashConfig) => clashConfig.tun.enable,
-            builder: (_, tunEnable, __) {
-              return ListItem.switchItem(
-                leading: const Icon(Icons.important_devices_outlined),
-                title: Text(appLocalizations.tun),
-                subtitle: Text(appLocalizations.tunDesc),
-                delegate: SwitchDelegate(
-                  value: tunEnable,
-                  onChanged: (bool value) async {
-                    final clashConfig = context.read<ClashConfig>();
-                    clashConfig.tun = Tun(enable: value);
-                    globalState.appController.updateClashConfigDebounce();
-                  },
-                ),
-              );
-            },
-          ),
-      ],
-    );
+  _updateLoglevel(LogLevel? logLevel) {
+    if (logLevel == null ||
+        logLevel == globalState.appController.clashConfig.logLevel) return;
+    globalState.appController.clashConfig.logLevel = logLevel;
+    globalState.appController.updateClashConfigDebounce();
  }

  @override
  Widget build(BuildContext context) {
    List<Widget> items = [
-      ..._buildAppSection(),
-      ..._buildGeneralSection(),
-      ..._buildMoreSection(),
+      Selector<ClashConfig, int>(
+        selector: (_, clashConfig) => clashConfig.mixedPort,
+        builder: (_, mixedPort, __) {
+          return ListItem(
+            onTab: () {
+              _modifyMixedPort(mixedPort);
+            },
+            padding: const EdgeInsets.symmetric(horizontal: 16,vertical: 4),
+            leading: const Icon(Icons.adjust),
+            title: Text(appLocalizations.proxyPort),
+            trailing: FilledButton.tonal(
+              onPressed: () {
+                _modifyMixedPort(mixedPort);
+              },
+              child: Text(
+                "$mixedPort",
+              ),
+            ),
+          );
+        },
+      ),
+      Selector<ClashConfig, bool>(
+        selector: (_, clashConfig) => clashConfig.allowLan,
+        builder: (_, allowLan, __) {
+          return ListItem.switchItem(
+            leading: const Icon(Icons.device_hub),
+            title: Text(appLocalizations.allowLan),
+            subtitle: Text(appLocalizations.allowLanDesc),
+            delegate: SwitchDelegate(
+              value: allowLan,
+              onChanged: (bool value) async {
+                final clashConfig = context.read<ClashConfig>();
+                clashConfig.allowLan = value;
+                globalState.appController.updateClashConfigDebounce();
+              },
+            ),
+          );
+        },
+      ),
+      // if (system.isDesktop)
+      //   Selector<ClashConfig, bool>(
+      //     selector: (_, clashConfig) => clashConfig.tun.enable,
+      //     builder: (_, tunEnable, __) {
+      //       return ListItem.switchItem(
+      //         leading: const Icon(Icons.support),
+      //         title: Text(appLocalizations.tun),
+      //         subtitle: Text(appLocalizations.tunDesc),
+      //         delegate: SwitchDelegate(
+      //           value: tunEnable,
+      //           onChanged: (bool value) async {
+      //             final clashConfig = context.read<ClashConfig>();
+      //             clashConfig.tun = Tun(enable: value);
+      //             globalState.appController.updateClashConfigDebounce();
+      //           },
+      //         ),
+      //       );
+      //     },
+      //   ),
+      Selector<Config, bool>(
+        selector: (_, config) => config.isCompatible,
+        builder: (_, isCompatible, __) {
+          return ListItem.switchItem(
+            leading: const Icon(Icons.expand),
+            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.updateClashConfig(isPatch: false);
+                await appController.updateGroups();
+                appController.changeProxy();
+              },
+            ),
+          );
+        },
+      ),
+      Padding(
+        padding: kMaterialListPadding,
+        child: Selector<ClashConfig, LogLevel>(
+          selector: (_, clashConfig) => clashConfig.logLevel,
+          builder: (_, value, __) {
+            return ListItem(
+              leading: const Icon(Icons.feedback),
+              title: Text(appLocalizations.logLevel),
+              trailing: SizedBox(
+                height: 48,
+                child: DropdownMenu<LogLevel>(
+                  width: 124,
+                  inputDecorationTheme: const InputDecorationTheme(
+                    filled: true,
+                    contentPadding: EdgeInsets.symmetric(
+                      vertical: 5,
+                      horizontal: 16,
+                    ),
+                  ),
+                  initialSelection: value,
+                  dropdownMenuEntries: [
+                    for (final logLevel in LogLevel.values)
+                      DropdownMenuEntry<LogLevel>(
+                        value: logLevel,
+                        label: logLevel.name,
+                      )
+                  ],
+                  onSelected: _updateLoglevel,
+                ),
+              ),
+            );
+          },
+        ),
+      ),
    ];
-    return ListView.builder(
-      padding: const EdgeInsets.only(bottom: 32),
+    return ListView.separated(
      itemBuilder: (_, index) {
        return Container(
          alignment: Alignment.center,
          child: items[index],
        );
      },
+      separatorBuilder: (_, __) {
+        return const Divider(
+          height: 0,
+        );
+      },
      itemCount: items.length,
    );
  }
@@ -465,7 +195,7 @@ class _MixedPortFormDialogState extends State<MixedPortFormDialog> {
    portController = TextEditingController(text: "${widget.mixedPort}");
  }

-  _handleUpdate() async {
+  _handleAddProfileFormURL() async {
    final port = portController.value.text;
    if (port.isEmpty) return;
    Navigator.of(context).pop<String>(port);
@@ -491,64 +221,7 @@ class _MixedPortFormDialogState extends State<MixedPortFormDialog> {
      ),
      actions: [
        TextButton(
-          onPressed: _handleUpdate,
-          child: Text(appLocalizations.submit),
-        )
-      ],
-    );
-  }
-}
-
-class TestUrlFormDialog extends StatefulWidget {
-  final String testUrl;
-
-  const TestUrlFormDialog({
-    super.key,
-    required this.testUrl,
-  });
-
-  @override
-  State<TestUrlFormDialog> createState() => _TestUrlFormDialogState();
-}
-
-class _TestUrlFormDialogState extends State<TestUrlFormDialog> {
-  late TextEditingController testUrlController;
-
-  @override
-  void initState() {
-    super.initState();
-    testUrlController = TextEditingController(text: widget.testUrl);
-  }
-
-  _handleUpdate() async {
-    final testUrl = testUrlController.value.text;
-    if (testUrl.isEmpty) return;
-    Navigator.of(context).pop<String>(testUrl);
-  }
-
-  @override
-  Widget build(BuildContext context) {
-    return AlertDialog(
-      title: Text(appLocalizations.testUrl),
-      content: SizedBox(
-        width: 300,
-        child: Wrap(
-          runSpacing: 16,
-          children: [
-            TextField(
-              maxLines: 5,
-              minLines: 1,
-              controller: testUrlController,
-              decoration: const InputDecoration(
-                border: OutlineInputBorder(),
-              ),
-            ),
-          ],
-        ),
-      ),
-      actions: [
-        TextButton(
-          onPressed: _handleUpdate,
+          onPressed: _handleAddProfileFormURL,
          child: Text(appLocalizations.submit),
        )
      ],
--- a/lib/fragments/connections.dart
+++ b/lib/fragments/connections.dart
@@ -1,14 +1,11 @@
 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/clash/core.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';

 class ConnectionsFragment extends StatefulWidget {
  const ConnectionsFragment({super.key});
@@ -18,417 +15,124 @@ class ConnectionsFragment extends StatefulWidget {
 }

 class _ConnectionsFragmentState extends State<ConnectionsFragment> {
-  final connectionsNotifier =
-      ValueNotifier<ConnectionsAndKeywords>(const ConnectionsAndKeywords());
-  final ScrollController _scrollController = ScrollController(
-    keepScrollOffset: false,
-  );
+  final connectionsNotifier = ValueNotifier<List<Connection>>([]);
+  Map<String, String?> idPackageNameMap = {};

  Timer? timer;

  @override
  void initState() {
    super.initState();
-    WidgetsBinding.instance.addPostFrameCallback((_) {
-      connectionsNotifier.value = connectionsNotifier.value
-          .copyWith(connections: clashCore.getConnections());
+    WidgetsBinding.instance.addPostFrameCallback((timeStamp) {
+      _getConnections();
      if (timer != null) {
        timer?.cancel();
        timer = null;
      }
-      timer = Timer.periodic(
-        const Duration(seconds: 1),
-        (timer) {
-          connectionsNotifier.value = connectionsNotifier.value
-              .copyWith(connections: clashCore.getConnections());
-        },
-      );
+      timer = Timer.periodic(const Duration(seconds: 3), (timer) {
+        if (mounted) {
+          _getConnections();
+        }
+      });
    });
  }

-  _initActions() {
-    WidgetsBinding.instance.addPostFrameCallback(
-      (_) {
-        final commonScaffoldState =
-            context.findAncestorStateOfType<CommonScaffoldState>();
-        commonScaffoldState?.actions = [
-          IconButton(
-            onPressed: () {
-              showSearch(
-                context: context,
-                delegate: ConnectionsSearchDelegate(
-                  state: connectionsNotifier.value,
-                ),
-              );
-            },
-            icon: const Icon(Icons.search),
-          ),
-          const SizedBox(
-            width: 8,
-          )
-        ];
-      },
-    );
-  }
-
-  _addKeyword(String keyword) {
-    final isContains = connectionsNotifier.value.keywords.contains(keyword);
-    if (isContains) return;
-    final keywords = List<String>.from(connectionsNotifier.value.keywords)
-      ..add(keyword);
-    connectionsNotifier.value = connectionsNotifier.value.copyWith(
-      keywords: keywords,
-    );
-  }
-
-  _deleteKeyword(String keyword) {
-    final isContains = connectionsNotifier.value.keywords.contains(keyword);
-    if (!isContains) return;
-    final keywords = List<String>.from(connectionsNotifier.value.keywords)
-      ..remove(keyword);
-    connectionsNotifier.value = connectionsNotifier.value.copyWith(
-      keywords: keywords,
-    );
-  }
-
-  _handleBlockConnection(String id) {
-    clashCore.closeConnections(id);
-    connectionsNotifier.value = connectionsNotifier.value
-        .copyWith(connections: clashCore.getConnections());
+  _getConnections() {
+    connectionsNotifier.value = clashCore
+        .getConnections();
  }

  @override
  void dispose() {
    super.dispose();
    timer?.cancel();
-    connectionsNotifier.dispose();
-    _scrollController.dispose();
    timer = null;
  }

-  @override
-  Widget build(BuildContext context) {
-    return Selector<AppState, bool?>(
-      selector: (_, appState) =>
-          appState.currentLabel == 'connections' ||
-          appState.viewMode == ViewMode.mobile &&
-              appState.currentLabel == "tools",
-      builder: (_, isCurrent, child) {
-        if (isCurrent == null || isCurrent) {
-          _initActions();
-        }
-        return child!;
-      },
-      child: ValueListenableBuilder<ConnectionsAndKeywords>(
-        valueListenable: connectionsNotifier,
-        builder: (_, state, __) {
-          var connections = state.filteredConnections;
-          if (connections.isEmpty) {
-            return NullStatus(
-              label: appLocalizations.nullConnectionsDesc,
-            );
-          }
-          connections = connections.reversed.toList();
-          return Column(
-            crossAxisAlignment: CrossAxisAlignment.start,
-            children: [
-              if (state.keywords.isNotEmpty)
-                Padding(
-                  padding: const EdgeInsets.symmetric(
-                    horizontal: 16,
-                    vertical: 16,
-                  ),
-                  child: Wrap(
-                    runSpacing: 6,
-                    spacing: 6,
-                    children: [
-                      for (final keyword in state.keywords)
-                        CommonChip(
-                          label: keyword,
-                          type: ChipType.delete,
-                          onPressed: () {
-                            _deleteKeyword(keyword);
-                          },
-                        ),
-                    ],
-                  ),
-                ),
-              Expanded(
-                child: ListView.separated(
-                  controller: _scrollController,
-                  itemBuilder: (_, index) {
-                    final connection = connections[index];
-                    return ConnectionItem(
-                      key: Key(connection.id),
-                      connection: connection,
-                      onClick: _addKeyword,
-                      onBlock: _handleBlockConnection,
-                    );
-                  },
-                  separatorBuilder: (BuildContext context, int index) {
-                    return const Divider(
-                      height: 0,
-                    );
-                  },
-                  itemCount: connections.length,
-                ),
-              )
-            ],
-          );
-        },
-      ),
-    );
-  }
-}
-
-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}";
+  Future<ImageProvider?> _getPackageIconWithConnection(
+      Connection connection) async {
+    final uid = connection.metadata.uid;
+    // if(globalState.packageNameMap[uid] == null){
+    //   globalState.packageNameMap[uid] = await app?.getPackageName(connection.metadata);
+    // }
+    final packageName = globalState.packageNameMap[uid];
+    if(packageName == null) return null;
+    return await app?.getPackageIcon(packageName);
  }

  @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;
-
-  ConnectionsSearchDelegate({
-    required ConnectionsAndKeywords state,
-  }) : connectionsNotifier = ValueNotifier<ConnectionsAndKeywords>(state);
-
-  get state => connectionsNotifier.value;
-
-  List<Connection> get _results {
-    final lowerQuery = query.toLowerCase().trim();
-    return connectionsNotifier.value.filteredConnections.where((request) {
-      final lowerNetwork = request.metadata.network.toLowerCase();
-      final lowerHost = request.metadata.host.toLowerCase();
-      final lowerDestinationIP = request.metadata.destinationIP.toLowerCase();
-      final lowerProcess = request.metadata.process.toLowerCase();
-      final lowerChains = request.chains.join("").toLowerCase();
-      return lowerNetwork.contains(lowerQuery) ||
-          lowerHost.contains(lowerQuery) ||
-          lowerDestinationIP.contains(lowerQuery) ||
-          lowerProcess.contains(lowerQuery) ||
-          lowerChains.contains(lowerQuery);
-    }).toList();
-  }
-
-  _addKeyword(String keyword) {
-    final isContains = connectionsNotifier.value.keywords.contains(keyword);
-    if (isContains) return;
-    final keywords = List<String>.from(connectionsNotifier.value.keywords)
-      ..add(keyword);
-    connectionsNotifier.value = connectionsNotifier.value.copyWith(
-      keywords: keywords,
-    );
-  }
-
-  _deleteKeyword(String keyword) {
-    final isContains = connectionsNotifier.value.keywords.contains(keyword);
-    if (!isContains) return;
-    final keywords = List<String>.from(connectionsNotifier.value.keywords)
-      ..remove(keyword);
-    connectionsNotifier.value = connectionsNotifier.value.copyWith(
-      keywords: keywords,
-    );
-  }
-
-
-  _handleBlockConnection(String id) {
-    clashCore.closeConnections(id);
-    connectionsNotifier.value = connectionsNotifier.value
-        .copyWith(connections: clashCore.getConnections());
-  }
-
-  @override
-  List<Widget>? buildActions(BuildContext context) {
-    return [
-      IconButton(
-        onPressed: () {
-          if (query.isEmpty) {
-            close(context, null);
-            return;
-          }
-          query = '';
-        },
-        icon: const Icon(Icons.clear),
-      ),
-      const SizedBox(
-        width: 8,
-      )
-    ];
-  }
-
-  @override
-  Widget? buildLeading(BuildContext context) {
-    return IconButton(
-      onPressed: () {
-        close(context, null);
-      },
-      icon: const Icon(Icons.arrow_back),
-    );
-  }
-
-  @override
-  Widget buildResults(BuildContext context) {
-    return buildSuggestions(context);
-  }
-
-  @override
-  void dispose() {
-    connectionsNotifier.dispose();
-    super.dispose();
-  }
-
-  @override
-  Widget buildSuggestions(BuildContext context) {
-    return ValueListenableBuilder(
+    return ValueListenableBuilder<List<Connection>>(
      valueListenable: connectionsNotifier,
-      builder: (_, __, ___) {
-        return Column(
-          crossAxisAlignment: CrossAxisAlignment.start,
-          children: [
-            if (state.keywords.isNotEmpty)
-              Padding(
-                padding: const EdgeInsets.symmetric(
-                  horizontal: 16,
-                  vertical: 16,
-                ),
-                child: Wrap(
-                  runSpacing: 6,
-                  spacing: 6,
-                  children: [
-                    for (final keyword in state.keywords)
-                      CommonChip(
-                        label: keyword,
-                        type: ChipType.delete,
-                        onPressed: () {
-                          _deleteKeyword(keyword);
-                        },
-                      ),
-                  ],
+      builder: (_, List<Connection> connections, __) {
+        if (connections.isEmpty) {
+          return const NullStatus(
+            label: "未开启代理,或者没有连接数据",
+          );
+        }
+        return ListView.separated(
+          physics: const AlwaysScrollableScrollPhysics(),
+          itemBuilder: (_, index) {
+            final connection = connections[index];
+            return ListTile(
+              titleAlignment: ListTileTitleAlignment.top,
+              leading: Container(
+                margin: const EdgeInsets.only(top: 4),
+                width: 48,
+                height: 48,
+                child: FutureBuilder<ImageProvider?>(
+                  future: _getPackageIconWithConnection(connection),
+                  builder: (_, snapshot) {
+                    if (!snapshot.hasData && snapshot.data == null) {
+                      return Container();
+                    } else {
+                      return Image(
+                        image: snapshot.data!,
+                        gaplessPlayback: true,
+                        width: 48,
+                        height: 48,
+                      );
+                    }
+                  },
                ),
              ),
-            Expanded(
-              child: ListView.separated(
-                itemBuilder: (_, index) {
-                  final connection = _results[index];
-                  return ConnectionItem(
-                    key: Key(connection.id),
-                    connection: connection,
-                    onClick: _addKeyword,
-                    onBlock: _handleBlockConnection,
-                  );
-                },
-                separatorBuilder: (BuildContext context, int index) {
-                  return const Divider(
-                    height: 0,
-                  );
-                },
-                itemCount: _results.length,
+              contentPadding:
+                  const EdgeInsets.symmetric(vertical: 12, horizontal: 16),
+              title: Column(
+                crossAxisAlignment: CrossAxisAlignment.start,
+                children: [
+                  Text(connection.metadata.host.isNotEmpty
+                      ? connection.metadata.host
+                      : connection.metadata.destinationIP),
+                  Padding(
+                    padding: const EdgeInsets.only(
+                      top: 12,
+                    ),
+                    child: Wrap(
+                      runSpacing: 8,
+                      spacing: 8,
+                      children: [
+                        for (final chain in connection.chains)
+                          CommonChip(
+                            label: chain,
+                          ),
+                      ],
+                    ),
+                  ),
+                ],
              ),
-            )
-          ],
+              trailing: IconButton(
+                icon: const Icon(Icons.block),
+                onPressed: () {},
+              ),
+            );
+          },
+          separatorBuilder: (BuildContext context, int index) {
+            return const Divider(
+              height: 0,
+            );
+          },
+          itemCount: connections.length,
        );
      },
    );
--- a/lib/fragments/dashboard/core_info.dart
+++ b/lib/fragments/dashboard/core_info.dart
@@ -13,7 +13,6 @@ class CoreInfo extends StatelessWidget {
      selector: (_, appState) => appState.versionInfo,
      builder: (_, versionInfo, __) {
        return CommonCard(
-          onPressed: () {},
          info: Info(
            label: appLocalizations.coreInfo,
            iconData: Icons.memory,
@@ -32,7 +31,7 @@ class CoreInfo extends StatelessWidget {
                    style: context
                        .textTheme
                        .titleMedium
-                        ?.toSoftBold,
+                        ?.toSoftBold(),
                  ),
                ),
                const SizedBox(
@@ -45,7 +44,7 @@ class CoreInfo extends StatelessWidget {
                    style: context
                        .textTheme
                        .titleLarge
-                        ?.toSoftBold,
+                        ?.toSoftBold(),
                  ),
                ),
              ],
--- a/lib/fragments/dashboard/dashboard.dart
+++ b/lib/fragments/dashboard/dashboard.dart
@@ -1,11 +1,11 @@
 import 'package:fl_clash/enum/enum.dart';
-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 'core_info.dart';
 import 'outbound_mode.dart';
 import 'start_button.dart';
 import 'network_speed.dart';
@@ -56,7 +56,7 @@ class _DashboardFragmentState extends State<DashboardFragment> {
                  ),
                  GridItem(
                    crossAxisCellCount: isDesktop ? 4 : 6,
-                    child: const IntranetIP(),
+                    child: const CoreInfo(),
                  ),
                ],
              );
--- a/lib/fragments/dashboard/intranet_ip.dart
+++ b/lib/fragments/dashboard/intranet_ip.dart
@@ -1,92 +0,0 @@
-import 'dart:io';
-
-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';
-
-class IntranetIP extends StatefulWidget {
-  const IntranetIP({super.key});
-
-  @override
-  State<IntranetIP> createState() => _IntranetIPState();
-}
-
-class _IntranetIPState extends State<IntranetIP> {
-  final ipNotifier = ValueNotifier<String>("");
-
-  Future<String?> getLocalIpAddress() async {
-    List<NetworkInterface> interfaces = await NetworkInterface.list();
-    for (final interface in interfaces) {
-      for (final address in interface.addresses) {
-        if (!address.isLoopback) {
-          return address.address;
-        }
-      }
-    }
-    return null;
-  }
-
-  @override
-  void dispose() {
-    super.dispose();
-    ipNotifier.dispose();
-  }
-
-  @override
-  void initState() {
-    super.initState();
-    WidgetsBinding.instance.addPostFrameCallback((_) async {
-      ipNotifier.value = await getLocalIpAddress() ?? "";
-    });
-  }
-
-  @override
-  Widget build(BuildContext context) {
-    return CommonCard(
-      info: Info(
-        label: appLocalizations.intranetIP,
-        iconData: Icons.devices,
-      ),
-      onPressed: (){
-
-      },
-      child: Container(
-        padding: const EdgeInsets.all(16).copyWith(top: 0),
-        height: globalState.appController.measure.titleLargeHeight + 24 - 2,
-        child: ValueListenableBuilder(
-          valueListenable: ipNotifier,
-          builder: (_, value, __) {
-            return FadeBox(
-              child: value.isNotEmpty
-                  ? Column(
-                      crossAxisAlignment: CrossAxisAlignment.start,
-                      mainAxisSize: MainAxisSize.min,
-                      children: [
-                        Flexible(
-                          flex: 1,
-                          child: TooltipText(
-                            text: Text(
-                              value,
-                              style: context.textTheme.titleLarge?.toSoftBold.toMinus,
-                              maxLines: 1,
-                              overflow: TextOverflow.ellipsis,
-                            ),
-                          ),
-                        ),
-                      ],
-                    )
-                  : const Padding(
-                      padding: EdgeInsets.all(2),
-                      child: AspectRatio(
-                        aspectRatio: 1,
-                        child: CircularProgressIndicator(),
-                      ),
-                    ),
-            );
-          },
-        ),
-      ),
-    );
-  }
-}
--- a/lib/fragments/dashboard/network_detection.dart
+++ b/lib/fragments/dashboard/network_detection.dart
@@ -19,14 +19,12 @@ class _NetworkDetectionState extends State<NetworkDetection> {
  final timeoutNotifier = ValueNotifier<bool>(false);
  bool? _preIsStart;
  CancelToken? cancelToken;
-  Function? _checkIpDebounce;

  _checkIp(
    bool isInit,
    bool isStart,
  ) async {
    if (!isInit) return;
-    timeoutNotifier.value = false;
    if (_preIsStart == false && _preIsStart == isStart) return;
    if (cancelToken != null) {
      cancelToken!.cancel();
@@ -45,33 +43,22 @@ class _NetworkDetectionState extends State<NetworkDetection> {
  }

  _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,
        );
      },
      builder: (_, state, __) {
-        if (_checkIpDebounce != null) {
-          _checkIpDebounce!([state.isInit, state.isStart]);
-        }
+        _checkIp(state.isInit, state.isStart);
        return child;
      },
      child: child,
    );
  }

-  @override
-  void dispose() {
-    super.dispose();
-    ipInfoNotifier.dispose();
-    timeoutNotifier.dispose();
-  }
-
  @override
  Widget build(BuildContext context) {
    return _checkIpContainer(
@@ -79,7 +66,6 @@ class _NetworkDetectionState extends State<NetworkDetection> {
        valueListenable: ipInfoNotifier,
        builder: (_, ipInfo, __) {
          return CommonCard(
-            onPressed: () {},
            child: Column(
              children: [
                Flexible(
@@ -136,9 +122,8 @@ class _NetworkDetectionState extends State<NetworkDetection> {
                  ),
                ),
                Container(
-                  height: globalState.appController.measure.titleLargeHeight +
-                      24 -
-                      2,
+                  height:
+                      globalState.appController.measure.titleLargeHeight + 24,
                  alignment: Alignment.centerLeft,
                  padding: const EdgeInsets.all(16).copyWith(top: 0),
                  child: FadeBox(
@@ -153,7 +138,7 @@ class _NetworkDetectionState extends State<NetworkDetection> {
                                  text: Text(
                                    ipInfo.ip,
                                    style: context.textTheme.titleLarge
-                                        ?.toSoftBold.toMinus,
+                                        ?.toSoftBold(),
                                    maxLines: 1,
                                    overflow: TextOverflow.ellipsis,
                                  ),
@@ -166,11 +151,9 @@ class _NetworkDetectionState extends State<NetworkDetection> {
                            builder: (_, timeout, __) {
                              if (timeout) {
                                return Text(
-                                  "timeout",
+                                  appLocalizations.ipCheckTimeout,
                                  style: context.textTheme.titleLarge
-                                      ?.copyWith(color: Colors.red)
-                                      .toSoftBold
-                                      .toMinus,
+                                      ?.toSoftBold(),
                                  maxLines: 1,
                                  overflow: TextOverflow.ellipsis,
                                );
--- a/lib/fragments/dashboard/network_speed.dart
+++ b/lib/fragments/dashboard/network_speed.dart
@@ -21,17 +21,26 @@ class _NetworkSpeedState extends State<NetworkSpeed> {
        .asMap()
        .map(
          (index, e) => MapEntry(
-            index,
-            Point(
-              (index + initPoints.length).toDouble(),
-              e.speed.toDouble(),
-            ),
-          ),
-        )
+        index,
+        Point(
+          (index + initPoints.length).toDouble(),
+          e.speed.toDouble(),
+        ),
+      ),
+    )
        .values
        .toList();
+    var pointsRaw = [...initPoints, ...trafficPoints];
+    List<Point> points;
+    if (pointsRaw.length > 60) {
+      points = pointsRaw
+          .getRange(pointsRaw.length - 61, pointsRaw.length - 1)
+          .toList();
+    } else {
+      points = pointsRaw;
+    }

-    return [...initPoints, ...trafficPoints];
+    return points;
  }

  Traffic _getLastTraffic(List<Traffic> traffics) {
@@ -44,11 +53,12 @@ class _NetworkSpeedState extends State<NetworkSpeed> {
    required IconData iconData,
    required TrafficValue value,
  }) {
+
    final showValue = value.showValue;
    final showUnit = "${value.showUnit}/s";
    final titleLargeSoftBold =
-        Theme.of(context).textTheme.titleLarge?.toSoftBold;
-    final bodyMedium = Theme.of(context).textTheme.bodySmall?.toLight;
+    Theme.of(context).textTheme.titleLarge?.toSoftBold();
+    final bodyMedium = Theme.of(context).textTheme.bodySmall?.toLight();
    final valueText = Text(
      showValue,
      style: titleLargeSoftBold,
@@ -75,7 +85,7 @@ class _NetworkSpeedState extends State<NetworkSpeed> {
            Flexible(
              child: Text(
                label,
-                style: Theme.of(context).textTheme.titleSmall?.toSoftBold,
+                style: Theme.of(context).textTheme.titleSmall?.toSoftBold(),
              ),
            ),
          ],
@@ -111,8 +121,7 @@ class _NetworkSpeedState extends State<NetworkSpeed> {
  @override
  Widget build(BuildContext context) {
    return CommonCard(
-      onPressed: () {},
-      info: Info(
+      info:  Info(
        label: appLocalizations.networkSpeed,
        iconData: Icons.speed,
      ),
@@ -163,4 +172,4 @@ class _NetworkSpeedState extends State<NetworkSpeed> {
      ),
    );
  }
-}
+}
--- a/lib/fragments/dashboard/outbound_mode.dart
+++ b/lib/fragments/dashboard/outbound_mode.dart
@@ -13,10 +13,18 @@ class OutboundMode extends StatelessWidget {
  _changeMode(BuildContext context, Mode? value) async {
    final appController = globalState.appController;
    final clashConfig = appController.clashConfig;
+    final config = appController.config;
    if (value == null || clashConfig.mode == value) return;
    clashConfig.mode = value;
    await appController.updateClashConfig();
-    appController.addCheckIpNumDebounce();
+    if (!config.isCompatible) {
+      final proxySelected = config.currentSelectedMap[GroupName.Proxy.name];
+      final globalSelected = config.currentSelectedMap[GroupName.GLOBAL.name];
+      if (proxySelected != null && globalSelected == null) {
+        config.updateCurrentSelectedMap(GroupName.GLOBAL.name, proxySelected);
+      }
+    }
+    appController.changeProxy();
  }

  @override
@@ -25,7 +33,6 @@ class OutboundMode extends StatelessWidget {
      selector: (_, clashConfig) => clashConfig.mode,
      builder: (_, mode, __) {
        return CommonCard(
-          onPressed: () {},
          info: Info(
            label: appLocalizations.outboundMode,
            iconData: Icons.call_split,
@@ -56,8 +63,11 @@ class OutboundMode extends StatelessWidget {
                    ),
                    title: Text(
                      Intl.message(item.name),
-                      style:
-                          Theme.of(context).textTheme.titleMedium?.toSoftBold,
+                      style: Theme
+                          .of(context)
+                          .textTheme
+                          .titleMedium
+                          ?.toSoftBold(),
                    ),
                  ),
              ],
--- a/lib/fragments/dashboard/start_button.dart
+++ b/lib/fragments/dashboard/start_button.dart
@@ -13,17 +13,19 @@ class StartButton extends StatefulWidget {

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

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

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

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

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

-  Widget _updateControllerContainer(Widget child) {
-    return Selector<AppState, bool>(
-      selector: (_, appState) => appState.isStart,
-      builder: (_, isStart, child) {
-        if(isStart != this.isStart){
-          this.isStart = isStart;
-          updateController();
-        }
-        return child!;
-      },
-      child: child,
-    );
+  updateSystemProxy() {
+    WidgetsBinding.instance.addPostFrameCallback((_) async {
+      final appController = globalState.appController;
+      await appController.updateSystemProxy(isStart);
+    });
  }

  @override
@@ -80,7 +72,8 @@ class _StartButtonState extends State<StartButton>
                    other.getTimeDifference(
                      DateTime.now(),
                    ),
-                    style: Theme.of(context).textTheme.titleMedium?.toSoftBold,
+                    style:
+                        Theme.of(context).textTheme.titleMedium?.toSoftBold(),
                  ),
                )
                .width +
@@ -126,14 +119,24 @@ class _StartButtonState extends State<StartButton>
          child: child,
        );
      },
-      child: _updateControllerContainer(
-        Selector<AppState, int?>(
+      child: Selector<AppState, bool>(
+        selector: (_, appState) => appState.runTime != null,
+        builder: (_, isRun, child) {
+          WidgetsBinding.instance.addPostFrameCallback((_) {
+            if (isStart != isRun) {
+              isStart = isRun;
+              updateController();
+            }
+          });
+          return child!;
+        },
+        child: Selector<AppState, int?>(
          selector: (_, appState) => appState.runTime,
          builder: (_, int? value, __) {
            final text = other.getTimeText(value);
            return Text(
              text,
-              style: Theme.of(context).textTheme.titleMedium?.toSoftBold,
+              style: Theme.of(context).textTheme.titleMedium?.toSoftBold(),
            );
          },
        ),
--- a/lib/fragments/dashboard/traffic_usage.dart
+++ b/lib/fragments/dashboard/traffic_usage.dart
@@ -42,7 +42,7 @@ class TrafficUsage extends StatelessWidget {
        ),
        Text(
          trafficValue.showUnit,
-          style: context.textTheme.labelMedium?.toLight,
+          style: context.textTheme.labelMedium?.toLight(),
        ),
      ],
    );
@@ -51,16 +51,25 @@ class TrafficUsage extends StatelessWidget {
  @override
  Widget build(BuildContext context) {
    return CommonCard(
-      onPressed: () {},
      info: Info(
        label: appLocalizations.trafficUsage,
        iconData: Icons.data_saver_off,
      ),
-      child: Selector<AppState, Traffic>(
-        selector: (_, appState) => appState.totalTraffic,
-        builder: (_, totalTraffic, __) {
-          final upTotalTrafficValue = totalTraffic.up;
-          final downTotalTrafficValue = totalTraffic.down;
+      child: Selector<AppState, List<Traffic>>(
+        selector: (_, appState) => appState.traffics,
+        builder: (_, traffics, __) {
+          final trafficTotal = traffics.isNotEmpty
+              ? traffics.reduce(
+                  (value, element) {
+                    return Traffic(
+                      up: element.up.value + value.up.value,
+                      down: element.down.value + value.down.value,
+                    );
+                  },
+                )
+              : Traffic();
+          final upTrafficValue = trafficTotal.up;
+          final downTrafficValue = trafficTotal.down;
          return Padding(
            padding: const EdgeInsets.all(16).copyWith(top: 0),
            child: Column(
@@ -71,7 +80,7 @@ class TrafficUsage extends StatelessWidget {
                  child: getTrafficDataItem(
                    context,
                    Icons.arrow_upward,
-                    upTotalTrafficValue,
+                    upTrafficValue,
                  ),
                ),
                const SizedBox(
@@ -82,7 +91,7 @@ class TrafficUsage extends StatelessWidget {
                  child: getTrafficDataItem(
                    context,
                    Icons.arrow_downward,
-                    downTotalTrafficValue,
+                    downTrafficValue,
                  ),
                ),
              ],
--- a/lib/fragments/fragments.dart
+++ b/lib/fragments/fragments.dart
@@ -9,5 +9,4 @@ export 'config.dart';
 export 'application_setting.dart';
 export 'about.dart';
 export 'backup_and_recovery.dart';
-export 'resources.dart';
-export 'requests.dart';
+export 'resources.dart';
--- a/lib/fragments/logs.dart
+++ b/lib/fragments/logs.dart
@@ -1,6 +1,5 @@
 import 'dart:async';

-import 'package:collection/collection.dart';
 import 'package:fl_clash/common/common.dart';
 import 'package:fl_clash/enum/enum.dart';
 import 'package:fl_clash/state.dart';
@@ -17,32 +16,20 @@ class LogsFragment extends StatefulWidget {
 }

 class _LogsFragmentState extends State<LogsFragment> {
-  final logsNotifier = ValueNotifier<LogsAndKeywords>(const LogsAndKeywords());
-  final scrollController = ScrollController(
-    keepScrollOffset: false,
-  );
-  List<GlobalObjectKey<_LogItemState>> keys = [];
-
+  final logsNotifier = ValueNotifier<List<Log>>([]);
  Timer? timer;

  @override
  void initState() {
    super.initState();
-    WidgetsBinding.instance.addPostFrameCallback((_) {
-      final appState = globalState.appController.appState;
-      logsNotifier.value = logsNotifier.value.copyWith(logs: appState.logs);
+    WidgetsBinding.instance.addPostFrameCallback((timeStamp) {
+      logsNotifier.value = context.read<AppState>().logs;
      if (timer != null) {
        timer?.cancel();
        timer = null;
      }
      timer = Timer.periodic(const Duration(milliseconds: 200), (timer) {
-        final logs = appState.logs;
-        if (!const ListEquality<Log>().equals(
-          logsNotifier.value.logs,
-          logs,
-        )) {
-          logsNotifier.value = logsNotifier.value.copyWith(logs: logs);
-        }
+        logsNotifier.value = globalState.appController.appState.logs;
      });
    });
  }
@@ -51,8 +38,6 @@ class _LogsFragmentState extends State<LogsFragment> {
  void dispose() {
    super.dispose();
    timer?.cancel();
-    logsNotifier.dispose();
-    scrollController.dispose();
    timer = null;
  }

@@ -66,7 +51,7 @@ class _LogsFragmentState extends State<LogsFragment> {
            showSearch(
              context: context,
              delegate: LogsSearchDelegate(
-                logs: logsNotifier.value,
+                logs: logsNotifier.value.reversed.toList(),
              ),
            );
          },
@@ -79,23 +64,32 @@ class _LogsFragmentState extends State<LogsFragment> {
    });
  }

-  _addKeyword(String keyword) {
-    final isContains = logsNotifier.value.keywords.contains(keyword);
-    if (isContains) return;
-    final keywords = List<String>.from(logsNotifier.value.keywords)
-      ..add(keyword);
-    logsNotifier.value = logsNotifier.value.copyWith(
-      keywords: keywords,
-    );
-  }
-
-  _deleteKeyword(String keyword) {
-    final isContains = logsNotifier.value.keywords.contains(keyword);
-    if (!isContains) return;
-    final keywords = List<String>.from(logsNotifier.value.keywords)
-      ..remove(keyword);
-    logsNotifier.value = logsNotifier.value.copyWith(
-      keywords: keywords,
+  _buildList() {
+    return ValueListenableBuilder<List<Log>>(
+      valueListenable: logsNotifier,
+      builder: (_, List<Log> logs, __) {
+        if (logs.isEmpty) {
+          return NullStatus(
+            label: appLocalizations.nullLogsDesc,
+          );
+        }
+        logs = logs.reversed.toList();
+        return ListView.separated(
+          physics: const AlwaysScrollableScrollPhysics(),
+          itemCount: logs.length,
+          itemBuilder: (BuildContext context, int index) {
+            final log = logs[index];
+            return LogItem(
+              log: log,
+            );
+          },
+          separatorBuilder: (BuildContext context, int index) {
+            return const Divider(
+              height: 0,
+            );
+          },
+        );
+      },
    );
  }

@@ -112,88 +106,21 @@ class _LogsFragmentState extends State<LogsFragment> {
        }
        return child!;
      },
-      child: ValueListenableBuilder<LogsAndKeywords>(
-        valueListenable: logsNotifier,
-        builder: (_, state, __) {
-          var logs = state.filteredLogs;
-          if (logs.isEmpty) {
-            return NullStatus(
-              label: appLocalizations.nullLogsDesc,
-            );
-          }
-          logs = logs.reversed.toList();
-          keys = logs
-              .map((log) => GlobalObjectKey<_LogItemState>(log.dateTime))
-              .toList();
-          return Column(
-            crossAxisAlignment: CrossAxisAlignment.start,
-            children: [
-              if (state.keywords.isNotEmpty)
-                Padding(
-                  padding: const EdgeInsets.symmetric(
-                    horizontal: 16,
-                    vertical: 16,
-                  ),
-                  child: Wrap(
-                    runSpacing: 8,
-                    spacing: 8,
-                    children: [
-                      for (final keyword in state.keywords)
-                        CommonChip(
-                          label: keyword,
-                          type: ChipType.delete,
-                          onPressed: () {
-                            _deleteKeyword(keyword);
-                          },
-                        ),
-                    ],
-                  ),
-                ),
-              Expanded(
-                child: ListView.separated(
-                  controller: scrollController,
-                  itemBuilder: (_, index) {
-                    final log = logs[index];
-                    return LogItem(
-                      key: Key(log.dateTime.toString()),
-                      log: log,
-                      onClick: _addKeyword,
-                    );
-                  },
-                  separatorBuilder: (BuildContext context, int index) {
-                    return const Divider(
-                      height: 0,
-                    );
-                  },
-                  itemCount: logs.length,
-                ),
-              )
-            ],
-          );
-        },
-      ),
+      child: _buildList(),
    );
  }
 }

 class LogsSearchDelegate extends SearchDelegate {
-  ValueNotifier<LogsAndKeywords> logsNotifier;
+  List<Log> logs = [];

  LogsSearchDelegate({
-    required LogsAndKeywords logs,
-  }) : logsNotifier = ValueNotifier(logs);
-
-  @override
-  void dispose() {
-    super.dispose();
-    logsNotifier.dispose();
-  }
-
-  get state => logsNotifier.value;
+    required this.logs,
+  });

  List<Log> get _results {
    final lowQuery = query.toLowerCase();
-    return logsNotifier.value.filteredLogs
+    return logs
        .where(
          (log) =>
              (log.payload?.toLowerCase().contains(lowQuery) ?? false) ||
@@ -236,120 +163,58 @@ class LogsSearchDelegate extends SearchDelegate {
    return buildSuggestions(context);
  }

-  _addKeyword(String keyword) {
-    final isContains = logsNotifier.value.keywords.contains(keyword);
-    if (isContains) return;
-    final keywords = List<String>.from(logsNotifier.value.keywords)..add(keyword);
-    logsNotifier.value = logsNotifier.value.copyWith(
-      keywords: keywords,
-    );
-  }
-
-  _deleteKeyword(String keyword) {
-    final isContains = logsNotifier.value.keywords.contains(keyword);
-    if (!isContains) return;
-    final keywords = List<String>.from(logsNotifier.value.keywords)..remove(keyword);
-    logsNotifier.value = logsNotifier.value.copyWith(
-      keywords: keywords,
-    );
-  }
-
  @override
  Widget buildSuggestions(BuildContext context) {
-    return ValueListenableBuilder(
-      valueListenable: logsNotifier,
-      builder: (_, __, ___) {
-        return Column(
-          crossAxisAlignment: CrossAxisAlignment.start,
-          children: [
-            if (state.keywords.isNotEmpty)
-              Padding(
-                padding: const EdgeInsets.symmetric(
-                  horizontal: 16,
-                  vertical: 16,
-                ),
-                child: Wrap(
-                  runSpacing: 6,
-                  spacing: 6,
-                  children: [
-                    for (final keyword in state.keywords)
-                      CommonChip(
-                        label: keyword,
-                        type: ChipType.delete,
-                        onPressed: () {
-                          _deleteKeyword(keyword);
-                        },
-                      ),
-                  ],
-                ),
-              ),
-            Expanded(
-              child: ListView.separated(
-                itemBuilder: (_, index) {
-                  final log = _results[index];
-                  return LogItem(
-                    key: Key(log.dateTime.toString()),
-                    log: log,
-                    onClick: (value) {
-                      _addKeyword(value);
-                    },
-                  );
-                },
-                separatorBuilder: (BuildContext context, int index) {
-                  return const Divider(
-                    height: 0,
-                  );
-                },
-                itemCount: _results.length,
-              ),
-            )
-          ],
+    return ListView.separated(
+      physics: const AlwaysScrollableScrollPhysics(),
+      itemCount: _results.length,
+      itemBuilder: (BuildContext context, int index) {
+        final log = _results[index];
+        return LogItem(
+          key: ValueKey(log.dateTime),
+          log: log,
+        );
+      },
+      separatorBuilder: (BuildContext context, int index) {
+        return const Divider(
+          height: 0,
        );
      },
    );
  }
 }

-class LogItem extends StatefulWidget {
+class LogItem extends StatelessWidget {
  final Log log;
-  final Function(String)? onClick;

  const LogItem({
    super.key,
    required this.log,
-    this.onClick,
  });

-  @override
-  State<LogItem> createState() => _LogItemState();
-}
-
-class _LogItemState extends State<LogItem> {
  @override
  Widget build(BuildContext context) {
-    final log = widget.log;
-    return ListItem(
-      padding: const EdgeInsets.symmetric(
-        horizontal: 16,
-        vertical: 4,
-      ),
+    return ListTile(
      title: SelectableText(log.payload ?? ''),
      subtitle: Column(
        crossAxisAlignment: CrossAxisAlignment.start,
        children: [
-          SelectableText(
-            "${log.dateTime}",
-            style: context.textTheme.bodySmall
-                ?.copyWith(color: context.colorScheme.primary),
+          Padding(
+            padding: const EdgeInsets.only(
+              top: 8,
+            ),
+            child: SelectableText(
+              "${log.dateTime}",
+              style: context.textTheme.bodySmall
+                  ?.copyWith(color: context.colorScheme.primary),
+            ),
          ),
-          const SizedBox(height: 8,),
          Container(
            alignment: Alignment.centerLeft,
+            padding: const EdgeInsets.symmetric(
+              vertical: 8,
+            ),
            child: CommonChip(
-              onPressed: () {
-                if (widget.onClick == null) return;
-                widget.onClick!(log.logLevel.name);
-              },
              label: log.logLevel.name,
            ),
          ),
--- a/lib/fragments/profiles/add_profile.dart
+++ b/lib/fragments/profiles/add_profile.dart
@@ -25,9 +25,7 @@ class AddProfile extends StatelessWidget {
    final url = await Navigator.of(context)
        .push<String>(MaterialPageRoute(builder: (_) => const ScanPage()));
    if (url != null) {
-      WidgetsBinding.instance.addPostFrameCallback((_){
-        _handleAddProfileFormURL(url);
-      });
+      _handleAddProfileFormURL(url);
    }
  }

@@ -93,8 +91,6 @@ class _URLFormDialogState extends State<URLFormDialog> {
          runSpacing: 16,
          children: [
            TextField(
-              maxLines: 5,
-              minLines: 1,
              controller: urlController,
              decoration: InputDecoration(
                border: const OutlineInputBorder(),
--- a/lib/fragments/profiles/edit_profile.dart
+++ b/lib/fragments/profiles/edit_profile.dart
@@ -41,26 +41,19 @@ class _EditProfileState extends State<EditProfile> {
  _handleConfirm() {
    if (!_formKey.currentState!.validate()) return;
    final config = widget.context.read<Config>();
-    final profile = widget.profile.copyWith(
-      url: urlController.text,
-      label: labelController.text,
-      autoUpdate: autoUpdate,
-      autoUpdateDuration: Duration(
-        minutes: int.parse(
-          autoUpdateDurationController.text,
-        ),
-      ),
-    );
-    final hasUpdate = widget.profile.url != profile.url;
-    config.setProfile(profile);
+    final hasUpdate = urlController.text.isNotEmpty && widget.profile.url != urlController.text;
+    widget.profile.url = urlController.text;
+    widget.profile.label = labelController.text;
+    widget.profile.autoUpdate = autoUpdate;
+    widget.profile.autoUpdateDuration =
+        Duration(minutes: int.parse(autoUpdateDurationController.text));
+    config.setProfile(widget.profile);
    if (hasUpdate) {
-      globalState.homeScaffoldKey.currentState?.loadingRun(
-        () async {
-          if (hasUpdate) {
-            await globalState.appController.updateProfile(profile);
-          }
-        },
-      );
+      widget.context.findAncestorStateOfType<CommonScaffoldState>()?.loadingRun(
+            () => globalState.appController.updateProfile(
+              widget.profile.id,
+            ),
+          );
    }
    Navigator.of(context).pop();
  }
@@ -90,12 +83,12 @@ class _EditProfileState extends State<EditProfile> {
          },
        ),
      ),
-      if (widget.profile.type == ProfileType.url) ...[
+      if (widget.profile.type == ProfileType.url)...[
        ListItem(
          title: TextFormField(
            controller: urlController,
-            maxLines: 5,
            minLines: 1,
+            maxLines: 2,
            decoration: InputDecoration(
              border: const OutlineInputBorder(),
              labelText: appLocalizations.url,
@@ -159,7 +152,6 @@ class _EditProfileState extends State<EditProfile> {
            vertical: 16,
          ),
          child: ListView.separated(
-            primary: true,
            itemBuilder: (_, index) {
              return items[index];
            },
--- a/lib/fragments/profiles/profiles.dart
+++ b/lib/fragments/profiles/profiles.dart
@@ -1,6 +1,5 @@
 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,22 +15,11 @@ enum ProfileActions {
  edit,
  update,
  delete,
-  view,
 }

-class ProfilesFragment extends StatefulWidget {
+class ProfilesFragment extends StatelessWidget {
  const ProfilesFragment({super.key});

-  @override
-  State<ProfilesFragment> createState() => _ProfilesFragmentState();
-}
-
-class _ProfilesFragmentState extends State<ProfilesFragment> {
-  final hasPadding = ValueNotifier<bool>(false);
-  Function? applyConfigDebounce;
-
-  List<GlobalObjectKey<_ProfileItemState>> profileItemKeys = [];
-
  _handleShowAddExtendPage() {
    showExtendPage(
      globalState.navigatorKey.currentState!.context,
@@ -53,139 +41,88 @@ class _ProfilesFragmentState extends State<ProfilesFragment> {
    }
  }

-  _updateProfiles() async {
-    final updateProfiles = profileItemKeys.map<Future>(
-        (key) async => await key.currentState?.updateProfile(false));
-    await Future.wait(updateProfiles);
-  }
-
-  _initScaffoldState() {
+  _initScaffoldState(BuildContext context) {
    WidgetsBinding.instance.addPostFrameCallback(
      (_) {
        final commonScaffoldState =
            context.findAncestorStateOfType<CommonScaffoldState>();
-        if (!context.mounted) return;
        commonScaffoldState?.actions = [
          IconButton(
            onPressed: () {
-              _updateProfiles();
+              commonScaffoldState.loadingRun<void>(
+                () async {
+                  await globalState.appController.updateProfiles();
+                },
+              );
            },
-            icon: const Icon(Icons.sync),
+            icon: const Icon(Icons.download),
          ),
          const SizedBox(
            width: 8,
          )
        ];
-      },
-    );
-  }
-
-  @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(
-      floatingWidget: FloatWrapper(
-        child: FloatingActionButton(
+        commonScaffoldState?.floatingActionButton = FloatingActionButton(
          heroTag: null,
          onPressed: _handleShowAddExtendPage,
          child: const Icon(
            Icons.add,
          ),
+        );
+      },
+    );
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    return Selector<AppState, bool>(
+      selector: (_, appState) => appState.currentLabel == 'profiles',
+      builder: (_, isCurrent, child) {
+        if (isCurrent) {
+          _initScaffoldState(context);
+        }
+        return child!;
+      },
+      child: Selector2<AppState, Config, ProfilesSelectorState>(
+        selector: (_, appState, config) => ProfilesSelectorState(
+          profiles: config.profiles,
+          currentProfileId: config.currentProfileId,
+          viewMode: appState.viewMode,
        ),
-      ),
-      child: Selector<AppState, bool>(
-        selector: (_, appState) => appState.currentLabel == 'profiles',
-        builder: (_, isCurrent, child) {
-          if (isCurrent) {
-            _initScaffoldState();
-          }
-          return child!;
-        },
-        child: Selector2<AppState, Config, ProfilesSelectorState>(
-          selector: (_, appState, config) => ProfilesSelectorState(
-            profiles: config.profiles,
-            currentProfileId: config.currentProfileId,
-            viewMode: appState.viewMode,
-          ),
-          builder: (context, state, child) {
-            if (state.profiles.isEmpty) {
-              return NullStatus(
-                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: 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,
-                              ),
-                            ),
-                        ],
-                      ),
-                    );
-                  },
-                ),
-              ),
+        builder: (context, state, child) {
+          if (state.profiles.isEmpty) {
+            return NullStatus(
+              label: appLocalizations.nullProfileDesc,
            );
-          },
-        ),
+          }
+          final columns = _getColumns(state.viewMode);
+          final isMobile = state.viewMode == ViewMode.mobile;
+          return Align(
+            alignment: Alignment.topCenter,
+            child: SingleChildScrollView(
+              padding: !isMobile
+                  ? const EdgeInsets.symmetric(
+                      horizontal: 16,
+                      vertical: 16,
+                    )
+                  : EdgeInsets.zero,
+              child: Grid(
+                mainAxisSpacing: isMobile ? 8 : 16,
+                crossAxisSpacing: 16,
+                crossAxisCount: columns,
+                children: [
+                  for (final profile in state.profiles)
+                    GridItem(
+                      child: ProfileItem(
+                        profile: profile,
+                        groupValue: state.currentProfileId,
+                        onChanged: globalState.appController.changeProfile,
+                      ),
+                    ),
+                ],
+              ),
+            ),
+          );
+        },
      ),
    );
  }
@@ -210,58 +147,42 @@ class ProfileItem extends StatefulWidget {
 class _ProfileItemState extends State<ProfileItem> {
  final isUpdating = ValueNotifier<bool>(false);

-  _handleDeleteProfile() async {
-    globalState.appController.deleteProfile(widget.profile.id);
+  _handleDeleteProfile(String id) async {
+    globalState.appController.deleteProfile(id);
  }

-  _handleUpdateProfile() async {
-    await globalState.safeRun<void>(updateProfile);
-  }
-
-  Future updateProfile([isSingle = true]) async {
+  _handleUpdateProfile(String id) 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 {
-        rethrow;
-      }
-    }
+    await globalState.safeRun<void>(() async {
+      await globalState.appController.updateProfile(id);
+    });
    isUpdating.value = false;
-    return null;
  }

-  _handleShowEditExtendPage() {
+  _handleShowEditExtendPage(
+    Profile profile,
+  ) {
    showExtendPage(
      context,
      body: EditProfile(
-        profile: widget.profile,
+        profile: profile.copyWith(),
        context: context,
      ),
      title: "${appLocalizations.edit}${appLocalizations.profile}",
    );
  }

-  _handleViewProfile() {
-    Navigator.of(context).push(
-      MaterialPageRoute(
-        builder: (context) => ViewProfile(
-          profile: widget.profile,
-        ),
-      ),
-    );
-  }
-
  _buildTitle(Profile profile) {
    final textTheme = context.textTheme;
+    final userInfo = profile.userInfo ?? UserInfo();
+    final use = userInfo.upload + userInfo.download;
+    final total = userInfo.total;
+    final useShow = TrafficValue(value: use).show;
+    final totalShow = TrafficValue(value: total).show;
+    final progress = total == 0 ? 0.0 : use / total;
+    final expireShow = userInfo.expire == 0
+        ? "长期有效"
+        : DateTime.fromMillisecondsSinceEpoch(userInfo.expire * 1000).show;
    return Container(
      padding: const EdgeInsets.symmetric(vertical: 4),
      child: Column(
@@ -280,147 +201,68 @@ class _ProfileItemState extends State<ProfileItem> {
              ),
              Text(
                profile.lastUpdateDate?.lastUpdateTimeDesc ?? '',
-                style: textTheme.labelMedium?.toLight,
+                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,
+          Column(
+            mainAxisSize: MainAxisSize.min,
+            crossAxisAlignment: CrossAxisAlignment.start,
+            mainAxisAlignment: MainAxisAlignment.center,
+            children: [
+              Container(
+                margin: const EdgeInsets.symmetric(
+                  vertical: 8,
+                ),
+                child: LinearProgressIndicator(
+                  minHeight: 6,
+                  value: progress,
+                ),
+              ),
+              Text(
+                "$useShow / $totalShow",
+                style: textTheme.labelMedium?.toLight(),
+              ),
+              const SizedBox(
+                height: 2,
+              ),
+              Row(
+                children: [
+                  Text(
+                    "到期时间:",
+                    style: textTheme.labelMedium?.toLighter(),
                  ),
-                  child: LinearProgressIndicator(
-                    minHeight: 6,
-                    value: progress,
+                  const SizedBox(
+                    width: 4,
                  ),
-                ),
-                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,
-            // );
-          }),
+                  Text(
+                    expireShow,
+                    style: textTheme.labelMedium?.toLighter(),
+                  ),
+                ],
+              )
+            ],
+          ),
        ],
      ),
    );
  }

-  @override
-  void dispose() {
-    isUpdating.dispose();
-    super.dispose();
-  }
-
  @override
  Widget build(BuildContext context) {
    final profile = widget.profile;
    final groupValue = widget.groupValue;
    final onChanged = widget.onChanged;
-    return CommonCard(
+    return Selector<AppState, ViewMode>(
+      selector: (_, appState) => appState.viewMode,
+      builder: (_, viewMode, child) {
+        if (viewMode == ViewMode.mobile) {
+          return child!;
+        }
+        return CommonCard(
+          child: child!,
+        );
+      },
      child: ListItem.radio(
        key: Key(profile.id),
        horizontalTitleGap: 16,
@@ -430,63 +272,40 @@ class _ProfileItemState extends State<ProfileItem> {
          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;
-                            }
-                          },
-                        ));
-            },
-          ),
+        trailing: CommonPopupMenu<ProfileActions>(
+          items: [
+            CommonPopupMenuItem(
+              action: ProfileActions.edit,
+              label: appLocalizations.edit,
+              iconData: Icons.edit,
+            ),
+            if (profile.type == ProfileType.url)
+              CommonPopupMenuItem(
+                action: ProfileActions.update,
+                label: appLocalizations.update,
+                iconData: Icons.sync,
+              ),
+            CommonPopupMenuItem(
+              action: ProfileActions.delete,
+              label: appLocalizations.delete,
+              iconData: Icons.delete,
+            ),
+          ],
+          onSelected: (ProfileActions? action) async {
+            switch (action) {
+              case ProfileActions.edit:
+                _handleShowEditExtendPage(profile);
+                break;
+              case ProfileActions.delete:
+                _handleDeleteProfile(profile.id);
+                break;
+              case ProfileActions.update:
+                _handleUpdateProfile(profile.id);
+                break;
+              case null:
+                break;
+            }
+          },
        ),
        title: _buildTitle(profile),
        tileTitleAlignment: ListTileTitleAlignment.titleHeight,
--- a/lib/fragments/profiles/view_profile.dart
+++ b/lib/fragments/profiles/view_profile.dart
@@ -1,207 +0,0 @@
-import 'dart:io';
-
-import 'package:fl_clash/common/common.dart';
-import 'package:fl_clash/models/models.dart';
-import 'package:fl_clash/state.dart';
-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';
-
-class ViewProfile extends StatefulWidget {
-  final Profile profile;
-
-  const ViewProfile({
-    super.key,
-    required this.profile,
-  });
-
-  @override
-  State<ViewProfile> createState() => _ViewProfileState();
-}
-
-class _ViewProfileState extends State<ViewProfile> {
-  bool readOnly = true;
-  CodeLineEditingController? controller;
-  final contentNotifier = ValueNotifier<String>("");
-  final key = GlobalKey<CommonScaffoldState>();
-
-  @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;
-    });
-  }
-
-  @override
-  void dispose() {
-    super.dispose();
-    contentNotifier.dispose();
-    controller?.dispose();
-  }
-
-  Profile get profile => widget.profile;
-
-  _handleChangeReadOnly() async {
-    if (readOnly == true) {
-      setState(() {
-        readOnly = false;
-      });
-    } else {
-      final text = controller?.text;
-      if (text == null || text == contentNotifier.value) {
-        setState(() {
-          readOnly = true;
-        });
-        return;
-      }
-      contentNotifier.value = text;
-      final newProfile = await key.currentState?.loadingRun<Profile>(() async {
-        return await profile.saveFileWithString(text);
-      });
-      if (newProfile == null) return;
-      globalState.appController.config.setProfile(newProfile);
-      setState(() {
-        readOnly = true;
-      });
-    }
-  }
-
-  @override
-  Widget build(BuildContext context) {
-    return CommonScaffold(
-      key: key,
-      actions: [
-        IconButton(
-          onPressed: controller?.undo,
-          icon: const Icon(Icons.undo),
-        ),
-        IconButton(
-          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,
-        )
-      ],
-      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,
-              ),
-            ),
-          );
-        },
-      ),
-      title: widget.profile.label ?? widget.profile.id,
-    );
-  }
-}
-
-class ContextMenuItemWidget extends PopupMenuItem<void> {
-  ContextMenuItemWidget({
-    super.key,
-    required String text,
-    required VoidCallback super.onTap,
-  }) : super(child: Text(text));
-}
-
-class ContextMenuControllerImpl implements SelectionToolbarController {
-  const ContextMenuControllerImpl();
-
-  @override
-  void hide(BuildContext context) {}
-
-  @override
-  void show({
-    required BuildContext context,
-    required CodeLineEditingController controller,
-    required TextSelectionToolbarAnchors anchors,
-    Rect? renderRect,
-    required LayerLink layerLink,
-    required ValueNotifier<bool> visibility,
-  }) {
-    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,
-        ),
-      ],
-    );
-  }
-}
--- a/lib/fragments/proxies.dart
+++ b/lib/fragments/proxies.dart
--- a/lib/fragments/requests.dart
+++ b/lib/fragments/requests.dart
@@ -1,418 +0,0 @@
-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';
-import 'package:provider/provider.dart';
-
-class RequestsFragment extends StatefulWidget {
-  const RequestsFragment({super.key});
-
-  @override
-  State<RequestsFragment> createState() => _RequestsFragmentState();
-}
-
-class _RequestsFragmentState extends State<RequestsFragment> {
-  final requestsNotifier =
-      ValueNotifier<ConnectionsAndKeywords>(const ConnectionsAndKeywords());
-  final ScrollController _scrollController = ScrollController(
-    keepScrollOffset: false,
-  );
-
-  Timer? timer;
-
-  @override
-  void initState() {
-    super.initState();
-    WidgetsBinding.instance.addPostFrameCallback((_) {
-      final appState = globalState.appController.appState;
-      requestsNotifier.value =
-          requestsNotifier.value.copyWith(connections: appState.requests);
-      if (timer != null) {
-        timer?.cancel();
-        timer = null;
-      }
-      timer = Timer.periodic(const Duration(milliseconds: 200), (timer) {
-        final requests = appState.requests;
-        if (!const ListEquality<Connection>().equals(
-          requestsNotifier.value.connections,
-          requests,
-        )) {
-          requestsNotifier.value =
-              requestsNotifier.value.copyWith(connections: requests);
-        }
-      });
-    });
-  }
-
-  _initActions() {
-    WidgetsBinding.instance.addPostFrameCallback(
-      (_) {
-        final commonScaffoldState =
-            context.findAncestorStateOfType<CommonScaffoldState>();
-        commonScaffoldState?.actions = [
-          IconButton(
-            onPressed: () {
-              showSearch(
-                context: context,
-                delegate: RequestsSearchDelegate(
-                  state: requestsNotifier.value,
-                ),
-              );
-            },
-            icon: const Icon(Icons.search),
-          ),
-          const SizedBox(
-            width: 8,
-          )
-        ];
-      },
-    );
-  }
-
-  _addKeyword(String keyword) {
-    final isContains = requestsNotifier.value.keywords.contains(keyword);
-    if (isContains) return;
-    final keywords = List<String>.from(requestsNotifier.value.keywords)
-      ..add(keyword);
-    requestsNotifier.value = requestsNotifier.value.copyWith(
-      keywords: keywords,
-    );
-  }
-
-  _deleteKeyword(String keyword) {
-    final isContains = requestsNotifier.value.keywords.contains(keyword);
-    if (!isContains) return;
-    final keywords = List<String>.from(requestsNotifier.value.keywords)
-      ..remove(keyword);
-    requestsNotifier.value = requestsNotifier.value.copyWith(
-      keywords: keywords,
-    );
-  }
-
-  @override
-  void dispose() {
-    super.dispose();
-    timer?.cancel();
-    _scrollController.dispose();
-    timer = null;
-  }
-
-  @override
-  Widget build(BuildContext context) {
-    return Selector<AppState, bool?>(
-      selector: (_, appState) =>
-          appState.currentLabel == 'requests' ||
-          appState.viewMode == ViewMode.mobile &&
-              appState.currentLabel == "tools",
-      builder: (_, isCurrent, child) {
-        if (isCurrent == null || isCurrent) {
-          _initActions();
-        }
-        return child!;
-      },
-      child: ValueListenableBuilder<ConnectionsAndKeywords>(
-        valueListenable: requestsNotifier,
-        builder: (_, state, __) {
-          var connections = state.filteredConnections;
-          if (connections.isEmpty) {
-            return NullStatus(
-              label: appLocalizations.nullRequestsDesc,
-            );
-          }
-          connections = connections.reversed.toList();
-          return Column(
-            crossAxisAlignment: CrossAxisAlignment.start,
-            children: [
-              if (state.keywords.isNotEmpty)
-                Padding(
-                  padding: const EdgeInsets.symmetric(
-                    horizontal: 16,
-                    vertical: 16,
-                  ),
-                  child: Wrap(
-                    runSpacing: 6,
-                    spacing: 6,
-                    children: [
-                      for (final keyword in state.keywords)
-                        CommonChip(
-                          label: keyword,
-                          type: ChipType.delete,
-                          onPressed: () {
-                            _deleteKeyword(keyword);
-                          },
-                        ),
-                    ],
-                  ),
-                ),
-              Expanded(
-                child: ListView.separated(
-                  controller: _scrollController,
-                  itemBuilder: (_, index) {
-                    final connection = connections[index];
-                    return RequestItem(
-                      key: Key(connection.id),
-                      connection: connection,
-                      onClick: _addKeyword,
-                    );
-                  },
-                  separatorBuilder: (BuildContext context, int index) {
-                    return const Divider(
-                      height: 0,
-                    );
-                  },
-                  itemCount: connections.length,
-                ),
-              )
-            ],
-          );
-        },
-      ),
-    );
-  }
-}
-
-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;
-
-  RequestsSearchDelegate({
-    required ConnectionsAndKeywords state,
-  }) : requestsNotifier = ValueNotifier<ConnectionsAndKeywords>(state);
-
-  get state => requestsNotifier.value;
-
-  List<Connection> get _results {
-    final lowerQuery = query.toLowerCase().trim();
-    return requestsNotifier.value.filteredConnections.where((request) {
-      final lowerNetwork = request.metadata.network.toLowerCase();
-      final lowerHost = request.metadata.host.toLowerCase();
-      final lowerDestinationIP = request.metadata.destinationIP.toLowerCase();
-      final lowerProcess = request.metadata.process.toLowerCase();
-      final lowerChains = request.chains.join("").toLowerCase();
-      return lowerNetwork.contains(lowerQuery) ||
-          lowerHost.contains(lowerQuery) ||
-          lowerDestinationIP.contains(lowerQuery) ||
-          lowerProcess.contains(lowerQuery) ||
-          lowerChains.contains(lowerQuery);
-    }).toList();
-  }
-
-  _addKeyword(String keyword) {
-    final isContains = requestsNotifier.value.keywords.contains(keyword);
-    if (isContains) return;
-    final keywords = List<String>.from(requestsNotifier.value.keywords)
-      ..add(keyword);
-    requestsNotifier.value = requestsNotifier.value.copyWith(
-      keywords: keywords,
-    );
-  }
-
-  _deleteKeyword(String keyword) {
-    final isContains = requestsNotifier.value.keywords.contains(keyword);
-    if (!isContains) return;
-    final keywords = List<String>.from(requestsNotifier.value.keywords)
-      ..remove(keyword);
-    requestsNotifier.value = requestsNotifier.value.copyWith(
-      keywords: keywords,
-    );
-  }
-
-  @override
-  List<Widget>? buildActions(BuildContext context) {
-    return [
-      IconButton(
-        onPressed: () {
-          if (query.isEmpty) {
-            close(context, null);
-            return;
-          }
-          query = '';
-        },
-        icon: const Icon(Icons.clear),
-      ),
-      const SizedBox(
-        width: 8,
-      )
-    ];
-  }
-
-  @override
-  Widget? buildLeading(BuildContext context) {
-    return IconButton(
-      onPressed: () {
-        close(context, null);
-      },
-      icon: const Icon(Icons.arrow_back),
-    );
-  }
-
-  @override
-  Widget buildResults(BuildContext context) {
-    return buildSuggestions(context);
-  }
-
-  @override
-  void dispose() {
-    requestsNotifier.dispose();
-    super.dispose();
-  }
-
-  @override
-  Widget buildSuggestions(BuildContext context) {
-    return ValueListenableBuilder(
-      valueListenable: requestsNotifier,
-      builder: (_, __, ___) {
-        return Column(
-          crossAxisAlignment: CrossAxisAlignment.start,
-          children: [
-            if (state.keywords.isNotEmpty)
-              Padding(
-                padding: const EdgeInsets.symmetric(
-                  horizontal: 16,
-                  vertical: 16,
-                ),
-                child: Wrap(
-                  runSpacing: 6,
-                  spacing: 6,
-                  children: [
-                    for (final keyword in state.keywords)
-                      CommonChip(
-                        label: keyword,
-                        type: ChipType.delete,
-                        onPressed: () {
-                          _deleteKeyword(keyword);
-                        },
-                      ),
-                  ],
-                ),
-              ),
-            Expanded(
-              child: ListView.separated(
-                itemBuilder: (_, index) {
-                  final connection = _results[index];
-                  return RequestItem(
-                    key: Key(connection.id),
-                    connection: connection,
-                    onClick: (value) {
-                      _addKeyword(value);
-                    },
-                  );
-                },
-                separatorBuilder: (BuildContext context, int index) {
-                  return const Divider(
-                    height: 0,
-                  );
-                },
-                itemCount: _results.length,
-              ),
-            )
-          ],
-        );
-      },
-    );
-  }
-}
--- a/lib/fragments/resources.dart
+++ b/lib/fragments/resources.dart
@@ -2,37 +2,22 @@ import 'dart:io';

 import 'package:fl_clash/clash/clash.dart';
 import 'package:fl_clash/common/common.dart';
-import 'package:fl_clash/models/models.dart';
-import 'package:fl_clash/state.dart';
+import 'package:fl_clash/models/ffi.dart';
 import 'package:fl_clash/widgets/widgets.dart';
 import 'package:flutter/material.dart';
 import 'package:path/path.dart' hide context;
-import 'package:provider/provider.dart';

@immutable
 class GeoItem {
  final String label;
-  final String key;
  final String fileName;

  const GeoItem({
    required this.label,
-    required this.key,
    required this.fileName,
  });
 }

-@immutable
-class FileInfo {
-  final String size;
-  final DateTime lastModified;
-
-  const FileInfo({
-    required this.size,
-    required this.lastModified,
-  });
-}
-
 class Resources extends StatefulWidget {
  const Resources({super.key});

@@ -41,473 +26,147 @@ class Resources extends StatefulWidget {
 }

 class _ResourcesState extends State<Resources> {
-  List<ExternalProvider> externalProviders = [];
-
-  List<GlobalObjectKey<_ProviderItemState>> providerItemKeys = [];
-
-  @override
-  void initState() {
-    super.initState();
-    WidgetsBinding.instance.addPostFrameCallback((_) {
-      _syncExternalProviders();
+  _updateExternalProvider(
+    String providerName,
+    String providerType,
+  ) async {
+    final commonScaffoldState = context.commonScaffoldState;
+    await commonScaffoldState?.loadingRun(() async {
+      final message = await clashCore.updateExternalProvider(
+        providerName: providerName,
+        providerType: providerType,
+      );
+      if (message.isNotEmpty) throw message;
    });
-  }
-
-  _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() {
-    const geoItems = <GeoItem>[
-      GeoItem(
-        label: "GeoIp",
-        fileName: geoIpFileName,
-        key: "geoip",
-      ),
-      GeoItem(label: "GeoSite", fileName: geoSiteFileName, key: "geosite"),
-      GeoItem(
-        label: "MMDB",
-        fileName: mmdbFileName,
-        key: "mmdb",
-      ),
-      GeoItem(label: "ASN", fileName: asnFileName, key: "asn"),
-    ];
-
-    return generateInfoSection(
-      info: Info(
-        iconData: Icons.storage,
-        label: appLocalizations.geoData,
-      ),
-      items: geoItems.map(
-        (geoItem) => GeoDataListItem(
-          geoItem: geoItem,
-        ),
-      ),
-    );
-  }
-
-  @override
-  Widget build(BuildContext context) {
-    return generateListView(
-      [
-        ..._buildGeoDataSection(),
-        ..._buildExternalProviderSection(),
-      ],
-    );
-  }
-}
-
-class GeoDataListItem extends StatefulWidget {
-  final GeoItem geoItem;
-
-  const GeoDataListItem({
-    super.key,
-    required this.geoItem,
-  });
-
-  @override
-  State<GeoDataListItem> createState() => _GeoDataListItemState();
-}
-
-class _GeoDataListItemState extends State<GeoDataListItem> {
-  final isUpdating = ValueNotifier<bool>(false);
-
-  GeoItem get geoItem => widget.geoItem;
-
-  _updateUrl(String url) async {
-    final newUrl = await globalState.showCommonDialog<String>(
-      child: UpdateGeoUrlFormDialog(
-        title: geoItem.label,
-        url: url,
-      ),
-    );
-    if (newUrl != null && newUrl != url && mounted) {
-      try {
-        if (!newUrl.isUrl) {
-          throw "Invalid url";
-        }
-        final appController = globalState.appController;
-        appController.clashConfig.geoXUrl =
-            Map.from(appController.clashConfig.geoXUrl)..[geoItem.key] = newUrl;
-        appController.updateClashConfigDebounce();
-      } catch (e) {
-        globalState.showMessage(
-          title: geoItem.label,
-          message: TextSpan(
-            text: e.toString(),
-          ),
-        );
-      }
-    }
-  }
-
-  Future<FileInfo> _getGeoFileLastModified(String fileName) async {
-    final homePath = await appPath.getHomeDirPath();
-    final file = File(join(homePath, fileName));
-    final lastModified = await file.lastModified();
-    final size = await file.length();
-    return FileInfo(
-      size: TrafficValue(value: size).show,
-      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,
-      children: [
-        const SizedBox(
-          height: 4,
-        ),
-        FutureBuilder<FileInfo>(
-          future: _getGeoFileLastModified(geoItem.fileName),
-          builder: (_, snapshot) {
-            return SizedBox(
-              height: 24,
-              child: FadeBox(
-                key: Key("fade_box_${geoItem.label}"),
-                child: snapshot.data == null
-                    ? const SizedBox(
-                        width: 24,
-                        height: 24,
-                        child: CircularProgressIndicator(
-                          strokeWidth: 2,
-                        ),
-                      )
-                    : Text(
-                        _buildFileInfoDesc(snapshot.data!),
-                      ),
-              ),
-            );
-          },
-        ),
-        Text(
-          url,
-          style: context.textTheme.bodyMedium?.toLight,
-        ),
-        const SizedBox(
-          height: 8,
-        ),
-        const SizedBox(
-          height: 8,
-        ),
-        Wrap(
-          runSpacing: 6,
-          spacing: 12,
-          children: [
-            CommonChip(
-              avatar: const Icon(Icons.edit),
-              label: appLocalizations.edit,
-              onPressed: () {
-                _updateUrl(url);
-              },
-            ),
-            CommonChip(
-              avatar: const Icon(Icons.sync),
-              label: appLocalizations.sync,
-              onPressed: () {
-                _handleUpdateGeoDataItem();
-              },
-            ),
-          ],
-        ),
-      ],
-    );
-  }
-
-  _handleUpdateGeoDataItem() async {
-    await globalState.safeRun<void>(updateGeoDateItem);
    setState(() {});
  }

-  updateGeoDateItem() async {
-    isUpdating.value = true;
-    try {
-      final message = await clashCore.updateExternalProvider(
-        providerName: geoItem.fileName,
-        providerType: geoItem.label,
-      );
-      if (message.isNotEmpty) throw message;
-    } catch (e) {
-      isUpdating.value = false;
-      rethrow;
-    }
-    isUpdating.value = false;
-    return null;
+  Future<DateTime> _getGeoFileLastModified(String fileName) async {
+    final homePath = await appPath.getHomeDirPath();
+    return await File(join(homePath, fileName)).lastModified();
  }

-  @override
-  void dispose() {
-    super.dispose();
-    isUpdating.dispose();
-  }
-
-  @override
-  Widget build(BuildContext context) {
-    return ListItem(
-      padding: const EdgeInsets.symmetric(
-        horizontal: 16,
-        vertical: 4,
-      ),
-      title: Text(geoItem.label),
-      subtitle: Selector<ClashConfig, String>(
-        selector: (_, clashConfig) => clashConfig.geoXUrl[geoItem.key]!,
-        builder: (_, value, __) {
-          return _buildSubtitle(value);
-        },
-      ),
-      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 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,
+  Widget _buildExternalProviderSection() {
+    return FutureBuilder<List<ExternalProvider>>(
+      future: () async {
+        await Future.delayed(const Duration(milliseconds: 200));
+        return await clashCore.getExternalProviders();
+      }(),
+      builder: (_, snapshot) {
+        return Center(
+          child: FadeBox(
+            key: const Key("external_providers"),
+            child: snapshot.data == null || snapshot.data!.isEmpty
+                ? Container()
+                : Section(
+                    title: appLocalizations.externalResources,
+                    child: Column(
+                      children: [
+                        for (final externalProvider in snapshot.data!)
+                          ListItem(
+                            title: Text(externalProvider.name),
+                            subtitle: Text(
+                              "${externalProvider.type} (${externalProvider.vehicleType})",
+                            ),
+                            trailing: Row(
+                              mainAxisSize: MainAxisSize.min,
+                              children: [
+                                Text(
+                                  externalProvider.updateAt.lastUpdateTimeDesc,
+                                  style: context.textTheme.bodyMedium,
+                                ),
+                                const Padding(
+                                  padding: EdgeInsets.only(left: 12,right: 4),
+                                  child: VerticalDivider(
+                                    endIndent: 2,
+                                    width: 4,
+                                    indent: 2,
+                                  ),
+                                ),
+                                externalProvider.vehicleType == "HTTP"
+                                    ? IconButton(
+                                        icon: const Icon(Icons.sync),
+                                        onPressed: () {
+                                          _updateExternalProvider(
+                                            externalProvider.name,
+                                            externalProvider.type,
+                                          );
+                                        },
+                                      )
+                                    : Container(),
+                              ],
+                            ),
+                          )
+                      ],
+                    ),
+                  ),
          ),
-          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;
-
-  const UpdateGeoUrlFormDialog({
-    super.key,
-    required this.title,
-    required this.url,
-  });
-
-  @override
-  State<UpdateGeoUrlFormDialog> createState() => _UpdateGeoUrlFormDialogState();
-}
-
-class _UpdateGeoUrlFormDialogState extends State<UpdateGeoUrlFormDialog> {
-  late TextEditingController urlController;
-
-  @override
-  void initState() {
-    super.initState();
-    urlController = TextEditingController(text: widget.url);
-  }
-
-  _handleUpdate() async {
-    final url = urlController.value.text;
-    if (url.isEmpty) return;
-    Navigator.of(context).pop<String>(url);
-  }
-
-  @override
-  Widget build(BuildContext context) {
-    return AlertDialog(
-      title: Text(widget.title),
-      content: SizedBox(
-        width: 300,
-        child: Wrap(
-          runSpacing: 16,
-          children: [
-            TextField(
-              maxLines: 5,
-              minLines: 1,
-              controller: urlController,
-              decoration: const InputDecoration(
-                border: OutlineInputBorder(),
+  Widget _buildGeoDataSection() {
+    const geoItems = <GeoItem>[
+      GeoItem(label: "GeoIp", fileName: mmdbFileName),
+      GeoItem(label: "GeoSite", fileName: geoSiteFileName),
+      GeoItem(label: "ASN", fileName: asnFileName),
+    ];
+    return Section(
+      title: appLocalizations.geoData,
+      child: Column(
+        children: [
+          for (final geoItem in geoItems)
+            ListItem(
+              title: Text(geoItem.label),
+              subtitle: FutureBuilder<DateTime>(
+                future: () async {
+                  await Future.delayed(const Duration(milliseconds: 200));
+                  return await _getGeoFileLastModified(geoItem.fileName);
+                }(),
+                builder: (_, snapshot) {
+                  return Container(
+                    alignment: Alignment.centerLeft,
+                    height: 24,
+                    child: FadeBox(
+                      key: Key("fade_box_${geoItem.label}"),
+                      child: snapshot.data == null
+                          ? const SizedBox(
+                              width: 24,
+                              height: 24,
+                              child: CircularProgressIndicator(
+                                strokeWidth: 2,
+                              ),
+                            )
+                          : Text(
+                              snapshot.data!.lastUpdateTimeDesc,
+                            ),
+                    ),
+                  );
+                },
+              ),
+              trailing: IconButton(
+                icon: const Icon(Icons.sync),
+                onPressed: () {
+                  _updateExternalProvider(
+                    geoItem.fileName,
+                    geoItem.label,
+                  );
+                },
              ),
            ),
-          ],
-        ),
+        ],
      ),
-      actions: [
-        TextButton(
-          onPressed: _handleUpdate,
-          child: Text(appLocalizations.submit),
-        )
+    );
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    return ListView(
+      children: [
+        _buildGeoDataSection(),
+        _buildExternalProviderSection(),
      ],
    );
  }
-}
+}
--- a/lib/fragments/theme.dart
+++ b/lib/fragments/theme.dart
@@ -111,10 +111,9 @@ class ThemeFragment extends StatelessWidget {
      null,
      defaultPrimaryColor,
      Colors.pinkAccent,
-      Colors.lightBlue,
      Colors.greenAccent,
      Colors.yellowAccent,
-      Colors.purple,
+      Colors.purple
    ];
    return Column(
      children: [
--- a/lib/fragments/tools.dart
+++ b/lib/fragments/tools.dart
@@ -57,120 +57,137 @@ class _ToolboxFragmentState extends State<ToolsFragment> {
    return Intl.message(locale.toString());
  }

-  List<Widget> _getOtherList() {
-    return generateSection(
-      title: appLocalizations.other,
-      items: [
-        ListItem.open(
-          leading: const Icon(Icons.info),
-          title: Text(appLocalizations.about),
-          delegate: OpenDelegate(
-            title: appLocalizations.about,
-            widget: const AboutFragment(),
-          ),
+  Widget _getOtherList() {
+    List<Widget> items = [
+      ListItem.open(
+        leading: const Icon(Icons.info),
+        title: Text(appLocalizations.about),
+        delegate: OpenDelegate(
+          title: appLocalizations.about,
+          widget: const AboutFragment(),
        ),
+      ),
+    ];
+    return Column(
+      mainAxisSize: MainAxisSize.min,
+      children: [
+        for (final item in items) ...[
+          item,
+          if (item != items.last)
+            const Divider(
+              height: 0,
+            ),
+        ]
      ],
    );
  }

-  List<Widget> _getSettingList() {
-    return generateSection(
-      title: appLocalizations.settings,
-      items: [
-        Selector<Config, String?>(
-          selector: (_, config) => config.locale,
-          builder: (_, localeString, __) {
-            final subTitle = localeString ?? appLocalizations.defaultText;
-            final currentLocale = other.getLocaleForString(localeString);
-            return ListTile(
-              leading: const Icon(Icons.language_outlined),
-              title: Text(appLocalizations.language),
-              subtitle: Text(Intl.message(subTitle)),
-              onTap: () {
-                globalState.showCommonDialog(
-                  child: AlertDialog(
-                    title: Text(appLocalizations.language),
-                    contentPadding: const EdgeInsets.symmetric(
-                      horizontal: 8,
-                      vertical: 16,
-                    ),
-                    content: SizedBox(
-                      width: 250,
-                      child: Wrap(
-                        children: [
-                          for (final locale in [
-                            null,
-                            ...AppLocalizations.delegate.supportedLocales
-                          ])
-                            ListItem.radio(
-                              delegate: RadioDelegate<Locale?>(
-                                value: locale,
-                                groupValue: currentLocale,
-                                onChanged: (Locale? value) {
-                                  final config = context.read<Config>();
-                                  config.locale = value?.toString();
-                                  Navigator.of(context).pop();
-                                },
-                              ),
-                              title: Text(_getLocaleString(locale)),
-                            )
-                        ],
-                      ),
+  Widget _getSettingList() {
+    List<Widget> items = [
+      Selector<Config, String?>(
+        selector: (_, config) => config.locale,
+        builder: (_, localeString, __) {
+          final subTitle = localeString ?? appLocalizations.defaultText;
+          final currentLocale = other.getLocaleForString(localeString);
+          return ListTile(
+            leading: const Icon(Icons.language_outlined),
+            title: Text(appLocalizations.language),
+            subtitle: Text(Intl.message(subTitle)),
+            onTap: () {
+              globalState.showCommonDialog(
+                child: AlertDialog(
+                  title: Text(appLocalizations.language),
+                  contentPadding: const EdgeInsets.symmetric(
+                    horizontal: 8,
+                    vertical: 16,
+                  ),
+                  content: SizedBox(
+                    width: 250,
+                    child: Wrap(
+                      children: [
+                        for (final locale in [
+                          null,
+                          ...AppLocalizations.delegate.supportedLocales
+                        ])
+                          ListItem.radio(
+                            delegate: RadioDelegate<Locale?>(
+                              value: locale,
+                              groupValue: currentLocale,
+                              onChanged: (Locale? value) {
+                                final config = context.read<Config>();
+                                config.locale = value?.toString();
+                                Navigator.of(context).pop();
+                              },
+                            ),
+                            title: Text(_getLocaleString(locale)),
+                          )
+                      ],
                    ),
                  ),
-                );
-              },
-            );
-          },
+                ),
+              );
+            },
+          );
+        },
+      ),
+      ListItem.open(
+        leading: const Icon(Icons.style),
+        title: Text(appLocalizations.theme),
+        subtitle: Text(appLocalizations.themeDesc),
+        delegate: OpenDelegate(
+          title: appLocalizations.theme,
+          widget: const ThemeFragment(),
+          extendPageWidth: 360,
        ),
+      ),
+      ListItem.open(
+        leading: const Icon(Icons.cloud_sync),
+        title: Text(appLocalizations.backupAndRecovery),
+        subtitle: Text(appLocalizations.backupAndRecoveryDesc),
+        delegate: OpenDelegate(
+          title: appLocalizations.backupAndRecovery,
+          widget: const BackupAndRecovery(),
+        ),
+      ),
+      if (Platform.isAndroid)
        ListItem.open(
-          leading: const Icon(Icons.style),
-          title: Text(appLocalizations.theme),
-          subtitle: Text(appLocalizations.themeDesc),
+          leading: const Icon(Icons.view_list),
+          title: Text(appLocalizations.accessControl),
+          subtitle: Text(appLocalizations.accessControlDesc),
          delegate: OpenDelegate(
-            title: appLocalizations.theme,
-            widget: const ThemeFragment(),
-            extendPageWidth: 360,
+            title: appLocalizations.appAccessControl,
+            widget: const AccessFragment(),
          ),
        ),
-        ListItem.open(
-          leading: const Icon(Icons.cloud_sync),
-          title: Text(appLocalizations.backupAndRecovery),
-          subtitle: Text(appLocalizations.backupAndRecoveryDesc),
-          delegate: OpenDelegate(
-            title: appLocalizations.backupAndRecovery,
-            widget: const BackupAndRecovery(),
-          ),
+      ListItem.open(
+        leading: const Icon(Icons.edit),
+        title: Text(appLocalizations.override),
+        subtitle: Text(appLocalizations.overrideDesc),
+        delegate: OpenDelegate(
+          title: appLocalizations.override,
+          widget: const ConfigFragment(),
        ),
-        if (Platform.isAndroid)
-          ListItem.open(
-            leading: const Icon(Icons.view_list),
-            title: Text(appLocalizations.accessControl),
-            subtitle: Text(appLocalizations.accessControlDesc),
-            delegate: OpenDelegate(
-              title: appLocalizations.appAccessControl,
-              widget: const AccessFragment(),
+      ),
+      ListItem.open(
+        leading: const Icon(Icons.settings_applications),
+        title: Text(appLocalizations.application),
+        subtitle: Text(appLocalizations.applicationDesc),
+        delegate: OpenDelegate(
+          title: appLocalizations.application,
+          widget: const ApplicationSettingFragment(),
+        ),
+      ),
+    ];
+    return Column(
+      mainAxisSize: MainAxisSize.min,
+      children: [
+        for (final item in items) ...[
+          item,
+          if (item != items.last)
+            const Divider(
+              height: 0,
            ),
-          ),
-        ListItem.open(
-          leading: const Icon(Icons.edit),
-          title: Text(appLocalizations.override),
-          subtitle: Text(appLocalizations.overrideDesc),
-          delegate: OpenDelegate(
-            title: appLocalizations.override,
-            widget: const ConfigFragment(),
-            extendPageWidth: 360,
-          ),
-        ),
-        ListItem.open(
-          leading: const Icon(Icons.settings_applications),
-          title: Text(appLocalizations.application),
-          subtitle: Text(appLocalizations.applicationDesc),
-          delegate: OpenDelegate(
-            title: appLocalizations.application,
-            widget: const ApplicationSettingFragment(),
-          ),
-        ),
+        ]
      ],
    );
  }
@@ -198,16 +215,20 @@ class _ToolboxFragmentState extends State<ToolsFragment> {
              if (state.navigationItems.isEmpty) {
                return Container();
              }
-              return Column(
-                children: [
-                  ListHeader(title: appLocalizations.more),
-                  _buildNavigationMenu(state.navigationItems)
-                ],
+              return Section(
+                title: appLocalizations.more,
+                child: _buildNavigationMenu(state.navigationItems),
              );
            },
          ),
-          ..._getSettingList(),
-          ..._getOtherList(),
+          Section(
+            title: appLocalizations.settings,
+            child: _getSettingList(),
+          ),
+          Section(
+            title: appLocalizations.other,
+            child: _getOtherList(),
+          ),
        ];
        return ListView.builder(
          itemCount: items.length,
--- a/lib/l10n/arb/intl_en.arb
+++ b/lib/l10n/arb/intl_en.arb
@@ -37,7 +37,7 @@
  "overrideDesc": "Override Proxy related config",
  "allowLan": "AllowLan",
  "allowLanDesc": "Allow access proxy through the LAN",
-  "tun": "TUN mode",
+  "tun": "Tun mode",
  "tunDesc": "only effective in administrator mode",
  "minimizeOnExit": "Minimize on exit",
  "minimizeOnExitDesc": "Modify the default system exit event",
@@ -111,7 +111,6 @@
  "noMoreInfoDesc": "No more info",
  "profileParseErrorDesc": "profile parse error",
  "proxyPort": "ProxyPort",
-  "proxyPortDesc": "Set the Clash listening port",
  "port": "Port",
  "logLevel": "LogLevel",
  "show": "Show",
@@ -161,39 +160,5 @@
  "checking": "Checking...",
  "country": "Country",
  "checkError": "Check error",
-  "search": "Search",
-  "allowBypass": "Allow applications to bypass VPN",
-  "allowBypassDesc": "Some apps can bypass VPN when turned on",
-  "externalController": "ExternalController",
-  "externalControllerDesc": "Once enabled, the Clash kernel can be controlled on port 9090",
-  "ipv6Desc": "When turned on it will be able to receive IPv6 traffic",
-  "app": "App",
-  "general": "General",
-  "systemProxyDesc": "Attach HTTP proxy to VpnService",
-  "unifiedDelay": "Unified delay",
-  "unifiedDelayDesc": "Remove extra delays such as handshaking",
-  "tcpConcurrent": "TCP concurrent",
-  "tcpConcurrentDesc": "Enabling it will allow TCP concurrency",
-  "geodataLoader": "Geo Low Memory Mode",
-  "geodataLoaderDesc": "Enabling will use the Geo low memory loader",
-  "requests": "Requests",
-  "requestsDesc": "View recently requested data",
-  "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",
-  "nullRequestsDesc": "No requests",
-  "nullConnectionsDesc": "No connections",
-  "intranetIP": "Intranet IP",
-  "view": "View",
-  "cut": "Cut",
-  "copy": "Copy",
-  "paste": "Paste",
-  "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"
+  "ipCheckTimeout": "Ip check timeout"
 }
--- a/lib/l10n/arb/intl_zh_CN.arb
+++ b/lib/l10n/arb/intl_zh_CN.arb
@@ -37,7 +37,7 @@
  "overrideDesc": "覆写代理相关配置",
  "allowLan": "局域网代理",
  "allowLanDesc": "允许通过局域网访问代理",
-  "tun": "TUN模式",
+  "tun": "Tun模式",
  "tunDesc": "仅在管理员模式生效",
  "minimizeOnExit": "退出时最小化",
  "minimizeOnExitDesc": "修改系统默认退出事件",
@@ -111,7 +111,6 @@
  "noMoreInfoDesc": "暂无更多信息",
  "profileParseErrorDesc": "配置文件解析错误",
  "proxyPort": "代理端口",
-  "proxyPortDesc": "设置Clash监听端口",
  "port": "端口",
  "logLevel": "日志等级",
  "show": "显示",
@@ -161,39 +160,5 @@
  "checking": "检测中...",
  "country": "区域",
  "checkError": "检测失败",
-  "search": "搜索",
-  "allowBypass": "允许应用绕过VPN",
-  "allowBypassDesc": "开启后部分应用可绕过VPN",
-  "externalController": "外部控制器",
-  "externalControllerDesc": "开启后将可以通过9090端口控制Clash内核",
-  "ipv6Desc": "开启后将可以接收IPv6流量",
-  "app": "应用",
-  "general": "基础",
-  "systemProxyDesc": "为VpnService附加HTTP代理",
-  "unifiedDelay": "统一延迟",
-  "unifiedDelayDesc": "去除握手等额外延迟",
-  "tcpConcurrent": "TCP并发",
-  "tcpConcurrentDesc": "开启后允许TCP并发",
-  "geodataLoader": "Geo低内存模式",
-  "geodataLoaderDesc": "开启将使用Geo低内存加载器",
-  "requests": "请求",
-  "requestsDesc": "查看最近请求数据",
-  "findProcessMode": "查找进程",
-  "findProcessModeDesc": "开启后存在闪退风险",
-  "init": "初始化",
-  "infiniteTime": "长期有效",
-  "expirationTime": "到期时间",
-  "connections": "连接",
-  "connectionsDesc": "查看当前连接",
-  "nullRequestsDesc": "暂无请求",
-  "nullConnectionsDesc": "暂无连接",
-  "intranetIP": "内网 IP",
-  "view": "查看",
-  "cut": "剪切",
-  "copy": "复制",
-  "paste": "粘贴",
-  "testUrl": "测速链接",
-  "sync": "同步",
-  "exclude": "从最近任务中隐藏",
-  "excludeDesc": "应用在后台时,从最近任务中隐藏应用"
+  "ipCheckTimeout": "Ip检测超时"
 }
--- a/lib/l10n/intl/messages_en.dart
+++ b/lib/l10n/intl/messages_en.dart
@@ -40,14 +40,9 @@ class MessageLookup extends MessageLookupByLibrary {
        "addressTip": MessageLookupByLibrary.simpleMessage(
            "Please enter a valid WebDAV address"),
        "ago": MessageLookupByLibrary.simpleMessage(" Ago"),
-        "allowBypass": MessageLookupByLibrary.simpleMessage(
-            "Allow applications to bypass VPN"),
-        "allowBypassDesc": MessageLookupByLibrary.simpleMessage(
-            "Some apps can bypass VPN when turned on"),
        "allowLan": MessageLookupByLibrary.simpleMessage("AllowLan"),
        "allowLanDesc": MessageLookupByLibrary.simpleMessage(
            "Allow access proxy through the LAN"),
-        "app": MessageLookupByLibrary.simpleMessage("App"),
        "appAccessControl":
            MessageLookupByLibrary.simpleMessage("App access control"),
        "application": MessageLookupByLibrary.simpleMessage("Application"),
@@ -92,16 +87,11 @@ class MessageLookup extends MessageLookupByLibrary {
        "compatibleDesc": MessageLookupByLibrary.simpleMessage(
            "Opening it will lose part of its application ability and gain the support of full amount of Clash."),
        "confirm": MessageLookupByLibrary.simpleMessage("Confirm"),
-        "connections": MessageLookupByLibrary.simpleMessage("Connections"),
-        "connectionsDesc":
-            MessageLookupByLibrary.simpleMessage("View current connection"),
        "connectivity": MessageLookupByLibrary.simpleMessage("Connectivity："),
-        "copy": MessageLookupByLibrary.simpleMessage("Copy"),
        "core": MessageLookupByLibrary.simpleMessage("Core"),
        "coreInfo": MessageLookupByLibrary.simpleMessage("Core info"),
        "country": MessageLookupByLibrary.simpleMessage("Country"),
        "create": MessageLookupByLibrary.simpleMessage("Create"),
-        "cut": MessageLookupByLibrary.simpleMessage("Cut"),
        "dark": MessageLookupByLibrary.simpleMessage("Dark"),
        "dashboard": MessageLookupByLibrary.simpleMessage("Dashboard"),
        "days": MessageLookupByLibrary.simpleMessage("Days"),
@@ -121,17 +111,7 @@ class MessageLookup extends MessageLookupByLibrary {
        "download": MessageLookupByLibrary.simpleMessage("Download"),
        "edit": MessageLookupByLibrary.simpleMessage("Edit"),
        "en": MessageLookupByLibrary.simpleMessage("English"),
-        "exclude":
-            MessageLookupByLibrary.simpleMessage("Hidden from recent tasks"),
-        "excludeDesc": MessageLookupByLibrary.simpleMessage(
-            "When the app is in the background, the app is hidden from the recent task"),
        "exit": MessageLookupByLibrary.simpleMessage("Exit"),
-        "expirationTime":
-            MessageLookupByLibrary.simpleMessage("Expiration time"),
-        "externalController":
-            MessageLookupByLibrary.simpleMessage("ExternalController"),
-        "externalControllerDesc": MessageLookupByLibrary.simpleMessage(
-            "Once enabled, the Clash kernel can be controlled on port 9090"),
        "externalResources":
            MessageLookupByLibrary.simpleMessage("External resources"),
        "file": MessageLookupByLibrary.simpleMessage("File"),
@@ -139,26 +119,14 @@ class MessageLookup extends MessageLookupByLibrary {
            MessageLookupByLibrary.simpleMessage("Directly upload profile"),
        "filterSystemApp":
            MessageLookupByLibrary.simpleMessage("Filter system app"),
-        "findProcessMode": MessageLookupByLibrary.simpleMessage("Find process"),
-        "findProcessModeDesc": MessageLookupByLibrary.simpleMessage(
-            "There is a risk of flashback after opening"),
-        "general": MessageLookupByLibrary.simpleMessage("General"),
        "geoData": MessageLookupByLibrary.simpleMessage("GeoData"),
-        "geodataLoader":
-            MessageLookupByLibrary.simpleMessage("Geo Low Memory Mode"),
-        "geodataLoaderDesc": MessageLookupByLibrary.simpleMessage(
-            "Enabling will use the Geo low memory loader"),
        "global": MessageLookupByLibrary.simpleMessage("Global"),
        "goDownload": MessageLookupByLibrary.simpleMessage("Go to download"),
        "hours": MessageLookupByLibrary.simpleMessage("Hours"),
        "importFromURL":
            MessageLookupByLibrary.simpleMessage("Import from URL"),
-        "infiniteTime":
-            MessageLookupByLibrary.simpleMessage("Long term effective"),
-        "init": MessageLookupByLibrary.simpleMessage("Init"),
-        "intranetIP": MessageLookupByLibrary.simpleMessage("Intranet IP"),
-        "ipv6Desc": MessageLookupByLibrary.simpleMessage(
-            "When turned on it will be able to receive IPv6 traffic"),
+        "ipCheckTimeout":
+            MessageLookupByLibrary.simpleMessage("Ip check timeout"),
        "just": MessageLookupByLibrary.simpleMessage("Just"),
        "language": MessageLookupByLibrary.simpleMessage("Language"),
        "light": MessageLookupByLibrary.simpleMessage("Light"),
@@ -187,14 +155,11 @@ class MessageLookup extends MessageLookupByLibrary {
            "Please create a profile or add a valid profile"),
        "notSelectedTip": MessageLookupByLibrary.simpleMessage(
            "The current proxy group cannot be selected."),
-        "nullConnectionsDesc":
-            MessageLookupByLibrary.simpleMessage("No connections"),
        "nullCoreInfoDesc":
            MessageLookupByLibrary.simpleMessage("Unable to obtain core info"),
        "nullLogsDesc": MessageLookupByLibrary.simpleMessage("No logs"),
        "nullProfileDesc": MessageLookupByLibrary.simpleMessage(
            "No profile, Please add a profile"),
-        "nullRequestsDesc": MessageLookupByLibrary.simpleMessage("No requests"),
        "other": MessageLookupByLibrary.simpleMessage("Other"),
        "outboundMode": MessageLookupByLibrary.simpleMessage("Outbound mode"),
        "override": MessageLookupByLibrary.simpleMessage("Override"),
@@ -203,7 +168,6 @@ class MessageLookup extends MessageLookupByLibrary {
        "password": MessageLookupByLibrary.simpleMessage("Password"),
        "passwordTip":
            MessageLookupByLibrary.simpleMessage("Password cannot be empty"),
-        "paste": MessageLookupByLibrary.simpleMessage("Paste"),
        "pleaseBindWebDAV":
            MessageLookupByLibrary.simpleMessage("Please bind WebDAV"),
        "pleaseUploadFile":
@@ -231,8 +195,6 @@ class MessageLookup extends MessageLookupByLibrary {
        "project": MessageLookupByLibrary.simpleMessage("Project"),
        "proxies": MessageLookupByLibrary.simpleMessage("Proxies"),
        "proxyPort": MessageLookupByLibrary.simpleMessage("ProxyPort"),
-        "proxyPortDesc": MessageLookupByLibrary.simpleMessage(
-            "Set the Clash listening port"),
        "qrcode": MessageLookupByLibrary.simpleMessage("QR code"),
        "qrcodeDesc": MessageLookupByLibrary.simpleMessage(
            "Scan QR code to obtain profile"),
@@ -245,15 +207,11 @@ class MessageLookup extends MessageLookupByLibrary {
            MessageLookupByLibrary.simpleMessage("Only recovery profiles"),
        "recoverySuccess":
            MessageLookupByLibrary.simpleMessage("Recovery success"),
-        "requests": MessageLookupByLibrary.simpleMessage("Requests"),
-        "requestsDesc": MessageLookupByLibrary.simpleMessage(
-            "View recently requested data"),
        "resources": MessageLookupByLibrary.simpleMessage("Resources"),
        "resourcesDesc": MessageLookupByLibrary.simpleMessage(
            "External resource related info"),
        "rule": MessageLookupByLibrary.simpleMessage("Rule"),
        "save": MessageLookupByLibrary.simpleMessage("Save"),
-        "search": MessageLookupByLibrary.simpleMessage("Search"),
        "selectAll": MessageLookupByLibrary.simpleMessage("Select all"),
        "selected": MessageLookupByLibrary.simpleMessage("Selected"),
        "settings": MessageLookupByLibrary.simpleMessage("Settings"),
@@ -264,17 +222,10 @@ class MessageLookup extends MessageLookupByLibrary {
        "startVpn": MessageLookupByLibrary.simpleMessage("Staring VPN..."),
        "stopVpn": MessageLookupByLibrary.simpleMessage("Stopping VPN..."),
        "submit": MessageLookupByLibrary.simpleMessage("Submit"),
-        "sync": MessageLookupByLibrary.simpleMessage("Sync"),
        "systemProxy": MessageLookupByLibrary.simpleMessage("SystemProxy"),
-        "systemProxyDesc": MessageLookupByLibrary.simpleMessage(
-            "Attach HTTP proxy to VpnService"),
        "tabAnimation": MessageLookupByLibrary.simpleMessage("Tab animation"),
        "tabAnimationDesc": MessageLookupByLibrary.simpleMessage(
            "When enabled, the home tab will add a toggle animation"),
-        "tcpConcurrent": MessageLookupByLibrary.simpleMessage("TCP concurrent"),
-        "tcpConcurrentDesc": MessageLookupByLibrary.simpleMessage(
-            "Enabling it will allow TCP concurrency"),
-        "testUrl": MessageLookupByLibrary.simpleMessage("Test url"),
        "theme": MessageLookupByLibrary.simpleMessage("Theme"),
        "themeColor": MessageLookupByLibrary.simpleMessage("Theme color"),
        "themeDesc": MessageLookupByLibrary.simpleMessage(
@@ -283,22 +234,18 @@ class MessageLookup extends MessageLookupByLibrary {
        "tip": MessageLookupByLibrary.simpleMessage("tip"),
        "tools": MessageLookupByLibrary.simpleMessage("Tools"),
        "trafficUsage": MessageLookupByLibrary.simpleMessage("Traffic usage"),
-        "tun": MessageLookupByLibrary.simpleMessage("TUN mode"),
+        "tun": MessageLookupByLibrary.simpleMessage("Tun mode"),
        "tunDesc": MessageLookupByLibrary.simpleMessage(
            "only effective in administrator mode"),
        "unableToUpdateCurrentProfileDesc":
            MessageLookupByLibrary.simpleMessage(
                "unable to update current profile"),
-        "unifiedDelay": MessageLookupByLibrary.simpleMessage("Unified delay"),
-        "unifiedDelayDesc": MessageLookupByLibrary.simpleMessage(
-            "Remove extra delays such as handshaking"),
        "unknown": MessageLookupByLibrary.simpleMessage("Unknown"),
        "update": MessageLookupByLibrary.simpleMessage("Update"),
        "upload": MessageLookupByLibrary.simpleMessage("Upload"),
        "url": MessageLookupByLibrary.simpleMessage("URL"),
        "urlDesc":
            MessageLookupByLibrary.simpleMessage("Obtain profile through URL"),
-        "view": MessageLookupByLibrary.simpleMessage("View"),
        "webDAVConfiguration":
            MessageLookupByLibrary.simpleMessage("WebDAV configuration"),
        "whitelistMode": MessageLookupByLibrary.simpleMessage("Whitelist mode"),
--- a/lib/l10n/intl/messages_zh_CN.dart
+++ b/lib/l10n/intl/messages_zh_CN.dart
@@ -36,12 +36,8 @@ class MessageLookup extends MessageLookupByLibrary {
        "addressHelp": MessageLookupByLibrary.simpleMessage("WebDAV服务器地址"),
        "addressTip": MessageLookupByLibrary.simpleMessage("请输入有效的WebDAV地址"),
        "ago": MessageLookupByLibrary.simpleMessage("前"),
-        "allowBypass": MessageLookupByLibrary.simpleMessage("允许应用绕过VPN"),
-        "allowBypassDesc":
-            MessageLookupByLibrary.simpleMessage("开启后部分应用可绕过VPN"),
        "allowLan": MessageLookupByLibrary.simpleMessage("局域网代理"),
        "allowLanDesc": MessageLookupByLibrary.simpleMessage("允许通过局域网访问代理"),
-        "app": MessageLookupByLibrary.simpleMessage("应用"),
        "appAccessControl": MessageLookupByLibrary.simpleMessage("应用访问控制"),
        "application": MessageLookupByLibrary.simpleMessage("应用程序"),
        "applicationDesc": MessageLookupByLibrary.simpleMessage("修改应用程序相关设置"),
@@ -75,15 +71,11 @@ class MessageLookup extends MessageLookupByLibrary {
        "compatibleDesc":
            MessageLookupByLibrary.simpleMessage("开启将失去部分应用能力，获得全量的Clash的支持"),
        "confirm": MessageLookupByLibrary.simpleMessage("确定"),
-        "connections": MessageLookupByLibrary.simpleMessage("连接"),
-        "connectionsDesc": MessageLookupByLibrary.simpleMessage("查看当前连接"),
        "connectivity": MessageLookupByLibrary.simpleMessage("连通性："),
-        "copy": MessageLookupByLibrary.simpleMessage("复制"),
        "core": MessageLookupByLibrary.simpleMessage("内核"),
        "coreInfo": MessageLookupByLibrary.simpleMessage("内核信息"),
        "country": MessageLookupByLibrary.simpleMessage("区域"),
        "create": MessageLookupByLibrary.simpleMessage("创建"),
-        "cut": MessageLookupByLibrary.simpleMessage("剪切"),
        "dark": MessageLookupByLibrary.simpleMessage("深色"),
        "dashboard": MessageLookupByLibrary.simpleMessage("仪表盘"),
        "days": MessageLookupByLibrary.simpleMessage("天"),
@@ -100,34 +92,17 @@ class MessageLookup extends MessageLookupByLibrary {
        "download": MessageLookupByLibrary.simpleMessage("下载"),
        "edit": MessageLookupByLibrary.simpleMessage("编辑"),
        "en": MessageLookupByLibrary.simpleMessage("英语"),
-        "exclude": MessageLookupByLibrary.simpleMessage("从最近任务中隐藏"),
-        "excludeDesc":
-            MessageLookupByLibrary.simpleMessage("应用在后台时,从最近任务中隐藏应用"),
        "exit": MessageLookupByLibrary.simpleMessage("退出"),
-        "expirationTime": MessageLookupByLibrary.simpleMessage("到期时间"),
-        "externalController": MessageLookupByLibrary.simpleMessage("外部控制器"),
-        "externalControllerDesc":
-            MessageLookupByLibrary.simpleMessage("开启后将可以通过9090端口控制Clash内核"),
        "externalResources": MessageLookupByLibrary.simpleMessage("外部资源"),
        "file": MessageLookupByLibrary.simpleMessage("文件"),
        "fileDesc": MessageLookupByLibrary.simpleMessage("直接上传配置文件"),
        "filterSystemApp": MessageLookupByLibrary.simpleMessage("过滤系统应用"),
-        "findProcessMode": MessageLookupByLibrary.simpleMessage("查找进程"),
-        "findProcessModeDesc":
-            MessageLookupByLibrary.simpleMessage("开启后存在闪退风险"),
-        "general": MessageLookupByLibrary.simpleMessage("基础"),
        "geoData": MessageLookupByLibrary.simpleMessage("地理数据"),
-        "geodataLoader": MessageLookupByLibrary.simpleMessage("Geo低内存模式"),
-        "geodataLoaderDesc":
-            MessageLookupByLibrary.simpleMessage("开启将使用Geo低内存加载器"),
        "global": MessageLookupByLibrary.simpleMessage("全局"),
        "goDownload": MessageLookupByLibrary.simpleMessage("前往下载"),
        "hours": MessageLookupByLibrary.simpleMessage("小时"),
        "importFromURL": MessageLookupByLibrary.simpleMessage("从URL导入"),
-        "infiniteTime": MessageLookupByLibrary.simpleMessage("长期有效"),
-        "init": MessageLookupByLibrary.simpleMessage("初始化"),
-        "intranetIP": MessageLookupByLibrary.simpleMessage("内网 IP"),
-        "ipv6Desc": MessageLookupByLibrary.simpleMessage("开启后将可以接收IPv6流量"),
+        "ipCheckTimeout": MessageLookupByLibrary.simpleMessage("Ip检测超时"),
        "just": MessageLookupByLibrary.simpleMessage("刚刚"),
        "language": MessageLookupByLibrary.simpleMessage("语言"),
        "light": MessageLookupByLibrary.simpleMessage("浅色"),
@@ -152,19 +127,16 @@ class MessageLookup extends MessageLookupByLibrary {
        "noProxyDesc":
            MessageLookupByLibrary.simpleMessage("请创建配置文件或者添加有效配置文件"),
        "notSelectedTip": MessageLookupByLibrary.simpleMessage("当前代理组无法选中"),
-        "nullConnectionsDesc": MessageLookupByLibrary.simpleMessage("暂无连接"),
        "nullCoreInfoDesc": MessageLookupByLibrary.simpleMessage("无法获取内核信息"),
        "nullLogsDesc": MessageLookupByLibrary.simpleMessage("暂无日志"),
        "nullProfileDesc":
            MessageLookupByLibrary.simpleMessage("没有配置文件,请先添加配置文件"),
-        "nullRequestsDesc": MessageLookupByLibrary.simpleMessage("暂无请求"),
        "other": MessageLookupByLibrary.simpleMessage("其他"),
        "outboundMode": MessageLookupByLibrary.simpleMessage("出站模式"),
        "override": MessageLookupByLibrary.simpleMessage("覆写"),
        "overrideDesc": MessageLookupByLibrary.simpleMessage("覆写代理相关配置"),
        "password": MessageLookupByLibrary.simpleMessage("密码"),
        "passwordTip": MessageLookupByLibrary.simpleMessage("密码不能为空"),
-        "paste": MessageLookupByLibrary.simpleMessage("粘贴"),
        "pleaseBindWebDAV": MessageLookupByLibrary.simpleMessage("请绑定WebDAV"),
        "pleaseUploadFile": MessageLookupByLibrary.simpleMessage("请上传文件"),
        "pleaseUploadValidQrcode":
@@ -188,7 +160,6 @@ class MessageLookup extends MessageLookupByLibrary {
        "project": MessageLookupByLibrary.simpleMessage("项目"),
        "proxies": MessageLookupByLibrary.simpleMessage("代理"),
        "proxyPort": MessageLookupByLibrary.simpleMessage("代理端口"),
-        "proxyPortDesc": MessageLookupByLibrary.simpleMessage("设置Clash监听端口"),
        "qrcode": MessageLookupByLibrary.simpleMessage("二维码"),
        "qrcodeDesc": MessageLookupByLibrary.simpleMessage("扫描二维码获取配置文件"),
        "recovery": MessageLookupByLibrary.simpleMessage("恢复"),
@@ -196,13 +167,10 @@ class MessageLookup extends MessageLookupByLibrary {
        "recoveryDesc": MessageLookupByLibrary.simpleMessage("从WebDAV恢复数据"),
        "recoveryProfiles": MessageLookupByLibrary.simpleMessage("仅恢复配置文件"),
        "recoverySuccess": MessageLookupByLibrary.simpleMessage("恢复成功"),
-        "requests": MessageLookupByLibrary.simpleMessage("请求"),
-        "requestsDesc": MessageLookupByLibrary.simpleMessage("查看最近请求数据"),
        "resources": MessageLookupByLibrary.simpleMessage("资源"),
        "resourcesDesc": MessageLookupByLibrary.simpleMessage("外部资源相关信息"),
        "rule": MessageLookupByLibrary.simpleMessage("规则"),
        "save": MessageLookupByLibrary.simpleMessage("保存"),
-        "search": MessageLookupByLibrary.simpleMessage("搜索"),
        "selectAll": MessageLookupByLibrary.simpleMessage("全选"),
        "selected": MessageLookupByLibrary.simpleMessage("已选择"),
        "settings": MessageLookupByLibrary.simpleMessage("设置"),
@@ -212,16 +180,10 @@ class MessageLookup extends MessageLookupByLibrary {
        "startVpn": MessageLookupByLibrary.simpleMessage("正在启动VPN..."),
        "stopVpn": MessageLookupByLibrary.simpleMessage("正在停止VPN..."),
        "submit": MessageLookupByLibrary.simpleMessage("提交"),
-        "sync": MessageLookupByLibrary.simpleMessage("同步"),
        "systemProxy": MessageLookupByLibrary.simpleMessage("系统代理"),
-        "systemProxyDesc":
-            MessageLookupByLibrary.simpleMessage("为VpnService附加HTTP代理"),
        "tabAnimation": MessageLookupByLibrary.simpleMessage("选项卡动画"),
        "tabAnimationDesc":
            MessageLookupByLibrary.simpleMessage("开启后，主页选项卡将添加切换动画"),
-        "tcpConcurrent": MessageLookupByLibrary.simpleMessage("TCP并发"),
-        "tcpConcurrentDesc": MessageLookupByLibrary.simpleMessage("开启后允许TCP并发"),
-        "testUrl": MessageLookupByLibrary.simpleMessage("测速链接"),
        "theme": MessageLookupByLibrary.simpleMessage("主题"),
        "themeColor": MessageLookupByLibrary.simpleMessage("主题色彩"),
        "themeDesc": MessageLookupByLibrary.simpleMessage("设置深色模式，调整色彩"),
@@ -229,18 +191,15 @@ class MessageLookup extends MessageLookupByLibrary {
        "tip": MessageLookupByLibrary.simpleMessage("提示"),
        "tools": MessageLookupByLibrary.simpleMessage("工具"),
        "trafficUsage": MessageLookupByLibrary.simpleMessage("流量统计"),
-        "tun": MessageLookupByLibrary.simpleMessage("TUN模式"),
+        "tun": MessageLookupByLibrary.simpleMessage("Tun模式"),
        "tunDesc": MessageLookupByLibrary.simpleMessage("仅在管理员模式生效"),
        "unableToUpdateCurrentProfileDesc":
            MessageLookupByLibrary.simpleMessage("无法更新当前配置文件"),
-        "unifiedDelay": MessageLookupByLibrary.simpleMessage("统一延迟"),
-        "unifiedDelayDesc": MessageLookupByLibrary.simpleMessage("去除握手等额外延迟"),
        "unknown": MessageLookupByLibrary.simpleMessage("未知"),
        "update": MessageLookupByLibrary.simpleMessage("更新"),
        "upload": MessageLookupByLibrary.simpleMessage("上传"),
        "url": MessageLookupByLibrary.simpleMessage("URL"),
        "urlDesc": MessageLookupByLibrary.simpleMessage("直接上传配置文件"),
-        "view": MessageLookupByLibrary.simpleMessage("查看"),
        "webDAVConfiguration": MessageLookupByLibrary.simpleMessage("WebDAV配置"),
        "whitelistMode": MessageLookupByLibrary.simpleMessage("白名单模式"),
        "years": MessageLookupByLibrary.simpleMessage("年"),
--- a/lib/l10n/l10n.dart
+++ b/lib/l10n/l10n.dart
@@ -430,10 +430,10 @@ class AppLocalizations {
    );
  }

-  /// `TUN mode`
+  /// `Tun mode`
  String get tun {
    return Intl.message(
-      'TUN mode',
+      'Tun mode',
      name: 'tun',
      desc: '',
      args: [],
@@ -1170,16 +1170,6 @@ class AppLocalizations {
    );
  }

-  /// `Set the Clash listening port`
-  String get proxyPortDesc {
-    return Intl.message(
-      'Set the Clash listening port',
-      name: 'proxyPortDesc',
-      desc: '',
-      args: [],
-    );
-  }
-
  /// `Port`
  String get port {
    return Intl.message(
@@ -1670,351 +1660,11 @@ class AppLocalizations {
    );
  }

-  /// `Search`
-  String get search {
+  /// `Ip check timeout`
+  String get ipCheckTimeout {
    return Intl.message(
-      'Search',
-      name: 'search',
-      desc: '',
-      args: [],
-    );
-  }
-
-  /// `Allow applications to bypass VPN`
-  String get allowBypass {
-    return Intl.message(
-      'Allow applications to bypass VPN',
-      name: 'allowBypass',
-      desc: '',
-      args: [],
-    );
-  }
-
-  /// `Some apps can bypass VPN when turned on`
-  String get allowBypassDesc {
-    return Intl.message(
-      'Some apps can bypass VPN when turned on',
-      name: 'allowBypassDesc',
-      desc: '',
-      args: [],
-    );
-  }
-
-  /// `ExternalController`
-  String get externalController {
-    return Intl.message(
-      'ExternalController',
-      name: 'externalController',
-      desc: '',
-      args: [],
-    );
-  }
-
-  /// `Once enabled, the Clash kernel can be controlled on port 9090`
-  String get externalControllerDesc {
-    return Intl.message(
-      'Once enabled, the Clash kernel can be controlled on port 9090',
-      name: 'externalControllerDesc',
-      desc: '',
-      args: [],
-    );
-  }
-
-  /// `When turned on it will be able to receive IPv6 traffic`
-  String get ipv6Desc {
-    return Intl.message(
-      'When turned on it will be able to receive IPv6 traffic',
-      name: 'ipv6Desc',
-      desc: '',
-      args: [],
-    );
-  }
-
-  /// `App`
-  String get app {
-    return Intl.message(
-      'App',
-      name: 'app',
-      desc: '',
-      args: [],
-    );
-  }
-
-  /// `General`
-  String get general {
-    return Intl.message(
-      'General',
-      name: 'general',
-      desc: '',
-      args: [],
-    );
-  }
-
-  /// `Attach HTTP proxy to VpnService`
-  String get systemProxyDesc {
-    return Intl.message(
-      'Attach HTTP proxy to VpnService',
-      name: 'systemProxyDesc',
-      desc: '',
-      args: [],
-    );
-  }
-
-  /// `Unified delay`
-  String get unifiedDelay {
-    return Intl.message(
-      'Unified delay',
-      name: 'unifiedDelay',
-      desc: '',
-      args: [],
-    );
-  }
-
-  /// `Remove extra delays such as handshaking`
-  String get unifiedDelayDesc {
-    return Intl.message(
-      'Remove extra delays such as handshaking',
-      name: 'unifiedDelayDesc',
-      desc: '',
-      args: [],
-    );
-  }
-
-  /// `TCP concurrent`
-  String get tcpConcurrent {
-    return Intl.message(
-      'TCP concurrent',
-      name: 'tcpConcurrent',
-      desc: '',
-      args: [],
-    );
-  }
-
-  /// `Enabling it will allow TCP concurrency`
-  String get tcpConcurrentDesc {
-    return Intl.message(
-      'Enabling it will allow TCP concurrency',
-      name: 'tcpConcurrentDesc',
-      desc: '',
-      args: [],
-    );
-  }
-
-  /// `Geo Low Memory Mode`
-  String get geodataLoader {
-    return Intl.message(
-      'Geo Low Memory Mode',
-      name: 'geodataLoader',
-      desc: '',
-      args: [],
-    );
-  }
-
-  /// `Enabling will use the Geo low memory loader`
-  String get geodataLoaderDesc {
-    return Intl.message(
-      'Enabling will use the Geo low memory loader',
-      name: 'geodataLoaderDesc',
-      desc: '',
-      args: [],
-    );
-  }
-
-  /// `Requests`
-  String get requests {
-    return Intl.message(
-      'Requests',
-      name: 'requests',
-      desc: '',
-      args: [],
-    );
-  }
-
-  /// `View recently requested data`
-  String get requestsDesc {
-    return Intl.message(
-      'View recently requested data',
-      name: 'requestsDesc',
-      desc: '',
-      args: [],
-    );
-  }
-
-  /// `Find process`
-  String get findProcessMode {
-    return Intl.message(
-      'Find process',
-      name: 'findProcessMode',
-      desc: '',
-      args: [],
-    );
-  }
-
-  /// `There is a risk of flashback after opening`
-  String get findProcessModeDesc {
-    return Intl.message(
-      'There is a risk of flashback after opening',
-      name: 'findProcessModeDesc',
-      desc: '',
-      args: [],
-    );
-  }
-
-  /// `Init`
-  String get init {
-    return Intl.message(
-      'Init',
-      name: 'init',
-      desc: '',
-      args: [],
-    );
-  }
-
-  /// `Long term effective`
-  String get infiniteTime {
-    return Intl.message(
-      'Long term effective',
-      name: 'infiniteTime',
-      desc: '',
-      args: [],
-    );
-  }
-
-  /// `Expiration time`
-  String get expirationTime {
-    return Intl.message(
-      'Expiration time',
-      name: 'expirationTime',
-      desc: '',
-      args: [],
-    );
-  }
-
-  /// `Connections`
-  String get connections {
-    return Intl.message(
-      'Connections',
-      name: 'connections',
-      desc: '',
-      args: [],
-    );
-  }
-
-  /// `View current connection`
-  String get connectionsDesc {
-    return Intl.message(
-      'View current connection',
-      name: 'connectionsDesc',
-      desc: '',
-      args: [],
-    );
-  }
-
-  /// `No requests`
-  String get nullRequestsDesc {
-    return Intl.message(
-      'No requests',
-      name: 'nullRequestsDesc',
-      desc: '',
-      args: [],
-    );
-  }
-
-  /// `No connections`
-  String get nullConnectionsDesc {
-    return Intl.message(
-      'No connections',
-      name: 'nullConnectionsDesc',
-      desc: '',
-      args: [],
-    );
-  }
-
-  /// `Intranet IP`
-  String get intranetIP {
-    return Intl.message(
-      'Intranet IP',
-      name: 'intranetIP',
-      desc: '',
-      args: [],
-    );
-  }
-
-  /// `View`
-  String get view {
-    return Intl.message(
-      'View',
-      name: 'view',
-      desc: '',
-      args: [],
-    );
-  }
-
-  /// `Cut`
-  String get cut {
-    return Intl.message(
-      'Cut',
-      name: 'cut',
-      desc: '',
-      args: [],
-    );
-  }
-
-  /// `Copy`
-  String get copy {
-    return Intl.message(
-      'Copy',
-      name: 'copy',
-      desc: '',
-      args: [],
-    );
-  }
-
-  /// `Paste`
-  String get paste {
-    return Intl.message(
-      'Paste',
-      name: 'paste',
-      desc: '',
-      args: [],
-    );
-  }
-
-  /// `Test url`
-  String get testUrl {
-    return Intl.message(
-      'Test url',
-      name: 'testUrl',
-      desc: '',
-      args: [],
-    );
-  }
-
-  /// `Sync`
-  String get sync {
-    return Intl.message(
-      'Sync',
-      name: 'sync',
-      desc: '',
-      args: [],
-    );
-  }
-
-  /// `Hidden from recent tasks`
-  String get exclude {
-    return Intl.message(
-      'Hidden from recent tasks',
-      name: 'exclude',
-      desc: '',
-      args: [],
-    );
-  }
-
-  /// `When the app is in the background, the app is hidden from the recent task`
-  String get excludeDesc {
-    return Intl.message(
-      'When the app is in the background, the app is hidden from the recent task',
-      name: 'excludeDesc',
+      'Ip check timeout',
+      name: 'ipCheckTimeout',
      desc: '',
      args: [],
    );
--- a/lib/main.dart
+++ b/lib/main.dart
@@ -3,11 +3,9 @@ import 'dart:io';

 import 'package:fl_clash/clash/clash.dart';
 import 'package:fl_clash/plugins/app.dart';
-import 'package:fl_clash/plugins/proxy.dart';
 import 'package:fl_clash/plugins/tile.dart';
 import 'package:fl_clash/state.dart';
 import 'package:flutter/material.dart';
-import 'package:package_info_plus/package_info_plus.dart';
 import 'application.dart';
 import 'l10n/l10n.dart';
 import 'models/models.dart';
@@ -17,8 +15,6 @@ Future<void> main() async {
  WidgetsFlutterBinding.ensureInitialized();
  await android?.init();
  await window?.init();
-  clashCore.initMessage();
-  globalState.packageInfo = await PackageInfo.fromPlatform();
  final config = await preferences.getConfig() ?? Config();
  final clashConfig = await preferences.getClashConfig() ?? ClashConfig();
  final appState = AppState(
@@ -26,15 +22,16 @@ Future<void> main() async {
    isCompatible: config.isCompatible,
    selectedMap: config.currentSelectedMap,
  );
-  appState.navigationItems = navigation.getItems(
-    openLogs: config.openLogs,
-    hasProxies: false,
-  );
  await globalState.init(
    appState: appState,
    config: config,
    clashConfig: clashConfig,
  );
+  globalState.updateNavigationItems(
+    appState: appState,
+    config: config,
+    clashConfig: clashConfig,
+  );
  runAppWithPreferences(
    const Application(),
    appState: appState,
@@ -46,7 +43,6 @@ Future<void> main() async {
@pragma('vm:entry-point')
 Future<void> vpnService() async {
  WidgetsFlutterBinding.ensureInitialized();
-  globalState.isVpnService = true;
  final config = await preferences.getConfig() ?? Config();
  final clashConfig = await preferences.getClashConfig() ?? ClashConfig();
  final appState = AppState(
@@ -54,112 +50,61 @@ Future<void> vpnService() async {
    isCompatible: config.isCompatible,
    selectedMap: config.currentSelectedMap,
  );
+  clashMessage.addListener(ClashMessageListenerWithVpn(onTun: (String fd) {
+    proxyManager.setProtect(
+      int.parse(fd),
+    );
+  }));
  await globalState.init(
    appState: appState,
    config: config,
    clashConfig: clashConfig,
  );

-  proxy?.setServiceMessageHandler(
-    ServiceMessageHandler(
-      onProtect: (Fd fd) async {
-        await proxy?.setProtect(fd.value);
-        clashCore.setFdMap(fd.id);
-      },
-      onProcess: (Process process) async {
-        print(process);
-        var packageName = await app?.resolverProcess(process);
-        clashCore.setProcessMap(
-          ProcessMapItem(
-            id: process.id,
-            value: packageName ?? "",
-          ),
-        );
-      },
-      onStarted: (String runTime) {
-        globalState.applyProfile(
-          appState: appState,
-          config: config,
-          clashConfig: clashConfig,
-        );
-      },
-      onLoaded: (String groupName) {
-        final currentSelectedMap = config.currentSelectedMap;
-        final proxyName = currentSelectedMap[groupName];
-        if (proxyName == null) return;
-        clashCore.changeProxy(
-          ChangeProxyParams(
-            groupName: groupName,
-            proxyName: proxyName,
-          ),
-        );
-      },
-    ),
-  );
  final appLocalizations = await AppLocalizations.load(
    other.getLocaleForString(config.locale) ??
        WidgetsBinding.instance.platformDispatcher.locale,
  );
-  await app?.tip(appLocalizations.startVpn);
-  await globalState.startSystemProxy(
-    appState: appState,
-    config: config,
-    clashConfig: clashConfig,
-  );

-  tile?.addListener(
-    TileListenerWithVpn(
-      onStop: () async {
-        await app?.tip(appLocalizations.stopVpn);
-        await globalState.stopSystemProxy();
-        exit(0);
-      },
-    ),
-  );
+  handleStart() async {
+    await app?.tip(appLocalizations.startVpn);
+    await globalState.startSystemProxy(
+      config: config,
+      clashConfig: clashConfig,
+    );
+    globalState.updateTraffic(config: config);
+    globalState.updateFunctionLists = [
+      () {
+        globalState.updateTraffic(config: config);
+      }
+    ];
+  }

-  globalState.updateTraffic();
-  globalState.updateFunctionLists = [
-    () {
-      globalState.updateTraffic();
-    }
-  ];
+  if (appState.isInit) {
+    handleStart();
+    tile?.addListener(
+      TileListenerWithVpn(
+        onStop: () async {
+          await app?.tip(appLocalizations.stopVpn);
+          await globalState.stopSystemProxy();
+          clashCore.shutdown();
+          exit(0);
+        },
+      ),
+    );
+  }
 }

-@immutable
-class ServiceMessageHandler with ServiceMessageListener {
-  final Function(Fd fd) _onProtect;
-  final Function(Process process) _onProcess;
-  final Function(String runTime) _onStarted;
-  final Function(String groupName) _onLoaded;
+class ClashMessageListenerWithVpn with ClashMessageListener {
+  final Function(String fd) _onTun;

-  const ServiceMessageHandler({
-    required Function(Fd fd) onProtect,
-    required Function(Process process) onProcess,
-    required Function(String runTime) onStarted,
-    required Function(String groupName) onLoaded,
-  })  : _onProtect = onProtect,
-        _onProcess = onProcess,
-        _onStarted = onStarted,
-        _onLoaded = onLoaded;
+  ClashMessageListenerWithVpn({
+    required Function(String fd) onTun,
+  }) : _onTun = onTun;

  @override
-  onProtect(Fd fd) {
-    _onProtect(fd);
-  }
-
-  @override
-  onProcess(Process process) {
-    _onProcess(process);
-  }
-
-  @override
-  onStarted(String runTime) {
-    _onStarted(runTime);
-  }
-
-  @override
-  onLoaded(String groupName) {
-    _onLoaded(groupName);
+  void onTun(String fd) {
+    _onTun(fd);
  }
 }

--- a/lib/models/app.dart
+++ b/lib/models/app.dart
@@ -1,10 +1,7 @@
-import 'dart:io';
-
 import 'package:collection/collection.dart';
 import 'package:fl_clash/common/common.dart';
 import 'package:fl_clash/enum/enum.dart';
 import 'package:flutter/material.dart';
-import 'connection.dart';
 import 'ffi.dart';
 import 'log.dart';
 import 'navigation.dart';
@@ -22,7 +19,6 @@ class AppState with ChangeNotifier {
  bool _isInit;
  VersionInfo? _versionInfo;
  List<Traffic> _traffics;
-  Traffic _totalTraffic;
  List<Log> _logs;
  String _currentLabel;
  SystemColorSchemes _systemColorSchemes;
@@ -33,8 +29,6 @@ class AppState with ChangeNotifier {
  bool _isCompatible;
  List<Group> _groups;
  double _viewWidth;
-  List<Connection> _requests;
-  num _checkIpNum;

  AppState({
    required Mode mode,
@@ -48,10 +42,7 @@ class AppState with ChangeNotifier {
        _viewWidth = 0,
        _selectedMap = selectedMap,
        _sortNum = 0,
-        _checkIpNum = 0,
-        _requests = [],
        _mode = mode,
-        _totalTraffic = Traffic(),
        _delayMap = {},
        _groups = [],
        _isCompatible = isCompatible,
@@ -116,7 +107,7 @@ class AppState with ChangeNotifier {
    } else {
      final index = groups.indexWhere((element) => element.name == proxyName);
      if (index == -1) return type;
-      return "$type(${groups[index].now ?? '*'})";
+      return "$type(${groups[index].now})";
    }
  }

@@ -125,10 +116,9 @@ class AppState with ChangeNotifier {
    final index = groups.indexWhere((element) => element.name == proxyName);
    if (index == -1) return proxyName;
    final group = groups[index];
-    return getRealProxyName((selectedMap.containsKey(proxyName)
-            ? selectedMap[proxyName]
-            : group.now)) ??
-        proxyName;
+    return getRealProxyName(selectedMap.containsKey(proxyName)
+        ? selectedMap[proxyName]
+        : group.now);
  }

  String? get showProxyName {
@@ -162,39 +152,8 @@ class AppState with ChangeNotifier {
    }
  }

-  addTraffic(Traffic traffic) {
-    _traffics = List.from(_traffics)..add(traffic);
-    const maxLength = 60;
-    if (_traffics.length > maxLength) {
-      _traffics = _traffics.sublist(_traffics.length - maxLength);
-    }
-    notifyListeners();
-  }
-
-  Traffic get totalTraffic => _totalTraffic;
-
-  set totalTraffic(Traffic value) {
-    if (_totalTraffic != value) {
-      _totalTraffic = value;
-      notifyListeners();
-    }
-  }
-
-  List<Connection> get requests => _requests;
-
-  set requests(List<Connection> value) {
-    if (_requests != value) {
-      _requests = value;
-      notifyListeners();
-    }
-  }
-
-  addRequest(Connection value) {
-    _requests = List.from(_requests)..add(value);
-    final maxLength = Platform.isAndroid ? 1000 : 60;
-    if (_requests.length > maxLength) {
-      _requests = _requests.sublist(_requests.length - maxLength);
-    }
+  addTraffic(Traffic value) {
+    _traffics = List.from(_traffics)..add(value);
    notifyListeners();
  }

@@ -208,10 +167,9 @@ class AppState with ChangeNotifier {
  }

  addLog(Log log) {
-    _logs = List.from(_logs)..add(log);
-    final maxLength = Platform.isAndroid ? 1000 : 60;
-    if (_logs.length > maxLength) {
-      _logs = _logs.sublist(_logs.length - maxLength);
+    _logs.add(log);
+    if (_logs.length > 60) {
+      _logs = _logs.sublist(_logs.length - 60);
    }
    notifyListeners();
  }
@@ -243,15 +201,6 @@ class AppState with ChangeNotifier {
    }
  }

-  num get checkIpNum => _checkIpNum;
-
-  set checkIpNum(num value) {
-    if (_checkIpNum != value) {
-      _checkIpNum = value;
-      notifyListeners();
-    }
-  }
-
  Mode get mode => _mode;

  set mode(Mode value) {
--- a/lib/models/clash_config.dart
+++ b/lib/models/clash_config.dart
@@ -1,10 +1,7 @@
 // ignore_for_file: invalid_annotation_target

-import 'dart:io';
-
-import 'package:collection/collection.dart';
 import 'package:fl_clash/common/common.dart';
-import 'package:fl_clash/state.dart';
+import 'package:fl_clash/common/constant.dart';
 import 'package:flutter/material.dart';
 import 'package:freezed_annotation/freezed_annotation.dart';

@@ -19,7 +16,7 @@ class Tun with _$Tun {
  const factory Tun({
    @Default(false) bool enable,
    @Default(appName) String device,
-    @Default(TunStack.gvisor) TunStack stack,
+    @Default(TunStack.mixed) TunStack stack,
    @JsonKey(name: "dns-hijack") @Default(["any:53"]) List<String> dnsHijack,
  }) = _Tun;

@@ -107,43 +104,33 @@ class Dns {
  }
 }

-typedef GeoXMap = Map<String, String>;
-
@JsonSerializable()
 class ClashConfig extends ChangeNotifier {
  int _mixedPort;
  bool _allowLan;
-  bool _ipv6;
-  String _geodataLoader;
-  LogLevel _logLevel;
-  String _externalController;
  Mode _mode;
-  FindProcessMode _findProcessMode;
-  bool _unifiedDelay;
-  bool _tcpConcurrent;
+  LogLevel _logLevel;
  Tun _tun;
  Dns _dns;
-  GeoXMap _geoXUrl;
  List<String> _rules;
-  String? _globalRealUa;

-  ClashConfig()
-      : _mixedPort = 7890,
-        _mode = Mode.rule,
-        _ipv6 = false,
-        _findProcessMode = FindProcessMode.off,
-        _allowLan = false,
-        _tcpConcurrent = false,
-        _logLevel = LogLevel.info,
-        _tun = const Tun(),
-        _unifiedDelay = false,
-        _geodataLoader = geodataLoaderMemconservative,
-        _externalController = '',
-        _dns = Dns(),
-        _geoXUrl = defaultGeoXMap,
-        _rules = [];
+  ClashConfig({
+    int? mixedPort,
+    Mode? mode,
+    bool? allowLan,
+    LogLevel? logLevel,
+    Tun? tun,
+    Dns? dns,
+    List<String>? rules,
+  })  : _mixedPort = mixedPort ?? 7890,
+        _mode = mode ?? Mode.rule,
+        _allowLan = allowLan ?? false,
+        _logLevel = logLevel ?? LogLevel.info,
+        _tun = tun ?? const Tun(),
+        _dns = dns ?? Dns(),
+        _rules = rules ?? [];

-  @JsonKey(name: "mixed-port", defaultValue: 7890)
+  @JsonKey(name: "mixed-port")
  int get mixedPort => _mixedPort;

  set mixedPort(int value) {
@@ -153,7 +140,6 @@ class ClashConfig extends ChangeNotifier {
    }
  }

-  @JsonKey(defaultValue: Mode.rule)
  Mode get mode => _mode;

  set mode(Mode value) {
@@ -163,16 +149,6 @@ class ClashConfig extends ChangeNotifier {
    }
  }

-  @JsonKey(name: "find-process-mode", defaultValue: FindProcessMode.off)
-  FindProcessMode get findProcessMode => _findProcessMode;
-
-  set findProcessMode(FindProcessMode value) {
-    if (_findProcessMode != value) {
-      _findProcessMode = value;
-      notifyListeners();
-    }
-  }
-
  @JsonKey(name: "allow-lan")
  bool get allowLan => _allowLan;

@@ -183,7 +159,7 @@ class ClashConfig extends ChangeNotifier {
    }
  }

-  @JsonKey(name: "log-level", defaultValue: LogLevel.info)
+  @JsonKey(name: "log-level")
  LogLevel get logLevel => _logLevel;

  set logLevel(LogLevel value) {
@@ -193,62 +169,7 @@ class ClashConfig extends ChangeNotifier {
    }
  }

-  @JsonKey(name: "external-controller", defaultValue: '')
-  String get externalController => _externalController;
-
-  set externalController(String value) {
-    if (_externalController != value) {
-      _externalController = value;
-      notifyListeners();
-    }
-  }
-
-  @JsonKey(defaultValue: false)
-  bool get ipv6 => _ipv6;
-
-  set ipv6(bool value) {
-    if (_ipv6 != value) {
-      _ipv6 = value;
-      notifyListeners();
-    }
-  }
-
-  @JsonKey(name: "geodata-loader", defaultValue: geodataLoaderMemconservative)
-  String get geodataLoader => _geodataLoader;
-
-  set geodataLoader(String value) {
-    if (_geodataLoader != value) {
-      _geodataLoader = value;
-      notifyListeners();
-    }
-  }
-
-  @JsonKey(name: "unified-delay", defaultValue: false)
-  bool get unifiedDelay => _unifiedDelay;
-
-  set unifiedDelay(bool value) {
-    if (_unifiedDelay != value) {
-      _unifiedDelay = value;
-      notifyListeners();
-    }
-  }
-
-  @JsonKey(name: "tcp-concurrent", defaultValue: false)
-  bool get tcpConcurrent => _tcpConcurrent;
-
-  set tcpConcurrent(bool value) {
-    if (_tcpConcurrent != value) {
-      _tcpConcurrent = value;
-      notifyListeners();
-    }
-  }
-
-  Tun get tun {
-    if (Platform.isAndroid) {
-      return _tun.copyWith(enable: false);
-    }
-    return _tun;
-  }
+  Tun get tun => _tun;

  set tun(Tun value) {
    if (_tun != value) {
@@ -275,35 +196,6 @@ class ClashConfig extends ChangeNotifier {
    }
  }

-  @JsonKey(name: "global-ua", defaultValue: null)
-  String get globalUa {
-    if (_globalRealUa == null) {
-      return globalState.packageInfo.ua;
-    } else {
-      return _globalRealUa!;
-    }
-  }
-
-  @JsonKey(name: "global-real-ua", defaultValue: null)
-  String? get globalRealUa => _globalRealUa;
-
-  set globalRealUa(String? value) {
-    if (_globalRealUa != value) {
-      _globalRealUa = value;
-      notifyListeners();
-    }
-  }
-
-  @JsonKey(name: "geox-url", defaultValue: defaultGeoXMap)
-  GeoXMap get geoXUrl => _geoXUrl;
-
-  set geoXUrl(GeoXMap value) {
-    if (!const MapEquality<String, String>().equals(value, _geoXUrl)) {
-      _geoXUrl = value;
-      notifyListeners();
-    }
-  }
-
  update([ClashConfig? clashConfig]) {
    if (clashConfig != null) {
      _mixedPort = clashConfig._mixedPort;
@@ -313,7 +205,6 @@ class ClashConfig extends ChangeNotifier {
      _tun = clashConfig._tun;
      _dns = clashConfig._dns;
      _rules = clashConfig._rules;
-      _globalRealUa = clashConfig.globalRealUa;
    }
    notifyListeners();
  }
@@ -325,4 +216,20 @@ class ClashConfig extends ChangeNotifier {
  factory ClashConfig.fromJson(Map<String, dynamic> json) {
    return _$ClashConfigFromJson(json);
  }
+
+  ClashConfig copyWith({Tun? tun}) {
+    return ClashConfig(
+      mixedPort: mixedPort,
+      mode: mode,
+      logLevel: logLevel,
+      tun: tun ?? this.tun,
+      dns: dns,
+      allowLan: allowLan,
+    );
+  }
+
+  @override
+  String toString() {
+    return 'ClashConfig{_mixedPort: $_mixedPort, _allowLan: $_allowLan, _mode: $_mode, _logLevel: $_logLevel, _tun: $_tun, _dns: $_dns, _rules: $_rules}';
+  }
 }
--- a/lib/models/config.dart
+++ b/lib/models/config.dart
@@ -1,6 +1,5 @@
 import 'dart:io';

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

@@ -9,7 +8,6 @@ import '../common/common.dart';
 import 'models.dart';

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

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

-@freezed
-class Props with _$Props {
-  const factory Props({
-    AccessControl? accessControl,
-    bool? allowBypass,
-    bool? systemProxy,
-  }) = _Props;
-
-  factory Props.fromJson(Map<String, Object?> json) => _$PropsFromJson(json);
-}
-
@JsonSerializable()
 class Config extends ChangeNotifier {
  List<Profile> _profiles;
@@ -54,14 +41,7 @@ class Config extends ChangeNotifier {
  AccessControl _accessControl;
  bool _isAnimateToPage;
  bool _autoCheckUpdate;
-  bool _allowBypass;
-  bool _systemProxy;
-  bool _isExclude;
  DAV? _dav;
-  ProxiesType _proxiesType;
-  ProxyCardType _proxyCardType;
-  int _proxiesColumns;
-  String _testUrl;

  Config()
      : _profiles = [],
@@ -76,15 +56,8 @@ class Config extends ChangeNotifier {
        _isMinimizeOnExit = true,
        _isAccessControl = false,
        _autoCheckUpdate = true,
-        _systemProxy = true,
-        _testUrl = defaultTestUrl,
        _accessControl = const AccessControl(),
-        _isAnimateToPage = true,
-        _allowBypass = true,
-        _isExclude = false,
-        _proxyCardType = ProxyCardType.expand,
-        _proxiesType = ProxiesType.tab,
-        _proxiesColumns = 2;
+        _isAnimateToPage = true;

  deleteProfileById(String id) {
    _profiles = profiles.where((element) => element.id != id).toList();
@@ -154,35 +127,10 @@ class Config extends ChangeNotifier {
  }

  Profile? get currentProfile {
-    final index =
-        profiles.indexWhere((profile) => profile.id == _currentProfileId);
-    return index == -1 ? null : profiles[index];
-  }
-
-  String? get currentGroupName => currentProfile?.currentGroupName;
-
-  Set<String> get currentUnfoldSet => currentProfile?.unfoldSet ?? {};
-
-  updateCurrentUnfoldSet(Set<String> value) {
-    if (!const SetEquality<String>().equals(currentUnfoldSet, value)) {
-      _setProfile(
-        currentProfile!.copyWith(
-          unfoldSet: value,
-        ),
-      );
-      notifyListeners();
-    }
-  }
-
-  updateCurrentGroupName(String groupName) {
-    if (currentProfile != null &&
-        currentProfile!.currentGroupName != groupName) {
-      _setProfile(
-        currentProfile!.copyWith(
-          currentGroupName: groupName,
-        ),
-      );
-      notifyListeners();
+    try {
+      return profiles.firstWhere((element) => element.id == _currentProfileId);
+    } catch (_) {
+      return null;
    }
  }

@@ -191,16 +139,9 @@ class Config extends ChangeNotifier {
  }

  updateCurrentSelectedMap(String groupName, String proxyName) {
-    if (currentProfile != null &&
-        currentProfile!.selectedMap[groupName] != proxyName) {
-      final SelectedMap selectedMap = Map.from(
-        currentProfile?.selectedMap ?? {},
-      )..[groupName] = proxyName;
-      _setProfile(
-        currentProfile!.copyWith(
-          selectedMap: selectedMap,
-        ),
-      );
+    if (currentProfile?.selectedMap[groupName] != proxyName) {
+      currentProfile?.selectedMap = Map.from(currentProfile?.selectedMap ?? {})
+        ..[groupName] = proxyName;
      notifyListeners();
    }
  }
@@ -364,84 +305,8 @@ class Config extends ChangeNotifier {
    }
  }

-  @JsonKey(defaultValue: true)
-  bool get allowBypass {
-    return _allowBypass;
-  }
-
-  set allowBypass(bool value) {
-    if (_allowBypass != value) {
-      _allowBypass = value;
-      notifyListeners();
-    }
-  }
-
-  @JsonKey(defaultValue: true)
-  bool get systemProxy {
-    return _systemProxy;
-  }
-
-  set systemProxy(bool value) {
-    if (_systemProxy != value) {
-      _systemProxy = value;
-      notifyListeners();
-    }
-  }
-
-  @JsonKey(defaultValue: ProxiesType.tab)
-  ProxiesType get proxiesType => _proxiesType;
-
-  set proxiesType(ProxiesType value) {
-    if (_proxiesType != value) {
-      _proxiesType = value;
-      notifyListeners();
-    }
-  }
-
-  @JsonKey(defaultValue: ProxyCardType.expand)
-  ProxyCardType get proxyCardType => _proxyCardType;
-
-  set proxyCardType(ProxyCardType value) {
-    if (_proxyCardType != value) {
-      _proxyCardType = value;
-      notifyListeners();
-    }
-  }
-
-  @JsonKey(defaultValue: 2)
-  int get proxiesColumns => _proxiesColumns;
-
-  set proxiesColumns(int value) {
-    if (_proxiesColumns != value) {
-      _proxiesColumns = value;
-      notifyListeners();
-    }
-  }
-
-  @JsonKey(name: "test-url", defaultValue: defaultTestUrl)
-  String get testUrl => _testUrl;
-
-  set testUrl(String value) {
-    if (_testUrl != value) {
-      _testUrl = value;
-      notifyListeners();
-    }
-  }
-
-  @JsonKey(defaultValue: false)
-  bool get isExclude => _isExclude;
-
-  set isExclude(bool value) {
-    if (_isExclude != value) {
-      _isExclude = value;
-      notifyListeners();
-    }
-  }
-
-  update([
-    Config? config,
-    RecoveryOption recoveryOptions = RecoveryOption.all,
-  ]) {
+  update(
+      [Config? config, RecoveryOption recoveryOptions = RecoveryOption.all]) {
    if (config != null) {
      _profiles = config._profiles;
      for (final profile in config._profiles) {
@@ -457,11 +322,9 @@ class Config extends ChangeNotifier {
      _autoLaunch = config._autoLaunch;
      _silentLaunch = config._silentLaunch;
      _autoRun = config._autoRun;
-      _proxiesType = config._proxiesType;
      _openLog = config._openLog;
      _themeMode = config._themeMode;
      _locale = config._locale;
-      _allowBypass = config._allowBypass;
      _primaryColor = config._primaryColor;
      _proxiesSortType = config._proxiesSortType;
      _isMinimizeOnExit = config._isMinimizeOnExit;
@@ -470,7 +333,6 @@ class Config extends ChangeNotifier {
      _isAnimateToPage = config._isAnimateToPage;
      _autoCheckUpdate = config._autoCheckUpdate;
      _dav = config._dav;
-      _testUrl = config.testUrl;
    }
    notifyListeners();
  }
--- a/lib/models/connection.dart
+++ b/lib/models/connection.dart
@@ -14,7 +14,6 @@ class Metadata with _$Metadata {
    required String destinationIP,
    required String destinationPort,
    required String host,
-    required String process,
    required String remoteDestination,
  }) = _Metadata;

@@ -23,7 +22,7 @@ class Metadata with _$Metadata {
 }

@freezed
-class Connection with _$Connection {
+class Connection with _$Connection{
  const factory Connection({
    required String id,
    num? upload,
@@ -36,19 +35,3 @@ class Connection with _$Connection {
  factory Connection.fromJson(Map<String, Object?> json) =>
      _$ConnectionFromJson(json);
 }
-
-@freezed
-class ConnectionsAndKeywords with _$ConnectionsAndKeywords {
-  const factory ConnectionsAndKeywords({
-    @Default([]) List<Connection> connections,
-    @Default([]) List<String> keywords,
-  }) = _ConnectionsAndKeywords;
-
-  factory ConnectionsAndKeywords.fromJson(Map<String, Object?> json) =>
-      _$ConnectionsAndKeywordsFromJson(json);
-}
-
-
-extension ConnectionsAndKeywordsExt on ConnectionsAndKeywords{
-  List<Connection> get filteredConnections => connections.where((connection)=> Set.from(connection.chains).containsAll(keywords)).toList();
-}
--- a/lib/models/ffi.dart
+++ b/lib/models/ffi.dart
@@ -2,33 +2,19 @@

 import 'package:fl_clash/enum/enum.dart';
 import 'package:fl_clash/models/clash_config.dart';
-import 'package:fl_clash/models/connection.dart';
-import 'package:fl_clash/models/models.dart';
 import 'package:freezed_annotation/freezed_annotation.dart';

 part 'generated/ffi.g.dart';

 part 'generated/ffi.freezed.dart';

-@freezed
-class ConfigExtendedParams with _$ConfigExtendedParams {
-  const factory ConfigExtendedParams({
-    @JsonKey(name: "is-patch") required bool isPatch,
-    @JsonKey(name: "is-compatible") required bool isCompatible,
-    @JsonKey(name: "selected-map") required SelectedMap selectedMap,
-    @JsonKey(name: "test-url") required String testUrl,
-  }) = _ConfigExtendedParams;
-
-  factory ConfigExtendedParams.fromJson(Map<String, Object?> json) =>
-      _$ConfigExtendedParamsFromJson(json);
-}
-
@freezed
 class UpdateConfigParams with _$UpdateConfigParams {
  const factory UpdateConfigParams({
    @JsonKey(name: "profile-path") String? profilePath,
    required ClashConfig config,
-    required ConfigExtendedParams params,
+    @JsonKey(name: "is-patch") required bool isPatch,
+    @JsonKey(name: "is-compatible") required bool isCompatible,
  }) = _UpdateConfigParams;

  factory UpdateConfigParams.fromJson(Map<String, Object?> json) =>
@@ -47,25 +33,14 @@ class ChangeProxyParams with _$ChangeProxyParams {
 }

@freezed
-class AppMessage with _$AppMessage {
-  const factory AppMessage({
-    required AppMessageType type,
+class Message with _$Message {
+  const factory Message({
+    required MessageType type,
    dynamic data,
-  }) = _AppMessage;
+  }) = _Message;

-  factory AppMessage.fromJson(Map<String, Object?> json) =>
-      _$AppMessageFromJson(json);
-}
-
-@freezed
-class ServiceMessage with _$ServiceMessage {
-  const factory ServiceMessage({
-    required ServiceMessageType type,
-    dynamic data,
-  }) = _ServiceMessage;
-
-  factory ServiceMessage.fromJson(Map<String, Object?> json) =>
-      _$ServiceMessageFromJson(json);
+  factory Message.fromJson(Map<String, Object?> json) =>
+      _$MessageFromJson(json);
 }

@freezed
@@ -91,35 +66,16 @@ class Now with _$Now {
@freezed
 class Process with _$Process {
  const factory Process({
-    required int id,
-    required Metadata metadata,
+    required int uid,
+    required String network,
+    required String source,
+    required String target,
  }) = _Process;

  factory Process.fromJson(Map<String, Object?> json) =>
      _$ProcessFromJson(json);
 }

-@freezed
-class Fd with _$Fd {
-  const factory Fd({
-    required int id,
-    required int value,
-  }) = _Fd;
-
-  factory Fd.fromJson(Map<String, Object?> json) => _$FdFromJson(json);
-}
-
-@freezed
-class ProcessMapItem with _$ProcessMapItem {
-  const factory ProcessMapItem({
-    required int id,
-    required String value,
-  }) = _ProcessMapItem;
-
-  factory ProcessMapItem.fromJson(Map<String, Object?> json) =>
-      _$ProcessMapItemFromJson(json);
-}
-
@freezed
 class ExternalProvider with _$ExternalProvider {
  const factory ExternalProvider({
@@ -132,27 +88,3 @@ class ExternalProvider with _$ExternalProvider {
  factory ExternalProvider.fromJson(Map<String, Object?> json) =>
      _$ExternalProviderFromJson(json);
 }
-
-abstract mixin class AppMessageListener {
-  void onLog(Log log) {}
-
-  void onDelay(Delay delay) {}
-
-  void onRequest(Connection connection) {}
-
-  void onStarted(String runTime) {}
-
-  void onLoaded(String groupName) {}
-}
-
-abstract mixin class ServiceMessageListener {
-  onProtect(Fd fd) {}
-
-  onProcess(Process process) {}
-
-  onStarted(String runTime) {}
-
-  onLoaded(String groupName) {}
-}
-
-
--- a/lib/models/generated/clash_config.freezed.dart
+++ b/lib/models/generated/clash_config.freezed.dart
@@ -135,7 +135,7 @@ class _$TunImpl implements _Tun {
  const _$TunImpl(
      {this.enable = false,
      this.device = appName,
-      this.stack = TunStack.gvisor,
+      this.stack = TunStack.mixed,
      @JsonKey(name: "dns-hijack")
      final List<String> dnsHijack = const ["any:53"]})
      : _dnsHijack = dnsHijack;
--- a/lib/models/generated/clash_config.g.dart
+++ b/lib/models/generated/clash_config.g.dart
@@ -35,55 +35,30 @@ Map<String, dynamic> _$DnsToJson(Dns instance) => <String, dynamic>{
      'fake-ip-filter': instance.fakeIpFilter,
    };

-ClashConfig _$ClashConfigFromJson(Map<String, dynamic> json) => ClashConfig()
-  ..mixedPort = (json['mixed-port'] as num?)?.toInt() ?? 7890
-  ..mode = $enumDecodeNullable(_$ModeEnumMap, json['mode']) ?? Mode.rule
-  ..findProcessMode = $enumDecodeNullable(
-          _$FindProcessModeEnumMap, json['find-process-mode']) ??
-      FindProcessMode.off
-  ..allowLan = json['allow-lan'] as bool
-  ..logLevel =
-      $enumDecodeNullable(_$LogLevelEnumMap, json['log-level']) ?? LogLevel.info
-  ..externalController = json['external-controller'] as String? ?? ''
-  ..ipv6 = json['ipv6'] as bool? ?? false
-  ..geodataLoader = json['geodata-loader'] as String? ?? 'memconservative'
-  ..unifiedDelay = json['unified-delay'] as bool? ?? false
-  ..tcpConcurrent = json['tcp-concurrent'] as bool? ?? false
-  ..tun = Tun.fromJson(json['tun'] as Map<String, dynamic>)
-  ..dns = Dns.fromJson(json['dns'] as Map<String, dynamic>)
-  ..rules = (json['rules'] as List<dynamic>).map((e) => e as String).toList()
-  ..globalRealUa = json['global-real-ua'] as String?
-  ..geoXUrl = (json['geox-url'] as Map<String, dynamic>?)?.map(
-        (k, e) => MapEntry(k, e as String),
-      ) ??
-      {
-        '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'
-      };
+ClashConfig _$ClashConfigFromJson(Map<String, dynamic> json) => ClashConfig(
+      mixedPort: (json['mixed-port'] as num?)?.toInt(),
+      mode: $enumDecodeNullable(_$ModeEnumMap, json['mode']),
+      allowLan: json['allow-lan'] as bool?,
+      logLevel: $enumDecodeNullable(_$LogLevelEnumMap, json['log-level']),
+      tun: json['tun'] == null
+          ? null
+          : Tun.fromJson(json['tun'] as Map<String, dynamic>),
+      dns: json['dns'] == null
+          ? null
+          : Dns.fromJson(json['dns'] as Map<String, dynamic>),
+      rules:
+          (json['rules'] as List<dynamic>?)?.map((e) => e as String).toList(),
+    );

 Map<String, dynamic> _$ClashConfigToJson(ClashConfig instance) =>
    <String, dynamic>{
      'mixed-port': instance.mixedPort,
      'mode': _$ModeEnumMap[instance.mode]!,
-      'find-process-mode': _$FindProcessModeEnumMap[instance.findProcessMode]!,
      'allow-lan': instance.allowLan,
      'log-level': _$LogLevelEnumMap[instance.logLevel]!,
-      'external-controller': instance.externalController,
-      'ipv6': instance.ipv6,
-      'geodata-loader': instance.geodataLoader,
-      'unified-delay': instance.unifiedDelay,
-      'tcp-concurrent': instance.tcpConcurrent,
      'tun': instance.tun,
      'dns': instance.dns,
      'rules': instance.rules,
-      'global-real-ua': instance.globalRealUa,
-      'geox-url': instance.geoXUrl,
    };

 const _$ModeEnumMap = {
@@ -92,11 +67,6 @@ const _$ModeEnumMap = {
  Mode.direct: 'direct',
 };

-const _$FindProcessModeEnumMap = {
-  FindProcessMode.always: 'always',
-  FindProcessMode.off: 'off',
-};
-
 const _$LogLevelEnumMap = {
  LogLevel.debug: 'debug',
  LogLevel.info: 'info',
@@ -109,7 +79,7 @@ _$TunImpl _$$TunImplFromJson(Map<String, dynamic> json) => _$TunImpl(
      enable: json['enable'] as bool? ?? false,
      device: json['device'] as String? ?? appName,
      stack: $enumDecodeNullable(_$TunStackEnumMap, json['stack']) ??
-          TunStack.gvisor,
+          TunStack.mixed,
      dnsHijack: (json['dns-hijack'] as List<dynamic>?)
              ?.map((e) => e as String)
              .toList() ??
--- a/lib/models/generated/config.freezed.dart
+++ b/lib/models/generated/config.freezed.dart
@@ -239,193 +239,3 @@ abstract class _AccessControl implements AccessControl {
  _$$AccessControlImplCopyWith<_$AccessControlImpl> get copyWith =>
      throw _privateConstructorUsedError;
 }
-
-Props _$PropsFromJson(Map<String, dynamic> json) {
-  return _Props.fromJson(json);
-}
-
-/// @nodoc
-mixin _$Props {
-  AccessControl? get accessControl => throw _privateConstructorUsedError;
-  bool? get allowBypass => throw _privateConstructorUsedError;
-  bool? get systemProxy => throw _privateConstructorUsedError;
-
-  Map<String, dynamic> toJson() => throw _privateConstructorUsedError;
-  @JsonKey(ignore: true)
-  $PropsCopyWith<Props> get copyWith => throw _privateConstructorUsedError;
-}
-
-/// @nodoc
-abstract class $PropsCopyWith<$Res> {
-  factory $PropsCopyWith(Props value, $Res Function(Props) then) =
-      _$PropsCopyWithImpl<$Res, Props>;
-  @useResult
-  $Res call(
-      {AccessControl? accessControl, bool? allowBypass, bool? systemProxy});
-
-  $AccessControlCopyWith<$Res>? get accessControl;
-}
-
-/// @nodoc
-class _$PropsCopyWithImpl<$Res, $Val extends Props>
-    implements $PropsCopyWith<$Res> {
-  _$PropsCopyWithImpl(this._value, this._then);
-
-  // ignore: unused_field
-  final $Val _value;
-  // ignore: unused_field
-  final $Res Function($Val) _then;
-
-  @pragma('vm:prefer-inline')
-  @override
-  $Res call({
-    Object? accessControl = freezed,
-    Object? allowBypass = freezed,
-    Object? systemProxy = freezed,
-  }) {
-    return _then(_value.copyWith(
-      accessControl: freezed == accessControl
-          ? _value.accessControl
-          : accessControl // ignore: cast_nullable_to_non_nullable
-              as AccessControl?,
-      allowBypass: freezed == allowBypass
-          ? _value.allowBypass
-          : allowBypass // ignore: cast_nullable_to_non_nullable
-              as bool?,
-      systemProxy: freezed == systemProxy
-          ? _value.systemProxy
-          : systemProxy // ignore: cast_nullable_to_non_nullable
-              as bool?,
-    ) as $Val);
-  }
-
-  @override
-  @pragma('vm:prefer-inline')
-  $AccessControlCopyWith<$Res>? get accessControl {
-    if (_value.accessControl == null) {
-      return null;
-    }
-
-    return $AccessControlCopyWith<$Res>(_value.accessControl!, (value) {
-      return _then(_value.copyWith(accessControl: value) as $Val);
-    });
-  }
-}
-
-/// @nodoc
-abstract class _$$PropsImplCopyWith<$Res> implements $PropsCopyWith<$Res> {
-  factory _$$PropsImplCopyWith(
-          _$PropsImpl value, $Res Function(_$PropsImpl) then) =
-      __$$PropsImplCopyWithImpl<$Res>;
-  @override
-  @useResult
-  $Res call(
-      {AccessControl? accessControl, bool? allowBypass, bool? systemProxy});
-
-  @override
-  $AccessControlCopyWith<$Res>? get accessControl;
-}
-
-/// @nodoc
-class __$$PropsImplCopyWithImpl<$Res>
-    extends _$PropsCopyWithImpl<$Res, _$PropsImpl>
-    implements _$$PropsImplCopyWith<$Res> {
-  __$$PropsImplCopyWithImpl(
-      _$PropsImpl _value, $Res Function(_$PropsImpl) _then)
-      : super(_value, _then);
-
-  @pragma('vm:prefer-inline')
-  @override
-  $Res call({
-    Object? accessControl = freezed,
-    Object? allowBypass = freezed,
-    Object? systemProxy = freezed,
-  }) {
-    return _then(_$PropsImpl(
-      accessControl: freezed == accessControl
-          ? _value.accessControl
-          : accessControl // ignore: cast_nullable_to_non_nullable
-              as AccessControl?,
-      allowBypass: freezed == allowBypass
-          ? _value.allowBypass
-          : allowBypass // ignore: cast_nullable_to_non_nullable
-              as bool?,
-      systemProxy: freezed == systemProxy
-          ? _value.systemProxy
-          : systemProxy // ignore: cast_nullable_to_non_nullable
-              as bool?,
-    ));
-  }
-}
-
-/// @nodoc
-@JsonSerializable()
-class _$PropsImpl implements _Props {
-  const _$PropsImpl({this.accessControl, this.allowBypass, this.systemProxy});
-
-  factory _$PropsImpl.fromJson(Map<String, dynamic> json) =>
-      _$$PropsImplFromJson(json);
-
-  @override
-  final AccessControl? accessControl;
-  @override
-  final bool? allowBypass;
-  @override
-  final bool? systemProxy;
-
-  @override
-  String toString() {
-    return 'Props(accessControl: $accessControl, allowBypass: $allowBypass, systemProxy: $systemProxy)';
-  }
-
-  @override
-  bool operator ==(Object other) {
-    return identical(this, other) ||
-        (other.runtimeType == runtimeType &&
-            other is _$PropsImpl &&
-            (identical(other.accessControl, accessControl) ||
-                other.accessControl == accessControl) &&
-            (identical(other.allowBypass, allowBypass) ||
-                other.allowBypass == allowBypass) &&
-            (identical(other.systemProxy, systemProxy) ||
-                other.systemProxy == systemProxy));
-  }
-
-  @JsonKey(ignore: true)
-  @override
-  int get hashCode =>
-      Object.hash(runtimeType, accessControl, allowBypass, systemProxy);
-
-  @JsonKey(ignore: true)
-  @override
-  @pragma('vm:prefer-inline')
-  _$$PropsImplCopyWith<_$PropsImpl> get copyWith =>
-      __$$PropsImplCopyWithImpl<_$PropsImpl>(this, _$identity);
-
-  @override
-  Map<String, dynamic> toJson() {
-    return _$$PropsImplToJson(
-      this,
-    );
-  }
-}
-
-abstract class _Props implements Props {
-  const factory _Props(
-      {final AccessControl? accessControl,
-      final bool? allowBypass,
-      final bool? systemProxy}) = _$PropsImpl;
-
-  factory _Props.fromJson(Map<String, dynamic> json) = _$PropsImpl.fromJson;
-
-  @override
-  AccessControl? get accessControl;
-  @override
-  bool? get allowBypass;
-  @override
-  bool? get systemProxy;
-  @override
-  @JsonKey(ignore: true)
-  _$$PropsImplCopyWith<_$PropsImpl> get copyWith =>
-      throw _privateConstructorUsedError;
-}
--- a/lib/models/generated/config.g.dart
+++ b/lib/models/generated/config.g.dart
@@ -32,19 +32,7 @@ Config _$ConfigFromJson(Map<String, dynamic> json) => Config()
      : DAV.fromJson(json['dav'] as Map<String, dynamic>)
  ..isAnimateToPage = json['isAnimateToPage'] as bool? ?? true
  ..isCompatible = json['isCompatible'] as bool? ?? true
-  ..autoCheckUpdate = json['autoCheckUpdate'] as bool? ?? true
-  ..allowBypass = json['allowBypass'] as bool? ?? true
-  ..systemProxy = json['systemProxy'] as bool? ?? true
-  ..proxiesType =
-      $enumDecodeNullable(_$ProxiesTypeEnumMap, json['proxiesType']) ??
-          ProxiesType.tab
-  ..proxyCardType =
-      $enumDecodeNullable(_$ProxyCardTypeEnumMap, json['proxyCardType']) ??
-          ProxyCardType.expand
-  ..proxiesColumns = (json['proxiesColumns'] as num?)?.toInt() ?? 2
-  ..testUrl =
-      json['test-url'] as String? ?? 'https://www.gstatic.com/generate_204'
-  ..isExclude = json['isExclude'] as bool? ?? false;
+  ..autoCheckUpdate = json['autoCheckUpdate'] as bool? ?? true;

 Map<String, dynamic> _$ConfigToJson(Config instance) => <String, dynamic>{
      'profiles': instance.profiles,
@@ -64,13 +52,6 @@ Map<String, dynamic> _$ConfigToJson(Config instance) => <String, dynamic>{
      'isAnimateToPage': instance.isAnimateToPage,
      'isCompatible': instance.isCompatible,
      'autoCheckUpdate': instance.autoCheckUpdate,
-      'allowBypass': instance.allowBypass,
-      'systemProxy': instance.systemProxy,
-      'proxiesType': _$ProxiesTypeEnumMap[instance.proxiesType]!,
-      'proxyCardType': _$ProxyCardTypeEnumMap[instance.proxyCardType]!,
-      'proxiesColumns': instance.proxiesColumns,
-      'test-url': instance.testUrl,
-      'isExclude': instance.isExclude,
    };

 const _$ThemeModeEnumMap = {
@@ -85,16 +66,6 @@ const _$ProxiesSortTypeEnumMap = {
  ProxiesSortType.name: 'name',
 };

-const _$ProxiesTypeEnumMap = {
-  ProxiesType.tab: 'tab',
-  ProxiesType.expansion: 'expansion',
-};
-
-const _$ProxyCardTypeEnumMap = {
-  ProxyCardType.expand: 'expand',
-  ProxyCardType.shrink: 'shrink',
-};
-
 _$AccessControlImpl _$$AccessControlImplFromJson(Map<String, dynamic> json) =>
    _$AccessControlImpl(
      mode: $enumDecodeNullable(_$AccessControlModeEnumMap, json['mode']) ??
@@ -122,19 +93,3 @@ const _$AccessControlModeEnumMap = {
  AccessControlMode.acceptSelected: 'acceptSelected',
  AccessControlMode.rejectSelected: 'rejectSelected',
 };
-
-_$PropsImpl _$$PropsImplFromJson(Map<String, dynamic> json) => _$PropsImpl(
-      accessControl: json['accessControl'] == null
-          ? null
-          : AccessControl.fromJson(
-              json['accessControl'] as Map<String, dynamic>),
-      allowBypass: json['allowBypass'] as bool?,
-      systemProxy: json['systemProxy'] as bool?,
-    );
-
-Map<String, dynamic> _$$PropsImplToJson(_$PropsImpl instance) =>
-    <String, dynamic>{
-      'accessControl': instance.accessControl,
-      'allowBypass': instance.allowBypass,
-      'systemProxy': instance.systemProxy,
-    };
--- a/lib/models/generated/connection.freezed.dart
+++ b/lib/models/generated/connection.freezed.dart
@@ -27,7 +27,6 @@ mixin _$Metadata {
  String get destinationIP => throw _privateConstructorUsedError;
  String get destinationPort => throw _privateConstructorUsedError;
  String get host => throw _privateConstructorUsedError;
-  String get process => throw _privateConstructorUsedError;
  String get remoteDestination => throw _privateConstructorUsedError;

  Map<String, dynamic> toJson() => throw _privateConstructorUsedError;
@@ -49,7 +48,6 @@ abstract class $MetadataCopyWith<$Res> {
      String destinationIP,
      String destinationPort,
      String host,
-      String process,
      String remoteDestination});
 }

@@ -73,7 +71,6 @@ class _$MetadataCopyWithImpl<$Res, $Val extends Metadata>
    Object? destinationIP = null,
    Object? destinationPort = null,
    Object? host = null,
-    Object? process = null,
    Object? remoteDestination = null,
  }) {
    return _then(_value.copyWith(
@@ -105,10 +102,6 @@ class _$MetadataCopyWithImpl<$Res, $Val extends Metadata>
          ? _value.host
          : host // ignore: cast_nullable_to_non_nullable
              as String,
-      process: null == process
-          ? _value.process
-          : process // ignore: cast_nullable_to_non_nullable
-              as String,
      remoteDestination: null == remoteDestination
          ? _value.remoteDestination
          : remoteDestination // ignore: cast_nullable_to_non_nullable
@@ -133,7 +126,6 @@ abstract class _$$MetadataImplCopyWith<$Res>
      String destinationIP,
      String destinationPort,
      String host,
-      String process,
      String remoteDestination});
 }

@@ -155,7 +147,6 @@ class __$$MetadataImplCopyWithImpl<$Res>
    Object? destinationIP = null,
    Object? destinationPort = null,
    Object? host = null,
-    Object? process = null,
    Object? remoteDestination = null,
  }) {
    return _then(_$MetadataImpl(
@@ -187,10 +178,6 @@ class __$$MetadataImplCopyWithImpl<$Res>
          ? _value.host
          : host // ignore: cast_nullable_to_non_nullable
              as String,
-      process: null == process
-          ? _value.process
-          : process // ignore: cast_nullable_to_non_nullable
-              as String,
      remoteDestination: null == remoteDestination
          ? _value.remoteDestination
          : remoteDestination // ignore: cast_nullable_to_non_nullable
@@ -210,7 +197,6 @@ class _$MetadataImpl implements _Metadata {
      required this.destinationIP,
      required this.destinationPort,
      required this.host,
-      required this.process,
      required this.remoteDestination});

  factory _$MetadataImpl.fromJson(Map<String, dynamic> json) =>
@@ -231,13 +217,11 @@ class _$MetadataImpl implements _Metadata {
  @override
  final String host;
  @override
-  final String process;
-  @override
  final String remoteDestination;

  @override
  String toString() {
-    return 'Metadata(uid: $uid, network: $network, sourceIP: $sourceIP, sourcePort: $sourcePort, destinationIP: $destinationIP, destinationPort: $destinationPort, host: $host, process: $process, remoteDestination: $remoteDestination)';
+    return 'Metadata(uid: $uid, network: $network, sourceIP: $sourceIP, sourcePort: $sourcePort, destinationIP: $destinationIP, destinationPort: $destinationPort, host: $host, remoteDestination: $remoteDestination)';
  }

  @override
@@ -256,24 +240,14 @@ class _$MetadataImpl implements _Metadata {
            (identical(other.destinationPort, destinationPort) ||
                other.destinationPort == destinationPort) &&
            (identical(other.host, host) || other.host == host) &&
-            (identical(other.process, process) || other.process == process) &&
            (identical(other.remoteDestination, remoteDestination) ||
                other.remoteDestination == remoteDestination));
  }

  @JsonKey(ignore: true)
  @override
-  int get hashCode => Object.hash(
-      runtimeType,
-      uid,
-      network,
-      sourceIP,
-      sourcePort,
-      destinationIP,
-      destinationPort,
-      host,
-      process,
-      remoteDestination);
+  int get hashCode => Object.hash(runtimeType, uid, network, sourceIP,
+      sourcePort, destinationIP, destinationPort, host, remoteDestination);

  @JsonKey(ignore: true)
  @override
@@ -298,7 +272,6 @@ abstract class _Metadata implements Metadata {
      required final String destinationIP,
      required final String destinationPort,
      required final String host,
-      required final String process,
      required final String remoteDestination}) = _$MetadataImpl;

  factory _Metadata.fromJson(Map<String, dynamic> json) =
@@ -319,8 +292,6 @@ abstract class _Metadata implements Metadata {
  @override
  String get host;
  @override
-  String get process;
-  @override
  String get remoteDestination;
  @override
  @JsonKey(ignore: true)
@@ -589,184 +560,3 @@ abstract class _Connection implements Connection {
  _$$ConnectionImplCopyWith<_$ConnectionImpl> get copyWith =>
      throw _privateConstructorUsedError;
 }
-
-ConnectionsAndKeywords _$ConnectionsAndKeywordsFromJson(
-    Map<String, dynamic> json) {
-  return _ConnectionsAndKeywords.fromJson(json);
-}
-
-/// @nodoc
-mixin _$ConnectionsAndKeywords {
-  List<Connection> get connections => throw _privateConstructorUsedError;
-  List<String> get keywords => throw _privateConstructorUsedError;
-
-  Map<String, dynamic> toJson() => throw _privateConstructorUsedError;
-  @JsonKey(ignore: true)
-  $ConnectionsAndKeywordsCopyWith<ConnectionsAndKeywords> get copyWith =>
-      throw _privateConstructorUsedError;
-}
-
-/// @nodoc
-abstract class $ConnectionsAndKeywordsCopyWith<$Res> {
-  factory $ConnectionsAndKeywordsCopyWith(ConnectionsAndKeywords value,
-          $Res Function(ConnectionsAndKeywords) then) =
-      _$ConnectionsAndKeywordsCopyWithImpl<$Res, ConnectionsAndKeywords>;
-  @useResult
-  $Res call({List<Connection> connections, List<String> keywords});
-}
-
-/// @nodoc
-class _$ConnectionsAndKeywordsCopyWithImpl<$Res,
-        $Val extends ConnectionsAndKeywords>
-    implements $ConnectionsAndKeywordsCopyWith<$Res> {
-  _$ConnectionsAndKeywordsCopyWithImpl(this._value, this._then);
-
-  // ignore: unused_field
-  final $Val _value;
-  // ignore: unused_field
-  final $Res Function($Val) _then;
-
-  @pragma('vm:prefer-inline')
-  @override
-  $Res call({
-    Object? connections = null,
-    Object? keywords = null,
-  }) {
-    return _then(_value.copyWith(
-      connections: null == connections
-          ? _value.connections
-          : connections // ignore: cast_nullable_to_non_nullable
-              as List<Connection>,
-      keywords: null == keywords
-          ? _value.keywords
-          : keywords // ignore: cast_nullable_to_non_nullable
-              as List<String>,
-    ) as $Val);
-  }
-}
-
-/// @nodoc
-abstract class _$$ConnectionsAndKeywordsImplCopyWith<$Res>
-    implements $ConnectionsAndKeywordsCopyWith<$Res> {
-  factory _$$ConnectionsAndKeywordsImplCopyWith(
-          _$ConnectionsAndKeywordsImpl value,
-          $Res Function(_$ConnectionsAndKeywordsImpl) then) =
-      __$$ConnectionsAndKeywordsImplCopyWithImpl<$Res>;
-  @override
-  @useResult
-  $Res call({List<Connection> connections, List<String> keywords});
-}
-
-/// @nodoc
-class __$$ConnectionsAndKeywordsImplCopyWithImpl<$Res>
-    extends _$ConnectionsAndKeywordsCopyWithImpl<$Res,
-        _$ConnectionsAndKeywordsImpl>
-    implements _$$ConnectionsAndKeywordsImplCopyWith<$Res> {
-  __$$ConnectionsAndKeywordsImplCopyWithImpl(
-      _$ConnectionsAndKeywordsImpl _value,
-      $Res Function(_$ConnectionsAndKeywordsImpl) _then)
-      : super(_value, _then);
-
-  @pragma('vm:prefer-inline')
-  @override
-  $Res call({
-    Object? connections = null,
-    Object? keywords = null,
-  }) {
-    return _then(_$ConnectionsAndKeywordsImpl(
-      connections: null == connections
-          ? _value._connections
-          : connections // ignore: cast_nullable_to_non_nullable
-              as List<Connection>,
-      keywords: null == keywords
-          ? _value._keywords
-          : keywords // ignore: cast_nullable_to_non_nullable
-              as List<String>,
-    ));
-  }
-}
-
-/// @nodoc
-@JsonSerializable()
-class _$ConnectionsAndKeywordsImpl implements _ConnectionsAndKeywords {
-  const _$ConnectionsAndKeywordsImpl(
-      {final List<Connection> connections = const [],
-      final List<String> keywords = const []})
-      : _connections = connections,
-        _keywords = keywords;
-
-  factory _$ConnectionsAndKeywordsImpl.fromJson(Map<String, dynamic> json) =>
-      _$$ConnectionsAndKeywordsImplFromJson(json);
-
-  final List<Connection> _connections;
-  @override
-  @JsonKey()
-  List<Connection> get connections {
-    if (_connections is EqualUnmodifiableListView) return _connections;
-    // ignore: implicit_dynamic_type
-    return EqualUnmodifiableListView(_connections);
-  }
-
-  final List<String> _keywords;
-  @override
-  @JsonKey()
-  List<String> get keywords {
-    if (_keywords is EqualUnmodifiableListView) return _keywords;
-    // ignore: implicit_dynamic_type
-    return EqualUnmodifiableListView(_keywords);
-  }
-
-  @override
-  String toString() {
-    return 'ConnectionsAndKeywords(connections: $connections, keywords: $keywords)';
-  }
-
-  @override
-  bool operator ==(Object other) {
-    return identical(this, other) ||
-        (other.runtimeType == runtimeType &&
-            other is _$ConnectionsAndKeywordsImpl &&
-            const DeepCollectionEquality()
-                .equals(other._connections, _connections) &&
-            const DeepCollectionEquality().equals(other._keywords, _keywords));
-  }
-
-  @JsonKey(ignore: true)
-  @override
-  int get hashCode => Object.hash(
-      runtimeType,
-      const DeepCollectionEquality().hash(_connections),
-      const DeepCollectionEquality().hash(_keywords));
-
-  @JsonKey(ignore: true)
-  @override
-  @pragma('vm:prefer-inline')
-  _$$ConnectionsAndKeywordsImplCopyWith<_$ConnectionsAndKeywordsImpl>
-      get copyWith => __$$ConnectionsAndKeywordsImplCopyWithImpl<
-          _$ConnectionsAndKeywordsImpl>(this, _$identity);
-
-  @override
-  Map<String, dynamic> toJson() {
-    return _$$ConnectionsAndKeywordsImplToJson(
-      this,
-    );
-  }
-}
-
-abstract class _ConnectionsAndKeywords implements ConnectionsAndKeywords {
-  const factory _ConnectionsAndKeywords(
-      {final List<Connection> connections,
-      final List<String> keywords}) = _$ConnectionsAndKeywordsImpl;
-
-  factory _ConnectionsAndKeywords.fromJson(Map<String, dynamic> json) =
-      _$ConnectionsAndKeywordsImpl.fromJson;
-
-  @override
-  List<Connection> get connections;
-  @override
-  List<String> get keywords;
-  @override
-  @JsonKey(ignore: true)
-  _$$ConnectionsAndKeywordsImplCopyWith<_$ConnectionsAndKeywordsImpl>
-      get copyWith => throw _privateConstructorUsedError;
-}
--- a/lib/models/generated/connection.g.dart
+++ b/lib/models/generated/connection.g.dart
@@ -15,7 +15,6 @@ _$MetadataImpl _$$MetadataImplFromJson(Map<String, dynamic> json) =>
      destinationIP: json['destinationIP'] as String,
      destinationPort: json['destinationPort'] as String,
      host: json['host'] as String,
-      process: json['process'] as String,
      remoteDestination: json['remoteDestination'] as String,
    );

@@ -28,7 +27,6 @@ Map<String, dynamic> _$$MetadataImplToJson(_$MetadataImpl instance) =>
      'destinationIP': instance.destinationIP,
      'destinationPort': instance.destinationPort,
      'host': instance.host,
-      'process': instance.process,
      'remoteDestination': instance.remoteDestination,
    };

@@ -52,23 +50,3 @@ Map<String, dynamic> _$$ConnectionImplToJson(_$ConnectionImpl instance) =>
      'metadata': instance.metadata,
      'chains': instance.chains,
    };
-
-_$ConnectionsAndKeywordsImpl _$$ConnectionsAndKeywordsImplFromJson(
-        Map<String, dynamic> json) =>
-    _$ConnectionsAndKeywordsImpl(
-      connections: (json['connections'] as List<dynamic>?)
-              ?.map((e) => Connection.fromJson(e as Map<String, dynamic>))
-              .toList() ??
-          const [],
-      keywords: (json['keywords'] as List<dynamic>?)
-              ?.map((e) => e as String)
-              .toList() ??
-          const [],
-    );
-
-Map<String, dynamic> _$$ConnectionsAndKeywordsImplToJson(
-        _$ConnectionsAndKeywordsImpl instance) =>
-    <String, dynamic>{
-      'connections': instance.connections,
-      'keywords': instance.keywords,
-    };
--- a/lib/models/generated/ffi.freezed.dart
+++ b/lib/models/generated/ffi.freezed.dart
--- a/lib/models/generated/ffi.g.dart
+++ b/lib/models/generated/ffi.g.dart
@@ -6,31 +6,13 @@ part of '../ffi.dart';
 // JsonSerializableGenerator
 // **************************************************************************

-_$ConfigExtendedParamsImpl _$$ConfigExtendedParamsImplFromJson(
-        Map<String, dynamic> json) =>
-    _$ConfigExtendedParamsImpl(
-      isPatch: json['is-patch'] as bool,
-      isCompatible: json['is-compatible'] as bool,
-      selectedMap: Map<String, String>.from(json['selected-map'] as Map),
-      testUrl: json['test-url'] as String,
-    );
-
-Map<String, dynamic> _$$ConfigExtendedParamsImplToJson(
-        _$ConfigExtendedParamsImpl instance) =>
-    <String, dynamic>{
-      'is-patch': instance.isPatch,
-      'is-compatible': instance.isCompatible,
-      'selected-map': instance.selectedMap,
-      'test-url': instance.testUrl,
-    };
-
 _$UpdateConfigParamsImpl _$$UpdateConfigParamsImplFromJson(
        Map<String, dynamic> json) =>
    _$UpdateConfigParamsImpl(
      profilePath: json['profile-path'] as String?,
      config: ClashConfig.fromJson(json['config'] as Map<String, dynamic>),
-      params:
-          ConfigExtendedParams.fromJson(json['params'] as Map<String, dynamic>),
+      isPatch: json['is-patch'] as bool,
+      isCompatible: json['is-compatible'] as bool,
    );

 Map<String, dynamic> _$$UpdateConfigParamsImplToJson(
@@ -38,7 +20,8 @@ Map<String, dynamic> _$$UpdateConfigParamsImplToJson(
    <String, dynamic>{
      'profile-path': instance.profilePath,
      'config': instance.config,
-      'params': instance.params,
+      'is-patch': instance.isPatch,
+      'is-compatible': instance.isCompatible,
    };

 _$ChangeProxyParamsImpl _$$ChangeProxyParamsImplFromJson(
@@ -55,44 +38,24 @@ Map<String, dynamic> _$$ChangeProxyParamsImplToJson(
      'proxy-name': instance.proxyName,
    };

-_$AppMessageImpl _$$AppMessageImplFromJson(Map<String, dynamic> json) =>
-    _$AppMessageImpl(
-      type: $enumDecode(_$AppMessageTypeEnumMap, json['type']),
+_$MessageImpl _$$MessageImplFromJson(Map<String, dynamic> json) =>
+    _$MessageImpl(
+      type: $enumDecode(_$MessageTypeEnumMap, json['type']),
      data: json['data'],
    );

-Map<String, dynamic> _$$AppMessageImplToJson(_$AppMessageImpl instance) =>
+Map<String, dynamic> _$$MessageImplToJson(_$MessageImpl instance) =>
    <String, dynamic>{
-      'type': _$AppMessageTypeEnumMap[instance.type]!,
+      'type': _$MessageTypeEnumMap[instance.type]!,
      'data': instance.data,
    };

-const _$AppMessageTypeEnumMap = {
-  AppMessageType.log: 'log',
-  AppMessageType.delay: 'delay',
-  AppMessageType.request: 'request',
-  AppMessageType.started: 'started',
-  AppMessageType.loaded: 'loaded',
-};
-
-_$ServiceMessageImpl _$$ServiceMessageImplFromJson(Map<String, dynamic> json) =>
-    _$ServiceMessageImpl(
-      type: $enumDecode(_$ServiceMessageTypeEnumMap, json['type']),
-      data: json['data'],
-    );
-
-Map<String, dynamic> _$$ServiceMessageImplToJson(
-        _$ServiceMessageImpl instance) =>
-    <String, dynamic>{
-      'type': _$ServiceMessageTypeEnumMap[instance.type]!,
-      'data': instance.data,
-    };
-
-const _$ServiceMessageTypeEnumMap = {
-  ServiceMessageType.protect: 'protect',
-  ServiceMessageType.process: 'process',
-  ServiceMessageType.started: 'started',
-  ServiceMessageType.loaded: 'loaded',
+const _$MessageTypeEnumMap = {
+  MessageType.log: 'log',
+  MessageType.tun: 'tun',
+  MessageType.delay: 'delay',
+  MessageType.process: 'process',
+  MessageType.now: 'now',
 };

 _$DelayImpl _$$DelayImplFromJson(Map<String, dynamic> json) => _$DelayImpl(
@@ -118,37 +81,18 @@ Map<String, dynamic> _$$NowImplToJson(_$NowImpl instance) => <String, dynamic>{

 _$ProcessImpl _$$ProcessImplFromJson(Map<String, dynamic> json) =>
    _$ProcessImpl(
-      id: (json['id'] as num).toInt(),
-      metadata: Metadata.fromJson(json['metadata'] as Map<String, dynamic>),
+      uid: (json['uid'] as num).toInt(),
+      network: json['network'] as String,
+      source: json['source'] as String,
+      target: json['target'] as String,
    );

 Map<String, dynamic> _$$ProcessImplToJson(_$ProcessImpl instance) =>
    <String, dynamic>{
-      'id': instance.id,
-      'metadata': instance.metadata,
-    };
-
-_$FdImpl _$$FdImplFromJson(Map<String, dynamic> json) => _$FdImpl(
-      id: (json['id'] as num).toInt(),
-      value: (json['value'] as num).toInt(),
-    );
-
-Map<String, dynamic> _$$FdImplToJson(_$FdImpl instance) => <String, dynamic>{
-      'id': instance.id,
-      'value': instance.value,
-    };
-
-_$ProcessMapItemImpl _$$ProcessMapItemImplFromJson(Map<String, dynamic> json) =>
-    _$ProcessMapItemImpl(
-      id: (json['id'] as num).toInt(),
-      value: json['value'] as String,
-    );
-
-Map<String, dynamic> _$$ProcessMapItemImplToJson(
-        _$ProcessMapItemImpl instance) =>
-    <String, dynamic>{
-      'id': instance.id,
-      'value': instance.value,
+      'uid': instance.uid,
+      'network': instance.network,
+      'source': instance.source,
+      'target': instance.target,
    };

 _$ExternalProviderImpl _$$ExternalProviderImplFromJson(
--- a/lib/models/generated/log.freezed.dart
+++ b/lib/models/generated/log.freezed.dart
@@ -1,189 +0,0 @@
-// coverage:ignore-file
-// GENERATED CODE - DO NOT MODIFY BY HAND
-// ignore_for_file: type=lint
-// ignore_for_file: unused_element, deprecated_member_use, deprecated_member_use_from_same_package, use_function_type_syntax_for_parameters, unnecessary_const, avoid_init_to_null, invalid_override_different_default_values_named, prefer_expression_function_bodies, annotate_overrides, invalid_annotation_target, unnecessary_question_mark
-
-part of '../log.dart';
-
-// **************************************************************************
-// FreezedGenerator
-// **************************************************************************
-
-T _$identity<T>(T value) => value;
-
-final _privateConstructorUsedError = UnsupportedError(
-    'It seems like you constructed your class using `MyClass._()`. This constructor is only meant to be used by freezed and you are not supposed to need it nor use it.\nPlease check the documentation here for more information: https://github.com/rrousselGit/freezed#adding-getters-and-methods-to-our-models');
-
-LogsAndKeywords _$LogsAndKeywordsFromJson(Map<String, dynamic> json) {
-  return _LogsAndKeywords.fromJson(json);
-}
-
-/// @nodoc
-mixin _$LogsAndKeywords {
-  List<Log> get logs => throw _privateConstructorUsedError;
-  List<String> get keywords => throw _privateConstructorUsedError;
-
-  Map<String, dynamic> toJson() => throw _privateConstructorUsedError;
-  @JsonKey(ignore: true)
-  $LogsAndKeywordsCopyWith<LogsAndKeywords> get copyWith =>
-      throw _privateConstructorUsedError;
-}
-
-/// @nodoc
-abstract class $LogsAndKeywordsCopyWith<$Res> {
-  factory $LogsAndKeywordsCopyWith(
-          LogsAndKeywords value, $Res Function(LogsAndKeywords) then) =
-      _$LogsAndKeywordsCopyWithImpl<$Res, LogsAndKeywords>;
-  @useResult
-  $Res call({List<Log> logs, List<String> keywords});
-}
-
-/// @nodoc
-class _$LogsAndKeywordsCopyWithImpl<$Res, $Val extends LogsAndKeywords>
-    implements $LogsAndKeywordsCopyWith<$Res> {
-  _$LogsAndKeywordsCopyWithImpl(this._value, this._then);
-
-  // ignore: unused_field
-  final $Val _value;
-  // ignore: unused_field
-  final $Res Function($Val) _then;
-
-  @pragma('vm:prefer-inline')
-  @override
-  $Res call({
-    Object? logs = null,
-    Object? keywords = null,
-  }) {
-    return _then(_value.copyWith(
-      logs: null == logs
-          ? _value.logs
-          : logs // ignore: cast_nullable_to_non_nullable
-              as List<Log>,
-      keywords: null == keywords
-          ? _value.keywords
-          : keywords // ignore: cast_nullable_to_non_nullable
-              as List<String>,
-    ) as $Val);
-  }
-}
-
-/// @nodoc
-abstract class _$$LogsAndKeywordsImplCopyWith<$Res>
-    implements $LogsAndKeywordsCopyWith<$Res> {
-  factory _$$LogsAndKeywordsImplCopyWith(_$LogsAndKeywordsImpl value,
-          $Res Function(_$LogsAndKeywordsImpl) then) =
-      __$$LogsAndKeywordsImplCopyWithImpl<$Res>;
-  @override
-  @useResult
-  $Res call({List<Log> logs, List<String> keywords});
-}
-
-/// @nodoc
-class __$$LogsAndKeywordsImplCopyWithImpl<$Res>
-    extends _$LogsAndKeywordsCopyWithImpl<$Res, _$LogsAndKeywordsImpl>
-    implements _$$LogsAndKeywordsImplCopyWith<$Res> {
-  __$$LogsAndKeywordsImplCopyWithImpl(
-      _$LogsAndKeywordsImpl _value, $Res Function(_$LogsAndKeywordsImpl) _then)
-      : super(_value, _then);
-
-  @pragma('vm:prefer-inline')
-  @override
-  $Res call({
-    Object? logs = null,
-    Object? keywords = null,
-  }) {
-    return _then(_$LogsAndKeywordsImpl(
-      logs: null == logs
-          ? _value._logs
-          : logs // ignore: cast_nullable_to_non_nullable
-              as List<Log>,
-      keywords: null == keywords
-          ? _value._keywords
-          : keywords // ignore: cast_nullable_to_non_nullable
-              as List<String>,
-    ));
-  }
-}
-
-/// @nodoc
-@JsonSerializable()
-class _$LogsAndKeywordsImpl implements _LogsAndKeywords {
-  const _$LogsAndKeywordsImpl(
-      {final List<Log> logs = const [], final List<String> keywords = const []})
-      : _logs = logs,
-        _keywords = keywords;
-
-  factory _$LogsAndKeywordsImpl.fromJson(Map<String, dynamic> json) =>
-      _$$LogsAndKeywordsImplFromJson(json);
-
-  final List<Log> _logs;
-  @override
-  @JsonKey()
-  List<Log> get logs {
-    if (_logs is EqualUnmodifiableListView) return _logs;
-    // ignore: implicit_dynamic_type
-    return EqualUnmodifiableListView(_logs);
-  }
-
-  final List<String> _keywords;
-  @override
-  @JsonKey()
-  List<String> get keywords {
-    if (_keywords is EqualUnmodifiableListView) return _keywords;
-    // ignore: implicit_dynamic_type
-    return EqualUnmodifiableListView(_keywords);
-  }
-
-  @override
-  String toString() {
-    return 'LogsAndKeywords(logs: $logs, keywords: $keywords)';
-  }
-
-  @override
-  bool operator ==(Object other) {
-    return identical(this, other) ||
-        (other.runtimeType == runtimeType &&
-            other is _$LogsAndKeywordsImpl &&
-            const DeepCollectionEquality().equals(other._logs, _logs) &&
-            const DeepCollectionEquality().equals(other._keywords, _keywords));
-  }
-
-  @JsonKey(ignore: true)
-  @override
-  int get hashCode => Object.hash(
-      runtimeType,
-      const DeepCollectionEquality().hash(_logs),
-      const DeepCollectionEquality().hash(_keywords));
-
-  @JsonKey(ignore: true)
-  @override
-  @pragma('vm:prefer-inline')
-  _$$LogsAndKeywordsImplCopyWith<_$LogsAndKeywordsImpl> get copyWith =>
-      __$$LogsAndKeywordsImplCopyWithImpl<_$LogsAndKeywordsImpl>(
-          this, _$identity);
-
-  @override
-  Map<String, dynamic> toJson() {
-    return _$$LogsAndKeywordsImplToJson(
-      this,
-    );
-  }
-}
-
-abstract class _LogsAndKeywords implements LogsAndKeywords {
-  const factory _LogsAndKeywords(
-      {final List<Log> logs,
-      final List<String> keywords}) = _$LogsAndKeywordsImpl;
-
-  factory _LogsAndKeywords.fromJson(Map<String, dynamic> json) =
-      _$LogsAndKeywordsImpl.fromJson;
-
-  @override
-  List<Log> get logs;
-  @override
-  List<String> get keywords;
-  @override
-  @JsonKey(ignore: true)
-  _$$LogsAndKeywordsImplCopyWith<_$LogsAndKeywordsImpl> get copyWith =>
-      throw _privateConstructorUsedError;
-}
--- a/lib/models/generated/log.g.dart
+++ b/lib/models/generated/log.g.dart
@@ -23,23 +23,3 @@ const _$LogLevelEnumMap = {
  LogLevel.error: 'error',
  LogLevel.silent: 'silent',
 };
-
-_$LogsAndKeywordsImpl _$$LogsAndKeywordsImplFromJson(
-        Map<String, dynamic> json) =>
-    _$LogsAndKeywordsImpl(
-      logs: (json['logs'] as List<dynamic>?)
-              ?.map((e) => Log.fromJson(e as Map<String, dynamic>))
-              .toList() ??
-          const [],
-      keywords: (json['keywords'] as List<dynamic>?)
-              ?.map((e) => e as String)
-              .toList() ??
-          const [],
-    );
-
-Map<String, dynamic> _$$LogsAndKeywordsImplToJson(
-        _$LogsAndKeywordsImpl instance) =>
-    <String, dynamic>{
-      'logs': instance.logs,
-      'keywords': instance.keywords,
-    };
--- a/lib/models/generated/profile.freezed.dart
+++ b/lib/models/generated/profile.freezed.dart
@@ -1,576 +0,0 @@
-// coverage:ignore-file
-// GENERATED CODE - DO NOT MODIFY BY HAND
-// ignore_for_file: type=lint
-// ignore_for_file: unused_element, deprecated_member_use, deprecated_member_use_from_same_package, use_function_type_syntax_for_parameters, unnecessary_const, avoid_init_to_null, invalid_override_different_default_values_named, prefer_expression_function_bodies, annotate_overrides, invalid_annotation_target, unnecessary_question_mark
-
-part of '../profile.dart';
-
-// **************************************************************************
-// FreezedGenerator
-// **************************************************************************
-
-T _$identity<T>(T value) => value;
-
-final _privateConstructorUsedError = UnsupportedError(
-    'It seems like you constructed your class using `MyClass._()`. This constructor is only meant to be used by freezed and you are not supposed to need it nor use it.\nPlease check the documentation here for more information: https://github.com/rrousselGit/freezed#adding-getters-and-methods-to-our-models');
-
-UserInfo _$UserInfoFromJson(Map<String, dynamic> json) {
-  return _UserInfo.fromJson(json);
-}
-
-/// @nodoc
-mixin _$UserInfo {
-  int get upload => throw _privateConstructorUsedError;
-  int get download => throw _privateConstructorUsedError;
-  int get total => throw _privateConstructorUsedError;
-  int get expire => throw _privateConstructorUsedError;
-
-  Map<String, dynamic> toJson() => throw _privateConstructorUsedError;
-  @JsonKey(ignore: true)
-  $UserInfoCopyWith<UserInfo> get copyWith =>
-      throw _privateConstructorUsedError;
-}
-
-/// @nodoc
-abstract class $UserInfoCopyWith<$Res> {
-  factory $UserInfoCopyWith(UserInfo value, $Res Function(UserInfo) then) =
-      _$UserInfoCopyWithImpl<$Res, UserInfo>;
-  @useResult
-  $Res call({int upload, int download, int total, int expire});
-}
-
-/// @nodoc
-class _$UserInfoCopyWithImpl<$Res, $Val extends UserInfo>
-    implements $UserInfoCopyWith<$Res> {
-  _$UserInfoCopyWithImpl(this._value, this._then);
-
-  // ignore: unused_field
-  final $Val _value;
-  // ignore: unused_field
-  final $Res Function($Val) _then;
-
-  @pragma('vm:prefer-inline')
-  @override
-  $Res call({
-    Object? upload = null,
-    Object? download = null,
-    Object? total = null,
-    Object? expire = null,
-  }) {
-    return _then(_value.copyWith(
-      upload: null == upload
-          ? _value.upload
-          : upload // ignore: cast_nullable_to_non_nullable
-              as int,
-      download: null == download
-          ? _value.download
-          : download // ignore: cast_nullable_to_non_nullable
-              as int,
-      total: null == total
-          ? _value.total
-          : total // ignore: cast_nullable_to_non_nullable
-              as int,
-      expire: null == expire
-          ? _value.expire
-          : expire // ignore: cast_nullable_to_non_nullable
-              as int,
-    ) as $Val);
-  }
-}
-
-/// @nodoc
-abstract class _$$UserInfoImplCopyWith<$Res>
-    implements $UserInfoCopyWith<$Res> {
-  factory _$$UserInfoImplCopyWith(
-          _$UserInfoImpl value, $Res Function(_$UserInfoImpl) then) =
-      __$$UserInfoImplCopyWithImpl<$Res>;
-  @override
-  @useResult
-  $Res call({int upload, int download, int total, int expire});
-}
-
-/// @nodoc
-class __$$UserInfoImplCopyWithImpl<$Res>
-    extends _$UserInfoCopyWithImpl<$Res, _$UserInfoImpl>
-    implements _$$UserInfoImplCopyWith<$Res> {
-  __$$UserInfoImplCopyWithImpl(
-      _$UserInfoImpl _value, $Res Function(_$UserInfoImpl) _then)
-      : super(_value, _then);
-
-  @pragma('vm:prefer-inline')
-  @override
-  $Res call({
-    Object? upload = null,
-    Object? download = null,
-    Object? total = null,
-    Object? expire = null,
-  }) {
-    return _then(_$UserInfoImpl(
-      upload: null == upload
-          ? _value.upload
-          : upload // ignore: cast_nullable_to_non_nullable
-              as int,
-      download: null == download
-          ? _value.download
-          : download // ignore: cast_nullable_to_non_nullable
-              as int,
-      total: null == total
-          ? _value.total
-          : total // ignore: cast_nullable_to_non_nullable
-              as int,
-      expire: null == expire
-          ? _value.expire
-          : expire // ignore: cast_nullable_to_non_nullable
-              as int,
-    ));
-  }
-}
-
-/// @nodoc
-@JsonSerializable()
-class _$UserInfoImpl implements _UserInfo {
-  const _$UserInfoImpl(
-      {this.upload = 0, this.download = 0, this.total = 0, this.expire = 0});
-
-  factory _$UserInfoImpl.fromJson(Map<String, dynamic> json) =>
-      _$$UserInfoImplFromJson(json);
-
-  @override
-  @JsonKey()
-  final int upload;
-  @override
-  @JsonKey()
-  final int download;
-  @override
-  @JsonKey()
-  final int total;
-  @override
-  @JsonKey()
-  final int expire;
-
-  @override
-  String toString() {
-    return 'UserInfo(upload: $upload, download: $download, total: $total, expire: $expire)';
-  }
-
-  @override
-  bool operator ==(Object other) {
-    return identical(this, other) ||
-        (other.runtimeType == runtimeType &&
-            other is _$UserInfoImpl &&
-            (identical(other.upload, upload) || other.upload == upload) &&
-            (identical(other.download, download) ||
-                other.download == download) &&
-            (identical(other.total, total) || other.total == total) &&
-            (identical(other.expire, expire) || other.expire == expire));
-  }
-
-  @JsonKey(ignore: true)
-  @override
-  int get hashCode => Object.hash(runtimeType, upload, download, total, expire);
-
-  @JsonKey(ignore: true)
-  @override
-  @pragma('vm:prefer-inline')
-  _$$UserInfoImplCopyWith<_$UserInfoImpl> get copyWith =>
-      __$$UserInfoImplCopyWithImpl<_$UserInfoImpl>(this, _$identity);
-
-  @override
-  Map<String, dynamic> toJson() {
-    return _$$UserInfoImplToJson(
-      this,
-    );
-  }
-}
-
-abstract class _UserInfo implements UserInfo {
-  const factory _UserInfo(
-      {final int upload,
-      final int download,
-      final int total,
-      final int expire}) = _$UserInfoImpl;
-
-  factory _UserInfo.fromJson(Map<String, dynamic> json) =
-      _$UserInfoImpl.fromJson;
-
-  @override
-  int get upload;
-  @override
-  int get download;
-  @override
-  int get total;
-  @override
-  int get expire;
-  @override
-  @JsonKey(ignore: true)
-  _$$UserInfoImplCopyWith<_$UserInfoImpl> get copyWith =>
-      throw _privateConstructorUsedError;
-}
-
-Profile _$ProfileFromJson(Map<String, dynamic> json) {
-  return _Profile.fromJson(json);
-}
-
-/// @nodoc
-mixin _$Profile {
-  String get id => throw _privateConstructorUsedError;
-  String? get label => throw _privateConstructorUsedError;
-  String? get currentGroupName => throw _privateConstructorUsedError;
-  String get url => throw _privateConstructorUsedError;
-  DateTime? get lastUpdateDate => throw _privateConstructorUsedError;
-  Duration get autoUpdateDuration => throw _privateConstructorUsedError;
-  UserInfo? get userInfo => throw _privateConstructorUsedError;
-  bool get autoUpdate => throw _privateConstructorUsedError;
-  Map<String, String> get selectedMap => throw _privateConstructorUsedError;
-  Set<String> get unfoldSet => throw _privateConstructorUsedError;
-
-  Map<String, dynamic> toJson() => throw _privateConstructorUsedError;
-  @JsonKey(ignore: true)
-  $ProfileCopyWith<Profile> get copyWith => throw _privateConstructorUsedError;
-}
-
-/// @nodoc
-abstract class $ProfileCopyWith<$Res> {
-  factory $ProfileCopyWith(Profile value, $Res Function(Profile) then) =
-      _$ProfileCopyWithImpl<$Res, Profile>;
-  @useResult
-  $Res call(
-      {String id,
-      String? label,
-      String? currentGroupName,
-      String url,
-      DateTime? lastUpdateDate,
-      Duration autoUpdateDuration,
-      UserInfo? userInfo,
-      bool autoUpdate,
-      Map<String, String> selectedMap,
-      Set<String> unfoldSet});
-
-  $UserInfoCopyWith<$Res>? get userInfo;
-}
-
-/// @nodoc
-class _$ProfileCopyWithImpl<$Res, $Val extends Profile>
-    implements $ProfileCopyWith<$Res> {
-  _$ProfileCopyWithImpl(this._value, this._then);
-
-  // ignore: unused_field
-  final $Val _value;
-  // ignore: unused_field
-  final $Res Function($Val) _then;
-
-  @pragma('vm:prefer-inline')
-  @override
-  $Res call({
-    Object? id = null,
-    Object? label = freezed,
-    Object? currentGroupName = freezed,
-    Object? url = null,
-    Object? lastUpdateDate = freezed,
-    Object? autoUpdateDuration = null,
-    Object? userInfo = freezed,
-    Object? autoUpdate = null,
-    Object? selectedMap = null,
-    Object? unfoldSet = null,
-  }) {
-    return _then(_value.copyWith(
-      id: null == id
-          ? _value.id
-          : id // ignore: cast_nullable_to_non_nullable
-              as String,
-      label: freezed == label
-          ? _value.label
-          : label // ignore: cast_nullable_to_non_nullable
-              as String?,
-      currentGroupName: freezed == currentGroupName
-          ? _value.currentGroupName
-          : currentGroupName // ignore: cast_nullable_to_non_nullable
-              as String?,
-      url: null == url
-          ? _value.url
-          : url // ignore: cast_nullable_to_non_nullable
-              as String,
-      lastUpdateDate: freezed == lastUpdateDate
-          ? _value.lastUpdateDate
-          : lastUpdateDate // ignore: cast_nullable_to_non_nullable
-              as DateTime?,
-      autoUpdateDuration: null == autoUpdateDuration
-          ? _value.autoUpdateDuration
-          : autoUpdateDuration // ignore: cast_nullable_to_non_nullable
-              as Duration,
-      userInfo: freezed == userInfo
-          ? _value.userInfo
-          : userInfo // ignore: cast_nullable_to_non_nullable
-              as UserInfo?,
-      autoUpdate: null == autoUpdate
-          ? _value.autoUpdate
-          : autoUpdate // ignore: cast_nullable_to_non_nullable
-              as bool,
-      selectedMap: null == selectedMap
-          ? _value.selectedMap
-          : selectedMap // ignore: cast_nullable_to_non_nullable
-              as Map<String, String>,
-      unfoldSet: null == unfoldSet
-          ? _value.unfoldSet
-          : unfoldSet // ignore: cast_nullable_to_non_nullable
-              as Set<String>,
-    ) as $Val);
-  }
-
-  @override
-  @pragma('vm:prefer-inline')
-  $UserInfoCopyWith<$Res>? get userInfo {
-    if (_value.userInfo == null) {
-      return null;
-    }
-
-    return $UserInfoCopyWith<$Res>(_value.userInfo!, (value) {
-      return _then(_value.copyWith(userInfo: value) as $Val);
-    });
-  }
-}
-
-/// @nodoc
-abstract class _$$ProfileImplCopyWith<$Res> implements $ProfileCopyWith<$Res> {
-  factory _$$ProfileImplCopyWith(
-          _$ProfileImpl value, $Res Function(_$ProfileImpl) then) =
-      __$$ProfileImplCopyWithImpl<$Res>;
-  @override
-  @useResult
-  $Res call(
-      {String id,
-      String? label,
-      String? currentGroupName,
-      String url,
-      DateTime? lastUpdateDate,
-      Duration autoUpdateDuration,
-      UserInfo? userInfo,
-      bool autoUpdate,
-      Map<String, String> selectedMap,
-      Set<String> unfoldSet});
-
-  @override
-  $UserInfoCopyWith<$Res>? get userInfo;
-}
-
-/// @nodoc
-class __$$ProfileImplCopyWithImpl<$Res>
-    extends _$ProfileCopyWithImpl<$Res, _$ProfileImpl>
-    implements _$$ProfileImplCopyWith<$Res> {
-  __$$ProfileImplCopyWithImpl(
-      _$ProfileImpl _value, $Res Function(_$ProfileImpl) _then)
-      : super(_value, _then);
-
-  @pragma('vm:prefer-inline')
-  @override
-  $Res call({
-    Object? id = null,
-    Object? label = freezed,
-    Object? currentGroupName = freezed,
-    Object? url = null,
-    Object? lastUpdateDate = freezed,
-    Object? autoUpdateDuration = null,
-    Object? userInfo = freezed,
-    Object? autoUpdate = null,
-    Object? selectedMap = null,
-    Object? unfoldSet = null,
-  }) {
-    return _then(_$ProfileImpl(
-      id: null == id
-          ? _value.id
-          : id // ignore: cast_nullable_to_non_nullable
-              as String,
-      label: freezed == label
-          ? _value.label
-          : label // ignore: cast_nullable_to_non_nullable
-              as String?,
-      currentGroupName: freezed == currentGroupName
-          ? _value.currentGroupName
-          : currentGroupName // ignore: cast_nullable_to_non_nullable
-              as String?,
-      url: null == url
-          ? _value.url
-          : url // ignore: cast_nullable_to_non_nullable
-              as String,
-      lastUpdateDate: freezed == lastUpdateDate
-          ? _value.lastUpdateDate
-          : lastUpdateDate // ignore: cast_nullable_to_non_nullable
-              as DateTime?,
-      autoUpdateDuration: null == autoUpdateDuration
-          ? _value.autoUpdateDuration
-          : autoUpdateDuration // ignore: cast_nullable_to_non_nullable
-              as Duration,
-      userInfo: freezed == userInfo
-          ? _value.userInfo
-          : userInfo // ignore: cast_nullable_to_non_nullable
-              as UserInfo?,
-      autoUpdate: null == autoUpdate
-          ? _value.autoUpdate
-          : autoUpdate // ignore: cast_nullable_to_non_nullable
-              as bool,
-      selectedMap: null == selectedMap
-          ? _value._selectedMap
-          : selectedMap // ignore: cast_nullable_to_non_nullable
-              as Map<String, String>,
-      unfoldSet: null == unfoldSet
-          ? _value._unfoldSet
-          : unfoldSet // ignore: cast_nullable_to_non_nullable
-              as Set<String>,
-    ));
-  }
-}
-
-/// @nodoc
-@JsonSerializable()
-class _$ProfileImpl implements _Profile {
-  const _$ProfileImpl(
-      {required this.id,
-      this.label,
-      this.currentGroupName,
-      this.url = "",
-      this.lastUpdateDate,
-      required this.autoUpdateDuration,
-      this.userInfo,
-      this.autoUpdate = true,
-      final Map<String, String> selectedMap = const {},
-      final Set<String> unfoldSet = const {}})
-      : _selectedMap = selectedMap,
-        _unfoldSet = unfoldSet;
-
-  factory _$ProfileImpl.fromJson(Map<String, dynamic> json) =>
-      _$$ProfileImplFromJson(json);
-
-  @override
-  final String id;
-  @override
-  final String? label;
-  @override
-  final String? currentGroupName;
-  @override
-  @JsonKey()
-  final String url;
-  @override
-  final DateTime? lastUpdateDate;
-  @override
-  final Duration autoUpdateDuration;
-  @override
-  final UserInfo? userInfo;
-  @override
-  @JsonKey()
-  final bool autoUpdate;
-  final Map<String, String> _selectedMap;
-  @override
-  @JsonKey()
-  Map<String, String> get selectedMap {
-    if (_selectedMap is EqualUnmodifiableMapView) return _selectedMap;
-    // ignore: implicit_dynamic_type
-    return EqualUnmodifiableMapView(_selectedMap);
-  }
-
-  final Set<String> _unfoldSet;
-  @override
-  @JsonKey()
-  Set<String> get unfoldSet {
-    if (_unfoldSet is EqualUnmodifiableSetView) return _unfoldSet;
-    // ignore: implicit_dynamic_type
-    return EqualUnmodifiableSetView(_unfoldSet);
-  }
-
-  @override
-  String toString() {
-    return 'Profile(id: $id, label: $label, currentGroupName: $currentGroupName, url: $url, lastUpdateDate: $lastUpdateDate, autoUpdateDuration: $autoUpdateDuration, userInfo: $userInfo, autoUpdate: $autoUpdate, selectedMap: $selectedMap, unfoldSet: $unfoldSet)';
-  }
-
-  @override
-  bool operator ==(Object other) {
-    return identical(this, other) ||
-        (other.runtimeType == runtimeType &&
-            other is _$ProfileImpl &&
-            (identical(other.id, id) || other.id == id) &&
-            (identical(other.label, label) || other.label == label) &&
-            (identical(other.currentGroupName, currentGroupName) ||
-                other.currentGroupName == currentGroupName) &&
-            (identical(other.url, url) || other.url == url) &&
-            (identical(other.lastUpdateDate, lastUpdateDate) ||
-                other.lastUpdateDate == lastUpdateDate) &&
-            (identical(other.autoUpdateDuration, autoUpdateDuration) ||
-                other.autoUpdateDuration == autoUpdateDuration) &&
-            (identical(other.userInfo, userInfo) ||
-                other.userInfo == userInfo) &&
-            (identical(other.autoUpdate, autoUpdate) ||
-                other.autoUpdate == autoUpdate) &&
-            const DeepCollectionEquality()
-                .equals(other._selectedMap, _selectedMap) &&
-            const DeepCollectionEquality()
-                .equals(other._unfoldSet, _unfoldSet));
-  }
-
-  @JsonKey(ignore: true)
-  @override
-  int get hashCode => Object.hash(
-      runtimeType,
-      id,
-      label,
-      currentGroupName,
-      url,
-      lastUpdateDate,
-      autoUpdateDuration,
-      userInfo,
-      autoUpdate,
-      const DeepCollectionEquality().hash(_selectedMap),
-      const DeepCollectionEquality().hash(_unfoldSet));
-
-  @JsonKey(ignore: true)
-  @override
-  @pragma('vm:prefer-inline')
-  _$$ProfileImplCopyWith<_$ProfileImpl> get copyWith =>
-      __$$ProfileImplCopyWithImpl<_$ProfileImpl>(this, _$identity);
-
-  @override
-  Map<String, dynamic> toJson() {
-    return _$$ProfileImplToJson(
-      this,
-    );
-  }
-}
-
-abstract class _Profile implements Profile {
-  const factory _Profile(
-      {required final String id,
-      final String? label,
-      final String? currentGroupName,
-      final String url,
-      final DateTime? lastUpdateDate,
-      required final Duration autoUpdateDuration,
-      final UserInfo? userInfo,
-      final bool autoUpdate,
-      final Map<String, String> selectedMap,
-      final Set<String> unfoldSet}) = _$ProfileImpl;
-
-  factory _Profile.fromJson(Map<String, dynamic> json) = _$ProfileImpl.fromJson;
-
-  @override
-  String get id;
-  @override
-  String? get label;
-  @override
-  String? get currentGroupName;
-  @override
-  String get url;
-  @override
-  DateTime? get lastUpdateDate;
-  @override
-  Duration get autoUpdateDuration;
-  @override
-  UserInfo? get userInfo;
-  @override
-  bool get autoUpdate;
-  @override
-  Map<String, String> get selectedMap;
-  @override
-  Set<String> get unfoldSet;
-  @override
-  @JsonKey(ignore: true)
-  _$$ProfileImplCopyWith<_$ProfileImpl> get copyWith =>
-      throw _privateConstructorUsedError;
-}
--- a/Show More
+++ b/Show More