Optimize startTun performance

Support custom text scaling
Optimize the display of different text scale Optimize windows setup experience
2025-04-25 22:34:37 +08:00 · 2025-04-25 17:38:26 +08:00 · 2025-04-22 16:05:24 +08:00
74 changed files with 496 additions and 1278 deletions
--- a/.github/workflows/build.yaml
+++ b/.github/workflows/build.yaml
@@ -19,7 +19,7 @@ jobs:
            os: windows-latest
            arch: amd64
          - platform: linux
-            os: ubuntu-22.04
+            os: ubuntu-latest
            arch: amd64
          - platform: macos
            os: macos-13
--- a/CHANGELOG.md
+++ b/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
--- a/README.md
+++ b/README.md
@@ -41,8 +41,8 @@ on Mobile:
 ⚠️ Make sure to install the following dependencies before using them

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

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

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

 ### Android
--- a/android/app/src/main/kotlin/com/follow/clash/services/FlClashVpnService.kt
+++ b/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
--- a/android/core/build.gradle.kts
+++ b/android/core/build.gradle.kts
@@ -1,3 +1,5 @@
+import com.android.build.gradle.tasks.MergeSourceSetFolders
+
 plugins {
    id("com.android.library")
    id("org.jetbrains.kotlin.android")
@@ -35,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") {
@@ -60,4 +58,8 @@ afterEvaluate {
    tasks.named("preBuild") {
        dependsOn(copyNativeLibs)
    }
+}
+
+dependencies {
+    implementation("androidx.core:core-ktx:1.16.0")
 }
--- a/android/core/src/main/cpp/CMakeLists.txt
+++ b/android/core/src/main/cpp/CMakeLists.txt
@@ -21,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")
--- a/arb/intl_en.arb
+++ b/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"
 }
--- a/arb/intl_ja.arb
+++ b/arb/intl_ja.arb
@@ -396,10 +396,5 @@
  "textScale": "テキストスケーリング",
  "internet": "インターネット",
  "systemApp": "システムアプリ",
-  "noNetworkApp": "ネットワークなしアプリ",
-  "contactMe": "連絡する",
-  "recoveryStrategy": "リカバリー戦略",
-  "recoveryStrategy_override": "オーバーライド",
-  "recoveryStrategy_compatible": "互換性",
-  "logsTest": "ログテスト"
+  "noNetworkApp": "ネットワークなしアプリ"
 }
--- a/arb/intl_ru.arb
+++ b/arb/intl_ru.arb
@@ -396,10 +396,5 @@
  "textScale": "Масштабирование текста",
  "internet": "Интернет",
  "systemApp": "Системное приложение",
-  "noNetworkApp": "Приложение без сети",
-  "contactMe": "Свяжитесь со мной",
-  "recoveryStrategy": "Стратегия восстановления",
-  "recoveryStrategy_override": "Переопределение",
-  "recoveryStrategy_compatible": "Совместимый",
-  "logsTest": "Тест журналов"
+  "noNetworkApp": "Приложение без сети"
 }
--- a/arb/intl_zh_CN.arb
+++ b/arb/intl_zh_CN.arb
@@ -396,10 +396,5 @@
  "textScale": "文本缩放",
  "internet": "互联网",
  "systemApp": "系统应用",
-  "noNetworkApp": "无网络应用",
-  "contactMe": "联系我",
-  "recoveryStrategy": "恢复策略",
-  "recoveryStrategy_override": "覆盖",
-  "recoveryStrategy_compatible": "兼容",
-  "logsTest": "日志测试"
+  "noNetworkApp": "无网络应用"
 }
--- a/core/Clash.Meta
+++ b/core/Clash.Meta
--- a/lib/clash/interface.dart
+++ b/lib/clash/interface.dart
@@ -245,6 +245,7 @@ abstract class ClashHandlerInterface with ClashInterface {
    );
  }

+
  @override
  Future<bool> crash() {
    return invoke<bool>(
--- a/lib/clash/service.dart
+++ b/lib/clash/service.dart
@@ -71,9 +71,9 @@ class ClashService extends ClashHandlerInterface {
      }
    }, (error, stack) {
      commonPrint.log(error.toString());
-      if (error is SocketException) {
+      if(error is SocketException){
        globalState.showNotifier(error.toString());
-        // globalState.appController.restartCore();
+        globalState.appController.restartCore();
      }
    });
  }
@@ -92,11 +92,12 @@ class ClashService extends ClashHandlerInterface {
    final arg = Platform.isWindows
        ? "${serverSocket.port}"
        : serverSocket.address.address;
+    bool isSuccess = false;
    if (Platform.isWindows && await system.checkIsAdmin()) {
-      final isSuccess = await request.startCoreByHelper(arg);
-      if (isSuccess) {
-        return;
-      }
+      isSuccess = await request.startCoreByHelper(arg);
+    }
+    if (isSuccess) {
+      return;
    }
    process = await Process.start(
      appPath.corePath,
--- a/lib/common/common.dart
+++ b/lib/common/common.dart
@@ -12,7 +12,7 @@ export 'iterable.dart';
 export 'keyboard.dart';
 export 'launch.dart';
 export 'link.dart';
-export 'fixed.dart';
+export 'list.dart';
 export 'lock.dart';
 export 'measure.dart';
 export 'navigation.dart';
--- a/lib/common/constant.dart
+++ b/lib/common/constant.dart
@@ -16,8 +16,7 @@ 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,
@@ -76,24 +75,22 @@ const viewModeColumnsMap = {
  ViewMode.desktop: [4, 3],
 };

-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,
 ];
--- a/lib/common/fixed.dart
+++ b/lib/common/fixed.dart
@@ -1,79 +0,0 @@
-import 'iterable.dart';
-
-class FixedList<T> {
-  final int maxLength;
-  final List<T> _list;
-
-  FixedList(this.maxLength, {List<T>? list})
-      : _list = (list ?? [])..truncate(maxLength);
-
-  add(T item) {
-    _list.add(item);
-    _list.truncate(maxLength);
-  }
-
-  clear() {
-    _list.clear();
-  }
-
-  List<T> get list => List.unmodifiable(_list);
-
-  int get length => _list.length;
-
-  T operator [](int index) => _list[index];
-
-  FixedList<T> copyWith() {
-    return FixedList(
-      maxLength,
-      list: _list,
-    );
-  }
-}
-
-class FixedMap<K, V> {
-  int maxLength;
-  late Map<K, V> _map;
-
-  FixedMap(this.maxLength, {Map<K, V>? map}) {
-    _map = map ?? {};
-  }
-
-  updateCacheValue(K key, V Function() callback) {
-    final realValue = _map.updateCacheValue(
-      key,
-      callback,
-    );
-    _adjustMap();
-    return realValue;
-  }
-
-  clear() {
-    _map.clear();
-  }
-
-  updateMaxLength(int size) {
-    maxLength = size;
-    _adjustMap();
-  }
-
-  updateMap(Map<K, V> map) {
-    _map = map;
-    _adjustMap();
-  }
-
-  _adjustMap() {
-    if (_map.length > maxLength) {
-      _map = Map.fromEntries(
-        map.entries.toList()..truncate(maxLength),
-      );
-    }
-  }
-
-  V? get(K key) => _map[key];
-
-  bool containsKey(K key) => _map.containsKey(key);
-
-  int get length => _map.length;
-
-  Map<K, V> get map => Map.unmodifiable(_map);
-}
--- a/lib/common/iterable.dart
+++ b/lib/common/iterable.dart
@@ -38,43 +38,6 @@ extension IterableExt<T> on Iterable<T> {
      count++;
    }
  }
