Update ndk version

cache
Optimize android vpn performance
2025-04-15 16:52:52 +08:00 · 2025-04-15 16:39:20 +08:00 · 2025-04-15 15:54:36 +08:00
175 changed files with 2931 additions and 8658 deletions
--- a/.github/ISSUE_TEMPLATE/bug_report.yml
+++ b/.github/ISSUE_TEMPLATE/bug_report.yml
@@ -1,57 +0,0 @@
-name: 问题反馈 / Bug report
-title: "[BUG] "
-description: 反馈你遇到的问题 / Report the issue you are experiencing
-
-body:
-  - type: markdown
-    attributes:
-      value: |
-        ## 在提交问题之前，请确认以下事项：
-        1. 请务必给issue填写一个简洁明了的标题，以便他人快速检索
-        2. 请确保[已有的问题](https://github.com/chen08209/FlClash/issues?q=is%3Aissue) 中没有人提交过相似issue，否则请在已有的issue下进行讨论
-        3. 请务必按照模板规范详细描述问题，否则issue将会被直接关闭
-        ## Before submitting the issue, please make sure of the following checklist:
-        1. Please be sure to fill in a concise and clear title for the issue so that others can quickly search
-        2. Please make sure there is no similar issue in the [existing issues](https://github.com/chen08209/FlClash/issues?q=is%3Aissue), otherwise please discuss under the existing issue
-        3. Please describe the problem in detail according to the template specification, otherwise issue will be closed directly.
-  - type: textarea
-    id: description
-    attributes:
-      label: 问题描述 / Describe the bug
-      description: 详细清晰地描述你遇到的问题，并配合截图 / Describe the problem you encountered in detail and clearly, and provide screenshots
-    validations:
-      required: true
-  - type: textarea
-    attributes:
-      label: 软件版本 / Version
-      description: 请提供FlClash的具体版本 / Please provide the specific version of FlClash.
-    validations:
-      required: true
-  - type: textarea
-    attributes:
-      label: 复现步骤 / To Reproduce
-      description: 请提供复现问题的步骤 / Steps to reproduce the behavior
-    validations:
-      required: true
-  - type: dropdown
-    attributes:
-      label: 操作系统 / OS
-      options:
-        - Android
-        - Windows
-        - MacOS
-        - Linux
-    validations:
-      required: true
-  - type: input
-    attributes:
-      label: 操作系统版本 / OS Version
-      description: 请提供你的操作系统版本，Linux请额外提供桌面环境及窗口系统 / Please provide your OS version, for Linux, please also provide the desktop environment and window system
-    validations:
-      required: true
-  - type: textarea
-    attributes:
-      label: 日志(勿上传日志文件，请粘贴日志内容) / Log (Do not upload the log file, paste the log content directly)
-      description: 请提供完整或相关部分的Debug日志（请在“软件左侧菜单”->“设置”->“日志等级”调整到debug / Please provide a complete or relevant Debug log (please adjust it to debug in the left menu of software-> Settings-> Log Level)
-    validations:
-      required: true
--- a/.github/ISSUE_TEMPLATE/config.yml
+++ b/.github/ISSUE_TEMPLATE/config.yml
@@ -1,4 +0,0 @@
-contact_links:
-  - name: 讨论交流 / Communication
-    url: https://t.me/+G-veVtwBOl4wODc1
-    about: 在 Telegram 群组中与其他用户讨论交流 / Communicate with other users in the Telegram group
--- a/.github/ISSUE_TEMPLATE/feature_request.yml
+++ b/.github/ISSUE_TEMPLATE/feature_request.yml
@@ -1,42 +0,0 @@
-name: 功能请求 / Feature request
-title: "[Feature] "
-description: 提出你的功能请求 / Propose your feature request
-
-body:
-  - type: markdown
-    attributes:
-      value: |
-        ## 在提交问题之前，请确认以下事项：
-        1. 请务必给issue填写一个简洁明了的标题，以便他人快速检索
-        2. 请确保[已有的问题](https://github.com/chen08209/FlClash/issues?q=is%3Aissue) 中没有人提交过相似issue，否则请在已有的issue下进行讨论
-        3. 请务必按照模板规范详细描述问题，否则issue将会被直接关闭
-        ## Before submitting the issue, please make sure of the following checklist:
-        1. Please be sure to fill in a concise and clear title for the issue so that others can quickly search
-        2. Please make sure there is no similar issue in the [existing issues](https://github.com/chen08209/FlClash/issues?q=is%3Aissue), otherwise please discuss under the existing issue
-        3. Please describe the problem in detail according to the template specification, otherwise issue will be closed directly.
-
-  - type: textarea
-    id: description
-    attributes:
-      label: 功能描述 / Feature description
-      description: 详细清晰地描述你的功能请求 / A clear and concise description of what the feature is
-    validations:
-      required: true
-  - type: textarea
-    attributes:
-      label: 使用场景 / Use case
-      description: 请描述你的功能请求的使用场景 / Please describe the use case of your feature request
-    validations:
-      required: true
-  - type: checkboxes
-    id: os-labels
-    attributes:
-      label: 适用系统 / Target OS
-      description: 请选择该功能适用的操作系统（至少选择一个） / Please select the operating system(s) for this feature request (select at least one)
-      options:
-        - label: Android
-        - label: Windows
-        - label: MacOS
-        - label: Linux
-    validations:
-      required: true
--- a/.github/workflows/build.yaml
+++ b/.github/workflows/build.yaml
@@ -19,7 +19,7 @@ jobs:
            os: windows-latest
            arch: amd64
          - platform: linux
-            os: ubuntu-22.04
+            os: ubuntu-latest
            arch: amd64
          - platform: macos
            os: macos-13
@@ -27,27 +27,29 @@ jobs:
          - platform: macos
            os: macos-latest
            arch: arm64
-          - platform: windows
-            os: windows-11-arm
-            arch: arm64
-          - platform: linux
-            os: ubuntu-24.04-arm
-            arch: arm64

    steps:
-      - name: Setup rust
-        if: startsWith(matrix.os, 'windows-11-arm')
-        run: |
-          Invoke-WebRequest -Uri "https://win.rustup.rs/aarch64" -OutFile rustup-init.exe
-          .\rustup-init.exe -y --default-toolchain stable
-          $cargoPath = "$env:USERPROFILE\.cargo\bin"
-          Add-Content $env:GITHUB_PATH $cargoPath
-
      - name: Checkout
        uses: actions/checkout@v4
        with:
          submodules: recursive

+      - name: Setup JAVA
+        if: startsWith(matrix.platform,'android')
+        uses: actions/setup-java@v4
+        with:
+          distribution: 'zulu'
+          java-version: 17
+
+      - name: Setup NDK
+        if: startsWith(matrix.platform,'android')
+        uses: nttld/setup-ndk@v1
+        id: setup-ndk
+        with:
+          ndk-version: r28
+          add-to-path: true
+          link-to-sdk: true
+
      - name: Setup Android Signing
        if: startsWith(matrix.platform,'android')
        run: |
@@ -56,17 +58,18 @@ jobs:
          echo "storePassword=${{ secrets.STORE_PASSWORD }}" >> android/local.properties
          echo "keyPassword=${{ secrets.KEY_PASSWORD }}" >> android/local.properties

+
      - name: Setup Go
        uses: actions/setup-go@v5
        with:
-          go-version: '1.24.0'
+          go-version: 'stable'
          cache-dependency-path: |
            core/go.sum

      - name: Setup Flutter
        uses: subosito/flutter-action@v2
        with:
-          channel: ${{ (startsWith(matrix.os, 'windows-11-arm') || startsWith(matrix.os, 'ubuntu-24.04-arm')) && 'master' || 'stable' }}
+          channel: stable
          cache: true

      - name: Get Flutter Dependency
@@ -201,7 +204,6 @@ jobs:
        env:
          TELEGRAM_BOT_TOKEN: ${{ secrets.TELEGRAM_BOT_TOKEN }}
          TAG: ${{ github.ref_name }}
-          RUN_ID: ${{ github.run_id }}
        run: |
          python -m pip install --upgrade pip
          pip install requests
@@ -212,14 +214,6 @@ jobs:
          version=$(echo "${{ github.ref_name }}" | sed 's/^v//')
          sed "s|VERSION|$version|g" ./.github/release_template.md >> release.md

-      - name: Generate sha256
-        if: env.IS_STABLE == 'true'
-        run: |
-          cd ./dist
-          for file in $(find . -type f -not -name "*.sha256"); do
-            sha256sum "$file" > "${file}.sha256"
-          done  
-
      - name: Release
        if: ${{ env.IS_STABLE == 'true' }}
        uses: softprops/action-gh-release@v2
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,57 +1,3 @@
-## v0.8.84
-
- Fix windows service verify issues
-
- Update changelog
-
-## v0.8.83
-
- Add windows server mode start process verify
-
- Add linux deb dependencies
-
- Add backup recovery strategy select
-
- Support custom text scaling
-
- Optimize the display of different text scale
-
- Optimize windows setup experience
-
- Optimize startTun performance
-
- Optimize android tv experience
-
- Optimize default option
-
- Optimize computed text size
-
- Optimize hyperOS freeform window
-
- Add developer mode
-
- Update core
-
- Optimize more details
-
- Add issues template
-
- Update changelog
-
-## v0.8.82
-
- Optimize android vpn performance
-
- Add custom primary color and color scheme
-
- Add linux nad windows arm release
-
- Optimize requests and logs page
-
- Fix map input page delete issues
-
- Update changelog
-
 ## v0.8.81

 - Add rule override
--- a/2
+++ b/2
@@ -2,8 +2,6 @@ android_arm64:
 	dart ./setup.dart android --arch arm64
 macos_arm64:
 	dart ./setup.dart macos --arch arm64
-android_app:
-	dart ./setup.dart android
 android_arm64_core:
 	dart ./setup.dart android --arch arm64 --out core
 macos_arm64_core:
--- a/README.md
+++ b/README.md
@@ -41,8 +41,8 @@ on Mobile:
 ⚠️ Make sure to install the following dependencies before using them

   ```bash
-    sudo apt-get install libayatana-appindicator3-dev
-    sudo apt-get install libkeybinder-3.0-dev
+    sudo apt-get install appindicator3-0.1 libappindicator3-dev
+    sudo apt-get install keybinder-3.0
   ```

 ### Android
--- a/README_zh_CN.md
+++ b/README_zh_CN.md
@@ -41,8 +41,8 @@ on Mobile:
 ⚠️ 使用前请确保安装以下依赖

   ```bash
-    sudo apt-get install libayatana-appindicator3-dev
-    sudo apt-get install libkeybinder-3.0-dev
+    sudo apt-get install appindicator3-0.1 libappindicator3-dev
+    sudo apt-get install keybinder-3.0
   ```

 ### Android
--- a/android/app/build.gradle
+++ b/android/app/build.gradle
@@ -31,8 +31,7 @@ def isRelease = defStoreFile.exists() && defStorePassword != null && defKeyAlias

 android {
    namespace "com.follow.clash"
-    compileSdk 35
-    ndkVersion = "28.0.13004108"
+    compileSdkVersion 35

    compileOptions {
        sourceCompatibility JavaVersion.VERSION_17
@@ -73,9 +72,6 @@ android {
            applicationIdSuffix '.debug'
        }
        release {
-            minifyEnabled true
-            debuggable false
-            
            if (isRelease) {
                signingConfig signingConfigs.release
            } else {
--- a/android/app/src/main/AndroidManifest.xml
+++ b/android/app/src/main/AndroidManifest.xml
@@ -44,7 +44,6 @@
            <intent-filter>
                <action android:name="android.intent.action.MAIN" />
                <category android:name="android.intent.category.LAUNCHER" />
-                <category android:name="android.intent.category.LEANBACK_LAUNCHER" />
            </intent-filter>
            <intent-filter>
                <action android:name="android.service.quicksettings.action.QS_TILE_PREFERENCES" />
--- a/android/app/src/main/kotlin/com/follow/clash/GlobalState.kt
+++ b/android/app/src/main/kotlin/com/follow/clash/GlobalState.kt
@@ -7,10 +7,6 @@ import com.follow.clash.plugins.VpnPlugin
 import io.flutter.FlutterInjector
 import io.flutter.embedding.engine.FlutterEngine
 import io.flutter.embedding.engine.dart.DartExecutor
-import kotlinx.coroutines.CoroutineScope
-import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.launch
-import kotlinx.coroutines.withContext
 import java.util.concurrent.locks.ReentrantLock
 import kotlin.concurrent.withLock

@@ -24,10 +20,6 @@ enum class RunState {
 object GlobalState {
    val runLock = ReentrantLock()

-    const val NOTIFICATION_CHANNEL = "FlClash"
-
-    const val NOTIFICATION_ID = 1
-
    val runState: MutableLiveData<RunState> = MutableLiveData<RunState>(RunState.STOP)
    var flutterEngine: FlutterEngine? = null
    private var serviceEngine: FlutterEngine? = null
@@ -37,15 +29,6 @@ object GlobalState {
        return currentEngine?.plugins?.get(AppPlugin::class.java) as AppPlugin?
    }

-    fun syncStatus() {
-        CoroutineScope(Dispatchers.Default).launch {
-            val status = getCurrentVPNPlugin()?.getStatus() ?: false
-            withContext(Dispatchers.Main){
-                runState.value = if (status) RunState.START else RunState.STOP
-            }
-        }
-    }
-
    suspend fun getText(text: String): String {
        return getCurrentAppPlugin()?.getText(text) ?: ""
    }
--- a/android/app/src/main/kotlin/com/follow/clash/MainActivity.kt
+++ b/android/app/src/main/kotlin/com/follow/clash/MainActivity.kt
@@ -1,5 +1,6 @@
 package com.follow.clash

+import com.follow.clash.core.Core
 import com.follow.clash.plugins.AppPlugin
 import com.follow.clash.plugins.ServicePlugin
 import com.follow.clash.plugins.TilePlugin
@@ -17,7 +18,6 @@ class MainActivity : FlutterActivity() {

    override fun onDestroy() {
        GlobalState.flutterEngine = null
-        GlobalState.runState.value = RunState.STOP
        super.onDestroy()
    }
 }
--- a/android/app/src/main/kotlin/com/follow/clash/extensions/Ext.kt
+++ b/android/app/src/main/kotlin/com/follow/clash/extensions/Ext.kt
@@ -27,6 +27,7 @@ import java.util.concurrent.locks.ReentrantLock
 import kotlin.coroutines.resume
 import kotlin.coroutines.suspendCoroutine

+
 suspend fun Drawable.getBase64(): String {
    val drawable = this
    return withContext(Dispatchers.IO) {
--- a/android/app/src/main/kotlin/com/follow/clash/models/Package.kt
+++ b/android/app/src/main/kotlin/com/follow/clash/models/Package.kt
@@ -3,7 +3,6 @@ package com.follow.clash.models
 data class Package(
    val packageName: String,
    val label: String,
-    val system: Boolean,
-    val internet: Boolean,
+    val isSystem: Boolean,
    val lastUpdateTime: Long,
 )
--- a/android/app/src/main/kotlin/com/follow/clash/plugins/AppPlugin.kt
+++ b/android/app/src/main/kotlin/com/follow/clash/plugins/AppPlugin.kt
@@ -293,17 +293,19 @@ class AppPlugin : FlutterPlugin, MethodChannel.MethodCallHandler, ActivityAware
        if (packages.isNotEmpty()) return packages
        packageManager?.getInstalledPackages(PackageManager.GET_META_DATA or PackageManager.GET_PERMISSIONS)
            ?.filter {
-                it.packageName != FlClashApplication.getAppContext().packageName || it.packageName == "android"
+                it.packageName != FlClashApplication.getAppContext().packageName && (
+                        it.requestedPermissions?.contains(Manifest.permission.INTERNET) == true
+                                || it.packageName == "android"
+                        )

            }?.map {
-                Package(
-                    packageName = it.packageName,
-                    label = it.applicationInfo?.loadLabel(packageManager).toString(),
-                    system = (it.applicationInfo?.flags?.and(ApplicationInfo.FLAG_SYSTEM)) == 1,
-                    lastUpdateTime = it.lastUpdateTime,
-                    internet = it.requestedPermissions?.contains(Manifest.permission.INTERNET) == true
-                )
-            }?.let { packages.addAll(it) }
+            Package(
+                packageName = it.packageName,
+                label = it.applicationInfo?.loadLabel(packageManager).toString(),
+                isSystem = (it.applicationInfo?.flags?.and(ApplicationInfo.FLAG_SYSTEM)) == 1,
+                lastUpdateTime = it.lastUpdateTime
+            )
+        }?.let { packages.addAll(it) }
        return packages
    }

--- a/android/app/src/main/kotlin/com/follow/clash/plugins/ServicePlugin.kt
+++ b/android/app/src/main/kotlin/com/follow/clash/plugins/ServicePlugin.kt
@@ -51,7 +51,6 @@ data object ServicePlugin : FlutterPlugin, MethodChannel.MethodCallHandler {
        }
    }

-
    private fun handleDestroy() {
        GlobalState.destroyServiceEngine()
    }
--- a/android/app/src/main/kotlin/com/follow/clash/plugins/VpnPlugin.kt
+++ b/android/app/src/main/kotlin/com/follow/clash/plugins/VpnPlugin.kt
@@ -168,10 +168,8 @@ data object VpnPlugin : FlutterPlugin, MethodChannel.MethodCallHandler {
        try {
            if (GlobalState.runState.value != RunState.START) return
            val data = flutterMethodChannel.awaitResult<String>("getStartForegroundParams")
-            val startForegroundParams = if (data != null) Gson().fromJson(
+            val startForegroundParams = Gson().fromJson(
                data, StartForegroundParams::class.java
-            ) else StartForegroundParams(
-                title = "", content = ""
            )
            if (lastStartForegroundParams != startForegroundParams) {
                lastStartForegroundParams = startForegroundParams
@@ -200,13 +198,6 @@ data object VpnPlugin : FlutterPlugin, MethodChannel.MethodCallHandler {
        timerJob = null
    }

-
-    suspend fun getStatus(): Boolean? {
-        return withContext(Dispatchers.Default) {
-            flutterMethodChannel.awaitResult<Boolean>("status", null)
-        }
-    }
-
    private fun handleStartService() {
        if (flClashService == null) {
            bindService()
@@ -255,9 +246,9 @@ data object VpnPlugin : FlutterPlugin, MethodChannel.MethodCallHandler {
        GlobalState.runLock.withLock {
            if (GlobalState.runState.value == RunState.STOP) return
            GlobalState.runState.value = RunState.STOP
-            flClashService?.stop()
            stopForegroundJob()
            Core.stopTun()
+            flClashService?.stop()
            GlobalState.handleTryDestroy()
        }
    }
--- a/android/app/src/main/kotlin/com/follow/clash/services/BaseServiceInterface.kt
+++ b/android/app/src/main/kotlin/com/follow/clash/services/BaseServiceInterface.kt
@@ -1,26 +1,6 @@
 package com.follow.clash.services

-import android.annotation.SuppressLint
-import android.app.Notification
-import android.app.Notification.FOREGROUND_SERVICE_IMMEDIATE
-import android.app.NotificationChannel
-import android.app.NotificationManager
-import android.app.PendingIntent
-import android.app.Service
-import android.content.Intent
-import android.content.pm.ServiceInfo.FOREGROUND_SERVICE_TYPE_DATA_SYNC
-import android.os.Build
-import androidx.core.app.NotificationCompat
-import com.follow.clash.GlobalState
-import com.follow.clash.MainActivity
-import com.follow.clash.R
-import com.follow.clash.extensions.getActionPendingIntent
 import com.follow.clash.models.VpnOptions
-import io.flutter.Log
-import kotlinx.coroutines.CoroutineScope
-import kotlinx.coroutines.Deferred
-import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.async

 interface BaseServiceInterface {

@@ -29,70 +9,4 @@ interface BaseServiceInterface {
    fun stop()

    suspend fun startForeground(title: String, content: String)
-}
-
-fun Service.createFlClashNotificationBuilder(): Deferred<NotificationCompat.Builder> =
-    CoroutineScope(Dispatchers.Main).async {
-        val stopText = GlobalState.getText("stop")
-        val intent = Intent(this@createFlClashNotificationBuilder, MainActivity::class.java)
-
-        val pendingIntent = if (Build.VERSION.SDK_INT >= 31) {
-            PendingIntent.getActivity(
-                this@createFlClashNotificationBuilder,
-                0,
-                intent,
-                PendingIntent.FLAG_IMMUTABLE or PendingIntent.FLAG_UPDATE_CURRENT
-            )
-        } else {
-            PendingIntent.getActivity(
-                this@createFlClashNotificationBuilder, 0, intent, PendingIntent.FLAG_UPDATE_CURRENT
-            )
-        }
-
-        with(
-            NotificationCompat.Builder(
-                this@createFlClashNotificationBuilder, GlobalState.NOTIFICATION_CHANNEL
-            )
-        ) {
-            setSmallIcon(R.drawable.ic_stat_name)
-            setContentTitle("FlClash")
-            setContentIntent(pendingIntent)
-            setCategory(NotificationCompat.CATEGORY_SERVICE)
-            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.S) {
-                foregroundServiceBehavior = FOREGROUND_SERVICE_IMMEDIATE
-            }
-            setOngoing(true)
-            addAction(
-                0, stopText, getActionPendingIntent("STOP")
-            )
-            setShowWhen(false)
-            setOnlyAlertOnce(true)
-        }
-    }
-
-@SuppressLint("ForegroundServiceType")
-fun Service.startForeground(notification: Notification) {
-    if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
-        val manager = getSystemService(NotificationManager::class.java)
-        var channel = manager?.getNotificationChannel(GlobalState.NOTIFICATION_CHANNEL)
-        if (channel == null) {
-            Log.d("[FlClash]","createNotificationChannel===>")
-            channel = NotificationChannel(
-                GlobalState.NOTIFICATION_CHANNEL, "FlClash", NotificationManager.IMPORTANCE_LOW
-            )
-            manager?.createNotificationChannel(channel)
-        }
-    }
-
-    if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.UPSIDE_DOWN_CAKE) {
-        try {
-            startForeground(
-                GlobalState.NOTIFICATION_ID, notification, FOREGROUND_SERVICE_TYPE_DATA_SYNC
-            )
-        } catch (_: Exception) {
-            startForeground(GlobalState.NOTIFICATION_ID, notification)
-        }
-    } else {
-        startForeground(GlobalState.NOTIFICATION_ID, notification)
-    }
 }
--- a/android/app/src/main/kotlin/com/follow/clash/services/FlClashService.kt
+++ b/android/app/src/main/kotlin/com/follow/clash/services/FlClashService.kt
@@ -1,51 +1,29 @@
 package com.follow.clash.services

 import android.annotation.SuppressLint
+import android.app.Notification.FOREGROUND_SERVICE_IMMEDIATE
+import android.app.NotificationChannel
+import android.app.NotificationManager
+import android.app.PendingIntent
 import android.app.Service
 import android.content.Intent
+import android.content.pm.ServiceInfo.FOREGROUND_SERVICE_TYPE_DATA_SYNC
 import android.os.Binder
 import android.os.Build
 import android.os.IBinder
 import androidx.core.app.NotificationCompat
 import com.follow.clash.GlobalState
+import com.follow.clash.MainActivity
+import com.follow.clash.extensions.getActionPendingIntent
 import com.follow.clash.models.VpnOptions
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.Deferred
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.async


 class FlClashService : Service(), BaseServiceInterface {

-    override fun start(options: VpnOptions) = 0
-
-    override fun stop() {
-        stopSelf()
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) {
-            stopForeground(STOP_FOREGROUND_REMOVE)
-        }
-    }
-    
-    private var cachedBuilder: NotificationCompat.Builder? = null
-
-    private suspend fun notificationBuilder(): NotificationCompat.Builder {
-        if (cachedBuilder == null) {
-            cachedBuilder = createFlClashNotificationBuilder().await()
-        }
-        return cachedBuilder!!
-    }
-
-    @SuppressLint("ForegroundServiceType")
-    override suspend fun startForeground(title: String, content: String) {
-        startForeground(
-            notificationBuilder()
-                .setContentTitle(title)
-                .setContentText(content).build()
-        )
-    }
-
-    override fun onTrimMemory(level: Int) {
-        super.onTrimMemory(level)
-        GlobalState.getCurrentVPNPlugin()?.requestGc()
-    }
-
-
    private val binder = LocalBinder()

    inner class LocalBinder : Binder() {
@@ -60,8 +38,93 @@ class FlClashService : Service(), BaseServiceInterface {
        return super.onUnbind(intent)
    }

-    override fun onDestroy() {
-        stop()
-        super.onDestroy()
+    private val CHANNEL = "FlClash"
+
+    private val notificationId: Int = 1
+
+    private val notificationBuilderDeferred: Deferred<NotificationCompat.Builder> by lazy {
+        CoroutineScope(Dispatchers.Main).async {
+            val stopText = GlobalState.getText("stop")
+
+            val intent = Intent(
+                this@FlClashService, MainActivity::class.java
+            )
+
+            val pendingIntent = if (Build.VERSION.SDK_INT >= 31) {
+                PendingIntent.getActivity(
+                    this@FlClashService,
+                    0,
+                    intent,
+                    PendingIntent.FLAG_IMMUTABLE or PendingIntent.FLAG_UPDATE_CURRENT
+                )
+            } else {
+                PendingIntent.getActivity(
+                    this@FlClashService,
+                    0,
+                    intent,
+                    PendingIntent.FLAG_UPDATE_CURRENT
+                )
+            }
+
+            with(NotificationCompat.Builder(this@FlClashService, CHANNEL)) {
+                setSmallIcon(com.follow.clash.R.drawable.ic_stat_name)
+                setContentTitle("FlClash")
+                setContentIntent(pendingIntent)
+                setCategory(NotificationCompat.CATEGORY_SERVICE)
+                priority = NotificationCompat.PRIORITY_MIN
+                if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.S) {
+                    foregroundServiceBehavior = FOREGROUND_SERVICE_IMMEDIATE
+                }
+                addAction(
+                    0,
+                    stopText, // 使用 suspend 函数获取的文本
+                    getActionPendingIntent("STOP")
+                )
+                setOngoing(true)
+                setShowWhen(false)
+                setOnlyAlertOnce(true)
+                setAutoCancel(true)
+            }
+        }
+    }
+
+    private suspend fun getNotificationBuilder(): NotificationCompat.Builder {
+        return notificationBuilderDeferred.await()
+    }
+
+    override fun start(options: VpnOptions) = 0
+
+    override fun stop() {
+        stopSelf()
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) {
+            stopForeground(STOP_FOREGROUND_REMOVE)
+        }
+    }
+
+
+    @SuppressLint("ForegroundServiceType")
+    override suspend fun startForeground(title: String, content: String) {
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
+            val manager = getSystemService(NotificationManager::class.java)
+            var channel = manager?.getNotificationChannel(CHANNEL)
+            if (channel == null) {
+                channel =
+                    NotificationChannel(CHANNEL, "FlClash", NotificationManager.IMPORTANCE_LOW)
+                manager?.createNotificationChannel(channel)
+            }
+        }
+        val notification =
+            getNotificationBuilder()
+                .setContentTitle(title)
+                .setContentText(content).build()
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.UPSIDE_DOWN_CAKE) {
+            try {
+                startForeground(notificationId, notification, FOREGROUND_SERVICE_TYPE_DATA_SYNC)
+            } catch (_: Exception) {
+                startForeground(notificationId, notification)
+            }
+        } else {
+            startForeground(notificationId, notification)
+        }
    }
 }
--- a/android/app/src/main/kotlin/com/follow/clash/services/FlClashTileService.kt
+++ b/android/app/src/main/kotlin/com/follow/clash/services/FlClashTileService.kt
@@ -33,7 +33,6 @@ class FlClashTileService : TileService() {

    override fun onStartListening() {
        super.onStartListening()
-        GlobalState.syncStatus()
        GlobalState.runState.value?.let { updateTile(it) }
        GlobalState.runState.observeForever(observer)
    }
--- a/android/app/src/main/kotlin/com/follow/clash/services/FlClashVpnService.kt
+++ b/android/app/src/main/kotlin/com/follow/clash/services/FlClashVpnService.kt
@@ -1,7 +1,12 @@
 package com.follow.clash.services

 import android.annotation.SuppressLint
+import android.app.Notification.FOREGROUND_SERVICE_IMMEDIATE
+import android.app.NotificationChannel
+import android.app.NotificationManager
+import android.app.PendingIntent
 import android.content.Intent
+import android.content.pm.ServiceInfo.FOREGROUND_SERVICE_TYPE_DATA_SYNC
 import android.net.ProxyInfo
 import android.net.VpnService
 import android.os.Binder
@@ -12,13 +17,18 @@ import android.os.RemoteException
 import android.util.Log
 import androidx.core.app.NotificationCompat
 import com.follow.clash.GlobalState
+import com.follow.clash.MainActivity
+import com.follow.clash.R
+import com.follow.clash.extensions.getActionPendingIntent
 import com.follow.clash.extensions.getIpv4RouteAddress
 import com.follow.clash.extensions.getIpv6RouteAddress
 import com.follow.clash.extensions.toCIDR
 import com.follow.clash.models.AccessControlMode
 import com.follow.clash.models.VpnOptions
 import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.Deferred
 import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.async
 import kotlinx.coroutines.launch


@@ -33,10 +43,6 @@ class FlClashVpnService : VpnService(), BaseServiceInterface {
            if (options.ipv4Address.isNotEmpty()) {
                val cidr = options.ipv4Address.toCIDR()
                addAddress(cidr.address, cidr.prefixLength)
-                Log.d(
-                    "addAddress",
-                    "address: ${cidr.address} prefixLength:${cidr.prefixLength}"
-                )
                val routeAddress = options.getIpv4RouteAddress()
                if (routeAddress.isNotEmpty()) {
                    try {
@@ -53,39 +59,26 @@ class FlClashVpnService : VpnService(), BaseServiceInterface {
                } else {
                    addRoute("0.0.0.0", 0)
                }
-            } else {
-                addRoute("0.0.0.0", 0)
            }
-            try {
-                if (options.ipv6Address.isNotEmpty()) {
-                    val cidr = options.ipv6Address.toCIDR()
-                    Log.d(
-                        "addAddress6",
-                        "address: ${cidr.address} prefixLength:${cidr.prefixLength}"
-                    )
-                    addAddress(cidr.address, cidr.prefixLength)
-                    val routeAddress = options.getIpv6RouteAddress()
-                    if (routeAddress.isNotEmpty()) {
-                        try {
-                            routeAddress.forEach { i ->
-                                Log.d(
-                                    "addRoute6",
-                                    "address: ${i.address} prefixLength:${i.prefixLength}"
-                                )
-                                addRoute(i.address, i.prefixLength)
-                            }
-                        } catch (_: Exception) {
-                            addRoute("::", 0)
+            if (options.ipv6Address.isNotEmpty()) {
+                val cidr = options.ipv6Address.toCIDR()
+                addAddress(cidr.address, cidr.prefixLength)
+                val routeAddress = options.getIpv6RouteAddress()
+                if (routeAddress.isNotEmpty()) {
+                    try {
+                        routeAddress.forEach { i ->
+                            Log.d(
+                                "addRoute6",
+                                "address: ${i.address} prefixLength:${i.prefixLength}"
+                            )
+                            addRoute(i.address, i.prefixLength)
                        }
-                    } else {
+                    } catch (_: Exception) {
                        addRoute("::", 0)
                    }
+                } else {
+                    addRoute("::", 0)
                }
-            }catch (_:Exception){
-                Log.d(
-                    "addAddress6",
-                    "IPv6 is not supported."
-                )
            }
            addDnsServer(options.dnsServerAddress)
            setMtu(9000)
@@ -135,22 +128,82 @@ class FlClashVpnService : VpnService(), BaseServiceInterface {
        }
    }

-    private var cachedBuilder: NotificationCompat.Builder? = null
+    private val CHANNEL = "FlClash"

-    private suspend fun notificationBuilder(): NotificationCompat.Builder {
-        if (cachedBuilder == null) {
-            cachedBuilder = createFlClashNotificationBuilder().await()
+    private val notificationId: Int = 1
+
+    private val notificationBuilderDeferred: Deferred<NotificationCompat.Builder> by lazy {
+        CoroutineScope(Dispatchers.Main).async {
+            val stopText = GlobalState.getText("stop")
+            val intent = Intent(this@FlClashVpnService, MainActivity::class.java)
+
+            val pendingIntent = if (Build.VERSION.SDK_INT >= 31) {
+                PendingIntent.getActivity(
+                    this@FlClashVpnService,
+                    0,
+                    intent,
+                    PendingIntent.FLAG_IMMUTABLE or PendingIntent.FLAG_UPDATE_CURRENT
+                )
+            } else {
+                PendingIntent.getActivity(
+                    this@FlClashVpnService,
+                    0,
+                    intent,
+                    PendingIntent.FLAG_UPDATE_CURRENT
+                )
+            }
+
+            with(NotificationCompat.Builder(this@FlClashVpnService, CHANNEL)) {
+                setSmallIcon(R.drawable.ic_stat_name)
+                setContentTitle("FlClash")
+                setContentIntent(pendingIntent)
+                setCategory(NotificationCompat.CATEGORY_SERVICE)
+                priority = NotificationCompat.PRIORITY_MIN
+                if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.S) {
+                    foregroundServiceBehavior = FOREGROUND_SERVICE_IMMEDIATE
+                }
+                setOngoing(true)
+                addAction(
+                    0,
+                    stopText,
+                    getActionPendingIntent("STOP")
+                )
+                setShowWhen(false)
+                setOnlyAlertOnce(true)
+                setAutoCancel(true)
+            }
        }
-        return cachedBuilder!!
+    }
+
+    private suspend fun getNotificationBuilder(): NotificationCompat.Builder {
+        return notificationBuilderDeferred.await()
    }

    @SuppressLint("ForegroundServiceType")
    override suspend fun startForeground(title: String, content: String) {
-        startForeground(
-            notificationBuilder()
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
+            val manager = getSystemService(NotificationManager::class.java)
+            var channel = manager?.getNotificationChannel(CHANNEL)
+            if (channel == null) {
+                channel =
+                    NotificationChannel(CHANNEL, "FlClash", NotificationManager.IMPORTANCE_LOW)
+                manager?.createNotificationChannel(channel)
+            }
+        }
+        val notification =
+            getNotificationBuilder()
                .setContentTitle(title)
-                .setContentText(content).build()
-        )
+                .setContentText(content)
+                .build()
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.UPSIDE_DOWN_CAKE) {
+            try {
+                startForeground(notificationId, notification, FOREGROUND_SERVICE_TYPE_DATA_SYNC)
+            } catch (_: Exception) {
+                startForeground(notificationId, notification)
+            }
+        } else {
+            startForeground(notificationId, notification)
+        }
    }

    override fun onTrimMemory(level: Int) {
--- a/android/core/build.gradle.kts
+++ b/android/core/build.gradle.kts
@@ -1,4 +1,4 @@
-import org.jetbrains.kotlin.ir.backend.js.transformers.irToJs.argumentsWithVarargAsSingleArray
+import com.android.build.gradle.tasks.MergeSourceSetFolders

 plugins {
    id("com.android.library")
@@ -12,11 +12,11 @@ android {

    defaultConfig {
        minSdk = 21
+        consumerProguardFiles("consumer-rules.pro")
    }

    buildTypes {
        release {
-            isJniDebuggable = false
            proguardFiles(
                getDefaultProguardFile("proguard-android-optimize.txt"),
                "proguard-rules.pro"
@@ -37,20 +37,16 @@ android {
        }
    }

-    kotlinOptions {
-        jvmTarget = "17"
-    }
-
    compileOptions {
-        sourceCompatibility = JavaVersion.VERSION_17
-        targetCompatibility = JavaVersion.VERSION_17
+        sourceCompatibility = JavaVersion.VERSION_11
+        targetCompatibility = JavaVersion.VERSION_11
+    }
+    kotlinOptions {
+        jvmTarget = "11"
    }
 }
-dependencies {
-    implementation("androidx.annotation:annotation-jvm:1.9.1")
-}

-val copyNativeLibs by tasks.register<Copy>("copyNativeLibs") {
+tasks.register<Copy>("copyNativeLibs") {
    doFirst {
        delete("src/main/jniLibs")
    }
@@ -58,8 +54,19 @@ val copyNativeLibs by tasks.register<Copy>("copyNativeLibs") {
    into("src/main/jniLibs")
 }

+tasks.withType<MergeSourceSetFolders>().configureEach {
+    dependsOn("copyNativeLibs")
+}
+
 afterEvaluate {
-    tasks.named("preBuild") {
-        dependsOn(copyNativeLibs)
+    tasks.named("assembleDebug").configure {
+        dependsOn("copyNativeLibs")
    }
+    tasks.named("assembleRelease").configure {
+        dependsOn("copyNativeLibs")
+    }
+}
+
+dependencies {
+    implementation("androidx.core:core-ktx:1.16.0")
 }
--- a/android/core/consumer-rules.pro
+++ b/android/core/consumer-rules.pro
--- a/android/core/src/main/cpp/CMakeLists.txt
+++ b/android/core/src/main/cpp/CMakeLists.txt
@@ -1,10 +1,8 @@
 cmake_minimum_required(VERSION 3.22.1)

+
 project("core")

-message("CMAKE_SOURCE_DIR ${CMAKE_SOURCE_DIR}")
-
-message("CMAKE_BUILD_TYPE ${CMAKE_BUILD_TYPE}")

 if (NOT "${CMAKE_BUILD_TYPE}" STREQUAL "Debug")
    add_compile_options(-O3)
@@ -23,16 +21,11 @@ if (NOT "${CMAKE_BUILD_TYPE}" STREQUAL "Debug")
            -Wl,--strip-all
            -Wl,--exclude-libs=ALL
    )
-
-    add_compile_options(-fvisibility=hidden -fvisibility-inlines-hidden)
 endif ()
-
 set(LIB_CLASH_PATH "${CMAKE_SOURCE_DIR}/../jniLibs/${ANDROID_ABI}/libclash.so")
-
-message("LIB_CLASH_PATH ${LIB_CLASH_PATH}")
 if (EXISTS ${LIB_CLASH_PATH})
-    message("Found libclash.so for ABI ${ANDROID_ABI}")
-    add_compile_definitions(LIBCLASH)
+    message(STATUS "Found libclash.so for ABI ${ANDROID_ABI}")
+    add_definitions(-D_LIBCLASH)
    include_directories(${CMAKE_SOURCE_DIR}/../jniLibs/${ANDROID_ABI})
    link_directories(${CMAKE_SOURCE_DIR}/../jniLibs/${ANDROID_ABI})
    add_library(${CMAKE_PROJECT_NAME} SHARED
@@ -41,7 +34,6 @@ if (EXISTS ${LIB_CLASH_PATH})
    target_link_libraries(${CMAKE_PROJECT_NAME}
            clash)
 else ()
-    message("Not found libclash.so for ABI ${ANDROID_ABI}")
    add_library(${CMAKE_PROJECT_NAME} SHARED
            jni_helper.cpp
            core.cpp)
--- a/android/core/src/main/cpp/core.cpp
+++ b/android/core/src/main/cpp/core.cpp
@@ -1,18 +1,21 @@
-#ifdef LIBCLASH
 #include <jni.h>
+
+#ifdef _LIBCLASH
+#include <jni.h>
+#include <string>
 #include "jni_helper.h"
 #include "libclash.h"

 extern "C"
 JNIEXPORT void JNICALL
-Java_com_follow_clash_core_Core_startTun(JNIEnv *env, jobject, const jint fd, jobject cb) {
-    const auto interface = new_global(cb);
+Java_com_follow_clash_core_Core_startTun(JNIEnv *env, jobject thiz, jint fd, jobject cb) {
+    auto interface = new_global(cb);
    startTUN(fd, interface);
 }

 extern "C"
 JNIEXPORT void JNICALL
-Java_com_follow_clash_core_Core_stopTun(JNIEnv *) {
+Java_com_follow_clash_core_Core_stopTun(JNIEnv *env, jobject thiz) {
    stopTun();
 }

@@ -23,50 +26,63 @@ static jmethodID m_tun_interface_resolve_process;

 static void release_jni_object_impl(void *obj) {
    ATTACH_JNI();
-    del_global(static_cast<jobject>(obj));
+    del_global((jobject) obj);
 }

-static void call_tun_interface_protect_impl(void *tun_interface, const int fd) {
+static void call_tun_interface_protect_impl(void *tun_interface, int fd) {
    ATTACH_JNI();
-    env->CallVoidMethod(static_cast<jobject>(tun_interface),
-                        m_tun_interface_protect,
-                        fd);
+    env->CallVoidMethod((jobject) tun_interface,
+                        (jmethodID) m_tun_interface_protect,
+                        (jint) fd);
 }

-static const char *
+static const char*
 call_tun_interface_resolve_process_impl(void *tun_interface, int protocol,
-                                        const char *source,
-                                        const char *target,
-                                        const int uid) {
+                                         const char *source,
+                                         const char *target,
+                                         int uid) {
    ATTACH_JNI();
-    const auto packageName = reinterpret_cast<jstring>(env->CallObjectMethod(static_cast<jobject>(tun_interface),
-                                                                       m_tun_interface_resolve_process,
-                                                                       protocol,
-                                                                       new_string(source),
-                                                                       new_string(target),
-                                                                       uid));
+    jstring packageName = (jstring)env->CallObjectMethod((jobject) tun_interface,
+                              (jmethodID) m_tun_interface_resolve_process,
+                              (jint) protocol,
+                              (jstring) new_string(source),
+                              (jstring) new_string(target),
+                              (jint) uid);
    return get_string(packageName);
 }

 extern "C"
 JNIEXPORT jint JNICALL
-JNI_OnLoad(JavaVM *vm, void *) {
+JNI_OnLoad(JavaVM *vm, void *reserved) {
    JNIEnv *env = nullptr;
-    if (vm->GetEnv(reinterpret_cast<void **>(&env), JNI_VERSION_1_6) != JNI_OK) {
+    if (vm->GetEnv((void **) &env, JNI_VERSION_1_6) != JNI_OK) {
        return JNI_ERR;
    }

    initialize_jni(vm, env);

-    const auto c_tun_interface = find_class("com/follow/clash/core/TunInterface");
+    jclass c_tun_interface = find_class("com/follow/clash/core/TunInterface");

    m_tun_interface_protect = find_method(c_tun_interface, "protect", "(I)V");
    m_tun_interface_resolve_process = find_method(c_tun_interface, "resolverProcess",
-                                                  "(ILjava/lang/String;Ljava/lang/String;I)Ljava/lang/String;");
+                                                   "(ILjava/lang/String;Ljava/lang/String;I)Ljava/lang/String;");

    registerCallbacks(&call_tun_interface_protect_impl,
                      &call_tun_interface_resolve_process_impl,
                      &release_jni_object_impl);
    return JNI_VERSION_1_6;
 }
-#endif
+
+#else
+
+extern "C"
+JNIEXPORT void JNICALL
+Java_com_follow_clash_core_Core_stopTun(JNIEnv *env, jobject thiz) {
+
+}
+extern "C"
+JNIEXPORT void JNICALL
+Java_com_follow_clash_core_Core_startTun(JNIEnv *env, jobject thiz, jint fd, jobject cb) {
+}
+
+#endif
--- a/android/core/src/main/cpp/jni_helper.cpp
+++ b/android/core/src/main/cpp/jni_helper.cpp
@@ -1,6 +1,5 @@
 #include "jni_helper.h"

-#include <cstdlib>
 #include <malloc.h>
 #include <cstring>

@@ -13,7 +12,7 @@ static jmethodID m_get_bytes;
 void initialize_jni(JavaVM *vm, JNIEnv *env) {
    global_vm = vm;

-    c_string = reinterpret_cast<jclass>(new_global(find_class("java/lang/String")));
+    c_string = (jclass) new_global(find_class("java/lang/String"));
    m_new_string = find_method(c_string, "<init>", "([B)V");
    m_get_bytes = find_method(c_string, "getBytes", "()[B");
 }
@@ -23,23 +22,23 @@ JavaVM *global_java_vm() {
 }

 char *jni_get_string(JNIEnv *env, jstring str) {
-    const auto array = reinterpret_cast<jbyteArray>(env->CallObjectMethod(str, m_get_bytes));
-    const int length = env->GetArrayLength(array);
-    const auto content = static_cast<char *>(malloc(length + 1));
-    env->GetByteArrayRegion(array, 0, length, reinterpret_cast<jbyte *>(content));
+    auto array = (jbyteArray) env->CallObjectMethod(str, m_get_bytes);
+    int length = env->GetArrayLength(array);
+    char *content = (char *) malloc(length + 1);
+    env->GetByteArrayRegion(array, 0, length, (jbyte *) content);
    content[length] = 0;
    return content;
 }

 jstring jni_new_string(JNIEnv *env, const char *str) {
-    const auto length = static_cast<int>(strlen(str));
-    const auto array = env->NewByteArray(length);
-    env->SetByteArrayRegion(array, 0, length, reinterpret_cast<const jbyte *>(str));
-    return reinterpret_cast<jstring>(env->NewObject(c_string, m_new_string, array));
+    auto length = (int) strlen(str);
+    jbyteArray array = env->NewByteArray(length);
+    env->SetByteArrayRegion(array, 0, length, (const jbyte *) str);
+    return (jstring) env->NewObject(c_string, m_new_string, array);
 }

 int jni_catch_exception(JNIEnv *env) {
-    const int result = env->ExceptionCheck();
+    int result = env->ExceptionCheck();
    if (result) {
        env->ExceptionDescribe();
        env->ExceptionClear();
@@ -47,9 +46,9 @@ int jni_catch_exception(JNIEnv *env) {
    return result;
 }

-void jni_attach_thread(scoped_jni *jni) {
+void jni_attach_thread(struct scoped_jni *jni) {
    JavaVM *vm = global_java_vm();
-    if (vm->GetEnv(reinterpret_cast<void **>(&jni->env), JNI_VERSION_1_6) == JNI_OK) {
+    if (vm->GetEnv((void **) &jni->env, JNI_VERSION_1_6) == JNI_OK) {
        jni->require_release = 0;
        return;
    }
@@ -59,9 +58,9 @@ void jni_attach_thread(scoped_jni *jni) {
    jni->require_release = 1;
 }

-void jni_detach_thread(const scoped_jni *env) {
+void jni_detach_thread(struct scoped_jni *jni) {
    JavaVM *vm = global_java_vm();
-    if (env->require_release) {
+    if (jni->require_release) {
        vm->DetachCurrentThread();
    }
 }
--- a/android/core/src/main/cpp/jni_helper.h
+++ b/android/core/src/main/cpp/jni_helper.h
@@ -1,6 +1,9 @@
 #pragma once

 #include <jni.h>
+#include <cstdint>
+#include <cstdlib>
+#include <malloc.h>

 struct scoped_jni {
    JNIEnv *env;
@@ -15,14 +18,14 @@ extern char *jni_get_string(JNIEnv *env, jstring str);

 extern int jni_catch_exception(JNIEnv *env);

-extern void jni_attach_thread(scoped_jni *jni);
+extern void jni_attach_thread(struct scoped_jni *jni);

-extern void jni_detach_thread(const scoped_jni *env);
+extern void jni_detach_thread(struct scoped_jni *env);

 extern void release_string(char **str);

 #define ATTACH_JNI() __attribute__((unused, cleanup(jni_detach_thread))) \
-                    scoped_jni _jni{}; \
+                    struct scoped_jni _jni; \
                    jni_attach_thread(&_jni); \
                    JNIEnv *env = _jni.env

@@ -33,4 +36,4 @@ extern void release_string(char **str);
 #define new_global(obj) env->NewGlobalRef(obj)
 #define del_global(obj) env->DeleteGlobalRef(obj)
 #define get_string(jstr) jni_get_string(env, jstr)
-#define new_string(cstr) jni_new_string(env, cstr)
+#define new_string(cstr) jni_new_string(env, cstr)
--- a/android/gradle.properties
+++ b/android/gradle.properties
@@ -2,4 +2,4 @@ org.gradle.jvmargs=-Xmx4G
 android.useAndroidX=true
 android.enableJetifier=true
 kotlin_version=1.9.22
-agp_version=8.9.2
+agp_version=8.9.1
--- a/core/Clash.Meta
+++ b/core/Clash.Meta
--- a/core/action.go
+++ b/core/action.go
@@ -87,9 +87,6 @@ func handleAction(action *Action, result func(data interface{})) {
 	case closeConnectionsMethod:
 		result(handleCloseConnections())
 		return
-	case resetConnectionsMethod:
-		result(handleResetConnections())
-		return
 	case closeConnectionMethod:
 		id := action.Data.(string)
 		result(handleCloseConnection(id))
@@ -169,9 +166,6 @@ func handleAction(action *Action, result func(data interface{})) {
 		data := action.Data.(string)
 		handleSetState(data)
 		result(true)
-	case crashMethod:
-		result(true)
-		handleCrash()
 	default:
 		handle := nextHandle(action, result)
 		if handle {
--- a/core/android_bride.go
+++ b/core/android_bride.go
@@ -43,13 +43,13 @@ var (
 	}
 )

-func Protect(callback unsafe.Pointer, fd int) {
+func protect(callback unsafe.Pointer, fd int) {
 	if globalCallbacks.protectFunc != nil {
 		C.protect(globalCallbacks.protectFunc, callback, C.int(fd))
 	}
 }

-func ResolveProcess(callback unsafe.Pointer, protocol int, source, target string, uid int) string {
+func resolveProcess(callback unsafe.Pointer, protocol int, source, target string, uid int) string {
 	if globalCallbacks.resolveProcessFunc == nil {
 		return ""
 	}
--- a/core/common.go
+++ b/core/common.go
@@ -78,6 +78,7 @@ func getRawConfigWithId(id string) *config.RawConfig {
 	path := getProfilePath(id)
 	bytes, err := readFile(path)
 	if err != nil {
+		log.Errorln("profile is not exist")
 		return config.DefaultRawConfig()
 	}
 	prof, err := config.UnmarshalRawConfig(bytes)
@@ -237,7 +238,6 @@ func overwriteConfig(targetConfig *config.RawConfig, patchConfig config.RawConfi
 	targetConfig.Tun.DNSHijack = patchConfig.Tun.DNSHijack
 	targetConfig.Tun.Stack = patchConfig.Tun.Stack
 	targetConfig.Tun.RouteAddress = patchConfig.Tun.RouteAddress
-	targetConfig.Tun.AutoRoute = patchConfig.Tun.AutoRoute
 	targetConfig.GeodataLoader = patchConfig.GeodataLoader
 	targetConfig.Profile.StoreSelected = false
 	targetConfig.GeoXUrl = patchConfig.GeoXUrl
@@ -362,11 +362,10 @@ func applyConfig(rawConfig *config.RawConfig) error {
 	}
 	if configParams.IsPatch {
 		patchConfig()
-		updateListeners(false)
 	} else {
 		hub.ApplyConfig(currentConfig)
 		patchSelectGroup()
-		updateListeners(true)
 	}
+	updateListeners(false)
 	return err
 }
--- a/core/constant.go
+++ b/core/constant.go
@@ -64,7 +64,6 @@ const (
 	asyncTestDelayMethod           Method = "asyncTestDelay"
 	getConnectionsMethod           Method = "getConnections"
 	closeConnectionsMethod         Method = "closeConnections"
-	resetConnectionsMethod         Method = "resetConnectionsMethod"
 	closeConnectionMethod          Method = "closeConnection"
 	getExternalProvidersMethod     Method = "getExternalProviders"
 	getExternalProviderMethod      Method = "getExternalProvider"
@@ -83,7 +82,6 @@ const (
 	getRunTimeMethod               Method = "getRunTime"
 	getCurrentProfileNameMethod    Method = "getCurrentProfileName"
 	getProfileMethod               Method = "getProfile"
-	crashMethod                    Method = "crash"
 )

 type Method string
--- a/core/go.mod
+++ b/core/go.mod
@@ -6,13 +6,12 @@ replace github.com/metacubex/mihomo => ./Clash.Meta

 require (
 	github.com/metacubex/mihomo v0.0.0-00010101000000-000000000000
-	github.com/samber/lo v1.50.0
-	golang.org/x/sync v0.11.0
+	github.com/samber/lo v1.49.1
 )

 require (
 	github.com/3andne/restls-client-go v0.1.6 // indirect
-	github.com/RyuaNerin/go-krypto v1.3.0 // indirect
+	github.com/RyuaNerin/go-krypto v1.2.4 // indirect
 	github.com/Yawning/aez v0.0.0-20211027044916-e49e68abd344 // indirect
 	github.com/ajg/form v1.5.1 // indirect
 	github.com/andybalholm/brotli v1.0.6 // indirect
@@ -21,13 +20,13 @@ require (
 	github.com/cloudflare/circl v1.3.7 // indirect
 	github.com/coreos/go-iptables v0.8.0 // indirect
 	github.com/dlclark/regexp2 v1.11.5 // indirect
-	github.com/ebitengine/purego v0.8.3-0.20250507171810-1638563e3615 // indirect
+	github.com/ebitengine/purego v0.8.2 // indirect
 	github.com/enfein/mieru/v3 v3.13.0 // indirect
-	github.com/ericlagergren/aegis v0.0.0-20250325060835-cd0defd64358 // indirect
+	github.com/ericlagergren/aegis v0.0.0-20230312195928-b4ce538b56f9 // indirect
 	github.com/ericlagergren/polyval v0.0.0-20220411101811-e25bc10ba391 // indirect
 	github.com/ericlagergren/siv v0.0.0-20220507050439-0b757b3aa5f1 // indirect
 	github.com/ericlagergren/subtle v0.0.0-20220507045147-890d697da010 // indirect
-	github.com/fsnotify/fsnotify v1.9.0 // indirect
+	github.com/fsnotify/fsnotify v1.7.0 // indirect
 	github.com/gaukas/godicttls v0.0.4 // indirect
 	github.com/go-chi/chi/v5 v5.2.1 // indirect
 	github.com/go-chi/render v1.0.3 // indirect
@@ -36,7 +35,7 @@ require (
 	github.com/gobwas/httphead v0.1.0 // indirect
 	github.com/gobwas/pool v0.2.1 // indirect
 	github.com/gobwas/ws v1.4.0 // indirect
-	github.com/gofrs/uuid/v5 v5.3.2 // indirect
+	github.com/gofrs/uuid/v5 v5.3.1 // indirect
 	github.com/google/btree v1.1.3 // indirect
 	github.com/google/go-cmp v0.6.0 // indirect
 	github.com/google/pprof v0.0.0-20210407192527-94a9f03dee38 // indirect
@@ -53,25 +52,20 @@ require (
 	github.com/metacubex/amneziawg-go v0.0.0-20240922133038-fdf3a4d5a4ab // indirect
 	github.com/metacubex/bart v0.19.0 // indirect
 	github.com/metacubex/bbolt v0.0.0-20240822011022-aed6d4850399 // indirect
-	github.com/metacubex/chacha v0.1.2 // indirect
-	github.com/metacubex/fswatch v0.1.1 // indirect
+	github.com/metacubex/chacha v0.1.1 // indirect
 	github.com/metacubex/gopacket v1.1.20-0.20230608035415-7e2f98a3e759 // indirect
 	github.com/metacubex/gvisor v0.0.0-20250324165734-5857f47bd43b // indirect
-	github.com/metacubex/nftables v0.0.0-20250503052935-30a69ab87793 // indirect
-	github.com/metacubex/quic-go v0.51.1-0.20250511032541-4e34341cf18b // indirect
+	github.com/metacubex/quic-go v0.49.1-0.20250212162123-c135a4412996 // indirect
 	github.com/metacubex/randv2 v0.2.0 // indirect
-	github.com/metacubex/sing v0.5.3-0.20250504031621-1f99e54c15b7 // indirect
-	github.com/metacubex/sing-mux v0.3.2 // indirect
-	github.com/metacubex/sing-quic v0.0.0-20250511034158-b46e0e3e81b2 // indirect
-	github.com/metacubex/sing-shadowsocks v0.2.9 // indirect
-	github.com/metacubex/sing-shadowsocks2 v0.2.3 // indirect
-	github.com/metacubex/sing-shadowtls v0.0.0-20250503063515-5d9f966d17a2 // indirect
-	github.com/metacubex/sing-tun v0.4.6-0.20250503065609-efb9f0beb6f6 // indirect
-	github.com/metacubex/sing-vmess v0.2.1 // indirect
-	github.com/metacubex/sing-wireguard v0.0.0-20250503063753-2dc62acc626f // indirect
-	github.com/metacubex/smux v0.0.0-20250503055512-501391591dee // indirect
-	github.com/metacubex/tfo-go v0.0.0-20250503140532-decbcfccbfdf // indirect
-	github.com/metacubex/utls v1.7.0-alpha.3 // indirect
+	github.com/metacubex/reality v0.0.0-20250219003814-74e8d7850629 // indirect
+	github.com/metacubex/sing-quic v0.0.0-20250119013740-2a19cce83925 // indirect
+	github.com/metacubex/sing-shadowsocks v0.2.8 // indirect
+	github.com/metacubex/sing-shadowsocks2 v0.2.2 // indirect
+	github.com/metacubex/sing-tun v0.4.6-0.20250312042506-6d3b4dc05c04 // indirect
+	github.com/metacubex/sing-vmess v0.1.14-0.20250228002636-abc39e113b82 // indirect
+	github.com/metacubex/sing-wireguard v0.0.0-20241126021510-0827d417b589 // indirect
+	github.com/metacubex/tfo-go v0.0.0-20241231083714-66613d49c422 // indirect
+	github.com/metacubex/utls v1.6.8-alpha.4 // indirect
 	github.com/metacubex/wireguard-go v0.0.0-20240922131502-c182e7471181 // indirect
 	github.com/miekg/dns v1.1.63 // indirect
 	github.com/mroth/weightedrand/v2 v2.1.0 // indirect
@@ -83,8 +77,15 @@ require (
 	github.com/power-devops/perfstat v0.0.0-20210106213030-5aafc221ea8c // indirect
 	github.com/puzpuzpuz/xsync/v3 v3.5.1 // indirect
 	github.com/quic-go/qpack v0.4.0 // indirect
+	github.com/quic-go/qtls-go1-20 v0.4.1 // indirect
 	github.com/sagernet/cors v1.2.1 // indirect
+	github.com/sagernet/fswatch v0.1.1 // indirect
 	github.com/sagernet/netlink v0.0.0-20240612041022-b9a21c07ac6a // indirect
+	github.com/sagernet/nftables v0.3.0-beta.4 // indirect
+	github.com/sagernet/sing v0.5.2 // indirect
+	github.com/sagernet/sing-mux v0.2.1 // indirect
+	github.com/sagernet/sing-shadowtls v0.1.5 // indirect
+	github.com/sagernet/smux v0.0.0-20231208180855-7041f6ea79e7 // indirect
 	github.com/shirou/gopsutil/v4 v4.25.1 // indirect
 	github.com/sina-ghaderi/poly1305 v0.0.0-20220724002748-c5926b03988b // indirect
 	github.com/sina-ghaderi/rabaead v0.0.0-20220730151906-ab6e06b96e8c // indirect
@@ -106,6 +107,7 @@ require (
 	golang.org/x/exp v0.0.0-20240904232852-e7e105dedf7e // indirect
 	golang.org/x/mod v0.20.0 // indirect
 	golang.org/x/net v0.35.0 // indirect
+	golang.org/x/sync v0.11.0 // indirect
 	golang.org/x/sys v0.30.0 // indirect
 	golang.org/x/text v0.22.0 // indirect
 	golang.org/x/time v0.7.0 // indirect
--- a/core/go.sum
+++ b/core/go.sum
@@ -1,8 +1,8 @@
 github.com/3andne/restls-client-go v0.1.6 h1:tRx/YilqW7iHpgmEL4E1D8dAsuB0tFF3uvncS+B6I08=
 github.com/3andne/restls-client-go v0.1.6/go.mod h1:iEdTZNt9kzPIxjIGSMScUFSBrUH6bFRNg0BWlP4orEY=
-github.com/RyuaNerin/go-krypto v1.3.0 h1:smavTzSMAx8iuVlGb4pEwl9MD2qicqMzuXR2QWp2/Pg=
-github.com/RyuaNerin/go-krypto v1.3.0/go.mod h1:9R9TU936laAIqAmjcHo/LsaXYOZlymudOAxjaBf62UM=
-github.com/RyuaNerin/testingutil v0.1.0 h1:IYT6JL57RV3U2ml3dLHZsVtPOP6yNK7WUVdzzlpNrss=
+github.com/RyuaNerin/elliptic2 v1.0.0/go.mod h1:wWB8fWrJI/6EPJkyV/r1Rj0hxUgrusmqSj8JN6yNf/A=
+github.com/RyuaNerin/go-krypto v1.2.4 h1:mXuNdK6M317aPV0llW6Xpjbo4moOlPF7Yxz4tb4b4Go=
+github.com/RyuaNerin/go-krypto v1.2.4/go.mod h1:QqCYkoutU3yInyD9INt2PGolVRsc3W4oraQadVGXJ/8=
 github.com/Yawning/aez v0.0.0-20211027044916-e49e68abd344 h1:cDVUiFo+npB0ZASqnw4q90ylaVAbnYyx0JYqK4YcGok=
 github.com/Yawning/aez v0.0.0-20211027044916-e49e68abd344/go.mod h1:9pIqrY6SXNL8vjRQE5Hd/OL5GyK/9MrGUWs87z/eFfk=
 github.com/ajg/form v1.5.1 h1:t9c7v8JUKu/XxOGBU0yjNpaMloxGEJhUkqFRq0ibGeU=
@@ -26,12 +26,12 @@ github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c
 github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/dlclark/regexp2 v1.11.5 h1:Q/sSnsKerHeCkc/jSTNq1oCm7KiVgUMZRDUoRu0JQZQ=
 github.com/dlclark/regexp2 v1.11.5/go.mod h1:DHkYz0B9wPfa6wondMfaivmHpzrQ3v9q8cnmRbL6yW8=
-github.com/ebitengine/purego v0.8.3-0.20250507171810-1638563e3615 h1:W7mpP4uiOAbBOdDnRXT9EUdauFv7bz+ERT5rPIord00=
-github.com/ebitengine/purego v0.8.3-0.20250507171810-1638563e3615/go.mod h1:iIjxzd6CiRiOG0UyXP+V1+jWqUXVjPKLAI0mRfJZTmQ=
+github.com/ebitengine/purego v0.8.2 h1:jPPGWs2sZ1UgOSgD2bClL0MJIqu58nOmIcBuXr62z1I=
+github.com/ebitengine/purego v0.8.2/go.mod h1:iIjxzd6CiRiOG0UyXP+V1+jWqUXVjPKLAI0mRfJZTmQ=
 github.com/enfein/mieru/v3 v3.13.0 h1:eGyxLGkb+lut9ebmx+BGwLJ5UMbEc/wGIYO0AXEKy98=
 github.com/enfein/mieru/v3 v3.13.0/go.mod h1:zJBUCsi5rxyvHM8fjFf+GLaEl4OEjjBXr1s5F6Qd3hM=
-github.com/ericlagergren/aegis v0.0.0-20250325060835-cd0defd64358 h1:kXYqH/sL8dS/FdoFjr12ePjnLPorPo2FsnrHNuXSDyo=
-github.com/ericlagergren/aegis v0.0.0-20250325060835-cd0defd64358/go.mod h1:hkIFzoiIPZYxdFOOLyDho59b7SrDfo+w3h+yWdlg45I=
+github.com/ericlagergren/aegis v0.0.0-20230312195928-b4ce538b56f9 h1:/5RkVc9Rc81XmMyVqawCiDyrBHZbLAZgTTCqou4mwj8=
+github.com/ericlagergren/aegis v0.0.0-20230312195928-b4ce538b56f9/go.mod h1:hkIFzoiIPZYxdFOOLyDho59b7SrDfo+w3h+yWdlg45I=
 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=
@@ -39,8 +39,8 @@ github.com/ericlagergren/siv v0.0.0-20220507050439-0b757b3aa5f1 h1:tlDMEdcPRQKBE
 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/fsnotify/fsnotify v1.9.0 h1:2Ml+OJNzbYCTzsxtv8vKSFD9PbJjmhYF14k/jKC7S9k=
-github.com/fsnotify/fsnotify v1.9.0/go.mod h1:8jBTzvmWwFyi3Pb8djgCCO5IBqzKJ/Jwo8TRcHyHii0=
+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.2.1 h1:KOIHODQj58PmL80G2Eak4WdvUzjSJSm0vG72crDCqb8=
@@ -59,8 +59,8 @@ github.com/gobwas/pool v0.2.1 h1:xfeeEhW7pwmX8nuLVlqbzVc7udMDrwetjEv+TZIz1og=
 github.com/gobwas/pool v0.2.1/go.mod h1:q8bcK0KcYlCgd9e7WYLm9LpyS+YeLd8JVDW6WezmKEw=
 github.com/gobwas/ws v1.4.0 h1:CTaoG1tojrh4ucGPcoJFiAQUAsEWekEWvLy7GsVNqGs=
 github.com/gobwas/ws v1.4.0/go.mod h1:G3gNqMNtPppf5XUz7O4shetPpcZ1VJ7zt18dlUeakrc=
-github.com/gofrs/uuid/v5 v5.3.2 h1:2jfO8j3XgSwlz/wHqemAEugfnTlikAYHhnqQ8Xh4fE0=
-github.com/gofrs/uuid/v5 v5.3.2/go.mod h1:CDOjlDMVAtN56jqyRUZh58JT31Tiw7/oQyEXZV+9bD8=
+github.com/gofrs/uuid/v5 v5.3.1 h1:aPx49MwJbekCzOyhZDjJVb0hx3A0KLjlbLx6p2gY0p0=
+github.com/gofrs/uuid/v5 v5.3.1/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/google/btree v1.1.3 h1:CVpQJjYgC4VbzxeGVHfvZrv1ctoYCAI8vbl07Fcxlyg=
@@ -101,45 +101,34 @@ github.com/metacubex/bart v0.19.0 h1:XQ9AJeI+WO+phRPkUOoflAFwlqDJnm5BPQpixciJQBY
 github.com/metacubex/bart v0.19.0/go.mod h1:DCcyfP4MC+Zy7sLK7XeGuMw+P5K9mIRsYOBgiE8icsI=
 github.com/metacubex/bbolt v0.0.0-20240822011022-aed6d4850399 h1:oBowHVKZycNtAFbZ6avaCSZJYeme2Nrj+4RpV2cNJig=
 github.com/metacubex/bbolt v0.0.0-20240822011022-aed6d4850399/go.mod h1:4xcieuIK+M4bGQmQYZVqEaIYqjS1ahO4kXG7EmDgEro=
-github.com/metacubex/chacha v0.1.2 h1:QulCq3eVm3TO6+4nVIWJtmSe7BT2GMrgVHuAoqRQnlc=
-github.com/metacubex/chacha v0.1.2/go.mod h1:Djn9bPZxLTXbJFSeyo0/qzEzQI+gUSSzttuzZM75GH8=
-github.com/metacubex/fswatch v0.1.1 h1:jqU7C/v+g0qc2RUFgmAOPoVvfl2BXXUXEumn6oQuxhU=
-github.com/metacubex/fswatch v0.1.1/go.mod h1:czrTT7Zlbz7vWft8RQu9Qqh+JoX+Nnb+UabuyN1YsgI=
+github.com/metacubex/chacha v0.1.1 h1:OHIv11Nd9CISAIzegpjfupIoZp9DYm6uQw41RxvmU/c=
+github.com/metacubex/chacha v0.1.1/go.mod h1:Djn9bPZxLTXbJFSeyo0/qzEzQI+gUSSzttuzZM75GH8=
 github.com/metacubex/gopacket v1.1.20-0.20230608035415-7e2f98a3e759 h1:cjd4biTvOzK9ubNCCkQ+ldc4YSH/rILn53l/xGBFHHI=
 github.com/metacubex/gopacket v1.1.20-0.20230608035415-7e2f98a3e759/go.mod h1:UHOv2xu+RIgLwpXca7TLrXleEd4oR3sPatW6IF8wU88=
 github.com/metacubex/gvisor v0.0.0-20250324165734-5857f47bd43b h1:RUh4OdVPz/jDrM9MQ2ySuqu2aeBqcA8rtfWUYLZ8RtI=
 github.com/metacubex/gvisor v0.0.0-20250324165734-5857f47bd43b/go.mod h1:8LpS0IJW1VmWzUm3ylb0e2SK5QDm5lO/2qwWLZgRpBU=
-github.com/metacubex/nftables v0.0.0-20250503052935-30a69ab87793 h1:1Qpuy+sU3DmyX9HwI+CrBT/oLNJngvBorR2RbajJcqo=
-github.com/metacubex/nftables v0.0.0-20250503052935-30a69ab87793/go.mod h1:RjRNb4G52yAgfR+Oe/kp9G4PJJ97Fnj89eY1BFO3YyA=
-github.com/metacubex/quic-go v0.51.1-0.20250511032541-4e34341cf18b h1:8oDU32eJ+RRhl1FodGgPfxQxtoBAiD9D40XG2XtU/SE=
-github.com/metacubex/quic-go v0.51.1-0.20250511032541-4e34341cf18b/go.mod h1:9R1NOzCgTcWsdWvOMlmtMuF0uKzuOpsfvEf7U3I8zM0=
+github.com/metacubex/quic-go v0.49.1-0.20250212162123-c135a4412996 h1:B+AP/Pj2/jBDS/kCYjz/x+0BCOKfd2VODYevyeIt+Ds=
+github.com/metacubex/quic-go v0.49.1-0.20250212162123-c135a4412996/go.mod h1:ExVjGyEwTUjCFqx+5uxgV7MOoA3fZI+th4D40H35xmY=
 github.com/metacubex/randv2 v0.2.0 h1:uP38uBvV2SxYfLj53kuvAjbND4RUDfFJjwr4UigMiLs=
 github.com/metacubex/randv2 v0.2.0/go.mod h1:kFi2SzrQ5WuneuoLLCMkABtiBu6VRrMrWFqSPyj2cxY=
-github.com/metacubex/sing v0.5.2/go.mod h1:ypf0mjwlZm0sKdQSY+yQvmsbWa0hNPtkeqyRMGgoN+w=
-github.com/metacubex/sing v0.5.3-0.20250504031621-1f99e54c15b7 h1:m4nSxvw46JEgxMzzmnXams+ebwabcry4Ydep/zNiesQ=
-github.com/metacubex/sing v0.5.3-0.20250504031621-1f99e54c15b7/go.mod h1:ypf0mjwlZm0sKdQSY+yQvmsbWa0hNPtkeqyRMGgoN+w=
-github.com/metacubex/sing-mux v0.3.2 h1:nJv52pyRivHcaZJKk2JgxpaVvj1GAXG81scSa9N7ncw=
-github.com/metacubex/sing-mux v0.3.2/go.mod h1:3rt1soewn0O6j89GCLmwAQFsq257u0jf2zQSPhTL3Bw=
-github.com/metacubex/sing-quic v0.0.0-20250511034158-b46e0e3e81b2 h1:wfmYgtECbEYo1slMtyo+2kMqscYYDSjU/TVgS3018F4=
-github.com/metacubex/sing-quic v0.0.0-20250511034158-b46e0e3e81b2/go.mod h1:P1kd57U6XXmXv9PbwWdznUGT0k9bKgFJXF0fEORbIlk=
-github.com/metacubex/sing-shadowsocks v0.2.9 h1:2e++13WNN7EGjGtvrGLUzW1xrCdQbW2gIFpgw5GEw00=
-github.com/metacubex/sing-shadowsocks v0.2.9/go.mod h1:CJSEGO4FWQAWe+ZiLZxCweGdjRR60A61SIoVjdjQeBA=
-github.com/metacubex/sing-shadowsocks2 v0.2.3 h1:v3rNS/5Ywh0NIZ6VU/NmdERQIN5RePzyxCFeQsU4Cx0=
-github.com/metacubex/sing-shadowsocks2 v0.2.3/go.mod h1:/WNy/Q8ahLCoPRriWuFZFD0Jy+JNp1MEQl28Zw6SaF8=
-github.com/metacubex/sing-shadowtls v0.0.0-20250503063515-5d9f966d17a2 h1:gXU+MYPm7Wme3/OAY2FFzVq9d9GxPHOqu5AQfg/ddhI=
-github.com/metacubex/sing-shadowtls v0.0.0-20250503063515-5d9f966d17a2/go.mod h1:mbfboaXauKJNIHJYxQRa+NJs4JU9NZfkA+I33dS2+9E=
-github.com/metacubex/sing-tun v0.4.6-0.20250503065609-efb9f0beb6f6 h1:TAwL91XPa6x1QK55CRm+VTzPvLPUfEr/uFDnOZArqEU=
-github.com/metacubex/sing-tun v0.4.6-0.20250503065609-efb9f0beb6f6/go.mod h1:HDaHDL6onAX2ZGbAGUXKp++PohRdNb7Nzt6zxzhox+U=
-github.com/metacubex/sing-vmess v0.2.1 h1:I6gM3VUjtvJ15D805EUbNH+SRBuqzJeFnuIbKYUsWZ0=
-github.com/metacubex/sing-vmess v0.2.1/go.mod h1:DsODWItJtOMZNna8Qhheg8r3tUivrcO3vWgaTYKnfTo=
-github.com/metacubex/sing-wireguard v0.0.0-20250503063753-2dc62acc626f h1:Sr/DYKYofKHKc4GF3qkRGNuj6XA6c0eqPgEDN+VAsYU=
-github.com/metacubex/sing-wireguard v0.0.0-20250503063753-2dc62acc626f/go.mod h1:jpAkVLPnCpGSfNyVmj6Cq4YbuZsFepm/Dc+9BAOcR80=
-github.com/metacubex/smux v0.0.0-20250503055512-501391591dee h1:lp6hJ+4wCLZu113awp7P6odM2okB5s60HUyF0FMqKmo=
-github.com/metacubex/smux v0.0.0-20250503055512-501391591dee/go.mod h1:4bPD8HWx9jPJ9aE4uadgyN7D1/Wz3KmPy+vale8sKLE=
-github.com/metacubex/tfo-go v0.0.0-20250503140532-decbcfccbfdf h1:LwID1wz4tzypidd412dd4dC1H0m1TgRCQ/XvRvMJDFM=
-github.com/metacubex/tfo-go v0.0.0-20250503140532-decbcfccbfdf/go.mod h1:l9oLnLoEXyGZ5RVLsh7QCC5XsouTUyKk4F2nLm2DHLw=
-github.com/metacubex/utls v1.7.0-alpha.3 h1:cp1cEMUnoifiWrGHRzo+nCwPRveN9yPD8QaRFmfcYxA=
-github.com/metacubex/utls v1.7.0-alpha.3/go.mod h1:oknYT0qTOwE4hjPmZOEpzVdefnW7bAdGLvZcqmk4TLU=
+github.com/metacubex/reality v0.0.0-20250219003814-74e8d7850629 h1:aHsYiTvubfgMa3JMTDY//hDXVvFWrHg6ARckR52ttZs=
+github.com/metacubex/reality v0.0.0-20250219003814-74e8d7850629/go.mod h1:TTeIOZLdGmzc07Oedn++vWUUfkZoXLF4sEMxWuhBFr8=
+github.com/metacubex/sing-quic v0.0.0-20250119013740-2a19cce83925 h1:UkPoRAnoBQMn7IK5qpoIV3OejU15q+rqel3NrbSCFKA=
+github.com/metacubex/sing-quic v0.0.0-20250119013740-2a19cce83925/go.mod h1:g7Mxj7b7zm7YVqD975mk/hSmrb0A0G4bVvIMr2MMzn8=
+github.com/metacubex/sing-shadowsocks v0.2.8 h1:wIhlaigswzjPw4hej75sEvWte3QR0+AJRafgwBHO5B4=
+github.com/metacubex/sing-shadowsocks v0.2.8/go.mod h1:X3x88XtJpBxG0W0/ECOJL6Ib0SJ3xdniAkU/6/RMWU0=
+github.com/metacubex/sing-shadowsocks2 v0.2.2 h1:eaf42uVx4Lr21S6MDYs0ZdTvGA0GEhDpb9no4+gdXPo=
+github.com/metacubex/sing-shadowsocks2 v0.2.2/go.mod h1:BhOug03a/RbI7y6hp6q+6ITM1dXjnLTmeWBHSTwvv2Q=
+github.com/metacubex/sing-tun v0.4.6-0.20250312042506-6d3b4dc05c04 h1:B211C+i/I8CWf4I/BaAV0mmkEHrDBJ0XR9EWxjPbFEg=
+github.com/metacubex/sing-tun v0.4.6-0.20250312042506-6d3b4dc05c04/go.mod h1:V0N4rr0dWPBEE20ESkTXdbtx2riQYcb6YtwC5w/9wl0=
+github.com/metacubex/sing-vmess v0.1.14-0.20250228002636-abc39e113b82 h1:zZp5uct9+/0Hb1jKGyqDjCU4/72t43rs7qOq3Rc9oU8=
+github.com/metacubex/sing-vmess v0.1.14-0.20250228002636-abc39e113b82/go.mod h1:nE7Mdzj/QUDwgRi/8BASPtsxtIFZTHA4Yst5GgwbGCQ=
+github.com/metacubex/sing-wireguard v0.0.0-20241126021510-0827d417b589 h1:Z6bNy0HLTjx6BKIkV48sV/yia/GP8Bnyb5JQuGgSGzg=
+github.com/metacubex/sing-wireguard v0.0.0-20241126021510-0827d417b589/go.mod h1:4NclTLIZuk+QkHVCGrP87rHi/y8YjgPytxTgApJNMhc=
+github.com/metacubex/tfo-go v0.0.0-20241231083714-66613d49c422 h1:zGeQt3UyNydIVrMRB97AA5WsYEau/TyCnRtTf1yUmJY=
+github.com/metacubex/tfo-go v0.0.0-20241231083714-66613d49c422/go.mod h1:l9oLnLoEXyGZ5RVLsh7QCC5XsouTUyKk4F2nLm2DHLw=
+github.com/metacubex/utls v1.6.8-alpha.4 h1:5EvsCHxDNneaOtAyc8CztoNSpmonLvkvuGs01lIeeEI=
+github.com/metacubex/utls v1.6.8-alpha.4/go.mod h1:MEZ5WO/VLKYs/s/dOzEK/mlXOQxc04ESeLzRgjmLYtk=
 github.com/metacubex/wireguard-go v0.0.0-20240922131502-c182e7471181 h1:hJLQviGySBuaynlCwf/oYgIxbVbGRUIKZCxdya9YrbQ=
 github.com/metacubex/wireguard-go v0.0.0-20240922131502-c182e7471181/go.mod h1:phewKljNYiTVT31Gcif8RiCKnTUOgVWFJjccqYM8s+Y=
 github.com/miekg/dns v1.1.63 h1:8M5aAw6OMZfFXTT7K5V0Eu5YiiL8l7nUAkyN6C9YwaY=
@@ -170,12 +159,27 @@ github.com/puzpuzpuz/xsync/v3 v3.5.1 h1:GJYJZwO6IdxN/IKbneznS6yPkVC+c3zyY/j19c++
 github.com/puzpuzpuz/xsync/v3 v3.5.1/go.mod h1:VjzYrABPabuM4KyBh1Ftq6u8nhwY5tBPKP9jpmh0nnA=
 github.com/quic-go/qpack v0.4.0 h1:Cr9BXA1sQS2SmDUWjSofMPNKmvF6IiIfDRmgU0w1ZCo=
 github.com/quic-go/qpack v0.4.0/go.mod h1:UZVnYIfi5GRk+zI9UMaCPsmZ2xKJP7XBUvVyT1Knj9A=
+github.com/quic-go/qtls-go1-20 v0.4.1 h1:D33340mCNDAIKBqXuAvexTNMUByrYmFYVfKfDN5nfFs=
+github.com/quic-go/qtls-go1-20 v0.4.1/go.mod h1:X9Nh97ZL80Z+bX/gUXMbipO6OxdiDi58b/fMC9mAL+k=
 github.com/sagernet/cors v1.2.1 h1:Cv5Z8y9YSD6Gm+qSpNrL3LO4lD3eQVvbFYJSG7JCMHQ=
 github.com/sagernet/cors v1.2.1/go.mod h1:O64VyOjjhrkLmQIjF4KGRrJO/5dVXFdpEmCW/eISRAI=
+github.com/sagernet/fswatch v0.1.1 h1:YqID+93B7VRfqIH3PArW/XpJv5H4OLEVWDfProGoRQs=
+github.com/sagernet/fswatch v0.1.1/go.mod h1:nz85laH0mkQqJfaOrqPpkwtU1znMFNVTpT/5oRsVz/o=
 github.com/sagernet/netlink v0.0.0-20240612041022-b9a21c07ac6a h1:ObwtHN2VpqE0ZNjr6sGeT00J8uU7JF4cNUdb44/Duis=
 github.com/sagernet/netlink v0.0.0-20240612041022-b9a21c07ac6a/go.mod h1:xLnfdiJbSp8rNqYEdIW/6eDO4mVoogml14Bh2hSiFpM=
-github.com/samber/lo v1.50.0 h1:XrG0xOeHs+4FQ8gJR97zDz5uOFMW7OwFWiFVzqopKgY=
-github.com/samber/lo v1.50.0/go.mod h1:RjZyNk6WSnUFRKK6EyOhsRJMqft3G+pg7dCWHQCWvsc=
+github.com/sagernet/nftables v0.3.0-beta.4 h1:kbULlAwAC3jvdGAC1P5Fa3GSxVwQJibNenDW2zaXr8I=
+github.com/sagernet/nftables v0.3.0-beta.4/go.mod h1:OQXAjvjNGGFxaTgVCSTRIhYB5/llyVDeapVoENYBDS8=
+github.com/sagernet/sing v0.2.18/go.mod h1:OL6k2F0vHmEzXz2KW19qQzu172FDgSbUSODylighuVo=
+github.com/sagernet/sing v0.5.2 h1:2OZQJNKGtji/66QLxbf/T/dqtK/3+fF/zuHH9tsGK7M=
+github.com/sagernet/sing v0.5.2/go.mod h1:ARkL0gM13/Iv5VCZmci/NuoOlePoIsW0m7BWfln/Hak=
+github.com/sagernet/sing-mux v0.2.1 h1:N/3MHymfnFZRd29tE3TaXwPUVVgKvxhtOkiCMLp9HVo=
+github.com/sagernet/sing-mux v0.2.1/go.mod h1:dm3BWL6NvES9pbib7llpylrq7Gq+LjlzG+0RacdxcyE=
+github.com/sagernet/sing-shadowtls v0.1.5 h1:uXxmq/HXh8DIiBGLzpMjCbWnzIAFs+lIxiTOjdgG5qo=
+github.com/sagernet/sing-shadowtls v0.1.5/go.mod h1:tvrDPTGLrSM46Wnf7mSr+L8NHvgvF8M4YnJF790rZX4=
+github.com/sagernet/smux v0.0.0-20231208180855-7041f6ea79e7 h1:DImB4lELfQhplLTxeq2z31Fpv8CQqqrUwTbrIRumZqQ=
+github.com/sagernet/smux v0.0.0-20231208180855-7041f6ea79e7/go.mod h1:FP9X2xjT/Az1EsG/orYYoC+5MojWnuI7hrffz8fGwwo=
+github.com/samber/lo v1.49.1 h1:4BIFyVfuQSEpluc7Fua+j1NolZHiEHEpaSEKdsH0tew=
+github.com/samber/lo v1.49.1/go.mod h1:dO6KHFzUKXgP8LDhU0oI8d2hekjXnGOu0DB8Jecxd6o=
 github.com/shirou/gopsutil/v4 v4.25.1 h1:QSWkTc+fu9LTAWfkZwZ6j8MSUk4A2LV7rbH0ZqmLjXs=
 github.com/shirou/gopsutil/v4 v4.25.1/go.mod h1:RoUCUpndaJFtT+2zsZzzmhvbfGoDCJ7nFXKJf8GqJbI=
 github.com/sina-ghaderi/poly1305 v0.0.0-20220724002748-c5926b03988b h1:rXHg9GrUEtWZhEkrykicdND3VPjlVbYiLdX9J7gimS8=
@@ -187,16 +191,9 @@ github.com/sina-ghaderi/rabbitio v0.0.0-20220730151941-9ce26f4f872e/go.mod h1:+e
 github.com/sirupsen/logrus v1.9.3 h1:dueUQJ1C2q9oE3F7wvmSGAaVtTmUizReu6fjN8uqzbQ=
 github.com/sirupsen/logrus v1.9.3/go.mod h1:naHLuLoDiP4jHNo9R0sCBMtWGeIprob74mVsIT4qYEQ=
 github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
-github.com/stretchr/objx v0.4.0/go.mod h1:YvHI0jy2hoMjB+UWwv71VJQ9isScKT/TqJzVSSt89Yw=
-github.com/stretchr/objx v0.5.0/go.mod h1:Yh+to48EsGEfYuaHDzXPcE3xhTkx73EhmCGUpEOglKo=
-github.com/stretchr/objx v0.5.2/go.mod h1:FRsXN1f5AsAjCGJKqEizvkpNtU+EGNCLh3NxZ/8L+MA=
 github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI=
 github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
 github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
-github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
-github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU=
-github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo=
-github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY=
 github.com/stretchr/testify v1.10.0 h1:Xv5erBjTwe/5IxqUQTdXv5kgmIvbHo3QQyRwhJsOfJA=
 github.com/tklauser/go-sysconf v0.3.12 h1:0QaGUFOdQaIVdPgfITYzaTegZvdCjmYO52cSFAEVmqU=
 github.com/tklauser/go-sysconf v0.3.12/go.mod h1:Ho14jnntGE1fpdOqQEEaiKRpvIavV0hSfmBq8nJbHYI=
@@ -256,7 +253,7 @@ golang.org/x/sys v0.1.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.8.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.11.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.21.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
+golang.org/x/sys v0.14.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
 golang.org/x/sys v0.30.0 h1:QjkSwP/36a20jFYWkSue1YwXzLmsV5Gfq7Eiy72C1uc=
 golang.org/x/sys v0.30.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
 golang.org/x/term v0.29.0 h1:L6pJp37ocefwRRtYPKSWOWzOtWSxVajvz2ldH/xi3iU=
--- a/core/hub.go
+++ b/core/hub.go
@@ -10,7 +10,6 @@ import (
 	"github.com/metacubex/mihomo/common/observable"
 	"github.com/metacubex/mihomo/common/utils"
 	"github.com/metacubex/mihomo/component/mmdb"
-	"github.com/metacubex/mihomo/component/resolver"
 	"github.com/metacubex/mihomo/component/updater"
 	"github.com/metacubex/mihomo/config"
 	"github.com/metacubex/mihomo/constant"
@@ -54,7 +53,6 @@ func handleStartListener() bool {
 	defer runLock.Unlock()
 	isRunning = true
 	updateListeners(true)
-	resolver.ResetConnection()
 	return true
 }

@@ -268,11 +266,6 @@ func handleGetConnections() string {
 func handleCloseConnections() bool {
 	runLock.Lock()
 	defer runLock.Unlock()
-	closeConnections()
-	return true
-}
-
-func closeConnections() {
 	statistic.DefaultManager.Range(func(c statistic.Tracker) bool {
 		err := c.Close()
 		if err != nil {
@@ -280,12 +273,6 @@ func closeConnections() {
 		}
 		return true
 	})
-}
-
-func handleResetConnections() bool {
-	runLock.Lock()
-	defer runLock.Unlock()
-	resolver.ResetConnection()
 	return true
 }

@@ -455,10 +442,6 @@ func handleSetState(params string) {
 	_ = json.Unmarshal([]byte(params), state.CurrentState)
 }

-func handleCrash() {
-	panic("handle invoke crash")
-}
-
 func init() {
 	adapter.UrlTestHook = func(url string, name string, delay uint16) {
 		delayData := &Delay{
--- a/core/lib_android.go
+++ b/core/lib_android.go
@@ -58,7 +58,7 @@ func (t *TunHandler) handleProtect(fd int) {
 		return
 	}

-	Protect(t.callback, fd)
+	protect(t.callback, fd)
 }

 func (t *TunHandler) handleResolveProcess(source, target net.Addr) string {
@@ -79,7 +79,7 @@ func (t *TunHandler) handleResolveProcess(source, target net.Addr) string {
 	if version < 29 {
 		uid = platform.QuerySocketUidFromProcFs(source, target)
 	}
-	return ResolveProcess(t.callback, protocol, source.String(), target.String(), uid)
+	return resolveProcess(t.callback, protocol, source.String(), target.String(), uid)
 }

 var (
@@ -98,13 +98,13 @@ func handleStopTun() {
 	}
 }

-func handleStartTun(fd int, callback unsafe.Pointer) {
+func handleStartTun(fd int, callback unsafe.Pointer) bool {
 	handleStopTun()
-	tunLock.Lock()
-	defer tunLock.Unlock()
 	now := time.Now()
 	runTime = &now
 	if fd != 0 {
+		tunLock.Lock()
+		defer tunLock.Unlock()
 		tunHandler = &TunHandler{
 			callback: callback,
 			limit:    semaphore.NewWeighted(4),
@@ -113,11 +113,13 @@ func handleStartTun(fd int, callback unsafe.Pointer) {
 		tunListener, _ := t.Start(fd, currentConfig.General.Tun.Device, currentConfig.General.Tun.Stack)
 		if tunListener != nil {
 			log.Infoln("TUN address: %v", tunListener.Address())
-			tunHandler.listener = tunListener
 		} else {
 			removeTunHook()
+			return false
 		}
+		tunHandler.listener = tunListener
 	}
+	return true
 }

 func handleGetRunTime() string {
@@ -226,10 +228,7 @@ func quickStart(initParamsChar *C.char, paramsChar *C.char, stateParamsChar *C.c

 //export startTUN
 func startTUN(fd C.int, callback unsafe.Pointer) bool {
-	go func() {
-		handleStartTun(int(fd), callback)
-	}()
-	return true
+	return handleStartTun(int(fd), callback)
 }

 //export getRunTime
@@ -239,9 +238,7 @@ func getRunTime() *C.char {

 //export stopTun
 func stopTun() {
-	go func() {
-		handleStopTun()
-	}()
+	handleStopTun()
 }

 //export getCurrentProfileName
--- a/core/state/state.go
+++ b/core/state/state.go
@@ -24,6 +24,7 @@ type AccessControl struct {
 	Mode              string   `json:"mode"`
 	AcceptList        []string `json:"acceptList"`
 	RejectList        []string `json:"rejectList"`
+	IsFilterSystemApp bool     `json:"isFilterSystemApp"`
 }

 type AndroidVpnRawOptions struct {
--- a/lib/application.dart
+++ b/lib/application.dart
@@ -1,18 +1,20 @@
 import 'dart:async';

+import 'package:dynamic_color/dynamic_color.dart';
 import 'package:fl_clash/clash/clash.dart';
 import 'package:fl_clash/common/common.dart';
 import 'package:fl_clash/l10n/l10n.dart';
 import 'package:fl_clash/manager/hotkey_manager.dart';
 import 'package:fl_clash/manager/manager.dart';
 import 'package:fl_clash/plugins/app.dart';
-import 'package:fl_clash/providers/providers.dart';
+import 'package:fl_clash/providers/config.dart';
 import 'package:fl_clash/state.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_localizations/flutter_localizations.dart';
 import 'package:flutter_riverpod/flutter_riverpod.dart';

 import 'controller.dart';
+import 'models/models.dart';
 import 'pages/pages.dart';

 class Application extends ConsumerStatefulWidget {
@@ -25,6 +27,7 @@ class Application extends ConsumerStatefulWidget {
 }

 class ApplicationState extends ConsumerState<Application> {
+  late ColorSchemes systemColorSchemes;
  Timer? _autoUpdateGroupTaskTimer;
  Timer? _autoUpdateProfilesTaskTimer;

@@ -40,8 +43,16 @@ class ApplicationState extends ConsumerState<Application> {
  ColorScheme _getAppColorScheme({
    required Brightness brightness,
    int? primaryColor,
+    required ColorSchemes systemColorSchemes,
  }) {
-    return ref.read(genColorSchemeProvider(brightness));
+    if (primaryColor != null) {
+      return ColorScheme.fromSeed(
+        seedColor: Color(primaryColor),
+        brightness: brightness,
+      );
+    } else {
+      return systemColorSchemes.getColorSchemeForBrightness(brightness);
+    }
  }

  @override
@@ -100,8 +111,7 @@ class ApplicationState extends ConsumerState<Application> {
    return AppStateManager(
      child: ClashManager(
        child: ConnectivityManager(
-          onConnectivityChanged: () async {
-            await clashCore.resetConnections();
+          onConnectivityChanged: () {
            globalState.appController.updateLocalIp();
            globalState.appController.addCheckIpNumDebounce();
          },
@@ -130,6 +140,19 @@ class ApplicationState extends ConsumerState<Application> {
    );
  }

+  _updateSystemColorSchemes(
+    ColorScheme? lightDynamic,
+    ColorScheme? darkDynamic,
+  ) {
+    systemColorSchemes = ColorSchemes(
+      lightColorScheme: lightDynamic,
+      darkColorScheme: darkDynamic,
+    );
+    WidgetsBinding.instance.addPostFrameCallback((_) {
+      globalState.appController.updateSystemColorSchemes(systemColorSchemes);
+    });
+  }
+
  @override
  Widget build(context) {
    return _buildPlatformState(
@@ -139,44 +162,51 @@ class ApplicationState extends ConsumerState<Application> {
            final locale =
                ref.watch(appSettingProvider.select((state) => state.locale));
            final themeProps = ref.watch(themeSettingProvider);
-            return MaterialApp(
-              debugShowCheckedModeBanner: false,
-              navigatorKey: globalState.navigatorKey,
-              localizationsDelegates: const [
-                AppLocalizations.delegate,
-                GlobalMaterialLocalizations.delegate,
-                GlobalCupertinoLocalizations.delegate,
-                GlobalWidgetsLocalizations.delegate
-              ],
-              builder: (_, child) {
-                return AppEnvManager(
-                  child: _buildPlatformApp(
-                    _buildApp(child!),
+            return DynamicColorBuilder(
+              builder: (lightDynamic, darkDynamic) {
+                _updateSystemColorSchemes(lightDynamic, darkDynamic);
+                return MaterialApp(
+                  debugShowCheckedModeBanner: false,
+                  navigatorKey: globalState.navigatorKey,
+                  localizationsDelegates: const [
+                    AppLocalizations.delegate,
+                    GlobalMaterialLocalizations.delegate,
+                    GlobalCupertinoLocalizations.delegate,
+                    GlobalWidgetsLocalizations.delegate
+                  ],
+                  builder: (_, child) {
+                    return AppEnvManager(
+                      child: _buildPlatformApp(
+                        _buildApp(child!),
+                      ),
+                    );
+                  },
+                  scrollBehavior: BaseScrollBehavior(),
+                  title: appName,
+                  locale: other.getLocaleForString(locale),
+                  supportedLocales: AppLocalizations.delegate.supportedLocales,
+                  themeMode: themeProps.themeMode,
+                  theme: ThemeData(
+                    useMaterial3: true,
+                    pageTransitionsTheme: _pageTransitionsTheme,
+                    colorScheme: _getAppColorScheme(
+                      brightness: Brightness.light,
+                      systemColorSchemes: systemColorSchemes,
+                      primaryColor: themeProps.primaryColor,
+                    ),
                  ),
+                  darkTheme: ThemeData(
+                    useMaterial3: true,
+                    pageTransitionsTheme: _pageTransitionsTheme,
+                    colorScheme: _getAppColorScheme(
+                      brightness: Brightness.dark,
+                      systemColorSchemes: systemColorSchemes,
+                      primaryColor: themeProps.primaryColor,
+                    ).toPureBlack(themeProps.pureBlack),
+                  ),
+                  home: child,
                );
              },
-              scrollBehavior: BaseScrollBehavior(),
-              title: appName,
-              locale: utils.getLocaleForString(locale),
-              supportedLocales: AppLocalizations.delegate.supportedLocales,
-              themeMode: themeProps.themeMode,
-              theme: ThemeData(
-                useMaterial3: true,
-                pageTransitionsTheme: _pageTransitionsTheme,
-                colorScheme: _getAppColorScheme(
-                  brightness: Brightness.light,
-                  primaryColor: themeProps.primaryColor,
-                ),
-              ),
-              darkTheme: ThemeData(
-                useMaterial3: true,
-                pageTransitionsTheme: _pageTransitionsTheme,
-                colorScheme: _getAppColorScheme(
-                  brightness: Brightness.dark,
-                  primaryColor: themeProps.primaryColor,
-                ).toPureBlack(themeProps.pureBlack),
-              ),
-              home: child,
            );
          },
          child: const HomePage(),
--- a/lib/clash/core.dart
+++ b/lib/clash/core.dart
@@ -143,10 +143,6 @@ class ClashCore {
    clashInterface.closeConnections();
  }

-  resetConnections() {
-    clashInterface.resetConnections();
-  }
-
  Future<List<ExternalProvider>> getExternalProviders() async {
    final externalProvidersRawString =
        await clashInterface.getExternalProviders();
--- a/lib/clash/interface.dart
+++ b/lib/clash/interface.dart
@@ -58,16 +58,12 @@ mixin ClashInterface {

  stopLog();

-  Future<bool> crash();
-
  FutureOr<String> getConnections();

  FutureOr<bool> closeConnection(String id);

  FutureOr<bool> closeConnections();

-  FutureOr<bool> resetConnections();
-
  FutureOr<String> getProfile(String id);

  Future<bool> setState(CoreState state);
@@ -108,7 +104,6 @@ abstract class ClashHandlerInterface with ClashInterface {
        case ActionMethod.closeConnection:
        case ActionMethod.stopListener:
        case ActionMethod.setState:
-        case ActionMethod.crash:
          completer?.complete(result.data as bool);
          return;
        case ActionMethod.changeProxy:
@@ -156,7 +151,7 @@ abstract class ClashHandlerInterface with ClashInterface {
    Duration? timeout,
    FutureOr<T> Function()? onTimeout,
  }) async {
-    final id = "${method.name}#${utils.id}";
+    final id = "${method.name}#${other.id}";

    callbackCompleterMap[id] = Completer<T>();

@@ -247,13 +242,6 @@ abstract class ClashHandlerInterface with ClashInterface {
    );
  }

-  @override
-  Future<bool> crash() {
-    return invoke<bool>(
-      method: ActionMethod.crash,
-    );
-  }
-
  @override
  Future<String> getProxies() {
    return invoke<String>(
@@ -330,13 +318,6 @@ abstract class ClashHandlerInterface with ClashInterface {
    );
  }

-  @override
-  Future<bool> resetConnections() {
-    return invoke<bool>(
-      method: ActionMethod.resetConnections,
-    );
-  }
-
  @override
  Future<bool> closeConnection(String id) {
    return invoke<bool>(
--- a/lib/clash/lib.dart
+++ b/lib/clash/lib.dart
@@ -267,15 +267,6 @@ class ClashLibHandler {
    return true;
  }

-  DateTime? getRunTime() {
-    final runTimeRaw = clashFFI.getRunTime();
-    final runTimeString = runTimeRaw.cast<Utf8>().toDartString();
-    if (runTimeString.isEmpty) {
-      return null;
-    }
-    return DateTime.fromMillisecondsSinceEpoch(int.parse(runTimeString));
-  }
-
  Future<String> quickStart(
    InitParams initParams,
    UpdateConfigParams updateConfigParams,
@@ -306,10 +297,15 @@ class ClashLibHandler {
    malloc.free(stateParamsChar);
    return completer.future;
  }
+
+  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));
+  }
 }

 ClashLib? get clashLib =>
    Platform.isAndroid && !globalState.isService ? ClashLib() : null;
-
-ClashLibHandler? get clashLibHandler =>
-    Platform.isAndroid ? ClashLibHandler() : null;
--- a/lib/clash/service.dart
+++ b/lib/clash/service.dart
@@ -71,9 +71,9 @@ class ClashService extends ClashHandlerInterface {
      }
    }, (error, stack) {
      commonPrint.log(error.toString());
-      if (error is SocketException) {
+      if(error is SocketException){
        globalState.showNotifier(error.toString());
-        // globalState.appController.restartCore();
+        globalState.appController.restartCore();
      }
    });
  }
@@ -92,11 +92,12 @@ class ClashService extends ClashHandlerInterface {
    final arg = Platform.isWindows
        ? "${serverSocket.port}"
        : serverSocket.address.address;
+    bool isSuccess = false;
    if (Platform.isWindows && await system.checkIsAdmin()) {
-      final isSuccess = await request.startCoreByHelper(arg);
-      if (isSuccess) {
-        return;
-      }
+      isSuccess = await request.startCoreByHelper(arg);
+    }
+    if (isSuccess) {
+      return;
    }
    process = await Process.start(
      appPath.corePath,
--- a/lib/common/color.dart
+++ b/lib/common/color.dart
@@ -1,5 +1,3 @@
-import 'dart:math';
-
 import 'package:flutter/material.dart';

 extension ColorExtension on Color {
@@ -39,54 +37,11 @@ extension ColorExtension on Color {
    return withAlpha(0);
  }

-  int get value32bit {
-    return _floatToInt8(a) << 24 |
-        _floatToInt8(r) << 16 |
-        _floatToInt8(g) << 8 |
-        _floatToInt8(b) << 0;
-  }
-
-  int get alpha8bit => (0xff000000 & value32bit) >> 24;
-
-  int get red8bit => (0x00ff0000 & value32bit) >> 16;
-
-  int get green8bit => (0x0000ff00 & value32bit) >> 8;
-
-  int get blue8bit => (0x000000ff & value32bit) >> 0;
-
-  int _floatToInt8(double x) {
-    return (x * 255.0).round() & 0xff;
-  }
-
-  Color lighten([double amount = 10]) {
-    if (amount <= 0) return this;
-    if (amount > 100) return Colors.white;
-    final HSLColor hsl = this == const Color(0xFF000000)
-        ? HSLColor.fromColor(this).withSaturation(0)
-        : HSLColor.fromColor(this);
-    return hsl
-        .withLightness(min(1, max(0, hsl.lightness + amount / 100)))
-        .toColor();
-  }
-
-  String get hex {
-    final value = toARGB32();
-    final red = (value >> 16) & 0xFF;
-    final green = (value >> 8) & 0xFF;
-    final blue = value & 0xFF;
-    return '#${red.toRadixString(16).padLeft(2, '0')}'
-            '${green.toRadixString(16).padLeft(2, '0')}'
-            '${blue.toRadixString(16).padLeft(2, '0')}'
-        .toUpperCase();
-  }
-
-  Color darken([final int amount = 10]) {
-    if (amount <= 0) return this;
-    if (amount > 100) return Colors.black;
-    final HSLColor hsl = HSLColor.fromColor(this);
-    return hsl
-        .withLightness(min(1, max(0, hsl.lightness - amount / 100)))
-        .toColor();
+  Color darken([double amount = .1]) {
+    assert(amount >= 0 && amount <= 1);
+    final hsl = HSLColor.fromColor(this);
+    final hslDark = hsl.withLightness((hsl.lightness - amount).clamp(0.0, 1.0));
+    return hslDark.toColor();
  }

  Color blendDarken(
@@ -119,7 +74,7 @@ extension ColorSchemeExtension on ColorScheme {
      ? copyWith(
          surface: Colors.black,
          surfaceContainer: surfaceContainer.darken(
-            5,
+            0.05,
          ),
        )
      : this;
--- a/lib/common/common.dart
+++ b/lib/common/common.dart
@@ -4,37 +4,36 @@ export 'color.dart';
 export 'constant.dart';
 export 'context.dart';
 export 'datetime.dart';
-export 'fixed.dart';
 export 'function.dart';
 export 'future.dart';
 export 'http.dart';
 export 'icons.dart';
 export 'iterable.dart';
-export 'javascript.dart';
 export 'keyboard.dart';
 export 'launch.dart';
 export 'link.dart';
+export 'list.dart';
 export 'lock.dart';
 export 'measure.dart';
-export 'mixin.dart';
 export 'navigation.dart';
 export 'navigator.dart';
 export 'network.dart';
 export 'num.dart';
+export 'other.dart';
 export 'package.dart';
 export 'path.dart';
 export 'picker.dart';
 export 'preferences.dart';
-export 'print.dart';
 export 'protocol.dart';
 export 'proxy.dart';
-export 'render.dart';
 export 'request.dart';
 export 'scroll.dart';
 export 'string.dart';
 export 'system.dart';
 export 'text.dart';
 export 'tray.dart';
-export 'utils.dart';
 export 'window.dart';
 export 'windows.dart';
+export 'render.dart';
+export 'mixin.dart';
+export 'print.dart';
--- a/lib/common/constant.dart
+++ b/lib/common/constant.dart
@@ -16,15 +16,16 @@ const browserUa =
 const packageName = "com.follow.clash";
 final unixSocketPath = "/tmp/FlClashSocket_${Random().nextInt(10000)}.sock";
 const helperPort = 47890;
-const maxTextScale = 1.4;
-const minTextScale = 0.8;
-final baseInfoEdgeInsets = EdgeInsets.symmetric(
-  vertical: 16.ap,
-  horizontal: 16.ap,
+const helperTag = "2024125";
+const baseInfoEdgeInsets = EdgeInsets.symmetric(
+  vertical: 16,
+  horizontal: 16,
 );

-final defaultTextScaleFactor =
-    WidgetsBinding.instance.platformDispatcher.textScaleFactor;
+double textScaleFactor = min(
+  WidgetsBinding.instance.platformDispatcher.textScaleFactor,
+  1.2,
+);
 const httpTimeoutDuration = Duration(milliseconds: 5000);
 const moreDuration = Duration(milliseconds: 100);
 const animateDuration = Duration(milliseconds: 100);
@@ -43,6 +44,7 @@ const profilesDirectoryName = "profiles";
 const localhost = "127.0.0.1";
 const clashConfigKey = "clash_config";
 const configKey = "config";
+const listItemPadding = EdgeInsets.symmetric(horizontal: 16);
 const double dialogCommonWidth = 300;
 const repository = "chen08209/FlClash";
 const defaultExternalController = "127.0.0.1:9090";
@@ -58,7 +60,6 @@ final commonFilter = ImageFilter.blur(
 const navigationItemListEquality = ListEquality<NavigationItem>();
 const connectionListEquality = ListEquality<Connection>();
 const stringListEquality = ListEquality<String>();
-const intListEquality = ListEquality<int>();
 const logListEquality = ListEquality<Log>();
 const groupListEquality = ListEquality<Group>();
 const externalProviderListEquality = ListEquality<ExternalProvider>();
@@ -77,28 +78,12 @@ const viewModeColumnsMap = {
  ViewMode.desktop: [4, 3],
 };

-// const proxiesStoreKey = PageStorageKey<String>('proxies');
-// const toolsStoreKey = PageStorageKey<String>('tools');
-// const profilesStoreKey = PageStorageKey<String>('profiles');
-
-const defaultPrimaryColor = 0XFFD8C0C3;
+const defaultPrimaryColor = Colors.brown;

 double getWidgetHeight(num lines) {
-  return max(lines * 84 + (lines - 1) * 16, 0).ap;
+  return max(lines * 84 * textScaleFactor + (lines - 1) * 16, 0);
 }

-const maxLength = 150;
-
 final mainIsolate = "FlClashMainIsolate";

 final serviceIsolate = "FlClashServiceIsolate";
-
-const defaultPrimaryColors = [
-  0xFF795548,
-  0xFF03A9F4,
-  0xFFFFFF00,
-  0XFFBBC9CC,
-  0XFFABD397,
-  defaultPrimaryColor,
-  0XFF665390,
-];
--- a/lib/common/context.dart
+++ b/lib/common/context.dart
@@ -1,4 +1,4 @@
-import 'package:fl_clash/manager/message_manager.dart';
+import 'package:fl_clash/manager/manager.dart';
 import 'package:fl_clash/widgets/scaffold.dart';
 import 'package:flutter/material.dart';

@@ -11,36 +11,6 @@ extension BuildContextExtension on BuildContext {
    return findAncestorStateOfType<MessageManagerState>()?.message(text);
  }

-  showSnackBar(
-    String message, {
-    SnackBarAction? action,
-  }) {
-    final width = viewWidth;
-    EdgeInsets margin;
-    if (width < 600) {
-      margin = const EdgeInsets.only(
-        bottom: 16,
-        right: 16,
-        left: 16,
-      );
-    } else {
-      margin = EdgeInsets.only(
-        bottom: 16,
-        left: 16,
-        right: width - 316,
-      );
-    }
-    ScaffoldMessenger.of(this).showSnackBar(
-      SnackBar(
-        action: action,
-        content: Text(message),
-        behavior: SnackBarBehavior.floating,
-        duration: const Duration(milliseconds: 1500),
-        margin: margin,
-      ),
-    );
-  }
-
  Size get appSize {
    return MediaQuery.of(this).size;
  }
@@ -57,10 +27,10 @@ extension BuildContextExtension on BuildContext {
    T? state;

    visitor(Element element) {
-      if (!element.mounted) {
+      if(!element.mounted){
        return;
      }
-      if (element is StatefulElement) {
+      if(element is StatefulElement){
        if (element.state is T) {
          state = element.state as T;
        }
--- a/lib/common/fixed.dart
+++ b/lib/common/fixed.dart
@@ -1,79 +0,0 @@
-import 'iterable.dart';
-
-class FixedList<T> {
-  final int maxLength;
-  final List<T> _list;
-
-  FixedList(this.maxLength, {List<T>? list})
-      : _list = (list ?? [])..truncate(maxLength);
-
-  add(T item) {
-    _list.add(item);
-    _list.truncate(maxLength);
-  }
-
-  clear() {
-    _list.clear();
-  }
-
-  List<T> get list => List.unmodifiable(_list);
-
-  int get length => _list.length;
-
-  T operator [](int index) => _list[index];
-
-  FixedList<T> copyWith() {
-    return FixedList(
-      maxLength,
-      list: _list,
-    );
-  }
-}
-
-class FixedMap<K, V> {
-  int maxLength;
-  late Map<K, V> _map;
-
-  FixedMap(this.maxLength, {Map<K, V>? map}) {
-    _map = map ?? {};
-  }
-
-  updateCacheValue(K key, V Function() callback) {
-    final realValue = _map.updateCacheValue(
-      key,
-      callback,
-    );
-    _adjustMap();
-    return realValue;
-  }
-
-  clear() {
-    _map.clear();
-  }
-
-  updateMaxLength(int size) {
-    maxLength = size;
-    _adjustMap();
-  }
-
-  updateMap(Map<K, V> map) {
-    _map = map;
-    _adjustMap();
-  }
-
-  _adjustMap() {
-    if (_map.length > maxLength) {
-      _map = Map.fromEntries(
-        map.entries.toList()..truncate(maxLength),
-      );
-    }
-  }
-
-  V? get(K key) => _map[key];
-
-  bool containsKey(K key) => _map.containsKey(key);
-
-  int get length => _map.length;
-
-  Map<K, V> get map => Map.unmodifiable(_map);
-}
--- a/lib/common/function.dart
+++ b/lib/common/function.dart
@@ -1,12 +1,10 @@
 import 'dart:async';

-import 'package:fl_clash/enum/enum.dart';
-
 class Debouncer {
-  final Map<FunctionTag, Timer?> _operations = {};
+  final Map<dynamic, Timer?> _operations = {};

  call(
-    FunctionTag tag,
+    dynamic tag,
    Function func, {
    List<dynamic>? args,
    Duration duration = const Duration(milliseconds: 600),
@@ -35,10 +33,10 @@ class Debouncer {
 }

 class Throttler {
-  final Map<FunctionTag, Timer?> _operations = {};
+  final Map<dynamic, Timer?> _operations = {};

  call(
-    FunctionTag tag,
+    dynamic tag,
    Function func, {
    List<dynamic>? args,
    Duration duration = const Duration(milliseconds: 600),
--- a/lib/common/iterable.dart
+++ b/lib/common/iterable.dart
@@ -38,43 +38,6 @@ extension IterableExt<T> on Iterable<T> {
      count++;
    }
  }
-
-  Iterable<T> takeLast({int count = 50}) {
-    if (count <= 0) return Iterable.empty();
-    return count >= length ? this : toList().skip(length - count);
-  }
-}
-
-extension ListExt<T> on List<T> {
-  void truncate(int maxLength) {
-    assert(maxLength > 0);
-    if (length > maxLength) {
-      removeRange(0, length - maxLength);
-    }
-  }
-
-  List<T> intersection(List<T> list) {
-    return where((item) => list.contains(item)).toList();
-  }
-
-  List<List<T>> batch(int maxConcurrent) {
-    final batches = (length / maxConcurrent).ceil();
-    final List<List<T>> res = [];
-    for (int i = 0; i < batches; i++) {
-      if (i != batches - 1) {
-        res.add(sublist(i * maxConcurrent, maxConcurrent * (i + 1)));
-      } else {
-        res.add(sublist(i * maxConcurrent, length));
-      }
-    }
-    return res;
-  }
-
-  List<T> safeSublist(int start) {
-    if (start <= 0) return this;
-    if (start > length) return [];
-    return sublist(start);
-  }
 }

 extension DoubleListExt on List<double> {
@@ -104,9 +67,9 @@ extension DoubleListExt on List<double> {
 }

 extension MapExt<K, V> on Map<K, V> {
-  updateCacheValue(K key, V Function() callback) {
+  getCacheValue(K key, V defaultValue) {
    if (this[key] == null) {
-      this[key] = callback();
+      this[key] = defaultValue;
    }
    return this[key];
  }
--- a/lib/common/javascript.dart
+++ b/lib/common/javascript.dart
@@ -1,22 +0,0 @@
-import 'package:flutter_js/flutter_js.dart';
-
-class Javascript {
-  static Javascript? _instance;
-  late JavascriptRuntime runtime;
-
-  Javascript._internal() {
-    runtime = getJavascriptRuntime();
-  }
-
-  Future<String> evaluate(String js) async {
-    final evaluate = runtime.evaluate(js);
-    return evaluate.stringResult;
-  }
-
-  factory Javascript() {
-    _instance ??= Javascript._internal();
-    return _instance!;
-  }
-}
-
-final js = Javascript();
--- a/lib/common/launch.dart
+++ b/lib/common/launch.dart
@@ -1,7 +1,6 @@
 import 'dart:async';
 import 'dart:io';

-import 'package:flutter/foundation.dart';
 import 'package:launch_at_startup/launch_at_startup.dart';

 import 'constant.dart';
@@ -35,9 +34,6 @@ class AutoLaunch {
  }

  updateStatus(bool isAutoLaunch) async {
-    if(kDebugMode){
-      return;
-    }
    if (await isEnable == isAutoLaunch) return;
    if (isAutoLaunch == true) {
      enable();
--- a/lib/common/list.dart
+++ b/lib/common/list.dart
@@ -0,0 +1,93 @@
+import 'dart:collection';
+
+class FixedList<T> {
+  final int maxLength;
+  final List<T> _list;
+
+  FixedList(this.maxLength, {List<T>? list}) : _list = list ?? [];
+
+  add(T item) {
+    if (_list.length == maxLength) {
+      _list.removeAt(0);
+    }
+    _list.add(item);
+  }
+
+  clear() {
+    _list.clear();
+  }
+
+  List<T> get list => List.unmodifiable(_list);
+
+  int get length => _list.length;
+
+  T operator [](int index) => _list[index];
+
+  FixedList<T> copyWith() {
+    return FixedList(
+      maxLength,
+      list: _list,
+    );
+  }
+}
+
+class FixedMap<K, V> {
+  int maxSize;
+  final Map<K, V> _map = {};
+  final Queue<K> _queue = Queue<K>();
+
+  FixedMap(this.maxSize);
+
+  put(K key, V value) {
+    if (_map.length == maxSize) {
+      final oldestKey = _queue.removeFirst();
+      _map.remove(oldestKey);
+    }
+    _map[key] = value;
+    _queue.add(key);
+    return value;
+  }
+
+  clear() {
+    _map.clear();
+    _queue.clear();
+  }
+
+  updateMaxSize(int size){
+    maxSize = size;
+  }
+
+  V? get(K key) => _map[key];
+
+
+  bool containsKey(K key) => _map.containsKey(key);
+
+  int get length => _map.length;
+
+  Map<K, V> get map => Map.unmodifiable(_map);
+}
+
+extension ListExtension<T> on List<T> {
+  List<T> intersection(List<T> list) {
+    return where((item) => list.contains(item)).toList();
+  }
+
+  List<List<T>> batch(int maxConcurrent) {
+    final batches = (length / maxConcurrent).ceil();
+    final List<List<T>> res = [];
+    for (int i = 0; i < batches; i++) {
+      if (i != batches - 1) {
+        res.add(sublist(i * maxConcurrent, maxConcurrent * (i + 1)));
+      } else {
+        res.add(sublist(i * maxConcurrent, length));
+      }
+    }
+    return res;
+  }
+
+  List<T> safeSublist(int start) {
+    if (start <= 0) return this;
+    if (start > length) return [];
+    return sublist(start);
+  }
+}
--- a/lib/common/measure.dart
+++ b/lib/common/measure.dart
@@ -3,13 +3,11 @@ import 'package:flutter/cupertino.dart';
 import 'package:flutter/material.dart';

 class Measure {
-  final TextScaler _textScaler;
+  final TextScaler _textScale;
  final BuildContext context;
-  final Map<String, dynamic> _measureMap;

-  Measure.of(this.context, double textScaleFactor)
-      : _measureMap = {},
-        _textScaler = TextScaler.linear(
+  Measure.of(this.context)
+      : _textScale = TextScaler.linear(
          textScaleFactor,
        );

@@ -23,7 +21,7 @@ class Measure {
        style: text.style,
      ),
      maxLines: text.maxLines,
-      textScaler: _textScaler,
+      textScaler: _textScale,
      textDirection: text.textDirection ?? TextDirection.ltr,
    )..layout(
        maxWidth: maxWidth,
@@ -31,87 +29,81 @@ class Measure {
    return textPainter.size;
  }

+  double? _bodyMediumHeight;
+  Size? _bodyLargeSize;
+  double? _bodySmallHeight;
+  double? _labelSmallHeight;
+  double? _labelMediumHeight;
+  double? _titleLargeHeight;
+  double? _titleMediumHeight;
+
  double get bodyMediumHeight {
-    return _measureMap.updateCacheValue(
-      "bodyMediumHeight",
-      () => computeTextSize(
-        Text(
-          "X",
-          style: context.textTheme.bodyMedium,
-        ),
-      ).height,
-    );
+    _bodyMediumHeight ??= computeTextSize(
+      Text(
+        "X",
+        style: context.textTheme.bodyMedium,
+      ),
+    ).height;
+    return _bodyMediumHeight!;
  }

-  double get bodyLargeHeight {
-    return _measureMap.updateCacheValue(
-      "bodyLargeHeight",
-      () => computeTextSize(
-        Text(
-          "X",
-          style: context.textTheme.bodyLarge,
-        ),
-      ).height,
+  Size get bodyLargeSize {
+    _bodyLargeSize ??= computeTextSize(
+      Text(
+        "X",
+        style: context.textTheme.bodyLarge,
+      ),
    );
+    return _bodyLargeSize!;
  }

  double get bodySmallHeight {
-    return _measureMap.updateCacheValue(
-      "bodySmallHeight",
-      () => computeTextSize(
-        Text(
-          "X",
-          style: context.textTheme.bodySmall,
-        ),
-      ).height,
-    );
+    _bodySmallHeight ??= computeTextSize(
+      Text(
+        "X",
+        style: context.textTheme.bodySmall,
+      ),
+    ).height;
+    return _bodySmallHeight!;
  }

  double get labelSmallHeight {
-    return _measureMap.updateCacheValue(
-      "labelSmallHeight",
-      () => computeTextSize(
-        Text(
-          "X",
-          style: context.textTheme.labelSmall,
-        ),
-      ).height,
-    );
+    _labelSmallHeight ??= computeTextSize(
+      Text(
+        "X",
+        style: context.textTheme.labelSmall,
+      ),
+    ).height;
+    return _labelSmallHeight!;
  }

  double get labelMediumHeight {
-    return _measureMap.updateCacheValue(
-      "labelMediumHeight",
-      () => computeTextSize(
-        Text(
-          "X",
-          style: context.textTheme.labelMedium,
-        ),
-      ).height,
-    );
+    _labelMediumHeight ??= computeTextSize(
+      Text(
+        "X",
+        style: context.textTheme.labelMedium,
+      ),
+    ).height;
+    return _labelMediumHeight!;
  }

  double get titleLargeHeight {
-    return _measureMap.updateCacheValue(
-      "titleLargeHeight",
-      () => computeTextSize(
-        Text(
-          "X",
-          style: context.textTheme.titleLarge,
-        ),
-      ).height,
-    );
+    _titleLargeHeight ??= computeTextSize(
+      Text(
+        "X",
+        style: context.textTheme.titleLarge,
+      ),
+    ).height;
+    return _titleLargeHeight!;
  }

  double get titleMediumHeight {
-    return _measureMap.updateCacheValue(
-      "titleMediumHeight",
-      () => computeTextSize(
-        Text(
-          "X",
-          style: context.textTheme.titleMedium,
-        ),
-      ).height,
-    );
+    _titleMediumHeight ??= computeTextSize(
+      Text(
+        "X",
+        style: context.textTheme.titleMedium,
+      ),
+    ).height;
+    return _titleMediumHeight!;
  }
 }
--- a/lib/common/navigation.dart
+++ b/lib/common/navigation.dart
@@ -12,9 +12,9 @@ class Navigation {
  }) {
    return [
      const NavigationItem(
-        keep: false,
        icon: Icon(Icons.space_dashboard),
        label: PageLabel.dashboard,
+        keep: false,
        fragment: DashboardFragment(
          key: GlobalObjectKey(PageLabel.dashboard),
        ),
@@ -66,6 +66,7 @@ class Navigation {
        icon: Icon(Icons.storage),
        label: PageLabel.resources,
        description: "resourcesDesc",
+        keep: false,
        fragment: Resources(
          key: GlobalObjectKey(
            PageLabel.resources,
--- a/lib/common/num.dart
+++ b/lib/common/num.dart
@@ -1,4 +1,3 @@
-import 'package:fl_clash/state.dart';
 import 'package:flutter/foundation.dart';
 import 'package:flutter/material.dart';

@@ -13,10 +12,6 @@ extension NumExt on num {
    }
    return formatted;
  }
-
-  double get ap {
-    return this * (1 + (globalState.theme.textScaleFactor - 1) * 0.5);
-  }
 }

 extension DoubleExt on double {
--- a/lib/common/other.dart
+++ b/lib/common/other.dart
@@ -5,11 +5,9 @@ import 'dart:ui';
 import 'package:fl_clash/common/common.dart';
 import 'package:fl_clash/enum/enum.dart';
 import 'package:flutter/material.dart';
-import 'package:flutter/services.dart';
 import 'package:lpinyin/lpinyin.dart';
-import 'package:yaml/yaml.dart';

-class Utils {
+class Other {
  Color? getDelayColor(int? delay) {
    if (delay == null) return null;
    if (delay < 0) return Colors.red;
@@ -232,64 +230,7 @@ class Utils {
  }

  int getProfilesColumns(double viewWidth) {
-    return max((viewWidth / 320).floor(), 1);
-  }
-
-  final _indexPrimary = [
-    50,
-    100,
-    200,
-    300,
-    400,
-    500,
-    600,
-    700,
-    800,
-    850,
-    900,
-  ];
-
-  _createPrimarySwatch(Color color) {
-    final Map<int, Color> swatch = <int, Color>{};
-    final int a = color.alpha8bit;
-    final int r = color.red8bit;
-    final int g = color.green8bit;
-    final int b = color.blue8bit;
-    for (final int strength in _indexPrimary) {
-      final double ds = 0.5 - strength / 1000;
-      swatch[strength] = Color.fromARGB(
-        a,
-        r + ((ds < 0 ? r : (255 - r)) * ds).round(),
-        g + ((ds < 0 ? g : (255 - g)) * ds).round(),
-        b + ((ds < 0 ? b : (255 - b)) * ds).round(),
-      );
-    }
-    swatch[50] = swatch[50]!.lighten(18);
-    swatch[100] = swatch[100]!.lighten(16);
-    swatch[200] = swatch[200]!.lighten(14);
-    swatch[300] = swatch[300]!.lighten(10);
-    swatch[400] = swatch[400]!.lighten(6);
-    swatch[700] = swatch[700]!.darken(2);
-    swatch[800] = swatch[800]!.darken(3);
-    swatch[900] = swatch[900]!.darken(4);
-    return MaterialColor(color.value32bit, swatch);
-  }
-
-  List<Color> getMaterialColorShades(Color color) {
-    final swatch = _createPrimarySwatch(color);
-    return <Color>[
-      if (swatch[50] != null) swatch[50]!,
-      if (swatch[100] != null) swatch[100]!,
-      if (swatch[200] != null) swatch[200]!,
-      if (swatch[300] != null) swatch[300]!,
-      if (swatch[400] != null) swatch[400]!,
-      if (swatch[500] != null) swatch[500]!,
-      if (swatch[600] != null) swatch[600]!,
-      if (swatch[700] != null) swatch[700]!,
-      if (swatch[800] != null) swatch[800]!,
-      if (swatch[850] != null) swatch[850]!,
-      if (swatch[900] != null) swatch[900]!,
-    ];
+    return max((viewWidth / 350).floor(), 1);
  }

  String getBackupFileName() {
@@ -325,40 +266,6 @@ class Utils {
    }
    return "";
  }
-
-  SingleActivator controlSingleActivator(LogicalKeyboardKey trigger) {
-    final control = Platform.isMacOS ? false : true;
-    return SingleActivator(
-      trigger,
-      control: control,
-      meta: !control,
-    );
-  }
-
-  dynamic convertLoadYaml(dynamic node) {
-    if (node is YamlMap) {
-      final map = <String, dynamic>{};
-      node.nodes.forEach((key, value) {
-        String stringKey;
-        if (key is YamlScalar) {
-          stringKey = key.value.toString();
-        } else {
-          stringKey = key.toString();
-        }
-        map[stringKey] = convertLoadYaml(value.value);
-      });
-      return map;
-    } else if (node is YamlList) {
-      final list = <dynamic>[];
-      for (final item in node.nodes) {
-        list.add(convertLoadYaml(item.value));
-      }
-      return list;
-    } else if (node is YamlScalar) {
-      return node.value;
-    }
-    return node;
-  }
 }

-final utils = Utils();
+final other = Other();
--- a/lib/common/path.dart
+++ b/lib/common/path.dart
@@ -73,12 +73,14 @@ class AppPath {
    return join(directory.path, profilesDirectoryName);
  }

-  Future<String> getProfilePath(String id) async {
+  Future<String?> getProfilePath(String? id) async {
+    if (id == null) return null;
    final directory = await profilesPath;
    return join(directory, "$id.yaml");
  }

-  Future<String> getProvidersPath(String id) async {
+  Future<String?> getProvidersPath(String? id) async {
+    if (id == null) return null;
    final directory = await profilesPath;
    return join(directory, "providers", id);
  }
--- a/lib/common/print.dart
+++ b/lib/common/print.dart
@@ -1,3 +1,4 @@
+import 'package:fl_clash/enum/enum.dart';
 import 'package:fl_clash/models/models.dart';
 import 'package:fl_clash/state.dart';
 import 'package:flutter/cupertino.dart';
@@ -15,11 +16,14 @@ class CommonPrint {
  log(String? text) {
    final payload = "[FlClash] $text";
    debugPrint(payload);
-    if (!globalState.isInit) {
+    if (globalState.isService) {
      return;
    }
    globalState.appController.addLog(
-      Log.app(payload),
+      Log(
+        logLevel: LogLevel.info,
+        payload: payload,
+      ),
    );
  }
 }
--- a/lib/common/render.dart
+++ b/lib/common/render.dart
@@ -23,14 +23,14 @@ class Render {

  pause() {
    throttler.call(
-      FunctionTag.renderPause,
+      DebounceTag.renderPause,
      _pause,
      duration: Duration(seconds: 5),
    );
  }

  resume() {
-    throttler.cancel(FunctionTag.renderPause);
+    throttler.cancel(DebounceTag.renderPause);
    _resume();
  }

@@ -54,4 +54,4 @@ class Render {
  }
 }

-final Render? render = system.isDesktop ? Render() : null;
+final render = system.isDesktop ? Render() : null;
--- a/lib/common/request.dart
+++ b/lib/common/request.dart
@@ -68,7 +68,7 @@ class Request {
    final remoteVersion = data['tag_name'];
    final version = globalState.packageInfo.version;
    final hasUpdate =
-        utils.compareVersions(remoteVersion.replaceAll('v', ''), version) > 0;
+        other.compareVersions(remoteVersion.replaceAll('v', ''), version) > 0;
    if (!hasUpdate) return null;
    return data;
  }
@@ -130,7 +130,7 @@ class Request {
      if (response.statusCode != HttpStatus.ok) {
        return false;
      }
-      return (response.data as String) == globalState.coreSHA256;
+      return (response.data as String) == helperTag;
    } catch (_) {
      return false;
    }
--- a/lib/common/string.dart
+++ b/lib/common/string.dart
@@ -47,10 +47,6 @@ extension StringExtension on String {
      return false;
    }
  }
-
-// bool containsToLower(String target) {
-//   return toLowerCase().contains(target);
-// }
 }

 extension StringExtensionSafe on String? {
--- a/lib/common/system.dart
+++ b/lib/common/system.dart
@@ -55,24 +55,18 @@ class System {
  }

  Future<AuthorizeCode> authorizeCore() async {
-    if (Platform.isAndroid) {
-      return AuthorizeCode.none;
-    }
    final corePath = appPath.corePath.replaceAll(' ', '\\\\ ');
    final isAdmin = await checkIsAdmin();
    if (isAdmin) {
      return AuthorizeCode.none;
    }
-
    if (Platform.isWindows) {
      final result = await windows?.registerService();
      if (result == true) {
        return AuthorizeCode.success;
      }
      return AuthorizeCode.error;
-    }
-
-    if (Platform.isMacOS) {
+    } else if (Platform.isMacOS) {
      final shell = 'chown root:admin $corePath; chmod +sx $corePath';
      final arguments = [
        "-e",
--- a/lib/common/theme.dart
+++ b/lib/common/theme.dart
@@ -4,43 +4,36 @@ import 'package:flutter/material.dart';
 class CommonTheme {
  final BuildContext context;
  final Map<String, Color> _colorMap;
-  final double textScaleFactor;

-  CommonTheme.of(
-    this.context,
-    this.textScaleFactor,
-  ) : _colorMap = {};
+  CommonTheme.of(this.context) : _colorMap = {};

  Color get darkenSecondaryContainer {
-    return _colorMap.updateCacheValue(
+    return _colorMap.getCacheValue(
      "darkenSecondaryContainer",
-      () => context.colorScheme.secondaryContainer
-          .blendDarken(context, factor: 0.1),
+      context.colorScheme.secondaryContainer.blendDarken(context, factor: 0.1),
    );
  }

  Color get darkenSecondaryContainerLighter {
-    return _colorMap.updateCacheValue(
+    return _colorMap.getCacheValue(
      "darkenSecondaryContainerLighter",
-      () => context.colorScheme.secondaryContainer
+      context.colorScheme.secondaryContainer
          .blendDarken(context, factor: 0.1)
          .opacity60,
    );
  }

  Color get darken2SecondaryContainer {
-    return _colorMap.updateCacheValue(
+    return _colorMap.getCacheValue(
      "darken2SecondaryContainer",
-      () => context.colorScheme.secondaryContainer
-          .blendDarken(context, factor: 0.2),
+      context.colorScheme.secondaryContainer.blendDarken(context, factor: 0.2),
    );
  }

  Color get darken3PrimaryContainer {
-    return _colorMap.updateCacheValue(
+    return _colorMap.getCacheValue(
      "darken3PrimaryContainer",
-      () => context.colorScheme.primaryContainer
-          .blendDarken(context, factor: 0.3),
+      context.colorScheme.primaryContainer.blendDarken(context, factor: 0.3),
    );
  }
 }
--- a/lib/common/tray.dart
+++ b/lib/common/tray.dart
@@ -1,6 +1,5 @@
 import 'dart:io';

-import 'package:fl_clash/common/utils.dart';
 import 'package:fl_clash/enum/enum.dart';
 import 'package:fl_clash/models/models.dart';
 import 'package:fl_clash/state.dart';
@@ -11,6 +10,7 @@ import 'package:tray_manager/tray_manager.dart';

 import 'app_localizations.dart';
 import 'constant.dart';
+import 'other.dart';
 import 'window.dart';

 class Tray {
@@ -25,7 +25,7 @@ class Tray {
      await trayManager.destroy();
    }
    await trayManager.setIcon(
-      utils.getTrayIconPath(
+      other.getTrayIconPath(
        brightness: brightness ??
            WidgetsBinding.instance.platformDispatcher.platformBrightness,
      ),
@@ -80,7 +80,7 @@ class Tray {
      );
    }
    menuItems.add(MenuItem.separator());
-    if (Platform.isMacOS) {
+    if (!Platform.isWindows) {
      for (final group in trayState.groups) {
        List<MenuItem> subMenuItems = [];
        for (final proxy in group.all) {
--- a/lib/controller.dart
+++ b/lib/controller.dart
@@ -8,7 +8,6 @@ import 'package:archive/archive.dart';
 import 'package:fl_clash/clash/clash.dart';
 import 'package:fl_clash/common/archive.dart';
 import 'package:fl_clash/enum/enum.dart';
-import 'package:fl_clash/plugins/app.dart';
 import 'package:fl_clash/providers/providers.dart';
 import 'package:fl_clash/state.dart';
 import 'package:fl_clash/widgets/dialog.dart';
@@ -31,18 +30,18 @@ class AppController {
  AppController(this.context, WidgetRef ref) : _ref = ref;

  updateClashConfigDebounce() {
-    debouncer.call(FunctionTag.updateClashConfig, () async {
+    debouncer.call(DebounceTag.updateClashConfig, () async {
      final isPatch = globalState.appState.needApply ? false : true;
      await updateClashConfig(isPatch);
    });
  }

  updateGroupsDebounce() {
-    debouncer.call(FunctionTag.updateGroups, updateGroups);
+    debouncer.call(DebounceTag.updateGroups, updateGroups);
  }

  addCheckIpNumDebounce() {
-    debouncer.call(FunctionTag.addCheckIpNum, () {
+    debouncer.call(DebounceTag.addCheckIpNum, () {
      _ref.read(checkIpNumProvider.notifier).add();
    });
  }
@@ -50,17 +49,17 @@ class AppController {
  applyProfileDebounce({
    bool silence = false,
  }) {
-    debouncer.call(FunctionTag.applyProfile, (silence) {
+    debouncer.call(DebounceTag.applyProfile, (silence) {
      applyProfile(silence: silence);
    }, args: [silence]);
  }

  savePreferencesDebounce() {
-    debouncer.call(FunctionTag.savePreferences, savePreferences);
+    debouncer.call(DebounceTag.savePreferences, savePreferences);
  }

  changeProxyDebounce(String groupName, String proxyName) {
-    debouncer.call(FunctionTag.changeProxy,
+    debouncer.call(DebounceTag.changeProxy,
        (String groupName, String proxyName) async {
      await changeProxy(
        groupName: groupName,
@@ -154,7 +153,7 @@ class AppController {
  updateLocalIp() async {
    _ref.read(localIpProvider.notifier).value = null;
    await Future.delayed(commonDuration);
-    _ref.read(localIpProvider.notifier).value = await utils.getLocalIpAddress();
+    _ref.read(localIpProvider.notifier).value = await other.getLocalIpAddress();
  }

  Future<void> updateProfile(Profile profile) async {
@@ -261,7 +260,9 @@ class AppController {
    final patchConfig = _ref.read(patchClashConfigProvider);
    final appSetting = _ref.read(appSettingProvider);
    bool enableTun = patchConfig.tun.enable;
-    if (enableTun != lastTunEnable && lastTunEnable == false) {
+    if (enableTun != lastTunEnable &&
+        lastTunEnable == false &&
+        !Platform.isAndroid) {
      final code = await system.authorizeCore();
      switch (code) {
        case AuthorizeCode.none:
@@ -313,10 +314,6 @@ class AppController {
  handleChangeProfile() {
    _ref.read(delayDataSourceProvider.notifier).value = {};
    applyProfile();
-    _ref.read(logsProvider.notifier).value = FixedList(500);
-    _ref.read(requestsProvider.notifier).value = FixedList(500);
-    globalState.cacheHeightMap = {};
-    globalState.cacheScrollPosition = {};
  }

  updateBrightness(Brightness brightness) {
@@ -337,22 +334,23 @@ class AppController {
      try {
        await updateProfile(profile);
      } catch (e) {
-        commonPrint.log(e.toString());
+        _ref.read(logsProvider.notifier).addLog(
+              Log(
+                logLevel: LogLevel.info,
+                payload: e.toString(),
+              ),
+            );
      }
    }
  }

  Future<void> updateGroups() async {
-    try {
-      _ref.read(groupsProvider.notifier).value = await retry(
-        task: () async {
-          return await clashCore.getProxiesGroups();
-        },
-        retryIf: (res) => res.isEmpty,
-      );
-    } catch (_) {
-      _ref.read(groupsProvider.notifier).value = [];
-    }
+    _ref.read(groupsProvider.notifier).value = await retry(
+      task: () async {
+        return await clashCore.getProxiesGroups();
+      },
+      retryIf: (res) => res.isEmpty,
+    );
  }

  updateProfiles() async {
@@ -364,6 +362,10 @@ class AppController {
    }
  }

+  updateSystemColorSchemes(ColorSchemes colorSchemes) {
+    _ref.read(appSchemesProvider.notifier).value = colorSchemes;
+  }
+
  savePreferences() async {
    commonPrint.log("save preferences");
    await preferences.saveConfig(globalState.config);
@@ -380,15 +382,12 @@ class AppController {
      ),
    );
    if (_ref.read(appSettingProvider).closeConnections) {
-      clashCore.resetConnections();
+      clashCore.closeConnections();
    }
    addCheckIpNumDebounce();
  }

  handleBackOrExit() async {
-    if (_ref.read(backBlockProvider)) {
-      return;
-    }
    if (_ref.read(appSettingProvider).minimizeOnExit) {
      if (system.isDesktop) {
        await savePreferencesDebounce();
@@ -399,34 +398,18 @@ class AppController {
    }
  }

-  backBlock() {
-    _ref.read(backBlockProvider.notifier).value = true;
-  }
-
-  unBackBlock() {
-    _ref.read(backBlockProvider.notifier).value = false;
-  }
-
  handleExit() async {
    try {
      await updateStatus(false);
-      await proxy?.stopProxy();
      await clashCore.shutdown();
      await clashService?.destroy();
+      await proxy?.stopProxy();
      await savePreferences();
    } finally {
      system.exit();
    }
  }

-  Future handleClear() async {
-    await preferences.clearPreferences();
-    commonPrint.log("clear preferences");
-    globalState.config = Config(
-      themeProps: defaultThemeProps,
-    );
-  }
-
  autoCheckUpdate() async {
    if (!_ref.read(appSettingProvider).autoCheckUpdate) return;
    final res = await request.checkForUpdate();
@@ -443,7 +426,7 @@ class AppController {
    if (data != null) {
      final tagName = data['tag_name'];
      final body = data['body'];
-      final submits = utils.parseReleaseBody(body);
+      final submits = other.parseReleaseBody(body);
      final textTheme = context.textTheme;
      final res = await globalState.showMessage(
        title: appLocalizations.discoverNewVersion,
@@ -501,18 +484,17 @@ class AppController {
  Future<void> _initCore() async {
    final isInit = await clashCore.isInit;
    if (!isInit) {
-      await clashCore.init();
      await clashCore.setState(
        globalState.getCoreState(),
      );
+      await clashCore.init();
    }
    await applyProfile();
  }

  init() async {
-    FlutterError.onError = (details) {
-      commonPrint.log(details.stack.toString());
-    };
+    await _handlePreference();
+    await _handlerDisclaimer();
    await _initCore();
    await _initStatus();
    updateTray(true);
@@ -526,8 +508,6 @@ class AppController {
    } else {
      window?.hide();
    }
-    await _handlePreference();
-    await _handlerDisclaimer();
    _ref.read(initProvider.notifier).value = true;
  }

@@ -691,9 +671,9 @@ class AppController {
  List<Proxy> _sortOfName(List<Proxy> proxies) {
    return List.of(proxies)
      ..sort(
-        (a, b) => utils.sortByChar(
-          utils.getPinyin(a.name),
-          utils.getPinyin(b.name),
+        (a, b) => other.sortByChar(
+          other.getPinyin(a.name),
+          other.getPinyin(b.name),
        ),
      );
  }
@@ -705,16 +685,10 @@ class AppController {
    return List.of(proxies)
      ..sort(
        (a, b) {
-          final aDelay = _ref.read(getDelayProvider(
-            proxyName: a.name,
-            testUrl: testUrl,
-          ));
-          final bDelay = _ref.read(
-            getDelayProvider(
-              proxyName: b.name,
-              testUrl: testUrl,
-            ),
-          );
+          final aDelay =
+              _ref.read(getDelayProvider(proxyName: a.name, testUrl: testUrl));
+          final bDelay =
+              _ref.read(getDelayProvider(proxyName: b.name, testUrl: testUrl));
          if (aDelay == null && bDelay == null) {
            return 0;
          }
@@ -744,15 +718,19 @@ class AppController {
    final profilePath = await appPath.getProfilePath(profileId);
    final providersPath = await appPath.getProvidersPath(profileId);
    return await Isolate.run(() async {
-      final profileFile = File(profilePath);
-      final isExists = await profileFile.exists();
-      if (isExists) {
-        profileFile.delete(recursive: true);
+      if (profilePath != null) {
+        final profileFile = File(profilePath);
+        final isExists = await profileFile.exists();
+        if (isExists) {
+          profileFile.delete(recursive: true);
+        }
      }
-      final providersFileDir = File(providersPath);
-      final providersFileIsExists = await providersFileDir.exists();
-      if (providersFileIsExists) {
-        providersFileDir.delete(recursive: true);
+      if (providersPath != null) {
+        final providersFileDir = File(providersPath);
+        final isExists = await providersFileDir.exists();
+        if (isExists) {
+          providersFileDir.delete(recursive: true);
+        }
      }
    });
  }
@@ -771,17 +749,6 @@ class AppController {
        );
  }

-  Future<List<Package>> getPackages() async {
-    if (_ref.read(isMobileViewProvider)) {
-      await Future.delayed(commonDuration);
-    }
-    if (_ref.read(packagesProvider).isEmpty) {
-      _ref.read(packagesProvider.notifier).value =
-          await app?.getPackages() ?? [];
-    }
-    return _ref.read(packagesProvider);
-  }
-
  updateStart() {
    updateStatus(!_ref.read(runTimeProvider.notifier).isStart);
  }
@@ -896,7 +863,7 @@ class AppController {
      return utf8.encode(logsRawString);
    });
    return await picker.saveFile(
-          utils.logFile,
+          other.logFile,
          Uint8List.fromList(data),
        ) !=
        null;
@@ -970,39 +937,30 @@ class AppController {
  }

  _recovery(Config config, RecoveryOption recoveryOption) {
-    final recoveryStrategy = _ref.read(appSettingProvider.select(
-      (state) => state.recoveryStrategy,
-    ));
    final profiles = config.profiles;
-    if (recoveryStrategy == RecoveryStrategy.override) {
-      _ref.read(profilesProvider.notifier).value = profiles;
-    } else {
-      for (final profile in profiles) {
-        _ref.read(profilesProvider.notifier).setProfile(
-              profile,
-            );
-      }
+    for (final profile in profiles) {
+      _ref.read(profilesProvider.notifier).setProfile(profile);
    }
    final onlyProfiles = recoveryOption == RecoveryOption.onlyProfiles;
-    if (!onlyProfiles) {
-      _ref.read(patchClashConfigProvider.notifier).value =
-          config.patchClashConfig;
-      _ref.read(appSettingProvider.notifier).value = config.appSetting;
-      _ref.read(currentProfileIdProvider.notifier).value =
-          config.currentProfileId;
-      _ref.read(appDAVSettingProvider.notifier).value = config.dav;
-      _ref.read(themeSettingProvider.notifier).value = config.themeProps;
-      _ref.read(windowSettingProvider.notifier).value = config.windowProps;
-      _ref.read(vpnSettingProvider.notifier).value = config.vpnProps;
-      _ref.read(proxiesStyleSettingProvider.notifier).value =
-          config.proxiesStyle;
-      _ref.read(overrideDnsProvider.notifier).value = config.overrideDns;
-      _ref.read(networkSettingProvider.notifier).value = config.networkProps;
-      _ref.read(hotKeyActionsProvider.notifier).value = config.hotKeyActions;
-    }
-    final currentProfile = _ref.read(currentProfileProvider);
-    if (currentProfile == null) {
-      _ref.read(currentProfileIdProvider.notifier).value = profiles.first.id;
+    if (onlyProfiles) {
+      final currentProfile = _ref.read(currentProfileProvider);
+      if (currentProfile != null) {
+        _ref.read(currentProfileIdProvider.notifier).value = profiles.first.id;
+      }
+      return;
    }
+    _ref.read(patchClashConfigProvider.notifier).value =
+        config.patchClashConfig;
+    _ref.read(appSettingProvider.notifier).value = config.appSetting;
+    _ref.read(currentProfileIdProvider.notifier).value =
+        config.currentProfileId;
+    _ref.read(appDAVSettingProvider.notifier).value = config.dav;
+    _ref.read(themeSettingProvider.notifier).value = config.themeProps;
+    _ref.read(windowSettingProvider.notifier).value = config.windowProps;
+    _ref.read(vpnSettingProvider.notifier).value = config.vpnProps;
+    _ref.read(proxiesStyleSettingProvider.notifier).value = config.proxiesStyle;
+    _ref.read(overrideDnsProvider.notifier).value = config.overrideDns;
+    _ref.read(networkSettingProvider.notifier).value = config.networkProps;
+    _ref.read(hotKeyActionsProvider.notifier).value = config.hotKeyActions;
  }
 }
--- a/lib/enum/enum.dart
+++ b/lib/enum/enum.dart
@@ -91,14 +91,7 @@ enum Mode { rule, global, direct }

 enum ViewMode { mobile, laptop, desktop }

-enum LogLevel {
-  debug,
-  info,
-  warning,
-  error,
-  silent,
-  app,
-}
+enum LogLevel { debug, info, warning, error, silent }

 enum TransportProtocol { udp, tcp }

@@ -256,7 +249,6 @@ enum ActionMethod {
  asyncTestDelay,
  getConnections,
  closeConnections,
-  resetConnections,
  closeConnection,
  getExternalProviders,
  getExternalProvider,
@@ -270,7 +262,6 @@ enum ActionMethod {
  getCountryCode,
  getMemory,
  getProfile,
-  crash,

  ///Android,
  setFdMap,
@@ -292,9 +283,8 @@ enum WindowsHelperServiceStatus {
  running,
 }

-enum FunctionTag {
+enum DebounceTag {
  updateClashConfig,
-  updateStatus,
  updateGroups,
  addCheckIpNum,
  applyProfile,
@@ -309,8 +299,6 @@ enum FunctionTag {
  updatePageIndex,
  pageChange,
  proxiesTabChange,
-  logs,
-  requests,
 }

 enum DashboardWidget {
@@ -320,12 +308,6 @@ enum DashboardWidget {
      child: NetworkSpeed(),
    ),
  ),
-  outboundModeV2(
-    GridItem(
-      crossAxisCellCount: 8,
-      child: OutboundModeV2(),
-    ),
-  ),
  outboundMode(
    GridItem(
      crossAxisCellCount: 4,
@@ -351,15 +333,6 @@ enum DashboardWidget {
    ),
    platforms: desktopPlatforms,
  ),
-  vpnButton(
-    GridItem(
-      crossAxisCellCount: 4,
-      child: VpnButton(),
-    ),
-    platforms: [
-      SupportPlatform.Android,
-    ],
-  ),
  systemProxyButton(
    GridItem(
      crossAxisCellCount: 4,
@@ -474,14 +447,3 @@ enum RuleTarget {
  DIRECT,
  REJECT,
 }
-
-enum RecoveryStrategy {
-  compatible,
-  override,
-}
-
-enum CacheTag {
-  logs,
-  rules,
-  requests,
-}
--- a/lib/fragments/about.dart
+++ b/lib/fragments/about.dart
@@ -1,11 +1,7 @@
-import 'dart:async';
-
 import 'package:fl_clash/common/common.dart';
-import 'package:fl_clash/providers/config.dart';
 import 'package:fl_clash/state.dart';
 import 'package:fl_clash/widgets/list.dart';
 import 'package:flutter/material.dart';
-import 'package:flutter_riverpod/flutter_riverpod.dart';

@immutable
 class Contributor {
@@ -47,15 +43,6 @@ class AboutFragment extends StatelessWidget {
            _checkUpdate(context);
          },
        ),
-        ListItem(
-          title: Text(appLocalizations.contactMe),
-          onTap: () {
-            globalState.showMessage(
-              title: appLocalizations.contactMe,
-              message: TextSpan(text: "chen08209@gmail.com"),
-            );
-          },
-        ),
        ListItem(
          title: const Text("Telegram"),
          onTap: () {
@@ -129,43 +116,33 @@ class AboutFragment extends StatelessWidget {
        title: Column(
          crossAxisAlignment: CrossAxisAlignment.start,
          children: [
-            Consumer(builder: (_, ref, ___) {
-              return _DeveloperModeDetector(
-                child: Wrap(
-                  spacing: 16,
-                  crossAxisAlignment: WrapCrossAlignment.center,
+            Wrap(
+              spacing: 16,
+              crossAxisAlignment: WrapCrossAlignment.center,
+              children: [
+                Padding(
+                  padding: const EdgeInsets.all(12),
+                  child: Image.asset(
+                    'assets/images/icon.png',
+                    width: 64,
+                    height: 64,
+                  ),
+                ),
+                Column(
+                  crossAxisAlignment: CrossAxisAlignment.start,
                  children: [
-                    Padding(
-                      padding: const EdgeInsets.all(12),
-                      child: Image.asset(
-                        'assets/images/icon.png',
-                        width: 64,
-                        height: 64,
-                      ),
+                    Text(
+                      appName,
+                      style: Theme.of(context).textTheme.headlineSmall,
                    ),
-                    Column(
-                      crossAxisAlignment: CrossAxisAlignment.start,
-                      children: [
-                        Text(
-                          appName,
-                          style: Theme.of(context).textTheme.headlineSmall,
-                        ),
-                        Text(
-                          globalState.packageInfo.version,
-                          style: Theme.of(context).textTheme.labelLarge,
-                        )
-                      ],
+                    Text(
+                      globalState.packageInfo.version,
+                      style: Theme.of(context).textTheme.labelLarge,
                    )
                  ],
-                ),
-                onEnterDeveloperMode: () {
-                  ref.read(appSettingProvider.notifier).updateState(
-                        (state) => state.copyWith(developerMode: true),
-                      );
-                  context.showNotifier(appLocalizations.developerModeEnableTip);
-                },
-              );
-            }),
+                )
+              ],
+            ),
            const SizedBox(
              height: 24,
            ),
@@ -202,7 +179,10 @@ class Avatar extends StatelessWidget {

  @override
  Widget build(BuildContext context) {
-    return GestureDetector(
+    return InkWell(
+      splashColor: Colors.transparent,
+      highlightColor: Colors.transparent,
+      hoverColor: Colors.transparent,
      child: Column(
        children: [
          SizedBox(
@@ -229,52 +209,3 @@ class Avatar extends StatelessWidget {
    );
  }
 }
-
-class _DeveloperModeDetector extends StatefulWidget {
-  final Widget child;
-  final VoidCallback onEnterDeveloperMode;
-
-  const _DeveloperModeDetector({
-    required this.child,
-    required this.onEnterDeveloperMode,
-  });
-
-  @override
-  State<_DeveloperModeDetector> createState() => _DeveloperModeDetectorState();
-}
-
-class _DeveloperModeDetectorState extends State<_DeveloperModeDetector> {
-  int _counter = 0;
-  Timer? _timer;
-
-  void _handleTap() {
-    _counter++;
-    if (_counter >= 5) {
-      widget.onEnterDeveloperMode();
-      _resetCounter();
-    } else {
-      _timer?.cancel();
-      _timer = Timer(Duration(seconds: 1), _resetCounter);
-    }
-  }
-
-  void _resetCounter() {
-    _counter = 0;
-    _timer?.cancel();
-    _timer = null;
-  }
-
-  @override
-  void dispose() {
-    _timer?.cancel();
-    super.dispose();
-  }
-
-  @override
-  Widget build(BuildContext context) {
-    return GestureDetector(
-      onTap: _handleTap,
-      child: widget.child,
-    );
-  }
-}
--- a/lib/fragments/access.dart
+++ b/lib/fragments/access.dart
@@ -1,4 +1,3 @@
-import 'dart:async';
 import 'dart:convert';

 import 'package:fl_clash/enum/enum.dart';
@@ -23,14 +22,21 @@ class _AccessFragmentState extends ConsumerState<AccessFragment> {
  List<String> acceptList = [];
  List<String> rejectList = [];
  late ScrollController _controller;
-  final _completer = Completer();

  @override
  void initState() {
    super.initState();
    _updateInitList();
    _controller = ScrollController();
-    _completer.complete(globalState.appController.getPackages());
+    WidgetsBinding.instance.addPostFrameCallback((_) {
+      final appState = globalState.appState;
+      if (appState.packages.isEmpty) {
+        Future.delayed(const Duration(milliseconds: 300), () async {
+          ref.read(packagesProvider.notifier).value =
+              await app?.getPackages() ?? [];
+        });
+      }
+    });
  }

  @override
@@ -107,11 +113,15 @@ class _AccessFragmentState extends ConsumerState<AccessFragment> {
  }

  _intelligentSelected() async {
-    final packageNames = ref.read(
-      packageListSelectorStateProvider.select(
-        (state) => state.list.map((item) => item.packageName),
-      ),
-    );
+    final appState = globalState.appState;
+    final config = globalState.config;
+    final accessControl = config.vpnProps.accessControl;
+    final packageNames = appState.packages
+        .where(
+          (item) =>
+              accessControl.isFilterSystemApp ? item.isSystem == false : true,
+        )
+        .map((item) => item.packageName);
    final commonScaffoldState = context.commonScaffoldState;
    if (commonScaffoldState?.mounted != true) return;
    final selectedPackageNames =
@@ -184,7 +194,7 @@ class _AccessFragmentState extends ConsumerState<AccessFragment> {
    final state = ref.watch(packageListSelectorStateProvider);
    final accessControl = state.accessControl;
    final accessControlMode = accessControl.mode;
-    final packages = state.getSortList(
+    final packages = state.getList(
      accessControlMode == AccessControlMode.acceptSelected
          ? acceptList
          : rejectList,
@@ -313,42 +323,31 @@ class _AccessFragmentState extends ConsumerState<AccessFragment> {
                ),
                Expanded(
                  flex: 1,
-                  child: FutureBuilder(
-                      future: _completer.future,
-                      builder: (_, snapshot) {
-                        if (snapshot.connectionState != ConnectionState.done) {
-                          return Center(
-                            child: CircularProgressIndicator(),
-                          );
-                        }
-                        return packages.isEmpty
-                            ? NullStatus(
-                                label: appLocalizations.noData,
-                              )
-                            : CommonScrollBar(
-                                controller: _controller,
-                                child: ListView.builder(
-                                  controller: _controller,
-                                  itemCount: packages.length,
-                                  itemExtent: 72,
-                                  itemBuilder: (_, index) {
-                                    final package = packages[index];
-                                    return PackageListItem(
-                                      key: Key(package.packageName),
-                                      package: package,
-                                      value: valueList
-                                          .contains(package.packageName),
-                                      isActive: accessControl.enable,
-                                      onChanged: (value) {
-                                        _handleSelected(
-                                            valueList, package, value);
-                                      },
-                                    );
-                                  },
-                                ),
+                  child: packages.isEmpty
+                      ? const Center(
+                          child: CircularProgressIndicator(),
+                        )
+                      : CommonScrollBar(
+                          controller: _controller,
+                          child: ListView.builder(
+                            controller: _controller,
+                            itemCount: packages.length,
+                            itemExtent: 72,
+                            itemBuilder: (_, index) {
+                              final package = packages[index];
+                              return PackageListItem(
+                                key: Key(package.packageName),
+                                package: package,
+                                value: valueList.contains(package.packageName),
+                                isActive: accessControl.enable,
+                                onChanged: (value) {
+                                  _handleSelected(valueList, package, value);
+                                },
                              );
-                      }),
-                )
+                            },
+                          ),
+                        ),
+                ),
              ],
            ),
          ),
@@ -483,20 +482,14 @@ class AccessControlSearchDelegate extends SearchDelegate {
    final lowQuery = query.toLowerCase();
    return Consumer(
      builder: (context, ref, __) {
-        final vm3 = ref.watch(
-          packageListSelectorStateProvider.select(
-            (state) => VM3(
-              a: state.getSortList(
-                state.accessControl.mode == AccessControlMode.acceptSelected
-                    ? acceptList
-                    : rejectList,
-              ),
-              b: state.accessControl.enable,
-              c: state.accessControl.currentList,
-            ),
-          ),
+        final state = ref.watch(packageListSelectorStateProvider);
+        final accessControl = state.accessControl;
+        final accessControlMode = accessControl.mode;
+        final packages = state.getList(
+          accessControlMode == AccessControlMode.acceptSelected
+              ? acceptList
+              : rejectList,
        );
-        final packages = vm3.a;
        final queryPackages = packages
            .where(
              (package) =>
@@ -504,8 +497,8 @@ class AccessControlSearchDelegate extends SearchDelegate {
                  package.packageName.contains(lowQuery),
            )
            .toList();
-        final isAccessControl = vm3.b;
-        final currentList = vm3.c;
+        final isAccessControl = state.accessControl.enable;
+        final currentList = accessControl.currentList;
        final packageNameList = packages.map((e) => e.packageName).toList();
        final valueList = currentList.intersection(packageNameList);
        return DisabledMask(
@@ -586,6 +579,13 @@ class _AccessControlPanelState extends ConsumerState<AccessControlPanel> {
    };
  }

+  String _getTextWithIsFilterSystemApp(bool isFilterSystemApp) {
+    return switch (isFilterSystemApp) {
+      true => appLocalizations.onlyOtherApps,
+      false => appLocalizations.allApps,
+    };
+  }
+
  List<Widget> _buildModeSetting() {
    return generateSection(
      title: appLocalizations.mode,
@@ -673,39 +673,25 @@ class _AccessControlPanelState extends ConsumerState<AccessControlPanel> {
          scrollDirection: Axis.horizontal,
          child: Consumer(
            builder: (_, ref, __) {
-              final vm2 = ref.watch(
-                vpnSettingProvider.select(
-                  (state) => VM2(
-                    a: state.accessControl.isFilterSystemApp,
-                    b: state.accessControl.isFilterNonInternetApp,
-                  ),
-                ),
+              final isFilterSystemApp = ref.watch(
+                vpnSettingProvider
+                    .select((state) => state.accessControl.isFilterSystemApp),
              );
              return Wrap(
                spacing: 16,
                children: [
-                  SettingTextCard(
-                    appLocalizations.systemApp,
-                    isSelected: vm2.a == false,
-                    onPressed: () {
-                      ref.read(vpnSettingProvider.notifier).updateState(
-                            (state) => state.copyWith.accessControl(
-                              isFilterSystemApp: !vm2.a,
-                            ),
-                          );
-                    },
-                  ),
-                  SettingTextCard(
-                    appLocalizations.noNetworkApp,
-                    isSelected: vm2.b == false,
-                    onPressed: () {
-                      ref.read(vpnSettingProvider.notifier).updateState(
-                            (state) => state.copyWith.accessControl(
-                              isFilterNonInternetApp: !vm2.b,
-                            ),
-                          );
-                    },
-                  )
+                  for (final item in [false, true])
+                    SettingTextCard(
+                      _getTextWithIsFilterSystemApp(item),
+                      isSelected: isFilterSystemApp == item,
+                      onPressed: () {
+                        ref.read(vpnSettingProvider.notifier).updateState(
+                              (state) => state.copyWith.accessControl(
+                                isFilterSystemApp: item,
+                              ),
+                            );
+                      },
+                    )
                ],
              );
            },
--- a/lib/fragments/backup_and_recovery.dart
+++ b/lib/fragments/backup_and_recovery.dart
@@ -8,12 +8,10 @@ import 'package:fl_clash/providers/config.dart';
 import 'package:fl_clash/state.dart';
 import 'package:fl_clash/widgets/dialog.dart';
 import 'package:fl_clash/widgets/fade_box.dart';
-import 'package:fl_clash/widgets/input.dart';
 import 'package:fl_clash/widgets/list.dart';
 import 'package:fl_clash/widgets/text.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_riverpod/flutter_riverpod.dart';
-import 'package:intl/intl.dart';

 class BackupAndRecovery extends ConsumerWidget {
  const BackupAndRecovery({super.key});
@@ -77,7 +75,7 @@ class BackupAndRecovery extends ConsumerWidget {
      () async {
        final backupData = await globalState.appController.backupData();
        final value = await picker.saveFile(
-          utils.getBackupFileName(),
+          other.getBackupFileName(),
          Uint8List.fromList(backupData),
        );
        if (value == null) return false;
@@ -136,30 +134,6 @@ class BackupAndRecovery extends ConsumerWidget {
        );
  }

-  _handleUpdateRecoveryStrategy(WidgetRef ref) async {
-    final recoveryStrategy = ref.read(appSettingProvider.select(
-      (state) => state.recoveryStrategy,
-    ));
-    final res = await globalState.showCommonDialog(
-      child: OptionsDialog<RecoveryStrategy>(
-        title: appLocalizations.recoveryStrategy,
-        options: RecoveryStrategy.values,
-        textBuilder: (mode) => Intl.message(
-          "recoveryStrategy_${mode.name}",
-        ),
-        value: recoveryStrategy,
-      ),
-    );
-    if (res == null) {
-      return;
-    }
-    ref.read(appSettingProvider.notifier).updateState(
-          (state) => state.copyWith(
-            recoveryStrategy: res,
-          ),
-        );
-  }
-
  @override
  Widget build(BuildContext context, ref) {
    final dav = ref.watch(appDAVSettingProvider);
@@ -202,25 +176,25 @@ class BackupAndRecovery extends ConsumerWidget {
                    builder: (_, snapshot) {
                      return Center(
                        child: FadeThroughBox(
-                          child:
-                              snapshot.connectionState != ConnectionState.done
-                                  ? 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,
-                                    ),
+                          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,
+                                ),
                        ),
                      );
                    },
@@ -282,26 +256,6 @@ class BackupAndRecovery extends ConsumerWidget {
          title: Text(appLocalizations.recovery),
          subtitle: Text(appLocalizations.localRecoveryDesc),
        ),
-        ListHeader(title: appLocalizations.options),
-        Consumer(builder: (_, ref, __) {
-          final recoveryStrategy = ref.watch(appSettingProvider.select(
-            (state) => state.recoveryStrategy,
-          ));
-          return ListItem(
-            onTap: () {
-              _handleUpdateRecoveryStrategy(ref);
-            },
-            title: Text(appLocalizations.recoveryStrategy),
-            trailing: FilledButton(
-              onPressed: () {
-                _handleUpdateRecoveryStrategy(ref);
-              },
-              child: Text(
-                Intl.message("recoveryStrategy_${recoveryStrategy.name}"),
-              ),
-            ),
-          );
-        }),
      ],
    );
  }
--- a/lib/fragments/config/config.dart
+++ b/lib/fragments/config/config.dart
@@ -61,6 +61,7 @@ class _ConfigFragmentState extends State<ConfigFragment> {
                if (res != true) {
                  return;
                }
+
                ref.read(patchClashConfigProvider.notifier).updateState(
                      (state) => state.copyWith(
                        dns: defaultDns,
--- a/lib/fragments/config/network.dart
+++ b/lib/fragments/config/network.dart
@@ -301,11 +301,8 @@ class RouteAddressItem extends ConsumerWidget {
        title: appLocalizations.routeAddress,
        widget: Consumer(
          builder: (_, ref, __) {
-            final routeAddress = ref.watch(
-              patchClashConfigProvider.select(
-                (state) => state.tun.routeAddress,
-              ),
-            );
+            final routeAddress = ref.watch(patchClashConfigProvider
+                .select((state) => state.tun.routeAddress));
            return ListInputPage(
              title: appLocalizations.routeAddress,
              items: routeAddress,
@@ -374,9 +371,7 @@ class NetworkListView extends ConsumerWidget {
              return;
            }
            ref.read(vpnSettingProvider.notifier).updateState(
-                  (state) => defaultVpnProps.copyWith(
-                    accessControl: state.accessControl,
-                  ),
+                  (state) => defaultVpnProps,
                );
            ref.read(patchClashConfigProvider.notifier).updateState(
                  (state) => state.copyWith(
--- a/lib/fragments/connection/item.dart
+++ b/lib/fragments/connection/item.dart
@@ -78,72 +78,113 @@ class ConnectionItem extends ConsumerWidget {
    );
    return CommonPopupBox(
      targetBuilder: (open) {
-        openPopup(Offset offset) {
-          open(
-            offset: offset.translate(
-              0,
-              0,
-            ),
-          );
-        }
-
-        return InkWell(
-          child: GestureDetector(
-            onLongPressStart: (details) {
-              if (!system.isDesktop) {
-                return;
-              }
-              openPopup(details.localPosition);
-            },
-            onSecondaryTapDown: (details) {
-              if (!system.isDesktop) {
-                return;
-              }
-              openPopup(details.localPosition);
-            },
-            child: ListItem(
-              padding: const EdgeInsets.symmetric(
-                horizontal: 16,
-                vertical: 4,
-              ),
-              tileTitleAlignment: ListTileTitleAlignment.titleHeight,
-              leading: value
-                  ? GestureDetector(
-                      onTap: () {
-                        if (onClickKeyword == null) return;
-                        final process = connection.metadata.process;
-                        if (process.isEmpty) return;
-                        onClickKeyword!(process);
-                      },
-                      child: 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: title,
-              subtitle: subTitle,
-              trailing: trailing,
-            ),
+        return ListItem(
+          padding: const EdgeInsets.symmetric(
+            horizontal: 16,
+            vertical: 4,
          ),
-          onTap: () {},
+          tileTitleAlignment: ListTileTitleAlignment.titleHeight,
+          leading: value
+              ? GestureDetector(
+            onTap: () {
+              if (onClickKeyword == null) return;
+              final process = connection.metadata.process;
+              if (process.isEmpty) return;
+              onClickKeyword!(process);
+            },
+            child: 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: title,
+          subtitle: subTitle,
+          trailing: trailing,
        );
+        // return InkWell(
+        //   child: GestureDetector(
+        //     onLongPressStart: (details) {
+        //       if (!system.isDesktop) {
+        //         return;
+        //       }
+        //       open(
+        //         offset: details.localPosition.translate(
+        //           0,
+        //           -12,
+        //         ),
+        //       );
+        //     },
+        //     onSecondaryTapDown: (details) {
+        //       if (!system.isDesktop) {
+        //         return;
+        //       }
+        //       open(
+        //         offset: details.localPosition.translate(
+        //           0,
+        //           -12,
+        //         ),
+        //       );
+        //     },
+        //     child: ListItem(
+        //       padding: const EdgeInsets.symmetric(
+        //         horizontal: 16,
+        //         vertical: 4,
+        //       ),
+        //       tileTitleAlignment: ListTileTitleAlignment.titleHeight,
+        //       leading: value
+        //           ? GestureDetector(
+        //               onTap: () {
+        //                 if (onClickKeyword == null) return;
+        //                 final process = connection.metadata.process;
+        //                 if (process.isEmpty) return;
+        //                 onClickKeyword!(process);
+        //               },
+        //               child: 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: title,
+        //       subtitle: subTitle,
+        //       trailing: trailing,
+        //     ),
+        //   ),
+        //   onTap: () {},
+        // );
      },
      popup: CommonPopupMenu(
        minWidth: 160,
--- a/lib/fragments/connection/requests.dart
+++ b/lib/fragments/connection/requests.dart
@@ -11,6 +11,8 @@ import 'package:flutter_riverpod/flutter_riverpod.dart';

 import 'item.dart';

+double _preOffset = 0;
+
 class RequestsFragment extends ConsumerStatefulWidget {
  const RequestsFragment({super.key});

@@ -20,13 +22,14 @@ class RequestsFragment extends ConsumerStatefulWidget {

 class _RequestsFragmentState extends ConsumerState<RequestsFragment>
    with PageMixin {
-  final _requestsStateNotifier = ValueNotifier<ConnectionsState>(
-    const ConnectionsState(loading: true),
-  );
+  final GlobalKey<CacheItemExtentListViewState> _key = GlobalKey();
+  final _requestsStateNotifier =
+      ValueNotifier<ConnectionsState>(const ConnectionsState());
  List<Connection> _requests = [];
-  final _tag = CacheTag.requests;
-  late ScrollController _scrollController;
-  bool _isLoad = false;
+
+  final ScrollController _scrollController = ScrollController(
+    initialScrollOffset: _preOffset != 0 ? _preOffset : double.maxFinite,
+  );

  double _currentMaxWidth = 0;

@@ -46,14 +49,10 @@ class _RequestsFragmentState extends ConsumerState<RequestsFragment>
  @override
  void initState() {
    super.initState();
-    final preOffset = globalState.cacheScrollPosition[_tag] ?? -1;
-    _scrollController = ScrollController(
-      initialScrollOffset: preOffset > 0 ? preOffset : double.maxFinite,
-    );
-    _requests = globalState.appState.requests.list;
    _requestsStateNotifier.value = _requestsStateNotifier.value.copyWith(
-      connections: _requests,
+      connections: globalState.appState.requests.list,
    );
+
    ref.listenManual(
      isCurrentPageProvider(
        PageLabel.requests,
@@ -75,6 +74,7 @@ class _RequestsFragmentState extends ConsumerState<RequestsFragment>
          updateRequestsThrottler();
        }
      },
+      fireImmediately: true,
    );
  }

@@ -99,7 +99,14 @@ class _RequestsFragmentState extends ConsumerState<RequestsFragment>
    final lines = (chainSize.height / baseHeight).round();
    final computerHeight =
        size.height + chainSize.height + 24 + 24 * (lines - 1);
-    return computerHeight + 8 + 32 + globalState.measure.bodyMediumHeight;
+    return computerHeight;
+  }
+
+  _handleTryClearCache(double maxWidth) {
+    if (_currentMaxWidth != maxWidth) {
+      _currentMaxWidth = maxWidth;
+      _key.currentState?.clearCache();
+    }
  }

  @override
@@ -111,7 +118,7 @@ class _RequestsFragmentState extends ConsumerState<RequestsFragment>
  }

  updateRequestsThrottler() {
-    throttler.call(FunctionTag.requests, () {
+    throttler.call("request", () {
      final isEquality = connectionListEquality.equals(
        _requests,
        _requestsStateNotifier.value.connections,
@@ -120,51 +127,13 @@ class _RequestsFragmentState extends ConsumerState<RequestsFragment>
        return;
      }
      WidgetsBinding.instance.addPostFrameCallback((_) {
-        if(mounted){
-          _requestsStateNotifier.value = _requestsStateNotifier.value.copyWith(
-            connections: _requests,
-          );
-        }
+        _requestsStateNotifier.value = _requestsStateNotifier.value.copyWith(
+          connections: _requests,
+        );
      });
    }, duration: commonDuration);
  }

-  _preLoad() {
-    if (_isLoad == true) {
-      return;
-    }
-    _isLoad = true;
-    WidgetsBinding.instance.addPostFrameCallback((_) async {
-      if (!mounted) {
-        return;
-      }
-      final isMobileView = ref.read(isMobileViewProvider);
-      if (isMobileView) {
-        await Future.delayed(Duration(milliseconds: 300));
-      }
-      final parts = _requests.batch(10);
-      globalState.cacheHeightMap[_tag] ??= FixedMap(
-        _requests.length,
-      );
-      for (int i = 0; i < parts.length; i++) {
-        final part = parts[i];
-        await Future(
-          () {
-            for (final request in part) {
-              globalState.cacheHeightMap[_tag]?.updateCacheValue(
-                request.id,
-                () => _calcCacheHeight(request),
-              );
-            }
-          },
-        );
-      }
-      _requestsStateNotifier.value = _requestsStateNotifier.value.copyWith(
-        loading: false,
-      );
-    });
-  }
-
  @override
  Widget build(BuildContext context) {
    return LayoutBuilder(
@@ -178,86 +147,76 @@ class _RequestsFragmentState extends ConsumerState<RequestsFragment>
                    Platform.isAndroid,
              ),
            );
-            _currentMaxWidth = constraints.maxWidth - 40 - (value ? 60 : 0);
+            _handleTryClearCache(constraints.maxWidth - 40 - (value ? 60 : 0));
            return child!;
          },
-          child: TextScaleNotification(
-            child: ValueListenableBuilder<ConnectionsState>(
-              valueListenable: _requestsStateNotifier,
-              builder: (_, state, __) {
-                _preLoad();
-                final connections = state.list;
-                if (connections.isEmpty) {
-                  return NullStatus(
-                    label: appLocalizations.nullRequestsDesc,
-                  );
-                }
-                final items = connections
-                    .map<Widget>(
-                      (connection) => ConnectionItem(
-                        key: Key(connection.id),
-                        connection: connection,
-                        onClickKeyword: (value) {
-                          context.commonScaffoldState?.addKeyword(value);
-                        },
-                      ),
-                    )
-                    .separated(
-                      const Divider(
-                        height: 0,
-                      ),
-                    )
-                    .toList();
-                final content = connections.isEmpty
-                    ? NullStatus(
-                        label: appLocalizations.nullRequestsDesc,
-                      )
-                    : Align(
-                        alignment: Alignment.topCenter,
-                        child: ScrollToEndBox(
-                          controller: _scrollController,
-                          tag: _tag,
-                          dataSource: connections,
-                          child: CommonScrollBar(
-                            controller: _scrollController,
-                            child: CacheItemExtentListView(
-                              tag: _tag,
-                              reverse: true,
-                              shrinkWrap: true,
-                              physics: NextClampingScrollPhysics(),
-                              controller: _scrollController,
-                              itemExtentBuilder: (index) {
-                                if (index.isOdd) {
-                                  return 0;
-                                }
-                                return _calcCacheHeight(
-                                    connections[index ~/ 2]);
-                              },
-                              itemBuilder: (_, index) {
-                                return items[index];
-                              },
-                              itemCount: items.length,
-                              keyBuilder: (int index) {
-                                if (index.isOdd) {
-                                  return "divider";
-                                }
-                                return connections[index ~/ 2].id;
-                              },
-                            ),
-                          ),
-                        ),
-                      );
-                return FadeBox(
-                  child: state.loading
-                      ? Center(
-                          child: CircularProgressIndicator(),
-                        )
-                      : content,
+          child: ValueListenableBuilder<ConnectionsState>(
+            valueListenable: _requestsStateNotifier,
+            builder: (_, state, __) {
+              final connections = state.list;
+              if (connections.isEmpty) {
+                return NullStatus(
+                  label: appLocalizations.nullRequestsDesc,
                );
-              },
-            ),
-            onNotification: (_) {
-              globalState.cacheHeightMap[_tag]?.clear();
+              }
+              final items = connections
+                  .map<Widget>(
+                    (connection) => ConnectionItem(
+                      key: Key(connection.id),
+                      connection: connection,
+                      onClickKeyword: (value) {
+                        context.commonScaffoldState?.addKeyword(value);
+                      },
+                    ),
+                  )
+                  .separated(
+                    const Divider(
+                      height: 0,
+                    ),
+                  )
+                  .toList();
+              return Align(
+                alignment: Alignment.topCenter,
+                child: NotificationListener<ScrollEndNotification>(
+                  onNotification: (details) {
+                    _preOffset = details.metrics.pixels;
+                    return false;
+                  },
+                  child: CommonScrollBar(
+                    controller: _scrollController,
+                    child: CacheItemExtentListView(
+                      key: _key,
+                      reverse: true,
+                      shrinkWrap: true,
+                      physics: NextClampingScrollPhysics(),
+                      controller: _scrollController,
+                      itemExtentBuilder: (index) {
+                        final widget = items[index];
+                        if (widget.runtimeType == Divider) {
+                          return 0;
+                        }
+                        final measure = globalState.measure;
+                        final bodyMediumHeight = measure.bodyMediumHeight;
+                        final connection = connections[(index / 2).floor()];
+                        final height = _calcCacheHeight(connection);
+                        return height + bodyMediumHeight + 32;
+                      },
+                      itemBuilder: (_, index) {
+                        return items[index];
+                      },
+                      itemCount: items.length,
+                      keyBuilder: (int index) {
+                        final widget = items[index];
+                        if (widget.runtimeType == Divider) {
+                          return "divider";
+                        }
+                        final connection = connections[(index / 2).floor()];
+                        return connection.id;
+                      },
+                    ),
+                  ),
+                ),
+              );
            },
          ),
        );
--- a/lib/fragments/dashboard/dashboard.dart
+++ b/lib/fragments/dashboard/dashboard.dart
@@ -6,7 +6,6 @@ import 'package:fl_clash/providers/providers.dart';
 import 'package:fl_clash/widgets/widgets.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_riverpod/flutter_riverpod.dart';
-
 import 'widgets/start_button.dart';

 class DashboardFragment extends ConsumerStatefulWidget {
@@ -67,16 +66,7 @@ class _DashboardFragmentState extends ConsumerState<DashboardFragment>
            valueListenable: key.currentState!.isEditNotifier,
            builder: (_, isEdit, ___) {
              return isEdit
-                  ? SystemBackBlock(
-                      child: CommonPopScope(
-                        child: Icon(Icons.save),
-                        onPop: () {
-                          key.currentState!.isEditNotifier.value =
-                              !key.currentState!.isEditNotifier.value;
-                          return false;
-                        },
-                      ),
-                    )
+                  ? Icon(Icons.save)
                  : Icon(
                      Icons.edit,
                    );
@@ -103,7 +93,7 @@ class _DashboardFragmentState extends ConsumerState<DashboardFragment>
  @override
  Widget build(BuildContext context) {
    final dashboardState = ref.watch(dashboardStateProvider);
-    final columns = max(4 * ((dashboardState.viewWidth / 320).ceil()), 8);
+    final columns = max(4 * ((dashboardState.viewWidth / 350).ceil()), 8);
    return Align(
      alignment: Alignment.topCenter,
      child: SingleChildScrollView(
@@ -113,8 +103,8 @@ class _DashboardFragmentState extends ConsumerState<DashboardFragment>
        child: SuperGrid(
          key: key,
          crossAxisCount: columns,
-          crossAxisSpacing: 16.ap,
-          mainAxisSpacing: 16.ap,
+          crossAxisSpacing: 16,
+          mainAxisSpacing: 16,
          children: [
            ...dashboardState.dashboardWidgets
                .where(
--- a/lib/fragments/dashboard/widgets/memory_info.dart
+++ b/lib/fragments/dashboard/widgets/memory_info.dart
@@ -4,7 +4,6 @@ import 'dart:io';
 import 'package:fl_clash/clash/clash.dart';
 import 'package:fl_clash/common/common.dart';
 import 'package:fl_clash/models/common.dart';
-import 'package:fl_clash/state.dart';
 import 'package:fl_clash/widgets/widgets.dart';
 import 'package:flutter/material.dart';

@@ -58,43 +57,37 @@ class _MemoryInfoState extends State<MemoryInfo> {
        onPressed: () {
          clashCore.requestGc();
        },
-        child: Container(
-          padding: baseInfoEdgeInsets.copyWith(
-            top: 0,
-          ),
-          child: Column(
-            mainAxisSize: MainAxisSize.max,
-            mainAxisAlignment: MainAxisAlignment.end,
-            crossAxisAlignment: CrossAxisAlignment.start,
-            children: [
-              SizedBox(
-                height: globalState.measure.bodyMediumHeight + 2,
-                child: ValueListenableBuilder(
-                  valueListenable: _memoryInfoStateNotifier,
-                  builder: (_, trafficValue, __) {
-                    return Row(
-                      mainAxisAlignment: MainAxisAlignment.start,
-                      children: [
-                        Text(
-                          trafficValue.showValue,
-                          style: context.textTheme.bodyMedium?.toLight
-                              .adjustSize(1),
-                        ),
-                        SizedBox(
-                          width: 8,
-                        ),
-                        Text(
-                          trafficValue.showUnit,
-                          style: context.textTheme.bodyMedium?.toLight
-                              .adjustSize(1),
-                        )
-                      ],
-                    );
-                  },
-                ),
-              )
-            ],
-          ),
+        child: Column(
+          children: [
+            ValueListenableBuilder(
+              valueListenable: _memoryInfoStateNotifier,
+              builder: (_, trafficValue, __) {
+                return Padding(
+                  padding: baseInfoEdgeInsets.copyWith(
+                    bottom: 0,
+                    top: 12,
+                  ),
+                  child: Row(
+                    children: [
+                      Text(
+                        trafficValue.showValue,
+                        style:
+                            context.textTheme.bodyMedium?.toLight.adjustSize(1),
+                      ),
+                      SizedBox(
+                        width: 8,
+                      ),
+                      Text(
+                        trafficValue.showUnit,
+                        style:
+                            context.textTheme.bodyMedium?.toLight.adjustSize(1),
+                      )
+                    ],
+                  ),
+                );
+              },
+            ),
+          ],
        ),
      ),
    );
--- a/lib/fragments/dashboard/widgets/network_detection.dart
+++ b/lib/fragments/dashboard/widgets/network_detection.dart
@@ -1,11 +1,23 @@
+import 'dart:async';
+
+import 'package:dio/dio.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/providers/app.dart';
 import 'package:fl_clash/state.dart';
 import 'package:fl_clash/widgets/widgets.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_riverpod/flutter_riverpod.dart';

+final _networkDetectionState = ValueNotifier<NetworkDetectionState>(
+  const NetworkDetectionState(
+    isTesting: false,
+    isLoading: true,
+    ipInfo: null,
+  ),
+);
+
 class NetworkDetection extends ConsumerStatefulWidget {
  const NetworkDetection({super.key});

@@ -14,6 +26,101 @@ class NetworkDetection extends ConsumerStatefulWidget {
 }

 class _NetworkDetectionState extends ConsumerState<NetworkDetection> {
+  bool? _preIsStart;
+  Timer? _setTimeoutTimer;
+  CancelToken? cancelToken;
+
+  @override
+  void initState() {
+    ref.listenManual(checkIpNumProvider, (prev, next) {
+      if (prev != next) {
+        _startCheck();
+      }
+    });
+    if (!_networkDetectionState.value.isTesting &&
+        _networkDetectionState.value.isLoading) {
+      _startCheck();
+    }
+    super.initState();
+  }
+
+  _startCheck() async {
+    if (cancelToken != null) {
+      cancelToken!.cancel();
+      cancelToken = null;
+    }
+    debouncer.call(
+      DebounceTag.checkIp,
+      _checkIp,
+    );
+  }
+
+  _checkIp() async {
+    final appState = globalState.appState;
+    final isInit = appState.isInit;
+    if (!isInit) return;
+    final isStart = appState.runTime != null;
+    if (_preIsStart == false &&
+        _preIsStart == isStart &&
+        _networkDetectionState.value.ipInfo != null) {
+      return;
+    }
+    _clearSetTimeoutTimer();
+    _networkDetectionState.value = _networkDetectionState.value.copyWith(
+      isLoading: true,
+      ipInfo: null,
+    );
+    _preIsStart = isStart;
+    if (cancelToken != null) {
+      cancelToken!.cancel();
+      cancelToken = null;
+    }
+    cancelToken = CancelToken();
+    try {
+      _networkDetectionState.value = _networkDetectionState.value.copyWith(
+        isTesting: true,
+      );
+      final ipInfo = await request.checkIp(cancelToken: cancelToken);
+      _networkDetectionState.value = _networkDetectionState.value.copyWith(
+        isTesting: false,
+      );
+      if (ipInfo != null) {
+        _networkDetectionState.value = _networkDetectionState.value.copyWith(
+          isLoading: false,
+          ipInfo: ipInfo,
+        );
+        return;
+      }
+      _clearSetTimeoutTimer();
+      _setTimeoutTimer = Timer(const Duration(milliseconds: 300), () {
+        _networkDetectionState.value = _networkDetectionState.value.copyWith(
+          isLoading: false,
+          ipInfo: null,
+        );
+      });
+    } catch (e) {
+      if (e.toString() == "cancelled") {
+        _networkDetectionState.value = _networkDetectionState.value.copyWith(
+          isLoading: true,
+          ipInfo: null,
+        );
+      }
+    }
+  }
+
+  @override
+  void dispose() {
+    _clearSetTimeoutTimer();
+    super.dispose();
+  }
+
+  _clearSetTimeoutTimer() {
+    if (_setTimeoutTimer != null) {
+      _setTimeoutTimer?.cancel();
+      _setTimeoutTimer = null;
+    }
+  }
+
  _countryCodeToEmoji(String countryCode) {
    final String code = countryCode.toUpperCase();
    if (code.length != 2) {
@@ -29,7 +136,7 @@ class _NetworkDetectionState extends ConsumerState<NetworkDetection> {
    return SizedBox(
      height: getWidgetHeight(1),
      child: ValueListenableBuilder<NetworkDetectionState>(
-        valueListenable: detectionState.state,
+        valueListenable: _networkDetectionState,
        builder: (_, state, __) {
          final ipInfo = state.ipInfo;
          final isLoading = state.isLoading;
@@ -99,7 +206,7 @@ class _NetworkDetectionState extends ConsumerState<NetworkDetection> {
                            );
                          },
                          icon: Icon(
-                            size: 16.ap,
+                            size: 16,
                            Icons.info_outline,
                            color: context.colorScheme.onSurfaceVariant,
                          ),
--- a/lib/fragments/dashboard/widgets/outbound_mode.dart
+++ b/lib/fragments/dashboard/widgets/outbound_mode.dart
@@ -17,146 +17,58 @@ class OutboundMode extends StatelessWidget {
      height: height,
      child: Consumer(
        builder: (_, ref, __) {
-          final mode = ref.watch(
-            patchClashConfigProvider.select(
-              (state) => state.mode,
+          final mode =
+              ref.watch(patchClashConfigProvider.select((state) => state.mode));
+          return CommonCard(
+            onPressed: () {},
+            info: Info(
+              label: appLocalizations.outboundMode,
+              iconData: Icons.call_split_sharp,
+            ),
+            child: Padding(
+              padding: const EdgeInsets.only(
+                top: 12,
+                bottom: 16,
+              ),
+              child: Column(
+                mainAxisSize: MainAxisSize.max,
+                crossAxisAlignment: CrossAxisAlignment.start,
+                mainAxisAlignment: MainAxisAlignment.start,
+                children: [
+                  for (final item in Mode.values)
+                    Flexible(
+                      child: ListItem.radio(
+                        dense: true,
+                        horizontalTitleGap: 4,
+                        padding: const EdgeInsets.only(
+                          left: 12,
+                          right: 16,
+                        ),
+                        delegate: RadioDelegate(
+                          value: item,
+                          groupValue: mode,
+                          onChanged: (value) async {
+                            if (value == null) {
+                              return;
+                            }
+                            globalState.appController.changeMode(value);
+                          },
+                        ),
+                        title: Text(
+                          Intl.message(item.name),
+                          style: Theme.of(context)
+                              .textTheme
+                              .bodyMedium
+                              ?.toSoftBold,
+                        ),
+                      ),
+                    ),
+                ],
+              ),
            ),
          );
-          return Theme(
-              data: Theme.of(context).copyWith(
-                  splashColor: Colors.transparent,
-                  highlightColor: Colors.transparent,
-                  hoverColor: Colors.transparent),
-              child: CommonCard(
-                onPressed: () {},
-                info: Info(
-                  label: appLocalizations.outboundMode,
-                  iconData: Icons.call_split_sharp,
-                ),
-                child: Padding(
-                  padding: const EdgeInsets.only(
-                    top: 12,
-                    bottom: 16,
-                  ),
-                  child: Column(
-                    mainAxisSize: MainAxisSize.max,
-                    crossAxisAlignment: CrossAxisAlignment.start,
-                    mainAxisAlignment: MainAxisAlignment.center,
-                    children: [
-                      for (final item in Mode.values)
-                        Flexible(
-                          fit: FlexFit.tight,
-                          child: ListItem.radio(
-                            dense: true,
-                            horizontalTitleGap: 4,
-                            padding: EdgeInsets.only(
-                              left: 12.ap,
-                              right: 16.ap,
-                            ),
-                            delegate: RadioDelegate(
-                              value: item,
-                              groupValue: mode,
-                              onChanged: (value) async {
-                                if (value == null) {
-                                  return;
-                                }
-                                globalState.appController.changeMode(value);
-                              },
-                            ),
-                            title: Text(
-                              Intl.message(item.name),
-                              style: Theme.of(context)
-                                  .textTheme
-                                  .bodyMedium
-                                  ?.toSoftBold,
-                            ),
-                          ),
-                        ),
-                    ],
-                  ),
-                ),
-              ));
        },
      ),
    );
  }
 }
-
-class OutboundModeV2 extends StatelessWidget {
-  const OutboundModeV2({super.key});
-
-  Color _getTextColor(BuildContext context, Mode mode) {
-    return switch (mode) {
-      Mode.rule => context.colorScheme.onSecondaryContainer,
-      Mode.global => context.colorScheme.onPrimaryContainer,
-      Mode.direct => context.colorScheme.onTertiaryContainer,
-    };
-  }
-
-  @override
-  Widget build(BuildContext context) {
-    final height = getWidgetHeight(0.72);
-    return SizedBox(
-      height: height,
-      child: CommonCard(
-        padding: EdgeInsets.zero,
-        child: Consumer(
-          builder: (_, ref, __) {
-            final mode = ref.watch(
-              patchClashConfigProvider.select(
-                (state) => state.mode,
-              ),
-            );
-            final thumbColor = switch (mode) {
-              Mode.rule => context.colorScheme.secondaryContainer,
-              Mode.global => globalState.theme.darken3PrimaryContainer,
-              Mode.direct => context.colorScheme.tertiaryContainer,
-            };
-            return Container(
-              constraints: BoxConstraints.expand(),
-              child: CommonTabBar<Mode>(
-                children: Map.fromEntries(
-                  Mode.values.map(
-                    (item) => MapEntry(
-                      item,
-                      Container(
-                        clipBehavior: Clip.antiAlias,
-                        alignment: Alignment.center,
-                        decoration: BoxDecoration(),
-                        height: height - 16,
-                        child: Text(
-                          Intl.message(item.name),
-                          style: Theme.of(context)
-                              .textTheme
-                              .titleSmall
-                              ?.adjustSize(1)
-                              .copyWith(
-                                color: item == mode
-                                    ? _getTextColor(
-                                        context,
-                                        item,
-                                      )
-                                    : null,
-                              ),
-                        ),
-                      ),
-                    ),
-                  ),
-                ),
-                padding: EdgeInsets.symmetric(horizontal: 8),
-                groupValue: mode,
-                onValueChanged: (value) {
-                  if (value == null) {
-                    return;
-                  }
-                  globalState.appController.changeMode(value);
-                },
-                thumbColor: thumbColor,
-              ),
-            );
-          },
-        ),
-      ),
-    );
-  }
-}
--- a/lib/fragments/dashboard/widgets/quick_options.dart
+++ b/lib/fragments/dashboard/widgets/quick_options.dart
@@ -165,87 +165,3 @@ class SystemProxyButton extends StatelessWidget {
    );
  }
 }
-
-class VpnButton extends StatelessWidget {
-  const VpnButton({super.key});
-
-  @override
-  Widget build(BuildContext context) {
-    return SizedBox(
-      height: getWidgetHeight(1),
-      child: CommonCard(
-        onPressed: () {
-          showSheet(
-            context: context,
-            builder: (_, type) {
-              return AdaptiveSheetScaffold(
-                type: type,
-                body: generateListView(
-                  generateSection(
-                    items: [
-                      const VPNItem(),
-                      const VpnSystemProxyItem(),
-                      const TunStackItem(),
-                    ],
-                  ),
-                ),
-                title: "VPN",
-              );
-            },
-          );
-        },
-        info: Info(
-          label: "VPN",
-          iconData: Icons.stacked_line_chart,
-        ),
-        child: Container(
-          padding: baseInfoEdgeInsets.copyWith(
-            top: 4,
-            bottom: 8,
-            right: 8,
-          ),
-          child: Row(
-            mainAxisSize: MainAxisSize.max,
-            mainAxisAlignment: MainAxisAlignment.spaceBetween,
-            children: [
-              Flexible(
-                flex: 1,
-                child: TooltipText(
-                  text: Text(
-                    appLocalizations.options,
-                    maxLines: 1,
-                    overflow: TextOverflow.ellipsis,
-                    style: Theme.of(context)
-                        .textTheme
-                        .titleSmall
-                        ?.adjustSize(-2)
-                        .toLight,
-                  ),
-                ),
-              ),
-              Consumer(
-                builder: (_, ref, __) {
-                  final enable = ref.watch(
-                    vpnSettingProvider.select(
-                      (state) => state.enable,
-                    ),
-                  );
-                  return Switch(
-                    value: enable,
-                    onChanged: (value) {
-                      ref.read(vpnSettingProvider.notifier).updateState(
-                            (state) => state.copyWith(
-                              enable: value,
-                            ),
-                          );
-                    },
-                  );
-                },
-              )
-            ],
-          ),
-        ),
-      ),
-    );
-  }
-}
--- a/lib/fragments/dashboard/widgets/start_button.dart
+++ b/lib/fragments/dashboard/widgets/start_button.dart
@@ -1,21 +1,20 @@
 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/providers/providers.dart';
 import 'package:fl_clash/state.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_riverpod/flutter_riverpod.dart';

-class StartButton extends ConsumerStatefulWidget {
+class StartButton extends StatefulWidget {
  const StartButton({super.key});

  @override
-  ConsumerState<StartButton> createState() => _StartButtonState();
+  State<StartButton> createState() => _StartButtonState();
 }

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

  @override
@@ -27,20 +26,6 @@ class _StartButtonState extends ConsumerState<StartButton>
      value: isStart ? 1 : 0,
      duration: const Duration(milliseconds: 200),
    );
-    _animation = CurvedAnimation(
-      parent: _controller,
-      curve: Curves.easeOutBack,
-    );
-    ref.listenManual(
-      runTimeProvider.select((state) => state != null),
-      (prev, next) {
-        if (next != isStart) {
-          isStart = next;
-          updateController();
-        }
-      },
-      fireImmediately: true,
-    );
  }

  @override
@@ -50,98 +35,100 @@ class _StartButtonState extends ConsumerState<StartButton>
  }

  handleSwitchStart() {
-    isStart = !isStart;
-    updateController();
-    debouncer.call(
-      FunctionTag.updateStatus,
-      () {
-        globalState.appController.updateStatus(isStart);
-      },
-      duration: commonDuration,
-    );
+    if (isStart == globalState.appState.isStart) {
+      isStart = !isStart;
+      updateController();
+      globalState.appController.updateStatus(isStart);
+    }
  }

  updateController() {
-    WidgetsBinding.instance.addPostFrameCallback((_) {
-      if (isStart) {
-        _controller.forward();
-      } else {
-        _controller.reverse();
-      }
-    });
+    if (isStart) {
+      _controller.forward();
+    } else {
+      _controller.reverse();
+    }
  }

  @override
  Widget build(BuildContext context) {
-    final state = ref.watch(startButtonSelectorStateProvider);
-    if (!state.isInit || !state.hasProfile) {
-      return Container();
-    }
-    return Theme(
-      data: Theme.of(context).copyWith(
-        floatingActionButtonTheme: FloatingActionButtonThemeData(
-          sizeConstraints: BoxConstraints(
-            minWidth: 56,
-            maxWidth: 200,
-          ),
-        ),
-      ),
-      child: AnimatedBuilder(
-        animation: _controller.view,
-        builder: (_, child) {
-          final textWidth = globalState.measure
-                  .computeTextSize(
-                    Text(
-                      utils.getTimeDifference(
-                        DateTime.now(),
-                      ),
-                      style: context.textTheme.titleMedium?.toSoftBold,
+    return Consumer(
+      builder: (_, ref, child) {
+        final state = ref.watch(startButtonSelectorStateProvider);
+        if (!state.isInit || !state.hasProfile) {
+          return Container();
+        }
+        ref.listenManual(
+          runTimeProvider.select((state) => state != null),
+          (prev, next) {
+            if (next != isStart) {
+              isStart = next;
+              updateController();
+            }
+          },
+          fireImmediately: true,
+        );
+        final textWidth = globalState.measure
+                .computeTextSize(
+                  Text(
+                    other.getTimeDifference(
+                      DateTime.now(),
                    ),
-                  )
-                  .width +
-              16;
-          return FloatingActionButton(
-            clipBehavior: Clip.antiAlias,
-            materialTapTargetSize: MaterialTapTargetSize.padded,
-            heroTag: null,
-            onPressed: () {
-              handleSwitchStart();
-            },
-            child: Row(
-              mainAxisSize: MainAxisSize.max,
-              children: [
-                Container(
-                  height: 56,
-                  width: 56,
-                  alignment: Alignment.center,
-                  child: AnimatedIcon(
-                    icon: AnimatedIcons.play_pause,
-                    progress: _animation,
+                    style: Theme.of(context).textTheme.titleMedium?.toSoftBold,
                  ),
-                ),
-                SizedBox(
-                  width: textWidth * _animation.value,
-                  child: child!,
                )
-              ],
-            ),
-          );
-        },
-        child: Consumer(
-          builder: (_, ref, __) {
-            final runTime = ref.watch(runTimeProvider);
-            final text = utils.getTimeText(runTime);
-            return Text(
-              text,
-              maxLines: 1,
-              overflow: TextOverflow.visible,
-              style:
-                  Theme.of(context).textTheme.titleMedium?.toSoftBold.copyWith(
-                        color: context.colorScheme.onPrimaryContainer,
+                .width +
+            16;
+        return AnimatedBuilder(
+          animation: _controller.view,
+          builder: (_, child) {
+            return SizedBox(
+              width: 56 + textWidth * _controller.value,
+              height: 56,
+              child: FloatingActionButton(
+                heroTag: null,
+                onPressed: () {
+                  handleSwitchStart();
+                },
+                child: Row(
+                  children: [
+                    Container(
+                      width: 56,
+                      height: 56,
+                      alignment: Alignment.center,
+                      child: AnimatedIcon(
+                        icon: AnimatedIcons.play_pause,
+                        progress: _controller,
                      ),
+                    ),
+                    Expanded(
+                      child: ClipRect(
+                        child: OverflowBox(
+                          maxWidth: textWidth,
+                          child: Container(
+                            alignment: Alignment.centerLeft,
+                            child: child!,
+                          ),
+                        ),
+                      ),
+                    ),
+                  ],
+                ),
+              ),
            );
          },
-        ),
+          child: child,
+        );
+      },
+      child: Consumer(
+        builder: (_, ref, __) {
+          final runTime = ref.watch(runTimeProvider);
+          final text = other.getTimeText(runTime);
+          return Text(
+            text,
+            style: Theme.of(context).textTheme.titleMedium?.toSoftBold,
+          );
+        },
      ),
    );
  }
--- a/lib/fragments/developer.dart
+++ b/lib/fragments/developer.dart
@@ -1,118 +0,0 @@
-import 'package:fl_clash/clash/core.dart';
-import 'package:fl_clash/common/common.dart';
-import 'package:fl_clash/enum/enum.dart';
-import 'package:fl_clash/models/common.dart';
-import 'package:fl_clash/providers/config.dart';
-import 'package:fl_clash/state.dart';
-import 'package:fl_clash/widgets/widgets.dart';
-import 'package:flutter/material.dart';
-import 'package:flutter_riverpod/flutter_riverpod.dart';
-
-import '../providers/app.dart';
-
-class DeveloperView extends ConsumerWidget {
-  const DeveloperView({super.key});
-
-  Widget _getDeveloperList(BuildContext context, WidgetRef ref) {
-    return generateSectionV2(
-      title: appLocalizations.options,
-      items: [
-        ListItem(
-          title: Text(appLocalizations.messageTest),
-          onTap: () {
-            context.showNotifier(
-              appLocalizations.messageTestTip,
-            );
-          },
-        ),
-        ListItem(
-          title: Text(appLocalizations.logsTest),
-          onTap: () {
-            for (int i = 0; i < 1000; i++) {
-              ref.read(requestsProvider.notifier).addRequest(Connection(
-                    id: utils.id,
-                    start: DateTime.now(),
-                    metadata: Metadata(
-                      uid: i * i,
-                      network: utils.generateRandomString(
-                        maxLength: 1000,
-                        minLength: 20,
-                      ),
-                      sourceIP: '',
-                      sourcePort: '',
-                      destinationIP: '',
-                      destinationPort: '',
-                      host: '',
-                      process: '',
-                      remoteDestination: "",
-                    ),
-                    chains: ["chains"],
-                  ));
-              globalState.appController.addLog(
-                Log.app(
-                  utils.generateRandomString(
-                    maxLength: 200,
-                    minLength: 20,
-                  ),
-                ),
-              );
-            }
-          },
-        ),
-        ListItem(
-          title: Text(appLocalizations.crashTest),
-          onTap: () {
-            clashCore.clashInterface.crash();
-          },
-        ),
-        ListItem(
-          title: Text(appLocalizations.clearData),
-          onTap: () async {
-            await globalState.appController.handleClear();
-          },
-        )
-      ],
-    );
-  }
-
-  @override
-  Widget build(BuildContext context, ref) {
-    final enable = ref.watch(
-      appSettingProvider.select(
-        (state) => state.developerMode,
-      ),
-    );
-    return SingleChildScrollView(
-      padding: baseInfoEdgeInsets,
-      child: Column(
-        children: [
-          CommonCard(
-            type: CommonCardType.filled,
-            radius: 18,
-            child: ListItem.switchItem(
-              padding: const EdgeInsets.only(
-                left: 16,
-                right: 16,
-              ),
-              title: Text(appLocalizations.developerMode),
-              delegate: SwitchDelegate(
-                value: enable,
-                onChanged: (value) {
-                  ref.read(appSettingProvider.notifier).updateState(
-                        (state) => state.copyWith(
-                          developerMode: value,
-                        ),
-                      );
-                },
-              ),
-            ),
-          ),
-          SizedBox(
-            height: 16,
-          ),
-          _getDeveloperList(context, ref)
-        ],
-      ),
-    );
-  }
-}
--- a/lib/fragments/fragments.dart
+++ b/lib/fragments/fragments.dart
@@ -11,4 +11,3 @@ export 'backup_and_recovery.dart';
 export 'resources.dart';
 export 'connection/requests.dart';
 export 'connection/connections.dart';
-export 'developer.dart';
--- a/lib/fragments/hotkey.dart
+++ b/lib/fragments/hotkey.dart
@@ -103,7 +103,7 @@ class _HotKeyRecorderState extends State<HotKeyRecorder> {
      modifiers: modifiers,
      key: key.usbHidUsage,
    );
-    return false;
+    return true;
  }

  @override
@@ -157,65 +157,59 @@ class _HotKeyRecorderState extends State<HotKeyRecorder> {

  @override
  Widget build(BuildContext context) {
-    return Focus(
-      onKeyEvent: (_, __) {
-        return KeyEventResult.handled;
-      },
-      autofocus: true,
-      child: CommonDialog(
-        title: IntlExt.actionMessage(widget.hotKeyAction.action.name),
-        actions: [
-          TextButton(
-            onPressed: () {
-              _handleRemove();
-            },
-            child: Text(appLocalizations.remove),
-          ),
-          const SizedBox(
-            width: 8,
-          ),
-          TextButton(
-            onPressed: () {
-              _handleConfirm();
-            },
-            child: Text(
-              appLocalizations.confirm,
-            ),
-          ),
-        ],
-        child: ValueListenableBuilder(
-          valueListenable: hotKeyActionNotifier,
-          builder: (_, hotKeyAction, ___) {
-            final key = hotKeyAction.key;
-            final modifiers = hotKeyAction.modifiers;
-            return SizedBox(
-              width: dialogCommonWidth,
-              child: key != null
-                  ? Wrap(
-                      spacing: 8,
-                      crossAxisAlignment: WrapCrossAlignment.center,
-                      children: [
-                        for (final modifier in modifiers)
-                          KeyboardKeyBox(
-                            keyboardKey: modifier.physicalKeys.first,
-                          ),
-                        if (modifiers.isNotEmpty)
-                          Text(
-                            "+",
-                            style: context.textTheme.titleMedium,
-                          ),
-                        KeyboardKeyBox(
-                          keyboardKey: PhysicalKeyboardKey(key),
-                        ),
-                      ],
-                    )
-                  : Text(
-                      appLocalizations.pressKeyboard,
-                      style: context.textTheme.titleMedium,
-                    ),
-            );
+    return CommonDialog(
+      title: IntlExt.actionMessage(widget.hotKeyAction.action.name),
+      actions: [
+        TextButton(
+          onPressed: () {
+            _handleRemove();
          },
+          child: Text(appLocalizations.remove),
        ),
+        const SizedBox(
+          width: 8,
+        ),
+        TextButton(
+          onPressed: () {
+            _handleConfirm();
+          },
+          child: Text(
+            appLocalizations.confirm,
+          ),
+        ),
+      ],
+      child: ValueListenableBuilder(
+        valueListenable: hotKeyActionNotifier,
+        builder: (_, hotKeyAction, ___) {
+          final key = hotKeyAction.key;
+          final modifiers = hotKeyAction.modifiers;
+          return SizedBox(
+            width: dialogCommonWidth,
+            child: key != null
+                ? Wrap(
+                    spacing: 8,
+                    crossAxisAlignment: WrapCrossAlignment.center,
+                    children: [
+                      for (final modifier in modifiers)
+                        KeyboardKeyBox(
+                          keyboardKey: modifier.physicalKeys.first,
+                        ),
+                      if (modifiers.isNotEmpty)
+                        Text(
+                          "+",
+                          style: context.textTheme.titleMedium,
+                        ),
+                      KeyboardKeyBox(
+                        keyboardKey: PhysicalKeyboardKey(key),
+                      ),
+                    ],
+                  )
+                : Text(
+                    appLocalizations.pressKeyboard,
+                    style: context.textTheme.titleMedium,
+                  ),
+          );
+        },
      ),
    );
  }
--- a/lib/fragments/logs.dart
+++ b/lib/fragments/logs.dart
@@ -1,5 +1,3 @@
-import 'dart:math';
-
 import 'package:fl_clash/common/common.dart';
 import 'package:fl_clash/enum/enum.dart';
 import 'package:fl_clash/providers/providers.dart';
@@ -10,6 +8,8 @@ import 'package:flutter_riverpod/flutter_riverpod.dart';
 import '../models/models.dart';
 import '../widgets/widgets.dart';

+double _preOffset = 0;
+
 class LogsFragment extends ConsumerStatefulWidget {
  const LogsFragment({super.key});

@@ -18,27 +18,33 @@ class LogsFragment extends ConsumerStatefulWidget {
 }

 class _LogsFragmentState extends ConsumerState<LogsFragment> with PageMixin {
-  final _logsStateNotifier = ValueNotifier<LogsState>(
-    LogsState(loading: true),
+  final _logsStateNotifier = ValueNotifier<LogsState>(LogsState());
+  final _scrollController = ScrollController(
+    initialScrollOffset: _preOffset != 0 ? _preOffset : double.maxFinite,
  );
-  late ScrollController _scrollController;
-
  double _currentMaxWidth = 0;
-  final _tag = CacheTag.rules;
-  bool _isLoad = false;
+  final GlobalKey<CacheItemExtentListViewState> _key = GlobalKey();

  List<Log> _logs = [];

  @override
  void initState() {
    super.initState();
-    final position = globalState.cacheScrollPosition[_tag] ?? -1;
-    _scrollController = ScrollController(
-      initialScrollOffset: position > 0 ? position : double.maxFinite,
-    );
-    _logs = globalState.appState.logs.list;
    _logsStateNotifier.value = _logsStateNotifier.value.copyWith(
-      logs: _logs,
+      logs: globalState.appState.logs.list,
+    );
+    ref.listenManual(
+      logsProvider.select((state) => state.list),
+      (prev, next) {
+        if (prev != next) {
+          final isEquality = logListEquality.equals(prev, next);
+          if (!isEquality) {
+            _logs = next;
+            updateLogsThrottler();
+          }
+        }
+      },
+      fireImmediately: true,
    );
    ref.listenManual(
      isCurrentPageProvider(
@@ -53,18 +59,6 @@ class _LogsFragmentState extends ConsumerState<LogsFragment> with PageMixin {
      },
      fireImmediately: true,
    );
-    ref.listenManual(
-      logsProvider.select((state) => state.list),
-      (prev, next) {
-        if (prev != next) {
-          final isEquality = logListEquality.equals(prev, next);
-          if (!isEquality) {
-            _logs = next;
-            updateLogsThrottler();
-          }
-        }
-      },
-    );
  }

  @override
@@ -99,6 +93,13 @@ class _LogsFragmentState extends ConsumerState<LogsFragment> with PageMixin {
    super.dispose();
  }

+  _handleTryClearCache(double maxWidth) {
+    if (_currentMaxWidth != maxWidth) {
+      _currentMaxWidth = maxWidth;
+      _key.currentState?.clearCache();
+    }
+  }
+
  _handleExport() async {
    final commonScaffoldState = context.commonScaffoldState;
    final res = await commonScaffoldState?.loadingRun<bool>(
@@ -121,17 +122,17 @@ class _LogsFragmentState extends ConsumerState<LogsFragment> with PageMixin {
    final height = globalState.measure
        .computeTextSize(
          Text(
-            log.payload,
-            style: context.textTheme.bodyLarge,
+            log.payload ?? "",
+            style: globalState.appController.context.textTheme.bodyLarge,
          ),
          maxWidth: _currentMaxWidth,
        )
        .height;
-    return height + bodySmallHeight + 8 + bodyMediumHeight + 40 + 8;
+    return height + bodySmallHeight + 8 + bodyMediumHeight + 40;
  }

  updateLogsThrottler() {
-    throttler.call(FunctionTag.logs, () {
+    throttler.call("logs", () {
      final isEquality = logListEquality.equals(
        _logs,
        _logsStateNotifier.value.logs,
@@ -140,123 +141,83 @@ class _LogsFragmentState extends ConsumerState<LogsFragment> with PageMixin {
        return;
      }
      WidgetsBinding.instance.addPostFrameCallback((_) {
-        if (mounted) {
-          _logsStateNotifier.value = _logsStateNotifier.value.copyWith(
-            logs: _logs,
-          );
-        }
+        _logsStateNotifier.value = _logsStateNotifier.value.copyWith(
+          logs: _logs,
+        );
      });
    }, duration: commonDuration);
  }

-  _preLoad() {
-    if (_isLoad == true) {
-      return;
-    }
-    _isLoad = true;
-    WidgetsBinding.instance.addPostFrameCallback((_) async {
-      if (!mounted) {
-        return;
-      }
-      final isMobileView = ref.read(isMobileViewProvider);
-      if (isMobileView) {
-        await Future.delayed(Duration(milliseconds: 300));
-      }
-      final parts = _logs.batch(10);
-      globalState.cacheHeightMap[_tag] ??= FixedMap(
-        _logs.length,
-      );
-      for (int i = 0; i < parts.length; i++) {
-        final part = parts[i];
-        await Future(
-          () {
-            for (final log in part) {
-              globalState.cacheHeightMap[_tag]?.updateCacheValue(
-                log.payload,
-                () => _getItemHeight(log),
-              );
-            }
-          },
-        );
-      }
-      _logsStateNotifier.value = _logsStateNotifier.value.copyWith(
-        loading: false,
-      );
-    });
-  }
-
  @override
  Widget build(BuildContext context) {
    return LayoutBuilder(
      builder: (_, constraints) {
-        _currentMaxWidth = constraints.maxWidth - 40;
-        return ValueListenableBuilder<LogsState>(
-          valueListenable: _logsStateNotifier,
-          builder: (_, state, __) {
-            _preLoad();
-            final logs = state.list;
-            final items = logs
-                .map<Widget>(
-                  (log) => LogItem(
-                    key: Key(log.dateTime),
-                    log: log,
-                    onClick: (value) {
-                      context.commonScaffoldState?.addKeyword(value);
+        _handleTryClearCache(constraints.maxWidth - 40);
+        return Align(
+          alignment: Alignment.topCenter,
+          child: ValueListenableBuilder<LogsState>(
+            valueListenable: _logsStateNotifier,
+            builder: (_, state, __) {
+              final logs = state.list;
+              if (logs.isEmpty) {
+                return NullStatus(
+                  label: appLocalizations.nullLogsDesc,
+                );
+              }
+              final items = logs
+                  .map<Widget>(
+                    (log) => LogItem(
+                      key: Key(log.dateTime.toString()),
+                      log: log,
+                      onClick: (value) {
+                        context.commonScaffoldState?.addKeyword(value);
+                      },
+                    ),
+                  )
+                  .separated(
+                    const Divider(
+                      height: 0,
+                    ),
+                  )
+                  .toList();
+              return NotificationListener<ScrollEndNotification>(
+                onNotification: (details) {
+                  _preOffset = details.metrics.pixels;
+                  return false;
+                },
+                child: CommonScrollBar(
+                  controller: _scrollController,
+                  child: CacheItemExtentListView(
+                    key: _key,
+                    reverse: true,
+                    shrinkWrap: true,
+                    physics: NextClampingScrollPhysics(),
+                    controller: _scrollController,
+                    itemBuilder: (_, index) {
+                      return items[index];
+                    },
+                    itemExtentBuilder: (index) {
+                      final item = items[index];
+                      if (item.runtimeType == Divider) {
+                        return 0;
+                      }
+                      final log = logs[(index / 2).floor()];
+                      return _getItemHeight(log);
+                    },
+                    itemCount: items.length,
+                    keyBuilder: (int index) {
+                      final item = items[index];
+                      if (item.runtimeType == Divider) {
+                        return "divider";
+                      }
+                      final log = logs[(index / 2).floor()];
+                      return log.payload ?? "";
                    },
                  ),
-                )
-                .separated(
-                  const Divider(
-                    height: 0,
-                  ),
-                )
-                .toList();
-            final content = logs.isEmpty
-                ? NullStatus(
-                    label: appLocalizations.nullLogsDesc,
-                  )
-                : Align(
-                    alignment: Alignment.topCenter,
-                    child: CommonScrollBar(
-                      controller: _scrollController,
-                      child: ScrollToEndBox(
-                        controller: _scrollController,
-                        tag: _tag,
-                        dataSource: logs,
-                        child: CacheItemExtentListView(
-                          tag: _tag,
-                          reverse: true,
-                          shrinkWrap: true,
-                          physics: NextClampingScrollPhysics(),
-                          controller: _scrollController,
-                          itemBuilder: (_, index) {
-                            return items[index];
-                          },
-                          itemExtentBuilder: (index) {
-                            if (index.isOdd) {
-                              return 0;
-                            }
-                            return _getItemHeight(logs[index ~/ 2]);
-                          },
-                          itemCount: items.length,
-                          keyBuilder: (int index) {
-                            if (index.isOdd) {
-                              return "divider";
-                            }
-                            return logs[index ~/ 2].payload;
-                          },
-                        ),
-                      ),
-                    ),
-                  );
-            return FadeBox(
-              child: state.loading
-                  ? Center(
-                      child: CircularProgressIndicator(),
-                    )
-                  : content,
-            );
-          },
+                ),
+              );
+            },
+          ),
        );
      },
    );
@@ -281,14 +242,14 @@ class LogItem extends StatelessWidget {
        vertical: 4,
      ),
      title: SelectableText(
-        log.payload,
+        log.payload ?? '',
        style: context.textTheme.bodyLarge,
      ),
      subtitle: Column(
        crossAxisAlignment: CrossAxisAlignment.start,
        children: [
          SelectableText(
-            log.dateTime,
+            "${log.dateTime}",
            style: context.textTheme.bodySmall?.copyWith(
              color: context.colorScheme.primary,
            ),
--- a/lib/fragments/profiles/add_profile.dart
+++ b/lib/fragments/profiles/add_profile.dart
@@ -104,13 +104,8 @@ class _URLFormDialogState extends State<URLFormDialog> {
          runSpacing: 16,
          children: [
            TextField(
-              keyboardType: TextInputType.url,
-              minLines: 1,
              maxLines: 5,
-              onSubmitted: (_) {
-                _handleAddProfileFormURL();
-              },
-              onEditingComplete: _handleAddProfileFormURL,
+              minLines: 1,
              controller: urlController,
              decoration: InputDecoration(
                border: const OutlineInputBorder(),
--- a/lib/fragments/profiles/edit_profile.dart
+++ b/lib/fragments/profiles/edit_profile.dart
@@ -47,6 +47,7 @@ class _EditProfileState extends State<EditProfile> {
      text: widget.profile.autoUpdateDuration.inMinutes.toString(),
    );
    appPath.getProfilePath(widget.profile.id).then((path) async {
+      if (path == null) return;
      fileInfoNotifier.value = await _getFileInfo(path);
    });
  }
@@ -142,10 +143,9 @@ class _EditProfileState extends State<EditProfile> {
  _editProfileFile() async {
    if (rawText == null) {
      final profilePath = await appPath.getProfilePath(widget.profile.id);
+      if (profilePath == null) return;
      final file = File(profilePath);
-      if (await file.exists()) {
-        rawText = await file.readAsString();
-      }
+      rawText = await file.readAsString();
    }
    if (!mounted) return;
    final title = widget.profile.label ?? widget.profile.id;
@@ -214,7 +214,6 @@ class _EditProfileState extends State<EditProfile> {
    final items = [
      ListItem(
        title: TextFormField(
-          textInputAction: TextInputAction.next,
          controller: labelController,
          decoration: InputDecoration(
            border: const OutlineInputBorder(),
@@ -231,8 +230,6 @@ class _EditProfileState extends State<EditProfile> {
      if (widget.profile.type == ProfileType.url) ...[
        ListItem(
          title: TextFormField(
-            textInputAction: TextInputAction.next,
-            keyboardType: TextInputType.url,
            controller: urlController,
            maxLines: 5,
            minLines: 1,
@@ -261,7 +258,6 @@ class _EditProfileState extends State<EditProfile> {
        if (autoUpdate)
          ListItem(
            title: TextFormField(
-              textInputAction: TextInputAction.next,
              controller: autoUpdateDurationController,
              decoration: InputDecoration(
                border: const OutlineInputBorder(),
--- a/lib/fragments/profiles/override_profile.dart
+++ b/lib/fragments/profiles/override_profile.dart
@@ -23,6 +23,7 @@ class OverrideProfile extends StatefulWidget {
 }

 class _OverrideProfileState extends State<OverrideProfile> {
+  final GlobalKey<CacheItemExtentListViewState> _ruleListKey = GlobalKey();
  final _controller = ScrollController();
  double _currentMaxWidth = 0;

@@ -85,6 +86,13 @@ class _OverrideProfileState extends State<OverrideProfile> {
        );
  }

+  _handleTryClearCache(double maxWidth) {
+    if (_currentMaxWidth != maxWidth) {
+      _currentMaxWidth = maxWidth;
+      _ruleListKey.currentState?.clearCache();
+    }
+  }
+
  _buildContent() {
    return Consumer(
      builder: (_, ref, child) {
@@ -108,7 +116,7 @@ class _OverrideProfileState extends State<OverrideProfile> {
      },
      child: LayoutBuilder(
        builder: (_, constraints) {
-          _currentMaxWidth = constraints.maxWidth - 104;
+          _handleTryClearCache(constraints.maxWidth - 104);
          return CommonAutoHiddenScrollBar(
            controller: _controller,
            child: CustomScrollView(
@@ -140,6 +148,7 @@ class _OverrideProfileState extends State<OverrideProfile> {
                  padding: EdgeInsets.symmetric(horizontal: 16.0, vertical: 0),
                  sliver: RuleContent(
                    maxWidth: _currentMaxWidth,
+                    ruleListKey: _ruleListKey,
                  ),
                ),
                SliverToBoxAdapter(
@@ -219,7 +228,7 @@ class _OverrideProfileState extends State<OverrideProfile> {
                              message: TextSpan(
                                text: appLocalizations.saveTip,
                              ),
-                              confirmText: appLocalizations.save,
+                              confirmText: appLocalizations.tip,
                            );
                            if (res != true) {
                              return;
@@ -305,6 +314,8 @@ class OverrideSwitch extends ConsumerWidget {
        padding: const EdgeInsets.only(
          left: 16,
          right: 16,
+          top: 4,
+          bottom: 4,
        ),
        title: Text(appLocalizations.enableOverride),
        delegate: SwitchDelegate(
@@ -438,10 +449,12 @@ class RuleTitle extends ConsumerWidget {
 }

 class RuleContent extends ConsumerWidget {
+  final Key ruleListKey;
  final double maxWidth;

  const RuleContent({
    super.key,
+    required this.ruleListKey,
    required this.maxWidth,
  });

@@ -589,7 +602,7 @@ class RuleContent extends ConsumerWidget {
      );
    }
    return CacheItemExtentSliverReorderableList(
-      tag: CacheTag.rules,
+      key: ruleListKey,
      itemBuilder: (context, index) {
        final rule = rules[index];
        return GestureDetector(
@@ -860,8 +873,6 @@ class _AddRuleDialogState extends State<AddRuleDialog> {
                          builder: (filed) {
                            return DropdownMenu(
                              width: 200,
-                              enableFilter: false,
-                              enableSearch: false,
                              controller: _subRuleController,
                              label: Text(appLocalizations.subRule),
                              menuHeight: 250,
@@ -879,11 +890,11 @@ class _AddRuleDialogState extends State<AddRuleDialog> {
                          builder: (filed) {
                            return DropdownMenu(
                              controller: _ruleTargetController,
+                              initialSelection: filed.value,
                              label: Text(appLocalizations.ruleTarget),
                              width: 200,
                              menuHeight: 250,
-                              enableFilter: false,
-                              enableSearch: false,
+                              enableFilter: true,
                              dropdownMenuEntries: _targetItems,
                              errorText: filed.errorText,
                            );
--- a/lib/fragments/profiles/profiles.dart
+++ b/lib/fragments/profiles/profiles.dart
@@ -349,10 +349,12 @@ class ProfileItem extends StatelessWidget {
                        ),
                        PopupMenuItemData(
                          icon: Icons.delete_outlined,
+                          iconSize: 20,
                          label: appLocalizations.delete,
                          onPressed: () {
                            _handleDeleteProfile(context);
                          },
+                          type: PopupMenuItemType.danger,
                        ),
                      ],
                    ),
@@ -368,7 +370,7 @@ class ProfileItem extends StatelessWidget {
          ),
        ),
        title: Container(
-          padding: const EdgeInsets.symmetric(vertical: 4),
+          padding: const EdgeInsets.symmetric(vertical: 8),
          child: Column(
            crossAxisAlignment: CrossAxisAlignment.start,
            mainAxisAlignment: MainAxisAlignment.center,
--- a/lib/fragments/proxies/card.dart
+++ b/lib/fragments/proxies/card.dart
@@ -63,7 +63,7 @@ class ProxyCard extends StatelessWidget {
                    delay > 0 ? '$delay ms' : "Timeout",
                    style: context.textTheme.labelSmall?.copyWith(
                      overflow: TextOverflow.ellipsis,
-                      color: utils.getDelayColor(
+                      color: other.getDelayColor(
                        delay,
                      ),
                    ),
@@ -133,6 +133,7 @@ class ProxyCard extends StatelessWidget {
                ref.watch(getSelectedProxyNameProvider(groupName));
            return CommonCard(
              key: key,
+              enterAnimated: true,
              onPressed: () {
                _changeProxy(ref);
              },
@@ -176,8 +177,8 @@ class ProxyCard extends StatelessWidget {
                              proxy.type,
                              style: context.textTheme.bodySmall?.copyWith(
                                overflow: TextOverflow.ellipsis,
-                                color: context
-                                    .textTheme.bodySmall?.color?.opacity80,
+                                color:
+                                    context.textTheme.bodySmall?.color?.opacity80,
                              ),
                            ),
                          ),
--- a/lib/fragments/proxies/common.dart
+++ b/lib/fragments/proxies/common.dart
@@ -6,7 +6,7 @@ import 'package:fl_clash/state.dart';

 double get listHeaderHeight {
  final measure = globalState.measure;
-  return 20 + measure.titleMediumHeight + 4 + measure.bodyMediumHeight;
+  return 24 + measure.titleMediumHeight + 4 + measure.bodyMediumHeight;
 }

 double getItemHeight(ProxyCardType proxyCardType) {
--- a/lib/fragments/proxies/list.dart
+++ b/lib/fragments/proxies/list.dart
@@ -114,16 +114,12 @@ class _ProxiesListFragmentState extends State<ProxiesListFragment> {
    required int columns,
    required Set<String> currentUnfoldSet,
    required ProxyCardType type,
-    required String query,
  }) {
    final items = <Widget>[];
    final GroupNameProxiesMap groupNameProxiesMap = {};
    for (final groupName in groupNames) {
-      final group = ref.read(
-        groupsProvider.select(
-          (state) => state.getGroup(groupName),
-        ),
-      );
+      final group =
+          ref.read(groupsProvider.select((state) => state.getGroup(groupName)));
      if (group == null) {
        continue;
      }
@@ -144,9 +140,7 @@ class _ProxiesListFragmentState extends State<ProxiesListFragment> {
      ]);
      if (isExpand) {
        final sortedProxies = globalState.appController.getSortProxies(
-          group.all
-              .where((item) => item.name.toLowerCase().contains(query))
-              .toList(),
+          group.all,
          group.testUrl,
        );
        groupNameProxiesMap[groupName] = sortedProxies;
@@ -256,7 +250,6 @@ class _ProxiesListFragmentState extends State<ProxiesListFragment> {
    return Consumer(
      builder: (_, ref, __) {
        final state = ref.watch(proxiesListSelectorStateProvider);
-        ref.watch(themeSettingProvider.select((state) => state.textScale));
        if (state.groupNames.isEmpty) {
          return NullStatus(
            label: appLocalizations.nullProxies,
@@ -268,7 +261,6 @@ class _ProxiesListFragmentState extends State<ProxiesListFragment> {
          currentUnfoldSet: state.currentUnfoldSet,
          columns: state.columns,
          type: state.proxyCardType,
-          query: state.query,
        );
        final itemsOffset = _getItemHeightList(items, state.proxyCardType);
        return CommonScrollBar(
@@ -422,10 +414,7 @@ class _ListHeaderState extends State<ListHeader>
    return Consumer(
      builder: (_, ref, child) {
        final iconStyle = ref.watch(
-          proxiesStyleSettingProvider.select(
-            (state) => state.iconStyle,
-          ),
-        );
+            proxiesStyleSettingProvider.select((state) => state.iconStyle));
        final icon = ref.watch(proxiesStyleSettingProvider.select((state) {
          final iconMapEntryList = state.iconMap.entries.toList();
          final index = iconMapEntryList.indexWhere((item) {
@@ -441,44 +430,30 @@ class _ListHeaderState extends State<ListHeader>
          return this.icon;
        }));
        return switch (iconStyle) {
-          ProxiesIconStyle.standard => LayoutBuilder(
-              builder: (_, constraints) {
-                return Container(
-                  margin: const EdgeInsets.only(
-                    right: 16,
-                  ),
-                  child: AspectRatio(
-                    aspectRatio: 1,
-                    child: Container(
-                      height: constraints.maxHeight,
-                      width: constraints.maxWidth,
-                      alignment: Alignment.center,
-                      padding: EdgeInsets.all(6.ap),
-                      decoration: BoxDecoration(
-                        color: context.colorScheme.secondaryContainer,
-                        borderRadius: BorderRadius.circular(12),
-                      ),
-                      clipBehavior: Clip.antiAlias,
-                      child: CommonTargetIcon(
-                        src: icon,
-                        size: constraints.maxHeight - 12.ap,
-                      ),
-                    ),
-                  ),
-                );
-              },
+          ProxiesIconStyle.standard => Container(
+              height: 48,
+              width: 48,
+              margin: const EdgeInsets.only(
+                right: 16,
+              ),
+              padding: const EdgeInsets.all(8),
+              decoration: BoxDecoration(
+                color: context.colorScheme.secondaryContainer,
+                borderRadius: BorderRadius.circular(12),
+              ),
+              clipBehavior: Clip.antiAlias,
+              child: CommonTargetIcon(
+                src: icon,
+                size: 32,
+              ),
            ),
          ProxiesIconStyle.icon => Container(
              margin: const EdgeInsets.only(
                right: 16,
              ),
-              child: LayoutBuilder(
-                builder: (_, constraints) {
-                  return CommonTargetIcon(
-                    src: icon,
-                    size: constraints.maxHeight - 8,
-                  );
-                },
+              child: CommonTargetIcon(
+                src: icon,
+                size: 42,
              ),
            ),
          ProxiesIconStyle.none => Container(),
@@ -492,7 +467,7 @@ class _ListHeaderState extends State<ListHeader>
    return CommonCard(
      enterAnimated: widget.enterAnimated,
      key: widget.key,
-      radius: 16.ap,
+      radius: 14,
      type: CommonCardType.filled,
      child: Padding(
        padding: const EdgeInsets.symmetric(
@@ -595,10 +570,7 @@ class _ListHeaderState extends State<ListHeader>
                  const SizedBox(
                    width: 6,
                  ),
-                ] else
-                  SizedBox(
-                    width: 4,
-                  ),
+                ],
                AnimatedBuilder(
                  animation: _animationController.view,
                  builder: (_, __) {
--- a/lib/fragments/proxies/proxies.dart
+++ b/lib/fragments/proxies/proxies.dart
@@ -2,12 +2,10 @@ import 'package:fl_clash/common/common.dart';
 import 'package:fl_clash/enum/enum.dart';
 import 'package:fl_clash/fragments/proxies/list.dart';
 import 'package:fl_clash/fragments/proxies/providers.dart';
-import 'package:fl_clash/models/common.dart';
 import 'package:fl_clash/providers/providers.dart';
 import 'package:fl_clash/widgets/widgets.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_riverpod/flutter_riverpod.dart';
-
 import 'common.dart';
 import 'setting.dart';
 import 'tab.dart';
@@ -27,97 +25,70 @@ class _ProxiesFragmentState extends ConsumerState<ProxiesFragment>

  @override
  get actions => [
-        CommonPopupBox(
-          targetBuilder: (open) {
-            return IconButton(
-              onPressed: () {
-                open(
-                  offset: Offset(0, 20),
-                );
-              },
-              icon: Icon(
-                Icons.more_vert,
-              ),
-            );
-          },
-          popup: CommonPopupMenu(
-            items: [
-              PopupMenuItemData(
-                icon: Icons.tune,
-                label: appLocalizations.settings,
+        if (_hasProviders)
+          IconButton(
+            onPressed: () {
+              showExtend(
+                context,
+                builder: (_, type) {
+                  return ProvidersView(
+                    type: type,
+                  );
+                },
+              );
+            },
+            icon: const Icon(
+              Icons.poll_outlined,
+            ),
+          ),
+        _isTab
+            ? IconButton(
                onPressed: () {
-                  showSheet(
-                    context: context,
-                    props: SheetProps(
-                      isScrollControlled: true,
-                    ),
+                  _proxiesTabKey.currentState?.scrollToGroupSelected();
+                },
+                icon: const Icon(
+                  Icons.adjust_outlined,
+                ),
+              )
+            : IconButton(
+                onPressed: () {
+                  showExtend(
+                    context,
                    builder: (_, type) {
                      return AdaptiveSheetScaffold(
                        type: type,
-                        body: const ProxiesSetting(),
-                        title: appLocalizations.settings,
+                        body: const _IconConfigView(),
+                        title: appLocalizations.iconConfiguration,
                      );
                    },
                  );
                },
-              ),
-              if (_hasProviders)
-                PopupMenuItemData(
-                  icon: Icons.poll_outlined,
-                  label: appLocalizations.providers,
-                  onPressed: () {
-                    showExtend(
-                      context,
-                      builder: (_, type) {
-                        return ProvidersView(
-                          type: type,
-                        );
-                      },
-                    );
-                  },
+                icon: const Icon(
+                  Icons.style_outlined,
                ),
-              _isTab
-                  ? PopupMenuItemData(
-                      icon: Icons.adjust_outlined,
-                      label: "聚焦",
-                      onPressed: () {
-                        _proxiesTabKey.currentState?.scrollToGroupSelected();
-                      },
-                    )
-                  : PopupMenuItemData(
-                      icon: Icons.style_outlined,
-                      label: appLocalizations.iconConfiguration,
-                      onPressed: () {
-                        showExtend(
-                          context,
-                          builder: (_, type) {
-                            return AdaptiveSheetScaffold(
-                              type: type,
-                              body: const _IconConfigView(),
-                              title: appLocalizations.iconConfiguration,
-                            );
-                          },
-                        );
-                      },
-                    ),
-            ],
+              ),
+        IconButton(
+          onPressed: () {
+            showSheet(
+              context: context,
+              props: SheetProps(
+                isScrollControlled: true,
+              ),
+              builder: (_, type) {
+                return AdaptiveSheetScaffold(
+                  type: type,
+                  body: const ProxiesSetting(),
+                  title: appLocalizations.proxiesSetting,
+                );
+              },
+            );
+          },
+          icon: const Icon(
+            Icons.tune,
          ),
        )
      ];

-  @override
-  get onSearch => (value) {
-        ref.read(proxiesQueryProvider.notifier).value = value;
-      };
-
-  @override
-  void dispose() {
-    super.dispose();
-    WidgetsBinding.instance.addPostFrameCallback((_) {
-      ref.read(proxiesQueryProvider.notifier).value = "";
-    });
-  }
-
  @override
  get floatingActionButton => _isTab
      ? DelayTestButton(
@@ -132,70 +103,6 @@ class _ProxiesFragmentState extends ConsumerState<ProxiesFragment>

  @override
  void initState() {
-    [
-      if (_hasProviders)
-        IconButton(
-          onPressed: () {
-            showExtend(
-              context,
-              builder: (_, type) {
-                return ProvidersView(
-                  type: type,
-                );
-              },
-            );
-          },
-          icon: const Icon(
-            Icons.poll_outlined,
-          ),
-        ),
-      _isTab
-          ? IconButton(
-              onPressed: () {
-                _proxiesTabKey.currentState?.scrollToGroupSelected();
-              },
-              icon: const Icon(
-                Icons.adjust_outlined,
-              ),
-            )
-          : IconButton(
-              onPressed: () {
-                showExtend(
-                  context,
-                  builder: (_, type) {
-                    return AdaptiveSheetScaffold(
-                      type: type,
-                      body: const _IconConfigView(),
-                      title: appLocalizations.iconConfiguration,
-                    );
-                  },
-                );
-              },
-              icon: const Icon(
-                Icons.style_outlined,
-              ),
-            ),
-      IconButton(
-        onPressed: () {
-          showSheet(
-            context: context,
-            props: SheetProps(
-              isScrollControlled: true,
-            ),
-            builder: (_, type) {
-              return AdaptiveSheetScaffold(
-                type: type,
-                body: const ProxiesSetting(),
-                title: appLocalizations.settings,
-              );
-            },
-          );
-        },
-        icon: const Icon(
-          Icons.tune,
-        ),
-      )
-    ];
    ref.listenManual(
      proxiesActionsStateProvider,
      fireImmediately: true,
@@ -216,11 +123,8 @@ class _ProxiesFragmentState extends ConsumerState<ProxiesFragment>

  @override
  Widget build(BuildContext context) {
-    final proxiesType = ref.watch(
-      proxiesStyleSettingProvider.select(
-        (state) => state.type,
-      ),
-    );
+    final proxiesType =
+        ref.watch(proxiesStyleSettingProvider.select((state) => state.type));
    return switch (proxiesType) {
      ProxiesType.tab => ProxiesTabFragment(
          key: _proxiesTabKey,
@@ -235,9 +139,8 @@ class _IconConfigView extends ConsumerWidget {

  @override
  Widget build(BuildContext context, WidgetRef ref) {
-    final iconMap = ref.watch(proxiesStyleSettingProvider.select(
-      (state) => state.iconMap,
-    ));
+    final iconMap =
+        ref.watch(proxiesStyleSettingProvider.select((state) => state.iconMap));
    return MapInputPage(
      title: appLocalizations.iconConfiguration,
      map: iconMap,
--- a/lib/fragments/proxies/tab.dart
+++ b/lib/fragments/proxies/tab.dart
@@ -1,13 +1,13 @@
 import 'dart:math';

 import 'package:fl_clash/common/common.dart';
+import 'package:fl_clash/models/common.dart';
 import 'package:fl_clash/providers/providers.dart';
 import 'package:fl_clash/state.dart';
 import 'package:fl_clash/widgets/widgets.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_riverpod/flutter_riverpod.dart';

-import '../../models/common.dart';
 import 'card.dart';
 import 'common.dart';

@@ -127,6 +127,8 @@ class ProxiesTabFragmentState extends ConsumerState<ProxiesTabFragment>
      return;
    }
    final currentGroup = currentGroups[groupIndex];
+    currentTabProxies = currentGroup.all;
+    currentTabTestUrl = currentGroup.testUrl;
    WidgetsBinding.instance.addPostFrameCallback((_) {
      globalState.appController.updateCurrentGroupName(
        currentGroup.name,
@@ -162,7 +164,7 @@ class ProxiesTabFragmentState extends ConsumerState<ProxiesTabFragment>
        if (prev == next) {
          return;
        }
-        if (!stringListEquality.equals(prev?.groupNames, next.groupNames)) {
+        if (prev?.groupNames.length != next.groupNames.length) {
          _destroyTabController();
          final index = next.groupNames.indexWhere(
            (item) => item == next.currentGroupName,
@@ -176,7 +178,6 @@ class ProxiesTabFragmentState extends ConsumerState<ProxiesTabFragment>

  @override
  Widget build(BuildContext context) {
-    ref.watch(themeSettingProvider.select((state) => state.textScale));
    final state = ref.watch(groupNamesStateProvider);
    final groupNames = state.groupNames;
    if (groupNames.isEmpty) {
@@ -293,12 +294,17 @@ class ProxyGroupViewState extends ConsumerState<ProxyGroupView> {
    if (_controller.position.maxScrollExtent == 0) {
      return;
    }
+
+    final sortedProxies = globalState.appController.getSortProxies(
+      currentTabProxies,
+      currentTabTestUrl,
+    );
    _controller.animateTo(
      min(
        16 +
            getScrollToSelectedOffset(
              groupName: groupName,
-              proxies: currentTabProxies,
+              proxies: sortedProxies,
            ),
        _controller.position.maxScrollExtent,
      ),
@@ -317,8 +323,6 @@ class ProxyGroupViewState extends ConsumerState<ProxyGroupView> {
      proxies,
      state.testUrl,
    );
-    currentTabProxies = sortedProxies;
-    currentTabTestUrl = state.testUrl;
    return Align(
      alignment: Alignment.topCenter,
      child: CommonAutoHiddenScrollBar(
--- a/lib/fragments/resources.dart
+++ b/lib/fragments/resources.dart
@@ -147,21 +147,22 @@ class _GeoDataListItemState extends State<GeoDataListItem> {
            FutureBuilder<FileInfo>(
              future: _getGeoFileLastModified(geoItem.fileName),
              builder: (_, snapshot) {
-                final height = globalState.measure.bodyMediumHeight;
                return SizedBox(
-                  height: height,
-                  child: snapshot.data == null
-                      ? SizedBox(
-                          width: height,
-                          height: height,
-                          child: CircularProgressIndicator(
-                            strokeWidth: 2,
+                  height: 24,
+                  child: FadeThroughBox(
+                    key: Key("fade_box_${geoItem.label}"),
+                    child: snapshot.data == null
+                        ? const SizedBox(
+                            width: 24,
+                            height: 24,
+                            child: CircularProgressIndicator(
+                              strokeWidth: 2,
+                            ),
+                          )
+                        : Text(
+                            snapshot.data!.desc,
                          ),
-                        )
-                      : Text(
-                          snapshot.data!.desc,
-                          style: context.textTheme.bodyMedium,
-                        ),
+                  ),
                );
              },
            ),
--- a/lib/fragments/theme.dart
+++ b/lib/fragments/theme.dart
@@ -1,18 +1,9 @@
-// ignore_for_file: deprecated_member_use
-
-import 'dart:math';
-
-import 'dart:ui' as ui;
-
 import 'package:fl_clash/common/common.dart';
 import 'package:fl_clash/enum/enum.dart';
-import 'package:fl_clash/models/selector.dart';
 import 'package:fl_clash/providers/config.dart';
-import 'package:fl_clash/state.dart';
 import 'package:fl_clash/widgets/widgets.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_riverpod/flutter_riverpod.dart';
-import 'package:intl/intl.dart';

 class ThemeModeItem {
  final ThemeMode themeMode;
@@ -41,17 +32,25 @@ class ThemeFragment extends StatelessWidget {

  @override
  Widget build(BuildContext context) {
+    final previewCard = Padding(
+      padding: const EdgeInsets.symmetric(horizontal: 16),
+      child: CommonCard(
+        onPressed: () {},
+        info: Info(
+          label: appLocalizations.preview,
+          iconData: Icons.looks,
+        ),
+        child: Container(
+          height: 200,
+        ),
+      ),
+    );
    return SingleChildScrollView(
      child: Column(
-        spacing: 24,
+        mainAxisSize: MainAxisSize.min,
        children: [
-          _ThemeModeItem(),
-          _PrimaryColorItem(),
-          _PrueBlackItem(),
-          _TextScaleFactorItem(),
-          const SizedBox(
-            height: 64,
-          ),
+          previewCard,
+          const ThemeColorsBox(),
        ],
      ),
    );
@@ -61,30 +60,125 @@ class ThemeFragment extends StatelessWidget {
 class ItemCard extends StatelessWidget {
  final Widget child;
  final Info info;
-  final List<Widget> actions;

  const ItemCard({
    super.key,
    required this.info,
    required this.child,
-    this.actions = const [],
  });

  @override
  Widget build(BuildContext context) {
-    return Wrap(
-      runSpacing: 16,
+    return Padding(
+      padding: const EdgeInsets.only(
+        top: 16,
+      ),
+      child: Wrap(
+        runSpacing: 16,
+        children: [
+          InfoHeader(
+            info: info,
+          ),
+          child,
+        ],
+      ),
+    );
+  }
+}
+
+class ThemeColorsBox extends ConsumerStatefulWidget {
+  const ThemeColorsBox({super.key});
+
+  @override
+  ConsumerState<ThemeColorsBox> createState() => _ThemeColorsBoxState();
+}
+
+class _ThemeColorsBoxState extends ConsumerState<ThemeColorsBox> {
+  @override
+  Widget build(BuildContext context) {
+    return Column(
      children: [
-        InfoHeader(
-          info: info,
-          actions: actions,
+        // _FontFamilyItem(),
+        _ThemeModeItem(),
+        _PrimaryColorItem(),
+        _PrueBlackItem(),
+        const SizedBox(
+          height: 64,
        ),
-        child,
      ],
    );
  }
 }

+// class _FontFamilyItem extends ConsumerWidget {
+//   const _FontFamilyItem();
+//
+//   @override
+//   Widget build(BuildContext context, WidgetRef ref) {
+//     final fontFamily =
+//         ref.watch(themeSettingProvider.select((state) => state.fontFamily));
+//     List<FontFamilyItem> fontFamilyItems = [
+//       FontFamilyItem(
+//         label: appLocalizations.systemFont,
+//         fontFamily: FontFamily.system,
+//       ),
+//       const FontFamilyItem(
+//         label: "roboto",
+//         fontFamily: FontFamily.roboto,
+//       ),
+//     ];
+//     return ItemCard(
+//       info: Info(
+//         label: appLocalizations.fontFamily,
+//         iconData: Icons.text_fields,
+//       ),
+//       child: Container(
+//         margin: const EdgeInsets.only(
+//           left: 16,
+//           right: 16,
+//         ),
+//         height: 48,
+//         child: ListView.separated(
+//           scrollDirection: Axis.horizontal,
+//           itemBuilder: (_, index) {
+//             final fontFamilyItem = fontFamilyItems[index];
+//             return CommonCard(
+//               isSelected: fontFamilyItem.fontFamily == fontFamily,
+//               onPressed: () {
+//                 ref.read(themeSettingProvider.notifier).updateState(
+//                       (state) => state.copyWith(
+//                         fontFamily: fontFamilyItem.fontFamily,
+//                       ),
+//                     );
+//               },
+//               child: Padding(
+//                 padding: const EdgeInsets.symmetric(horizontal: 16),
+//                 child: Row(
+//                   mainAxisSize: MainAxisSize.min,
+//                   mainAxisAlignment: MainAxisAlignment.start,
+//                   children: [
+//                     Flexible(
+//                       child: Text(
+//                         fontFamilyItem.label,
+//                       ),
+//                     ),
+//                   ],
+//                 ),
+//               ),
+//             );
+//           },
+//           separatorBuilder: (_, __) {
+//             return const SizedBox(
+//               width: 16,
+//             );
+//           },
+//           itemCount: fontFamilyItems.length,
+//         ),
+//       ),
+//     );
+//   }
+// }
+
 class _ThemeModeItem extends ConsumerWidget {
  const _ThemeModeItem();

@@ -116,7 +210,7 @@ class _ThemeModeItem extends ConsumerWidget {
      ),
      child: Container(
        padding: const EdgeInsets.symmetric(horizontal: 16),
-        height: 56,
+        height: 64,
        child: ListView.separated(
          scrollDirection: Axis.horizontal,
          itemCount: themeModeItems.length,
@@ -164,272 +258,56 @@ class _ThemeModeItem extends ConsumerWidget {
  }
 }

-class _PrimaryColorItem extends ConsumerStatefulWidget {
+class _PrimaryColorItem extends ConsumerWidget {
  const _PrimaryColorItem();

  @override
-  ConsumerState<_PrimaryColorItem> createState() => _PrimaryColorItemState();
-}
-
-class _PrimaryColorItemState extends ConsumerState<_PrimaryColorItem> {
-  int? _removablePrimaryColor;
-
-  int _calcColumns(double maxWidth) {
-    return max((maxWidth / 96).ceil(), 3);
-  }
-
-  _handleReset() async {
-    final res = await globalState.showMessage(
-      message: TextSpan(
-        text: appLocalizations.resetTip,
+  Widget build(BuildContext context, WidgetRef ref) {
+    final primaryColor =
+        ref.watch(themeSettingProvider.select((state) => state.primaryColor));
+    List<Color?> primaryColors = [
+      null,
+      defaultPrimaryColor,
+      Colors.pinkAccent,
+      Colors.lightBlue,
+      Colors.greenAccent,
+      Colors.yellowAccent,
+      Colors.purple,
+    ];
+    return ItemCard(
+      info: Info(
+        label: appLocalizations.themeColor,
+        iconData: Icons.palette,
      ),
-    );
-    if (res != true) {
-      return;
-    }
-    ref.read(themeSettingProvider.notifier).updateState(
-      (state) {
-        return state.copyWith(
-          primaryColors: defaultPrimaryColors,
-          primaryColor: defaultPrimaryColor,
-          schemeVariant: DynamicSchemeVariant.tonalSpot,
-        );
-      },
-    );
-  }
-
-  _handleDel() async {
-    if (_removablePrimaryColor == null) {
-      return;
-    }
-    final res = await globalState.showMessage(
-        message: TextSpan(text: appLocalizations.deleteColorTip));
-    if (res != true) {
-      return;
-    }
-    ref.read(themeSettingProvider.notifier).updateState(
-      (state) {
-        final newPrimaryColors = List<int>.from(state.primaryColors)
-          ..remove(_removablePrimaryColor);
-        int? newPrimaryColor = state.primaryColor;
-        if (state.primaryColor == _removablePrimaryColor) {
-          if (newPrimaryColors.contains(defaultPrimaryColor)) {
-            newPrimaryColor = defaultPrimaryColor;
-          } else {
-            newPrimaryColor = null;
-          }
-        }
-        return state.copyWith(
-          primaryColors: newPrimaryColors,
-          primaryColor: newPrimaryColor,
-        );
-      },
-    );
-    setState(() {
-      _removablePrimaryColor = null;
-    });
-  }
-
-  _handleAdd() async {
-    final res = await globalState.showCommonDialog<int>(
-      child: _PaletteDialog(),
-    );
-    if (res == null) {
-      return;
-    }
-    final isExists = ref.read(
-      themeSettingProvider.select((state) => state.primaryColors.contains(res)),
-    );
-    if (isExists && mounted) {
-      context.showNotifier(appLocalizations.colorExists);
-      return;
-    }
-    ref.read(themeSettingProvider.notifier).updateState(
-      (state) {
-        return state.copyWith(
-          primaryColors: List.from(
-            state.primaryColors,
-          )..add(res),
-        );
-      },
-    );
-  }
-
-  _handleChangeSchemeVariant() async {
-    final schemeVariant = ref.read(
-      themeSettingProvider.select(
-        (state) => state.schemeVariant,
-      ),
-    );
-    final value = await globalState.showCommonDialog<DynamicSchemeVariant>(
-      child: OptionsDialog<DynamicSchemeVariant>(
-        title: appLocalizations.colorSchemes,
-        options: DynamicSchemeVariant.values,
-        textBuilder: (item) => Intl.message("${item.name}Scheme"),
-        value: schemeVariant,
-      ),
-    );
-    if (value == null) {
-      return;
-    }
-    ref.read(themeSettingProvider.notifier).updateState(
-      (state) {
-        return state.copyWith(
-          schemeVariant: value,
-        );
-      },
-    );
-  }
-
-  @override
-  Widget build(BuildContext context) {
-    final vm4 = ref.watch(
-      themeSettingProvider.select(
-        (state) => VM4(
-          a: state.primaryColor,
-          b: state.primaryColors,
-          c: state.schemeVariant,
-          d: state.primaryColor == defaultPrimaryColor &&
-              intListEquality.equals(state.primaryColors, defaultPrimaryColors),
+      child: Container(
+        margin: const EdgeInsets.only(
+          left: 16,
+          right: 16,
+          bottom: 16,
        ),
-      ),
-    );
-    final primaryColor = vm4.a;
-    final primaryColors = [null, ...vm4.b];
-    final schemeVariant = vm4.c;
-    final isEquals = vm4.d;
-
-    return CommonPopScope(
-      onPop: () {
-        if (_removablePrimaryColor != null) {
-          setState(() {
-            _removablePrimaryColor = null;
-          });
-          return false;
-        }
-        return true;
-      },
-      child: ItemCard(
-        info: Info(
-          label: appLocalizations.themeColor,
-          iconData: Icons.palette,
-        ),
-        actions: genActions(
-          [
-            if (_removablePrimaryColor == null)
-              FilledButton(
-                style: ButtonStyle(
-                  visualDensity: VisualDensity.compact,
-                ),
-                onPressed: _handleChangeSchemeVariant,
-                child: Text(Intl.message("${schemeVariant.name}Scheme")),
-              ),
-            if (_removablePrimaryColor != null)
-              FilledButton(
-                style: ButtonStyle(
-                  visualDensity: VisualDensity.compact,
-                ),
-                onPressed: () {
-                  setState(() {
-                    _removablePrimaryColor = null;
-                  });
-                },
-                child: Text(appLocalizations.cancel),
-              ),
-            if (_removablePrimaryColor == null && !isEquals)
-              IconButton.filledTonal(
-                iconSize: 20,
-                padding: EdgeInsets.all(4),
-                visualDensity: VisualDensity.compact,
-                onPressed: _handleReset,
-                icon: Icon(Icons.replay),
-              )
-          ],
-          space: 8,
-        ),
-        child: Container(
-          margin: const EdgeInsets.symmetric(
-            horizontal: 16,
-          ),
-          child: LayoutBuilder(
-            builder: (_, constraints) {
-              final columns = _calcColumns(constraints.maxWidth);
-              final itemWidth =
-                  (constraints.maxWidth - (columns - 1) * 16) / columns;
-              return Wrap(
-                spacing: 16,
-                runSpacing: 16,
-                children: [
-                  for (final color in primaryColors)
-                    Container(
-                      clipBehavior: Clip.none,
-                      width: itemWidth,
-                      height: itemWidth,
-                      child: Stack(
-                        alignment: Alignment.center,
-                        clipBehavior: Clip.none,
-                        children: [
-                          EffectGestureDetector(
-                            child: ColorSchemeBox(
-                              isSelected: color == primaryColor,
-                              primaryColor: color != null ? Color(color) : null,
-                              onPressed: () {
-                                setState(() {
-                                  _removablePrimaryColor = null;
-                                });
-                                ref
-                                    .read(themeSettingProvider.notifier)
-                                    .updateState(
-                                      (state) => state.copyWith(
-                                        primaryColor: color,
-                                      ),
-                                    );
-                              },
-                            ),
-                            onLongPress: () {
-                              setState(() {
-                                _removablePrimaryColor = color;
-                              });
-                            },
-                          ),
-                          if (_removablePrimaryColor != null &&
-                              _removablePrimaryColor == color)
-                            Container(
-                              color: Colors.white.opacity0,
-                              padding: EdgeInsets.all(8),
-                              child: IconButton.filledTonal(
-                                onPressed: _handleDel,
-                                padding: EdgeInsets.all(12),
-                                iconSize: 30,
-                                icon: Icon(
-                                  color: context.colorScheme.primary,
-                                  Icons.delete,
-                                ),
-                              ),
-                            ),
-                        ],
+        height: 88,
+        child: ListView.separated(
+          scrollDirection: Axis.horizontal,
+          itemBuilder: (_, index) {
+            final color = primaryColors[index];
+            return ColorSchemeBox(
+              isSelected: color?.toARGB32() == primaryColor,
+              primaryColor: color,
+              onPressed: () {
+                ref.read(themeSettingProvider.notifier).updateState(
+                      (state) => state.copyWith(
+                        primaryColor: color?.toARGB32(),
                      ),
-                    ),
-                  if (_removablePrimaryColor == null)
-                    Container(
-                      width: itemWidth,
-                      height: itemWidth,
-                      padding: EdgeInsets.all(
-                        4,
-                      ),
-                      child: IconButton.filledTonal(
-                        onPressed: _handleAdd,
-                        iconSize: 32,
-                        icon: Icon(
-                          color: context.colorScheme.primary,
-                          Icons.add,
-                        ),
-                      ),
-                    )
-                ],
-              );
-            },
-          ),
+                    );
+              },
+            );
+          },
+          separatorBuilder: (_, __) {
+            return const SizedBox(
+              width: 16,
+            );
+          },
+          itemCount: primaryColors.length,
        ),
      ),
    );
@@ -441,289 +319,27 @@ class _PrueBlackItem extends ConsumerWidget {

  @override
  Widget build(BuildContext context, WidgetRef ref) {
-    final prueBlack = ref.watch(
-      themeSettingProvider.select(
-        (state) => state.pureBlack,
-      ),
-    );
-    return ListItem.switchItem(
-      leading: Icon(
-        Icons.contrast,
-      ),
-      horizontalTitleGap: 12,
-      title: Text(
-        appLocalizations.pureBlackMode,
-        style: Theme.of(context).textTheme.titleSmall?.copyWith(
-              color: context.colorScheme.onSurfaceVariant,
-            ),
-      ),
-      delegate: SwitchDelegate(
-        value: prueBlack,
-        onChanged: (value) {
-          ref.read(themeSettingProvider.notifier).updateState(
-                (state) => state.copyWith(
-                  pureBlack: value,
-                ),
-              );
-        },
-      ),
-    );
-  }
-}
-
-class _TextScaleFactorItem extends ConsumerWidget {
-  const _TextScaleFactorItem();
-
-  @override
-  Widget build(BuildContext context, WidgetRef ref) {
-    final textScale = ref.watch(
-      themeSettingProvider.select(
-        (state) => state.textScale,
-      ),
-    );
-    final String process = "${((textScale.scale * 100) as double).round()}%";
-    return Column(
-      crossAxisAlignment: CrossAxisAlignment.start,
-      children: [
-        Padding(
-          padding: EdgeInsets.only(bottom: 8),
-          child: ListItem.switchItem(
-            leading: Icon(
-              Icons.text_fields,
-            ),
-            horizontalTitleGap: 12,
-            title: Text(
-              appLocalizations.textScale,
-              style: Theme.of(context).textTheme.titleSmall?.copyWith(
-                    color: context.colorScheme.onSurfaceVariant,
-                  ),
-            ),
-            delegate: SwitchDelegate(
-              value: textScale.enable,
-              onChanged: (value) {
-                ref.read(themeSettingProvider.notifier).updateState(
-                      (state) => state.copyWith.textScale(
-                        enable: value,
-                      ),
-                    );
-              },
-            ),
-          ),
+    final prueBlack =
+        ref.watch(themeSettingProvider.select((state) => state.pureBlack));
+    return Padding(
+      padding: const EdgeInsets.symmetric(vertical: 16),
+      child: ListItem.switchItem(
+        leading: Icon(
+          Icons.contrast,
+          color: context.colorScheme.primary,
        ),
-        Padding(
-          padding: EdgeInsets.symmetric(horizontal: 16),
-          child: Row(
-            mainAxisAlignment: MainAxisAlignment.spaceBetween,
-            mainAxisSize: MainAxisSize.max,
-            spacing: 32,
-            children: [
-              Expanded(
-                child: DisabledMask(
-                  status: !textScale.enable,
-                  child: ActivateBox(
-                    active: textScale.enable,
-                    child: SliderTheme(
-                      data: _SliderDefaultsM3(context),
-                      child: Slider(
-                        padding: EdgeInsets.zero,
-                        min: minTextScale,
-                        max: maxTextScale,
-                        value: textScale.scale,
-                        onChanged: (value) {
-                          ref.read(themeSettingProvider.notifier).updateState(
-                                (state) => state.copyWith.textScale(
-                                  scale: value,
-                                ),
-                              );
-                        },
-                      ),
-                    ),
+        title: Text(appLocalizations.pureBlackMode),
+        delegate: SwitchDelegate(
+          value: prueBlack,
+          onChanged: (value) {
+            ref.read(themeSettingProvider.notifier).updateState(
+                  (state) => state.copyWith(
+                    pureBlack: value,
                  ),
-                ),
-              ),
-              Padding(
-                padding: EdgeInsets.only(right: 4),
-                child: Text(
-                  process,
-                  style: context.textTheme.titleMedium,
-                ),
-              ),
-            ],
-          ),
-        ),
-      ],
-    );
-  }
-}
-
-class _PaletteDialog extends StatefulWidget {
-  const _PaletteDialog();
-
-  @override
-  State<_PaletteDialog> createState() => _PaletteDialogState();
-}
-
-class _PaletteDialogState extends State<_PaletteDialog> {
-  final _controller = ValueNotifier<ui.Color>(Colors.transparent);
-
-  @override
-  Widget build(BuildContext context) {
-    return CommonDialog(
-      title: appLocalizations.palette,
-      actions: [
-        TextButton(
-          onPressed: () {
-            Navigator.of(context).pop();
+                );
          },
-          child: Text(appLocalizations.cancel),
        ),
-        TextButton(
-          onPressed: () {
-            Navigator.of(context).pop(_controller.value.toARGB32());
-          },
-          child: Text(appLocalizations.confirm),
-        ),
-      ],
-      child: Column(
-        children: [
-          SizedBox(
-            height: 8,
-          ),
-          SizedBox(
-            width: 250,
-            height: 250,
-            child: Palette(
-              controller: _controller,
-            ),
-          ),
-          SizedBox(
-            height: 24,
-          ),
-          ValueListenableBuilder(
-            valueListenable: _controller,
-            builder: (_, color, __) {
-              return PrimaryColorBox(
-                primaryColor: color,
-                child: FilledButton(
-                  onPressed: () {},
-                  child: Text(
-                    _controller.value.hex,
-                  ),
-                ),
-              );
-            },
-          ),
-        ],
      ),
    );
  }
 }
-
-class _SliderDefaultsM3 extends SliderThemeData {
-  _SliderDefaultsM3(this.context) : super(trackHeight: 16.0);
-
-  final BuildContext context;
-  late final ColorScheme _colors = Theme.of(context).colorScheme;
-
-  @override
-  Color? get activeTrackColor => _colors.primary;
-
-  @override
-  Color? get inactiveTrackColor => _colors.secondaryContainer;
-
-  @override
-  Color? get secondaryActiveTrackColor => _colors.primary.withOpacity(0.54);
-
-  @override
-  Color? get disabledActiveTrackColor => _colors.onSurface.withOpacity(0.38);
-
-  @override
-  Color? get disabledInactiveTrackColor => _colors.onSurface.withOpacity(0.12);
-
-  @override
-  Color? get disabledSecondaryActiveTrackColor =>
-      _colors.onSurface.withOpacity(0.38);
-
-  @override
-  Color? get activeTickMarkColor => _colors.onPrimary.withOpacity(1.0);
-
-  @override
-  Color? get inactiveTickMarkColor =>
-      _colors.onSecondaryContainer.withOpacity(1.0);
-
-  @override
-  Color? get disabledActiveTickMarkColor => _colors.onInverseSurface;
-
-  @override
-  Color? get disabledInactiveTickMarkColor => _colors.onSurface;
-
-  @override
-  Color? get thumbColor => _colors.primary;
-
-  @override
-  Color? get disabledThumbColor => _colors.onSurface.withOpacity(0.38);
-
-  @override
-  Color? get overlayColor =>
-      WidgetStateColor.resolveWith((Set<WidgetState> states) {
-        if (states.contains(WidgetState.dragged)) {
-          return _colors.primary.withOpacity(0.1);
-        }
-        if (states.contains(WidgetState.hovered)) {
-          return _colors.primary.withOpacity(0.08);
-        }
-        if (states.contains(WidgetState.focused)) {
-          return _colors.primary.withOpacity(0.1);
-        }
-
-        return Colors.transparent;
-      });
-
-  @override
-  TextStyle? get valueIndicatorTextStyle =>
-      Theme.of(context).textTheme.labelLarge!.copyWith(
-            color: _colors.onInverseSurface,
-          );
-
-  @override
-  Color? get valueIndicatorColor => _colors.inverseSurface;
-
-  @override
-  SliderComponentShape? get valueIndicatorShape =>
-      const RoundedRectSliderValueIndicatorShape();
-
-  @override
-  SliderComponentShape? get thumbShape => const HandleThumbShape();
-
-  @override
-  SliderTrackShape? get trackShape => const GappedSliderTrackShape();
-
-  @override
-  SliderComponentShape? get overlayShape => const RoundSliderOverlayShape();
-
-  @override
-  SliderTickMarkShape? get tickMarkShape =>
-      const RoundSliderTickMarkShape(tickMarkRadius: 4.0 / 2);
-
-  @override
-  WidgetStateProperty<Size?>? get thumbSize {
-    return WidgetStateProperty.resolveWith((Set<WidgetState> states) {
-      if (states.contains(WidgetState.disabled)) {
-        return const Size(4.0, 44.0);
-      }
-      if (states.contains(WidgetState.hovered)) {
-        return const Size(4.0, 44.0);
-      }
-      if (states.contains(WidgetState.focused)) {
-        return const Size(2.0, 44.0);
-      }
-      if (states.contains(WidgetState.pressed)) {
-        return const Size(2.0, 44.0);
-      }
-      return const Size(4.0, 44.0);
-    });
-  }
-
-  @override
-  double? get trackGap => 6.0;
-}
--- a/lib/fragments/tools.dart
+++ b/lib/fragments/tools.dart
@@ -14,7 +14,6 @@ import 'package:flutter/material.dart';
 import 'package:flutter_riverpod/flutter_riverpod.dart';
 import 'package:intl/intl.dart';
 import 'backup_and_recovery.dart';
-import 'developer.dart';
 import 'theme.dart';
 import 'package:path/path.dart' show dirname, join;

@@ -55,12 +54,11 @@ class _ToolboxFragmentState extends ConsumerState<ToolsFragment> {
    );
  }

-  List<Widget> _getOtherList(bool enableDeveloperMode) {
+  List<Widget> _getOtherList() {
    return generateSection(
      title: appLocalizations.other,
      items: [
        _DisclaimerItem(),
-        if (enableDeveloperMode) _DeveloperItem(),
        _InfoItem(),
      ],
    );
@@ -84,11 +82,7 @@ class _ToolboxFragmentState extends ConsumerState<ToolsFragment> {

  @override
  Widget build(BuildContext context) {
-    final vm2 = ref.watch(
-      appSettingProvider.select(
-        (state) => VM2(a: state.locale, b: state.developerMode),
-      ),
-    );
+    ref.watch(appSettingProvider.select((state) => state.locale));
    final items = [
      Consumer(
        builder: (_, ref, __) {
@@ -105,7 +99,7 @@ class _ToolboxFragmentState extends ConsumerState<ToolsFragment> {
        },
      ),
      ..._getSettingList(),
-      ..._getOtherList(vm2.b),
+      ..._getOtherList(),
    ];
    return ListView.builder(
      itemCount: items.length,
@@ -128,7 +122,7 @@ class _LocaleItem extends ConsumerWidget {
    final locale =
        ref.watch(appSettingProvider.select((state) => state.locale));
    final subTitle = locale ?? appLocalizations.defaultText;
-    final currentLocale = utils.getLocaleForString(locale);
+    final currentLocale = other.getLocaleForString(locale);
    return ListItem<Locale?>.options(
      leading: const Icon(Icons.language_outlined),
      title: Text(appLocalizations.language),
@@ -303,19 +297,3 @@ class _InfoItem extends StatelessWidget {
    );
  }
 }
-
-class _DeveloperItem extends StatelessWidget {
-  const _DeveloperItem();
-
-  @override
-  Widget build(BuildContext context) {
-    return ListItem.open(
-      leading: const Icon(Icons.developer_board),
-      title: Text(appLocalizations.developerMode),
-      delegate: OpenDelegate(
-        title: appLocalizations.developerMode,
-        widget: const DeveloperView(),
-      ),
-    );
-  }
-}
--- a/lib/l10n/arb/intl_en.arb
+++ b/lib/l10n/arb/intl_en.arb
@@ -372,33 +372,5 @@
  "generalDesc": "Modify general settings",
  "findProcessModeDesc": "There is a certain performance loss after opening",
  "tabAnimationDesc": "Effective only in mobile view",
-  "saveTip": "Are you sure you want to save?",
-  "deleteColorTip": "Are you sure you want to delete the current color?",
-  "colorExists": "Current color already exists",
-  "colorSchemes": "Color schemes",
-  "palette": "Palette",
-  "tonalSpotScheme": "TonalSpot",
-  "fidelityScheme": "Fidelity",
-  "monochromeScheme": "Monochrome",
-  "neutralScheme": "Neutral",
-  "vibrantScheme": "Vibrant",
-  "expressiveScheme": "Expressive",
-  "contentScheme": "Content",
-  "rainbowScheme": "Rainbow",
-  "fruitSaladScheme": "FruitSalad",
-  "developerMode": "Developer mode",
-  "developerModeEnableTip": "Developer mode is enabled.",
-  "messageTest": "Message test",
-  "messageTestTip": "This is a message.",
-  "crashTest": "Crash test",
-  "clearData": "Clear Data",
-  "textScale": "Text Scaling",
-  "internet": "Internet",
-  "systemApp": "System APP",
-  "noNetworkApp": "No network APP",
-  "contactMe": "Contact me",
-  "recoveryStrategy": "Recovery strategy",
-  "recoveryStrategy_override": "Override",
-  "recoveryStrategy_compatible": "Compatible",
-  "logsTest": "Logs test"
+  "saveTip": "Are you sure you want to save?"
 }
--- a/lib/l10n/arb/intl_ja.arb
+++ b/lib/l10n/arb/intl_ja.arb
@@ -372,34 +372,5 @@
  "generalDesc": "一般設定を変更",
  "findProcessModeDesc": "有効化するとパフォーマンスが若干低下します",
  "tabAnimationDesc": "モバイル表示でのみ有効",
-  "saveTip": "保存してもよろしいですか？",
-  "deleteColorTip": "現在の色を削除しますか？",
-  "colorExists": "この色は既に存在します",
-  "colorSchemes": "カラースキーム",
-  "palette": "パレット",
-  "tonalSpotScheme": "トーンスポット",
-  "fidelityScheme": "ハイファイデリティー",
-  "monochromeScheme": "モノクローム",
-  "neutralScheme": "ニュートラル",
-  "vibrantScheme": "ビブラント",
-  "expressiveScheme": "エクスプレッシブ",
-  "contentScheme": "コンテンツテーマ",
-  "rainbowScheme": "レインボー",
-  "fruitSaladScheme": "フルーツサラダ",
-  "developerMode": "デベロッパーモード",
-  "developerModeEnableTip": "デベロッパーモードが有効になりました。",
-  "messageTest": "メッセージテスト",
-  "messageTestTip": "これはメッセージです。",
-  "crashTest": "クラッシュテスト",
-  "clearData": "データを消去",
-  "zoom": "ズーム",
-  "textScale": "テキストスケーリング",
-  "internet": "インターネット",
-  "systemApp": "システムアプリ",
-  "noNetworkApp": "ネットワークなしアプリ",
-  "contactMe": "連絡する",
-  "recoveryStrategy": "リカバリー戦略",
-  "recoveryStrategy_override": "オーバーライド",
-  "recoveryStrategy_compatible": "互換性",
-  "logsTest": "ログテスト"
+  "saveTip": "保存してもよろしいですか？"
 }
--- a/lib/l10n/arb/intl_ru.arb
+++ b/lib/l10n/arb/intl_ru.arb
@@ -372,34 +372,5 @@
  "generalDesc": "Изменение общих настроек",
  "findProcessModeDesc": "При включении возможны небольшие потери производительности",
  "tabAnimationDesc": "Действительно только в мобильном виде",
-  "saveTip": "Вы уверены, что хотите сохранить?",
-  "deleteColorTip": "Удалить текущий цвет?",
-  "colorExists": "Этот цвет уже существует",
-  "colorSchemes": "Цветовые схемы",
-  "palette": "Палитра",
-  "tonalSpotScheme": "Тональный акцент",
-  "fidelityScheme": "Точная передача",
-  "monochromeScheme": "Монохром",
-  "neutralScheme": "Нейтральные",
-  "vibrantScheme": "Яркие",
-  "expressiveScheme": "Экспрессивные",
-  "contentScheme": "Контентная тема",
-  "rainbowScheme": "Радужные",
-  "fruitSaladScheme": "Фруктовый микс",
-  "developerMode": "Режим разработчика",
-  "developerModeEnableTip": "Режим разработчика активирован.",
-  "messageTest": "Тестирование сообщения",
-  "messageTestTip": "Это сообщение.",
-  "crashTest": "Тест на сбои",
-  "clearData": "Очистить данные",
-  "zoom": "Масштаб",
-  "textScale": "Масштабирование текста",
-  "internet": "Интернет",
-  "systemApp": "Системное приложение",
-  "noNetworkApp": "Приложение без сети",
-  "contactMe": "Свяжитесь со мной",
-  "recoveryStrategy": "Стратегия восстановления",
-  "recoveryStrategy_override": "Переопределение",
-  "recoveryStrategy_compatible": "Совместимый",
-  "logsTest": "Тест журналов"
+  "saveTip": "Вы уверены, что хотите сохранить?"
 }
--- a/lib/l10n/arb/intl_zh_CN.arb
+++ b/lib/l10n/arb/intl_zh_CN.arb
@@ -372,34 +372,5 @@
  "generalDesc": "修改通用设置",
  "findProcessModeDesc": "开启后会有一定性能损耗",
  "tabAnimationDesc": "仅在移动视图中有效",
-  "saveTip": "确定要保存吗？",
-  "deleteColorTip": "确定删除当前颜色吗？",
-  "colorExists": "该颜色已存在",
-  "colorSchemes": "配色方案",
-  "palette": "调色板",
-  "tonalSpotScheme": "调性点缀",
-  "fidelityScheme": "高保真",
-  "monochromeScheme": "单色",
-  "neutralScheme": "中性",
-  "vibrantScheme": "活力",
-  "expressiveScheme": "表现力",
-  "contentScheme": "内容主题",
-  "rainbowScheme": "彩虹",
-  "fruitSaladScheme": "果缤纷",
-  "developerMode": "开发者模式",
-  "developerModeEnableTip": "开发者模式已启用。",
-  "messageTest": "消息测试",
-  "messageTestTip": "这是一条消息。",
-  "crashTest": "崩溃测试",
-  "clearData": "清除数据",
-  "zoom": "缩放",
-  "textScale": "文本缩放",
-  "internet": "互联网",
-  "systemApp": "系统应用",
-  "noNetworkApp": "无网络应用",
-  "contactMe": "联系我",
-  "recoveryStrategy": "恢复策略",
-  "recoveryStrategy_override": "覆盖",
-  "recoveryStrategy_compatible": "兼容",
-  "logsTest": "日志测试"
+  "saveTip": "确定要保存吗？"
 }
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
chen08209	c2f3b13deb	Update ndk version	2025-04-15 16:52:52 +08:00
chen08209	edc4714488	cache	2025-04-15 16:39:20 +08:00
chen08209	aec325a19a	Optimize android vpn performance Optimize more details	2025-04-15 15:54:36 +08:00