Support custom text scaling

Optimize the display of different text scale

Optimize windows setup experience

.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

CHANGELOG.md

@@ -1,43 +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

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

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

android/app/build.gradle

@@ -73,9 +73,6 @@ android {
             applicationIdSuffix '.debug'
         }
         release {
-            minifyEnabled true
-            debuggable false
-            
             if (isRelease) {
                 signingConfig signingConfigs.release
             } else {

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
 
@@ -37,15 +33,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) ?: ""
     }

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

@@ -17,7 +17,6 @@ class MainActivity : FlutterActivity() {
 
     override fun onDestroy() {
         GlobalState.flutterEngine = null
-        GlobalState.runState.value = RunState.STOP
         super.onDestroy()
     }
 }

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()
     }

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

@@ -200,13 +200,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 +248,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()
         }
     }

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)
     }

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

@@ -1,6 +1,7 @@
 package com.follow.clash.services
 
 import android.annotation.SuppressLint
+import android.app.PendingIntent
 import android.content.Intent
 import android.net.ProxyInfo
 import android.net.VpnService
@@ -33,10 +34,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 +50,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)

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,17 +37,13 @@ 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") {
@@ -62,4 +58,8 @@ afterEvaluate {
     tasks.named("preBuild") {
         dependsOn(copyNativeLibs)
     }
+}
+
+dependencies {
+    implementation("androidx.core:core-ktx:1.16.0")
 }

android/core/src/main/cpp/CMakeLists.txt

@@ -4,8 +4,6 @@ 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,8 +21,6 @@ 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")

android/core/src/main/cpp/core.cpp

@@ -1,18 +1,21 @@
+#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,50 @@ 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
+#endif

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();
     }
 }

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)

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

arb/intl_en.arb

@@ -395,10 +395,5 @@
   "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"
+  "noNetworkApp": "No network App"
 }

arb/intl_ja.arb

@@ -396,10 +396,5 @@
   "textScale": "テキストスケーリング",
   "internet": "インターネット",
   "systemApp": "システムアプリ",
-  "noNetworkApp": "ネットワークなしアプリ",
-  "contactMe": "連絡する",
-  "recoveryStrategy": "リカバリー戦略",
-  "recoveryStrategy_override": "オーバーライド",
-  "recoveryStrategy_compatible": "互換性",
-  "logsTest": "ログテスト"
+  "noNetworkApp": "ネットワークなしアプリ"
 }

arb/intl_ru.arb

@@ -396,10 +396,5 @@
   "textScale": "Масштабирование текста",
   "internet": "Интернет",
   "systemApp": "Системное приложение",
-  "noNetworkApp": "Приложение без сети",
-  "contactMe": "Свяжитесь со мной",
-  "recoveryStrategy": "Стратегия восстановления",
-  "recoveryStrategy_override": "Переопределение",
-  "recoveryStrategy_compatible": "Совместимый",
-  "logsTest": "Тест журналов"
+  "noNetworkApp": "Приложение без сети"
 }

arb/intl_zh_CN.arb

@@ -396,10 +396,5 @@
   "textScale": "文本缩放",
   "internet": "互联网",
   "systemApp": "系统应用",
-  "noNetworkApp": "无网络应用",
-  "contactMe": "联系我",
-  "recoveryStrategy": "恢复策略",
-  "recoveryStrategy_override": "覆盖",
-  "recoveryStrategy_compatible": "兼容",
-  "logsTest": "日志测试"
+  "noNetworkApp": "无网络应用"
 }

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))

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 ""
 	}

core/common.go

@@ -237,7 +237,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 +361,10 @@ func applyConfig(rawConfig *config.RawConfig) error {
 	}
 	if configParams.IsPatch {
 		patchConfig()
-		updateListeners(false)
 	} else {
 		hub.ApplyConfig(currentConfig)
 		patchSelectGroup()
-		updateListeners(true)
 	}
+	updateListeners(false)
 	return err
 }

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"

core/go.mod

@@ -6,13 +6,13 @@ replace github.com/metacubex/mihomo => ./Clash.Meta
 
 require (
 	github.com/metacubex/mihomo v0.0.0-00010101000000-000000000000
-	github.com/samber/lo v1.50.0
+	github.com/samber/lo v1.49.1
 	golang.org/x/sync v0.11.0
 )
 
 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 +21,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 +36,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
@@ -54,24 +54,19 @@ require (
 	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/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/sing-quic v0.0.0-20250404030904-b2cc8aab562c // indirect
+	github.com/metacubex/sing-shadowsocks v0.2.8 // indirect
+	github.com/metacubex/sing-shadowsocks2 v0.2.2 // indirect
+	github.com/metacubex/sing-shadowtls v0.0.0-20250412122235-0e9005731a63 // indirect
+	github.com/metacubex/sing-tun v0.4.6-0.20250412144348-c426cb167db5 // 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.7.0-alpha.1 // 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 +78,14 @@ 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/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

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=
@@ -103,43 +103,32 @@ github.com/metacubex/bbolt v0.0.0-20240822011022-aed6d4850399 h1:oBowHVKZycNtAFb
 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/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/sing-quic v0.0.0-20250404030904-b2cc8aab562c h1:OB3WmMA8YPJjE36RjD9X8xlrWGJ4orxbf2R/KAE28b0=
+github.com/metacubex/sing-quic v0.0.0-20250404030904-b2cc8aab562c/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-shadowtls v0.0.0-20250412122235-0e9005731a63 h1:vy/8ZYYtWUXYnOnw/NF8ThG1W/RqM/h5rkun+OXZMH0=
+github.com/metacubex/sing-shadowtls v0.0.0-20250412122235-0e9005731a63/go.mod h1:eDZ2JpkSkewGmUlCoLSn2MRFn1D0jKPIys/6aogFx7U=
+github.com/metacubex/sing-tun v0.4.6-0.20250412144348-c426cb167db5 h1:hcsz5e5lqhBxn3iQQDIF60FLZ8PQT542GTQZ+1wcIGo=
+github.com/metacubex/sing-tun v0.4.6-0.20250412144348-c426cb167db5/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.7.0-alpha.1 h1:oMFsPh2oTlALJ7vKXPJuqgy0YeiZ+q/LLw+ZdxZ80l4=
+github.com/metacubex/utls v1.7.0-alpha.1/go.mod h1:oknYT0qTOwE4hjPmZOEpzVdefnW7bAdGLvZcqmk4TLU=
 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,25 @@ 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/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 +189,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 +251,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=

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
 }
 

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

lib/application.dart

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

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();

lib/clash/interface.dart

@@ -66,8 +66,6 @@ mixin ClashInterface {
 
   FutureOr<bool> closeConnections();
 
-  FutureOr<bool> resetConnections();
-
   FutureOr<String> getProfile(String id);
 
   Future<bool> setState(CoreState state);
@@ -247,6 +245,7 @@ abstract class ClashHandlerInterface with ClashInterface {
     );
   }
 
+
   @override
   Future<bool> crash() {
     return invoke<bool>(
@@ -330,13 +329,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>(

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;

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,

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 'utils.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';

lib/common/constant.dart

@@ -16,15 +16,13 @@ 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;
+const helperTag = "2024125";
 final baseInfoEdgeInsets = EdgeInsets.symmetric(
   vertical: 16.ap,
   horizontal: 16.ap,
 );
 
-final defaultTextScaleFactor =
-    WidgetsBinding.instance.platformDispatcher.textScaleFactor;
+final defaultTextScaleFactor = WidgetsBinding.instance.platformDispatcher.textScaleFactor;
 const httpTimeoutDuration = Duration(milliseconds: 5000);
 const moreDuration = Duration(milliseconds: 100);
 const animateDuration = Duration(milliseconds: 100);
@@ -77,28 +75,22 @@ 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 = 0xFF795548;
 
 double getWidgetHeight(num lines) {
   return max(lines * 84 + (lines - 1) * 16, 0).ap;
 }
 
-const maxLength = 150;
-
 final mainIsolate = "FlClashMainIsolate";
 
 final serviceIsolate = "FlClashServiceIsolate";
 
 const defaultPrimaryColors = [
-  0xFF795548,
+  defaultPrimaryColor,
   0xFF03A9F4,
   0xFFFFFF00,
   0XFFBBC9CC,
   0XFFABD397,
-  defaultPrimaryColor,
+  0XFFD8C0C3,
   0XFF665390,
 ];

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);
-}

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),

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];
   }

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();

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);
+  }
+}

lib/common/measure.dart