-
-  Iterable<T> takeLast({int count = 50}) {
-    if (count <= 0) return Iterable.empty();
-    return count >= length ? this : toList().skip(length - count);
-  }
-}
-
-extension ListExt<T> on List<T> {
-  void truncate(int maxLength) {
-    assert(maxLength > 0);
-    if (length > maxLength) {
-      removeRange(0, length - maxLength);
-    }
-  }
-
-  List<T> intersection(List<T> list) {
-    return where((item) => list.contains(item)).toList();
-  }
-
-  List<List<T>> batch(int maxConcurrent) {
-    final batches = (length / maxConcurrent).ceil();
-    final List<List<T>> res = [];
-    for (int i = 0; i < batches; i++) {
-      if (i != batches - 1) {
-        res.add(sublist(i * maxConcurrent, maxConcurrent * (i + 1)));
-      } else {
-        res.add(sublist(i * maxConcurrent, length));
-      }
-    }
-    return res;
-  }
-
-  List<T> safeSublist(int start) {
-    if (start <= 0) return this;
-    if (start > length) return [];
-    return sublist(start);
-  }
 }

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

 extension MapExt<K, V> on Map<K, V> {
-  updateCacheValue(K key, V Function() callback) {
+  getCacheValue(K key, V defaultValue) {
    if (this[key] == null) {
-      this[key] = callback();
+      this[key] = defaultValue;
    }
    return this[key];
  }
--- a/lib/common/list.dart
+++ b/lib/common/list.dart
@@ -0,0 +1,93 @@
+import 'dart:collection';
+
+class FixedList<T> {
+  final int maxLength;
+  final List<T> _list;
+
+  FixedList(this.maxLength, {List<T>? list}) : _list = list ?? [];
+
+  add(T item) {
+    if (_list.length == maxLength) {
+      _list.removeAt(0);
+    }
+    _list.add(item);
+  }
+
+  clear() {
+    _list.clear();
+  }
+
+  List<T> get list => List.unmodifiable(_list);
+
+  int get length => _list.length;
+
+  T operator [](int index) => _list[index];
+
+  FixedList<T> copyWith() {
+    return FixedList(
+      maxLength,
+      list: _list,
+    );
+  }
+}
+
+class FixedMap<K, V> {
+  int maxSize;
+  final Map<K, V> _map = {};
+  final Queue<K> _queue = Queue<K>();
+
+  FixedMap(this.maxSize);
+
+  put(K key, V value) {
+    if (_map.length == maxSize) {
+      final oldestKey = _queue.removeFirst();
+      _map.remove(oldestKey);
+    }
+    _map[key] = value;
+    _queue.add(key);
+    return value;
+  }
+
+  clear() {
+    _map.clear();
+    _queue.clear();
+  }
+
+  updateMaxSize(int size){
+    maxSize = size;
+  }
+
+  V? get(K key) => _map[key];
+
+
+  bool containsKey(K key) => _map.containsKey(key);
+
+  int get length => _map.length;
+
+  Map<K, V> get map => Map.unmodifiable(_map);
+}
+
+extension ListExtension<T> on List<T> {
+  List<T> intersection(List<T> list) {
+    return where((item) => list.contains(item)).toList();
+  }
+
+  List<List<T>> batch(int maxConcurrent) {
+    final batches = (length / maxConcurrent).ceil();
+    final List<List<T>> res = [];
+    for (int i = 0; i < batches; i++) {
+      if (i != batches - 1) {
+        res.add(sublist(i * maxConcurrent, maxConcurrent * (i + 1)));
+      } else {
+        res.add(sublist(i * maxConcurrent, length));
+      }
+    }
+    return res;
+  }
+
+  List<T> safeSublist(int start) {
+    if (start <= 0) return this;
+    if (start > length) return [];
+    return sublist(start);
+  }
+}
--- a/lib/common/measure.dart
+++ b/lib/common/measure.dart
@@ -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,
--- a/lib/common/navigation.dart
+++ b/lib/common/navigation.dart
@@ -14,6 +14,7 @@ class Navigation {
      const NavigationItem(
        icon: Icon(Icons.space_dashboard),
        label: PageLabel.dashboard,
+        keep: false,
        fragment: DashboardFragment(
          key: GlobalObjectKey(PageLabel.dashboard),
        ),
--- a/lib/common/request.dart
+++ b/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;
    }
--- a/lib/common/system.dart
+++ b/lib/common/system.dart
@@ -55,24 +55,18 @@ class System {
  }

  Future<AuthorizeCode> authorizeCore() async {
-    if (Platform.isAndroid) {
-      return AuthorizeCode.none;
-    }
    final corePath = appPath.corePath.replaceAll(' ', '\\\\ ');
    final isAdmin = await checkIsAdmin();
    if (isAdmin) {
      return AuthorizeCode.none;
    }
-
    if (Platform.isWindows) {
      final result = await windows?.registerService();
      if (result == true) {
        return AuthorizeCode.success;
      }
      return AuthorizeCode.error;
-    }
-
-    if (Platform.isMacOS) {
+    } else if (Platform.isMacOS) {
      final shell = 'chown root:admin $corePath; chmod +sx $corePath';
      final arguments = [
        "-e",
--- a/lib/common/theme.dart
+++ b/lib/common/theme.dart
@@ -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),
    );
  }
 }
--- a/lib/controller.dart
+++ b/lib/controller.dart
@@ -260,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:
@@ -312,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) {
@@ -398,9 +396,9 @@ class AppController {
  handleExit() async {
    try {
      await updateStatus(false);
-      await proxy?.stopProxy();
      await clashCore.shutdown();
      await clashService?.destroy();
+      await proxy?.stopProxy();
      await savePreferences();
    } finally {
      system.exit();
@@ -489,10 +487,10 @@ 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();
  }
@@ -942,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) {
--- a/lib/enum/enum.dart
+++ b/lib/enum/enum.dart
@@ -471,14 +471,3 @@ enum RuleTarget {
  DIRECT,
  REJECT,
 }
-
-enum RecoveryStrategy {
-  compatible,
-  override,
-}
-
-enum CacheTag {
-  logs,
-  rules,
-  requests,
-}
--- a/lib/fragments/about.dart
+++ b/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: () {
--- a/lib/fragments/backup_and_recovery.dart
+++ b/lib/fragments/backup_and_recovery.dart
@@ -8,12 +8,10 @@ import 'package:fl_clash/providers/config.dart';
 import 'package:fl_clash/state.dart';
 import 'package:fl_clash/widgets/dialog.dart';
 import 'package:fl_clash/widgets/fade_box.dart';
-import 'package:fl_clash/widgets/input.dart';
 import 'package:fl_clash/widgets/list.dart';
 import 'package:fl_clash/widgets/text.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_riverpod/flutter_riverpod.dart';
-import 'package:intl/intl.dart';

 class BackupAndRecovery extends ConsumerWidget {
  const BackupAndRecovery({super.key});
@@ -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);
@@ -282,26 +256,6 @@ class BackupAndRecovery extends ConsumerWidget {
          title: Text(appLocalizations.recovery),
          subtitle: Text(appLocalizations.localRecoveryDesc),
        ),
-        ListHeader(title: appLocalizations.options),
-        Consumer(builder: (_, ref, __) {
-          final recoveryStrategy = ref.watch(appSettingProvider.select(
-            (state) => state.recoveryStrategy,
-          ));
-          return ListItem(
-            onTap: () {
-              _handleUpdateRecoveryStrategy(ref);
-            },
-            title: Text(appLocalizations.recoveryStrategy),
-            trailing: FilledButton(
-              onPressed: () {
-                _handleUpdateRecoveryStrategy(ref);
-              },
-              child: Text(
-                Intl.message("recoveryStrategy_${recoveryStrategy.name}"),
-              ),
-            ),
-          );
-        }),
      ],
    );
  }
--- a/lib/fragments/connection/requests.dart
+++ b/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
@@ -127,42 +132,6 @@ class _RequestsFragmentState extends ConsumerState<RequestsFragment>
    }, 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(
@@ -176,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(
@@ -206,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();
            },
          ),
        );