@@ -32,9 +32,9 @@ class Measure {
   }
 
   double get bodyMediumHeight {
-    return _measureMap.updateCacheValue(
+    return _measureMap.getCacheValue(
       "bodyMediumHeight",
-      () => computeTextSize(
+      computeTextSize(
         Text(
           "X",
           style: context.textTheme.bodyMedium,
@@ -43,22 +43,10 @@ class Measure {
     );
   }
 
-  double get bodyLargeHeight {
-    return _measureMap.updateCacheValue(
-      "bodyLargeHeight",
-      () => computeTextSize(
-        Text(
-          "X",
-          style: context.textTheme.bodyLarge,
-        ),
-      ).height,
-    );
-  }
-
   double get bodySmallHeight {
-    return _measureMap.updateCacheValue(
+    return _measureMap.getCacheValue(
       "bodySmallHeight",
-      () => computeTextSize(
+      computeTextSize(
         Text(
           "X",
           style: context.textTheme.bodySmall,
@@ -68,9 +56,9 @@ class Measure {
   }
 
   double get labelSmallHeight {
-    return _measureMap.updateCacheValue(
+    return _measureMap.getCacheValue(
       "labelSmallHeight",
-      () => computeTextSize(
+      computeTextSize(
         Text(
           "X",
           style: context.textTheme.labelSmall,
@@ -80,9 +68,9 @@ class Measure {
   }
 
   double get labelMediumHeight {
-    return _measureMap.updateCacheValue(
+    return _measureMap.getCacheValue(
       "labelMediumHeight",
-      () => computeTextSize(
+      computeTextSize(
         Text(
           "X",
           style: context.textTheme.labelMedium,
@@ -92,9 +80,9 @@ class Measure {
   }
 
   double get titleLargeHeight {
-    return _measureMap.updateCacheValue(
+    return _measureMap.getCacheValue(
       "titleLargeHeight",
-      () => computeTextSize(
+      computeTextSize(
         Text(
           "X",
           style: context.textTheme.titleLarge,
@@ -104,9 +92,9 @@ class Measure {
   }
 
   double get titleMediumHeight {
-    return _measureMap.updateCacheValue(
+    return _measureMap.getCacheValue(
       "titleMediumHeight",
-      () => computeTextSize(
+      computeTextSize(
         Text(
           "X",
           style: context.textTheme.titleMedium,

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,

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);
   }

lib/common/print.dart

@@ -15,7 +15,7 @@ class CommonPrint {
   log(String? text) {
     final payload = "[FlClash] $text";
     debugPrint(payload);
-    if (!globalState.isInit) {
+    if (globalState.isService) {
       return;
     }
     globalState.appController.addLog(

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();
   }
 

lib/common/request.dart

@@ -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;
     }

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? {

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",

lib/common/theme.dart

@@ -12,35 +12,32 @@ class CommonTheme {
   ) : _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),
     );
   }
 }

lib/common/utils.dart

@@ -5,9 +5,7 @@ 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 {
   Color? getDelayColor(int? delay) {
@@ -232,7 +230,7 @@ class Utils {
   }
 
   int getProfilesColumns(double viewWidth) {
-    return max((viewWidth / 320).floor(), 1);
+    return max((viewWidth / 350).floor(), 1);
   }
 
   final _indexPrimary = [
@@ -325,40 +323,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();

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,
@@ -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) {
@@ -380,15 +377,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,20 +393,12 @@ 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();
@@ -501,18 +487,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 +511,6 @@ class AppController {
     } else {
       window?.hide();
     }
-    await _handlePreference();
-    await _handlerDisclaimer();
     _ref.read(initProvider.notifier).value = true;
   }
 
@@ -705,16 +688,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 +721,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 +752,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);
   }
@@ -970,18 +940,14 @@ 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,
-            );
-      }
+    final oldProfiles = List.from(globalState.config.profiles);
+    _ref.read(profilesProvider.notifier).value = profiles;
+    for (final profile in oldProfiles) {
+      _ref.read(profilesProvider.notifier).setProfile(
+            profile,
+            force: false,
+          );
     }
     final onlyProfiles = recoveryOption == RecoveryOption.onlyProfiles;
     if (!onlyProfiles) {

lib/enum/enum.dart

@@ -256,7 +256,6 @@ enum ActionMethod {
   asyncTestDelay,
   getConnections,
   closeConnections,
-  resetConnections,
   closeConnection,
   getExternalProviders,
   getExternalProvider,
@@ -292,9 +291,8 @@ enum WindowsHelperServiceStatus {
   running,
 }
 
-enum FunctionTag {
+enum DebounceTag {
   updateClashConfig,
-  updateStatus,
   updateGroups,
   addCheckIpNum,
   applyProfile,
@@ -309,8 +307,6 @@ enum FunctionTag {
   updatePageIndex,
   pageChange,
   proxiesTabChange,
-  logs,
-  requests,
 }
 
 enum DashboardWidget {
@@ -474,14 +470,3 @@ enum RuleTarget {
   DIRECT,
   REJECT,
 }
-
-enum RecoveryStrategy {
-  compatible,
-  override,
-}
-
-enum CacheTag {
-  logs,
-  rules,
-  requests,
-}

lib/fragments/about.dart

@@ -47,15 +47,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: () {
@@ -202,7 +193,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(

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
@@ -313,42 +319,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);
+                                },
                               );
-                      }),
-                )
+                            },
+                          ),
+                        ),
+                ),
               ],
             ),
           ),

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});
@@ -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}"),
-              ),
-            ),
-          );
-        }),
       ],
     );
   }

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(

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,

lib/fragments/connection/requests.dart

@@ -20,13 +20,12 @@ 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;
+  final _cacheKey = ValueKey("requests_list");
   late ScrollController _scrollController;
-  bool _isLoad = false;
 
   double _currentMaxWidth = 0;
 
@@ -46,13 +45,12 @@ class _RequestsFragmentState extends ConsumerState<RequestsFragment>
   @override
   void initState() {
     super.initState();
-    final preOffset = globalState.cacheScrollPosition[_tag] ?? -1;
+    final preOffset = globalState.cacheScrollPosition[_cacheKey] ?? -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(
@@ -99,7 +97,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 +116,7 @@ class _RequestsFragmentState extends ConsumerState<RequestsFragment>
   }
 
   updateRequestsThrottler() {
-    throttler.call(FunctionTag.requests, () {
+    throttler.call("request", () {
       final isEquality = connectionListEquality.equals(
         _requests,
         _requestsStateNotifier.value.connections,
@@ -120,51 +125,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,14 +145,13 @@ 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(
@@ -208,56 +174,51 @@ class _RequestsFragmentState extends ConsumerState<RequestsFragment>
                       ),
                     )
                     .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,
+                return Align(
+                  alignment: Alignment.topCenter,
+                  child: ScrollToEndBox(
+                    controller: _scrollController,
+                    cacheKey: _cacheKey,
+                    dataSource: connections,
+                    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;
+                        },
+                      ),
+                    ),
+                  ),
                 );
               },
             ),
             onNotification: (_) {
-              globalState.cacheHeightMap[_tag]?.clear();
+              _key.currentState?.clearCache();
             },
           ),
         );

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,
                     );

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;

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,102 @@ 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(
+                    utils.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: context.textTheme.titleMedium?.toSoftBold,
                   ),
-                ),
-                SizedBox(
-                  width: textWidth * _animation.value,
-                  child: child!,
                 )
-              ],
+                .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 = utils.getTimeText(runTime);
+          return Text(
+            text,
+            style: Theme.of(context).textTheme.titleMedium?.toSoftBold.copyWith(
+              color: context.colorScheme.onPrimaryContainer
             ),
           );
         },
-        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,
-                      ),
-            );
-          },
-        ),
       ),
     );
   }

lib/fragments/developer.dart

@@ -1,23 +1,21 @@
 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) {
+  Widget _getDeveloperList(BuildContext context) {
     return generateSectionV2(
       title: appLocalizations.options,
       items: [
         ListItem(
+          leading: Icon(Icons.ac_unit),
           title: Text(appLocalizations.messageTest),
           onTap: () {
             context.showNotifier(
@@ -26,46 +24,14 @@ class DeveloperView extends ConsumerWidget {
           },
         ),
         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(
+          leading: Icon(Icons.heart_broken),
           title: Text(appLocalizations.crashTest),
           onTap: () {
             clashCore.clashInterface.crash();
           },
         ),
         ListItem(
+          leading: Icon(Icons.delete_forever),
           title: Text(appLocalizations.clearData),
           onTap: () async {
             await globalState.appController.handleClear();
@@ -93,6 +59,8 @@ class DeveloperView extends ConsumerWidget {
               padding: const EdgeInsets.only(
                 left: 16,
                 right: 16,
+                top: 4,
+                bottom: 4,
               ),
               title: Text(appLocalizations.developerMode),
               delegate: SwitchDelegate(
@@ -110,7 +78,7 @@ class DeveloperView extends ConsumerWidget {
           SizedBox(
             height: 16,
           ),
-          _getDeveloperList(context, ref)
+          _getDeveloperList(context)
         ],
       ),
     );

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,
+                  ),
+          );
+        },
       ),
     );
   }

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';
@@ -18,27 +16,23 @@ class LogsFragment extends ConsumerStatefulWidget {
 }
 
 class _LogsFragmentState extends ConsumerState<LogsFragment> with PageMixin {
-  final _logsStateNotifier = ValueNotifier<LogsState>(
-    LogsState(loading: true),
-  );
+  final _logsStateNotifier = ValueNotifier<LogsState>(LogsState());
+  final _cacheKey = ValueKey("logs_list");
   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;
+    final preOffset = globalState.cacheScrollPosition[_cacheKey] ?? -1;
     _scrollController = ScrollController(
-      initialScrollOffset: position > 0 ? position : double.maxFinite,
+      initialScrollOffset: preOffset > 0 ? preOffset : double.maxFinite,
     );
-    _logs = globalState.appState.logs.list;
     _logsStateNotifier.value = _logsStateNotifier.value.copyWith(
-      logs: _logs,
+      logs: globalState.appState.logs.list,
     );
     ref.listenManual(
       isCurrentPageProvider(
@@ -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>(
@@ -122,16 +123,16 @@ class _LogsFragmentState extends ConsumerState<LogsFragment> with PageMixin {
         .computeTextSize(
           Text(
             log.payload,
-            style: context.textTheme.bodyLarge,
+            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,122 +141,86 @@ 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);
-                    },
-                  ),
-                )
-                .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;
-                          },
-                        ),
-                      ),
+        _handleTryClearCache(constraints.maxWidth - 40);
+        return TextScaleNotification(
+          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),
+                      log: log,
+                      onClick: (value) {
+                        context.commonScaffoldState?.addKeyword(value);
+                      },
                     ),
-                  );
-            return FadeBox(
-              child: state.loading
-                  ? Center(
-                      child: CircularProgressIndicator(),
-                    )
-                  : content,
-            );
+                  )
+                  .separated(
+                    const Divider(
+                      height: 0,
+                    ),
+                  )
+                  .toList();
+              return Align(
+                alignment: Alignment.topCenter,
+                child: ScrollToEndBox<Log>(
+                  controller: _scrollController,
+                  cacheKey: _cacheKey,
+                  dataSource: logs,
+                  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;
+                      },
+                    ),
+                  ),
+                ),
+              );
+            },
+          ),
+          onNotification: (_) {
+            _key.currentState?.clearCache();
           },
         );
       },

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;

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(
@@ -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(

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,

lib/fragments/proxies/card.dart

@@ -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,
                               ),
                             ),
                           ),

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 28 + measure.titleMediumHeight + 4 + measure.bodyMediumHeight;
 }
 
 double getItemHeight(ProxyCardType proxyCardType) {

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(
@@ -492,7 +484,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 +587,7 @@ class _ListHeaderState extends State<ListHeader>
                   const SizedBox(
                     width: 6,
                   ),
-                ] else
-                  SizedBox(
-                    width: 4,
-                  ),
+                ],
                 AnimatedBuilder(
                   animation: _animationController.view,
                   builder: (_, __) {

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.settings,
+                );
+              },
+            );
+          },
+          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,

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(

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,
-                        ),
+                  ),
                 );
               },
             ),

lib/fragments/theme.dart