--- a/lib/fragments/dashboard/widgets/start_button.dart
+++ b/lib/fragments/dashboard/widgets/start_button.dart
@@ -1,5 +1,6 @@
 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';
--- a/lib/fragments/developer.dart
+++ b/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();
@@ -112,7 +78,7 @@ class DeveloperView extends ConsumerWidget {
          SizedBox(
            height: 16,
          ),
-          _getDeveloperList(context, ref)
+          _getDeveloperList(context)
        ],
      ),
    );
--- a/lib/fragments/logs.dart
+++ b/lib/fragments/logs.dart
@@ -1,5 +1,3 @@
-import 'dart:math';
-
 import 'package:fl_clash/common/common.dart';
 import 'package:fl_clash/enum/enum.dart';
 import 'package:fl_clash/providers/providers.dart';
@@ -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,12 +123,12 @@ 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() {
@@ -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();
          },
        );
      },
--- a/lib/fragments/profiles/override_profile.dart
+++ b/lib/fragments/profiles/override_profile.dart
@@ -23,6 +23,7 @@ class OverrideProfile extends StatefulWidget {
 }

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

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

+  _handleTryClearCache(double maxWidth) {
+    if (_currentMaxWidth != maxWidth) {
+      _currentMaxWidth = maxWidth;
+      _ruleListKey.currentState?.clearCache();
+    }
+  }
+
  _buildContent() {
    return Consumer(
      builder: (_, ref, child) {
@@ -108,7 +116,7 @@ class _OverrideProfileState extends State<OverrideProfile> {
      },
      child: LayoutBuilder(
        builder: (_, constraints) {
-          _currentMaxWidth = constraints.maxWidth - 104;
+          _handleTryClearCache(constraints.maxWidth - 104);
          return CommonAutoHiddenScrollBar(
            controller: _controller,
            child: CustomScrollView(
@@ -140,6 +148,7 @@ class _OverrideProfileState extends State<OverrideProfile> {
                  padding: EdgeInsets.symmetric(horizontal: 16.0, vertical: 0),
                  sliver: RuleContent(
                    maxWidth: _currentMaxWidth,
+                    ruleListKey: _ruleListKey,
                  ),
                ),
                SliverToBoxAdapter(
@@ -440,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,
  });

@@ -591,7 +602,7 @@ class RuleContent extends ConsumerWidget {
      );
    }
    return CacheItemExtentSliverReorderableList(
-      tag: CacheTag.rules,
+      key: ruleListKey,
      itemBuilder: (context, index) {
        final rule = rules[index];
        return GestureDetector(
--- a/lib/fragments/profiles/profiles.dart
+++ b/lib/fragments/profiles/profiles.dart
@@ -370,7 +370,7 @@ class ProfileItem extends StatelessWidget {
          ),
        ),
        title: Container(
-          padding: const EdgeInsets.symmetric(vertical: 4),
+          padding: const EdgeInsets.symmetric(vertical: 8),
          child: Column(
            crossAxisAlignment: CrossAxisAlignment.start,
            mainAxisAlignment: MainAxisAlignment.center,
--- a/lib/fragments/proxies/proxies.dart
+++ b/lib/fragments/proxies/proxies.dart
@@ -123,13 +123,8 @@ class _ProxiesFragmentState extends ConsumerState<ProxiesFragment>

  @override
  Widget build(BuildContext context) {
-    final proxiesType = ref.watch(
-      proxiesStyleSettingProvider.select(
-        (state) => state.type,
-      ),
-    );
-
-    ref.watch(themeSettingProvider.select((state) => state.textScale));
+    final proxiesType =
+        ref.watch(proxiesStyleSettingProvider.select((state) => state.type));
    return switch (proxiesType) {
      ProxiesType.tab => ProxiesTabFragment(
          key: _proxiesTabKey,
--- a/lib/fragments/resources.dart
+++ b/lib/fragments/resources.dart
@@ -147,21 +147,22 @@ class _GeoDataListItemState extends State<GeoDataListItem> {
            FutureBuilder<FileInfo>(
              future: _getGeoFileLastModified(geoItem.fileName),
              builder: (_, snapshot) {
-                final height = globalState.measure.bodyMediumHeight;
                return SizedBox(
-                  height: height,
-                  child: snapshot.data == null
-                      ? SizedBox(
-                          width: height,
-                          height: height,
-                          child: CircularProgressIndicator(
-                            strokeWidth: 2,
+                  height: 24,
+                  child: FadeThroughBox(
+                    key: Key("fade_box_${geoItem.label}"),
+                    child: snapshot.data == null
+                        ? const SizedBox(
+                            width: 24,
+                            height: 24,
+                            child: CircularProgressIndicator(
+                              strokeWidth: 2,
+                            ),
+                          )
+                        : Text(
+                            snapshot.data!.desc,
                          ),
-                        )
-                      : Text(
-                          snapshot.data!.desc,
-                          style: context.textTheme.bodyMedium,
-                        ),
+                  ),
                );
              },
            ),
--- a/lib/fragments/theme.dart
+++ b/lib/fragments/theme.dart
@@ -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(
--- a/lib/l10n/intl/messages_en.dart
+++ b/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"),
--- a/lib/l10n/intl/messages_ja.dart
+++ b/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("正規表現"),
--- a/lib/l10n/intl/messages_ru.dart
+++ b/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(
      "Восстановление успешно",
    ),
--- a/lib/l10n/intl/messages_zh_CN.dart
+++ b/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("正则"),
--- a/lib/l10n/l10n.dart
+++ b/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> {
--- a/lib/main.dart
+++ b/lib/main.dart
@@ -21,14 +21,12 @@ import 'common/common.dart';
 Future<void> main() async {
  globalState.isService = false;
  WidgetsFlutterBinding.ensureInitialized();
-  FlutterError.onError = (details) {
-    commonPrint.log(details.stack.toString());
-  };
  final version = await system.version;
  await clashCore.preload();
  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(),
--- a/lib/manager/app_state_manager.dart
+++ b/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,22 +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 = {};
-        }
-      });
-    });
  }

  @override
--- a/lib/manager/clash_manager.dart
+++ b/lib/manager/clash_manager.dart
@@ -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,
          ),
--- a/lib/manager/theme_manager.dart
+++ b/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);
--- a/lib/models/clash_config.dart
+++ b/lib/models/clash_config.dart
@@ -148,7 +148,7 @@ class Tun with _$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;
--- a/lib/models/common.dart
+++ b/lib/models/common.dart
@@ -120,7 +120,6 @@ class LogsState with _$LogsState {
    @Default([]) List<Log> logs,
    @Default([]) List<String> keywords,
    @Default("") String query,
-    @Default(false) bool loading,
  }) = _LogsState;
 }

@@ -144,7 +143,6 @@ class ConnectionsState with _$ConnectionsState {
    @Default([]) List<Connection> connections,
    @Default([]) List<String> keywords,
    @Default("") String query,
-    @Default(false) bool loading,
  }) = _ConnectionsState;
 }

@@ -514,17 +512,3 @@ class PopupMenuItemData {
  final IconData? icon;
  final PopupMenuItemType? type;
 }
-
-@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);
-}
--- a/lib/models/config.dart
+++ b/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;
--- a/lib/models/generated/clash_config.freezed.dart
+++ b/lib/models/generated/clash_config.freezed.dart
@@ -810,7 +810,7 @@ class _$TunImpl implements _Tun {
      {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")
--- a/lib/models/generated/clash_config.g.dart
+++ b/lib/models/generated/clash_config.g.dart
@@ -68,7 +68,7 @@ _$TunImpl _$$TunImplFromJson(Map<String, dynamic> json) => _$TunImpl(
      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() ??
--- a/lib/models/generated/common.freezed.dart
+++ b/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;
-}
--- a/lib/models/generated/common.g.dart
+++ b/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,
-    };
--- a/lib/models/generated/config.freezed.dart
+++ b/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;
--- a/lib/models/generated/config.g.dart
+++ b/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()
--- a/lib/pages/editor.dart
+++ b/lib/pages/editor.dart
@@ -127,7 +127,6 @@ class _EditorPageState extends ConsumerState<EditorPage> {
                );
              },
              popup: CommonPopupMenu(
-                minWidth: 180,
                items: [
                  PopupMenuItemData(
                    icon: Icons.search,
@@ -190,7 +189,7 @@ class _EditorPageState extends ConsumerState<EditorPage> {
          shortcutsActivatorsBuilder: DefaultCodeShortcutsActivatorsBuilder(),
          controller: _controller,
          style: CodeEditorStyle(
-            fontSize: 14.ap,
+            fontSize: 14,
            fontFamily: FontFamily.jetBrainsMono.value,
            codeTheme: CodeHighlightTheme(
              languages: {
--- a/lib/providers/config.dart
+++ b/lib/providers/config.dart
@@ -126,7 +126,7 @@ class Profiles extends _$Profiles with AutoDisposeNotifierMixin {
    }
  }

-  setProfile(Profile profile) {
+  setProfile(Profile profile, {bool force = true}) {
    final List<Profile> profilesTemp = List.from(state);
    final index =
        profilesTemp.indexWhere((element) => element.id == profile.id);
@@ -135,7 +135,7 @@ class Profiles extends _$Profiles with AutoDisposeNotifierMixin {
    );
    if (index == -1) {
      profilesTemp.add(updateProfile);
-    } else {
+    } else if (force == true) {
      profilesTemp[index] = updateProfile;
    }
    state = profilesTemp;
--- a/lib/providers/generated/config.g.dart
+++ b/lib/providers/generated/config.g.dart
@@ -83,7 +83,7 @@ final themeSettingProvider =
 );

 typedef _$ThemeSetting = AutoDisposeNotifier<ThemeProps>;
-String _$profilesHash() => r'a6514c89064e4f42fc31fe7d525088fd26c51016';
+String _$profilesHash() => r'c416fda0f8deded24a715a8234efa0bcd0445449';

 /// See also [Profiles].
@ProviderFor(Profiles)
--- a/lib/providers/generated/state.g.dart
+++ b/lib/providers/generated/state.g.dart
@@ -1765,22 +1765,6 @@ class _GetProfileOverrideDataProviderElement
  String get profileId => (origin as GetProfileOverrideDataProvider).profileId;
 }

-String _$layoutChangeHash() => r'f25182e1dfaf3c70000404d7635bb1e1db09efbb';
-
-/// See also [layoutChange].
-@ProviderFor(layoutChange)
-final layoutChangeProvider = AutoDisposeProvider<VM2?>.internal(
-  layoutChange,
-  name: r'layoutChangeProvider',
-  debugGetCreateSourceHash:
-      const bool.fromEnvironment('dart.vm.product') ? null : _$layoutChangeHash,
-  dependencies: null,
-  allTransitiveDependencies: null,
-);
-
-@Deprecated('Will be removed in 3.0. Use Ref instead')
-// ignore: unused_element
-typedef LayoutChangeRef = AutoDisposeProviderRef<VM2?>;
 String _$genColorSchemeHash() => r'b18f15c938a8132ee4ed02cdfc02f3b9f01724e2';

 /// See also [genColorScheme].
--- a/lib/providers/state.dart
+++ b/lib/providers/state.dart
@@ -510,17 +510,6 @@ OverrideData? getProfileOverrideData(Ref ref, String profileId) {
  );
 }

-@riverpod
-VM2? layoutChange(Ref ref) {
-  final viewWidth = ref.watch(viewWidthProvider);
-  final textScale =
-      ref.watch(themeSettingProvider.select((state) => state.textScale));
-  return VM2(
-    a: viewWidth,
-    b: textScale,
-  );
-}
-
@riverpod
 ColorScheme genColorScheme(
  Ref ref,
--- a/lib/state.dart
+++ b/lib/state.dart
@@ -1,4 +1,5 @@
 import 'dart:async';
+
 import 'package:animations/animations.dart';
 import 'package:dynamic_color/dynamic_color.dart';
 import 'package:fl_clash/clash/clash.dart';
@@ -21,15 +22,14 @@ typedef UpdateTasks = List<FutureOr Function()>;

 class GlobalState {
  static GlobalState? _instance;
-  Map<CacheTag, double> cacheScrollPosition = {};
-  Map<CacheTag, FixedMap<String, double>> cacheHeightMap = {};
+  Map<Key, double> cacheScrollPosition = {};
+  Map<Key, FixedMap<String, double>> cacheHeightMap = {};
  bool isService = false;
  Timer? timer;
  Timer? groupsUpdateTimer;
  late Config config;
  late AppState appState;
  bool isPre = true;
-  String? coreSHA256;
  late PackageInfo packageInfo;
  Function? updateCurrentDelayDebounce;
  late Measure measure;
@@ -52,13 +52,11 @@ class GlobalState {
  }

  initApp(int version) async {
-    coreSHA256 = const String.fromEnvironment("CORE_SHA256");
-    isPre = const String.fromEnvironment("APP_ENV") != 'stable';
    appState = AppState(
      version: version,
      viewSize: Size.zero,
-      requests: FixedList(maxLength),
-      logs: FixedList(maxLength),
+      requests: FixedList(1000),
+      logs: FixedList(1000),
      traffics: FixedList(30),
      totalTraffic: Traffic(),
    );
--- a/lib/widgets/list.dart
+++ b/lib/widgets/list.dart
@@ -257,7 +257,6 @@ class ListItem<T> extends StatelessWidget {
      leading: leading ?? this.leading,
      horizontalTitleGap: horizontalTitleGap,
      title: title,
-      minVerticalPadding: 12,
      subtitle: subtitle,
      titleAlignment: tileTitleAlignment,
      onTap: onTap,
--- a/lib/widgets/notification.dart
+++ b/lib/widgets/notification.dart
@@ -16,7 +16,7 @@ class TextScaleNotification extends StatelessWidget {
  @override
  Widget build(BuildContext context) {
    return Consumer(
-      builder: (_, ref, child) {
+      builder: (_, ref, __) {
        ref.listen(
          themeSettingProvider.select((state) => state.textScale),
          (prev, next) {
@@ -25,7 +25,7 @@ class TextScaleNotification extends StatelessWidget {
            }
          },
        );
-        return child!;
+        return child;
      },
      child: child,
    );
--- a/lib/widgets/scroll.dart
+++ b/lib/widgets/scroll.dart
@@ -1,6 +1,6 @@
 import 'package:collection/collection.dart';
 import 'package:fl_clash/common/common.dart';
-import 'package:fl_clash/enum/enum.dart';
+import 'package:fl_clash/common/list.dart';
 import 'package:fl_clash/state.dart';
 import 'package:flutter/material.dart';

@@ -54,13 +54,13 @@ class ScrollToEndBox<T> extends StatefulWidget {
  final ScrollController controller;
  final List<T> dataSource;
  final Widget child;
-  final CacheTag tag;
+  final Key cacheKey;

  const ScrollToEndBox({
    super.key,
    required this.child,
    required this.controller,
-    required this.tag,
+    required this.cacheKey,
    required this.dataSource,
  });

@@ -73,7 +73,8 @@ class _ScrollToEndBoxState<T> extends State<ScrollToEndBox<T>> {

  _handleTryToEnd() {
    WidgetsBinding.instance.addPostFrameCallback((_) {
-      final double offset = globalState.cacheScrollPosition[widget.tag] ?? -1;
+      final double offset =
+          globalState.cacheScrollPosition[widget.cacheKey] ?? -1;
      if (offset < 0) {
        widget.controller.animateTo(
          duration: kThemeAnimationDuration,
@@ -84,6 +85,12 @@ class _ScrollToEndBoxState<T> extends State<ScrollToEndBox<T>> {
    });
  }

+  @override
+  void initState() {
+    super.initState();
+    globalState.cacheScrollPosition[widget.cacheKey] = -1;
+  }
+
  @override
  void didUpdateWidget(ScrollToEndBox<T> oldWidget) {
    super.didUpdateWidget(oldWidget);
@@ -94,12 +101,13 @@ class _ScrollToEndBoxState<T> extends State<ScrollToEndBox<T>> {

  @override
  Widget build(BuildContext context) {
-    return NotificationListener<UserScrollNotification>(
+    return NotificationListener<ScrollNotification>(
      onNotification: (details) {
-        globalState.cacheScrollPosition[widget.tag] =
+        double offset =
            details.metrics.pixels == details.metrics.maxScrollExtent
                ? -1
                : details.metrics.pixels;
+        globalState.cacheScrollPosition[widget.cacheKey] = offset;
        return false;
      },
      child: widget.child,
@@ -116,7 +124,6 @@ class CacheItemExtentListView extends StatefulWidget {
  final bool shrinkWrap;
  final bool reverse;
  final ScrollController controller;
-  final CacheTag tag;

  const CacheItemExtentListView({
    super.key,
@@ -128,7 +135,6 @@ class CacheItemExtentListView extends StatefulWidget {
    required this.keyBuilder,
    required this.itemCount,
    required this.itemExtentBuilder,
-    required this.tag,
  });

  @override
@@ -137,19 +143,21 @@ class CacheItemExtentListView extends StatefulWidget {
 }

 class CacheItemExtentListViewState extends State<CacheItemExtentListView> {
+  late final FixedMap<String, double> _cacheHeightMap;
+
  @override
  void initState() {
    super.initState();
-    _updateCacheHeightMap();
+    _cacheHeightMap = FixedMap(widget.itemCount);
  }

-  _updateCacheHeightMap() {
-    globalState.cacheHeightMap[widget.tag]?.updateMaxLength(widget.itemCount);
-    globalState.cacheHeightMap[widget.tag] ??= FixedMap(widget.itemCount);
+  clearCache() {
+    _cacheHeightMap.clear();
  }

  @override
  Widget build(BuildContext context) {
+    _cacheHeightMap.updateMaxSize(widget.itemCount);
    return ListView.builder(
      itemBuilder: widget.itemBuilder,
      itemCount: widget.itemCount,
@@ -158,14 +166,20 @@ class CacheItemExtentListViewState extends State<CacheItemExtentListView> {
      shrinkWrap: widget.shrinkWrap,
      controller: widget.controller,
      itemExtentBuilder: (index, __) {
-        _updateCacheHeightMap();
-        return globalState.cacheHeightMap[widget.tag]?.updateCacheValue(
-          widget.keyBuilder(index),
-          () => widget.itemExtentBuilder(index),
-        );
+        final key = widget.keyBuilder(index);
+        if (_cacheHeightMap.containsKey(key)) {
+          return _cacheHeightMap.get(key);
+        }
+        return _cacheHeightMap.put(key, widget.itemExtentBuilder(index));
      },
    );
  }
+
+  @override
+  void dispose() {
+    _cacheHeightMap.clear();
+    super.dispose();
+  }
 }

 class CacheItemExtentSliverReorderableList extends StatefulWidget {
@@ -175,7 +189,6 @@ class CacheItemExtentSliverReorderableList extends StatefulWidget {
  final double Function(int index) itemExtentBuilder;
  final ReorderCallback onReorder;
  final ReorderItemProxyDecorator? proxyDecorator;
-  final CacheTag tag;

  const CacheItemExtentSliverReorderableList({
    super.key,
@@ -185,7 +198,6 @@ class CacheItemExtentSliverReorderableList extends StatefulWidget {
    required this.itemExtentBuilder,
    required this.onReorder,
    this.proxyDecorator,
-    required this.tag,
  });

  @override
@@ -195,24 +207,30 @@ class CacheItemExtentSliverReorderableList extends StatefulWidget {

 class CacheItemExtentSliverReorderableListState
    extends State<CacheItemExtentSliverReorderableList> {
+  late final FixedMap<String, double> _cacheHeightMap;
+
  @override
  void initState() {
    super.initState();
-    globalState.cacheHeightMap[widget.tag]?.updateMaxLength(widget.itemCount);
-    globalState.cacheHeightMap[widget.tag] ??= FixedMap(widget.itemCount);
+    _cacheHeightMap = FixedMap(widget.itemCount);
+  }
+
+  clearCache() {
+    _cacheHeightMap.clear();
  }

  @override
  Widget build(BuildContext context) {
-    globalState.cacheHeightMap[widget.tag]?.updateMaxLength(widget.itemCount);
+    _cacheHeightMap.updateMaxSize(widget.itemCount);
    return SliverReorderableList(
      itemBuilder: widget.itemBuilder,
      itemCount: widget.itemCount,
      itemExtentBuilder: (index, __) {
-        return globalState.cacheHeightMap[widget.tag]?.updateCacheValue(
-          widget.keyBuilder(index),
-          () => widget.itemExtentBuilder(index),
-        );
+        final key = widget.keyBuilder(index);
+        if (_cacheHeightMap.containsKey(key)) {
+          return _cacheHeightMap.get(key);
+        }
+        return _cacheHeightMap.put(key, widget.itemExtentBuilder(index));
      },
      onReorder: widget.onReorder,
      proxyDecorator: widget.proxyDecorator,
@@ -221,6 +239,7 @@ class CacheItemExtentSliverReorderableListState

  @override
  void dispose() {
+    _cacheHeightMap.clear();
    super.dispose();
  }
 }
--- a/linux/packaging/appimage/make_config.yaml
+++ b/linux/packaging/appimage/make_config.yaml
@@ -10,6 +10,7 @@ keywords:

 generic_name: FlClash

+
 categories:
  - Network

--- a/linux/packaging/deb/make_config.yaml
+++ b/linux/packaging/deb/make_config.yaml
@@ -10,9 +10,6 @@ installed_size: 6604
 essential: false
 icon: ./assets/images/icon.png

-dependencies:
-  - libayatana-appindicator3-dev
-  - libkeybinder-3.0-dev

 keywords:
  - FlClash
--- a/plugins/flutter_distributor
+++ b/plugins/flutter_distributor
--- a/pubspec.lock
+++ b/pubspec.lock
@@ -279,7 +279,7 @@ packages:
    source: hosted
    version: "0.3.4+2"
  crypto:
-    dependency: "direct dev"
+    dependency: transitive
    description:
      name: crypto
      sha256: "1e445881f28f22d6140f181e07737b22f1e099a5e1ff94b0af2f9e4a463f4855"
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -1,7 +1,7 @@
 name: fl_clash
 description: A multi-platform proxy client based on ClashMeta, simple and easy to use, open-source and ad-free.
 publish_to: 'none'
-version: 0.8.84+202505013
+version: 0.8.83+202504254
 environment:
  sdk: '>=3.1.0 <4.0.0'

@@ -66,7 +66,6 @@ dev_dependencies:
  riverpod_generator: ^2.6.3
  custom_lint: ^0.7.0
  riverpod_lint: ^2.6.3
-  crypto: ^3.0.3

 flutter:
  uses-material-design: true
--- a/services/helper/Cargo.lock
+++ b/services/helper/Cargo.lock
@@ -1,6 +1,6 @@
 # This file is automatically @generated by Cargo.
 # It is not intended for manual editing.
-version = 4
+version = 3

 [[package]]
 name = "addr2line"
@@ -284,7 +284,6 @@ dependencies = [
 "anyhow",
 "once_cell",
 "serde",
- "sha2",
 "tokio",
 "warp",
 "windows-service",
@@ -823,17 +822,6 @@ dependencies = [
 "digest",
 ]

-[[package]]
-name = "sha2"
-version = "0.10.8"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "793db75ad2bcafc3ffa7c68b215fee268f537982cd901d132f89c6343f3a3dc8"
-dependencies = [
- "cfg-if",
- "cpufeatures",
- "digest",
-]
-
 [[package]]
 name = "signal-hook-registry"
 version = "1.4.2"
--- a/services/helper/Cargo.toml
+++ b/services/helper/Cargo.toml
@@ -14,11 +14,10 @@ anyhow = "1.0.93"
 warp = "0.3.7"
 serde = { version = "1.0.215", features = ["derive"] }
 once_cell = "1.20.2"
-sha2 = "0.10.8"


 [profile.release]
 panic = "abort"
 codegen-units = 1
 lto = true
-opt-level = "s"
+opt-level = "s"
--- a/services/helper/build.rs
+++ b/services/helper/build.rs
@@ -1,4 +0,0 @@
-fn main() {
-    let version = std::env::var("TOKEN").unwrap_or_default();
-    println!("cargo:rustc-env=TOKEN={}", version);
-}
--- a/services/helper/src/service/hub.rs
+++ b/services/helper/src/service/hub.rs
@@ -1,13 +1,11 @@
-use once_cell::sync::Lazy;
-use serde::{Deserialize, Serialize};
-use sha2::{Digest, Sha256};
 use std::collections::VecDeque;
-use std::fs::File;
-use std::io::{BufRead, Error, Read};
+use std::{io, thread};
+use std::io::BufRead;
 use std::process::{Command, Stdio};
 use std::sync::{Arc, Mutex};
-use std::{io, thread};
 use warp::{Filter, Reply};
+use serde::{Deserialize, Serialize};
+use once_cell::sync::Lazy;

 const LISTEN_PORT: u16 = 47890;

@@ -17,32 +15,10 @@ pub struct StartParams {
    pub arg: String,
 }

-fn sha256_file(path: &str) -> Result<String, Error> {
-    let mut file = File::open(path)?;
-    let mut hasher = Sha256::new();
-    let mut buffer = [0; 4096];
-
-    loop {
-        let bytes_read = file.read(&mut buffer)?;
-        if bytes_read == 0 {
-            break;
-        }
-        hasher.update(&buffer[..bytes_read]);
-    }
-
-    Ok(format!("{:x}", hasher.finalize()))
-}
-
-static LOGS: Lazy<Arc<Mutex<VecDeque<String>>>> =
-    Lazy::new(|| Arc::new(Mutex::new(VecDeque::with_capacity(100))));
-static PROCESS: Lazy<Arc<Mutex<Option<std::process::Child>>>> =
-    Lazy::new(|| Arc::new(Mutex::new(None)));
+static LOGS: Lazy<Arc<Mutex<VecDeque<String>>>> = Lazy::new(|| Arc::new(Mutex::new(VecDeque::with_capacity(100))));
+static PROCESS: Lazy<Arc<Mutex<Option<std::process::Child>>>> = Lazy::new(|| Arc::new(Mutex::new(None)));

 fn start(start_params: StartParams) -> impl Reply {
-    let sha256 = sha256_file(start_params.path.as_str()).unwrap_or("".to_string());
-    if sha256 != env!("TOKEN") {
-        return format!("The SHA256 hash of the program requesting execution is: {}. The helper program only allows execution of applications with the SHA256 hash: {}.", sha256,  env!("TOKEN"),);
-    }
    stop();
    let mut process = PROCESS.lock().unwrap();
    match Command::new(&start_params.path)
@@ -97,29 +73,38 @@ fn log_message(message: String) {

 fn get_logs() -> impl Reply {
    let log_buffer = LOGS.lock().unwrap();
-    let value = log_buffer
-        .iter()
-        .cloned()
-        .collect::<Vec<String>>()
-        .join("\n");
+    let value = log_buffer.iter().cloned().collect::<Vec<String>>().join("\n");
    warp::reply::with_header(value, "Content-Type", "text/plain")
 }

 pub async fn run_service() -> anyhow::Result<()> {
-    let api_ping = warp::get().and(warp::path("ping")).map(|| env!("TOKEN"));
+    let api_ping = warp::get()
+        .and(warp::path("ping"))
+        .map(|| "2024125");

    let api_start = warp::post()
        .and(warp::path("start"))
        .and(warp::body::json())
-        .map(|start_params: StartParams| start(start_params));
+        .map(|start_params: StartParams| {
+            start(start_params)
+        });

-    let api_stop = warp::post().and(warp::path("stop")).map(|| stop());
+    let api_stop = warp::post()
+        .and(warp::path("stop"))
+        .map(|| stop());

-    let api_logs = warp::get().and(warp::path("logs")).map(|| get_logs());
+    let api_logs = warp::get()
+        .and(warp::path("logs"))
+        .map(|| get_logs());

-    warp::serve(api_ping.or(api_start).or(api_stop).or(api_logs))
+    warp::serve(
+        api_ping
+            .or(api_start)
+            .or(api_stop)
+            .or(api_logs)
+    )
        .run(([127, 0, 0, 1], LISTEN_PORT))
        .await;

    Ok(())
-}
+}
--- a/setup.dart
+++ b/setup.dart
@@ -5,7 +5,6 @@ import 'dart:io';

 import 'package:args/command_runner.dart';
 import 'package:path/path.dart';
-import 'package:crypto/crypto.dart';

 enum Target {
  windows,
@@ -196,16 +195,7 @@ class Build {
    if (exitCode != 0 && name != null) throw "$name error";
  }

-  static Future<String> calcSha256(String filePath) async {
-    final file = File(filePath);
-    if (!await file.exists()) {
-      throw "File not exists";
-    }
-    final stream = file.openRead();
-    return sha256.convert(await stream.reduce((a, b) => a + b)).toString();
-  }
-
-  static Future<List<String>> buildCore({
+  static buildCore({
    required Mode mode,
    required Target target,
    Arch? arch,
@@ -219,8 +209,6 @@ class Build {
      },
    ).toList();

-    final List<String> corePaths = [];
-
    for (final item in items) {
      final outFileDir = join(
        outDir,
@@ -240,7 +228,6 @@ class Build {
        outFileDir,
        fileName,
      );
-      corePaths.add(outPath);

      final Map<String, String> env = {};
      env["GOOS"] = item.target.os;
@@ -271,11 +258,9 @@ class Build {
        workingDirectory: _coreDir,
      );
    }
-
-    return corePaths;
  }

-  static buildHelper(Target target, String token) async {
+  static buildHelper(Target target) async {
    await exec(
      [
        "cargo",
@@ -284,9 +269,6 @@ class Build {
        "--features",
        "windows-service",
      ],
-      environment: {
-        "TOKEN": token,
-      },
      name: "build helper",
      workingDirectory: _servicesDir,
    );
@@ -296,15 +278,13 @@ class Build {
      "release",
      "helper${target.executableExtensionName}",
    );
-    final targetPath = join(
-      outDir,
-      target.name,
-      "FlClashHelperService${target.executableExtensionName}",
-    );
+    final targetPath = join(outDir, target.name,
+        "FlClashHelperService${target.executableExtensionName}");
    await File(outPath).copy(targetPath);
  }

  static List<String> getExecutable(String command) {
+    print(command);
    return command.split(" ");
  }

@@ -422,8 +402,7 @@ class BuildCommand extends Command {
      await Build.exec(
        Build.getExecutable("sudo apt install -y libfuse2"),
      );
-
-      final downloadName = arch == Arch.amd64 ? "x86_64" : "aarch64";
+      final downloadName = arch == Arch.amd64 ? "x86_64" : "aarch_64";
      await Build.exec(
        Build.getExecutable(
          "wget -O appimagetool https://github.com/AppImage/AppImageKit/releases/download/continuous/appimagetool-$downloadName.AppImage",
@@ -434,12 +413,12 @@ class BuildCommand extends Command {
          "chmod +x appimagetool",
        ),
      );
-      await Build.exec(
-        Build.getExecutable(
-          "sudo mv appimagetool /usr/local/bin/",
-        ),
-      );
    }
+    await Build.exec(
+      Build.getExecutable(
+        "sudo mv appimagetool /usr/local/bin/",
+      ),
+    );
  }

  _getMacosDependencies() async {
@@ -487,27 +466,26 @@ class BuildCommand extends Command {
      throw "Invalid arch parameter";
    }

-    final corePaths = await Build.buildCore(
+    await Build.buildCore(
      target: target,
      arch: arch,
      mode: mode,
    );

+    if (target == Target.windows) {
+      await Build.buildHelper(target);
+    }
+
    if (out != "app") {
      return;
    }

    switch (target) {
      case Target.windows:
-        final token = target != Target.android
-            ? await Build.calcSha256(corePaths.first)
-            : null;
-        Build.buildHelper(target, token!);
        _buildDistributor(
          target: target,
          targets: "exe,zip",
-          args:
-              " --description $archName --build-dart-define=CORE_SHA256=$token",
+          args: " --description $archName",
          env: env,
        );
        return;
@@ -518,8 +496,10 @@ class BuildCommand extends Command {
        };
        final targets = [
          "deb",
-          if (arch == Arch.amd64) "appimage",
-          if (arch == Arch.amd64) "rpm",
+          if (arch == Arch.amd64) ...[
+            "appimage",
+            "rpm",
+          ],
        ].join(",");
        final defaultTarget = targetMap[arch];
        await _getLinuxDependencies(arch!);
Author	SHA1	Message	Date
chen08209	af361a086a	Optimize startTun performance	2025-04-25 22:34:37 +08:00
chen08209	be8cf039ee	Support custom text scaling Optimize the display of different text scale Optimize windows setup experience	2025-04-25 17:38:26 +08:00
chen08209	30ee6889ab	Optimize android tv experience Optimize hyperOS freeform window Add developer mode Update core Optimize more details	2025-04-22 16:05:24 +08:00