@@ -526,8 +526,8 @@ class _TextScaleFactorItem extends ConsumerWidget {
                       data: _SliderDefaultsM3(context),
                       child: Slider(
                         padding: EdgeInsets.zero,
-                        min: minTextScale,
-                        max: maxTextScale,
+                        min: 0.8,
+                        max: 1.2,
                         value: textScale.scale,
                         onChanged: (value) {
                           ref.read(themeSettingProvider.notifier).updateState(

lib/l10n/intl/messages_en.dart

@@ -164,7 +164,6 @@ class MessageLookup extends MessageLookupByLibrary {
       "View current connections data",
     ),
     "connectivity": MessageLookupByLibrary.simpleMessage("Connectivity："),
-    "contactMe": MessageLookupByLibrary.simpleMessage("Contact me"),
     "content": MessageLookupByLibrary.simpleMessage("Content"),
     "contentEmptyTip": MessageLookupByLibrary.simpleMessage(
       "Content cannot be empty",
@@ -364,7 +363,6 @@ class MessageLookup extends MessageLookupByLibrary {
     ),
     "logs": MessageLookupByLibrary.simpleMessage("Logs"),
     "logsDesc": MessageLookupByLibrary.simpleMessage("Log capture records"),
-    "logsTest": MessageLookupByLibrary.simpleMessage("Logs test"),
     "loopback": MessageLookupByLibrary.simpleMessage("Loopback unlock tool"),
     "loopbackDesc": MessageLookupByLibrary.simpleMessage(
       "Used for UWP loopback unlocking",
@@ -412,7 +410,7 @@ class MessageLookup extends MessageLookupByLibrary {
     "noInfo": MessageLookupByLibrary.simpleMessage("No info"),
     "noMoreInfoDesc": MessageLookupByLibrary.simpleMessage("No more info"),
     "noNetwork": MessageLookupByLibrary.simpleMessage("No network"),
-    "noNetworkApp": MessageLookupByLibrary.simpleMessage("No network APP"),
+    "noNetworkApp": MessageLookupByLibrary.simpleMessage("No network App"),
     "noProxy": MessageLookupByLibrary.simpleMessage("No proxy"),
     "noProxyDesc": MessageLookupByLibrary.simpleMessage(
       "Please create a profile or add a valid profile",
@@ -540,15 +538,6 @@ class MessageLookup extends MessageLookupByLibrary {
     "recoveryProfiles": MessageLookupByLibrary.simpleMessage(
       "Only recovery profiles",
     ),
-    "recoveryStrategy": MessageLookupByLibrary.simpleMessage(
-      "Recovery strategy",
-    ),
-    "recoveryStrategy_compatible": MessageLookupByLibrary.simpleMessage(
-      "Compatible",
-    ),
-    "recoveryStrategy_override": MessageLookupByLibrary.simpleMessage(
-      "Override",
-    ),
     "recoverySuccess": MessageLookupByLibrary.simpleMessage("Recovery success"),
     "redo": MessageLookupByLibrary.simpleMessage("redo"),
     "regExp": MessageLookupByLibrary.simpleMessage("RegExp"),

lib/l10n/intl/messages_ja.dart

@@ -118,7 +118,6 @@ class MessageLookup extends MessageLookupByLibrary {
     "connections": MessageLookupByLibrary.simpleMessage("接続"),
     "connectionsDesc": MessageLookupByLibrary.simpleMessage("現在の接続データを表示"),
     "connectivity": MessageLookupByLibrary.simpleMessage("接続性："),
-    "contactMe": MessageLookupByLibrary.simpleMessage("連絡する"),
     "content": MessageLookupByLibrary.simpleMessage("内容"),
     "contentEmptyTip": MessageLookupByLibrary.simpleMessage("内容は必須です"),
     "contentScheme": MessageLookupByLibrary.simpleMessage("コンテンツテーマ"),
@@ -262,7 +261,6 @@ class MessageLookup extends MessageLookupByLibrary {
     "logcatDesc": MessageLookupByLibrary.simpleMessage("無効化するとログエントリを非表示"),
     "logs": MessageLookupByLibrary.simpleMessage("ログ"),
     "logsDesc": MessageLookupByLibrary.simpleMessage("ログキャプチャ記録"),
-    "logsTest": MessageLookupByLibrary.simpleMessage("ログテスト"),
     "loopback": MessageLookupByLibrary.simpleMessage("ループバック解除ツール"),
     "loopbackDesc": MessageLookupByLibrary.simpleMessage("UWPループバック解除用"),
     "loose": MessageLookupByLibrary.simpleMessage("疎"),
@@ -396,11 +394,6 @@ class MessageLookup extends MessageLookupByLibrary {
     "recovery": MessageLookupByLibrary.simpleMessage("復元"),
     "recoveryAll": MessageLookupByLibrary.simpleMessage("全データ復元"),
     "recoveryProfiles": MessageLookupByLibrary.simpleMessage("プロファイルのみ復元"),
-    "recoveryStrategy": MessageLookupByLibrary.simpleMessage("リカバリー戦略"),
-    "recoveryStrategy_compatible": MessageLookupByLibrary.simpleMessage("互換性"),
-    "recoveryStrategy_override": MessageLookupByLibrary.simpleMessage(
-      "オーバーライド",
-    ),
     "recoverySuccess": MessageLookupByLibrary.simpleMessage("復元成功"),
     "redo": MessageLookupByLibrary.simpleMessage("やり直す"),
     "regExp": MessageLookupByLibrary.simpleMessage("正規表現"),

lib/l10n/intl/messages_ru.dart

@@ -170,7 +170,6 @@ class MessageLookup extends MessageLookupByLibrary {
       "Просмотр текущих данных о соединениях",
     ),
     "connectivity": MessageLookupByLibrary.simpleMessage("Связь："),
-    "contactMe": MessageLookupByLibrary.simpleMessage("Свяжитесь со мной"),
     "content": MessageLookupByLibrary.simpleMessage("Содержание"),
     "contentEmptyTip": MessageLookupByLibrary.simpleMessage(
       "Содержание не может быть пустым",
@@ -386,7 +385,6 @@ class MessageLookup extends MessageLookupByLibrary {
     ),
     "logs": MessageLookupByLibrary.simpleMessage("Логи"),
     "logsDesc": MessageLookupByLibrary.simpleMessage("Записи захвата логов"),
-    "logsTest": MessageLookupByLibrary.simpleMessage("Тест журналов"),
     "loopback": MessageLookupByLibrary.simpleMessage(
       "Инструмент разблокировки Loopback",
     ),
@@ -574,15 +572,6 @@ class MessageLookup extends MessageLookupByLibrary {
     "recoveryProfiles": MessageLookupByLibrary.simpleMessage(
       "Только восстановление профилей",
     ),
-    "recoveryStrategy": MessageLookupByLibrary.simpleMessage(
-      "Стратегия восстановления",
-    ),
-    "recoveryStrategy_compatible": MessageLookupByLibrary.simpleMessage(
-      "Совместимый",
-    ),
-    "recoveryStrategy_override": MessageLookupByLibrary.simpleMessage(
-      "Переопределение",
-    ),
     "recoverySuccess": MessageLookupByLibrary.simpleMessage(
       "Восстановление успешно",
     ),

lib/l10n/intl/messages_zh_CN.dart

@@ -108,7 +108,6 @@ class MessageLookup extends MessageLookupByLibrary {
     "connections": MessageLookupByLibrary.simpleMessage("连接"),
     "connectionsDesc": MessageLookupByLibrary.simpleMessage("查看当前连接数据"),
     "connectivity": MessageLookupByLibrary.simpleMessage("连通性："),
-    "contactMe": MessageLookupByLibrary.simpleMessage("联系我"),
     "content": MessageLookupByLibrary.simpleMessage("内容"),
     "contentEmptyTip": MessageLookupByLibrary.simpleMessage("内容不能为空"),
     "contentScheme": MessageLookupByLibrary.simpleMessage("内容主题"),
@@ -234,7 +233,6 @@ class MessageLookup extends MessageLookupByLibrary {
     "logcatDesc": MessageLookupByLibrary.simpleMessage("禁用将会隐藏日志入口"),
     "logs": MessageLookupByLibrary.simpleMessage("日志"),
     "logsDesc": MessageLookupByLibrary.simpleMessage("日志捕获记录"),
-    "logsTest": MessageLookupByLibrary.simpleMessage("日志测试"),
     "loopback": MessageLookupByLibrary.simpleMessage("回环解锁工具"),
     "loopbackDesc": MessageLookupByLibrary.simpleMessage("用于UWP回环解锁"),
     "loose": MessageLookupByLibrary.simpleMessage("宽松"),
@@ -348,9 +346,6 @@ class MessageLookup extends MessageLookupByLibrary {
     "recovery": MessageLookupByLibrary.simpleMessage("恢复"),
     "recoveryAll": MessageLookupByLibrary.simpleMessage("恢复所有数据"),
     "recoveryProfiles": MessageLookupByLibrary.simpleMessage("仅恢复配置文件"),
-    "recoveryStrategy": MessageLookupByLibrary.simpleMessage("恢复策略"),
-    "recoveryStrategy_compatible": MessageLookupByLibrary.simpleMessage("兼容"),
-    "recoveryStrategy_override": MessageLookupByLibrary.simpleMessage("覆盖"),
     "recoverySuccess": MessageLookupByLibrary.simpleMessage("恢复成功"),
     "redo": MessageLookupByLibrary.simpleMessage("重做"),
     "regExp": MessageLookupByLibrary.simpleMessage("正则"),

lib/l10n/l10n.dart

@@ -3070,55 +3070,15 @@ class AppLocalizations {
     return Intl.message('System APP', name: 'systemApp', desc: '', args: []);
   }
 
-  /// `No network APP`
+  /// `No network App`
   String get noNetworkApp {
     return Intl.message(
-      'No network APP',
+      'No network App',
       name: 'noNetworkApp',
       desc: '',
       args: [],
     );
   }
-
-  /// `Contact me`
-  String get contactMe {
-    return Intl.message('Contact me', name: 'contactMe', desc: '', args: []);
-  }
-
-  /// `Recovery strategy`
-  String get recoveryStrategy {
-    return Intl.message(
-      'Recovery strategy',
-      name: 'recoveryStrategy',
-      desc: '',
-      args: [],
-    );
-  }
-
-  /// `Override`
-  String get recoveryStrategy_override {
-    return Intl.message(
-      'Override',
-      name: 'recoveryStrategy_override',
-      desc: '',
-      args: [],
-    );
-  }
-
-  /// `Compatible`
-  String get recoveryStrategy_compatible {
-    return Intl.message(
-      'Compatible',
-      name: 'recoveryStrategy_compatible',
-      desc: '',
-      args: [],
-    );
-  }
-
-  /// `Logs test`
-  String get logsTest {
-    return Intl.message('Logs test', name: 'logsTest', desc: '', args: []);
-  }
 }
 
 class AppLocalizationDelegate extends LocalizationsDelegate<AppLocalizations> {

lib/main.dart

@@ -26,6 +26,7 @@ Future<void> main() async {
   await globalState.initApp(version);
   await android?.init();
   await window?.init(version);
+  globalState.isPre = const String.fromEnvironment("APP_ENV") != 'stable';
   HttpOverrides.global = FlClashHttpOverrides();
   runApp(ProviderScope(
     child: const Application(),

lib/manager/app_state_manager.dart

@@ -1,13 +1,11 @@
 import 'dart:async';
 
 import 'package:fl_clash/common/common.dart';
-import 'package:fl_clash/providers/providers.dart';
 import 'package:fl_clash/state.dart';
 import 'package:flutter/foundation.dart';
 import 'package:flutter/material.dart';
-import 'package:flutter_riverpod/flutter_riverpod.dart';
 
-class AppStateManager extends ConsumerStatefulWidget {
+class AppStateManager extends StatefulWidget {
   final Widget child;
 
   const AppStateManager({
@@ -16,31 +14,15 @@ class AppStateManager extends ConsumerStatefulWidget {
   });
 
   @override
-  ConsumerState<AppStateManager> createState() => _AppStateManagerState();
+  State<AppStateManager> createState() => _AppStateManagerState();
 }
 
-class _AppStateManagerState extends ConsumerState<AppStateManager>
+class _AppStateManagerState extends State<AppStateManager>
     with WidgetsBindingObserver {
   @override
   void initState() {
     super.initState();
     WidgetsBinding.instance.addObserver(this);
-    ref.listenManual(layoutChangeProvider, (prev, next) {
-      WidgetsBinding.instance.addPostFrameCallback((_) {
-        if (prev != next) {
-          globalState.cacheHeightMap = {};
-        }
-      });
-    });
-    ref.listenManual(
-      checkIpProvider,
-      (prev, next) {
-        if (prev != next && next.b) {
-          detectionState.startCheck();
-        }
-      },
-      fireImmediately: true,
-    );
   }
 
   @override

lib/manager/clash_manager.dart

@@ -61,7 +61,7 @@ class _ClashContainerState extends ConsumerState<ClashManager>
     final appController = globalState.appController;
     appController.setDelay(delay);
     debouncer.call(
-      FunctionTag.updateDelay,
+      DebounceTag.updateDelay,
       () async {
         await appController.updateGroupsDebounce();
       },
@@ -71,7 +71,7 @@ class _ClashContainerState extends ConsumerState<ClashManager>
 
   @override
   void onLog(Log log) {
-    ref.read(logsProvider.notifier).addLog(log);
+    ref.watch(logsProvider.notifier).addLog(log);
     if (log.logLevel == LogLevel.error) {
       globalState.showNotifier(log.payload);
     }
@@ -80,13 +80,13 @@ class _ClashContainerState extends ConsumerState<ClashManager>
 
   @override
   void onRequest(Connection connection) async {
-    ref.read(requestsProvider.notifier).addRequest(connection);
+    ref.watch(requestsProvider.notifier).addRequest(connection);
     super.onRequest(connection);
   }
 
   @override
   Future<void> onLoaded(String providerName) async {
-    ref.read(providersProvider.notifier).setProvider(
+    ref.watch(providersProvider.notifier).setProvider(
           await clashCore.getExternalProvider(
             providerName,
           ),

lib/manager/hotkey_manager.dart

@@ -8,7 +8,7 @@ import 'package:flutter/services.dart';
 import 'package:flutter_riverpod/flutter_riverpod.dart';
 import 'package:hotkey_manager/hotkey_manager.dart';
 
-class HotKeyManager extends ConsumerStatefulWidget {
+class HotKeyManager extends StatelessWidget {
   final Widget child;
 
   const HotKeyManager({
@@ -16,25 +16,6 @@ class HotKeyManager extends ConsumerStatefulWidget {
     required this.child,
   });
 
-  @override
-  ConsumerState<HotKeyManager> createState() => _HotKeyManagerState();
-}
-
-class _HotKeyManagerState extends ConsumerState<HotKeyManager> {
-  @override
-  void initState() {
-    super.initState();
-    ref.listenManual(
-      hotKeyActionsProvider,
-      (prev, next) {
-        if (!hotKeyActionListEquality.equals(prev, next)) {
-          _updateHotKeys(hotKeyActions: next);
-        }
-      },
-      fireImmediately: true,
-    );
-  }
-
   _handleHotKeyAction(HotAction action) async {
     switch (action) {
       case HotAction.mode:
@@ -78,30 +59,22 @@ class _HotKeyManagerState extends ConsumerState<HotKeyManager> {
     await Future.wait(hotkeyActionHandles);
   }
 
-  _buildShortcuts(Widget child) {
-    return Shortcuts(
-      shortcuts: {
-        utils.controlSingleActivator(LogicalKeyboardKey.keyW):
-            CloseWindowIntent(),
-      },
-      child: Actions(
-        actions: {
-          CloseWindowIntent: CallbackAction<CloseWindowIntent>(
-            onInvoke: (_) => globalState.appController.handleBackOrExit(),
-          ),
-          DoNothingIntent: CallbackAction<DoNothingIntent>(
-            onInvoke: (_) => null,
-          ),
-        },
-        child: child,
-      ),
-    );
-  }
-
   @override
   Widget build(BuildContext context) {
-    return _buildShortcuts(
-      widget.child,
+    return Consumer(
+      builder: (_, ref, child) {
+        ref.listenManual(
+          hotKeyActionsProvider,
+          (prev, next) {
+            if (!hotKeyActionListEquality.equals(prev, next)) {
+              _updateHotKeys(hotKeyActions: next);
+            }
+          },
+          fireImmediately: true,
+        );
+        return child!;
+      },
+      child: child,
     );
   }
 }

lib/manager/theme_manager.dart

@@ -23,9 +23,9 @@ class ThemeManager extends ConsumerWidget {
     final double textScaleFactor = max(
       min(
         textScale.enable ? textScale.scale : defaultTextScaleFactor,
-        maxTextScale,
+        1.2,
       ),
-      minTextScale,
+      0.8,
     );
 
     globalState.measure = Measure.of(context, textScaleFactor);
@@ -38,7 +38,7 @@ class ThemeManager extends ConsumerWidget {
           textScaleFactor,
         ),
         padding: padding.copyWith(
-          top: padding.top > height * 0.3 ? 20.0 : padding.top,
+          top: padding.top > height * 0.3 ? 0.0 : padding.top,
         ),
       ),
       child: LayoutBuilder(

lib/manager/vpn_manager.dart

@@ -29,7 +29,7 @@ class _VpnContainerState extends ConsumerState<VpnManager> {
 
   showTip() {
     debouncer.call(
-      FunctionTag.vpnTip,
+      DebounceTag.vpnTip,
       () {
         if (ref.read(runTimeProvider.notifier).isStart) {
           globalState.showNotifier(

lib/manager/window_manager.dart

@@ -38,7 +38,7 @@ class _WindowContainerState extends ConsumerState<WindowManager>
       (prev, next) {
         if (prev != next) {
           debouncer.call(
-            FunctionTag.autoLaunch,
+            DebounceTag.autoLaunch,
             () {
               autoLaunch?.updateStatus(next);
             },
@@ -103,7 +103,7 @@ class _WindowContainerState extends ConsumerState<WindowManager>
 
   @override
   Future<void> onTaskbarCreated() async {
-    // globalState.appController.updateTray(true);
+    globalState.appController.updateTray(true);
     super.onTaskbarCreated();
   }
 

lib/models/app.dart

@@ -14,7 +14,6 @@ typedef DelayMap = Map<String, Map<String, int?>>;
 class AppState with _$AppState {
   const factory AppState({
     @Default(false) bool isInit,
-    @Default(false) bool backBlock,
     @Default(PageLabel.dashboard) PageLabel pageLabel,
     @Default([]) List<Package> packages,
     @Default(0) int sortNum,
@@ -31,7 +30,6 @@ class AppState with _$AppState {
     required FixedList<Log> logs,
     required FixedList<Traffic> traffics,
     required Traffic totalTraffic,
-    @Default("") String proxiesQuery,
     @Default(false) bool needApply,
   }) = _AppState;
 }

lib/models/clash_config.dart

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

lib/models/common.dart

@@ -8,6 +8,7 @@ import 'package:flutter/material.dart';
 import 'package:freezed_annotation/freezed_annotation.dart';
 
 part 'generated/common.freezed.dart';
+
 part 'generated/common.g.dart';
 
 @freezed
@@ -119,7 +120,6 @@ class LogsState with _$LogsState {
     @Default([]) List<Log> logs,
     @Default([]) List<String> keywords,
     @Default("") String query,
-    @Default(false) bool loading,
   }) = _LogsState;
 }
 
@@ -128,10 +128,10 @@ extension LogsStateExt on LogsState {
     final lowQuery = query.toLowerCase();
     return logs.where(
       (log) {
+        final payload = log.payload.toLowerCase();
         final logLevelName = log.logLevel.name;
         return {logLevelName}.containsAll(keywords) &&
-            ((log.payload.toLowerCase().contains(lowQuery)) ||
-                logLevelName.contains(lowQuery));
+            ((payload.contains(lowQuery)) || logLevelName.contains(lowQuery));
       },
     ).toList();
   }
@@ -143,7 +143,6 @@ class ConnectionsState with _$ConnectionsState {
     @Default([]) List<Connection> connections,
     @Default([]) List<String> keywords,
     @Default("") String query,
-    @Default(false) bool loading,
   }) = _ConnectionsState;
 }
 
@@ -503,27 +502,13 @@ class PopupMenuItemData {
     this.icon,
     required this.label,
     required this.onPressed,
+    this.type,
+    this.iconSize,
   });
 
+  final double? iconSize;
   final String label;
   final VoidCallback? onPressed;
   final IconData? icon;
-}
-
-@freezed
-class TextPainterParams with _$TextPainterParams {
-  const factory TextPainterParams({
-    required String? text,
-    required double? fontSize,
-    required double textScaleFactor,
-    @Default(double.infinity) double maxWidth,
-    int? maxLines,
-  }) = _TextPainterParams;
-
-  factory TextPainterParams.fromJson(Map<String, Object?> json) =>
-      _$TextPainterParamsFromJson(json);
-}
-
-class CloseWindowIntent extends Intent {
-  const CloseWindowIntent();
+  final PopupMenuItemType? type;
 }

lib/models/config.dart

@@ -75,7 +75,7 @@ class AppSettingProps with _$AppSettingProps {
     @Default(false) bool autoLaunch,
     @Default(false) bool silentLaunch,
     @Default(false) bool autoRun,
-    @Default(false) bool openLogs,
+    @Default(true) bool openLogs,
     @Default(true) bool closeConnections,
     @Default(defaultTestUrl) String testUrl,
     @Default(true) bool isAnimateToPage,
@@ -85,7 +85,6 @@ class AppSettingProps with _$AppSettingProps {
     @Default(true) bool minimizeOnExit,
     @Default(false) bool hidden,
     @Default(false) bool developerMode,
-    @Default(RecoveryStrategy.compatible) RecoveryStrategy recoveryStrategy,
   }) = _AppSettingProps;
 
   factory AppSettingProps.fromJson(Map<String, Object?> json) =>
@@ -192,7 +191,7 @@ class ThemeProps with _$ThemeProps {
     int? primaryColor,
     @Default(defaultPrimaryColors) List<int> primaryColors,
     @Default(ThemeMode.dark) ThemeMode themeMode,
-    @Default(DynamicSchemeVariant.content) DynamicSchemeVariant schemeVariant,
+    @Default(DynamicSchemeVariant.tonalSpot) DynamicSchemeVariant schemeVariant,
     @Default(false) bool pureBlack,
     @Default(TextScale()) TextScale textScale,
   }) = _ThemeProps;

lib/models/generated/app.freezed.dart

@@ -17,7 +17,6 @@ final _privateConstructorUsedError = UnsupportedError(
 /// @nodoc
 mixin _$AppState {
   bool get isInit => throw _privateConstructorUsedError;
-  bool get backBlock => throw _privateConstructorUsedError;
   PageLabel get pageLabel => throw _privateConstructorUsedError;
   List<Package> get packages => throw _privateConstructorUsedError;
   int get sortNum => throw _privateConstructorUsedError;
@@ -35,7 +34,6 @@ mixin _$AppState {
   FixedList<Log> get logs => throw _privateConstructorUsedError;
   FixedList<Traffic> get traffics => throw _privateConstructorUsedError;
   Traffic get totalTraffic => throw _privateConstructorUsedError;
-  String get proxiesQuery => throw _privateConstructorUsedError;
   bool get needApply => throw _privateConstructorUsedError;
 
   /// Create a copy of AppState
@@ -52,7 +50,6 @@ abstract class $AppStateCopyWith<$Res> {
   @useResult
   $Res call(
       {bool isInit,
-      bool backBlock,
       PageLabel pageLabel,
       List<Package> packages,
       int sortNum,
@@ -69,7 +66,6 @@ abstract class $AppStateCopyWith<$Res> {
       FixedList<Log> logs,
       FixedList<Traffic> traffics,
       Traffic totalTraffic,
-      String proxiesQuery,
       bool needApply});
 }
 
@@ -89,7 +85,6 @@ class _$AppStateCopyWithImpl<$Res, $Val extends AppState>
   @override
   $Res call({
     Object? isInit = null,
-    Object? backBlock = null,
     Object? pageLabel = null,
     Object? packages = null,
     Object? sortNum = null,
@@ -106,7 +101,6 @@ class _$AppStateCopyWithImpl<$Res, $Val extends AppState>
     Object? logs = null,
     Object? traffics = null,
     Object? totalTraffic = null,
-    Object? proxiesQuery = null,
     Object? needApply = null,
   }) {
     return _then(_value.copyWith(
@@ -114,10 +108,6 @@ class _$AppStateCopyWithImpl<$Res, $Val extends AppState>
           ? _value.isInit
           : isInit // ignore: cast_nullable_to_non_nullable
               as bool,
-      backBlock: null == backBlock
-          ? _value.backBlock
-          : backBlock // ignore: cast_nullable_to_non_nullable
-              as bool,
       pageLabel: null == pageLabel
           ? _value.pageLabel
           : pageLabel // ignore: cast_nullable_to_non_nullable
@@ -182,10 +172,6 @@ class _$AppStateCopyWithImpl<$Res, $Val extends AppState>
           ? _value.totalTraffic
           : totalTraffic // ignore: cast_nullable_to_non_nullable
               as Traffic,
-      proxiesQuery: null == proxiesQuery
-          ? _value.proxiesQuery
-          : proxiesQuery // ignore: cast_nullable_to_non_nullable
-              as String,
       needApply: null == needApply
           ? _value.needApply
           : needApply // ignore: cast_nullable_to_non_nullable
@@ -204,7 +190,6 @@ abstract class _$$AppStateImplCopyWith<$Res>
   @useResult
   $Res call(
       {bool isInit,
-      bool backBlock,
       PageLabel pageLabel,
       List<Package> packages,
       int sortNum,
@@ -221,7 +206,6 @@ abstract class _$$AppStateImplCopyWith<$Res>
       FixedList<Log> logs,
       FixedList<Traffic> traffics,
       Traffic totalTraffic,
-      String proxiesQuery,
       bool needApply});
 }
 
@@ -239,7 +223,6 @@ class __$$AppStateImplCopyWithImpl<$Res>
   @override
   $Res call({
     Object? isInit = null,
-    Object? backBlock = null,
     Object? pageLabel = null,
     Object? packages = null,
     Object? sortNum = null,
@@ -256,7 +239,6 @@ class __$$AppStateImplCopyWithImpl<$Res>
     Object? logs = null,
     Object? traffics = null,
     Object? totalTraffic = null,
-    Object? proxiesQuery = null,
     Object? needApply = null,
   }) {
     return _then(_$AppStateImpl(
@@ -264,10 +246,6 @@ class __$$AppStateImplCopyWithImpl<$Res>
           ? _value.isInit
           : isInit // ignore: cast_nullable_to_non_nullable
               as bool,
-      backBlock: null == backBlock
-          ? _value.backBlock
-          : backBlock // ignore: cast_nullable_to_non_nullable
-              as bool,
       pageLabel: null == pageLabel
           ? _value.pageLabel
           : pageLabel // ignore: cast_nullable_to_non_nullable
@@ -332,10 +310,6 @@ class __$$AppStateImplCopyWithImpl<$Res>
           ? _value.totalTraffic
           : totalTraffic // ignore: cast_nullable_to_non_nullable
               as Traffic,
-      proxiesQuery: null == proxiesQuery
-          ? _value.proxiesQuery
-          : proxiesQuery // ignore: cast_nullable_to_non_nullable
-              as String,
       needApply: null == needApply
           ? _value.needApply
           : needApply // ignore: cast_nullable_to_non_nullable
@@ -349,7 +323,6 @@ class __$$AppStateImplCopyWithImpl<$Res>
 class _$AppStateImpl implements _AppState {
   const _$AppStateImpl(
       {this.isInit = false,
-      this.backBlock = false,
       this.pageLabel = PageLabel.dashboard,
       final List<Package> packages = const [],
       this.sortNum = 0,
@@ -366,7 +339,6 @@ class _$AppStateImpl implements _AppState {
       required this.logs,
       required this.traffics,
       required this.totalTraffic,
-      this.proxiesQuery = "",
       this.needApply = false})
       : _packages = packages,
         _delayMap = delayMap,
@@ -378,9 +350,6 @@ class _$AppStateImpl implements _AppState {
   final bool isInit;
   @override
   @JsonKey()
-  final bool backBlock;
-  @override
-  @JsonKey()
   final PageLabel pageLabel;
   final List<Package> _packages;
   @override
@@ -444,14 +413,11 @@ class _$AppStateImpl implements _AppState {
   final Traffic totalTraffic;
   @override
   @JsonKey()
-  final String proxiesQuery;
-  @override
-  @JsonKey()
   final bool needApply;
 
   @override
   String toString() {
-    return 'AppState(isInit: $isInit, backBlock: $backBlock, pageLabel: $pageLabel, packages: $packages, sortNum: $sortNum, viewSize: $viewSize, delayMap: $delayMap, groups: $groups, checkIpNum: $checkIpNum, brightness: $brightness, runTime: $runTime, providers: $providers, localIp: $localIp, requests: $requests, version: $version, logs: $logs, traffics: $traffics, totalTraffic: $totalTraffic, proxiesQuery: $proxiesQuery, needApply: $needApply)';
+    return 'AppState(isInit: $isInit, pageLabel: $pageLabel, packages: $packages, sortNum: $sortNum, viewSize: $viewSize, delayMap: $delayMap, groups: $groups, checkIpNum: $checkIpNum, brightness: $brightness, runTime: $runTime, providers: $providers, localIp: $localIp, requests: $requests, version: $version, logs: $logs, traffics: $traffics, totalTraffic: $totalTraffic, needApply: $needApply)';
   }
 
   @override
@@ -460,8 +426,6 @@ class _$AppStateImpl implements _AppState {
         (other.runtimeType == runtimeType &&
             other is _$AppStateImpl &&
             (identical(other.isInit, isInit) || other.isInit == isInit) &&
-            (identical(other.backBlock, backBlock) ||
-                other.backBlock == backBlock) &&
             (identical(other.pageLabel, pageLabel) ||
                 other.pageLabel == pageLabel) &&
             const DeepCollectionEquality().equals(other._packages, _packages) &&
@@ -486,36 +450,31 @@ class _$AppStateImpl implements _AppState {
                 other.traffics == traffics) &&
             (identical(other.totalTraffic, totalTraffic) ||
                 other.totalTraffic == totalTraffic) &&
-            (identical(other.proxiesQuery, proxiesQuery) ||
-                other.proxiesQuery == proxiesQuery) &&
             (identical(other.needApply, needApply) ||
                 other.needApply == needApply));
   }
 
   @override
-  int get hashCode => Object.hashAll([
-        runtimeType,
-        isInit,
-        backBlock,
-        pageLabel,
-        const DeepCollectionEquality().hash(_packages),
-        sortNum,
-        viewSize,
-        const DeepCollectionEquality().hash(_delayMap),
-        const DeepCollectionEquality().hash(_groups),
-        checkIpNum,
-        brightness,
-        runTime,
-        const DeepCollectionEquality().hash(_providers),
-        localIp,
-        requests,
-        version,
-        logs,
-        traffics,
-        totalTraffic,
-        proxiesQuery,
-        needApply
-      ]);
+  int get hashCode => Object.hash(
+      runtimeType,
+      isInit,
+      pageLabel,
+      const DeepCollectionEquality().hash(_packages),
+      sortNum,
+      viewSize,
+      const DeepCollectionEquality().hash(_delayMap),
+      const DeepCollectionEquality().hash(_groups),
+      checkIpNum,
+      brightness,
+      runTime,
+      const DeepCollectionEquality().hash(_providers),
+      localIp,
+      requests,
+      version,
+      logs,
+      traffics,
+      totalTraffic,
+      needApply);
 
   /// Create a copy of AppState
   /// with the given fields replaced by the non-null parameter values.
@@ -529,7 +488,6 @@ class _$AppStateImpl implements _AppState {
 abstract class _AppState implements AppState {
   const factory _AppState(
       {final bool isInit,
-      final bool backBlock,
       final PageLabel pageLabel,
       final List<Package> packages,
       final int sortNum,
@@ -546,14 +504,11 @@ abstract class _AppState implements AppState {
       required final FixedList<Log> logs,
       required final FixedList<Traffic> traffics,
       required final Traffic totalTraffic,
-      final String proxiesQuery,
       final bool needApply}) = _$AppStateImpl;
 
   @override
   bool get isInit;
   @override
-  bool get backBlock;
-  @override
   PageLabel get pageLabel;
   @override
   List<Package> get packages;
@@ -586,8 +541,6 @@ abstract class _AppState implements AppState {
   @override
   Traffic get totalTraffic;
   @override
-  String get proxiesQuery;
-  @override
   bool get needApply;
 
   /// Create a copy of AppState

lib/models/generated/clash_config.freezed.dart

@@ -660,8 +660,6 @@ Tun _$TunFromJson(Map<String, dynamic> json) {
 mixin _$Tun {
   bool get enable => throw _privateConstructorUsedError;
   String get device => throw _privateConstructorUsedError;
-  @JsonKey(name: "auto-route")
-  bool get autoRoute => throw _privateConstructorUsedError;
   TunStack get stack => throw _privateConstructorUsedError;
   @JsonKey(name: "dns-hijack")
   List<String> get dnsHijack => throw _privateConstructorUsedError;
@@ -685,7 +683,6 @@ abstract class $TunCopyWith<$Res> {
   $Res call(
       {bool enable,
       String device,
-      @JsonKey(name: "auto-route") bool autoRoute,
       TunStack stack,
       @JsonKey(name: "dns-hijack") List<String> dnsHijack,
       @JsonKey(name: "route-address") List<String> routeAddress});
@@ -707,7 +704,6 @@ class _$TunCopyWithImpl<$Res, $Val extends Tun> implements $TunCopyWith<$Res> {
   $Res call({
     Object? enable = null,
     Object? device = null,
-    Object? autoRoute = null,
     Object? stack = null,
     Object? dnsHijack = null,
     Object? routeAddress = null,
@@ -721,10 +717,6 @@ class _$TunCopyWithImpl<$Res, $Val extends Tun> implements $TunCopyWith<$Res> {
           ? _value.device
           : device // ignore: cast_nullable_to_non_nullable
               as String,
-      autoRoute: null == autoRoute
-          ? _value.autoRoute
-          : autoRoute // ignore: cast_nullable_to_non_nullable
-              as bool,
       stack: null == stack
           ? _value.stack
           : stack // ignore: cast_nullable_to_non_nullable
@@ -750,7 +742,6 @@ abstract class _$$TunImplCopyWith<$Res> implements $TunCopyWith<$Res> {
   $Res call(
       {bool enable,
       String device,
-      @JsonKey(name: "auto-route") bool autoRoute,
       TunStack stack,
       @JsonKey(name: "dns-hijack") List<String> dnsHijack,
       @JsonKey(name: "route-address") List<String> routeAddress});
@@ -769,7 +760,6 @@ class __$$TunImplCopyWithImpl<$Res> extends _$TunCopyWithImpl<$Res, _$TunImpl>
   $Res call({
     Object? enable = null,
     Object? device = null,
-    Object? autoRoute = null,
     Object? stack = null,
     Object? dnsHijack = null,
     Object? routeAddress = null,
@@ -783,10 +773,6 @@ class __$$TunImplCopyWithImpl<$Res> extends _$TunCopyWithImpl<$Res, _$TunImpl>
           ? _value.device
           : device // ignore: cast_nullable_to_non_nullable
               as String,
-      autoRoute: null == autoRoute
-          ? _value.autoRoute
-          : autoRoute // ignore: cast_nullable_to_non_nullable
-              as bool,
       stack: null == stack
           ? _value.stack
           : stack // ignore: cast_nullable_to_non_nullable
@@ -809,8 +795,7 @@ class _$TunImpl implements _Tun {
   const _$TunImpl(
       {this.enable = false,
       this.device = appName,
-      @JsonKey(name: "auto-route") this.autoRoute = false,
-      this.stack = TunStack.mixed,
+      this.stack = TunStack.gvisor,
       @JsonKey(name: "dns-hijack")
       final List<String> dnsHijack = const ["any:53"],
       @JsonKey(name: "route-address")
@@ -828,9 +813,6 @@ class _$TunImpl implements _Tun {
   @JsonKey()
   final String device;
   @override
-  @JsonKey(name: "auto-route")
-  final bool autoRoute;
-  @override
   @JsonKey()
   final TunStack stack;
   final List<String> _dnsHijack;
@@ -853,7 +835,7 @@ class _$TunImpl implements _Tun {
 
   @override
   String toString() {
-    return 'Tun(enable: $enable, device: $device, autoRoute: $autoRoute, stack: $stack, dnsHijack: $dnsHijack, routeAddress: $routeAddress)';
+    return 'Tun(enable: $enable, device: $device, stack: $stack, dnsHijack: $dnsHijack, routeAddress: $routeAddress)';
   }
 
   @override
@@ -863,8 +845,6 @@ class _$TunImpl implements _Tun {
             other is _$TunImpl &&
             (identical(other.enable, enable) || other.enable == enable) &&
             (identical(other.device, device) || other.device == device) &&
-            (identical(other.autoRoute, autoRoute) ||
-                other.autoRoute == autoRoute) &&
             (identical(other.stack, stack) || other.stack == stack) &&
             const DeepCollectionEquality()
                 .equals(other._dnsHijack, _dnsHijack) &&
@@ -878,7 +858,6 @@ class _$TunImpl implements _Tun {
       runtimeType,
       enable,
       device,
-      autoRoute,
       stack,
       const DeepCollectionEquality().hash(_dnsHijack),
       const DeepCollectionEquality().hash(_routeAddress));
@@ -903,7 +882,6 @@ abstract class _Tun implements Tun {
   const factory _Tun(
           {final bool enable,
           final String device,
-          @JsonKey(name: "auto-route") final bool autoRoute,
           final TunStack stack,
           @JsonKey(name: "dns-hijack") final List<String> dnsHijack,
           @JsonKey(name: "route-address") final List<String> routeAddress}) =
@@ -916,9 +894,6 @@ abstract class _Tun implements Tun {
   @override
   String get device;
   @override
-  @JsonKey(name: "auto-route")
-  bool get autoRoute;
-  @override
   TunStack get stack;
   @override
   @JsonKey(name: "dns-hijack")

lib/models/generated/clash_config.g.dart

@@ -66,9 +66,8 @@ Map<String, dynamic> _$$RuleProviderImplToJson(_$RuleProviderImpl instance) =>
 _$TunImpl _$$TunImplFromJson(Map<String, dynamic> json) => _$TunImpl(
       enable: json['enable'] as bool? ?? false,
       device: json['device'] as String? ?? appName,
-      autoRoute: json['auto-route'] as bool? ?? false,
       stack: $enumDecodeNullable(_$TunStackEnumMap, json['stack']) ??
-          TunStack.mixed,
+          TunStack.gvisor,
       dnsHijack: (json['dns-hijack'] as List<dynamic>?)
               ?.map((e) => e as String)
               .toList() ??
@@ -82,7 +81,6 @@ _$TunImpl _$$TunImplFromJson(Map<String, dynamic> json) => _$TunImpl(
 Map<String, dynamic> _$$TunImplToJson(_$TunImpl instance) => <String, dynamic>{
       'enable': instance.enable,
       'device': instance.device,
-      'auto-route': instance.autoRoute,
       'stack': _$TunStackEnumMap[instance.stack]!,
       'dns-hijack': instance.dnsHijack,
       'route-address': instance.routeAddress,

lib/models/generated/common.freezed.dart

@@ -1320,7 +1320,6 @@ mixin _$LogsState {
   List<Log> get logs => throw _privateConstructorUsedError;
   List<String> get keywords => throw _privateConstructorUsedError;
   String get query => throw _privateConstructorUsedError;
-  bool get loading => throw _privateConstructorUsedError;
 
   /// Create a copy of LogsState
   /// with the given fields replaced by the non-null parameter values.
@@ -1334,8 +1333,7 @@ abstract class $LogsStateCopyWith<$Res> {
   factory $LogsStateCopyWith(LogsState value, $Res Function(LogsState) then) =
       _$LogsStateCopyWithImpl<$Res, LogsState>;
   @useResult
-  $Res call(
-      {List<Log> logs, List<String> keywords, String query, bool loading});
+  $Res call({List<Log> logs, List<String> keywords, String query});
 }
 
 /// @nodoc
@@ -1356,7 +1354,6 @@ class _$LogsStateCopyWithImpl<$Res, $Val extends LogsState>
     Object? logs = null,
     Object? keywords = null,
     Object? query = null,
-    Object? loading = null,
   }) {
     return _then(_value.copyWith(
       logs: null == logs
@@ -1371,10 +1368,6 @@ class _$LogsStateCopyWithImpl<$Res, $Val extends LogsState>
           ? _value.query
           : query // ignore: cast_nullable_to_non_nullable
               as String,
-      loading: null == loading
-          ? _value.loading
-          : loading // ignore: cast_nullable_to_non_nullable
-              as bool,
     ) as $Val);
   }
 }
@@ -1387,8 +1380,7 @@ abstract class _$$LogsStateImplCopyWith<$Res>
       __$$LogsStateImplCopyWithImpl<$Res>;
   @override
   @useResult
-  $Res call(
-      {List<Log> logs, List<String> keywords, String query, bool loading});
+  $Res call({List<Log> logs, List<String> keywords, String query});
 }
 
 /// @nodoc
@@ -1407,7 +1399,6 @@ class __$$LogsStateImplCopyWithImpl<$Res>
     Object? logs = null,
     Object? keywords = null,
     Object? query = null,
-    Object? loading = null,
   }) {
     return _then(_$LogsStateImpl(
       logs: null == logs
@@ -1422,10 +1413,6 @@ class __$$LogsStateImplCopyWithImpl<$Res>
           ? _value.query
           : query // ignore: cast_nullable_to_non_nullable
               as String,
-      loading: null == loading
-          ? _value.loading
-          : loading // ignore: cast_nullable_to_non_nullable
-              as bool,
     ));
   }
 }
@@ -1436,8 +1423,7 @@ class _$LogsStateImpl implements _LogsState {
   const _$LogsStateImpl(
       {final List<Log> logs = const [],
       final List<String> keywords = const [],
-      this.query = "",
-      this.loading = false})
+      this.query = ""})
       : _logs = logs,
         _keywords = keywords;
 
@@ -1462,13 +1448,10 @@ class _$LogsStateImpl implements _LogsState {
   @override
   @JsonKey()
   final String query;
-  @override
-  @JsonKey()
-  final bool loading;
 
   @override
   String toString() {
-    return 'LogsState(logs: $logs, keywords: $keywords, query: $query, loading: $loading)';
+    return 'LogsState(logs: $logs, keywords: $keywords, query: $query)';
   }
 
   @override
@@ -1478,8 +1461,7 @@ class _$LogsStateImpl implements _LogsState {
             other is _$LogsStateImpl &&
             const DeepCollectionEquality().equals(other._logs, _logs) &&
             const DeepCollectionEquality().equals(other._keywords, _keywords) &&
-            (identical(other.query, query) || other.query == query) &&
-            (identical(other.loading, loading) || other.loading == loading));
+            (identical(other.query, query) || other.query == query));
   }
 
   @override
@@ -1487,8 +1469,7 @@ class _$LogsStateImpl implements _LogsState {
       runtimeType,
       const DeepCollectionEquality().hash(_logs),
       const DeepCollectionEquality().hash(_keywords),
-      query,
-      loading);
+      query);
 
   /// Create a copy of LogsState
   /// with the given fields replaced by the non-null parameter values.
@@ -1503,8 +1484,7 @@ abstract class _LogsState implements LogsState {
   const factory _LogsState(
       {final List<Log> logs,
       final List<String> keywords,
-      final String query,
-      final bool loading}) = _$LogsStateImpl;
+      final String query}) = _$LogsStateImpl;
 
   @override
   List<Log> get logs;
@@ -1512,8 +1492,6 @@ abstract class _LogsState implements LogsState {
   List<String> get keywords;
   @override
   String get query;
-  @override
-  bool get loading;
 
   /// Create a copy of LogsState
   /// with the given fields replaced by the non-null parameter values.
@@ -1528,7 +1506,6 @@ mixin _$ConnectionsState {
   List<Connection> get connections => throw _privateConstructorUsedError;
   List<String> get keywords => throw _privateConstructorUsedError;
   String get query => throw _privateConstructorUsedError;
-  bool get loading => throw _privateConstructorUsedError;
 
   /// Create a copy of ConnectionsState
   /// with the given fields replaced by the non-null parameter values.
@@ -1544,10 +1521,7 @@ abstract class $ConnectionsStateCopyWith<$Res> {
       _$ConnectionsStateCopyWithImpl<$Res, ConnectionsState>;
   @useResult
   $Res call(
-      {List<Connection> connections,
-      List<String> keywords,
-      String query,
-      bool loading});
+      {List<Connection> connections, List<String> keywords, String query});
 }
 
 /// @nodoc
@@ -1568,7 +1542,6 @@ class _$ConnectionsStateCopyWithImpl<$Res, $Val extends ConnectionsState>
     Object? connections = null,
     Object? keywords = null,
     Object? query = null,
-    Object? loading = null,
   }) {
     return _then(_value.copyWith(
       connections: null == connections
@@ -1583,10 +1556,6 @@ class _$ConnectionsStateCopyWithImpl<$Res, $Val extends ConnectionsState>
           ? _value.query
           : query // ignore: cast_nullable_to_non_nullable
               as String,
-      loading: null == loading
-          ? _value.loading
-          : loading // ignore: cast_nullable_to_non_nullable
-              as bool,
     ) as $Val);
   }
 }
@@ -1600,10 +1569,7 @@ abstract class _$$ConnectionsStateImplCopyWith<$Res>
   @override
   @useResult
   $Res call(
-      {List<Connection> connections,
-      List<String> keywords,
-      String query,
-      bool loading});
+      {List<Connection> connections, List<String> keywords, String query});
 }
 
 /// @nodoc
@@ -1622,7 +1588,6 @@ class __$$ConnectionsStateImplCopyWithImpl<$Res>
     Object? connections = null,
     Object? keywords = null,
     Object? query = null,
-    Object? loading = null,
   }) {
     return _then(_$ConnectionsStateImpl(
       connections: null == connections
@@ -1637,10 +1602,6 @@ class __$$ConnectionsStateImplCopyWithImpl<$Res>
           ? _value.query
           : query // ignore: cast_nullable_to_non_nullable
               as String,
-      loading: null == loading
-          ? _value.loading
-          : loading // ignore: cast_nullable_to_non_nullable
-              as bool,
     ));
   }
 }
@@ -1651,8 +1612,7 @@ class _$ConnectionsStateImpl implements _ConnectionsState {
   const _$ConnectionsStateImpl(
       {final List<Connection> connections = const [],
       final List<String> keywords = const [],
-      this.query = "",
-      this.loading = false})
+      this.query = ""})
       : _connections = connections,
         _keywords = keywords;
 
@@ -1677,13 +1637,10 @@ class _$ConnectionsStateImpl implements _ConnectionsState {
   @override
   @JsonKey()
   final String query;
-  @override
-  @JsonKey()
-  final bool loading;
 
   @override
   String toString() {
-    return 'ConnectionsState(connections: $connections, keywords: $keywords, query: $query, loading: $loading)';
+    return 'ConnectionsState(connections: $connections, keywords: $keywords, query: $query)';
   }
 
   @override
@@ -1694,8 +1651,7 @@ class _$ConnectionsStateImpl implements _ConnectionsState {
             const DeepCollectionEquality()
                 .equals(other._connections, _connections) &&
             const DeepCollectionEquality().equals(other._keywords, _keywords) &&
-            (identical(other.query, query) || other.query == query) &&
-            (identical(other.loading, loading) || other.loading == loading));
+            (identical(other.query, query) || other.query == query));
   }
 
   @override
@@ -1703,8 +1659,7 @@ class _$ConnectionsStateImpl implements _ConnectionsState {
       runtimeType,
       const DeepCollectionEquality().hash(_connections),
       const DeepCollectionEquality().hash(_keywords),
-      query,
-      loading);
+      query);
 
   /// Create a copy of ConnectionsState
   /// with the given fields replaced by the non-null parameter values.
@@ -1720,8 +1675,7 @@ abstract class _ConnectionsState implements ConnectionsState {
   const factory _ConnectionsState(
       {final List<Connection> connections,
       final List<String> keywords,
-      final String query,
-      final bool loading}) = _$ConnectionsStateImpl;
+      final String query}) = _$ConnectionsStateImpl;
 
   @override
   List<Connection> get connections;
@@ -1729,8 +1683,6 @@ abstract class _ConnectionsState implements ConnectionsState {
   List<String> get keywords;
   @override
   String get query;
-  @override
-  bool get loading;
 
   /// Create a copy of ConnectionsState
   /// with the given fields replaced by the non-null parameter values.
@@ -3226,243 +3178,3 @@ abstract class _Field implements Field {
   _$$FieldImplCopyWith<_$FieldImpl> get copyWith =>
       throw _privateConstructorUsedError;
 }
-
-TextPainterParams _$TextPainterParamsFromJson(Map<String, dynamic> json) {
-  return _TextPainterParams.fromJson(json);
-}
-
-/// @nodoc
-mixin _$TextPainterParams {
-  String? get text => throw _privateConstructorUsedError;
-  double? get fontSize => throw _privateConstructorUsedError;
-  double get textScaleFactor => throw _privateConstructorUsedError;
-  double get maxWidth => throw _privateConstructorUsedError;
-  int? get maxLines => throw _privateConstructorUsedError;
-
-  /// Serializes this TextPainterParams to a JSON map.
-  Map<String, dynamic> toJson() => throw _privateConstructorUsedError;
-
-  /// Create a copy of TextPainterParams
-  /// with the given fields replaced by the non-null parameter values.
-  @JsonKey(includeFromJson: false, includeToJson: false)
-  $TextPainterParamsCopyWith<TextPainterParams> get copyWith =>
-      throw _privateConstructorUsedError;
-}
-
-/// @nodoc
-abstract class $TextPainterParamsCopyWith<$Res> {
-  factory $TextPainterParamsCopyWith(
-          TextPainterParams value, $Res Function(TextPainterParams) then) =
-      _$TextPainterParamsCopyWithImpl<$Res, TextPainterParams>;
-  @useResult
-  $Res call(
-      {String? text,
-      double? fontSize,
-      double textScaleFactor,
-      double maxWidth,
-      int? maxLines});
-}
-
-/// @nodoc
-class _$TextPainterParamsCopyWithImpl<$Res, $Val extends TextPainterParams>
-    implements $TextPainterParamsCopyWith<$Res> {
-  _$TextPainterParamsCopyWithImpl(this._value, this._then);
-
-  // ignore: unused_field
-  final $Val _value;
-  // ignore: unused_field
-  final $Res Function($Val) _then;
-
-  /// Create a copy of TextPainterParams
-  /// with the given fields replaced by the non-null parameter values.
-  @pragma('vm:prefer-inline')
-  @override
-  $Res call({
-    Object? text = freezed,
-    Object? fontSize = freezed,
-    Object? textScaleFactor = null,
-    Object? maxWidth = null,
-    Object? maxLines = freezed,
-  }) {
-    return _then(_value.copyWith(
-      text: freezed == text
-          ? _value.text
-          : text // ignore: cast_nullable_to_non_nullable
-              as String?,
-      fontSize: freezed == fontSize
-          ? _value.fontSize
-          : fontSize // ignore: cast_nullable_to_non_nullable
-              as double?,
-      textScaleFactor: null == textScaleFactor
-          ? _value.textScaleFactor
-          : textScaleFactor // ignore: cast_nullable_to_non_nullable
-              as double,
-      maxWidth: null == maxWidth
-          ? _value.maxWidth
-          : maxWidth // ignore: cast_nullable_to_non_nullable
-              as double,
-      maxLines: freezed == maxLines
-          ? _value.maxLines
-          : maxLines // ignore: cast_nullable_to_non_nullable
-              as int?,
-    ) as $Val);
-  }
-}
-
-/// @nodoc
-abstract class _$$TextPainterParamsImplCopyWith<$Res>
-    implements $TextPainterParamsCopyWith<$Res> {
-  factory _$$TextPainterParamsImplCopyWith(_$TextPainterParamsImpl value,
-          $Res Function(_$TextPainterParamsImpl) then) =
-      __$$TextPainterParamsImplCopyWithImpl<$Res>;
-  @override
-  @useResult
-  $Res call(
-      {String? text,
-      double? fontSize,
-      double textScaleFactor,
-      double maxWidth,
-      int? maxLines});
-}
-
-/// @nodoc
-class __$$TextPainterParamsImplCopyWithImpl<$Res>
-    extends _$TextPainterParamsCopyWithImpl<$Res, _$TextPainterParamsImpl>
-    implements _$$TextPainterParamsImplCopyWith<$Res> {
-  __$$TextPainterParamsImplCopyWithImpl(_$TextPainterParamsImpl _value,
-      $Res Function(_$TextPainterParamsImpl) _then)
-      : super(_value, _then);
-
-  /// Create a copy of TextPainterParams
-  /// with the given fields replaced by the non-null parameter values.
-  @pragma('vm:prefer-inline')
-  @override
-  $Res call({
-    Object? text = freezed,
-    Object? fontSize = freezed,
-    Object? textScaleFactor = null,
-    Object? maxWidth = null,
-    Object? maxLines = freezed,
-  }) {
-    return _then(_$TextPainterParamsImpl(
-      text: freezed == text
-          ? _value.text
-          : text // ignore: cast_nullable_to_non_nullable
-              as String?,
-      fontSize: freezed == fontSize
-          ? _value.fontSize
-          : fontSize // ignore: cast_nullable_to_non_nullable
-              as double?,
-      textScaleFactor: null == textScaleFactor
-          ? _value.textScaleFactor
-          : textScaleFactor // ignore: cast_nullable_to_non_nullable
-              as double,
-      maxWidth: null == maxWidth
-          ? _value.maxWidth
-          : maxWidth // ignore: cast_nullable_to_non_nullable
-              as double,
-      maxLines: freezed == maxLines
-          ? _value.maxLines
-          : maxLines // ignore: cast_nullable_to_non_nullable
-              as int?,
-    ));
-  }
-}
-
-/// @nodoc
-@JsonSerializable()
-class _$TextPainterParamsImpl implements _TextPainterParams {
-  const _$TextPainterParamsImpl(
-      {required this.text,
-      required this.fontSize,
-      required this.textScaleFactor,
-      this.maxWidth = double.infinity,
-      this.maxLines});
-
-  factory _$TextPainterParamsImpl.fromJson(Map<String, dynamic> json) =>
-      _$$TextPainterParamsImplFromJson(json);
-
-  @override
-  final String? text;
-  @override
-  final double? fontSize;
-  @override
-  final double textScaleFactor;
-  @override
-  @JsonKey()
-  final double maxWidth;
-  @override
-  final int? maxLines;
-
-  @override
-  String toString() {
-    return 'TextPainterParams(text: $text, fontSize: $fontSize, textScaleFactor: $textScaleFactor, maxWidth: $maxWidth, maxLines: $maxLines)';
-  }
-
-  @override
-  bool operator ==(Object other) {
-    return identical(this, other) ||
-        (other.runtimeType == runtimeType &&
-            other is _$TextPainterParamsImpl &&
-            (identical(other.text, text) || other.text == text) &&
-            (identical(other.fontSize, fontSize) ||
-                other.fontSize == fontSize) &&
-            (identical(other.textScaleFactor, textScaleFactor) ||
-                other.textScaleFactor == textScaleFactor) &&
-            (identical(other.maxWidth, maxWidth) ||
-                other.maxWidth == maxWidth) &&
-            (identical(other.maxLines, maxLines) ||
-                other.maxLines == maxLines));
-  }
-
-  @JsonKey(includeFromJson: false, includeToJson: false)
-  @override
-  int get hashCode => Object.hash(
-      runtimeType, text, fontSize, textScaleFactor, maxWidth, maxLines);
-
-  /// Create a copy of TextPainterParams
-  /// with the given fields replaced by the non-null parameter values.
-  @JsonKey(includeFromJson: false, includeToJson: false)
-  @override
-  @pragma('vm:prefer-inline')
-  _$$TextPainterParamsImplCopyWith<_$TextPainterParamsImpl> get copyWith =>
-      __$$TextPainterParamsImplCopyWithImpl<_$TextPainterParamsImpl>(
-          this, _$identity);
-
-  @override
-  Map<String, dynamic> toJson() {
-    return _$$TextPainterParamsImplToJson(
-      this,
-    );
-  }
-}
-
-abstract class _TextPainterParams implements TextPainterParams {
-  const factory _TextPainterParams(
-      {required final String? text,
-      required final double? fontSize,
-      required final double textScaleFactor,
-      final double maxWidth,
-      final int? maxLines}) = _$TextPainterParamsImpl;
-
-  factory _TextPainterParams.fromJson(Map<String, dynamic> json) =
-      _$TextPainterParamsImpl.fromJson;
-
-  @override
-  String? get text;
-  @override
-  double? get fontSize;
-  @override
-  double get textScaleFactor;
-  @override
-  double get maxWidth;
-  @override
-  int? get maxLines;
-
-  /// Create a copy of TextPainterParams
-  /// with the given fields replaced by the non-null parameter values.
-  @override
-  @JsonKey(includeFromJson: false, includeToJson: false)
-  _$$TextPainterParamsImplCopyWith<_$TextPainterParamsImpl> get copyWith =>
-      throw _privateConstructorUsedError;
-}

lib/models/generated/common.g.dart

@@ -198,23 +198,3 @@ const _$KeyboardModifierEnumMap = {
   KeyboardModifier.meta: 'meta',
   KeyboardModifier.shift: 'shift',
 };
-
-_$TextPainterParamsImpl _$$TextPainterParamsImplFromJson(
-        Map<String, dynamic> json) =>
-    _$TextPainterParamsImpl(
-      text: json['text'] as String?,
-      fontSize: (json['fontSize'] as num?)?.toDouble(),
-      textScaleFactor: (json['textScaleFactor'] as num).toDouble(),
-      maxWidth: (json['maxWidth'] as num?)?.toDouble() ?? double.infinity,
-      maxLines: (json['maxLines'] as num?)?.toInt(),
-    );
-
-Map<String, dynamic> _$$TextPainterParamsImplToJson(
-        _$TextPainterParamsImpl instance) =>
-    <String, dynamic>{
-      'text': instance.text,
-      'fontSize': instance.fontSize,
-      'textScaleFactor': instance.textScaleFactor,
-      'maxWidth': instance.maxWidth,
-      'maxLines': instance.maxLines,
-    };

lib/models/generated/config.freezed.dart

@@ -38,7 +38,6 @@ mixin _$AppSettingProps {
   bool get minimizeOnExit => throw _privateConstructorUsedError;
   bool get hidden => throw _privateConstructorUsedError;
   bool get developerMode => throw _privateConstructorUsedError;
-  RecoveryStrategy get recoveryStrategy => throw _privateConstructorUsedError;
 
   /// Serializes this AppSettingProps to a JSON map.
   Map<String, dynamic> toJson() => throw _privateConstructorUsedError;
@@ -73,8 +72,7 @@ abstract class $AppSettingPropsCopyWith<$Res> {
       bool disclaimerAccepted,
       bool minimizeOnExit,
       bool hidden,
-      bool developerMode,
-      RecoveryStrategy recoveryStrategy});
+      bool developerMode});
 }
 
 /// @nodoc
@@ -108,7 +106,6 @@ class _$AppSettingPropsCopyWithImpl<$Res, $Val extends AppSettingProps>
     Object? minimizeOnExit = null,
     Object? hidden = null,
     Object? developerMode = null,
-    Object? recoveryStrategy = null,
   }) {
     return _then(_value.copyWith(
       locale: freezed == locale
@@ -175,10 +172,6 @@ class _$AppSettingPropsCopyWithImpl<$Res, $Val extends AppSettingProps>
           ? _value.developerMode
           : developerMode // ignore: cast_nullable_to_non_nullable
               as bool,
-      recoveryStrategy: null == recoveryStrategy
-          ? _value.recoveryStrategy
-          : recoveryStrategy // ignore: cast_nullable_to_non_nullable
-              as RecoveryStrategy,
     ) as $Val);
   }
 }
@@ -208,8 +201,7 @@ abstract class _$$AppSettingPropsImplCopyWith<$Res>
       bool disclaimerAccepted,
       bool minimizeOnExit,
       bool hidden,
-      bool developerMode,
-      RecoveryStrategy recoveryStrategy});
+      bool developerMode});
 }
 
 /// @nodoc
@@ -241,7 +233,6 @@ class __$$AppSettingPropsImplCopyWithImpl<$Res>
     Object? minimizeOnExit = null,
     Object? hidden = null,
     Object? developerMode = null,
-    Object? recoveryStrategy = null,
   }) {
     return _then(_$AppSettingPropsImpl(
       locale: freezed == locale
@@ -308,10 +299,6 @@ class __$$AppSettingPropsImplCopyWithImpl<$Res>
           ? _value.developerMode
           : developerMode // ignore: cast_nullable_to_non_nullable
               as bool,
-      recoveryStrategy: null == recoveryStrategy
-          ? _value.recoveryStrategy
-          : recoveryStrategy // ignore: cast_nullable_to_non_nullable
-              as RecoveryStrategy,
     ));
   }
 }
@@ -327,7 +314,7 @@ class _$AppSettingPropsImpl implements _AppSettingProps {
       this.autoLaunch = false,
       this.silentLaunch = false,
       this.autoRun = false,
-      this.openLogs = false,
+      this.openLogs = true,
       this.closeConnections = true,
       this.testUrl = defaultTestUrl,
       this.isAnimateToPage = true,
@@ -336,8 +323,7 @@ class _$AppSettingPropsImpl implements _AppSettingProps {
       this.disclaimerAccepted = false,
       this.minimizeOnExit = true,
       this.hidden = false,
-      this.developerMode = false,
-      this.recoveryStrategy = RecoveryStrategy.compatible})
+      this.developerMode = false})
       : _dashboardWidgets = dashboardWidgets;
 
   factory _$AppSettingPropsImpl.fromJson(Map<String, dynamic> json) =>
@@ -397,13 +383,10 @@ class _$AppSettingPropsImpl implements _AppSettingProps {
   @override
   @JsonKey()
   final bool developerMode;
-  @override
-  @JsonKey()
-  final RecoveryStrategy recoveryStrategy;
 
   @override
   String toString() {
-    return 'AppSettingProps(locale: $locale, dashboardWidgets: $dashboardWidgets, onlyStatisticsProxy: $onlyStatisticsProxy, autoLaunch: $autoLaunch, silentLaunch: $silentLaunch, autoRun: $autoRun, openLogs: $openLogs, closeConnections: $closeConnections, testUrl: $testUrl, isAnimateToPage: $isAnimateToPage, autoCheckUpdate: $autoCheckUpdate, showLabel: $showLabel, disclaimerAccepted: $disclaimerAccepted, minimizeOnExit: $minimizeOnExit, hidden: $hidden, developerMode: $developerMode, recoveryStrategy: $recoveryStrategy)';
+    return 'AppSettingProps(locale: $locale, dashboardWidgets: $dashboardWidgets, onlyStatisticsProxy: $onlyStatisticsProxy, autoLaunch: $autoLaunch, silentLaunch: $silentLaunch, autoRun: $autoRun, openLogs: $openLogs, closeConnections: $closeConnections, testUrl: $testUrl, isAnimateToPage: $isAnimateToPage, autoCheckUpdate: $autoCheckUpdate, showLabel: $showLabel, disclaimerAccepted: $disclaimerAccepted, minimizeOnExit: $minimizeOnExit, hidden: $hidden, developerMode: $developerMode)';
   }
 
   @override
@@ -438,9 +421,7 @@ class _$AppSettingPropsImpl implements _AppSettingProps {
                 other.minimizeOnExit == minimizeOnExit) &&
             (identical(other.hidden, hidden) || other.hidden == hidden) &&
             (identical(other.developerMode, developerMode) ||
-                other.developerMode == developerMode) &&
-            (identical(other.recoveryStrategy, recoveryStrategy) ||
-                other.recoveryStrategy == recoveryStrategy));
+                other.developerMode == developerMode));
   }
 
   @JsonKey(includeFromJson: false, includeToJson: false)
@@ -462,8 +443,7 @@ class _$AppSettingPropsImpl implements _AppSettingProps {
       disclaimerAccepted,
       minimizeOnExit,
       hidden,
-      developerMode,
-      recoveryStrategy);
+      developerMode);
 
   /// Create a copy of AppSettingProps
   /// with the given fields replaced by the non-null parameter values.
@@ -500,8 +480,7 @@ abstract class _AppSettingProps implements AppSettingProps {
       final bool disclaimerAccepted,
       final bool minimizeOnExit,
       final bool hidden,
-      final bool developerMode,
-      final RecoveryStrategy recoveryStrategy}) = _$AppSettingPropsImpl;
+      final bool developerMode}) = _$AppSettingPropsImpl;
 
   factory _AppSettingProps.fromJson(Map<String, dynamic> json) =
       _$AppSettingPropsImpl.fromJson;
@@ -539,8 +518,6 @@ abstract class _AppSettingProps implements AppSettingProps {
   bool get hidden;
   @override
   bool get developerMode;
-  @override
-  RecoveryStrategy get recoveryStrategy;
 
   /// Create a copy of AppSettingProps
   /// with the given fields replaced by the non-null parameter values.
@@ -2127,7 +2104,7 @@ class _$ThemePropsImpl implements _ThemeProps {
       {this.primaryColor,
       final List<int> primaryColors = defaultPrimaryColors,
       this.themeMode = ThemeMode.dark,
-      this.schemeVariant = DynamicSchemeVariant.content,
+      this.schemeVariant = DynamicSchemeVariant.tonalSpot,
       this.pureBlack = false,
       this.textScale = const TextScale()})
       : _primaryColors = primaryColors;

lib/models/generated/config.g.dart

@@ -17,7 +17,7 @@ _$AppSettingPropsImpl _$$AppSettingPropsImplFromJson(
       autoLaunch: json['autoLaunch'] as bool? ?? false,
       silentLaunch: json['silentLaunch'] as bool? ?? false,
       autoRun: json['autoRun'] as bool? ?? false,
-      openLogs: json['openLogs'] as bool? ?? false,
+      openLogs: json['openLogs'] as bool? ?? true,
       closeConnections: json['closeConnections'] as bool? ?? true,
       testUrl: json['testUrl'] as String? ?? defaultTestUrl,
       isAnimateToPage: json['isAnimateToPage'] as bool? ?? true,
@@ -27,9 +27,6 @@ _$AppSettingPropsImpl _$$AppSettingPropsImplFromJson(
       minimizeOnExit: json['minimizeOnExit'] as bool? ?? true,
       hidden: json['hidden'] as bool? ?? false,
       developerMode: json['developerMode'] as bool? ?? false,
-      recoveryStrategy: $enumDecodeNullable(
-              _$RecoveryStrategyEnumMap, json['recoveryStrategy']) ??
-          RecoveryStrategy.compatible,
     );
 
 Map<String, dynamic> _$$AppSettingPropsImplToJson(
@@ -53,14 +50,8 @@ Map<String, dynamic> _$$AppSettingPropsImplToJson(
       'minimizeOnExit': instance.minimizeOnExit,
       'hidden': instance.hidden,
       'developerMode': instance.developerMode,
-      'recoveryStrategy': _$RecoveryStrategyEnumMap[instance.recoveryStrategy]!,
     };
 
-const _$RecoveryStrategyEnumMap = {
-  RecoveryStrategy.compatible: 'compatible',
-  RecoveryStrategy.override: 'override',
-};
-
 const _$DashboardWidgetEnumMap = {
   DashboardWidget.networkSpeed: 'networkSpeed',
   DashboardWidget.outboundModeV2: 'outboundModeV2',
@@ -257,7 +248,7 @@ _$ThemePropsImpl _$$ThemePropsImplFromJson(Map<String, dynamic> json) =>
           ThemeMode.dark,
       schemeVariant: $enumDecodeNullable(
               _$DynamicSchemeVariantEnumMap, json['schemeVariant']) ??
-          DynamicSchemeVariant.content,
+          DynamicSchemeVariant.tonalSpot,
       pureBlack: json['pureBlack'] as bool? ?? false,
       textScale: json['textScale'] == null
           ? const TextScale()