Add android shortcuts

Fix init params issues Fix dynamic color issues Optimize navigator animate Optimize window init Optimize fab Optimize save
Fix the collapse issues
2024-11-09 17:42:08 +08:00 · 2024-10-26 16:52:10 +08:00 · 2024-10-26 01:46:55 +08:00 · 2024-10-12 17:53:40 +08:00 · 2024-10-12 15:06:55 +08:00 · 2024-10-12 15:06:55 +08:00
185 changed files with 43269 additions and 33477 deletions
--- a/.github/release_template.md
+++ b/.github/release_template.md
@@ -0,0 +1,57 @@
+<div align=center>
+
+[![Release Downloads](https://img.shields.io/github/downloads/chen08209/FlClash/vVERSION/total?style=flat-square&logo=github)](https://img.shields.io/github/downloads/chen08209/FlClash/vVERSION/)
+
+</div>
+
+**Download based on your OS:**
+
+<div align=left>
+<table>
+    <thead align=left>
+        <tr>
+            <th>OS</th>
+            <th>Download</th>
+        </tr>
+    </thead>
+    <tbody align=left>
+        <tr>
+        <td>Android</td>
+            <td>
+                <a href="https://github.com/chen08209/FlClash/releases/download/vVERSION/FlClash-VERSION-android-arm64-v8a.apk"><img src="https://img.shields.io/badge/APK-ARMv8-168039.svg?logo=android"></a><br>
+                <a href="https://github.com/chen08209/FlClash/releases/download/vVERSION/FlClash-VERSION-android-armeabi-v7a.apk"><img src="https://img.shields.io/badge/APK-ARMv7-45bf55.svg?logo=android"></a><br>
+                <a href="https://github.com/chen08209/FlClash/releases/download/vVERSION/FlClash-VERSION-android-x86_64.apk"><img src="https://img.shields.io/badge/APK-x64-96ed89.svg?logo=android"></a>
+            </td>
+        </tr>
+        <tr>
+            <td>Windows</td>
+            <td>
+                <a href="https://github.com/chen08209/FlClash/releases/download/vVERSION/FlClash-VERSION-windows-amd64-setup.exe"><img src="https://img.shields.io/badge/Setup-x64-2d7d9a.svg?logo=windows"></a><br>
+                <a href="https://github.com/chen08209/FlClash/releases/download/vVERSION/FlClash-VERSION-windows-amd64.zip"><img src="https://img.shields.io/badge/Portable-x64-67b7d1.svg?logo=windows"></a>
+            </td>
+        </tr>
+        <tr>
+            <td>macOS (v10.15+)</td>
+            <td>
+                <a href="https://github.com/chen08209/FlClash/releases/download/vVERSION/FlClash-VERSION-macos-amd64.dmg"><img src="https://img.shields.io/badge/DMG-Universal-ea005e.svg?logo=apple"></a><br>
+            </td>
+        </tr>
+        <tr>
+            <td>Linux</td>
+            <td>
+                <a href="https://github.com/chen08209/FlClash/releases/download/vVERSION/FlClash-VERSION-linux-amd64.AppImage"><img src="https://img.shields.io/badge/AppImage-x64-f84e29.svg?logo=linux"> </a><br>
+                <a href="https://github.com/chen08209/FlClash/releases/download/vVERSION/FlClash-VERSION-linux-amd64.deb"><img src="https://img.shields.io/badge/DebPackage-x64-FF9966.svg?logo=debian"> </a><br>
+                <a href="https://github.com/chen08209/FlClash/releases/download/vVERSION/FlClash-VERSION-linux-amd64.deb"><img src="https://img.shields.io/badge/RpmPackage-x64-F1B42F.svg?logo=redhat"> </a>
+            </td>
+        </tr>
+    </tbody>
+</table>
+
+
+</div>
+
+<div dir="ltr">
+
+**List of all changes:** [ChangeLog](https://github.com/chen08209/FlClash/blob/main/CHANGELOG.md)
+
+</div>
--- a/.github/workflows/build.yaml
+++ b/.github/workflows/build.yaml
@@ -35,7 +35,6 @@ jobs:
          install: mingw-w64-x86_64-gcc
          update: true

-
      - name: Set Mingw64 Env
        if: startsWith(matrix.platform,'windows')
        run: |
@@ -80,14 +79,14 @@ jobs:
      - name: Setup Go
        uses: actions/setup-go@v5
        with:
-          go-version-file: 'core/go.mod'
+          go-version: 'stable'
          cache-dependency-path: |
            core/go.sum

      - name: Setup Flutter
        uses: subosito/flutter-action@v2
        with:
-          flutter-version: 3.22.x
+          flutter-version: '3.x'
          channel: 'stable'
          cache: true

@@ -102,15 +101,21 @@ jobs:
        with:
          name: artifact-${{ matrix.platform }}${{ matrix.arch && format('-{0}', matrix.arch) }}
          path: ./dist
-          retention-days: 1
          overwrite: true


-  upload-release:
-    if: ${{ !contains(github.ref, '+') }}
+  upload:
    permissions: write-all
    needs: [ build ]
    runs-on: ubuntu-latest
+    services:
+      telegram-bot-api:
+        image: aiogram/telegram-bot-api:latest
+        env:
+          TELEGRAM_API_ID: ${{ secrets.TELEGRAM_API_ID }}
+          TELEGRAM_API_HASH: ${{ secrets.TELEGRAM_API_HASH }}
+        ports:
+          - 8081:8081
    steps:
      - name: Checkout
        uses: actions/checkout@v4
@@ -124,32 +129,63 @@ jobs:
          pattern: artifact-*
          merge-multiple: true

-      - name: Pre Release
+      - name: Generate release.md
        run: |
-          pip install gitchangelog pystache mustache markdown
-          pre=$(curl --silent "https://api.github.com/repos/chen08209/FlClash/releases/latest" | grep -Po '"tag_name": "\K.*?(?=")' || echo "")
-          if [ -z "pre" ]; then
-            echo "init" > release.md
-          else
-            current="${{ github.ref_name }}"
-            echo -e "\n\n<details markdown=1><summary>All changes from $current to the latest commit:</summary>\n\n" >> release.md
-            gitchangelog "${pre}.." >> release.md 2>&1 || echo "Error in gitchangelog"
-            echo -e "\n\n</details>" >> release.md
-          fi
+          tags=($(git tag --merged $(git rev-parse HEAD) --sort=-creatordate))
+          preTag=$(curl --silent "https://api.github.com/repos/chen08209/FlClash/releases/latest" | grep -Po '"tag_name": "\K.*?(?=")' || echo "")
+          currentTag=""
+          for ((i = 0; i <= ${#tags[@]}; i++)); do
+            if (( i < ${#tags[@]} )); then
+              tag=${tags[$i]}
+            else
+              tag=""
+            fi
+            if [ -n "$currentTag" ]; then
+              if [ "$(echo -e "$currentTag\n$preTag" | sort -V | head -n 1)" == "$currentTag" ]; then
+                break
+              fi
+            fi
+            if [ -n "$currentTag" ]; then
+              if [ -n "$tag" ]; then
+                git log --pretty=format:"%B" "$tag..$currentTag" | awk 'NF {print "- " $0} !NF {print ""}' >> release.md
+              else
+                git log --pretty=format:"%B" "$currentTag" | awk 'NF {print "- " $0} !NF {print ""}' >> release.md
+              fi
+              echo "" >> release.md
+            fi
+            currentTag=$tag
+          done
+
+      - name: Push to telegram
+        env:
+          TELEGRAM_BOT_TOKEN: ${{ secrets.TELEGRAM_BOT_TOKEN }}
+          TAG: ${{ github.ref_name }}
+        run: |
+          python -m pip install --upgrade pip
+          pip install requests
+          python release.py
+
+      - name: Patch release.md
+        run: |
+          version=$(echo "${{ github.ref_name }}" | sed 's/^v//')
+          sed "s|VERSION|$version|g" ./.github/release_template.md >> release.md

      - name: Release
+        if: ${{ !contains(github.ref, '+') }}
        uses: softprops/action-gh-release@v2
        with:
          files: ./dist/*
          body_path: './release.md'

      - name: Create Fdroid Source Dir
+        if: ${{ !contains(github.ref, '+') }}
        run: |
          mkdir -p ./tmp
          cp ./dist/*android-arm64-v8a* ./tmp/ || true
          echo "Files copied successfully"

      - name: Push to fdroid repo
+        if: ${{ !contains(github.ref, '+') }}
        uses: cpina/github-action-push-to-another-repository@v1.7.2
        env:
          SSH_DEPLOY_KEY: ${{ secrets.SSH_DEPLOY_KEY }}
@@ -161,4 +197,4 @@ jobs:
          user-email: 'github-actions[bot]@users.noreply.github.com'
          target-branch: action-pr
          commit-message: Update from ${{ github.ref_name }}
-          target-directory: /tmp/
+          target-directory: /tmp/
--- a/.github/workflows/change.yaml
+++ b/.github/workflows/change.yaml
@@ -0,0 +1,45 @@
+name: change
+
+on:
+  push:
+    branches:
+      - 'main'
+
+jobs:
+  changelog:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
+
+      - name: Generate
+        run: |
+          tags=$(git tag --sort=creatordate)
+          previous=""
+          if [ ! -f CHANGELOG.md ]; then
+            echo "" > CHANGELOG.md
+          else
+            previous=$(grep -oP '^## \K.*' CHANGELOG.md | tail -n 1)
+          fi
+          for tag in $tags; do
+            if [ -n "$previous" ]; then
+              echo "## $tag" >> CHANGELOG.md
+              git log --pretty=format:"* %s (%h)" "$previous..$tag" >> CHANGELOG.md
+              echo -e "\n" >> CHANGELOG.md
+            fi
+            previous=$tag
+          done
+
+      - name: Commit
+        run: |
+          if ！git diff --cached --quiet; then
+            git config --local user.email "action@github.com"
+            git config --local user.name "GitHub Action"
+            git add CHANGELOG.md
+            git commit -m "Update Changelog"
+            git push
+          fi
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -0,0 +1,630 @@
+## v0.8.63
+
+- Fix windows admin auto launch issues
+
+- Add android vpn options
+
+- Support proxies icon configuration
+
+- Optimize android immersion display
+
+- Fix some issues
+
+## v0.8.62
+
+- Optimize ip detection
+
+- Support android vpn ipv6 inbound switch
+
+- Support log export
+
+- Optimize more details
+
+- Fix android system dns issues
+
+- Optimize dns default option
+
+- Fix some issues
+
+- Update readme
+
+- Update README.md 2
+
+- Update README.md 2
+
+- Update README.md
+
+## v0.8.60
+
+- Fix build error2
+
+- Fix build error
+
+- Support desktop hotkey
+
+- Support android ipv6 inbound
+
+- Support android system dns
+
+- fix some bugs
+
+## v0.8.59
+
+- Fix delete profile error
+
+## v0.8.58
+
+- Fix submit error 2
+
+- Fix submit error
+
+- Optimize DNS strategy
+
+- Fix the problem that the tray is not displayed in some cases
+
+- Optimize tray
+
+- Update core
+
+- Fix some error
+
+## v0.8.57
+
+- Fix tun update issues
+
+- Add DNS override
+- Fixed some bugs
+- Optimize more detail
+
+- Add Hosts override
+
+## v0.8.56
+
+- fix android tip error
+- fix windows auto launch error
+
+## v0.8.55
+
+- Fix windows tray issues
+
+- Optimize windows logic
+
+- Optimize app logic
+
+- Support windows administrator auto launch
+
+- Support android close vpn
+
+## v0.8.53
+
+- Change flutter version
+
+- Support profiles sort
+
+- Support windows country flags display
+
+- Optimize proxies page and profiles page columns
+
+## v0.8.52
+
+- Update flutter version
+
+- Update version
+
+- Update timeout time
+
+- Update access control page
+
+- Fix bug
+
+## v0.8.51
+
+- Optimize provider page
+
+- Optimize delay test
+
+- Support local backup and recovery
+
+- Fix android tile service issues
+
+## v0.8.49
+
+- Fix linux core build error
+
+- Add proxy-only traffic statistics
+
+- Update core
+
+- Optimize more details
+
+- Merge pull request #140 from txyyh/main
+
+- 添加自建 F-Droid 仓库相关 workflow
+- Rename readme fingerprint
+
+- Rename workflow deploy repo name
+
+- Add download guide to README
+
+- Add push release files to fdroid-repo
+
+## v0.8.48
+
+- Optimize proxies page
+
+- Fix ua issues
+
+- Optimize more details
+
+## v0.8.47
+
+- Fix windows build error
+
+## v0.8.46
+
+- Update app icon
+
+- Fix desktop backup error
+
+- Optimize request ua
+
+- Change android icon
+
+- Optimize dashboard
+
+## v0.8.44
+
+- Remove request validate certificate
+
+- Sync core
+
+## v0.8.43
+
+- Fix windows error
+
+## v0.8.42
+
+- Fix setup.dart error
+
+- Fix android system proxy not effective
+
+- Add macos arm64
+
+## v0.8.41
+
+- Optimize proxies page
+
+- Support mouse drag scroll
+
+- Adjust desktop ui
+
+- Revert "Fix android vpn issues"
+
+- This reverts commit 891977408e6938e2acd74e9b9adb959c48c79988.
+
+## v0.8.40
+
+- Fix android vpn issues
+
+- Fix android vpn issues
+
+- Rollback partial modification
+
+## v0.8.39
+
+- Fix the problem that ui can't be synchronized when android vpn is occupied by an external
+
+- Override default socksPort,port
+
+## v0.8.38
+
+- Fix fab issues
+
+## v0.8.37
+
+- Update version
+
+- Fix the problem that vpn cannot be started in some cases
+
+- Fix the problem that geodata url does not take effect
+
+## v0.8.36
+
+- Update ua
+
+- Fix change outbound mode without check ip issues
+
+- Separate android ui and vpn
+
+- Fix url validate issues 2
+
+- Add android hidden from the recent task
+
+- Add geoip file
+
+- Support modify geoData URL
+
+## v0.8.35
+
+- Fix url validate issues
+
+- Fix check ip performance problem
+
+- Optimize resources page
+
+## v0.8.34
+
+- Add ua selector
+
+- Support modify test url
+
+- Optimize android proxy
+
+- Fix the error that async proxy provider could not selected the proxy
+
+## v0.8.33
+
+- Fix android proxy error
+
+- Fix submit error
+
+- Add windows tun
+
+- Optimize android proxy
+
+- Optimize change profile
+
+- Update application ua
+
+- Optimize delay test
+
+## v0.8.32
+
+- Fix android repeated request notification issues
+
+## v0.8.31
+
+- Fix memory overflow issues
+
+## v0.8.30
+
+- Optimize proxies expansion panel 2
+
+- Fix android scan qrcode error
+
+## v0.8.29
+
+- Optimize proxies expansion panel
+
+- Fix text error
+
+## v0.8.28
+
+- Optimize proxy
+
+- Optimize delayed sorting performance
+
+- Add expansion panel proxies page
+
+- Support to adjust the proxy card size
+
+- Support to adjust proxies columns number
+
+- Fix autoRun show issues
+
+- Fix Android 10 issues
+
+- Optimize ip show
+
+## v0.8.26
+
+- Add intranet IP display
+
+- Add connections page
+
+- Add search in connections, requests
+
+- Add keyword search in connections, requests, logs
+
+- Add basic viewing editing capabilities
+
+- Optimize update profile
+
+## v0.8.25
+
+- Update version
+
+- Fix the problem of excessive memory usage in traffic usage.
+
+- Add lightBlue theme color
+
+- Fix start unable to update profile issues
+
+- Fix flashback caused by process
+
+## v0.8.23
+
+- Add build version
+
+- Optimize quick start
+
+- Update system default option
+
+## v0.8.22
+
+- Update build.yml
+
+- Fix android vpn close issues
+
+- Add requests page
+
+- Fix checkUpdate dark mode style error
+
+- Fix quickStart error open app
+
+- Add memory proxies tab index
+
+- Support hidden group
+
+- Optimize logs
+
+- Fix externalController hot load error
+
+## v0.8.21
+
+- Add tcp concurrent switch
+
+- Add system proxy switch
+
+- Add geodata loader switch
+
+- Add external controller switch
+
+- Add auto gc on trim memory
+
+- Fix android notification error
+
+## v0.8.20
+
+- Fix ipv6 error
+
+- Fix android udp direct error
+
+- Add ipv6 switch
+
+- Add access all selected button
+
+- Remove android low version splash
+
+## v0.8.19
+
+- Update version
+
+- Add allowBypass
+
+- Fix Android only pick .text file issues
+
+## v0.8.18
+
+- Fix search issues
+
+## v0.8.17
+
+- Fix LoadBalance, Relay load error
+
+- Fix build.yml4
+
+- Fix build.yml3
+
+- Fix build.yml2
+
+- Fix build.yml
+
+- Add search function at access control
+
+- Fix the issues with the profile add button to cover the edit button
+
+- Adapt LoadBalance and Relay
+
+- Add arm
+
+- Fix android notification icon error
+
+## v0.8.16
+
+- Add one-click update all profiles
+- Add expire show
+
+## v0.8.15
+
+- Temp remove tun mode
+
+- Remove macos in workflow
+
+- Change go version
+
+## v0.8.14
+
+- Update Version
+
+- Fix tun unable to open
+
+## v0.8.13
+
+- Optimize delay test2
+
+- Optimize delay test
+
+- Add check ip
+
+- add check ip request
+
+## v0.8.12
+
+- Fix the problem that the download of remote resources failed after GeodataMode was turned on, which caused the application to flash back.
+
+- Fix edit profile error
+
+- Fix quickStart change proxy error
+
+- Fix core version
+
+## v0.8.10
+
+- Fix core version
+
+## v0.8.9
+
+- Update file_picker
+
+- Add resources page
+
+- Optimize more detail
+
+- Add access selected sorted
+
+- Fix notification duplicate creation issue
+
+- Fix AccessControl click issue
+
+## v0.8.7
+
+- Fix Workflow
+
+- Fix Linux unable to open
+
+- Update README.md 3
+
+- Create LICENSE
+- Update README.md 2
+
+- Update README.md
+
+- Optimize workFlow
+
+## v0.8.6
+
+- optimize checkUpdate
+
+## v0.8.5
+
+- Fix submit error
+
+## v0.8.4
+
+- add WebDAV
+
+- add Auto check updates
+
+- Optimize more details
+
+- optimize delayTest
+
+## v0.8.2
+
+- upgrade flutter version
+
+## v0.8.1
+
+- Update kernel
+- Add import profile via QR code image
+
+## v0.8.0
+
+- Add compatibility mode and adapt clash scheme.
+
+## v0.7.14
+
+- update Version
+
+- Reconstruction application proxy logic
+
+## v0.7.13
+
+- Fix Tab destroy error
+
+## v0.7.12
+
+- Optimize repeat healthcheck
+
+## v0.7.11
+
+- Optimize Direct mode ui
+
+## v0.7.10
+
+- Optimize Healthcheck
+
+- Remove proxies position animation, improve performance
+- Add Telegram Link
+
+- Update healthcheck policy
+
+- New Check URLTest
+
+- Fix the problem of invalid auto-selection
+
+## v0.7.8
+
+- New Async UpdateConfig
+
+- add changeProfileDebounce
+
+- Update Workflow
+
+- Fix ChangeProfile block
+
+- Fix Release Message Error
+
+## v0.7.7
+
+- Update Selector 2
+
+## v0.7.6
+
+- Update Version
+
+- Fix Proxies Select Error
+
+## v0.7.5
+
+- Fix the problem that the proxy group is empty in global mode.
+
+- Fix the problem that the proxy group is empty in global mode.
+
+## v0.7.4
+
+- Add ProxyProvider2
+
+## v0.7.3
+
+- Add ProxyProvider
+
+- Update Version
+
+- Update ProxyGroup Sort
+
+- Fix Android quickStart VpnService some problems
+
+## v0.7.1
+
+- Update version
+
+- Set Android notification low importance
+
+- Fix the issue that VpnService can't be closed correctly in special cases
+
+- Fix the problem that TileService is not destroyed correctly in some cases
+
+- Adjust tab animation defaults
+
+- Add Telegram in README_zh_CN.md
+
+- Add Telegram
+
+## v0.7.0
+
+- update mobile_scanner
+
+- Initial commit
+
--- a/README.md
+++ b/README.md
@@ -6,13 +6,9 @@

 ## FlClash

-<p style="text-align: left;">
-    <img alt="stars" src="https://img.shields.io/github/stars/chen08209/FlClash?style=flat-square&logo=github"/>
-    <img alt="downloads" src="https://img.shields.io/github/downloads/chen08209/FlClash/total"/>
-    <a href="LICENSE">
-        <img alt="license" src="https://img.shields.io/github/license/chen08209/FlClash"/>
-    </a>
-</p>
+[![Downloads](https://img.shields.io/github/downloads/chen08209/FlClash/total?style=flat-square&logo=github)](https://github.com/chen08209/FlClash/releases/)[![Last Version](https://img.shields.io/github/release/chen08209/FlClash/all.svg?style=flat-square)](https://github.com/chen08209/FlClash/releases/)[![License](https://img.shields.io/github/license/chen08209/FlClash?style=flat-square)](LICENSE)
+
+[![Channel](https://img.shields.io/badge/Telegram-Channel-blue?style=flat-square&logo=telegram)](https://t.me/FlClash)

 A multi-platform proxy client based on ClashMeta, simple and easy to use, open-source and ad-free.

@@ -42,10 +38,6 @@ on Mobile:

 <a href="https://chen08209.github.io/FlClash-fdroid-repo/repo?fingerprint=789D6D32668712EF7672F9E58DEEB15FBD6DCEEC5AE7A4371EA72F2AAE8A12FD"><img alt="Get it on F-Droid" src="snapshots/get-it-on-fdroid.svg" width="200px"/></a> <a href="https://github.com/chen08209/FlClash/releases"><img alt="Get it on GitHub" src="snapshots/get-it-on-github.svg" width="200px"/></a>

-## Contact
-
-[Telegram](https://t.me/+G-veVtwBOl4wODc1)
-
 ## Build

 1. Update submodules
@@ -100,9 +92,6 @@ on Mobile:
           ```bash
           dart .\setup.dart	
           ```
-           
-
-    

 ## Star

--- a/README_zh_CN.md
+++ b/README_zh_CN.md
@@ -6,13 +6,10 @@

 ## FlClash

-<p style="text-align: left;">
-    <img alt="stars" src="https://img.shields.io/github/stars/chen08209/FlClash?style=flat-square&logo=github"/>
-    <img alt="downloads" src="https://img.shields.io/github/downloads/chen08209/FlClash/total"/>
-    <a href="LICENSE">
-        <img alt="license" src="https://img.shields.io/github/license/chen08209/FlClash"/>
-    </a>
-</p>
+[![Downloads](https://img.shields.io/github/downloads/chen08209/FlClash/total?style=flat-square&logo=github)](https://github.com/chen08209/FlClash/releases/)[![Last Version](https://img.shields.io/github/release/chen08209/FlClash/all.svg?style=flat-square)](https://github.com/chen08209/FlClash/releases/)[![License](https://img.shields.io/github/license/chen08209/FlClash?style=flat-square)](LICENSE)
+
+[![Channel](https://img.shields.io/badge/Telegram-Channel-blue?style=flat-square&logo=telegram)](https://t.me/FlClash)
+

 基于ClashMeta的多平台代理客户端，简单易用，开源无广告。

@@ -42,11 +39,6 @@ on Mobile:

 <a href="https://chen08209.github.io/FlClash-fdroid-repo/repo?fingerprint=789D6D32668712EF7672F9E58DEEB15FBD6DCEEC5AE7A4371EA72F2AAE8A12FD"><img alt="Get it on F-Droid" src="snapshots/get-it-on-fdroid.svg" width="200px"/></a> <a href="https://github.com/chen08209/FlClash/releases"><img alt="Get it on GitHub" src="snapshots/get-it-on-github.svg" width="200px"/></a>

-
-## Contact
-
-[Telegram](https://t.me/+G-veVtwBOl4wODc1)
-
 ## Build

 1. 更新 submodules
--- a/android/app/build.gradle
+++ b/android/app/build.gradle
@@ -34,22 +34,22 @@ def isRelease = defStoreFile.exists() && defStorePassword != null && defKeyAlias
 android {
    namespace "com.follow.clash"
    compileSdkVersion 34
-    ndkVersion "25.1.8937393"
+    ndkVersion "27.1.12297006"

    compileOptions {
-        sourceCompatibility JavaVersion.VERSION_1_8
-        targetCompatibility JavaVersion.VERSION_1_8
+        sourceCompatibility JavaVersion.VERSION_17
+        targetCompatibility JavaVersion.VERSION_17
    }

    kotlinOptions {
-        jvmTarget = '1.8'
+        jvmTarget = '17'
    }

    sourceSets {
        main.java.srcDirs += 'src/main/kotlin'
    }
    signingConfigs {
-        if (isRelease){
+        if (isRelease) {
            release {
                storeFile defStoreFile
                storePassword defStorePassword
@@ -74,10 +74,9 @@ android {
            applicationIdSuffix '.debug'
        }
        release {
-            minifyEnabled true
-            if(isRelease){
+            if (isRelease) {
                signingConfig signingConfigs.release
-            }else{
+            } else {
                signingConfig signingConfigs.debug
            }
            proguardFiles getDefaultProguardFile("proguard-android-optimize.txt"), "proguard-rules.pro"
--- a/android/app/src/main/AndroidManifest.xml
+++ b/android/app/src/main/AndroidManifest.xml
@@ -10,25 +10,23 @@

    <uses-permission android:name="android.permission.INTERNET" />
    <uses-permission android:name="android.permission.FOREGROUND_SERVICE" />
+    <uses-permission
+        android:name="android.permission.FOREGROUND_SERVICE_SPECIAL_USE"
+        tools:ignore="SystemPermissionTypo" />
    <uses-permission android:name="android.permission.POST_NOTIFICATIONS" />
    <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" />
    <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
    <uses-permission android:name="android.permission.CHANGE_NETWORK_STATE" />
-    <uses-permission
-        android:name="android.permission.FOREGROUND_SERVICE_SPECIAL_USE"
-        tools:ignore="SystemPermissionTypo" />
+    <uses-permission android:name="android.permission.REQUEST_IGNORE_BATTERY_OPTIMIZATIONS" />
    <uses-permission
        android:name="android.permission.QUERY_ALL_PACKAGES"
        tools:ignore="QueryAllPackagesPermission" />

    <application
        android:name="${applicationName}"
-        android:enableOnBackInvokedCallback="true"
-        android:extractNativeLibs="true"
+        android:hardwareAccelerated="true"
        android:icon="@mipmap/ic_launcher"
-        android:label="FlClash"
-        android:networkSecurityConfig="@xml/network_security_config"
-        tools:targetApi="tiramisu">
+        android:label="FlClash">
        <activity
            android:name="com.follow.clash.MainActivity"
            android:configChanges="orientation|keyboardHidden|keyboard|screenSize|smallestScreenSize|locale|layoutDirection|fontScale|screenLayout|density|uiMode"
@@ -72,7 +70,17 @@

        <activity
            android:name=".TempActivity"
-            android:theme="@style/TransparentTheme" />
+            android:exported="true"
+            android:theme="@style/TransparentTheme">
+            <intent-filter>
+                <category android:name="android.intent.category.DEFAULT" />
+                <action android:name="${applicationId}.action.STOP" />
+            </intent-filter>
+            <intent-filter>
+                <category android:name="android.intent.category.DEFAULT" />
+                <action android:name="${applicationId}.action.CHANGE" />
+            </intent-filter>
+        </activity>

        <service
            android:name=".services.FlClashTileService"
@@ -119,12 +127,19 @@
            <intent-filter>
                <action android:name="android.net.VpnService" />
            </intent-filter>
+            <property
+                android:name="android.app.PROPERTY_SPECIAL_USE_FGS_SUBTYPE"
+                android:value="vpn" />
        </service>

        <service
            android:name=".services.FlClashService"
            android:exported="false"
-            android:foregroundServiceType="specialUse" />
+            android:foregroundServiceType="specialUse">
+            <property
+                android:name="android.app.PROPERTY_SPECIAL_USE_FGS_SUBTYPE"
+                android:value="service" />
+        </service>

        <meta-data
            android:name="flutterEmbedding"
--- a/android/app/src/main/kotlin/com/follow/clash/BaseServiceInterface.kt
+++ b/android/app/src/main/kotlin/com/follow/clash/BaseServiceInterface.kt
@@ -1,10 +1,10 @@
 package com.follow.clash

-import com.follow.clash.models.Props
-import com.follow.clash.models.TunProps
+
+import com.follow.clash.models.VpnOptions

 interface BaseServiceInterface {
-    fun start(port: Int, props: Props?): TunProps?
+    fun start(options: VpnOptions): Int
    fun stop()
    fun startForeground(title: String, content: String)
 }
--- a/android/app/src/main/kotlin/com/follow/clash/GlobalState.kt
+++ b/android/app/src/main/kotlin/com/follow/clash/GlobalState.kt
@@ -4,8 +4,8 @@ import android.content.Context
 import androidx.lifecycle.MutableLiveData
 import com.follow.clash.plugins.AppPlugin
 import com.follow.clash.plugins.ServicePlugin
-import com.follow.clash.plugins.VpnPlugin
 import com.follow.clash.plugins.TilePlugin
+import com.follow.clash.plugins.VpnPlugin
 import io.flutter.FlutterInjector
 import io.flutter.embedding.engine.FlutterEngine
 import io.flutter.embedding.engine.dart.DartExecutor
@@ -33,7 +33,11 @@ object GlobalState {
        return currentEngine?.plugins?.get(AppPlugin::class.java) as AppPlugin?
    }

-    fun getCurrentTitlePlugin(): TilePlugin? {
+    fun getText(text: String): String {
+        return getCurrentAppPlugin()?.getText(text) ?: ""
+    }
+
+    fun getCurrentTilePlugin(): TilePlugin? {
        val currentEngine = if (flutterEngine != null) flutterEngine else serviceEngine
        return currentEngine?.plugins?.get(TilePlugin::class.java) as TilePlugin?
    }
@@ -42,6 +46,27 @@ object GlobalState {
        return serviceEngine?.plugins?.get(VpnPlugin::class.java) as VpnPlugin?
    }

+    fun handleToggle(context: Context) {
+        if (runState.value == RunState.STOP) {
+            runState.value = RunState.PENDING
+            val tilePlugin = getCurrentTilePlugin()
+            if (tilePlugin != null) {
+                tilePlugin.handleStart()
+            } else {
+                initServiceEngine(context)
+            }
+        } else {
+            handleStop()
+        }
+    }
+
+    fun handleStop() {
+        if (runState.value == RunState.START) {
+            runState.value = RunState.PENDING
+            getCurrentTilePlugin()?.handleStop()
+        }
+    }
+
    fun destroyServiceEngine() {
        serviceEngine?.destroy()
        serviceEngine = null
--- a/android/app/src/main/kotlin/com/follow/clash/MainActivity.kt
+++ b/android/app/src/main/kotlin/com/follow/clash/MainActivity.kt
@@ -3,13 +3,12 @@ package com.follow.clash

 import com.follow.clash.plugins.AppPlugin
 import com.follow.clash.plugins.ServicePlugin
-import com.follow.clash.plugins.VpnPlugin
 import com.follow.clash.plugins.TilePlugin
+import com.follow.clash.plugins.VpnPlugin
 import io.flutter.embedding.android.FlutterActivity
 import io.flutter.embedding.engine.FlutterEngine

 class MainActivity : FlutterActivity() {
-
    override fun configureFlutterEngine(flutterEngine: FlutterEngine) {
        super.configureFlutterEngine(flutterEngine)
        flutterEngine.plugins.add(AppPlugin())
--- a/android/app/src/main/kotlin/com/follow/clash/TempActivity.kt
+++ b/android/app/src/main/kotlin/com/follow/clash/TempActivity.kt
@@ -2,10 +2,20 @@ package com.follow.clash

 import android.app.Activity
 import android.os.Bundle
+import com.follow.clash.extensions.wrapAction

 class TempActivity : Activity() {
    override fun onCreate(savedInstanceState: Bundle?) {
        super.onCreate(savedInstanceState)
+        when (intent.action) {
+            wrapAction("STOP") -> {
+                GlobalState.handleStop()
+            }
+
+            wrapAction("CHANGE") -> {
+                GlobalState.handleToggle(applicationContext)
+            }
+        }
        finishAndRemoveTask()
    }
 }
--- a/android/app/src/main/kotlin/com/follow/clash/extensions/Ext.kt
+++ b/android/app/src/main/kotlin/com/follow/clash/extensions/Ext.kt
@@ -1,20 +1,29 @@
 package com.follow.clash.extensions

+import android.app.PendingIntent
+import android.content.Context
+import android.content.Intent
 import android.graphics.Bitmap
 import android.graphics.drawable.Drawable
 import android.net.ConnectivityManager
 import android.net.Network
+import android.os.Build
 import android.system.OsConstants.IPPROTO_TCP
 import android.system.OsConstants.IPPROTO_UDP
 import android.util.Base64
 import androidx.core.graphics.drawable.toBitmap
+import com.follow.clash.TempActivity
+import com.follow.clash.models.CIDR
 import com.follow.clash.models.Metadata
+import io.flutter.plugin.common.MethodChannel
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.withContext
 import java.io.ByteArrayOutputStream
 import java.net.Inet4Address
 import java.net.Inet6Address
 import java.net.InetAddress
+import kotlin.coroutines.resume
+import kotlin.coroutines.suspendCoroutine


 suspend fun Drawable.getBase64(): String {
@@ -33,10 +42,29 @@ fun Metadata.getProtocol(): Int? {
    return null
 }

+fun String.toCIDR(): CIDR {
+    val parts = split("/")
+    if (parts.size != 2) {
+        throw IllegalArgumentException("Invalid CIDR format")
+    }
+    val ipAddress = parts[0]
+    val prefixLength = parts[1].toIntOrNull()
+        ?: throw IllegalArgumentException("Invalid prefix length")

-fun ConnectivityManager.resolvePrimaryDns(network: Network?): String? {
-    val properties = getLinkProperties(network) ?: return null
-    return properties.dnsServers.firstOrNull()?.asSocketAddressText(53)
+    val address = InetAddress.getByName(ipAddress)
+
+    val maxPrefix = if (address.address.size == 4) 32 else 128
+    if (prefixLength < 0 || prefixLength > maxPrefix) {
+        throw IllegalArgumentException("Invalid prefix length for IP version")
+    }
+
+    return CIDR(address, prefixLength)
+}
+
+
+fun ConnectivityManager.resolveDns(network: Network?): List<String> {
+    val properties = getLinkProperties(network) ?: return listOf()
+    return properties.dnsServers.map { it.asSocketAddressText(53) }
 }

 fun InetAddress.asSocketAddressText(port: Int): String {
@@ -51,6 +79,34 @@ fun InetAddress.asSocketAddressText(port: Int): String {
    }
 }

+fun Context.wrapAction(action: String):String{
+    return "${this.packageName}.action.$action"
+}
+
+fun Context.getActionIntent(action: String): Intent {
+    val actionIntent = Intent(this, TempActivity::class.java)
+    actionIntent.action = wrapAction(action)
+    return actionIntent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK or Intent.FLAG_ACTIVITY_MULTIPLE_TASK)
+}
+
+fun Context.getActionPendingIntent(action: String): PendingIntent {
+    return if (Build.VERSION.SDK_INT >= 31) {
+        PendingIntent.getActivity(
+            this,
+            0,
+            getActionIntent(action),
+            PendingIntent.FLAG_IMMUTABLE or PendingIntent.FLAG_UPDATE_CURRENT
+        )
+    } else {
+        PendingIntent.getActivity(
+            this,
+            0,
+            getActionIntent(action),
+            PendingIntent.FLAG_UPDATE_CURRENT
+        )
+    }
+}
+

 private fun numericToTextFormat(src: ByteArray): String {
    val sb = StringBuilder(39)
@@ -67,3 +123,25 @@ private fun numericToTextFormat(src: ByteArray): String {
    }
    return sb.toString()
 }
+
+suspend fun <T> MethodChannel.awaitResult(
+    method: String,
+    arguments: Any? = null
+): T? = withContext(Dispatchers.Main) { // 切换到主线程
+    suspendCoroutine { continuation ->
+        invokeMethod(method, arguments, object : MethodChannel.Result {
+            override fun success(result: Any?) {
+                @Suppress("UNCHECKED_CAST")
+                continuation.resume(result as T)
+            }
+
+            override fun error(code: String, message: String?, details: Any?) {
+                continuation.resume(null)
+            }
+
+            override fun notImplemented() {
+                continuation.resume(null)
+            }
+        })
+    }
+}
--- a/android/app/src/main/kotlin/com/follow/clash/models/Dns.kt
+++ b/android/app/src/main/kotlin/com/follow/clash/models/Dns.kt
@@ -1,26 +0,0 @@
-package com.follow.clash.models
-
-import android.net.NetworkCapabilities
-import android.os.Build
-
-val TRANSPORT_PRIORITY = sequence {
-    yield(NetworkCapabilities.TRANSPORT_CELLULAR)
-
-    if (Build.VERSION.SDK_INT >= 27) {
-        yield(NetworkCapabilities.TRANSPORT_LOWPAN)
-    }
-
-    yield(NetworkCapabilities.TRANSPORT_BLUETOOTH)
-
-    if (Build.VERSION.SDK_INT >= 26) {
-        yield(NetworkCapabilities.TRANSPORT_WIFI_AWARE)
-    }
-
-    yield(NetworkCapabilities.TRANSPORT_WIFI)
-
-    if (Build.VERSION.SDK_INT >= 31) {
-        yield(NetworkCapabilities.TRANSPORT_USB)
-    }
-
-    yield(NetworkCapabilities.TRANSPORT_ETHERNET)
-}.toList()
--- a/android/app/src/main/kotlin/com/follow/clash/models/Props.kt
+++ b/android/app/src/main/kotlin/com/follow/clash/models/Props.kt
@@ -1,5 +1,7 @@
 package com.follow.clash.models

+import java.net.InetAddress
+
 enum class AccessControlMode {
    acceptSelected,
    rejectSelected,
@@ -11,19 +13,16 @@ data class AccessControl(
    val rejectList: List<String>,
 )

-data class Props(
-    val enable: Boolean?,
-    val accessControl: AccessControl?,
-    val allowBypass: Boolean?,
-    val systemProxy: Boolean?,
-)
+data class CIDR(val address: InetAddress, val prefixLength: Int)

-data class TunProps(
-    val fd: Int,
-    val gateway: String,
-    val gateway6: String,
-    val portal: String,
-    val portal6: String,
-    val dns: String,
-    val dns6: String
+data class VpnOptions(
+    val enable: Boolean,
+    val port: Int,
+    val accessControl: AccessControl?,
+    val allowBypass: Boolean,
+    val systemProxy: Boolean,
+    val bypassDomain: List<String>,
+    val ipv4Address: String,
+    val ipv6Address: String,
+    val dnsServerAddress: String,
 )
--- a/android/app/src/main/kotlin/com/follow/clash/plugins/AppPlugin.kt
+++ b/android/app/src/main/kotlin/com/follow/clash/plugins/AppPlugin.kt
@@ -14,9 +14,15 @@ import android.widget.Toast
 import androidx.core.app.ActivityCompat
 import androidx.core.content.ContextCompat
 import androidx.core.content.ContextCompat.getSystemService
-import com.android.tools.smali.dexlib2.dexbacked.DexBackedDexFile
 import androidx.core.content.FileProvider
+import androidx.core.content.pm.ShortcutInfoCompat
+import androidx.core.content.pm.ShortcutManagerCompat
+import androidx.core.graphics.drawable.IconCompat
+import com.android.tools.smali.dexlib2.dexbacked.DexBackedDexFile
 import com.follow.clash.GlobalState
+import com.follow.clash.R
+import com.follow.clash.extensions.awaitResult
+import com.follow.clash.extensions.getActionIntent
 import com.follow.clash.extensions.getBase64
 import com.follow.clash.models.Package
 import com.google.gson.Gson
@@ -31,6 +37,7 @@ import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.cancel
 import kotlinx.coroutines.launch
+import kotlinx.coroutines.runBlocking
 import kotlinx.coroutines.withContext
 import java.io.File
 import java.util.zip.ZipFile
@@ -116,11 +123,21 @@ class AppPlugin : FlutterPlugin, MethodChannel.MethodCallHandler, ActivityAware

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

+    private fun initShortcuts(label: String) {
+        val shortcut = ShortcutInfoCompat.Builder(context, "toggle")
+            .setShortLabel(label)
+            .setIcon(IconCompat.createWithResource(context, R.mipmap.ic_launcher_round))
+            .setIntent(context.getActionIntent("CHANGE"))
+            .build()
+        ShortcutManagerCompat.setDynamicShortcuts(context, listOf(shortcut))
+    }
+
+
    override fun onDetachedFromEngine(binding: FlutterPlugin.FlutterPluginBinding) {
        channel.setMethodCallHandler(null)
        scope.cancel()
@@ -128,11 +145,7 @@ class AppPlugin : FlutterPlugin, MethodChannel.MethodCallHandler, ActivityAware

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

@@ -140,13 +153,18 @@ class AppPlugin : FlutterPlugin, MethodChannel.MethodCallHandler, ActivityAware
        when (call.method) {
            "moveTaskToBack" -> {
                activity?.moveTaskToBack(true)
-                result.success(true);
+                result.success(true)
            }

            "updateExcludeFromRecents" -> {
                val value = call.argument<Boolean>("value")
                updateExcludeFromRecents(value)
-                result.success(true);
+                result.success(true)
+            }
+
+            "initShortcuts" -> {
+                initShortcuts(call.arguments as String)
+                result.success(true)
            }

            "getPackages" -> {
@@ -197,7 +215,7 @@ class AppPlugin : FlutterPlugin, MethodChannel.MethodCallHandler, ActivityAware
            }

            else -> {
-                result.notImplemented();
+                result.notImplemented()
            }
        }
    }
@@ -270,7 +288,7 @@ class AppPlugin : FlutterPlugin, MethodChannel.MethodCallHandler, ActivityAware

    private fun getPackages(): List<Package> {
        val packageManager = context.packageManager
-        if (packages.isNotEmpty()) return packages;
+        if (packages.isNotEmpty()) return packages
        packageManager?.getInstalledPackages(PackageManager.GET_META_DATA)?.filter {
            it.packageName != context.packageName
                    || it.requestedPermissions?.contains(Manifest.permission.INTERNET) == true
@@ -284,7 +302,7 @@ class AppPlugin : FlutterPlugin, MethodChannel.MethodCallHandler, ActivityAware
                firstInstallTime = it.firstInstallTime
            )
        }?.let { packages.addAll(it) }
-        return packages;
+        return packages
    }

    private suspend fun getPackagesToJson(): String {
@@ -306,7 +324,7 @@ class AppPlugin : FlutterPlugin, MethodChannel.MethodCallHandler, ActivityAware
        val intent = VpnService.prepare(context)
        if (intent != null) {
            activity?.startActivityForResult(intent, VPN_PERMISSION_REQUEST_CODE)
-            return;
+            return
        }
        vpnCallBack?.invoke()
    }
@@ -330,6 +348,12 @@ class AppPlugin : FlutterPlugin, MethodChannel.MethodCallHandler, ActivityAware
        }
    }

+    fun getText(text: String): String? {
+        return runBlocking {
+            channel.awaitResult<String>("getText", text)
+        }
+    }
+
    private fun isChinaPackage(packageName: String): Boolean {
        val packageManager = context.packageManager ?: return false
        skipPrefixList.forEach {
@@ -398,7 +422,7 @@ class AppPlugin : FlutterPlugin, MethodChannel.MethodCallHandler, ActivityAware
    }

    override fun onAttachedToActivity(binding: ActivityPluginBinding) {
-        activity = binding.activity;
+        activity = binding.activity
        binding.addActivityResultListener(::onActivityResult)
        binding.addRequestPermissionsResultListener(::onRequestPermissionsResultListener)
    }
@@ -408,7 +432,7 @@ class AppPlugin : FlutterPlugin, MethodChannel.MethodCallHandler, ActivityAware
    }

    override fun onReattachedToActivityForConfigChanges(binding: ActivityPluginBinding) {
-        activity = binding.activity;
+        activity = binding.activity
    }

    override fun onDetachedFromActivity() {
--- a/android/app/src/main/kotlin/com/follow/clash/plugins/ServicePlugin.kt
+++ b/android/app/src/main/kotlin/com/follow/clash/plugins/ServicePlugin.kt
@@ -1,8 +1,6 @@
 package com.follow.clash.plugins

 import android.content.Context
-import android.net.ConnectivityManager
-import androidx.core.content.getSystemService
 import com.follow.clash.GlobalState
 import io.flutter.embedding.engine.plugins.FlutterPlugin
 import io.flutter.plugin.common.MethodCall
--- a/android/app/src/main/kotlin/com/follow/clash/plugins/VpnPlugin.kt
+++ b/android/app/src/main/kotlin/com/follow/clash/plugins/VpnPlugin.kt
@@ -1,6 +1,5 @@
 package com.follow.clash.plugins

-import android.annotation.SuppressLint
 import android.content.ComponentName
 import android.content.Context
 import android.content.Intent
@@ -16,9 +15,7 @@ import com.follow.clash.BaseServiceInterface
 import com.follow.clash.GlobalState
 import com.follow.clash.RunState
 import com.follow.clash.extensions.getProtocol
-import com.follow.clash.extensions.resolvePrimaryDns
-import com.follow.clash.models.Props
-import com.follow.clash.models.TunProps
+import com.follow.clash.extensions.resolveDns
 import com.follow.clash.services.FlClashService
 import com.follow.clash.services.FlClashVpnService
 import com.google.gson.Gson
@@ -32,14 +29,14 @@ import kotlinx.coroutines.withContext
 import java.net.InetSocketAddress
 import kotlin.concurrent.withLock
 import com.follow.clash.models.Process
+import com.follow.clash.models.VpnOptions


 class VpnPlugin : FlutterPlugin, MethodChannel.MethodCallHandler {
    private lateinit var flutterMethodChannel: MethodChannel
    private lateinit var context: Context
    private var flClashService: BaseServiceInterface? = null
-    private var port: Int = 7890
-    private var props: Props? = null
+    private lateinit var options: VpnOptions
    private lateinit var scope: CoroutineScope

    private val connectivity by lazy {
@@ -79,11 +76,9 @@ class VpnPlugin : FlutterPlugin, MethodChannel.MethodCallHandler {
    override fun onMethodCall(call: MethodCall, result: MethodChannel.Result) {
        when (call.method) {
            "start" -> {
-                port = call.argument<Int>("port")!!
-                val args = call.argument<String>("args")
-                props =
-                    if (args != null) Gson().fromJson(args, Props::class.java) else null
-                when (props?.enable == true) {
+                val data = call.argument<String>("data")
+                options = Gson().fromJson(data, VpnOptions::class.java)
+                when (options.enable) {
                    true -> handleStartVpn()
                    false -> start()
                }
@@ -163,8 +158,7 @@ class VpnPlugin : FlutterPlugin, MethodChannel.MethodCallHandler {
        }
    }

-    @SuppressLint("ForegroundServiceType")
-    fun handleStartVpn() {
+    private fun handleStartVpn() {
        GlobalState.getCurrentAppPlugin()?.requestVpnPermission(context) {
            start()
        }
@@ -177,9 +171,11 @@ class VpnPlugin : FlutterPlugin, MethodChannel.MethodCallHandler {
    val networks = mutableSetOf<Network>()

    fun onUpdateNetwork() {
-        val dns = networks.mapNotNull {
-            connectivity?.resolvePrimaryDns(it)
-        }.joinToString(separator = ",")
+        val dns = networks.flatMap { network ->
+            connectivity?.resolveDns(network) ?: emptyList()
+        }
+            .toSet()
+            .joinToString(",")
        scope.launch {
            withContext(Dispatchers.Main) {
                flutterMethodChannel.invokeMethod("dnsChanged", dns)
@@ -226,7 +222,6 @@ class VpnPlugin : FlutterPlugin, MethodChannel.MethodCallHandler {
        onUpdateNetwork()
    }

-    @SuppressLint("ForegroundServiceType")
    private fun startForeground(title: String, content: String) {
        GlobalState.runLock.withLock {
            if (GlobalState.runState.value != RunState.START) return
@@ -242,10 +237,10 @@ class VpnPlugin : FlutterPlugin, MethodChannel.MethodCallHandler {
        GlobalState.runLock.withLock {
            if (GlobalState.runState.value == RunState.START) return
            GlobalState.runState.value = RunState.START
-            val tunProps = flClashService?.start(port, props)
+            val fd = flClashService?.start(options)
            flutterMethodChannel.invokeMethod(
                "started",
-                Gson().toJson(tunProps, TunProps::class.java)
+                fd
            )
        }
    }
@@ -260,7 +255,7 @@ class VpnPlugin : FlutterPlugin, MethodChannel.MethodCallHandler {
    }

    private fun bindService() {
-        val intent = when (props?.enable == true) {
+        val intent = when (options.enable) {
            true -> Intent(context, FlClashVpnService::class.java)
            false -> Intent(context, FlClashService::class.java)
        }
--- a/android/app/src/main/kotlin/com/follow/clash/services/FlClashService.kt
+++ b/android/app/src/main/kotlin/com/follow/clash/services/FlClashService.kt
@@ -11,14 +11,14 @@ import android.content.pm.ServiceInfo.FOREGROUND_SERVICE_TYPE_SPECIAL_USE
 import android.os.Binder
 import android.os.Build
 import android.os.IBinder
-import android.util.Log
 import androidx.core.app.NotificationCompat
 import com.follow.clash.BaseServiceInterface
+import com.follow.clash.GlobalState
 import com.follow.clash.MainActivity
-import com.follow.clash.models.Props
+import com.follow.clash.extensions.getActionPendingIntent
+import com.follow.clash.models.VpnOptions


-@SuppressLint("WrongConstant")
 class FlClashService : Service(), BaseServiceInterface {

    private val binder = LocalBinder()
@@ -66,6 +66,11 @@ class FlClashService : Service(), BaseServiceInterface {
            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.S) {
                foregroundServiceBehavior = FOREGROUND_SERVICE_IMMEDIATE
            }
+            addAction(
+                0,
+                GlobalState.getText("stop"),
+                getActionPendingIntent("CHANGE")
+            )
            setOngoing(true)
            setShowWhen(false)
            setOnlyAlertOnce(true)
@@ -73,7 +78,7 @@ class FlClashService : Service(), BaseServiceInterface {
        }
    }

-    override fun start(port: Int, props: Props?) = null
+    override fun start(options: VpnOptions) = 0

    override fun stop() {
        stopSelf()
--- a/android/app/src/main/kotlin/com/follow/clash/services/FlClashTileService.kt
+++ b/android/app/src/main/kotlin/com/follow/clash/services/FlClashTileService.kt
@@ -1,9 +1,9 @@
 package com.follow.clash.services

+import android.annotation.SuppressLint
 import android.app.PendingIntent
 import android.content.Intent
 import android.os.Build
-import android.os.IBinder
 import android.service.quicksettings.Tile
 import android.service.quicksettings.TileService
 import androidx.annotation.RequiresApi
@@ -37,6 +37,7 @@ class FlClashTileService : TileService() {
        GlobalState.runState.observeForever(observer)
    }

+    @SuppressLint("StartActivityAndCollapseDeprecated")
    private fun activityTransfer() {
        val intent = Intent(this, TempActivity::class.java)
        intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK or Intent.FLAG_ACTIVITY_MULTIPLE_TASK)
@@ -65,19 +66,7 @@ class FlClashTileService : TileService() {
    override fun onClick() {
        super.onClick()
        activityTransfer()
-        if (GlobalState.runState.value == RunState.STOP) {
-            GlobalState.runState.value = RunState.PENDING
-            val titlePlugin = GlobalState.getCurrentTitlePlugin()
-            if (titlePlugin != null) {
-                titlePlugin.handleStart()
-            } else {
-                GlobalState.initServiceEngine(applicationContext)
-            }
-        } else if (GlobalState.runState.value == RunState.START) {
-            GlobalState.runState.value = RunState.PENDING
-            GlobalState.getCurrentTitlePlugin()?.handleStop()
-        }
-
+        GlobalState.handleToggle(applicationContext)
    }

    override fun onDestroy() {
--- a/android/app/src/main/kotlin/com/follow/clash/services/FlClashVpnService.kt
+++ b/android/app/src/main/kotlin/com/follow/clash/services/FlClashVpnService.kt
@@ -15,71 +15,43 @@ import android.os.Build
 import android.os.IBinder
 import android.os.Parcel
 import android.os.RemoteException
-import android.util.Log
 import androidx.core.app.NotificationCompat
 import com.follow.clash.BaseServiceInterface
 import com.follow.clash.GlobalState
 import com.follow.clash.MainActivity
 import com.follow.clash.R
+import com.follow.clash.TempActivity
+import com.follow.clash.extensions.getActionPendingIntent
+import com.follow.clash.extensions.toCIDR
 import com.follow.clash.models.AccessControlMode
-import com.follow.clash.models.Props
-import com.follow.clash.models.TunProps
+import com.follow.clash.models.VpnOptions
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
+import kotlinx.coroutines.runBlocking


-@SuppressLint("WrongConstant")
 class FlClashVpnService : VpnService(), BaseServiceInterface {
-
-    companion object {
-        private val passList = listOf(
-            "*zhihu.com",
-            "*zhimg.com",
-            "*jd.com",
-            "100ime-iat-api.xfyun.cn",
-            "*360buyimg.com",
-            "localhost",
-            "*.local",
-            "127.*",
-            "10.*",
-            "172.16.*",
-            "172.17.*",
-            "172.18.*",
-            "172.19.*",
-            "172.2*",
-            "172.30.*",
-            "172.31.*",
-            "192.168.*"
-        )
-        private const val TUN_MTU = 9000
-        private const val TUN_SUBNET_PREFIX = 30
-        private const val TUN_GATEWAY = "172.19.0.1"
-        private const val TUN_SUBNET_PREFIX6 = 126
-        private const val TUN_GATEWAY6 = "fdfe:dcba:9876::1"
-        private const val TUN_PORTAL = "172.19.0.2"
-        private const val TUN_PORTAL6 = "fdfe:dcba:9876::2"
-        private const val TUN_DNS = TUN_PORTAL
-        private const val TUN_DNS6 = TUN_PORTAL6
-        private const val NET_ANY = "0.0.0.0"
-        private const val NET_ANY6 = "::"
-    }
-
    override fun onCreate() {
        super.onCreate()
        GlobalState.initServiceEngine(applicationContext)
    }

-    override fun start(port: Int, props: Props?): TunProps {
+    override fun start(options: VpnOptions): Int {
        return with(Builder()) {
-            addAddress(TUN_GATEWAY, TUN_SUBNET_PREFIX)
-            addAddress(TUN_GATEWAY6, TUN_SUBNET_PREFIX6)
-            addRoute(NET_ANY, 0)
-            addRoute(NET_ANY6, 0)
-            addDnsServer(TUN_DNS)
-            addDnsServer(TUN_DNS6)
-            setMtu(TUN_MTU)
-            props?.accessControl?.let { accessControl ->
+            if (options.ipv4Address.isNotEmpty()) {
+                val cidr = options.ipv4Address.toCIDR()
+                addAddress(cidr.address, cidr.prefixLength)
+                addRoute("0.0.0.0", 0)
+            }
+            if (options.ipv6Address.isNotEmpty()) {
+                val cidr = options.ipv6Address.toCIDR()
+                addAddress(cidr.address, cidr.prefixLength)
+                addRoute("::", 0)
+            }
+            addDnsServer(options.dnsServerAddress)
+            setMtu(9000)
+            options.accessControl?.let { accessControl ->
                when (accessControl.mode) {
                    AccessControlMode.acceptSelected -> {
                        (accessControl.acceptList + packageName).forEach {
@@ -99,32 +71,24 @@ class FlClashVpnService : VpnService(), BaseServiceInterface {
            if (Build.VERSION.SDK_INT >= 29) {
                setMetered(false)
            }
-            if (props?.allowBypass == true) {
+            if (options.allowBypass) {
                allowBypass()
            }
-            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q && props?.systemProxy == true) {
+            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q && options.systemProxy) {
                setHttpProxy(
                    ProxyInfo.buildDirectProxy(
                        "127.0.0.1",
-                        port,
-                        passList
+                        options.port,
+                        options.bypassDomain
                    )
                )
            }
-            TunProps(
-                fd = establish()?.detachFd()
-                    ?: throw NullPointerException("Establish VPN rejected by system"),
-                gateway = "$TUN_GATEWAY/$TUN_SUBNET_PREFIX",
-                gateway6 = "$TUN_GATEWAY6/$TUN_SUBNET_PREFIX6",
-                portal = TUN_PORTAL,
-                portal6 = TUN_PORTAL6,
-                dns = TUN_DNS,
-                dns6 = TUN_DNS6
-            )
+            establish()?.detachFd()
+                ?: throw NullPointerException("Establish VPN rejected by system")
        }
    }

-    fun updateUnderlyingNetworks( networks: Array<Network>){
+    fun updateUnderlyingNetworks(networks: Array<Network>) {
        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP_MR1) {
            this.setUnderlyingNetworks(networks)
        }
@@ -159,6 +123,7 @@ class FlClashVpnService : VpnService(), BaseServiceInterface {
                PendingIntent.FLAG_UPDATE_CURRENT
            )
        }
+
        with(NotificationCompat.Builder(this, CHANNEL)) {
            setSmallIcon(R.drawable.ic_stat_name)
            setContentTitle("FlClash")
@@ -169,6 +134,11 @@ class FlClashVpnService : VpnService(), BaseServiceInterface {
                foregroundServiceBehavior = FOREGROUND_SERVICE_IMMEDIATE
            }
            setOngoing(true)
+            addAction(
+                0,
+                GlobalState.getText("stop"),
+                getActionPendingIntent("STOP")
+            )
            setShowWhen(false)
            setOnlyAlertOnce(true)
            setAutoCancel(true)
@@ -177,21 +147,26 @@ class FlClashVpnService : VpnService(), BaseServiceInterface {

    @SuppressLint("ForegroundServiceType", "WrongConstant")
    override fun startForeground(title: String, content: String) {
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
-            val manager = getSystemService(NotificationManager::class.java)
-            var channel = manager?.getNotificationChannel(CHANNEL)
-            if (channel == null) {
-                channel =
-                    NotificationChannel(CHANNEL, "FlClash", NotificationManager.IMPORTANCE_LOW)
-                manager?.createNotificationChannel(channel)
+        CoroutineScope(Dispatchers.Default).launch {
+            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
+                val manager = getSystemService(NotificationManager::class.java)
+                var channel = manager?.getNotificationChannel(CHANNEL)
+                if (channel == null) {
+                    channel =
+                        NotificationChannel(CHANNEL, "FlClash", NotificationManager.IMPORTANCE_LOW)
+                    manager?.createNotificationChannel(channel)
+                }
+            }
+            val notification =
+                notificationBuilder
+                    .setContentTitle(title)
+                    .setContentText(content)
+                    .build()
+            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.UPSIDE_DOWN_CAKE) {
+                startForeground(notificationId, notification, FOREGROUND_SERVICE_TYPE_SPECIAL_USE)
+            } else {
+                startForeground(notificationId, notification)
            }
-        }
-        val notification =
-            notificationBuilder.setContentTitle(title).setContentText(content).build()
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.UPSIDE_DOWN_CAKE) {
-            startForeground(notificationId, notification, FOREGROUND_SERVICE_TYPE_SPECIAL_USE)
-        } else {
-            startForeground(notificationId, notification)
        }
    }

@@ -210,7 +185,7 @@ class FlClashVpnService : VpnService(), BaseServiceInterface {
                val isSuccess = super.onTransact(code, data, reply, flags)
                if (!isSuccess) {
                    CoroutineScope(Dispatchers.Main).launch {
-                        GlobalState.getCurrentTitlePlugin()?.handleStop()
+                        GlobalState.getCurrentTilePlugin()?.handleStop()
                    }
                }
                return isSuccess
--- a/assets/data/ASN.mmdb
+++ b/assets/data/ASN.mmdb
--- a/assets/data/GeoIP.dat
+++ b/assets/data/GeoIP.dat
--- a/assets/data/GeoSite.dat
+++ b/assets/data/GeoSite.dat
--- a/assets/data/geoip.metadb
+++ b/assets/data/geoip.metadb
--- a/assets/fonts/MiSans-Regular.ttf
+++ b/assets/fonts/MiSans-Regular.ttf
--- a/core/Clash.Meta
+++ b/core/Clash.Meta
--- a/core/common.go
+++ b/core/common.go
@@ -3,9 +3,12 @@ package main
 import "C"
 import (
 	"context"
+	"core/state"
 	"errors"
-	route "github.com/metacubex/mihomo/hub/route"
-	"math"
+	"fmt"
+	"github.com/metacubex/mihomo/constant/features"
+	"github.com/metacubex/mihomo/hub/route"
+	"github.com/samber/lo"
 	"os"
 	"os/exec"
 	"path/filepath"
@@ -154,6 +157,16 @@ func getRawConfigWithId(id string) *config.RawConfig {
 			continue
 		}
 		mapping["path"] = filepath.Join(getProfileProvidersPath(id), value)
+		if configParams.TestURL != nil {
+			if mapping["health-check"] != nil {
+				hc := mapping["health-check"].(map[string]any)
+				if hc != nil {
+					if hc["url"] != nil {
+						hc["url"] = *configParams.TestURL
+					}
+				}
+			}
+		}
 	}
 	for _, mapping := range prof.RuleProvider {
 		value, exist := mapping["path"].(string)
@@ -211,16 +224,16 @@ func sideUpdateExternalProvider(p cp.Provider, bytes []byte) error {
 	switch p.(type) {
 	case *provider.ProxySetProvider:
 		psp := p.(*provider.ProxySetProvider)
-		elm, same, err := psp.SideUpdate(bytes)
-		if err == nil && !same {
-			psp.OnUpdate(elm)
+		_, _, err := psp.SideUpdate(bytes)
+		if err == nil {
+			return err
 		}
 		return nil
 	case rp.RuleSetProvider:
 		rsp := p.(*rp.RuleSetProvider)
-		elm, same, err := rsp.SideUpdate(bytes)
-		if err == nil && !same {
-			rsp.OnUpdate(elm)
+		_, _, err := rsp.SideUpdate(bytes)
+		if err == nil {
+			return err
 		}
 		return nil
 	default:
@@ -234,151 +247,151 @@ func decorationConfig(profileId string, cfg config.RawConfig) *config.RawConfig
 	return prof
 }

-func Reduce[T any, U any](s []T, initVal U, f func(U, T) U) U {
-	for _, v := range s {
-		initVal = f(initVal, v)
-	}
-	return initVal
-}
+//func Reduce[T any, U any](s []T, initVal U, f func(U, T) U) U {
+//	for _, v := range s {
+//		initVal = f(initVal, v)
+//	}
+//	return initVal
+//}
+//
+//func Map[T, U any](slice []T, fn func(T) U) []U {
+//	result := make([]U, len(slice))
+//	for i, v := range slice {
+//		result[i] = fn(v)
+//	}
+//	return result
+//}
+//
+//func replaceFromMap(s string, m map[string]string) string {
+//	for k, v := range m {
+//		s = strings.ReplaceAll(s, k, v)
+//	}
+//	return s
+//}
+//
+//func removeDuplicateFromSlice[T any](slice []T) []T {
+//	result := make([]T, 0)
+//	seen := make(map[any]struct{})
+//	for _, value := range slice {
+//		if _, ok := seen[value]; !ok {
+//			result = append(result, value)
+//			seen[value] = struct{}{}
+//		}
+//	}
+//	return result
+//}

-func Map[T, U any](slice []T, fn func(T) U) []U {
-	result := make([]U, len(slice))
-	for i, v := range slice {
-		result[i] = fn(v)
-	}
-	return result
-}
-
-func replaceFromMap(s string, m map[string]string) string {
-	for k, v := range m {
-		s = strings.ReplaceAll(s, k, v)
-	}
-	return s
-}
-
-func removeDuplicateFromSlice[T any](slice []T) []T {
-	result := make([]T, 0)
-	seen := make(map[any]struct{})
-	for _, value := range slice {
-		if _, ok := seen[value]; !ok {
-			result = append(result, value)
-			seen[value] = struct{}{}
-		}
-	}
-	return result
-}
-
-func generateProxyGroupAndRule(proxyGroup *[]map[string]any, rule *[]string) {
-	var replacements = map[string]string{}
-	var selectArr []map[string]any
-	var urlTestArr []map[string]any
-	var fallbackArr []map[string]any
-	for _, group := range *proxyGroup {
-		switch group["type"] {
-		case "select":
-			selectArr = append(selectArr, group)
-			replacements[group["name"].(string)] = "Proxy"
-			break
-		case "url-test":
-			urlTestArr = append(urlTestArr, group)
-			replacements[group["name"].(string)] = "Auto"
-			break
-		case "fallback":
-			fallbackArr = append(fallbackArr, group)
-			replacements[group["name"].(string)] = "Fallback"
-			break
-		default:
-			break
-		}
-	}
-
-	ProxyProxies := Reduce(selectArr, []string{}, func(res []string, cur map[string]any) []string {
-		if cur["proxies"] == nil {
-			return res
-		}
-		for _, proxyName := range cur["proxies"].([]interface{}) {
-			if str, ok := proxyName.(string); ok {
-				str = replaceFromMap(str, replacements)
-				if str != "Proxy" {
-					res = append(res, str)
-				}
-			}
-		}
-		return res
-	})
-
-	ProxyProxies = removeDuplicateFromSlice(ProxyProxies)
-
-	AutoProxies := Reduce(urlTestArr, []string{}, func(res []string, cur map[string]any) []string {
-		if cur["proxies"] == nil {
-			return res
-		}
-		for _, proxyName := range cur["proxies"].([]interface{}) {
-			if str, ok := proxyName.(string); ok {
-				str = replaceFromMap(str, replacements)
-				if str != "Auto" {
-					res = append(res, str)
-				}
-			}
-		}
-		return res
-	})
-
-	AutoProxies = removeDuplicateFromSlice(AutoProxies)
-
-	FallbackProxies := Reduce(fallbackArr, []string{}, func(res []string, cur map[string]any) []string {
-		if cur["proxies"] == nil {
-			return res
-		}
-		for _, proxyName := range cur["proxies"].([]interface{}) {
-			if str, ok := proxyName.(string); ok {
-				str = replaceFromMap(str, replacements)
-				if str != "Fallback" {
-					res = append(res, str)
-				}
-			}
-		}
-		return res
-	})
-
-	FallbackProxies = removeDuplicateFromSlice(FallbackProxies)
-
-	var computedProxyGroup []map[string]any
-
-	if len(ProxyProxies) > 0 {
-		computedProxyGroup = append(computedProxyGroup,
-			map[string]any{
-				"name":    "Proxy",
-				"type":    "select",
-				"proxies": ProxyProxies,
-			})
-	}
-
-	if len(AutoProxies) > 0 {
-		computedProxyGroup = append(computedProxyGroup,
-			map[string]any{
-				"name":    "Auto",
-				"type":    "url-test",
-				"proxies": AutoProxies,
-			})
-	}
-
-	if len(FallbackProxies) > 0 {
-		computedProxyGroup = append(computedProxyGroup,
-			map[string]any{
-				"name":    "Fallback",
-				"type":    "fallback",
-				"proxies": FallbackProxies,
-			})
-	}
-
-	computedRule := Map(*rule, func(value string) string {
-		return replaceFromMap(value, replacements)
-	})
-
-	*proxyGroup = computedProxyGroup
-	*rule = computedRule
-}
+//func generateProxyGroupAndRule(proxyGroup *[]map[string]any, rule *[]string) {
+//	var replacements = map[string]string{}
+//	var selectArr []map[string]any
+//	var urlTestArr []map[string]any
+//	var fallbackArr []map[string]any
+//	for _, group := range *proxyGroup {
+//		switch group["type"] {
+//		case "select":
+//			selectArr = append(selectArr, group)
+//			replacements[group["name"].(string)] = "Proxy"
+//			break
+//		case "url-test":
+//			urlTestArr = append(urlTestArr, group)
+//			replacements[group["name"].(string)] = "Auto"
+//			break
+//		case "fallback":
+//			fallbackArr = append(fallbackArr, group)
+//			replacements[group["name"].(string)] = "Fallback"
+//			break
+//		default:
+//			break
+//		}
+//	}
+//
+//	ProxyProxies := Reduce(selectArr, []string{}, func(res []string, cur map[string]any) []string {
+//		if cur["proxies"] == nil {
+//			return res
+//		}
+//		for _, proxyName := range cur["proxies"].([]interface{}) {
+//			if str, ok := proxyName.(string); ok {
+//				str = replaceFromMap(str, replacements)
+//				if str != "Proxy" {
+//					res = append(res, str)
+//				}
+//			}
+//		}
+//		return res
+//	})
+//
+//	ProxyProxies = removeDuplicateFromSlice(ProxyProxies)
+//
+//	AutoProxies := Reduce(urlTestArr, []string{}, func(res []string, cur map[string]any) []string {
+//		if cur["proxies"] == nil {
+//			return res
+//		}
+//		for _, proxyName := range cur["proxies"].([]interface{}) {
+//			if str, ok := proxyName.(string); ok {
+//				str = replaceFromMap(str, replacements)
+//				if str != "Auto" {
+//					res = append(res, str)
+//				}
+//			}
+//		}
+//		return res
+//	})
+//
+//	AutoProxies = removeDuplicateFromSlice(AutoProxies)
+//
+//	FallbackProxies := Reduce(fallbackArr, []string{}, func(res []string, cur map[string]any) []string {
+//		if cur["proxies"] == nil {
+//			return res
+//		}
+//		for _, proxyName := range cur["proxies"].([]interface{}) {
+//			if str, ok := proxyName.(string); ok {
+//				str = replaceFromMap(str, replacements)
+//				if str != "Fallback" {
+//					res = append(res, str)
+//				}
+//			}
+//		}
+//		return res
+//	})
+//
+//	FallbackProxies = removeDuplicateFromSlice(FallbackProxies)
+//
+//	var computedProxyGroup []map[string]any
+//
+//	if len(ProxyProxies) > 0 {
+//		computedProxyGroup = append(computedProxyGroup,
+//			map[string]any{
+//				"name":    "Proxy",
+//				"type":    "select",
+//				"proxies": ProxyProxies,
+//			})
+//	}
+//
+//	if len(AutoProxies) > 0 {
+//		computedProxyGroup = append(computedProxyGroup,
+//			map[string]any{
+//				"name":    "Auto",
+//				"type":    "url-test",
+//				"proxies": AutoProxies,
+//			})
+//	}
+//
+//	if len(FallbackProxies) > 0 {
+//		computedProxyGroup = append(computedProxyGroup,
+//			map[string]any{
+//				"name":    "Fallback",
+//				"type":    "fallback",
+//				"proxies": FallbackProxies,
+//			})
+//	}
+//
+//	computedRule := Map(*rule, func(value string) string {
+//		return replaceFromMap(value, replacements)
+//	})
+//
+//	*proxyGroup = computedProxyGroup
+//	*rule = computedRule
+//}

 func genHosts(hosts, patchHosts map[string]any) {
 	for k, v := range patchHosts {
@@ -386,6 +399,37 @@ func genHosts(hosts, patchHosts map[string]any) {
 	}
 }

+func trimArr(arr []string) (r []string) {
+	for _, e := range arr {
+		r = append(r, strings.Trim(e, " "))
+	}
+	return
+}
+
+var ips = []string{"ipinfo.io", "ipapi.co", "api.ip.sb", "ipwho.is"}
+
+func overrideRules(rules *[]string) {
+	var target = ""
+	for _, line := range *rules {
+		rule := trimArr(strings.Split(line, ","))
+		l := len(rule)
+		if l != 2 {
+			return
+		}
+		if strings.ToUpper(rule[0]) == "MATCH" {
+			target = rule[1]
+			break
+		}
+	}
+	if target == "" {
+		return
+	}
+	var rulesExt = lo.Map(ips, func(ip string, index int) string {
+		return fmt.Sprintf("DOMAIN %s %s", ip, target)
+	})
+	*rules = append(rulesExt, *rules...)
+}
+
 func overwriteConfig(targetConfig *config.RawConfig, patchConfig config.RawConfig) {
 	targetConfig.ExternalController = patchConfig.ExternalController
 	targetConfig.ExternalUI = ""
@@ -410,6 +454,12 @@ func overwriteConfig(targetConfig *config.RawConfig, patchConfig config.RawConfi
 	targetConfig.Profile.StoreSelected = false
 	targetConfig.GeoXUrl = patchConfig.GeoXUrl
 	targetConfig.GlobalUA = patchConfig.GlobalUA
+	if configParams.TestURL != nil {
+		constant.DefaultTestURL = *configParams.TestURL
+	}
+	for idx := range targetConfig.ProxyGroup {
+		targetConfig.ProxyGroup[idx]["url"] = ""
+	}
 	genHosts(targetConfig.Hosts, patchConfig.Hosts)
 	if configParams.OverrideDns {
 		targetConfig.DNS = patchConfig.DNS
@@ -418,6 +468,7 @@ func overwriteConfig(targetConfig *config.RawConfig, patchConfig config.RawConfi
 			targetConfig.DNS.Enable = true
 		}
 	}
+	overrideRules(&targetConfig.Rule)
 	//if runtime.GOOS == "android" {
 	//	targetConfig.DNS.NameServer = append(targetConfig.DNS.NameServer, "dhcp://"+dns.SystemDNSPlaceholder)
 	//} else if runtime.GOOS == "windows" {
@@ -430,9 +481,8 @@ func overwriteConfig(targetConfig *config.RawConfig, patchConfig config.RawConfi
 	//}
 }

-func patchConfig(general *config.General, controller *config.Controller) {
+func patchConfig(general *config.General, controller *config.Controller, tls *config.TLS) {
 	log.Infoln("[Apply] patch")
-	route.ReStartServer(controller.ExternalController)
 	tunnel.SetSniffing(general.Sniffing)
 	tunnel.SetFindProcessMode(general.FindProcessMode)
 	dialer.SetTcpConcurrent(general.TCPConcurrent)
@@ -441,6 +491,22 @@ func patchConfig(general *config.General, controller *config.Controller) {
 	tunnel.SetMode(general.Mode)
 	log.SetLevel(general.LogLevel)
 	resolver.DisableIPv6 = !general.IPv6
+
+	route.ReCreateServer(&route.Config{
+		Addr:        controller.ExternalController,
+		TLSAddr:     controller.ExternalControllerTLS,
+		UnixAddr:    controller.ExternalControllerUnix,
+		PipeAddr:    controller.ExternalControllerPipe,
+		Secret:      controller.Secret,
+		Certificate: tls.Certificate,
+		PrivateKey:  tls.PrivateKey,
+		DohServer:   controller.ExternalDohServer,
+		IsDebug:     false,
+		Cors: route.Cors{
+			AllowOrigins:        controller.Cors.AllowOrigins,
+			AllowPrivateNetwork: controller.Cors.AllowPrivateNetwork,
+		},
+	})
 }

 var isRunning = false
@@ -453,7 +519,7 @@ func updateListeners(general *config.General, listeners map[string]constant.Inbo
 	}
 	runLock.Lock()
 	defer runLock.Unlock()
-
+	stopListeners()
 	listener.PatchInboundListeners(listeners, tunnel.Tunnel, true)
 	listener.SetAllowLan(general.AllowLan)
 	inbound.SetSkipAuthPrefixes(general.SkipAuthPrefixes)
@@ -468,34 +534,15 @@ func updateListeners(general *config.General, listeners map[string]constant.Inbo
 	listener.ReCreateShadowSocks(general.ShadowSocksConfig, tunnel.Tunnel)
 	listener.ReCreateVmess(general.VmessConfig, tunnel.Tunnel)
 	listener.ReCreateTuic(general.TuicServer, tunnel.Tunnel)
-	listener.ReCreateTun(general.Tun, tunnel.Tunnel)
+	if !features.Android {
+		listener.ReCreateTun(general.Tun, tunnel.Tunnel)
+	}
 }

 func stopListeners() {
 	listener.StopListener()
 }

-func hcCompatibleProvider(proxyProviders map[string]cp.ProxyProvider) {
-	wg := sync.WaitGroup{}
-	ch := make(chan struct{}, math.MaxInt)
-	for _, proxyProvider := range proxyProviders {
-		proxyProvider := proxyProvider
-		if proxyProvider.VehicleType() == cp.Compatible {
-			log.Infoln("Start initial Compatible provider %s", proxyProvider.Name())
-			wg.Add(1)
-			ch <- struct{}{}
-			go func() {
-				defer func() { <-ch; wg.Done() }()
-				if err := proxyProvider.Initial(); err != nil {
-					log.Errorln("initial Compatible provider %s error: %v", proxyProvider.Name(), err)
-				}
-			}()
-		}
-
-	}
-
-}
-
 func patchSelectGroup() {
 	mapping := configParams.SelectedMap
 	if mapping == nil {
@@ -522,25 +569,19 @@ func patchSelectGroup() {
 }

 func applyConfig() error {
-	cfg, err := config.ParseRawConfig(currentRawConfig)
+	cfg, err := config.ParseRawConfig(state.CurrentRawConfig)
 	if err != nil {
 		cfg, _ = config.ParseRawConfig(config.DefaultRawConfig())
 	}
-	if configParams.TestURL != nil {
-		constant.DefaultTestURL = *configParams.TestURL
-	}
 	if configParams.IsPatch {
-		patchConfig(cfg.General, cfg.Controller)
+		patchConfig(cfg.General, cfg.Controller, cfg.TLS)
 	} else {
 		closeConnections()
 		runtime.GC()
-		hub.UltraApplyConfig(cfg)
+		hub.ApplyConfig(cfg)
 		patchSelectGroup()
 	}
 	updateListeners(cfg.General, cfg.Listeners)
-	if isRunning {
-		hcCompatibleProvider(cfg.Providers)
-	}
 	externalProviders = getExternalProvidersRaw()
 	return err
 }
--- a/core/go.mod
+++ b/core/go.mod
@@ -6,6 +6,14 @@ replace github.com/metacubex/mihomo => ./Clash.Meta

 require github.com/metacubex/mihomo v1.17.1

+require (
+	github.com/metacubex/amneziawg-go v0.0.0-20240922133038-fdf3a4d5a4ab // indirect
+	github.com/metacubex/wireguard-go v0.0.0-20240922131502-c182e7471181 // indirect
+	github.com/sagernet/cors v1.2.1 // indirect
+	github.com/vmihailenco/msgpack/v5 v5.4.1 // indirect
+	github.com/vmihailenco/tagparser/v2 v2.0.0 // indirect
+)
+
 replace github.com/sagernet/sing => github.com/metacubex/sing v0.0.0-20240724044459-6f3cf5896297

 require (
@@ -17,7 +25,7 @@ require (
 	github.com/bahlo/generic-list-go v0.2.0 // indirect
 	github.com/buger/jsonparser v1.1.1 // indirect
 	github.com/cloudflare/circl v1.3.7 // indirect
-	github.com/coreos/go-iptables v0.7.0 // indirect
+	github.com/coreos/go-iptables v0.8.0 // indirect
 	github.com/dlclark/regexp2 v1.11.4 // indirect
 	github.com/ericlagergren/aegis v0.0.0-20230312195928-b4ce538b56f9 // indirect
 	github.com/ericlagergren/polyval v0.0.0-20220411101811-e25bc10ba391 // indirect
@@ -26,7 +34,6 @@ require (
 	github.com/fsnotify/fsnotify v1.7.0 // indirect
 	github.com/gaukas/godicttls v0.0.4 // indirect
 	github.com/go-chi/chi/v5 v5.1.0 // indirect
-	github.com/go-chi/cors v1.2.1 // indirect
 	github.com/go-chi/render v1.0.3 // indirect
 	github.com/go-ole/go-ole v1.3.0 // indirect
 	github.com/go-task/slim-sprig v0.0.0-20230315185526-52ccab3ef572 // indirect
@@ -38,7 +45,7 @@ require (
 	github.com/google/go-cmp v0.6.0 // indirect
 	github.com/google/pprof v0.0.0-20210407192527-94a9f03dee38 // indirect
 	github.com/hashicorp/yamux v0.1.1 // indirect
-	github.com/insomniacslk/dhcp v0.0.0-20240812123929-b105c29bd1b5 // indirect
+	github.com/insomniacslk/dhcp v0.0.0-20240829085014-a3a4c1f04475 // indirect
 	github.com/josharian/native v1.1.0 // indirect
 	github.com/klauspost/compress v1.17.9 // indirect
 	github.com/klauspost/cpuid/v2 v2.2.8 // indirect
@@ -58,8 +65,8 @@ require (
 	github.com/metacubex/sing-shadowsocks2 v0.2.2 // indirect
 	github.com/metacubex/sing-tun v0.2.7-0.20240729131039-ed03f557dee1 // indirect
 	github.com/metacubex/sing-vmess v0.1.9-0.20240719134745-1df6fb20bbf9 // indirect
-	github.com/metacubex/sing-wireguard v0.0.0-20240826061955-1e4e67afe5cd // indirect
-	github.com/metacubex/tfo-go v0.0.0-20240830120620-c5e019b67785 // indirect
+	github.com/metacubex/sing-wireguard v0.0.0-20240924052438-b0976fc59ea3 // indirect
+	github.com/metacubex/tfo-go v0.0.0-20241006021335-daedaf0ca7aa // indirect
 	github.com/metacubex/utls v1.6.6 // indirect
 	github.com/miekg/dns v1.1.62 // indirect
 	github.com/mroth/weightedrand/v2 v2.1.0 // indirect
@@ -79,8 +86,7 @@ require (
 	github.com/sagernet/sing-mux v0.2.1-0.20240124034317-9bfb33698bb6 // indirect
 	github.com/sagernet/sing-shadowtls v0.1.4 // indirect
 	github.com/sagernet/smux v0.0.0-20231208180855-7041f6ea79e7 // indirect
-	github.com/sagernet/wireguard-go v0.0.0-20231209092712-9a439356a62e // indirect
-	github.com/samber/lo v1.47.0 // indirect
+	github.com/samber/lo v1.47.0
 	github.com/shirou/gopsutil/v3 v3.24.5 // indirect
 	github.com/shoenig/go-m1cpu v0.1.6 // indirect
 	github.com/sina-ghaderi/poly1305 v0.0.0-20220724002748-c5926b03988b // indirect
@@ -97,13 +103,13 @@ require (
 	gitlab.com/yawning/bsaes.git v0.0.0-20190805113838-0a714cd429ec // indirect
 	go.uber.org/mock v0.4.0 // indirect
 	go4.org/netipx v0.0.0-20231129151722-fdeea329fbba // indirect
-	golang.org/x/crypto v0.26.0 // indirect
-	golang.org/x/exp v0.0.0-20240808152545-0cdaa3abc0fa // indirect
+	golang.org/x/crypto v0.28.0 // indirect
+	golang.org/x/exp v0.0.0-20240904232852-e7e105dedf7e // indirect
 	golang.org/x/mod v0.20.0 // indirect
-	golang.org/x/net v0.28.0 // indirect
+	golang.org/x/net v0.30.0 // indirect
 	golang.org/x/sync v0.8.0 // indirect
-	golang.org/x/sys v0.24.0 // indirect
-	golang.org/x/text v0.17.0 // indirect
+	golang.org/x/sys v0.26.0 // indirect
+	golang.org/x/text v0.19.0 // indirect
 	golang.org/x/time v0.5.0 // indirect
 	golang.org/x/tools v0.24.0 // indirect
 	google.golang.org/protobuf v1.34.2 // indirect
--- a/core/go.sum
+++ b/core/go.sum
@@ -19,8 +19,8 @@ github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e/go.mod h1:nSuG5e5P
 github.com/chzyer/test v0.0.0-20180213035817-a1ea475d72b1/go.mod h1:Q3SI9o4m/ZMnBNeIyt5eFwwo7qiLfzFZmjNmxjkiQlU=
 github.com/cloudflare/circl v1.3.7 h1:qlCDlTPz2n9fu58M0Nh1J/JzcFpfgkFHHX3O35r5vcU=
 github.com/cloudflare/circl v1.3.7/go.mod h1:sRTcRWXGLrKw6yIGJ+l7amYJFfAXbZG0kBSc8r4zxgA=
-github.com/coreos/go-iptables v0.7.0 h1:XWM3V+MPRr5/q51NuWSgU0fqMad64Zyxs8ZUoMsamr8=
-github.com/coreos/go-iptables v0.7.0/go.mod h1:Qe8Bv2Xik5FyTXwgIbLAnv2sWSBmvWdFETJConOQ//Q=
+github.com/coreos/go-iptables v0.8.0 h1:MPc2P89IhuVpLI7ETL/2tx3XZ61VeICZjYqDEgNsPRc=
+github.com/coreos/go-iptables v0.8.0/go.mod h1:Qe8Bv2Xik5FyTXwgIbLAnv2sWSBmvWdFETJConOQ//Q=
 github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
 github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
@@ -42,8 +42,6 @@ github.com/gaukas/godicttls v0.0.4 h1:NlRaXb3J6hAnTmWdsEKb9bcSBD6BvcIjdGdeb0zfXb
 github.com/gaukas/godicttls v0.0.4/go.mod h1:l6EenT4TLWgTdwslVb4sEMOCf7Bv0JAK67deKr9/NCI=
 github.com/go-chi/chi/v5 v5.1.0 h1:acVI1TYaD+hhedDJ3r54HyA6sExp3HfXq7QWEEY/xMw=
 github.com/go-chi/chi/v5 v5.1.0/go.mod h1:DslCQbL2OYiznFReuXYUmQ2hGd1aDpCnlMNITLSKoi8=
-github.com/go-chi/cors v1.2.1 h1:xEC8UT3Rlp2QuWNEr4Fs/c2EAGVKBwy/1vHx3bppil4=
-github.com/go-chi/cors v1.2.1/go.mod h1:sSbTewc+6wYHBBCW7ytsFSn836hqM7JxpglAy2Vzc58=
 github.com/go-chi/render v1.0.3 h1:AsXqd2a1/INaIfUSKq3G5uA8weYx20FOsM7uSoCyyt4=
 github.com/go-chi/render v1.0.3/go.mod h1:/gr3hVkmYR0YlEy3LxCuVRFzEu9Ruok+gFqbIofjao0=
 github.com/go-logr/logr v1.2.4 h1:g01GSCwiDw2xSZfjJ2/T9M+S6pFdcNtFYsp+Y43HYDQ=
@@ -76,8 +74,8 @@ github.com/google/tink/go v1.6.1/go.mod h1:IGW53kTgag+st5yPhKKwJ6u2l+SSp5/v9XF7s
 github.com/hashicorp/yamux v0.1.1 h1:yrQxtgseBDrq9Y652vSRDvsKCJKOUD+GzTS4Y0Y8pvE=
 github.com/hashicorp/yamux v0.1.1/go.mod h1:CtWFDAQgb7dxtzFs4tWbplKIe2jSi3+5vKbgIO0SLnQ=
 github.com/ianlancetaylor/demangle v0.0.0-20200824232613-28f6c0f3b639/go.mod h1:aSSvb/t6k1mPoxDqO4vJh6VOCGPwU4O0C2/Eqndh1Sc=
-github.com/insomniacslk/dhcp v0.0.0-20240812123929-b105c29bd1b5 h1:GkMacU5ftc+IEg1449N3UEy2XLDz58W4fkrRu2fibb8=
-github.com/insomniacslk/dhcp v0.0.0-20240812123929-b105c29bd1b5/go.mod h1:KclMyHxX06VrVr0DJmeFSUb1ankt7xTfoOA35pCkoic=
+github.com/insomniacslk/dhcp v0.0.0-20240829085014-a3a4c1f04475 h1:hxST5pwMBEOWmxpkX20w9oZG+hXdhKmAIPQ3NGGAxas=
+github.com/insomniacslk/dhcp v0.0.0-20240829085014-a3a4c1f04475/go.mod h1:KclMyHxX06VrVr0DJmeFSUb1ankt7xTfoOA35pCkoic=
 github.com/josharian/intern v1.0.0/go.mod h1:5DoeVV0s6jJacbCEi61lwdGj/aVlrQvzHFFd8Hwg//Y=
 github.com/josharian/native v1.0.1-0.20221213033349-c1e37c09b531/go.mod h1:7X/raswPFr05uY3HiLlYeyQntB6OO7E/d2Cu7qoaN2w=
 github.com/josharian/native v1.1.0 h1:uuaP0hAbW7Y4l0ZRQ6C9zfb7Mg1mbFKry/xzDAfmtLA=
@@ -96,6 +94,8 @@ github.com/mdlayher/netlink v1.7.2 h1:/UtM3ofJap7Vl4QWCPDGXY8d3GIY2UGSDbK+QWmY8/
 github.com/mdlayher/netlink v1.7.2/go.mod h1:xraEF7uJbxLhc5fpHL4cPe221LI2bdttWlU+ZGLfQSw=
 github.com/mdlayher/socket v0.4.1 h1:eM9y2/jlbs1M615oshPQOHZzj6R6wMT7bX5NPiQvn2U=
 github.com/mdlayher/socket v0.4.1/go.mod h1:cAqeGjoufqdxWkD7DkpyS+wcefOtmu5OQ8KuoJGIReA=
+github.com/metacubex/amneziawg-go v0.0.0-20240922133038-fdf3a4d5a4ab h1:Chbw+/31UC14YFNr78pESt5Vowlc62zziw05JCUqoL4=
+github.com/metacubex/amneziawg-go v0.0.0-20240922133038-fdf3a4d5a4ab/go.mod h1:xVKK8jC5Sd3hfh7WjmCq+HorehIbrBijaUWmcuKjPcI=
 github.com/metacubex/bbolt v0.0.0-20240822011022-aed6d4850399 h1:oBowHVKZycNtAFbZ6avaCSZJYeme2Nrj+4RpV2cNJig=
 github.com/metacubex/bbolt v0.0.0-20240822011022-aed6d4850399/go.mod h1:4xcieuIK+M4bGQmQYZVqEaIYqjS1ahO4kXG7EmDgEro=
 github.com/metacubex/chacha v0.1.0 h1:tg9RSJ18NvL38cCWNyYH1eiG6qDCyyXIaTLQthon0sc=
@@ -120,12 +120,14 @@ github.com/metacubex/sing-tun v0.2.7-0.20240729131039-ed03f557dee1 h1:ypfofGDZbP
 github.com/metacubex/sing-tun v0.2.7-0.20240729131039-ed03f557dee1/go.mod h1:olbEx9yVcaw5tHTNlRamRoxmMKcvDvcVS1YLnQGzvWE=
 github.com/metacubex/sing-vmess v0.1.9-0.20240719134745-1df6fb20bbf9 h1:OAXiCosqY8xKDp3pqTW3qbrCprZ1l6WkrXSFSCwyY4I=
 github.com/metacubex/sing-vmess v0.1.9-0.20240719134745-1df6fb20bbf9/go.mod h1:olVkD4FChQ5gKMHG4ZzuD7+fMkJY1G8vwOKpRehjrmY=
-github.com/metacubex/sing-wireguard v0.0.0-20240826061955-1e4e67afe5cd h1:r7alry8u4qlUFLNMwGvG1A8ZcfPM6AMSmrm6E2yKdB4=
-github.com/metacubex/sing-wireguard v0.0.0-20240826061955-1e4e67afe5cd/go.mod h1:uY+BYb0UEknLrqvbGcwi9i++KgrKxsurysgI6G1Pveo=
-github.com/metacubex/tfo-go v0.0.0-20240830120620-c5e019b67785 h1:NNmI+ZV0DzNuqaAInRQuZFLHlWVuyHeow8jYpdKjHjo=
-github.com/metacubex/tfo-go v0.0.0-20240830120620-c5e019b67785/go.mod h1:c7bVFM9f5+VzeZ/6Kg77T/jrg1Xp8QpqlSHvG/aXVts=
+github.com/metacubex/sing-wireguard v0.0.0-20240924052438-b0976fc59ea3 h1:xg71VmzLS6ByAzi/57phwDvjE+dLLs+ozH00k4DnOns=
+github.com/metacubex/sing-wireguard v0.0.0-20240924052438-b0976fc59ea3/go.mod h1:6nitcmzPDL3MXnLdhu6Hm126Zk4S1fBbX3P7jxUxSFw=
+github.com/metacubex/tfo-go v0.0.0-20241006021335-daedaf0ca7aa h1:9mcjV+RGZVC3reJBNDjjNPyS8PmFG97zq56X7WNaFO4=
+github.com/metacubex/tfo-go v0.0.0-20241006021335-daedaf0ca7aa/go.mod h1:4tLB5c8U0CxpkFM+AJJB77jEaVDbLH5XQvy42vAGsWw=
 github.com/metacubex/utls v1.6.6 h1:3D12YKHTf2Z41UPhQU2dWerNWJ5TVQD9gKoQ+H+iLC8=
 github.com/metacubex/utls v1.6.6/go.mod h1:+WLFUnXjcpdxXCnyX25nggw8C6YonZ8zOK2Zm/oRvdo=
+github.com/metacubex/wireguard-go v0.0.0-20240922131502-c182e7471181 h1:hJLQviGySBuaynlCwf/oYgIxbVbGRUIKZCxdya9YrbQ=
+github.com/metacubex/wireguard-go v0.0.0-20240922131502-c182e7471181/go.mod h1:phewKljNYiTVT31Gcif8RiCKnTUOgVWFJjccqYM8s+Y=
 github.com/miekg/dns v1.1.62 h1:cN8OuEF1/x5Rq6Np+h1epln8OiyPWV+lROx9LxcGgIQ=
 github.com/miekg/dns v1.1.62/go.mod h1:mvDlcItzm+br7MToIKqkglaGhlFMHJ9DTNNWONWXbNQ=
 github.com/mroth/weightedrand/v2 v2.1.0 h1:o1ascnB1CIVzsqlfArQQjeMy1U0NcIbBO5rfd5E/OeU=
@@ -156,6 +158,8 @@ github.com/quic-go/qpack v0.4.0 h1:Cr9BXA1sQS2SmDUWjSofMPNKmvF6IiIfDRmgU0w1ZCo=
 github.com/quic-go/qpack v0.4.0/go.mod h1:UZVnYIfi5GRk+zI9UMaCPsmZ2xKJP7XBUvVyT1Knj9A=
 github.com/quic-go/qtls-go1-20 v0.4.1 h1:D33340mCNDAIKBqXuAvexTNMUByrYmFYVfKfDN5nfFs=
 github.com/quic-go/qtls-go1-20 v0.4.1/go.mod h1:X9Nh97ZL80Z+bX/gUXMbipO6OxdiDi58b/fMC9mAL+k=
+github.com/sagernet/cors v1.2.1 h1:Cv5Z8y9YSD6Gm+qSpNrL3LO4lD3eQVvbFYJSG7JCMHQ=
+github.com/sagernet/cors v1.2.1/go.mod h1:O64VyOjjhrkLmQIjF4KGRrJO/5dVXFdpEmCW/eISRAI=
 github.com/sagernet/fswatch v0.1.1 h1:YqID+93B7VRfqIH3PArW/XpJv5H4OLEVWDfProGoRQs=
 github.com/sagernet/fswatch v0.1.1/go.mod h1:nz85laH0mkQqJfaOrqPpkwtU1znMFNVTpT/5oRsVz/o=
 github.com/sagernet/netlink v0.0.0-20240612041022-b9a21c07ac6a h1:ObwtHN2VpqE0ZNjr6sGeT00J8uU7JF4cNUdb44/Duis=
@@ -168,8 +172,6 @@ github.com/sagernet/sing-shadowtls v0.1.4 h1:aTgBSJEgnumzFenPvc+kbD9/W0PywzWevnV
 github.com/sagernet/sing-shadowtls v0.1.4/go.mod h1:F8NBgsY5YN2beQavdgdm1DPlhaKQlaL6lpDdcBglGK4=
 github.com/sagernet/smux v0.0.0-20231208180855-7041f6ea79e7 h1:DImB4lELfQhplLTxeq2z31Fpv8CQqqrUwTbrIRumZqQ=
 github.com/sagernet/smux v0.0.0-20231208180855-7041f6ea79e7/go.mod h1:FP9X2xjT/Az1EsG/orYYoC+5MojWnuI7hrffz8fGwwo=
-github.com/sagernet/wireguard-go v0.0.0-20231209092712-9a439356a62e h1:iGH0RMv2FzELOFNFQtvsxH7NPmlo7X5JizEK51UCojo=
-github.com/sagernet/wireguard-go v0.0.0-20231209092712-9a439356a62e/go.mod h1:YbL4TKHRR6APYQv3U2RGfwLDpPYSyWz6oUlpISBEzBE=
 github.com/samber/lo v1.47.0 h1:z7RynLwP5nbyRscyvcD043DWYoOcYRv3mV8lBeqOCLc=
 github.com/samber/lo v1.47.0/go.mod h1:RmDH9Ct32Qy3gduHQuKJ3gW1fMHAnE/fAzQuf6He5cU=
 github.com/shirou/gopsutil/v3 v3.24.5 h1:i0t8kL+kQTvpAYToeuiVk3TgDeKOFioZO3Ztz/iZ9pI=
@@ -209,6 +211,10 @@ github.com/vishvananda/netns v0.0.0-20191106174202-0a2b9b5464df/go.mod h1:JP3t17
 github.com/vishvananda/netns v0.0.0-20210104183010-2eb08e3e575f/go.mod h1:DD4vA1DwXk04H54A1oHXtwZmA0grkVMdPxx/VGLCah0=
 github.com/vishvananda/netns v0.0.4 h1:Oeaw1EM2JMxD51g9uhtC0D7erkIjgmj8+JZc26m1YX8=
 github.com/vishvananda/netns v0.0.4/go.mod h1:SpkAiCQRtJ6TvvxPnOSyH3BMl6unz3xZlaprSwhNNJM=
+github.com/vmihailenco/msgpack/v5 v5.4.1 h1:cQriyiUvjTwOHg8QZaPihLWeRAAVoCpE00IUPn0Bjt8=
+github.com/vmihailenco/msgpack/v5 v5.4.1/go.mod h1:GaZTsDaehaPpQVyxrf5mtQlH+pc21PIudVV/E3rRQok=
+github.com/vmihailenco/tagparser/v2 v2.0.0 h1:y09buUbR+b5aycVFQs/g70pqKVZNBmxwAhO7/IwNM9g=
+github.com/vmihailenco/tagparser/v2 v2.0.0/go.mod h1:Wri+At7QHww0WTrCBeu4J6bNtoV6mEfg5OIWRZA9qds=
 github.com/wk8/go-ordered-map/v2 v2.1.8 h1:5h/BUHu93oj4gIdvHHHGsScSTMijfx5PeYkE/fJgbpc=
 github.com/wk8/go-ordered-map/v2 v2.1.8/go.mod h1:5nJHM5DyteebpVlHnWMV0rPz6Zp7+xBAnxjb1X5vnTw=
 github.com/yusufpapurcu/wmi v1.2.4 h1:zFUKzehAFReQwLys1b/iSMl+JQGSCSjtVqQn9bBrPo0=
@@ -223,18 +229,18 @@ go4.org/netipx v0.0.0-20231129151722-fdeea329fbba h1:0b9z3AuHCjxk0x/opv64kcgZLBs
 go4.org/netipx v0.0.0-20231129151722-fdeea329fbba/go.mod h1:PLyyIXexvUFg3Owu6p/WfdlivPbZJsZdgWZlrGope/Y=
 golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
 golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
-golang.org/x/crypto v0.26.0 h1:RrRspgV4mU+YwB4FYnuBoKsUapNIL5cohGAmSH3azsw=
-golang.org/x/crypto v0.26.0/go.mod h1:GY7jblb9wI+FOo5y8/S2oY4zWP07AkOJ4+jxCqdqn54=
-golang.org/x/exp v0.0.0-20240808152545-0cdaa3abc0fa h1:ELnwvuAXPNtPk1TJRuGkI9fDTwym6AYBu0qzT8AcHdI=
-golang.org/x/exp v0.0.0-20240808152545-0cdaa3abc0fa/go.mod h1:akd2r19cwCdwSwWeIdzYQGa/EZZyqcOdwWiwj5L5eKQ=
+golang.org/x/crypto v0.28.0 h1:GBDwsMXVQi34v5CCYUm2jkJvu4cbtru2U4TN2PSyQnw=
+golang.org/x/crypto v0.28.0/go.mod h1:rmgy+3RHxRZMyY0jjAJShp2zgEdOqj2AO7U0pYmeQ7U=
+golang.org/x/exp v0.0.0-20240904232852-e7e105dedf7e h1:I88y4caeGeuDQxgdoFPUq097j7kNfw6uvuiNxUBfcBk=
+golang.org/x/exp v0.0.0-20240904232852-e7e105dedf7e/go.mod h1:akd2r19cwCdwSwWeIdzYQGa/EZZyqcOdwWiwj5L5eKQ=
 golang.org/x/lint v0.0.0-20200302205851-738671d3881b/go.mod h1:3xt1FjdF8hUf6vQPIChWIBhFzV8gjjsPE/fR3IyQdNY=
 golang.org/x/mod v0.1.1-0.20191105210325-c90efee705ee/go.mod h1:QqPTAvyqsEbceGzBzNggFXnrqF1CaUcvgkdR5Ot7KZg=
 golang.org/x/mod v0.20.0 h1:utOm6MM3R3dnawAiJgn0y+xvuYRsm1RKM/4giyfDgV0=
 golang.org/x/mod v0.20.0/go.mod h1:hTbmBsO62+eylJbnUtE2MGJUyE7QWk4xUqPFrRgJ+7c=
 golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
 golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
-golang.org/x/net v0.28.0 h1:a9JDOJc5GMUJ0+UDqmLT86WiEy7iWyIhz8gz8E4e5hE=
-golang.org/x/net v0.28.0/go.mod h1:yqtgsTWOOnlGLG9GFRrK3++bGOUEkNBoHZc8MEDWPNg=
+golang.org/x/net v0.30.0 h1:AcW1SDZMkb8IpzCdQUaIq2sP4sZ4zw+55h6ynffypl4=
+golang.org/x/net v0.30.0/go.mod h1:2wGyMJ5iFasEhkwi13ChkO/t1ECNC4X4eBKkVFyYFlU=
 golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.8.0 h1:3NFvSEYkUoMifnESzZl15y791HH1qU2xm6eCJU5ZPXQ=
 golang.org/x/sync v0.8.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk=
@@ -254,13 +260,13 @@ golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.8.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.11.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.21.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
-golang.org/x/sys v0.24.0 h1:Twjiwq9dn6R1fQcyiK+wQyHWfaz/BJB+YIpzU/Cv3Xg=
-golang.org/x/sys v0.24.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
-golang.org/x/term v0.23.0 h1:F6D4vR+EHoL9/sWAWgAR1H2DcHr4PareCbAaCo1RpuU=
-golang.org/x/term v0.23.0/go.mod h1:DgV24QBUrK6jhZXl+20l6UWznPlwAHm1Q1mGHtydmSk=
+golang.org/x/sys v0.26.0 h1:KHjCJyddX0LoSTb3J+vWpupP9p0oznkqVk/IfjymZbo=
+golang.org/x/sys v0.26.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
+golang.org/x/term v0.25.0 h1:WtHI/ltw4NvSUig5KARz9h521QvRC8RmF/cuYqifU24=
+golang.org/x/term v0.25.0/go.mod h1:RPyXicDX+6vLxogjjRxjgD2TKtmAO6NZBsBRfrOLu7M=
 golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
-golang.org/x/text v0.17.0 h1:XtiM5bkSOt+ewxlOE/aE/AKEHibwj/6gvWMl9Rsh0Qc=
-golang.org/x/text v0.17.0/go.mod h1:BuEKDfySbSR4drPmRPG/7iBdf8hvFMuRexcpahXilzY=
+golang.org/x/text v0.19.0 h1:kTxAhCbGbxhK0IwgSKiMO5awPoDQ0RpfiVYBfK860YM=
+golang.org/x/text v0.19.0/go.mod h1:BuEKDfySbSR4drPmRPG/7iBdf8hvFMuRexcpahXilzY=
 golang.org/x/time v0.5.0 h1:o7cqy6amK/52YcAKIPlM3a+Fpj35zvRj2TP+e1xFSfk=
 golang.org/x/time v0.5.0/go.mod h1:3BpzKBy/shNhVucY/MWOyx10tF3SFh9QdLuxbVysPQM=
 golang.org/x/tools v0.0.0-20200130002326-2f3ba24bd6e7/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28=
--- a/core/hub.go
+++ b/core/hub.go
@@ -7,6 +7,7 @@ import "C"
 import (
 	"context"
 	bridge "core/dart-bridge"
+	"core/state"
 	"encoding/json"
 	"fmt"
 	"github.com/metacubex/mihomo/common/utils"
@@ -30,8 +31,6 @@ import (
 	"github.com/metacubex/mihomo/tunnel/statistic"
 )

-var currentRawConfig = config.DefaultRawConfig()
-
 var configParams = ConfigExtendedParams{}

 var externalProviders = map[string]cp.Provider{}
@@ -124,7 +123,7 @@ func updateConfig(s *C.char, port C.longlong) {
 		}
 		configParams = params.Params
 		prof := decorationConfig(params.ProfileId, params.Config)
-		currentRawConfig = prof
+		state.CurrentRawConfig = prof
 		err = applyConfig()
 		if err != nil {
 			bridge.SendToPort(i, err.Error())
@@ -184,7 +183,7 @@ func changeProxy(s *C.char) {

 //export getTraffic
 func getTraffic() *C.char {
-	up, down := statistic.DefaultManager.Current(state.OnlyProxy)
+	up, down := statistic.DefaultManager.Current(state.CurrentState.OnlyProxy)
 	traffic := map[string]int64{
 		"up":   up,
 		"down": down,
@@ -199,7 +198,7 @@ func getTraffic() *C.char {

 //export getTotalTraffic
 func getTotalTraffic() *C.char {
-	up, down := statistic.DefaultManager.Total(state.OnlyProxy)
+	up, down := statistic.DefaultManager.Total(state.CurrentState.OnlyProxy)
 	traffic := map[string]int64{
 		"up":   up,
 		"down": down,
--- a/core/state.go
+++ b/core/state.go
@@ -2,36 +2,33 @@ package main

 import "C"
 import (
+	"core/state"
 	"encoding/json"
 	"fmt"
 )

-type AccessControl struct {
-	Mode              string   `json:"mode"`
-	AcceptList        []string `json:"acceptList"`
-	RejectList        []string `json:"rejectList"`
-	IsFilterSystemApp bool     `json:"isFilterSystemApp"`
+//export getCurrentProfileName
+func getCurrentProfileName() *C.char {
+	if state.CurrentState == nil {
+		return C.CString("")
+	}
+	return C.CString(state.CurrentState.CurrentProfileName)
 }

-type AndroidProps struct {
-	Enable        bool           `json:"enable"`
-	AccessControl *AccessControl `json:"accessControl"`
-	AllowBypass   bool           `json:"allowBypass"`
-	SystemProxy   bool           `json:"systemProxy"`
-}
-
-type State struct {
-	AndroidProps
-	CurrentProfileName string `json:"currentProfileName"`
-	MixedPort          int    `json:"mixedPort"`
-	OnlyProxy          bool   `json:"onlyProxy"`
-}
-
-var state State
-
-//export getState
-func getState() *C.char {
-	data, err := json.Marshal(state)
+//export getAndroidVpnOptions
+func getAndroidVpnOptions() *C.char {
+	options := state.AndroidVpnOptions{
+		Enable:           state.CurrentState.Enable,
+		Port:             state.CurrentRawConfig.MixedPort,
+		Ipv4Address:      state.DefaultIpv4Address,
+		Ipv6Address:      state.GetIpv6Address(),
+		AccessControl:    state.CurrentState.AccessControl,
+		SystemProxy:      state.CurrentState.SystemProxy,
+		AllowBypass:      state.CurrentState.AllowBypass,
+		BypassDomain:     state.CurrentState.BypassDomain,
+		DnsServerAddress: state.GetDnsServerAddress(),
+	}
+	data, err := json.Marshal(options)
 	if err != nil {
 		fmt.Println("Error:", err)
 		return C.CString("")
@@ -42,7 +39,7 @@ func getState() *C.char {
 //export setState
 func setState(s *C.char) {
 	paramsString := C.GoString(s)
-	err := json.Unmarshal([]byte(paramsString), &state)
+	err := json.Unmarshal([]byte(paramsString), state.CurrentState)
 	if err != nil {
 		return
 	}
--- a/core/state/state.go
+++ b/core/state/state.go
@@ -0,0 +1,59 @@
+package state
+
+import "github.com/metacubex/mihomo/config"
+
+var DefaultIpv4Address = "172.19.0.1/30"
+var DefaultDnsAddress = "172.19.0.2"
+var DefaultIpv6Address = "fdfe:dcba:9876::1/126"
+
+var CurrentRawConfig = config.DefaultRawConfig()
+
+type AndroidVpnOptions struct {
+	Enable           bool           `json:"enable"`
+	Port             int            `json:"port"`
+	AccessControl    *AccessControl `json:"accessControl"`
+	AllowBypass      bool           `json:"allowBypass"`
+	SystemProxy      bool           `json:"systemProxy"`
+	BypassDomain     []string       `json:"bypassDomain"`
+	Ipv4Address      string         `json:"ipv4Address"`
+	Ipv6Address      string         `json:"ipv6Address"`
+	DnsServerAddress string         `json:"dnsServerAddress"`
+}
+
+type AccessControl struct {
+	Mode              string   `json:"mode"`
+	AcceptList        []string `json:"acceptList"`
+	RejectList        []string `json:"rejectList"`
+	IsFilterSystemApp bool     `json:"isFilterSystemApp"`
+}
+
+type AndroidVpnRawOptions struct {
+	Enable        bool           `json:"enable"`
+	AccessControl *AccessControl `json:"accessControl"`
+	AllowBypass   bool           `json:"allowBypass"`
+	SystemProxy   bool           `json:"systemProxy"`
+	Ipv6          bool           `json:"ipv6"`
+	BypassDomain  []string       `json:"bypassDomain"`
+}
+
+type State struct {
+	AndroidVpnRawOptions
+	CurrentProfileName string `json:"currentProfileName"`
+	OnlyProxy          bool   `json:"onlyProxy"`
+}
+
+var CurrentState = &State{}
+
+func GetIpv6Address() string {
+	if CurrentState.Ipv6 {
+		return DefaultIpv6Address
+	} else {
+		return ""
+	}
+}
+
+func GetDnsServerAddress() string {
+	//prefix, _ := netip.ParsePrefix(DefaultIpv4Address)
+	//return prefix.Addr().String()
+	return DefaultDnsAddress
+}
--- a/core/tun.go
+++ b/core/tun.go
@@ -6,7 +6,6 @@ import "C"
 import (
 	"core/platform"
 	t "core/tun"
-	"encoding/json"
 	"errors"
 	"github.com/metacubex/mihomo/listener/sing_tun"
 	"strconv"
@@ -42,11 +41,10 @@ var (
 )

 //export startTUN
-func startTUN(s *C.char, port C.longlong) {
+func startTUN(fd C.int, port C.longlong) {
 	i := int64(port)
 	ServicePort = i
-	paramsString := C.GoString(s)
-	if paramsString == "" {
+	if fd == 0 {
 		tunLock.Lock()
 		defer tunLock.Unlock()
 		now := time.Now()
@@ -61,20 +59,8 @@ func startTUN(s *C.char, port C.longlong) {
 	go func() {
 		tunLock.Lock()
 		defer tunLock.Unlock()
-
-		var tunProps = &t.Props{}
-		err := json.Unmarshal([]byte(paramsString), tunProps)
-		if err != nil {
-			log.Errorln("startTUN error: %v", err)
-			return
-		}
-
-		tunListener, err = t.Start(*tunProps)
-
-		if err != nil {
-			return
-		}
-
+		f := int(fd)
+		tunListener, _ = t.Start(f)
 		if tunListener != nil {
 			log.Infoln("TUN address: %v", tunListener.Address())
 		}
@@ -142,7 +128,7 @@ func initSocketHook() {
 		}
 		return conn.Control(func(fd uintptr) {
 			fdInt := int64(fd)
-			timeout := time.After(100 * time.Millisecond)
+			timeout := time.After(500 * time.Millisecond)
 			id := atomic.AddInt64(&fdCounter, 1)

 			markSocket(Fd{
@@ -159,7 +145,7 @@ func initSocketHook() {
 					if exists {
 						return
 					}
-					time.Sleep(10 * time.Millisecond)
+					time.Sleep(20 * time.Millisecond)
 				}
 			}
 		})
--- a/core/tun/tun.go
+++ b/core/tun/tun.go
@@ -4,7 +4,7 @@ package tun

 import "C"
 import (
-	"github.com/metacubex/mihomo/constant"
+	"core/state"
 	LC "github.com/metacubex/mihomo/listener/config"
 	"github.com/metacubex/mihomo/listener/sing_tun"
 	"github.com/metacubex/mihomo/log"
@@ -23,38 +23,38 @@ type Props struct {
 	Dns6     string `json:"dns6"`
 }

-func Start(tunProps Props) (*sing_tun.Listener, error) {
+func Start(fd int) (*sing_tun.Listener, error) {
 	var prefix4 []netip.Prefix
-	tempPrefix4, err := netip.ParsePrefix(tunProps.Gateway)
+	tempPrefix4, err := netip.ParsePrefix(state.DefaultIpv4Address)
 	if err != nil {
 		log.Errorln("startTUN error:", err)
 		return nil, err
 	}
 	prefix4 = append(prefix4, tempPrefix4)
-
 	var prefix6 []netip.Prefix
-	tempPrefix6, err := netip.ParsePrefix(tunProps.Gateway6)
-	if err != nil {
-		log.Errorln("startTUN error:", err)
-		return nil, err
+	if state.CurrentState.Ipv6 {
+		tempPrefix6, err := netip.ParsePrefix(state.DefaultIpv6Address)
+		if err != nil {
+			log.Errorln("startTUN error:", err)
+			return nil, err
+		}
+		prefix6 = append(prefix6, tempPrefix6)
 	}
-	prefix6 = append(prefix6, tempPrefix6)

 	var dnsHijack []string
-	dnsHijack = append(dnsHijack, net.JoinHostPort(tunProps.Dns, "53"))
-	dnsHijack = append(dnsHijack, net.JoinHostPort(tunProps.Dns6, "53"))
+	dnsHijack = append(dnsHijack, net.JoinHostPort(state.GetDnsServerAddress(), "53"))

 	options := LC.Tun{
 		Enable:              true,
-		Device:              sing_tun.InterfaceName,
-		Stack:               constant.TunSystem,
+		Device:              state.CurrentRawConfig.Tun.Device,
+		Stack:               state.CurrentRawConfig.Tun.Stack,
 		DNSHijack:           dnsHijack,
 		AutoRoute:           false,
 		AutoDetectInterface: false,
 		Inet4Address:        prefix4,
 		Inet6Address:        prefix6,
 		MTU:                 9000,
-		FileDescriptor:      tunProps.Fd,
+		FileDescriptor:      fd,
 	}

 	listener, err := sing_tun.New(options, tunnel.Tunnel)
--- a/lib/application.dart
+++ b/lib/application.dart
@@ -1,11 +1,11 @@
 import 'dart:async';
-import 'dart:io';
-
+import 'package:animations/animations.dart';
 import 'package:dynamic_color/dynamic_color.dart';
 import 'package:fl_clash/l10n/l10n.dart';
 import 'package:fl_clash/common/common.dart';
 import 'package:fl_clash/manager/hotkey_manager.dart';
 import 'package:fl_clash/manager/manager.dart';
+import 'package:fl_clash/plugins/app.dart';
 import 'package:fl_clash/state.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_localizations/flutter_localizations.dart';
@@ -29,11 +29,13 @@ runAppWithPreferences(
      ChangeNotifierProvider<Config>(
        create: (_) => config,
      ),
+      ChangeNotifierProvider<AppFlowingState>(
+        create: (_) => AppFlowingState(),
+      ),
      ChangeNotifierProxyProvider2<Config, ClashConfig, AppState>(
        create: (_) => appState,
        update: (_, config, clashConfig, appState) {
          appState?.mode = clashConfig.mode;
-          appState?.isCompatible = config.isCompatible;
          appState?.selectedMap = config.currentSelectedMap;
          return appState!;
        },
@@ -58,10 +60,18 @@ class ApplicationState extends State<Application> {

  final _pageTransitionsTheme = const PageTransitionsTheme(
    builders: <TargetPlatform, PageTransitionsBuilder>{
-      TargetPlatform.android: CupertinoPageTransitionsBuilder(),
-      TargetPlatform.windows: CupertinoPageTransitionsBuilder(),
-      TargetPlatform.linux: CupertinoPageTransitionsBuilder(),
-      TargetPlatform.macOS: CupertinoPageTransitionsBuilder(),
+      TargetPlatform.android: SharedAxisPageTransitionsBuilder(
+        transitionType: SharedAxisTransitionType.horizontal,
+      ),
+      TargetPlatform.windows: SharedAxisPageTransitionsBuilder(
+        transitionType: SharedAxisTransitionType.horizontal,
+      ),
+      TargetPlatform.linux: SharedAxisPageTransitionsBuilder(
+        transitionType: SharedAxisTransitionType.horizontal,
+      ),
+      TargetPlatform.macOS: SharedAxisPageTransitionsBuilder(
+        transitionType: SharedAxisTransitionType.horizontal,
+      ),
    },
  );

@@ -85,6 +95,7 @@ class ApplicationState extends State<Application> {
    super.initState();
    _initTimer();
    globalState.appController = AppController(context);
+    globalState.measure = Measure.of(context);
    WidgetsBinding.instance.addPostFrameCallback((timeStamp) async {
      final currentContext = globalState.navigatorKey.currentContext;
      if (currentContext != null) {
@@ -92,6 +103,7 @@ class ApplicationState extends State<Application> {
      }
      await globalState.appController.init();
      globalState.appController.initLink();
+      app?.initShortcuts();
    });
  }

@@ -161,10 +173,11 @@ class ApplicationState extends State<Application> {
        child: ClashManager(
          child: Selector2<AppState, Config, ApplicationSelectorState>(
            selector: (_, appState, config) => ApplicationSelectorState(
-              locale: config.locale,
-              themeMode: config.themeMode,
-              primaryColor: config.primaryColor,
-              prueBlack: config.prueBlack,
+              locale: config.appSetting.locale,
+              themeMode: config.themeProps.themeMode,
+              primaryColor: config.themeProps.primaryColor,
+              prueBlack: config.themeProps.prueBlack,
+              fontFamily: config.themeProps.fontFamily,
            ),
            builder: (_, state, child) {
              return DynamicColorBuilder(
@@ -179,8 +192,15 @@ class ApplicationState extends State<Application> {
                      GlobalWidgetsLocalizations.delegate
                    ],
                    builder: (_, child) {
-                      return MediaManager(
-                        child: _buildPage(child!),
+                      return LayoutBuilder(
+                        builder: (_, container) {
+                          final appController = globalState.appController;
+                          final maxWidth = container.maxWidth;
+                          if (appController.appState.viewWidth != maxWidth) {
+                            globalState.appController.updateViewWidth(maxWidth);
+                          }
+                          return _buildPage(child!);
+                        },
                      );
                    },
                    scrollBehavior: BaseScrollBehavior(),
@@ -191,6 +211,7 @@ class ApplicationState extends State<Application> {
                    themeMode: state.themeMode,
                    theme: ThemeData(
                      useMaterial3: true,
+                      fontFamily: state.fontFamily.value,
                      pageTransitionsTheme: _pageTransitionsTheme,
                      colorScheme: _getAppColorScheme(
                        brightness: Brightness.light,
@@ -200,6 +221,7 @@ class ApplicationState extends State<Application> {
                    ),
                    darkTheme: ThemeData(
                      useMaterial3: true,
+                      fontFamily: state.fontFamily.value,
                      pageTransitionsTheme: _pageTransitionsTheme,
                      colorScheme: _getAppColorScheme(
                        brightness: Brightness.dark,
--- a/lib/clash/core.dart
+++ b/lib/clash/core.dart
@@ -287,13 +287,18 @@ class ClashCore {
    malloc.free(stateChar);
  }

-  CoreState getState() {
-    final stateRaw = clashFFI.getState();
-    final state = json.decode(
-      stateRaw.cast<Utf8>().toDartString(),
-    );
-    clashFFI.freeCString(stateRaw);
-    return CoreState.fromJson(state);
+  String getCurrentProfileName() {
+    final currentProfileRaw = clashFFI.getCurrentProfileName();
+    final currentProfile = currentProfileRaw.cast<Utf8>().toDartString();
+    clashFFI.freeCString(currentProfileRaw);
+    return currentProfile;
+  }
+
+  AndroidVpnOptions getAndroidVpnOptions() {
+    final vpnOptionsRaw = clashFFI.getAndroidVpnOptions();
+    final vpnOptions = json.decode(vpnOptionsRaw.cast<Utf8>().toDartString());
+    clashFFI.freeCString(vpnOptionsRaw);
+    return AndroidVpnOptions.fromJson(vpnOptions);
  }

  Traffic getTraffic() {
@@ -322,11 +327,9 @@ class ClashCore {
    clashFFI.stopLog();
  }

-  startTun(TunProps? tunProps, int port) {
+  startTun(int fd, int port) {
    if (!Platform.isAndroid) return;
-    final tunPropsChar = json.encode(tunProps).toNativeUtf8().cast<Char>();
-    clashFFI.startTUN(tunPropsChar, port);
-    malloc.free(tunPropsChar);
+    clashFFI.startTUN(fd, port);
  }

  updateDns(String dns) {
--- a/lib/clash/generated/clash_ffi.dart
+++ b/lib/clash/generated/clash_ffi.dart
@@ -5144,6 +5144,20 @@ class ClashFFI {
  late final __FCmulcr =
      __FCmulcrPtr.asFunction<_Fcomplex Function(_Fcomplex, double)>();

+  void updateDns(
+    ffi.Pointer<ffi.Char> s,
+  ) {
+    return _updateDns(
+      s,
+    );
+  }
+
+  late final _updateDnsPtr =
+      _lookup<ffi.NativeFunction<ffi.Void Function(ffi.Pointer<ffi.Char>)>>(
+          'updateDns');
+  late final _updateDns =
+      _updateDnsPtr.asFunction<void Function(ffi.Pointer<ffi.Char>)>();
+
  void start() {
    return _start();
  }
@@ -5264,20 +5278,6 @@ class ClashFFI {
  late final _getProxies =
      _getProxiesPtr.asFunction<ffi.Pointer<ffi.Char> Function()>();

-  void updateDns(
-    ffi.Pointer<ffi.Char> s,
-  ) {
-    return _updateDns(
-      s,
-    );
-  }
-
-  late final _updateDnsPtr =
-      _lookup<ffi.NativeFunction<ffi.Void Function(ffi.Pointer<ffi.Char>)>>(
-          'updateDns');
-  late final _updateDns =
-      _updateDnsPtr.asFunction<void Function(ffi.Pointer<ffi.Char>)>();
-
  void changeProxy(
    ffi.Pointer<ffi.Char> s,
  ) {
@@ -5557,14 +5557,25 @@ class ClashFFI {
  late final _setProcessMap =
      _setProcessMapPtr.asFunction<void Function(ffi.Pointer<ffi.Char>)>();

-  ffi.Pointer<ffi.Char> getState() {
-    return _getState();
+  ffi.Pointer<ffi.Char> getCurrentProfileName() {
+    return _getCurrentProfileName();
  }

-  late final _getStatePtr =
-      _lookup<ffi.NativeFunction<ffi.Pointer<ffi.Char> Function()>>('getState');
-  late final _getState =
-      _getStatePtr.asFunction<ffi.Pointer<ffi.Char> Function()>();
+  late final _getCurrentProfileNamePtr =
+      _lookup<ffi.NativeFunction<ffi.Pointer<ffi.Char> Function()>>(
+          'getCurrentProfileName');
+  late final _getCurrentProfileName =
+      _getCurrentProfileNamePtr.asFunction<ffi.Pointer<ffi.Char> Function()>();
+
+  ffi.Pointer<ffi.Char> getAndroidVpnOptions() {
+    return _getAndroidVpnOptions();
+  }
+
+  late final _getAndroidVpnOptionsPtr =
+      _lookup<ffi.NativeFunction<ffi.Pointer<ffi.Char> Function()>>(
+          'getAndroidVpnOptions');
+  late final _getAndroidVpnOptions =
+      _getAndroidVpnOptionsPtr.asFunction<ffi.Pointer<ffi.Char> Function()>();

  void setState(
    ffi.Pointer<ffi.Char> s,
@@ -5581,20 +5592,19 @@ class ClashFFI {
      _setStatePtr.asFunction<void Function(ffi.Pointer<ffi.Char>)>();

  void startTUN(
-    ffi.Pointer<ffi.Char> s,
+    int fd,
    int port,
  ) {
    return _startTUN(
-      s,
+      fd,
      port,
    );
  }

-  late final _startTUNPtr = _lookup<
-      ffi.NativeFunction<
-          ffi.Void Function(ffi.Pointer<ffi.Char>, ffi.LongLong)>>('startTUN');
-  late final _startTUN =
-      _startTUNPtr.asFunction<void Function(ffi.Pointer<ffi.Char>, int)>();
+  late final _startTUNPtr =
+      _lookup<ffi.NativeFunction<ffi.Void Function(ffi.Int, ffi.LongLong)>>(
+          'startTUN');
+  late final _startTUN = _startTUNPtr.asFunction<void Function(int, int)>();

  ffi.Pointer<ffi.Char> getRunTime() {
    return _getRunTime();
--- a/lib/common/android.dart
+++ b/lib/common/android.dart
@@ -1,10 +1,13 @@
 import 'dart:io';

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

 class Android {
  init() async {
-    app?.onExit = () {};
+    app?.onExit = () async {
+      await globalState.appController.savePreferences();
+    };
  }
 }

--- a/lib/common/common.dart
+++ b/lib/common/common.dart
@@ -28,4 +28,6 @@ export 'iterable.dart';
 export 'scroll.dart';
 export 'icons.dart';
 export 'http.dart';
-export 'keyboard.dart';
+export 'keyboard.dart';
+export 'network.dart';
+export 'navigator.dart';
--- a/lib/common/constant.dart
+++ b/lib/common/constant.dart
@@ -1,8 +1,9 @@
 import 'dart:io';
 import 'dart:ui';

+import 'package:collection/collection.dart';
 import 'package:fl_clash/enum/enum.dart';
-import 'package:fl_clash/models/clash_config.dart';
+import 'package:fl_clash/models/models.dart';
 import 'package:flutter/material.dart';
 import 'system.dart';

@@ -26,9 +27,9 @@ const GeoXMap defaultGeoXMap = {
  "mmdb":
      "https://github.com/MetaCubeX/meta-rules-dat/releases/download/latest/geoip.metadb",
  "asn":
-      "https://github.com/xishang0128/geoip/releases/download/latest/GeoLite2-ASN.mmdb",
+      "https://github.com/MetaCubeX/meta-rules-dat/releases/download/latest/GeoLite2-ASN.mmdb",
  "geoip":
-      "https://github.com/MetaCubeX/meta-rules-dat/releases/download/latest/GeoIP.dat",
+      "https://github.com/MetaCubeX/meta-rules-dat/releases/download/latest/geoip.dat",
  "geosite":
      "https://github.com/MetaCubeX/meta-rules-dat/releases/download/latest/geosite.dat"
 };
@@ -51,6 +52,21 @@ final filter = ImageFilter.blur(
  tileMode: TileMode.mirror,
 );

+const navigationItemListEquality = ListEquality<NavigationItem>();
+const connectionListEquality = ListEquality<Connection>();
+const stringListEquality = ListEquality<String>();
+const logListEquality = ListEquality<Log>();
+const groupListEquality = ListEquality<Group>();
+const externalProviderListEquality = ListEquality<ExternalProvider>();
+const packageListEquality = ListEquality<Package>();
+const hotKeyActionListEquality = ListEquality<HotKeyAction>();
+const stringAndStringMapEquality = MapEquality<String, String>();
+const stringAndStringMapEntryIterableEquality =
+    IterableEquality<MapEntry<String, String>>();
+const stringAndIntQMapEquality = MapEquality<String, int?>();
+const stringSetEquality = SetEquality<String>();
+const keyboardModifierListEquality = SetEquality<KeyboardModifier>();
+
 const viewModeColumnsMap = {
  ViewMode.mobile: [2, 1],
  ViewMode.laptop: [3, 2],
--- a/lib/common/context.dart
+++ b/lib/common/context.dart
@@ -11,7 +11,7 @@ extension BuildContextExtension on BuildContext {
    return MediaQuery.of(this).size;
  }

-  double get width {
+  double get viewWidth {
    return appSize.width;
  }

--- a/lib/common/http.dart
+++ b/lib/common/http.dart
@@ -11,8 +11,9 @@ class FlClashHttpOverrides extends HttpOverrides {
    client.badCertificateCallback = (_, __, ___) => true;
    client.findProxy = (url) {
      debugPrint("find $url");
-      final port = globalState.appController.clashConfig.mixedPort;
-      final isStart = globalState.appController.appState.isStart;
+      final appController = globalState.appController;
+      final port = appController.clashConfig.mixedPort;
+      final isStart = appController.appFlowingState.isStart;
      if (!isStart) return "DIRECT";
      return "PROXY localhost:$port";
    };
--- a/lib/common/iterable.dart
+++ b/lib/common/iterable.dart
@@ -62,6 +62,6 @@ extension DoubleListExt on List<double> {
      }
    }

-    return -1; // 这行理论上不会执行到，但为了完整性保留
+    return -1;
  }
 }
--- a/lib/common/launch.dart
+++ b/lib/common/launch.dart
@@ -58,22 +58,7 @@ class AutoLaunch {

  Future<bool> windowsEnable() async {
    await disable();
-    return windows?.runas(
-          'schtasks',
-          [
-            '/Create',
-            '/SC',
-            'ONLOGON',
-            '/TN',
-            appName,
-            '/TR',
-            '"${Platform.resolvedExecutable}"',
-            '/RL',
-            'HIGHEST',
-            '/F'
-          ].join(" "),
-        ) ??
-        false;
+    return await windows?.registerTask(appName) ?? false;
  }

  Future<bool> disable() async {
@@ -81,9 +66,9 @@ class AutoLaunch {
  }

  updateStatus(AutoLaunchState state) async {
-    final isOpenTun = state.isOpenTun;
+    final isAdminAutoLaunch = state.isAdminAutoLaunch;
    final isAutoLaunch = state.isAutoLaunch;
-    if (Platform.isWindows && isOpenTun) {
+    if (Platform.isWindows && isAdminAutoLaunch) {
      if (await windowsIsEnable == isAutoLaunch) return;
      if (isAutoLaunch) {
        final isEnable = await windowsEnable();
--- a/lib/common/list.dart
+++ b/lib/common/list.dart
@@ -15,4 +15,10 @@ extension ListExtension<T> on List<T> {
    }
    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
@@ -6,7 +6,10 @@ class Measure {
  final TextScaler _textScale;
  late BuildContext context;

-  Measure.of(this.context) : _textScale = MediaQuery.of(context).textScaler;
+  Measure.of(this.context)
+      : _textScale = TextScaler.linear(
+          WidgetsBinding.instance.platformDispatcher.textScaleFactor,
+        );

  Size computeTextSize(Text text) {
    final textPainter = TextPainter(
@@ -19,6 +22,7 @@ class Measure {
  }

  double? _bodyMediumHeight;
+  Size? _bodyLargeSize;
  double? _bodySmallHeight;
  double? _labelSmallHeight;
  double? _labelMediumHeight;
@@ -28,17 +32,27 @@ class Measure {
  double get bodyMediumHeight {
    _bodyMediumHeight ??= computeTextSize(
      Text(
-        "",
+        "X",
        style: context.textTheme.bodyMedium,
      ),
    ).height;
    return _bodyMediumHeight!;
  }

+  Size get bodyLargeSize {
+    _bodyLargeSize ??= computeTextSize(
+      Text(
+        "X",
+        style: context.textTheme.bodyLarge,
+      ),
+    );
+    return _bodyLargeSize!;
+  }
+
  double get bodySmallHeight {
    _bodySmallHeight ??= computeTextSize(
      Text(
-        "",
+        "X",
        style: context.textTheme.bodySmall,
      ),
    ).height;
@@ -48,7 +62,7 @@ class Measure {
  double get labelSmallHeight {
    _labelSmallHeight ??= computeTextSize(
      Text(
-        "",
+        "X",
        style: context.textTheme.labelSmall,
      ),
    ).height;
@@ -58,7 +72,7 @@ class Measure {
  double get labelMediumHeight {
    _labelMediumHeight ??= computeTextSize(
      Text(
-        "",
+        "X",
        style: context.textTheme.labelMedium,
      ),
    ).height;
@@ -68,7 +82,7 @@ class Measure {
  double get titleLargeHeight {
    _titleLargeHeight ??= computeTextSize(
      Text(
-        "",
+        "X",
        style: context.textTheme.titleLarge,
      ),
    ).height;
@@ -78,7 +92,7 @@ class Measure {
  double get titleMediumHeight {
    _titleMediumHeight ??= computeTextSize(
      Text(
-        "",
+        "X",
        style: context.textTheme.titleMedium,
      ),
    ).height;
--- a/lib/common/navigator.dart
+++ b/lib/common/navigator.dart
@@ -0,0 +1,11 @@
+import 'package:flutter/material.dart';
+
+class BaseNavigator {
+  static Future<T?> push<T>(BuildContext context, Widget child) async {
+    return await Navigator.of(context).push<T>(
+      MaterialPageRoute(
+        builder: (context) => child,
+      ),
+    );
+  }
+}
--- a/lib/common/network.dart
+++ b/lib/common/network.dart
@@ -0,0 +1,25 @@
+import 'dart:io';
+
+extension NetworkInterfaceExt on NetworkInterface {
+  bool get isWifi {
+    final nameLowCase = name.toLowerCase();
+    if (nameLowCase.contains('wlan') ||
+        nameLowCase.contains('wi-fi') ||
+        nameLowCase == 'en0' ||
+        nameLowCase == 'eth0') {
+      return true;
+    }
+
+    return false;
+  }
+
+  bool get includesIPv4 {
+    return addresses.any((addr) => addr.isIPv4);
+  }
+}
+
+extension InternetAddressExt on InternetAddress {
+  bool get isIPv4 {
+    return type == InternetAddressType.IPv4;
+  }
+}
--- a/lib/common/other.dart
+++ b/lib/common/other.dart
@@ -2,6 +2,7 @@ import 'dart:io';
 import 'dart:isolate';
 import 'dart:math';
 import 'dart:typed_data';
+import 'dart:ui';

 import 'package:fl_clash/common/common.dart';
 import 'package:fl_clash/enum/enum.dart';
@@ -101,17 +102,19 @@ class Other {
  }

  String getTrayIconPath({
-    required bool isStart,
    required Brightness brightness,
  }) {
-    final suffix = Platform.isWindows ? "ico" : "png";
-    if (!isStart && Platform.isWindows) {
-      return switch (brightness) {
-        Brightness.dark => "assets/images/icon_white.$suffix",
-        Brightness.light => "assets/images/icon_black.$suffix",
-      };
+    if(Platform.isMacOS){
+      return "assets/images/icon_white.png";
    }
-    return "assets/images/icon.$suffix";
+    final suffix = Platform.isWindows ? "ico" : "png";
+    if (Platform.isWindows) {
+      return "assets/images/icon.$suffix";
+    }
+    return switch (brightness) {
+      Brightness.dark => "assets/images/icon_white.$suffix",
+      Brightness.light => "assets/images/icon_black.$suffix",
+    };
  }

  int compareVersions(String version1, String version2) {
@@ -171,25 +174,27 @@ class Other {
    if (disposition == null) return null;
    final parseValue = HeaderValue.parse(disposition);
    final parameters = parseValue.parameters;
-    final key = parameters.keys
-        .firstWhere((key) => key.startsWith("filename"), orElse: () => '');
-    if (key.isEmpty) return null;
-    if (key == "filename*") {
-      return Uri.decodeComponent((parameters[key] ?? "").split("'").last);
-    } else {
-      return parameters[key];
+    final fileNamePointKey = parameters.keys
+        .firstWhere((key) => key == "filename*", orElse: () => "");
+    if (fileNamePointKey.isNotEmpty) {
+      final res = parameters[fileNamePointKey]?.split("''") ?? [];
+      if (res.length >= 2) {
+        return Uri.decodeComponent(res[1]);
+      }
    }
+    final fileNameKey = parameters.keys
+        .firstWhere((key) => key == "filename", orElse: () => "");
+    if (fileNameKey.isEmpty) return null;
+    return parameters[fileNameKey];
  }

-  double getViewWidth() {
-    final view = WidgetsBinding.instance.platformDispatcher.views.first;
-    final size = view.physicalSize / view.devicePixelRatio;
-    return size.width;
+  FlutterView getScreen() {
+    return WidgetsBinding.instance.platformDispatcher.views.first;
  }

  List<String> parseReleaseBody(String? body) {
    if (body == null) return [];
-    const pattern = r'- (.+?)\. \[.+?\]';
+    const pattern = r'- \s*(.*)';
    final regex = RegExp(pattern);
    return regex
        .allMatches(body)
@@ -220,6 +225,15 @@ class Other {
  String getBackupFileName() {
    return "${appName}_backup_${DateTime.now().show}.zip";
  }
+
+  String get logFile {
+    return "${appName}_${DateTime.now().show}.log";
+  }
+
+  Size getScreenSize() {
+    final view = WidgetsBinding.instance.platformDispatcher.views.first;
+    return view.physicalSize / view.devicePixelRatio;
+  }
 }

 final other = Other();
--- a/lib/common/path.dart
+++ b/lib/common/path.dart
@@ -8,11 +8,12 @@ import 'constant.dart';

 class AppPath {
  static AppPath? _instance;
-  Completer<Directory> cacheDir = Completer();
+  Completer<Directory> dataDir = Completer();
  Completer<Directory> downloadDir = Completer();
+  Completer<Directory> tempDir = Completer();
+  late String appDirPath;

  // Future<Directory> _createDesktopCacheDir() async {
-  //   final path = join(dirname(Platform.resolvedExecutable), 'cache');
  //   final dir = Directory(path);
  //   if (await dir.exists()) {
  //     await dir.create(recursive: true);
@@ -21,8 +22,12 @@ class AppPath {
  // }

  AppPath._internal() {
+    appDirPath = join(dirname(Platform.resolvedExecutable));
    getApplicationSupportDirectory().then((value) {
-      cacheDir.complete(value);
+      dataDir.complete(value);
+    });
+    getTemporaryDirectory().then((value){
+     tempDir.complete(value);
    });
    getDownloadsDirectory().then((value) {
      downloadDir.complete(value);
@@ -49,12 +54,12 @@ class AppPath {
  }

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

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

@@ -63,6 +68,11 @@ class AppPath {
    final directory = await getProfilesPath();
    return join(directory, "$id.yaml");
  }
+
+  Future<String> get tempPath async {
+    final directory = await tempDir.future;
+    return directory.path;
+  }
 }

 final appPath = AppPath();
--- a/lib/common/preferences.dart
+++ b/lib/common/preferences.dart
@@ -1,6 +1,7 @@
 import 'dart:async';
 import 'dart:convert';

+import 'package:flutter/cupertino.dart';
 import 'package:shared_preferences/shared_preferences.dart';

 import '../models/models.dart';
@@ -28,7 +29,8 @@ class Preferences {
    try {
      return ClashConfig.fromJson(clashConfigMap);
    } catch (e) {
-      throw e.toString();
+      debugPrint(e.toString());
+      return null;
    }
  }

@@ -48,7 +50,8 @@ class Preferences {
    try {
      return Config.fromJson(configMap);
    } catch (e) {
-      throw e.toString();
+      debugPrint(e.toString());
+      return null;
    }
  }

--- a/lib/common/request.dart
+++ b/lib/common/request.dart
@@ -1,4 +1,3 @@
-import 'dart:math';
 import 'dart:typed_data';

 import 'package:dio/dio.dart';
@@ -77,7 +76,7 @@ class Request {
  };

  Future<IpInfo?> checkIp({CancelToken? cancelToken}) async {
-    for (final source in _ipInfoSources.entries.toList()..shuffle(Random())) {
+    for (final source in _ipInfoSources.entries) {
      try {
        final response = await _dio
            .get<Map<String, dynamic>>(
--- a/lib/common/scroll.dart
+++ b/lib/common/scroll.dart
@@ -25,3 +25,18 @@ class HiddenBarScrollBehavior extends BaseScrollBehavior {
    return child;
  }
 }
+
+class ShowBarScrollBehavior extends BaseScrollBehavior {
+  @override
+  Widget buildScrollbar(
+    BuildContext context,
+    Widget child,
+    ScrollableDetails details,
+  ) {
+    return Scrollbar(
+      interactive: true,
+      controller: details.controller,
+      child: child,
+    );
+  }
+}
--- a/lib/common/string.dart
+++ b/lib/common/string.dart
@@ -1,3 +1,8 @@
+import 'dart:convert';
+import 'dart:typed_data';
+
+import 'package:flutter/material.dart';
+
 extension StringExtension on String {
  bool get isUrl {
    return RegExp(r'^(http|https|ftp)://').hasMatch(this);
@@ -8,4 +13,38 @@ extension StringExtension on String {
      other.toLowerCase(),
    );
  }
+
+  List<int> get encodeUtf16LeWithBom {
+    final byteData = ByteData(length * 2);
+    final bom = [0xFF, 0xFE];
+    for (int i = 0; i < length; i++) {
+      int charCode = codeUnitAt(i);
+      byteData.setUint16(i * 2, charCode, Endian.little);
+    }
+    return bom + byteData.buffer.asUint8List();
+  }
+
+  Uint8List? get getBase64 {
+    final regExp = RegExp(r'base64,(.*)');
+    final match = regExp.firstMatch(this);
+    final realValue = match?.group(1) ?? '';
+    if (realValue.isEmpty) {
+      return null;
+    }
+    try {
+      return base64.decode(realValue);
+    } catch (e) {
+      return null;
+    }
+  }
+
+  bool get isRegex {
+    try {
+      RegExp(this);
+      return true;
+    } catch (e) {
+      debugPrint(e.toString());
+      return false;
+    }
+  }
 }
--- a/lib/common/system.dart
+++ b/lib/common/system.dart
@@ -3,7 +3,6 @@ import 'dart:io';
 import 'package:device_info_plus/device_info_plus.dart';
 import 'package:fl_clash/plugins/app.dart';
 import 'package:flutter/services.dart';
-import 'package:window_manager/window_manager.dart';

 import 'window.dart';

--- a/lib/common/window.dart
+++ b/lib/common/window.dart
@@ -1,5 +1,7 @@
 import 'dart:io';
+import 'dart:math';

+import 'package:fl_clash/common/common.dart';
 import 'package:fl_clash/models/config.dart';
 import 'package:flutter/material.dart';
 import 'package:window_manager/window_manager.dart';
@@ -21,14 +23,7 @@ class Window {
      size: Size(props.width, props.height),
      minimumSize: const Size(380, 500),
    );
-    if (props.left != null || props.top != null) {
-      await windowManager.setPosition(
-        Offset(props.left ?? 0, props.top ?? 0),
-      );
-    } else {
-      await windowManager.setAlignment(Alignment.center);
-    }
-    if(!Platform.isMacOS || version > 10){
+    if (!Platform.isMacOS || version > 10) {
      await windowManager.setTitleBarStyle(TitleBarStyle.hidden);
    }
    await windowManager.waitUntilReadyToShow(windowOptions, () async {
--- a/lib/common/windows.dart
+++ b/lib/common/windows.dart
@@ -1,6 +1,8 @@
 import 'dart:ffi';
 import 'dart:io';
 import 'package:ffi/ffi.dart';
+import 'package:fl_clash/common/common.dart';
+import 'package:path/path.dart';

 class Windows {
  static Windows? _instance;
@@ -54,6 +56,62 @@ class Windows {
    }
    return true;
  }
+
+  Future<bool> registerTask(String appName) async {
+    final taskXml = '''
+<?xml version="1.0" encoding="UTF-16"?>
+<Task version="1.3" xmlns="http://schemas.microsoft.com/windows/2004/02/mit/task">
+  <Principals>
+    <Principal id="Author">
+      <LogonType>InteractiveToken</LogonType>
+      <RunLevel>HighestAvailable</RunLevel>
+    </Principal>
+  </Principals>
+  <Triggers>
+    <LogonTrigger/>
+  </Triggers>
+  <Settings>
+    <MultipleInstancesPolicy>Parallel</MultipleInstancesPolicy>
+    <DisallowStartIfOnBatteries>false</DisallowStartIfOnBatteries>
+    <StopIfGoingOnBatteries>false</StopIfGoingOnBatteries>
+    <AllowHardTerminate>false</AllowHardTerminate>
+    <StartWhenAvailable>false</StartWhenAvailable>
+    <RunOnlyIfNetworkAvailable>false</RunOnlyIfNetworkAvailable>
+    <IdleSettings>
+      <StopOnIdleEnd>false</StopOnIdleEnd>
+      <RestartOnIdle>false</RestartOnIdle>
+    </IdleSettings>
+    <AllowStartOnDemand>true</AllowStartOnDemand>
+    <Enabled>true</Enabled>
+    <Hidden>false</Hidden>
+    <RunOnlyIfIdle>false</RunOnlyIfIdle>
+    <WakeToRun>false</WakeToRun>
+    <ExecutionTimeLimit>PT72H</ExecutionTimeLimit>
+    <Priority>7</Priority>
+  </Settings>
+  <Actions Context="Author">
+    <Exec>
+      <Command>"${Platform.resolvedExecutable}"</Command>
+    </Exec>
+  </Actions>
+</Task>''';
+    final taskPath = join(await appPath.tempPath, "task.xml");
+    await File(taskPath).create(recursive: true);
+    await File(taskPath)
+        .writeAsBytes(taskXml.encodeUtf16LeWithBom, flush: true);
+    final commandLine = [
+      '/Create',
+      '/TN',
+      appName,
+      '/XML',
+      "%s",
+      '/F',
+    ].join(" ");
+    return runas(
+      'schtasks',
+      commandLine.replaceFirst("%s", taskPath),
+    );
+  }
 }

 final windows = Platform.isWindows ? Windows() : null;
--- a/lib/controller.dart
+++ b/lib/controller.dart
@@ -2,14 +2,17 @@ import 'dart:async';
 import 'dart:convert';
 import 'dart:io';
 import 'dart:isolate';
+import 'dart:typed_data';

 import 'package:archive/archive.dart';
 import 'package:fl_clash/common/archive.dart';
 import 'package:fl_clash/enum/enum.dart';
 import 'package:fl_clash/state.dart';
 import 'package:flutter/material.dart';
+import 'package:intl/intl.dart';
 import 'package:path/path.dart';
 import 'package:provider/provider.dart';
+import 'package:tray_manager/tray_manager.dart';
 import 'package:url_launcher/url_launcher.dart';

 import 'clash/core.dart';
@@ -19,20 +22,26 @@ import 'common/common.dart';
 class AppController {
  final BuildContext context;
  late AppState appState;
+  late AppFlowingState appFlowingState;
  late Config config;
  late ClashConfig clashConfig;
  late Function updateClashConfigDebounce;
  late Function updateGroupDebounce;
  late Function addCheckIpNumDebounce;
  late Function applyProfileDebounce;
+  late Function savePreferencesDebounce;

  AppController(this.context) {
    appState = context.read<AppState>();
    config = context.read<Config>();
    clashConfig = context.read<ClashConfig>();
+    appFlowingState = context.read<AppFlowingState>();
    updateClashConfigDebounce = debounce<Function()>(() async {
      await updateClashConfig();
    });
+    savePreferencesDebounce = debounce<Function()>(() async {
+      await savePreferences();
+    });
    applyProfileDebounce = debounce<Function()>(() async {
      await applyProfile(isPrue: true);
    });
@@ -46,23 +55,22 @@ class AppController {

  updateStatus(bool isStart) async {
    if (isStart) {
-      await globalState.handleStart(
-        config: config,
-        clashConfig: clashConfig,
-      );
+      await globalState.handleStart();
      updateRunTime();
      updateTraffic();
      globalState.updateFunctionLists = [
        updateRunTime,
        updateTraffic,
      ];
-      applyProfileDebounce();
+      if (!Platform.isAndroid) {
+        applyProfileDebounce();
+      }
    } else {
      await globalState.handleStop();
      clashCore.resetTraffic();
-      appState.traffics = [];
-      appState.totalTraffic = Traffic();
-      appState.runTime = null;
+      appFlowingState.traffics = [];
+      appFlowingState.totalTraffic = Traffic();
+      appFlowingState.runTime = null;
      addCheckIpNumDebounce();
    }
  }
@@ -76,15 +84,15 @@ class AppController {
    if (startTime != null) {
      final startTimeStamp = startTime.millisecondsSinceEpoch;
      final nowTimeStamp = DateTime.now().millisecondsSinceEpoch;
-      appState.runTime = nowTimeStamp - startTimeStamp;
+      appFlowingState.runTime = nowTimeStamp - startTimeStamp;
    } else {
-      appState.runTime = null;
+      appFlowingState.runTime = null;
    }
  }

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

@@ -116,11 +124,15 @@ class AppController {
  }

  Future<void> updateClashConfig({bool isPatch = true}) async {
-    await globalState.updateClashConfig(
-      clashConfig: clashConfig,
-      config: config,
-      isPatch: isPatch,
-    );
+    final commonScaffoldState = globalState.homeScaffoldKey.currentState;
+    if (commonScaffoldState?.mounted != true) return;
+    await commonScaffoldState?.loadingRun(() async {
+      await globalState.updateClashConfig(
+        clashConfig: clashConfig,
+        config: config,
+        isPatch: isPatch,
+      );
+    });
  }

  Future applyProfile({bool isPrue = false}) async {
@@ -163,7 +175,7 @@ class AppController {
      try {
        updateProfile(profile);
      } catch (e) {
-        appState.addLog(
+        appFlowingState.addLog(
          Log(
            logLevel: LogLevel.info,
            payload: e.toString(),
@@ -191,17 +203,8 @@ class AppController {
  }

  savePreferences() async {
-    await saveConfigPreferences();
-    await saveClashConfigPreferences();
-  }
-
-  saveConfigPreferences() async {
-    debugPrint("saveConfigPreferences");
+    debugPrint("[APP] savePreferences");
    await preferences.saveConfig(config);
-  }
-
-  saveClashConfigPreferences() async {
-    debugPrint("saveClashConfigPreferences");
    await preferences.saveClashConfig(clashConfig);
  }

@@ -218,9 +221,9 @@ class AppController {
  }

  handleBackOrExit() async {
-    if (config.isMinimizeOnExit) {
+    if (config.appSetting.minimizeOnExit) {
      if (system.isDesktop) {
-        await savePreferences();
+        await savePreferencesDebounce();
      }
      await system.back();
    } else {
@@ -237,16 +240,16 @@ class AppController {
  }

  updateLogStatus() {
-    if (config.openLogs) {
+    if (config.appSetting.openLogs) {
      clashCore.startLog();
    } else {
      clashCore.stopLog();
-      appState.logs = [];
+      appFlowingState.logs = [];
    }
  }

  autoCheckUpdate() async {
-    if (!config.autoCheckUpdate) return;
+    if (!config.appSetting.autoCheckUpdate) return;
    final res = await request.checkForUpdate();
    checkUpdateResultHandle(data: res);
  }
@@ -297,10 +300,10 @@ class AppController {
  init() async {
    final isDisclaimerAccepted = await handlerDisclaimer();
    if (!isDisclaimerAccepted) {
-      system.exit();
+      handleExit();
    }
    updateLogStatus();
-    if (!config.silentLaunch) {
+    if (!config.appSetting.silentLaunch) {
      window?.show();
    }
    if (Platform.isAndroid) {
@@ -309,7 +312,7 @@ class AppController {
    if (globalState.isStart) {
      await updateStatus(true);
    } else {
-      await updateStatus(config.autoRun);
+      await updateStatus(config.appSetting.autoRun);
    }
    autoUpdateProfiles();
    autoCheckUpdate();
@@ -324,7 +327,7 @@ class AppController {
      return;
    }
    appState.currentLabel = appState.currentNavigationItems[index].label;
-    if ((config.isAnimateToPage || hasAnimate)) {
+    if ((config.appSetting.isAnimateToPage || hasAnimate)) {
      globalState.pageController?.animateToPage(
        index,
        duration: kTabScrollDuration,
@@ -400,7 +403,9 @@ class AppController {
              ),
              TextButton(
                onPressed: () {
-                  config.isDisclaimerAccepted = true;
+                  config.appSetting = config.appSetting.copyWith(
+                    disclaimerAccepted: true,
+                  );
                  Navigator.of(context).pop<bool>(true);
                },
                child: Text(appLocalizations.agree),
@@ -412,7 +417,7 @@ class AppController {
  }

  Future<bool> handlerDisclaimer() async {
-    if (config.isDisclaimerAccepted) {
+    if (config.appSetting.disclaimerAccepted) {
      return true;
    }
    return showDisclaimer();
@@ -504,7 +509,7 @@ class AppController {
  }

  List<Proxy> getSortProxies(List<Proxy> proxies) {
-    return switch (config.proxiesSortType) {
+    return switch (config.proxiesStyle.sortType) {
      ProxiesSortType.none => proxies,
      ProxiesSortType.delay => _sortOfDelay(proxies),
      ProxiesSortType.name => _sortOfName(proxies),
@@ -518,21 +523,6 @@ class AppController {
        '';
  }

-  Future<List<int>> backupData() async {
-    final homeDirPath = await appPath.getHomeDirPath();
-    final profilesPath = await appPath.getProfilesPath();
-    final configJson = config.toJson();
-    final clashConfigJson = clashConfig.toJson();
-    return Isolate.run<List<int>>(() async {
-      final archive = Archive();
-      archive.add("config.json", configJson);
-      archive.add("clashConfig.json", clashConfigJson);
-      await archive.addDirectoryToArchive(profilesPath, homeDirPath);
-      final zipEncoder = ZipEncoder();
-      return zipEncoder.encode(archive) ?? [];
-    });
-  }
-
  updateTun() {
    clashConfig.tun = clashConfig.tun.copyWith(
      enable: !clashConfig.tun.enable,
@@ -546,11 +536,19 @@ class AppController {
  }

  updateStart() {
-    updateStatus(!appState.isStart);
+    updateStatus(!appFlowingState.isStart);
  }

  updateAutoLaunch() {
-    config.autoLaunch = !config.autoLaunch;
+    config.appSetting = config.appSetting.copyWith(
+      autoLaunch: !config.appSetting.autoLaunch,
+    );
+  }
+
+  updateAdminAutoLaunch() {
+    config.appSetting = config.appSetting.copyWith(
+      adminAutoLaunch: !config.appSetting.adminAutoLaunch,
+    );
  }

  updateVisible() async {
@@ -571,6 +569,153 @@ class AppController {
    clashConfig.mode = Mode.values[nextIndex];
  }

+  Future<bool> exportLogs() async {
+    final logsRaw = appFlowingState.logs.map(
+      (item) => item.toString(),
+    );
+    final data = await Isolate.run<List<int>>(() async {
+      final logsRawString = logsRaw.join("\n");
+      return utf8.encode(logsRawString);
+    });
+    return await picker.saveFile(
+          other.logFile,
+          Uint8List.fromList(data),
+        ) !=
+        null;
+  }
+
+  Future<List<int>> backupData() async {
+    final homeDirPath = await appPath.getHomeDirPath();
+    final profilesPath = await appPath.getProfilesPath();
+    final configJson = config.toJson();
+    final clashConfigJson = clashConfig.toJson();
+    return Isolate.run<List<int>>(() async {
+      final archive = Archive();
+      archive.add("config.json", configJson);
+      archive.add("clashConfig.json", clashConfigJson);
+      await archive.addDirectoryToArchive(profilesPath, homeDirPath);
+      final zipEncoder = ZipEncoder();
+      return zipEncoder.encode(archive) ?? [];
+    });
+  }
+
+  Future _updateSystemTray({
+    required Brightness? brightness,
+    bool force = false,
+  }) async {
+    if (Platform.isLinux || force) {
+      await trayManager.destroy();
+    }
+    await trayManager.setIcon(
+      other.getTrayIconPath(
+        brightness: brightness ??
+            WidgetsBinding.instance.platformDispatcher.platformBrightness,
+      ),
+      isTemplate: true,
+    );
+    if (!Platform.isLinux) {
+      await trayManager.setToolTip(
+        appName,
+      );
+    }
+  }
+
+  updateTray([bool focus = false]) async {
+    if (!Platform.isLinux) {
+      await _updateSystemTray(
+        brightness: appState.brightness,
+        force: focus,
+      );
+    }
+    List<MenuItem> menuItems = [];
+    final showMenuItem = MenuItem(
+      label: appLocalizations.show,
+      onClick: (_) {
+        window?.show();
+      },
+    );
+    menuItems.add(showMenuItem);
+    final startMenuItem = MenuItem.checkbox(
+      label: appFlowingState.isStart
+          ? appLocalizations.stop
+          : appLocalizations.start,
+      onClick: (_) async {
+        globalState.appController.updateStart();
+      },
+      checked: false,
+    );
+    menuItems.add(startMenuItem);
+    menuItems.add(MenuItem.separator());
+    for (final mode in Mode.values) {
+      menuItems.add(
+        MenuItem.checkbox(
+          label: Intl.message(mode.name),
+          onClick: (_) {
+            globalState.appController.clashConfig.mode = mode;
+          },
+          checked: mode == clashConfig.mode,
+        ),
+      );
+    }
+    menuItems.add(MenuItem.separator());
+    if (appFlowingState.isStart) {
+      menuItems.add(
+        MenuItem.checkbox(
+          label: appLocalizations.tun,
+          onClick: (_) {
+            globalState.appController.updateTun();
+          },
+          checked: clashConfig.tun.enable,
+        ),
+      );
+      menuItems.add(
+        MenuItem.checkbox(
+          label: appLocalizations.systemProxy,
+          onClick: (_) {
+            globalState.appController.updateSystemProxy();
+          },
+          checked: config.desktopProps.systemProxy,
+        ),
+      );
+      menuItems.add(MenuItem.separator());
+    }
+    final autoStartMenuItem = MenuItem.checkbox(
+      label: appLocalizations.autoLaunch,
+      onClick: (_) async {
+        globalState.appController.updateAutoLaunch();
+      },
+      checked: config.appSetting.autoLaunch,
+    );
+    menuItems.add(autoStartMenuItem);
+
+    if(Platform.isWindows){
+      final adminAutoStartMenuItem = MenuItem.checkbox(
+        label: appLocalizations.adminAutoLaunch,
+        onClick: (_) async {
+          globalState.appController.updateAdminAutoLaunch();
+        },
+        checked: config.appSetting.adminAutoLaunch,
+      );
+      menuItems.add(adminAutoStartMenuItem);
+    }
+    menuItems.add(MenuItem.separator());
+    final exitMenuItem = MenuItem(
+      label: appLocalizations.exit,
+      onClick: (_) async {
+        await globalState.appController.handleExit();
+      },
+    );
+    menuItems.add(exitMenuItem);
+    final menu = Menu(items: menuItems);
+    await trayManager.setContextMenu(menu);
+    if (Platform.isLinux) {
+      await _updateSystemTray(
+        brightness: appState.brightness,
+        force: focus,
+      );
+    }
+  }
+
  recoveryData(
    List<int> data,
    RecoveryOption recoveryOption,
--- a/lib/enum/enum.dart
+++ b/lib/enum/enum.dart
@@ -15,6 +15,10 @@ extension GroupTypeExtension on GroupType {
      )
      .toList();

+  bool get isURLTestOrFallback {
+    return [GroupType.URLTest, GroupType.Fallback].contains(this);
+  }
+
  static GroupType? getGroupType(String value) {
    final index = GroupTypeExtension.valueList.indexOf(value);
    if (index == -1) return null;
@@ -152,3 +156,20 @@ enum HotAction {
  proxy,
  tun,
 }
+
+enum ProxiesIconStyle {
+  standard,
+  none,
+  icon,
+}
+
+enum FontFamily {
+  system(),
+  miSans("MiSans"),
+  twEmoji("Twemoji"),
+  icon("Icons");
+
+  final String? value;
+
+  const FontFamily([this.value]);
+}
--- a/lib/fragments/application_setting.dart
+++ b/lib/fragments/application_setting.dart
@@ -8,6 +8,84 @@ import 'package:flutter/material.dart';
 import 'package:intl/intl.dart';
 import 'package:provider/provider.dart';

+class CloseConnectionsSwitch extends StatelessWidget {
+  const CloseConnectionsSwitch({super.key});
+
+  @override
+  Widget build(BuildContext context) {
+    return Selector<Config, bool>(
+      selector: (_, config) => config.appSetting.closeConnections,
+      builder: (_, closeConnections, __) {
+        return ListItem.switchItem(
+          title: Text(appLocalizations.autoCloseConnections),
+          subtitle: Text(appLocalizations.autoCloseConnectionsDesc),
+          delegate: SwitchDelegate(
+            value: closeConnections,
+            onChanged: (value) async {
+              final config = globalState.appController.config;
+              config.appSetting = config.appSetting.copyWith(
+                closeConnections: value,
+              );
+            },
+          ),
+        );
+      },
+    );
+  }
+}
+
+class UsageSwitch extends StatelessWidget {
+  const UsageSwitch({super.key});
+
+  @override
+  Widget build(BuildContext context) {
+    return Selector<Config, bool>(
+      selector: (_, config) => config.appSetting.onlyProxy,
+      builder: (_, onlyProxy, __) {
+        return ListItem.switchItem(
+          title: Text(appLocalizations.onlyStatisticsProxy),
+          subtitle: Text(appLocalizations.onlyStatisticsProxyDesc),
+          delegate: SwitchDelegate(
+            value: onlyProxy,
+            onChanged: (bool value) async {
+              final config = globalState.appController.config;
+              config.appSetting = config.appSetting.copyWith(
+                onlyProxy: value,
+              );
+            },
+          ),
+        );
+      },
+    );
+  }
+}
+
+class AdminAutoLaunchItem extends StatelessWidget {
+  const AdminAutoLaunchItem({super.key});
+
+  @override
+  Widget build(BuildContext context) {
+    return Selector<Config, bool>(
+      selector: (_, config) => config.appSetting.adminAutoLaunch,
+      builder: (_, adminAutoLaunch, __) {
+        return ListItem.switchItem(
+          title: Text(appLocalizations.adminAutoLaunch),
+          subtitle: Text(appLocalizations.adminAutoLaunchDesc),
+          delegate: SwitchDelegate(
+            value: adminAutoLaunch,
+            onChanged: (bool value) async {
+              final config = globalState.appController.config;
+              config.appSetting = config.appSetting.copyWith(
+                adminAutoLaunch: value,
+              );
+            },
+          ),
+        );
+      },
+    );
+  }
+}
+
 class ApplicationSettingFragment extends StatelessWidget {
  const ApplicationSettingFragment({super.key});

@@ -20,17 +98,18 @@ class ApplicationSettingFragment extends StatelessWidget {
  Widget build(BuildContext context) {
    List<Widget> items = [
      Selector<Config, bool>(
-        selector: (_, config) => config.isMinimizeOnExit,
+        selector: (_, config) => config.appSetting.minimizeOnExit,
        builder: (_, isMinimizeOnExit, child) {
          return ListItem.switchItem(
-            leading: const Icon(Icons.back_hand),
            title: Text(appLocalizations.minimizeOnExit),
            subtitle: Text(appLocalizations.minimizeOnExitDesc),
            delegate: SwitchDelegate(
              value: isMinimizeOnExit,
              onChanged: (bool value) {
                final config = context.read<Config>();
-                config.isMinimizeOnExit = value;
+                config.appSetting = config.appSetting.copyWith(
+                  minimizeOnExit: value,
+                );
              },
            ),
          );
@@ -38,52 +117,57 @@ class ApplicationSettingFragment extends StatelessWidget {
      ),
      if (system.isDesktop)
        Selector<Config, bool>(
-          selector: (_, config) => config.autoLaunch,
+          selector: (_, config) => config.appSetting.autoLaunch,
          builder: (_, autoLaunch, child) {
            return ListItem.switchItem(
-              leading: const Icon(Icons.rocket_launch),
              title: Text(appLocalizations.autoLaunch),
              subtitle: Text(appLocalizations.autoLaunchDesc),
              delegate: SwitchDelegate(
                value: autoLaunch,
                onChanged: (bool value) {
-                  final config = context.read<Config>();
-                  config.autoLaunch = value;
+                  final config = globalState.appController.config;
+                  config.appSetting = config.appSetting.copyWith(
+                    autoLaunch: value,
+                  );
                },
              ),
            );
          },
        ),
+      if(Platform.isWindows)
+        const AdminAutoLaunchItem(),
      if (system.isDesktop)
        Selector<Config, bool>(
-          selector: (_, config) => config.silentLaunch,
+          selector: (_, config) => config.appSetting.silentLaunch,
          builder: (_, silentLaunch, child) {
            return ListItem.switchItem(
-              leading: const Icon(Icons.expand_circle_down),
              title: Text(appLocalizations.silentLaunch),
              subtitle: Text(appLocalizations.silentLaunchDesc),
              delegate: SwitchDelegate(
                value: silentLaunch,
                onChanged: (bool value) {
-                  final config = context.read<Config>();
-                  config.silentLaunch = value;
+                  final config = globalState.appController.config;
+                  config.appSetting = config.appSetting.copyWith(
+                    silentLaunch: value,
+                  );
                },
              ),
            );
          },
        ),
      Selector<Config, bool>(
-        selector: (_, config) => config.autoRun,
+        selector: (_, config) => config.appSetting.autoRun,
        builder: (_, autoRun, child) {
          return ListItem.switchItem(
-            leading: const Icon(Icons.not_started),
            title: Text(appLocalizations.autoRun),
            subtitle: Text(appLocalizations.autoRunDesc),
            delegate: SwitchDelegate(
              value: autoRun,
              onChanged: (bool value) {
-                final config = context.read<Config>();
-                config.autoRun = value;
+                final config = globalState.appController.config;
+                config.appSetting = config.appSetting.copyWith(
+                  autoRun: value,
+                );
              },
            ),
          );
@@ -91,17 +175,18 @@ class ApplicationSettingFragment extends StatelessWidget {
      ),
      if (Platform.isAndroid)
        Selector<Config, bool>(
-          selector: (_, config) => config.isExclude,
+          selector: (_, config) => config.appSetting.hidden,
          builder: (_, isExclude, child) {
            return ListItem.switchItem(
-              leading: const Icon(Icons.visibility_off),
              title: Text(appLocalizations.exclude),
              subtitle: Text(appLocalizations.excludeDesc),
              delegate: SwitchDelegate(
                value: isExclude,
                onChanged: (value) {
-                  final config = context.read<Config>();
-                  config.isExclude = value;
+                  final config = globalState.appController.config;
+                  config.appSetting = config.appSetting.copyWith(
+                    hidden: value,
+                  );
                },
              ),
            );
@@ -109,52 +194,56 @@ class ApplicationSettingFragment extends StatelessWidget {
        ),
      if (Platform.isAndroid)
        Selector<Config, bool>(
-          selector: (_, config) => config.isAnimateToPage,
+          selector: (_, config) => config.appSetting.isAnimateToPage,
          builder: (_, isAnimateToPage, child) {
            return ListItem.switchItem(
-              leading: const Icon(Icons.animation),
              title: Text(appLocalizations.tabAnimation),
              subtitle: Text(appLocalizations.tabAnimationDesc),
              delegate: SwitchDelegate(
                value: isAnimateToPage,
                onChanged: (value) {
-                  final config = context.read<Config>();
-                  config.isAnimateToPage = value;
+                  final config = globalState.appController.config;
+                  config.appSetting = config.appSetting.copyWith(
+                    isAnimateToPage: value,
+                  );
                },
              ),
            );
          },
        ),
      Selector<Config, bool>(
-        selector: (_, config) => config.openLogs,
+        selector: (_, config) => config.appSetting.openLogs,
        builder: (_, openLogs, child) {
          return ListItem.switchItem(
-            leading: const Icon(Icons.bug_report),
            title: Text(appLocalizations.logcat),
            subtitle: Text(appLocalizations.logcatDesc),
            delegate: SwitchDelegate(
              value: openLogs,
              onChanged: (bool value) {
-                final config = context.read<Config>();
-                config.openLogs = value;
-                globalState.appController.updateLogStatus();
+                final config = globalState.appController.config;
+                config.appSetting = config.appSetting.copyWith(
+                  openLogs: value,
+                );
              },
            ),
          );
        },
      ),
+      const CloseConnectionsSwitch(),
+      const UsageSwitch(),
      Selector<Config, bool>(
-        selector: (_, config) => config.autoCheckUpdate,
+        selector: (_, config) => config.appSetting.autoCheckUpdate,
        builder: (_, autoCheckUpdate, child) {
          return ListItem.switchItem(
-            leading: const Icon(Icons.system_update),
            title: Text(appLocalizations.autoCheckUpdate),
            subtitle: Text(appLocalizations.autoCheckUpdateDesc),
            delegate: SwitchDelegate(
              value: autoCheckUpdate,
              onChanged: (bool value) {
-                final config = context.read<Config>();
-                config.autoCheckUpdate = value;
+                final config = globalState.appController.config;
+                config.appSetting = config.appSetting.copyWith(
+                  autoCheckUpdate: value,
+                );
              },
            ),
          );
--- a/lib/fragments/config/app.dart
+++ b/lib/fragments/config/app.dart
@@ -1,63 +0,0 @@
-import 'dart:io';
-
-import 'package:fl_clash/common/common.dart';
-import 'package:fl_clash/models/config.dart';
-import 'package:fl_clash/state.dart';
-import 'package:fl_clash/widgets/widgets.dart';
-import 'package:flutter/material.dart';
-import 'package:provider/provider.dart';
-
-class CloseConnectionsSwitch extends StatelessWidget {
-  const CloseConnectionsSwitch({super.key});
-
-  @override
-  Widget build(BuildContext context) {
-    return Selector<Config, bool>(
-      selector: (_, config) => config.isCloseConnections,
-      builder: (_, isCloseConnections, __) {
-        return ListItem.switchItem(
-          leading: const Icon(Icons.auto_delete_outlined),
-          title: Text(appLocalizations.autoCloseConnections),
-          subtitle: Text(appLocalizations.autoCloseConnectionsDesc),
-          delegate: SwitchDelegate(
-            value: isCloseConnections,
-            onChanged: (bool value) async {
-              final appController = globalState.appController;
-              appController.config.isCloseConnections = value;
-            },
-          ),
-        );
-      },
-    );
-  }
-}
-
-class UsageSwitch extends StatelessWidget {
-  const UsageSwitch({super.key});
-
-  @override
-  Widget build(BuildContext context) {
-    return Selector<Config, bool>(
-      selector: (_, config) => config.onlyProxy,
-      builder: (_, onlyProxy, __) {
-        return ListItem.switchItem(
-          leading: const Icon(Icons.data_usage_outlined),
-          title: Text(appLocalizations.onlyStatisticsProxy),
-          subtitle: Text(appLocalizations.onlyStatisticsProxyDesc),
-          delegate: SwitchDelegate(
-            value: onlyProxy,
-            onChanged: (bool value) async {
-              final appController = globalState.appController;
-              appController.config.onlyProxy = value;
-            },
-          ),
-        );
-      },
-    );
-  }
-}
-
-final appItems = [
-  const CloseConnectionsSwitch(),
-  const UsageSwitch(),
-];
--- a/lib/fragments/config/config.dart
+++ b/lib/fragments/config/config.dart
@@ -1,10 +1,7 @@
-import 'dart:io';
-
 import 'package:fl_clash/common/common.dart';
-import 'package:fl_clash/fragments/config/app.dart';
 import 'package:fl_clash/fragments/config/dns.dart';
 import 'package:fl_clash/fragments/config/general.dart';
-import 'package:fl_clash/fragments/config/vpn.dart';
+import 'package:fl_clash/fragments/config/network.dart';
 import 'package:fl_clash/widgets/widgets.dart';
 import 'package:flutter/material.dart';

@@ -20,36 +17,16 @@ class _ConfigFragmentState extends State<ConfigFragment> {
  Widget build(BuildContext context) {
    List<Widget> items = [
      ListItem.open(
-        title: Text(appLocalizations.app),
-        subtitle: Text(appLocalizations.appDesc),
-        leading: const Icon(Icons.settings_applications),
+        title: Text(appLocalizations.network),
+        subtitle: Text(appLocalizations.networkDesc),
+        leading: const Icon(Icons.vpn_key),
        delegate: OpenDelegate(
-          title: appLocalizations.app,
+          title: appLocalizations.network,
+          isScaffold: true,
          isBlur: false,
-          widget: generateListView(
-            appItems
-                .separated(
-                  const Divider(
-                    height: 0,
-                  ),
-                )
-                .toList(),
-          ),
+          widget: const NetworkListView(),
        ),
      ),
-      if (Platform.isAndroid)
-        ListItem.open(
-          title: const Text("VPN"),
-          subtitle: Text(appLocalizations.vpnDesc),
-          leading: const Icon(Icons.vpn_key),
-          delegate: OpenDelegate(
-            title: "VPN",
-            isBlur: false,
-            widget: generateListView(
-              vpnItems,
-            ),
-          ),
-        ),
      ListItem.open(
        title: Text(appLocalizations.general),
        subtitle: Text(appLocalizations.generalDesc),
@@ -67,11 +44,9 @@ class _ConfigFragmentState extends State<ConfigFragment> {
        title: const Text("DNS"),
        subtitle: Text(appLocalizations.dnsDesc),
        leading: const Icon(Icons.dns),
-        delegate: OpenDelegate(
+        delegate: const OpenDelegate(
          title: "DNS",
-          widget: generateListView(
-            dnsItems,
-          ),
+          widget: DnsListView(),
          isScaffold: true,
          isBlur: false,
          extendPageWidth: 360,
--- a/lib/fragments/config/dns.dart
+++ b/lib/fragments/config/dns.dart
@@ -1,5 +1,4 @@
 import 'package:collection/collection.dart';
-import 'package:fl_clash/common/app_localizations.dart';
 import 'package:fl_clash/common/common.dart';
 import 'package:fl_clash/enum/enum.dart';
 import 'package:fl_clash/models/models.dart';
@@ -11,27 +10,8 @@ import 'package:provider/provider.dart';
 class OverrideItem extends StatelessWidget {
  const OverrideItem({super.key});

-  _initActions(BuildContext context) {
-    WidgetsBinding.instance.addPostFrameCallback((timeStamp) {
-      final commonScaffoldState =
-          context.findAncestorStateOfType<CommonScaffoldState>();
-      commonScaffoldState?.actions = [
-        IconButton(
-          onPressed: () {
-            globalState.appController.clashConfig.dns = const Dns();
-          },
-          tooltip: appLocalizations.resetDns,
-          icon: const Icon(
-            Icons.replay,
-          ),
-        )
-      ];
-    });
-  }
-
  @override
  Widget build(BuildContext context) {
-    _initActions(context);
    return Selector<Config, bool>(
      selector: (_, config) => config.overrideDns,
      builder: (_, override, __) {
@@ -51,35 +31,6 @@ class OverrideItem extends StatelessWidget {
  }
 }

-class DnsDisabledContainer extends StatelessWidget {
-  final Widget child;
-
-  const DnsDisabledContainer(
-    this.child, {
-    super.key,
-  });
-
-  @override
-  Widget build(BuildContext context) {
-    return Selector<Config, bool>(
-      selector: (_, config) => config.overrideDns,
-      builder: (_, enable, child) {
-        return AbsorbPointer(
-          absorbing: !enable,
-          child: DisabledMask(
-            status: !enable,
-            child: Container(
-              color: context.colorScheme.surface,
-              child: child!,
-            ),
-          ),
-        );
-      },
-      child: child,
-    );
-  }
-}
-
 class StatusItem extends StatelessWidget {
  const StatusItem({super.key});

@@ -268,26 +219,17 @@ class FakeIpFilterItem extends StatelessWidget {
        title: appLocalizations.fakeipFilter,
        widget: Selector<ClashConfig, List<String>>(
          selector: (_, clashConfig) => clashConfig.dns.fakeIpFilter,
-          shouldRebuild: (prev, next) =>
-              !const ListEquality<String>().equals(prev, next),
+          shouldRebuild: (prev, next) => !stringListEquality.equals(prev, next),
          builder: (_, fakeIpFilter, __) {
-            return UpdatePage(
+            return ListPage(
              title: appLocalizations.fakeipFilter,
              items: fakeIpFilter,
              titleBuilder: (item) => Text(item),
-              onRemove: (value) {
+              onChange: (items){
                final clashConfig = globalState.appController.clashConfig;
                final dns = clashConfig.dns;
                clashConfig.dns = dns.copyWith(
-                  fakeIpFilter: List.from(dns.fakeIpFilter)..remove(value),
-                );
-              },
-              onAdd: (value) {
-                final clashConfig = globalState.appController.clashConfig;
-                final dns = clashConfig.dns;
-                if (fakeIpFilter.contains(value)) return;
-                clashConfig.dns = dns.copyWith(
-                  fakeIpFilter: List.from(dns.fakeIpFilter)..add(value),
+                  fakeIpFilter: List.from(items),
                );
              },
            );
@@ -312,28 +254,17 @@ class DefaultNameserverItem extends StatelessWidget {
        title: appLocalizations.defaultNameserver,
        widget: Selector<ClashConfig, List<String>>(
          selector: (_, clashConfig) => clashConfig.dns.defaultNameserver,
-          shouldRebuild: (prev, next) =>
-              !const ListEquality<String>().equals(prev, next),
+          shouldRebuild: (prev, next) => !stringListEquality.equals(prev, next),
          builder: (_, defaultNameserver, __) {
-            return UpdatePage(
+            return ListPage(
              title: appLocalizations.defaultNameserver,
              items: defaultNameserver,
              titleBuilder: (item) => Text(item),
-              onRemove: (value) {
+              onChange: (items){
                final clashConfig = globalState.appController.clashConfig;
                final dns = clashConfig.dns;
                clashConfig.dns = dns.copyWith(
-                  defaultNameserver: List.from(dns.defaultNameserver)
-                    ..remove(value),
-                );
-              },
-              onAdd: (value) {
-                final clashConfig = globalState.appController.clashConfig;
-                final dns = clashConfig.dns;
-                if (defaultNameserver.contains(value)) return;
-                clashConfig.dns = dns.copyWith(
-                  defaultNameserver: List.from(dns.defaultNameserver)
-                    ..add(value),
+                  defaultNameserver: List.from(items),
                );
              },
            );
@@ -358,26 +289,17 @@ class NameserverItem extends StatelessWidget {
        isBlur: false,
        widget: Selector<ClashConfig, List<String>>(
          selector: (_, clashConfig) => clashConfig.dns.nameserver,
-          shouldRebuild: (prev, next) =>
-              !const ListEquality<String>().equals(prev, next),
+          shouldRebuild: (prev, next) => !stringListEquality.equals(prev, next),
          builder: (_, nameserver, __) {
-            return UpdatePage(
+            return ListPage(
              title: "域名服务器",
              items: nameserver,
              titleBuilder: (item) => Text(item),
-              onRemove: (value) {
+              onChange: (items){
                final clashConfig = globalState.appController.clashConfig;
                final dns = clashConfig.dns;
                clashConfig.dns = dns.copyWith(
-                  nameserver: List.from(dns.nameserver)..remove(value),
-                );
-              },
-              onAdd: (value) {
-                final clashConfig = globalState.appController.clashConfig;
-                final dns = clashConfig.dns;
-                if (nameserver.contains(value)) return;
-                clashConfig.dns = dns.copyWith(
-                  nameserver: List.from(dns.nameserver)..add(value),
+                  nameserver: List.from(items),
                );
              },
            );
@@ -457,26 +379,16 @@ class NameserverPolicyItem extends StatelessWidget {
          shouldRebuild: (prev, next) =>
              !const MapEquality<String, String>().equals(prev, next),
          builder: (_, nameserverPolicy, __) {
-            return UpdatePage(
+            return ListPage(
              title: appLocalizations.nameserverPolicy,
              items: nameserverPolicy.entries,
              titleBuilder: (item) => Text(item.key),
              subtitleBuilder: (item) => Text(item.value),
-              isMap: true,
-              onRemove: (value) {
+              onChange: (items){
                final clashConfig = globalState.appController.clashConfig;
                final dns = clashConfig.dns;
                clashConfig.dns = dns.copyWith(
-                  nameserverPolicy: Map.from(dns.nameserverPolicy)
-                    ..remove(value.key),
-                );
-              },
-              onAdd: (value) {
-                final clashConfig = globalState.appController.clashConfig;
-                final dns = clashConfig.dns;
-                clashConfig.dns = dns.copyWith(
-                  nameserverPolicy: Map.from(dns.nameserverPolicy)
-                    ..addEntries([value]),
+                  nameserverPolicy: Map.fromEntries(items),
                );
              },
            );
@@ -501,28 +413,17 @@ class ProxyServerNameserverItem extends StatelessWidget {
        title: appLocalizations.proxyNameserver,
        widget: Selector<ClashConfig, List<String>>(
          selector: (_, clashConfig) => clashConfig.dns.proxyServerNameserver,
-          shouldRebuild: (prev, next) =>
-              !const ListEquality<String>().equals(prev, next),
+          shouldRebuild: (prev, next) => !stringListEquality.equals(prev, next),
          builder: (_, proxyServerNameserver, __) {
-            return UpdatePage(
+            return ListPage(
              title: appLocalizations.proxyNameserver,
              items: proxyServerNameserver,
              titleBuilder: (item) => Text(item),
-              onRemove: (value) {
+              onChange: (items){
                final clashConfig = globalState.appController.clashConfig;
                final dns = clashConfig.dns;
                clashConfig.dns = dns.copyWith(
-                  proxyServerNameserver: List.from(dns.proxyServerNameserver)
-                    ..remove(value),
-                );
-              },
-              onAdd: (value) {
-                final clashConfig = globalState.appController.clashConfig;
-                final dns = clashConfig.dns;
-                if (proxyServerNameserver.contains(value)) return;
-                clashConfig.dns = dns.copyWith(
-                  proxyServerNameserver: List.from(dns.proxyServerNameserver)
-                    ..add(value),
+                  proxyServerNameserver: List.from(items),
                );
              },
            );
@@ -547,26 +448,17 @@ class FallbackItem extends StatelessWidget {
        title: appLocalizations.fallback,
        widget: Selector<ClashConfig, List<String>>(
          selector: (_, clashConfig) => clashConfig.dns.fallback,
-          shouldRebuild: (prev, next) =>
-              !const ListEquality<String>().equals(prev, next),
+          shouldRebuild: (prev, next) => !stringListEquality.equals(prev, next),
          builder: (_, fallback, __) {
-            return UpdatePage(
+            return ListPage(
              title: appLocalizations.fallback,
              items: fallback,
              titleBuilder: (item) => Text(item),
-              onRemove: (value) {
+              onChange: (items){
                final clashConfig = globalState.appController.clashConfig;
                final dns = clashConfig.dns;
                clashConfig.dns = dns.copyWith(
-                  fallback: List.from(dns.fallback)..remove(value),
-                );
-              },
-              onAdd: (value) {
-                final clashConfig = globalState.appController.clashConfig;
-                final dns = clashConfig.dns;
-                if (fallback.contains(value)) return;
-                clashConfig.dns = dns.copyWith(
-                  fallback: List.from(dns.fallback)..add(value),
+                  fallback: List.from(items),
                );
              },
            );
@@ -657,28 +549,18 @@ class GeositeItem extends StatelessWidget {
        title: "Geosite",
        widget: Selector<ClashConfig, List<String>>(
          selector: (_, clashConfig) => clashConfig.dns.fallbackFilter.geosite,
-          shouldRebuild: (prev, next) =>
-              !const ListEquality<String>().equals(prev, next),
+          shouldRebuild: (prev, next) => !stringListEquality.equals(prev, next),
          builder: (_, geosite, __) {
-            return UpdatePage(
+            return ListPage(
              title: "Geosite",
              items: geosite,
              titleBuilder: (item) => Text(item),
-              onRemove: (value) {
+              onChange: (items){
                final clashConfig = globalState.appController.clashConfig;
                final dns = clashConfig.dns;
                clashConfig.dns = dns.copyWith(
                  fallbackFilter: dns.fallbackFilter.copyWith(
-                    geosite: List.from(geosite)..remove(value),
-                  ),
-                );
-              },
-              onAdd: (value) {
-                final clashConfig = globalState.appController.clashConfig;
-                final dns = clashConfig.dns;
-                clashConfig.dns = dns.copyWith(
-                  fallbackFilter: dns.fallbackFilter.copyWith(
-                    geosite: List.from(geosite)..add(value),
+                    geosite: List.from(items),
                  ),
                );
              },
@@ -703,28 +585,18 @@ class IpcidrItem extends StatelessWidget {
        title: appLocalizations.ipcidr,
        widget: Selector<ClashConfig, List<String>>(
          selector: (_, clashConfig) => clashConfig.dns.fallbackFilter.ipcidr,
-          shouldRebuild: (prev, next) =>
-              !const ListEquality<String>().equals(prev, next),
+          shouldRebuild: (prev, next) => !stringListEquality.equals(prev, next),
          builder: (_, ipcidr, __) {
-            return UpdatePage(
+            return ListPage(
              title: appLocalizations.ipcidr,
              items: ipcidr,
              titleBuilder: (item) => Text(item),
-              onRemove: (value) {
+              onChange: (items){
                final clashConfig = globalState.appController.clashConfig;
                final dns = clashConfig.dns;
                clashConfig.dns = dns.copyWith(
                  fallbackFilter: dns.fallbackFilter.copyWith(
-                    ipcidr: List.from(ipcidr)..remove(value),
-                  ),
-                );
-              },
-              onAdd: (value) {
-                final clashConfig = globalState.appController.clashConfig;
-                final dns = clashConfig.dns;
-                clashConfig.dns = dns.copyWith(
-                  fallbackFilter: dns.fallbackFilter.copyWith(
-                    ipcidr: List.from(ipcidr)..add(value),
+                    ipcidr: List.from(items),
                  ),
                );
              },
@@ -749,28 +621,18 @@ class DomainItem extends StatelessWidget {
        title: appLocalizations.domain,
        widget: Selector<ClashConfig, List<String>>(
          selector: (_, clashConfig) => clashConfig.dns.fallbackFilter.domain,
-          shouldRebuild: (prev, next) =>
-              !const ListEquality<String>().equals(prev, next),
+          shouldRebuild: (prev, next) => !stringListEquality.equals(prev, next),
          builder: (_, domain, __) {
-            return UpdatePage(
+            return ListPage(
              title: appLocalizations.domain,
              items: domain,
              titleBuilder: (item) => Text(item),
-              onRemove: (value) {
+              onChange: (items){
                final clashConfig = globalState.appController.clashConfig;
                final dns = clashConfig.dns;
                clashConfig.dns = dns.copyWith(
                  fallbackFilter: dns.fallbackFilter.copyWith(
-                    domain: List.from(domain)..remove(value),
-                  ),
-                );
-              },
-              onAdd: (value) {
-                final clashConfig = globalState.appController.clashConfig;
-                final dns = clashConfig.dns;
-                clashConfig.dns = dns.copyWith(
-                  fallbackFilter: dns.fallbackFilter.copyWith(
-                    domain: List.from(domain)..add(value),
+                    domain: List.from(items),
                  ),
                );
              },
@@ -788,27 +650,25 @@ class DnsOptions extends StatelessWidget {

  @override
  Widget build(BuildContext context) {
-    return DnsDisabledContainer(
-      Column(
-        children: generateSection(
-          title: appLocalizations.options,
-          items: [
-            const StatusItem(),
-            const UseHostsItem(),
-            const UseSystemHostsItem(),
-            const IPv6Item(),
-            const RespectRulesItem(),
-            const PreferH3Item(),
-            const DnsModeItem(),
-            const FakeIpRangeItem(),
-            const FakeIpFilterItem(),
-            const DefaultNameserverItem(),
-            const NameserverPolicyItem(),
-            const NameserverItem(),
-            const FallbackItem(),
-            const ProxyServerNameserverItem(),
-          ],
-        ),
+    return Column(
+      children: generateSection(
+        title: appLocalizations.options,
+        items: [
+          const StatusItem(),
+          const UseHostsItem(),
+          const UseSystemHostsItem(),
+          const IPv6Item(),
+          const RespectRulesItem(),
+          const PreferH3Item(),
+          const DnsModeItem(),
+          const FakeIpRangeItem(),
+          const FakeIpFilterItem(),
+          const DefaultNameserverItem(),
+          const NameserverPolicyItem(),
+          const NameserverItem(),
+          const FallbackItem(),
+          const ProxyServerNameserverItem(),
+        ],
      ),
    );
  }
@@ -819,18 +679,16 @@ class FallbackFilterOptions extends StatelessWidget {

  @override
  Widget build(BuildContext context) {
-    return DnsDisabledContainer(
-      Column(
-        children: generateSection(
-          title: appLocalizations.fallbackFilter,
-          items: [
-            const GeoipItem(),
-            const GeoipCodeItem(),
-            const GeositeItem(),
-            const IpcidrItem(),
-            const DomainItem(),
-          ],
-        ),
+    return Column(
+      children: generateSection(
+        title: appLocalizations.fallbackFilter,
+        items: [
+          const GeoipItem(),
+          const GeoipCodeItem(),
+          const GeositeItem(),
+          const IpcidrItem(),
+          const DomainItem(),
+        ],
      ),
    );
  }
@@ -841,3 +699,41 @@ const dnsItems = <Widget>[
  DnsOptions(),
  FallbackFilterOptions(),
 ];
+
+class DnsListView extends StatelessWidget {
+  const DnsListView({super.key});
+
+  _initActions(BuildContext context) {
+    WidgetsBinding.instance.addPostFrameCallback((timeStamp) {
+      final commonScaffoldState =
+          context.findAncestorStateOfType<CommonScaffoldState>();
+      commonScaffoldState?.actions = [
+        IconButton(
+          onPressed: () {
+            globalState.showMessage(
+                title: appLocalizations.reset,
+                message: TextSpan(
+                  text: appLocalizations.resetTip,
+                ),
+                onTab: () {
+                  globalState.appController.clashConfig.dns = defaultDns;
+                  Navigator.of(context).pop();
+                });
+          },
+          tooltip: appLocalizations.reset,
+          icon: const Icon(
+            Icons.replay,
+          ),
+        )
+      ];
+    });
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    _initActions(context);
+    return generateListView(
+      dnsItems,
+    );
+  }
+}
--- a/lib/fragments/config/general.dart
+++ b/lib/fragments/config/general.dart
@@ -119,7 +119,7 @@ class TestUrlItem extends StatelessWidget {
  @override
  Widget build(BuildContext context) {
    return Selector<Config, String>(
-      selector: (_, config) => config.testUrl,
+      selector: (_, config) => config.appSetting.testUrl,
      builder: (_, value, __) {
        return ListItem.input(
          leading: const Icon(Icons.timeline),
@@ -135,7 +135,10 @@ class TestUrlItem extends StatelessWidget {
                  if (!value.isUrl) {
                    throw "Invalid url";
                  }
-                  globalState.appController.config.testUrl = value;
+                  final config = globalState.appController.config;
+                  config.appSetting = config.appSetting.copyWith(
+                    testUrl: value,
+                  );
                } catch (e) {
                  globalState.showMessage(
                    title: appLocalizations.testUrl,
@@ -212,21 +215,15 @@ class HostsItem extends StatelessWidget {
              !const MapEquality<String, String>().equals(prev, next),
          builder: (_, hosts, ___) {
            final entries = hosts.entries;
-            return UpdatePage(
+            return ListPage(
              title: "Hosts",
              items: entries,
              titleBuilder: (item) => Text(item.key),
              subtitleBuilder: (item) => Text(item.value),
-              onRemove: (value) {
+              onChange: (items){
                final clashConfig = globalState.appController.clashConfig;
-                clashConfig.hosts = Map.from(hosts)..remove(value.key);
+                clashConfig.hosts = Map.fromEntries(items);
              },
-              onAdd: (value) {
-                final clashConfig = globalState.appController.clashConfig;
-                clashConfig.hosts = Map.from(clashConfig.hosts)
-                  ..addEntries([value]);
-              },
-              isMap: true,
            );
          },
        ),
--- a/lib/fragments/config/network.dart
+++ b/lib/fragments/config/network.dart
@@ -0,0 +1,270 @@
+import 'dart:io';
+
+import 'package:fl_clash/common/common.dart';
+import 'package:fl_clash/enum/enum.dart';
+import 'package:fl_clash/models/models.dart';
+import 'package:fl_clash/state.dart';
+import 'package:fl_clash/widgets/widgets.dart';
+import 'package:flutter/material.dart';
+import 'package:provider/provider.dart';
+
+class VPNSwitch extends StatelessWidget {
+  const VPNSwitch({super.key});
+
+  @override
+  Widget build(BuildContext context) {
+    return Selector<Config, bool>(
+      selector: (_, config) => config.vpnProps.enable,
+      builder: (_, enable, __) {
+        return ListItem.switchItem(
+          title: const Text("VPN"),
+          subtitle: Text(appLocalizations.vpnEnableDesc),
+          delegate: SwitchDelegate(
+            value: enable,
+            onChanged: (value) async {
+              final config = globalState.appController.config;
+              config.vpnProps = config.vpnProps.copyWith(
+                enable: value,
+              );
+            },
+          ),
+        );
+      },
+    );
+  }
+}
+
+class TUNItem extends StatelessWidget {
+  const TUNItem({super.key});
+
+  @override
+  Widget build(BuildContext context) {
+    return Selector<Config, bool>(
+      selector: (_, config) => config.vpnProps.enable,
+      builder: (_, enable, __) {
+        return ListItem.switchItem(
+          title: Text(appLocalizations.tun),
+          subtitle: Text(appLocalizations.tunDesc),
+          delegate: SwitchDelegate(
+            value: enable,
+            onChanged: (value) async {
+              final clashConfig = globalState.appController.clashConfig;
+              clashConfig.tun = clashConfig.tun.copyWith(
+                enable: value,
+              );
+            },
+          ),
+        );
+      },
+    );
+  }
+}
+
+class AllowBypassSwitch extends StatelessWidget {
+  const AllowBypassSwitch({super.key});
+
+  @override
+  Widget build(BuildContext context) {
+    return Selector<Config, bool>(
+      selector: (_, config) => config.vpnProps.allowBypass,
+      builder: (_, allowBypass, __) {
+        return ListItem.switchItem(
+          title: Text(appLocalizations.allowBypass),
+          subtitle: Text(appLocalizations.allowBypassDesc),
+          delegate: SwitchDelegate(
+            value: allowBypass,
+            onChanged: (bool value) async {
+              final config = globalState.appController.config;
+              final vpnProps = config.vpnProps;
+              config.vpnProps = vpnProps.copyWith(
+                allowBypass: value,
+              );
+            },
+          ),
+        );
+      },
+    );
+  }
+}
+
+class SystemProxySwitch extends StatelessWidget {
+  const SystemProxySwitch({super.key});
+
+  @override
+  Widget build(BuildContext context) {
+    return Selector<Config, bool>(
+      selector: (_, config) => config.vpnProps.systemProxy,
+      builder: (_, systemProxy, __) {
+        return ListItem.switchItem(
+          title: Text(appLocalizations.systemProxy),
+          subtitle: Text(appLocalizations.systemProxyDesc),
+          delegate: SwitchDelegate(
+            value: systemProxy,
+            onChanged: (bool value) async {
+              final config = globalState.appController.config;
+              final vpnProps = config.vpnProps;
+              config.vpnProps = vpnProps.copyWith(
+                systemProxy: value,
+              );
+            },
+          ),
+        );
+      },
+    );
+  }
+}
+
+class Ipv6Switch extends StatelessWidget {
+  const Ipv6Switch({super.key});
+
+  @override
+  Widget build(BuildContext context) {
+    return Selector<Config, bool>(
+      selector: (_, config) => config.vpnProps.ipv6,
+      builder: (_, ipv6, __) {
+        return ListItem.switchItem(
+          title: const Text("IPv6"),
+          subtitle: Text(appLocalizations.ipv6InboundDesc),
+          delegate: SwitchDelegate(
+            value: ipv6,
+            onChanged: (bool value) async {
+              final config = globalState.appController.config;
+              final vpnProps = config.vpnProps;
+              config.vpnProps = vpnProps.copyWith(
+                ipv6: value,
+              );
+            },
+          ),
+        );
+      },
+    );
+  }
+}
+
+class TunStackItem extends StatelessWidget {
+  const TunStackItem({super.key});
+
+  @override
+  Widget build(BuildContext context) {
+    return Selector<ClashConfig, TunStack>(
+      selector: (_, clashConfig) => clashConfig.tun.stack,
+      builder: (_, stack, __) {
+        return ListItem.options(
+          title: Text(appLocalizations.stackMode),
+          subtitle: Text(stack.name),
+          delegate: OptionsDelegate<TunStack>(
+            value: stack,
+            options: TunStack.values,
+            textBuilder: (value) => value.name,
+            onChanged: (value) {
+              if (value == null) {
+                return;
+              }
+              final clashConfig = globalState.appController.clashConfig;
+              clashConfig.tun = clashConfig.tun.copyWith(
+                stack: value,
+              );
+            },
+            title: appLocalizations.stackMode,
+          ),
+        );
+      },
+    );
+  }
+}
+
+class BypassDomainItem extends StatelessWidget {
+  const BypassDomainItem({super.key});
+
+  @override
+  Widget build(BuildContext context) {
+    return ListItem.open(
+      title: Text(appLocalizations.bypassDomain),
+      subtitle: Text(appLocalizations.bypassDomainDesc),
+      delegate: OpenDelegate(
+        isBlur: false,
+        title: appLocalizations.bypassDomain,
+        widget: Selector<Config, List<String>>(
+          selector: (_, config) => config.vpnProps.bypassDomain,
+          shouldRebuild: (prev, next) =>
+              !stringListEquality.equals(prev, next),
+          builder: (_, bypassDomain, __) {
+            return ListPage(
+              title: appLocalizations.bypassDomain,
+              items: bypassDomain,
+              titleBuilder: (item) => Text(item),
+              onChange: (items){
+                final config = globalState.appController.config;
+                config.vpnProps = config.vpnProps.copyWith(
+                  bypassDomain: List.from(items),
+                );
+              },
+            );
+          },
+        ),
+        extendPageWidth: 360,
+      ),
+    );
+  }
+}
+
+final networkItems = [
+  Platform.isAndroid ? const VPNSwitch() : const TUNItem(),
+  if (Platform.isAndroid)
+    ...generateSection(
+      title: "VPN",
+      items: [
+        const SystemProxySwitch(),
+        const AllowBypassSwitch(),
+        const Ipv6Switch(),
+        const BypassDomainItem(),
+      ],
+    ),
+  ...generateSection(
+    title: appLocalizations.options,
+    items: [
+      const TunStackItem(),
+    ],
+  ),
+];
+
+class NetworkListView extends StatelessWidget {
+  const NetworkListView({super.key});
+
+  _initActions(BuildContext context) {
+    WidgetsBinding.instance.addPostFrameCallback((timeStamp) {
+      final commonScaffoldState =
+          context.findAncestorStateOfType<CommonScaffoldState>();
+      commonScaffoldState?.actions = [
+        IconButton(
+          onPressed: () {
+            globalState.showMessage(
+              title: appLocalizations.reset,
+              message: TextSpan(
+                text: appLocalizations.resetTip,
+              ),
+              onTab: () {
+                final appController = globalState.appController;
+                appController.config.vpnProps = defaultVpnProps;
+                appController.clashConfig.tun = defaultTun;
+                Navigator.of(context).pop();
+              },
+            );
+          },
+          tooltip: appLocalizations.reset,
+          icon: const Icon(
+            Icons.replay,
+          ),
+        )
+      ];
+    });
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    _initActions(context);
+    return generateListView(
+      networkItems,
+    );
+  }
+}
--- a/lib/fragments/config/vpn.dart
+++ b/lib/fragments/config/vpn.dart
@@ -1,140 +0,0 @@
-import 'package:fl_clash/common/common.dart';
-import 'package:fl_clash/models/models.dart';
-import 'package:fl_clash/state.dart';
-import 'package:fl_clash/widgets/widgets.dart';
-import 'package:flutter/material.dart';
-import 'package:provider/provider.dart';
-
-class VPNSwitch extends StatelessWidget {
-  const VPNSwitch({super.key});
-
-  @override
-  Widget build(BuildContext context) {
-    return Selector<Config, bool>(
-      selector: (_, config) => config.vpnProps.enable,
-      builder: (_, enable, __) {
-        return ListItem.switchItem(
-          leading: const Icon(Icons.stacked_line_chart),
-          title: const Text("VPN"),
-          subtitle: Text(appLocalizations.vpnEnableDesc),
-          delegate: SwitchDelegate(
-            value: enable,
-            onChanged: (bool value) async {
-              final config = globalState.appController.config;
-              final vpnProps = config.vpnProps;
-              config.vpnProps = vpnProps.copyWith(
-                enable: value,
-              );
-            },
-          ),
-        );
-      },
-    );
-  }
-}
-
-class VPNDisabledContainer extends StatelessWidget {
-  final Widget child;
-
-  const VPNDisabledContainer(
-    this.child, {
-    super.key,
-  });
-
-  @override
-  Widget build(BuildContext context) {
-    return Selector<Config, bool>(
-      selector: (_, config) => config.vpnProps.enable,
-      builder: (_, enable, child) {
-        return AbsorbPointer(
-          absorbing: !enable,
-          child: DisabledMask(
-            status: !enable,
-            child: child!,
-          ),
-        );
-      },
-      child: child,
-    );
-  }
-}
-
-class AllowBypassSwitch extends StatelessWidget {
-  const AllowBypassSwitch({super.key});
-
-  @override
-  Widget build(BuildContext context) {
-    return Selector<Config, bool>(
-      selector: (_, config) => config.vpnProps.allowBypass,
-      builder: (_, allowBypass, __) {
-        return ListItem.switchItem(
-          leading: const Icon(Icons.arrow_forward_outlined),
-          title: Text(appLocalizations.allowBypass),
-          subtitle: Text(appLocalizations.allowBypassDesc),
-          delegate: SwitchDelegate(
-            value: allowBypass,
-            onChanged: (bool value) async {
-              final config = globalState.appController.config;
-              final vpnProps = config.vpnProps;
-              config.vpnProps = vpnProps.copyWith(
-                allowBypass: value,
-              );
-            },
-          ),
-        );
-      },
-    );
-  }
-}
-
-class SystemProxySwitch extends StatelessWidget {
-  const SystemProxySwitch({super.key});
-
-  @override
-  Widget build(BuildContext context) {
-    return Selector<Config, bool>(
-      selector: (_, config) => config.vpnProps.systemProxy,
-      builder: (_, systemProxy, __) {
-        return ListItem.switchItem(
-          leading: const Icon(Icons.settings_ethernet),
-          title: Text(appLocalizations.systemProxy),
-          subtitle: Text(appLocalizations.systemProxyDesc),
-          delegate: SwitchDelegate(
-            value: systemProxy,
-            onChanged: (bool value) async {
-              final config = globalState.appController.config;
-              final vpnProps = config.vpnProps;
-              config.vpnProps = vpnProps.copyWith(
-                systemProxy: value,
-              );
-            },
-          ),
-        );
-      },
-    );
-  }
-}
-
-class VpnOptions extends StatelessWidget {
-  const VpnOptions({super.key});
-
-  @override
-  Widget build(BuildContext context) {
-    return VPNDisabledContainer(
-      Column(
-        children: generateSection(
-          title: appLocalizations.options,
-          items: [
-            const SystemProxySwitch(),
-            const AllowBypassSwitch(),
-          ],
-        ),
-      ),
-    );
-  }
-}
-
-final vpnItems = [
-  const VPNSwitch(),
-  const VpnOptions(),
-];
--- a/lib/fragments/dashboard/dashboard.dart
+++ b/lib/fragments/dashboard/dashboard.dart
@@ -1,4 +1,3 @@
-import 'dart:io';
 import 'dart:math';

 import 'package:fl_clash/common/common.dart';
@@ -22,12 +21,25 @@ class DashboardFragment extends StatefulWidget {
 }

 class _DashboardFragmentState extends State<DashboardFragment> {
+  _initFab(bool isCurrent) {
+    if(!isCurrent){
+      return;
+    }
+    WidgetsBinding.instance.addPostFrameCallback((_) {
+      final commonScaffoldState =
+          context.findAncestorStateOfType<CommonScaffoldState>();
+      commonScaffoldState?.floatingActionButton = const StartButton();
+    });
+  }
+
  @override
  Widget build(BuildContext context) {
-    return FloatLayout(
-      floatingWidget: const FloatWrapper(
-        child: StartButton(),
-      ),
+    return ActiveBuilder(
+      label: "dashboard",
+      builder: (isCurrent, child) {
+        _initFab(isCurrent);
+        return child!;
+      },
      child: Align(
        alignment: Alignment.topCenter,
        child: SingleChildScrollView(
--- a/lib/fragments/dashboard/intranet_ip.dart
+++ b/lib/fragments/dashboard/intranet_ip.dart
@@ -13,16 +13,55 @@ class IntranetIP extends StatefulWidget {
 }

 class _IntranetIPState extends State<IntranetIP> {
-  final ipNotifier = ValueNotifier<String>("");
+  final ipNotifier = ValueNotifier<String?>("");

-  Future<String?> getLocalIpAddress() async {
-    List<NetworkInterface> interfaces = await NetworkInterface.list();
-    for (final interface in interfaces) {
-      for (final address in interface.addresses) {
-        if (!address.isLoopback) {
-          return address.address;
+  Future<String> getNetworkType() async {
+    try {
+      List<NetworkInterface> interfaces = await NetworkInterface.list(
+        includeLoopback: false,
+        type: InternetAddressType.any,
+      );
+
+      for (var interface in interfaces) {
+        if (interface.name.toLowerCase().contains('wlan') ||
+            interface.name.toLowerCase().contains('wi-fi')) {
+          return 'WiFi';
+        }
+        if (interface.name.toLowerCase().contains('rmnet') ||
+            interface.name.toLowerCase().contains('ccmni') ||
+            interface.name.toLowerCase().contains('cellular')) {
+          return 'Mobile Data';
        }
      }
+
+      return 'Unknown';
+    } catch (e) {
+      return 'Error';
+    }
+  }
+
+  Future<String?> getLocalIpAddress() async {
+    List<NetworkInterface> interfaces = await NetworkInterface.list(
+      includeLoopback: false,
+    )
+      ..sort((a, b) {
+        if (a.isWifi && !b.isWifi) return -1;
+        if (!a.isWifi && b.isWifi) return 1;
+        if (a.includesIPv4 && !b.includesIPv4) return -1;
+        if (!a.includesIPv4 && b.includesIPv4) return 1;
+        return 0;
+      });
+    for (final interface in interfaces) {
+      final addresses = interface.addresses;
+      if (addresses.isEmpty) {
+        continue;
+      }
+      addresses.sort((a, b) {
+        if (a.isIPv4 && !b.isIPv4) return -1;
+        if (!a.isIPv4 && b.isIPv4) return 1;
+        return 0;
+      });
+      return addresses.first.address;
    }
    return null;
  }
@@ -48,17 +87,15 @@ class _IntranetIPState extends State<IntranetIP> {
        label: appLocalizations.intranetIP,
        iconData: Icons.devices,
      ),
-      onPressed: (){
-
-      },
+      onPressed: () {},
      child: Container(
        padding: const EdgeInsets.all(16).copyWith(top: 0),
-        height: globalState.measure.titleLargeHeight + 24 - 2,
+        height: globalState.measure.titleMediumHeight + 24 - 2,
        child: ValueListenableBuilder(
          valueListenable: ipNotifier,
          builder: (_, value, __) {
            return FadeBox(
-              child: value.isNotEmpty
+              child: value != null
                  ? Column(
                      crossAxisAlignment: CrossAxisAlignment.start,
                      mainAxisSize: MainAxisSize.min,
@@ -67,8 +104,9 @@ class _IntranetIPState extends State<IntranetIP> {
                          flex: 1,
                          child: TooltipText(
                            text: Text(
-                              value,
-                              style: context.textTheme.titleLarge?.toSoftBold.toMinus,
+                              value.isNotEmpty ? value : appLocalizations.noNetwork,
+                              style: context
+                                  .textTheme.titleLarge?.toSoftBold.toMinus,
                              maxLines: 1,
                              overflow: TextOverflow.ellipsis,
                            ),
--- a/lib/fragments/dashboard/network_detection.dart
+++ b/lib/fragments/dashboard/network_detection.dart
@@ -1,5 +1,8 @@
+import 'dart:async';
+
 import 'package:dio/dio.dart';
 import 'package:fl_clash/common/common.dart';
+import 'package:fl_clash/enum/enum.dart';
 import 'package:fl_clash/models/models.dart';
 import 'package:fl_clash/state.dart';
 import 'package:fl_clash/widgets/widgets.dart';
@@ -22,14 +25,17 @@ class _NetworkDetectionState extends State<NetworkDetection> {
  );
  bool? _preIsStart;
  Function? _checkIpDebounce;
+  Timer? _setTimeoutTimer;
  CancelToken? cancelToken;

  _checkIp() async {
    final appState = globalState.appController.appState;
+    final appFlowingState = globalState.appController.appFlowingState;
    final isInit = appState.isInit;
    if (!isInit) return;
-    final isStart = appState.isStart;
+    final isStart = appFlowingState.isStart;
    if (_preIsStart == false && _preIsStart == isStart) return;
+    _clearSetTimeoutTimer();
    networkDetectionState.value = networkDetectionState.value.copyWith(
      isTesting: true,
      ipInfo: null,
@@ -42,11 +48,32 @@ class _NetworkDetectionState extends State<NetworkDetection> {
    cancelToken = CancelToken();
    try {
      final ipInfo = await request.checkIp(cancelToken: cancelToken);
+      if (ipInfo != null) {
+        networkDetectionState.value = networkDetectionState.value.copyWith(
+          isTesting: false,
+          ipInfo: ipInfo,
+        );
+        return;
+      }
+      _setTimeoutTimer = Timer(const Duration(milliseconds: 2000), () {
+        networkDetectionState.value = networkDetectionState.value.copyWith(
+          isTesting: false,
+          ipInfo: null,
+        );
+      });
+    } catch (_) {
      networkDetectionState.value = networkDetectionState.value.copyWith(
-        isTesting: false,
-        ipInfo: ipInfo,
+        isTesting: true,
+        ipInfo: null,
      );
-    } catch (_) {}
+    }
+  }
+
+  _clearSetTimeoutTimer() {
+    if (_setTimeoutTimer != null) {
+      _setTimeoutTimer?.cancel();
+      _setTimeoutTimer = null;
+    }
  }

  _checkIpContainer(Widget child) {
@@ -129,7 +156,7 @@ class _NetworkDetectionState extends State<NetworkDetection> {
                                              .textTheme
                                              .titleLarge
                                              ?.copyWith(
-                                                fontFamily: "Twemoji",
+                                                fontFamily: FontFamily.twEmoji.value,
                                              ),
                                        ),
                                      )
--- a/lib/fragments/dashboard/network_speed.dart
+++ b/lib/fragments/dashboard/network_speed.dart
@@ -116,8 +116,8 @@ class _NetworkSpeedState extends State<NetworkSpeed> {
        label: appLocalizations.networkSpeed,
        iconData: Icons.speed_sharp,
      ),
-      child: Selector<AppState, List<Traffic>>(
-        selector: (_, appState) => appState.traffics,
+      child: Selector<AppFlowingState, List<Traffic>>(
+        selector: (_, appFlowingState) => appFlowingState.traffics,
        builder: (_, traffics, __) {
          return Container(
            padding: const EdgeInsets.all(16),
--- a/lib/fragments/dashboard/start_button.dart
+++ b/lib/fragments/dashboard/start_button.dart
@@ -19,9 +19,10 @@ class _StartButtonState extends State<StartButton>
  @override
  void initState() {
    super.initState();
+    isStart = globalState.appController.appFlowingState.isStart;
    _controller = AnimationController(
      vsync: this,
-      value: 0,
+      value: isStart ? 1 : 0,
      duration: const Duration(milliseconds: 200),
    );
  }
@@ -34,7 +35,7 @@ class _StartButtonState extends State<StartButton>

  handleSwitchStart() {
    final appController = globalState.appController;
-    if (isStart == appController.appState.isStart) {
+    if (isStart == appController.appFlowingState.isStart) {
      isStart = !isStart;
      updateController();
      appController.updateStatus(isStart);
@@ -50,8 +51,8 @@ class _StartButtonState extends State<StartButton>
  }

  Widget _updateControllerContainer(Widget child) {
-    return Selector<AppState, bool>(
-      selector: (_, appState) => appState.isStart,
+    return Selector<AppFlowingState, bool>(
+      selector: (_, appFlowingState) => appFlowingState.isStart,
      builder: (_, isStart, child) {
        if (isStart != this.isStart) {
          this.isStart = isStart;
@@ -85,58 +86,58 @@ class _StartButtonState extends State<StartButton>
                )
                .width +
            16;
-        return AnimatedBuilder(
-          animation: _controller.view,
-          builder: (_, child) {
-            return SizedBox(
-              width: 56 + textWidth * _controller.value,
-              height: 56,
-              child: FloatingActionButton(
-                heroTag: null,
-                onPressed: () {
-                  handleSwitchStart();
-                },
-                child: Row(
-                  children: [
-                    Container(
-                      width: 56,
-                      height: 56,
-                      alignment: Alignment.center,
-                      child: AnimatedIcon(
-                        icon: AnimatedIcons.play_pause,
-                        progress: _controller,
+        return _updateControllerContainer(
+          AnimatedBuilder(
+            animation: _controller.view,
+            builder: (_, child) {
+              return SizedBox(
+                width: 56 + textWidth * _controller.value,
+                height: 56,
+                child: FloatingActionButton(
+                  heroTag: null,
+                  onPressed: () {
+                    handleSwitchStart();
+                  },
+                  child: Row(
+                    children: [
+                      Container(
+                        width: 56,
+                        height: 56,
+                        alignment: Alignment.center,
+                        child: AnimatedIcon(
+                          icon: AnimatedIcons.play_pause,
+                          progress: _controller,
+                        ),
                      ),
-                    ),
-                    Expanded(
-                      child: ClipRect(
-                        child: OverflowBox(
-                          maxWidth: textWidth,
-                          child: Container(
-                            alignment: Alignment.centerLeft,
-                            child: child!,
+                      Expanded(
+                        child: ClipRect(
+                          child: OverflowBox(
+                            maxWidth: textWidth,
+                            child: Container(
+                              alignment: Alignment.centerLeft,
+                              child: child!,
+                            ),
                          ),
                        ),
                      ),
-                    ),
-                  ],
+                    ],
+                  ),
                ),
-              ),
-            );
-          },
-          child: child,
+              );
+            },
+            child: child,
+          ),
        );
      },
-      child: _updateControllerContainer(
-        Selector<AppState, int?>(
-          selector: (_, appState) => appState.runTime,
-          builder: (_, int? value, __) {
-            final text = other.getTimeText(value);
-            return Text(
-              text,
-              style: Theme.of(context).textTheme.titleMedium?.toSoftBold,
-            );
-          },
-        ),
+      child: Selector<AppFlowingState, int?>(
+        selector: (_, appFlowingState) => appFlowingState.runTime,
+        builder: (_, int? value, __) {
+          final text = other.getTimeText(value);
+          return Text(
+            text,
+            style: Theme.of(context).textTheme.titleMedium?.toSoftBold,
+          );
+        },
      ),
    );
  }
--- a/lib/fragments/dashboard/traffic_usage.dart
+++ b/lib/fragments/dashboard/traffic_usage.dart
@@ -56,8 +56,8 @@ class TrafficUsage extends StatelessWidget {
        label: appLocalizations.trafficUsage,
        iconData: Icons.data_saver_off,
      ),
-      child: Selector<AppState, Traffic>(
-        selector: (_, appState) => appState.totalTraffic,
+      child: Selector<AppFlowingState, Traffic>(
+        selector: (_, appFlowingState) => appFlowingState.totalTraffic,
        builder: (_, totalTraffic, __) {
          final upTotalTrafficValue = totalTraffic.up;
          final downTotalTrafficValue = totalTraffic.down;
--- a/lib/fragments/hotkey.dart
+++ b/lib/fragments/hotkey.dart
@@ -146,7 +146,7 @@ class _HotKeyRecorderState extends State<HotKeyRecorder> {
    final index = hotKeyActions.indexWhere(
      (item) =>
          item.key == currentHotkeyAction.key &&
-          keyboardModifiersEquality.equals(
+          keyboardModifierListEquality.equals(
            item.modifiers,
            currentHotkeyAction.modifiers,
          ),
--- a/lib/fragments/logs.dart
+++ b/lib/fragments/logs.dart
@@ -1,6 +1,4 @@
 import 'dart:async';
-
-import 'package:collection/collection.dart';
 import 'package:fl_clash/common/common.dart';
 import 'package:fl_clash/enum/enum.dart';
 import 'package:fl_clash/state.dart';
@@ -21,7 +19,6 @@ class _LogsFragmentState extends State<LogsFragment> {
  final scrollController = ScrollController(
    keepScrollOffset: false,
  );
-  List<GlobalObjectKey<_LogItemState>> keys = [];

  Timer? timer;

@@ -29,19 +26,22 @@ class _LogsFragmentState extends State<LogsFragment> {
  void initState() {
    super.initState();
    WidgetsBinding.instance.addPostFrameCallback((_) {
-      final appState = globalState.appController.appState;
-      logsNotifier.value = logsNotifier.value.copyWith(logs: appState.logs);
+      final appFlowingState = globalState.appController.appFlowingState;
+      logsNotifier.value =
+          logsNotifier.value.copyWith(logs: appFlowingState.logs);
      if (timer != null) {
        timer?.cancel();
        timer = null;
      }
      timer = Timer.periodic(const Duration(milliseconds: 200), (timer) {
-        final logs = appState.logs;
-        if (!const ListEquality<Log>().equals(
+        final logs = appFlowingState.logs;
+        if (!logListEquality.equals(
          logsNotifier.value.logs,
          logs,
        )) {
-          logsNotifier.value = logsNotifier.value.copyWith(logs: logs);
+          logsNotifier.value = logsNotifier.value.copyWith(
+            logs: logs,
+          );
        }
      });
    });
@@ -56,6 +56,21 @@ class _LogsFragmentState extends State<LogsFragment> {
    timer = null;
  }

+  _handleExport() async {
+    final commonScaffoldState = context.commonScaffoldState;
+    final res = await commonScaffoldState?.loadingRun<bool>(
+      () async {
+        return await globalState.appController.exportLogs();
+      },
+      title: appLocalizations.exportLogs,
+    );
+    if (res != true) return;
+    globalState.showMessage(
+      title: appLocalizations.tip,
+      message: TextSpan(text: appLocalizations.exportSuccess),
+    );
+  }
+
  _initActions() {
    WidgetsBinding.instance.addPostFrameCallback((timeStamp) {
      final commonScaffoldState =
@@ -72,6 +87,17 @@ class _LogsFragmentState extends State<LogsFragment> {
          },
          icon: const Icon(Icons.search),
        ),
+        const SizedBox(
+          width: 8,
+        ),
+        IconButton(
+          onPressed: () {
+            _handleExport();
+          },
+          icon: const Icon(
+            Icons.file_download_outlined,
+          ),
+        ),
      ];
    });
  }
@@ -112,15 +138,26 @@ class _LogsFragmentState extends State<LogsFragment> {
      child: ValueListenableBuilder<LogsAndKeywords>(
        valueListenable: logsNotifier,
        builder: (_, state, __) {
-          var logs = state.filteredLogs;
+          final logs = state.filteredLogs;
          if (logs.isEmpty) {
            return NullStatus(
              label: appLocalizations.nullLogsDesc,
            );
          }
-          logs = logs.reversed.toList();
-          keys = logs
-              .map((log) => GlobalObjectKey<_LogItemState>(log.dateTime))
+          final reversedLogs = logs.reversed.toList();
+          final logWidgets = reversedLogs
+              .map<Widget>(
+                (log) => LogItem(
+                  key: Key(log.dateTime.toString()),
+                  log: log,
+                  onClick: _addKeyword,
+                ),
+              )
+              .separated(
+                const Divider(
+                  height: 0,
+                ),
+              )
              .toList();
          return Column(
            crossAxisAlignment: CrossAxisAlignment.start,
@@ -147,22 +184,38 @@ class _LogsFragmentState extends State<LogsFragment> {
                  ),
                ),
              Expanded(
-                child: ListView.separated(
-                  controller: scrollController,
-                  itemBuilder: (_, index) {
-                    final log = logs[index];
-                    return LogItem(
-                      key: Key(log.dateTime.toString()),
-                      log: log,
-                      onClick: _addKeyword,
-                    );
+                child: LayoutBuilder(
+                  builder: (_, constraints) {
+                    return ScrollConfiguration(
+                        behavior: ShowBarScrollBehavior(),
+                        child: ListView.builder(
+                          controller: scrollController,
+                          itemExtentBuilder: (index, __) {
+                            final widget = logWidgets[index];
+                            if (widget.runtimeType == Divider) {
+                              return 0;
+                            }
+                            final measure = globalState.measure;
+                            final bodyLargeSize = measure.bodyLargeSize;
+                            final bodySmallHeight = measure.bodySmallHeight;
+                            final bodyMediumHeight = measure.bodyMediumHeight;
+                            final log = reversedLogs[(index / 2).floor()];
+                            final width = (log.payload?.length ?? 0) *
+                                    bodyLargeSize.width +
+                                200;
+                            final lines = (width / constraints.maxWidth).ceil();
+                            return lines * bodyLargeSize.height +
+                                bodySmallHeight +
+                                8 +
+                                bodyMediumHeight +
+                                40;
+                          },
+                          itemBuilder: (_, index) {
+                            return logWidgets[index];
+                          },
+                          itemCount: logWidgets.length,
+                        ));
                  },
-                  separatorBuilder: (BuildContext context, int index) {
-                    return const Divider(
-                      height: 0,
-                    );
-                  },
-                  itemCount: logs.length,
                ),
              )
            ],
@@ -236,7 +289,8 @@ class LogsSearchDelegate extends SearchDelegate {
  _addKeyword(String keyword) {
    final isContains = logsNotifier.value.keywords.contains(keyword);
    if (isContains) return;
-    final keywords = List<String>.from(logsNotifier.value.keywords)..add(keyword);
+    final keywords = List<String>.from(logsNotifier.value.keywords)
+      ..add(keyword);
    logsNotifier.value = logsNotifier.value.copyWith(
      keywords: keywords,
    );
@@ -245,7 +299,8 @@ class LogsSearchDelegate extends SearchDelegate {
  _deleteKeyword(String keyword) {
    final isContains = logsNotifier.value.keywords.contains(keyword);
    if (!isContains) return;
-    final keywords = List<String>.from(logsNotifier.value.keywords)..remove(keyword);
+    final keywords = List<String>.from(logsNotifier.value.keywords)
+      ..remove(keyword);
    logsNotifier.value = logsNotifier.value.copyWith(
      keywords: keywords,
    );
@@ -330,7 +385,9 @@ class _LogItemState extends State<LogItem> {
        horizontal: 16,
        vertical: 4,
      ),
-      title: SelectableText(log.payload ?? ''),
+      title: SelectableText(
+        log.payload ?? '',
+      ),
      subtitle: Column(
        crossAxisAlignment: CrossAxisAlignment.start,
        children: [
@@ -339,7 +396,9 @@ class _LogItemState extends State<LogItem> {
            style: context.textTheme.bodySmall
                ?.copyWith(color: context.colorScheme.primary),
          ),
-          const SizedBox(height: 8,),
+          const SizedBox(
+            height: 8,
+          ),
          Container(
            alignment: Alignment.centerLeft,
            child: CommonChip(
--- a/lib/fragments/profiles/add_profile.dart
+++ b/lib/fragments/profiles/add_profile.dart
@@ -7,7 +7,10 @@ import 'package:flutter/material.dart';
 class AddProfile extends StatelessWidget {
  final BuildContext context;

-  const AddProfile({super.key, required this.context,});
+  const AddProfile({
+    super.key,
+    required this.context,
+  });

  _handleAddProfileFormFile() async {
    globalState.appController.addProfileFormFile();
@@ -18,14 +21,16 @@ class AddProfile extends StatelessWidget {
  }

  _toScan() async {
-    if(system.isDesktop){
+    if (system.isDesktop) {
      globalState.appController.addProfileFormQrCode();
      return;
    }
-    final url = await Navigator.of(context)
-        .push<String>(MaterialPageRoute(builder: (_) => const ScanPage()));
+    final url = await BaseNavigator.push(
+      context,
+      const ScanPage(),
+    );
    if (url != null) {
-      WidgetsBinding.instance.addPostFrameCallback((_){
+      WidgetsBinding.instance.addPostFrameCallback((_) {
        _handleAddProfileFormURL(url);
      });
    }
@@ -44,12 +49,12 @@ class AddProfile extends StatelessWidget {
  Widget build(context) {
    return ListView(
      children: [
-          ListItem(
-            leading: const Icon(Icons.qr_code),
-            title: Text(appLocalizations.qrcode),
-            subtitle: Text(appLocalizations.qrcodeDesc),
-            onTap: _toScan,
-          ),
+        ListItem(
+          leading: const Icon(Icons.qr_code),
+          title: Text(appLocalizations.qrcode),
+          subtitle: Text(appLocalizations.qrcodeDesc),
+          onTap: _toScan,
+        ),
        ListItem(
          leading: const Icon(Icons.upload_file),
          title: Text(appLocalizations.file),
--- a/lib/fragments/profiles/profiles.dart
+++ b/lib/fragments/profiles/profiles.dart
@@ -80,7 +80,7 @@ class _ProfilesFragmentState extends State<ProfilesFragment> {
    }
  }

-  _initScaffoldState() {
+  _initScaffold() {
    WidgetsBinding.instance.addPostFrameCallback(
      (_) {
        if (!mounted) return;
@@ -112,71 +112,67 @@ class _ProfilesFragmentState extends State<ProfilesFragment> {
            iconSize: 26,
          ),
        ];
+        commonScaffoldState?.floatingActionButton = FloatingActionButton(
+          heroTag: null,
+          onPressed: _handleShowAddExtendPage,
+          child: const Icon(
+            Icons.add,
+          ),
+        );
      },
    );
  }

  @override
  Widget build(BuildContext context) {
-    return FloatLayout(
-      floatingWidget: FloatWrapper(
-        child: FloatingActionButton(
-          heroTag: null,
-          onPressed: _handleShowAddExtendPage,
-          child: const Icon(
-            Icons.add,
-          ),
+    return ActiveBuilder(
+      label: "profiles",
+      builder: (isCurrent,child){
+        if(isCurrent){
+          _initScaffold();
+        }
+        return child!;
+      },
+      child: Selector2<AppState, Config, ProfilesSelectorState>(
+        selector: (_, appState, config) => ProfilesSelectorState(
+          profiles: config.profiles,
+          currentProfileId: config.currentProfileId,
+          columns: other.getProfilesColumns(appState.viewWidth),
        ),
-      ),
-      child: Selector<AppState, bool>(
-        selector: (_, appState) => appState.currentLabel == 'profiles',
-        builder: (_, isCurrent, child) {
-          if (isCurrent) {
-            _initScaffoldState();
-          }
-          return child!;
-        },
-        child: Selector2<AppState, Config, ProfilesSelectorState>(
-          selector: (_, appState, config) => ProfilesSelectorState(
-            profiles: config.profiles,
-            currentProfileId: config.currentProfileId,
-            columns: other.getProfilesColumns(appState.viewWidth),
-          ),
-          builder: (context, state, child) {
-            if (state.profiles.isEmpty) {
-              return NullStatus(
-                label: appLocalizations.nullProfileDesc,
-              );
-            }
-            return Align(
-              alignment: Alignment.topCenter,
-              child: SingleChildScrollView(
-                padding: const EdgeInsets.only(
-                  left: 16,
-                  right: 16,
-                  top: 16,
-                  bottom: 88,
-                ),
-                child: Grid(
-                  mainAxisSpacing: 16,
-                  crossAxisSpacing: 16,
-                  crossAxisCount: state.columns,
-                  children: [
-                    for (int i = 0; i < state.profiles.length; i++)
-                      GridItem(
-                        child: ProfileItem(
-                          key: Key(state.profiles[i].id),
-                          profile: state.profiles[i],
-                          groupValue: state.currentProfileId,
-                          onChanged: globalState.appController.changeProfile,
-                        ),
-                      ),
-                  ],
-                ),
-              ),
+        builder: (context, state, child) {
+          if (state.profiles.isEmpty) {
+            return NullStatus(
+              label: appLocalizations.nullProfileDesc,
            );
-          },
-        ),
+          }
+          return Align(
+            alignment: Alignment.topCenter,
+            child: SingleChildScrollView(
+              padding: const EdgeInsets.only(
+                left: 16,
+                right: 16,
+                top: 16,
+                bottom: 88,
+              ),
+              child: Grid(
+                mainAxisSpacing: 16,
+                crossAxisSpacing: 16,
+                crossAxisCount: state.columns,
+                children: [
+                  for (int i = 0; i < state.profiles.length; i++)
+                    GridItem(
+                      child: ProfileItem(
+                        key: Key(state.profiles[i].id),
+                        profile: state.profiles[i],
+                        groupValue: state.currentProfileId,
+                        onChanged: globalState.appController.changeProfile,
+                      ),
+                    ),
+                ],
+              ),
+            ),
+          );
+        },
      ),
    );
  }
@@ -459,10 +455,9 @@ class _ReorderableProfilesState extends State<ReorderableProfiles> {
          flex: 1,
          child: ReorderableListView.builder(
            buildDefaultDragHandles: false,
-            padding: const EdgeInsets.all(12),
+            padding: const EdgeInsets.symmetric(horizontal: 12),
            proxyDecorator: proxyDecorator,
-            onReorder: (int oldIndex, int newIndex) {
-              if (oldIndex == newIndex) return;
+            onReorder: (oldIndex, newIndex) {
              setState(() {
                if (oldIndex < newIndex) {
                  newIndex -= 1;
--- a/lib/fragments/profiles/view_profile.dart
+++ b/lib/fragments/profiles/view_profile.dart
@@ -166,20 +166,20 @@ class ContextMenuControllerImpl implements SelectionToolbarController {
    // _removeOverLayEntry();
  }

-  _handleCut(CodeLineEditingController controller) {
-    controller.cut();
-    _removeOverLayEntry();
-  }
-
-  _handleCopy(CodeLineEditingController controller) async {
-    await controller.copy();
-    _removeOverLayEntry();
-  }
-
-  _handlePaste(CodeLineEditingController controller) {
-    controller.paste();
-    _removeOverLayEntry();
-  }
+  // _handleCut(CodeLineEditingController controller) {
+  //   controller.cut();
+  //   _removeOverLayEntry();
+  // }
+  //
+  // _handleCopy(CodeLineEditingController controller) async {
+  //   await controller.copy();
+  //   _removeOverLayEntry();
+  // }
+  //
+  // _handlePaste(CodeLineEditingController controller) {
+  //   controller.paste();
+  //   _removeOverLayEntry();
+  // }

  @override
  void show({
--- a/lib/fragments/proxies/card.dart
+++ b/lib/fragments/proxies/card.dart
@@ -102,12 +102,12 @@ class ProxyCard extends StatelessWidget {

  _changeProxy(BuildContext context) async {
    final appController = globalState.appController;
-    final isUrlTest = groupType == GroupType.URLTest;
+    final isURLTestOrFallback = groupType.isURLTestOrFallback;
    final isSelector = groupType == GroupType.Selector;
-    if (isUrlTest || isSelector) {
+    if (isURLTestOrFallback || isSelector) {
      final currentProxyName =
          appController.config.currentSelectedMap[groupName];
-      final nextProxyName = switch (isUrlTest) {
+      final nextProxyName = switch (isURLTestOrFallback) {
        true => currentProxyName == proxy.name ? "" : proxy.name,
        false => proxy.name,
      };
@@ -133,7 +133,7 @@ class ProxyCard extends StatelessWidget {
    final measure = globalState.measure;
    final delayText = _buildDelayText();
    final proxyNameText = _buildProxyNameText(context);
-    return currentGroupProxyNameBuilder(
+    return currentSelectedProxyNameBuilder(
      groupName: groupName,
      builder: (currentGroupName) {
        return Stack(
@@ -207,30 +207,16 @@ class ProxyCard extends StatelessWidget {
                ),
              ),
            ),
-            if (groupType == GroupType.URLTest)
+            if (groupType.isURLTestOrFallback)
              Selector<Config, String>(
                selector: (_, config) {
                  final selectedProxyName =
                      config.currentSelectedMap[groupName];
                  return selectedProxyName ?? '';
                },
-                builder: (_, value, __) {
+                builder: (_, value, child) {
                  if (value != proxy.name) return Container();
-                  return Positioned.fill(
-                    child: Container(
-                      alignment: Alignment.topRight,
-                      margin: const EdgeInsets.all(8),
-                      child: Container(
-                        padding: const EdgeInsets.all(4),
-                        decoration: BoxDecoration(
-                          shape: BoxShape.circle,
-                          color:
-                              Theme.of(context).colorScheme.secondaryContainer,
-                        ),
-                        child: const SelectIcon(),
-                      ),
-                    ),
-                  );
+                  return child!;
                },
                child: Positioned.fill(
                  child: Container(
--- a/lib/fragments/proxies/common.dart
+++ b/lib/fragments/proxies/common.dart
@@ -6,7 +6,7 @@ import 'package:fl_clash/state.dart';
 import 'package:flutter/material.dart';
 import 'package:provider/provider.dart';

-Widget currentGroupProxyNameBuilder({
+Widget currentSelectedProxyNameBuilder({
  required String groupName,
  required Widget Function(String currentGroupName) builder,
 }) {
@@ -16,8 +16,8 @@ Widget currentGroupProxyNameBuilder({
      final selectedProxyName = config.currentSelectedMap[groupName];
      return group?.getCurrentSelectedName(selectedProxyName ?? "") ?? "";
    },
-    builder: (_, currentGroupName, ___) {
-      return builder(currentGroupName);
+    builder: (_, currentSelectedProxyName, ___) {
+      return builder(currentSelectedProxyName);
    },
  );
 }
@@ -81,9 +81,9 @@ double getScrollToSelectedOffset({
  final appController = globalState.appController;
  final columns = other.getProxiesColumns(
    appController.appState.viewWidth,
-    appController.config.proxiesLayout,
+    appController.config.proxiesStyle.layout,
  );
-  final proxyCardType = appController.config.proxyCardType;
+  final proxyCardType = appController.config.proxiesStyle.cardType;
  final selectedName = appController.getCurrentSelectedName(groupName);
  final findSelectedIndex = proxies.indexWhere(
    (proxy) => proxy.name == selectedName,
--- a/lib/fragments/proxies/list.dart
+++ b/lib/fragments/proxies/list.dart
@@ -1,14 +1,10 @@
 import 'dart:math';

-import 'package:cached_network_image/cached_network_image.dart';
-import 'package:collection/collection.dart';
 import 'package:fl_clash/common/common.dart';
 import 'package:fl_clash/enum/enum.dart';
 import 'package:fl_clash/models/models.dart';
 import 'package:fl_clash/state.dart';
-import 'package:fl_clash/widgets/builder.dart';
-import 'package:fl_clash/widgets/card.dart';
-import 'package:fl_clash/widgets/text.dart';
+import 'package:fl_clash/widgets/widgets.dart';
 import 'package:flutter/material.dart';
 import 'package:provider/provider.dart';

@@ -244,18 +240,17 @@ class _ProxiesListFragmentState extends State<ProxiesListFragment> {
        return ProxiesListSelectorState(
          groupNames: groupNames,
          currentUnfoldSet: config.currentUnfoldSet,
-          proxyCardType: config.proxyCardType,
-          proxiesSortType: config.proxiesSortType,
+          proxyCardType: config.proxiesStyle.cardType,
+          proxiesSortType: config.proxiesStyle.sortType,
          columns: other.getProxiesColumns(
            appState.viewWidth,
-            config.proxiesLayout,
+            config.proxiesStyle.layout,
          ),
          sortNum: appState.sortNum,
        );
      },
      shouldRebuild: (prev, next) {
-        if (!const ListEquality<String>()
-            .equals(prev.groupNames, next.groupNames)) {
+        if (!stringListEquality.equals(prev.groupNames, next.groupNames)) {
          _headerStateNotifier.value = const ProxiesListHeaderSelectorState(
            offset: 0,
            currentIndex: 0,
@@ -264,75 +259,73 @@ class _ProxiesListFragmentState extends State<ProxiesListFragment> {
        return prev != next;
      },
      builder: (_, state, __) {
-        return ScaleBuilder(builder: (_) {
-          final items = _buildItems(
-            groupNames: state.groupNames,
-            currentUnfoldSet: state.currentUnfoldSet,
-            columns: state.columns,
-            type: state.proxyCardType,
-          );
-          final itemsOffset = _getItemHeightList(items, state.proxyCardType);
-          return Scrollbar(
-            controller: _controller,
-            thumbVisibility: true,
-            trackVisibility: true,
-            thickness: 8,
-            radius: const Radius.circular(8),
-            interactive: true,
-            child: Stack(
-              children: [
-                Positioned.fill(
-                  child: ScrollConfiguration(
-                    behavior: HiddenBarScrollBehavior(),
-                    child: ListView.builder(
-                      padding: const EdgeInsets.all(16),
-                      controller: _controller,
-                      itemExtentBuilder: (index, __) {
-                        return itemsOffset[index];
-                      },
-                      itemCount: items.length,
-                      itemBuilder: (_, index) {
-                        return items[index];
-                      },
-                    ),
+        final items = _buildItems(
+          groupNames: state.groupNames,
+          currentUnfoldSet: state.currentUnfoldSet,
+          columns: state.columns,
+          type: state.proxyCardType,
+        );
+        final itemsOffset = _getItemHeightList(items, state.proxyCardType);
+        return Scrollbar(
+          controller: _controller,
+          thumbVisibility: true,
+          trackVisibility: true,
+          thickness: 8,
+          radius: const Radius.circular(8),
+          interactive: true,
+          child: Stack(
+            children: [
+              Positioned.fill(
+                child: ScrollConfiguration(
+                  behavior: HiddenBarScrollBehavior(),
+                  child: ListView.builder(
+                    padding: const EdgeInsets.all(16),
+                    controller: _controller,
+                    itemExtentBuilder: (index, __) {
+                      return itemsOffset[index];
+                    },
+                    itemCount: items.length,
+                    itemBuilder: (_, index) {
+                      return items[index];
+                    },
                  ),
                ),
-                LayoutBuilder(builder: (_, container) {
-                  return ValueListenableBuilder(
-                    valueListenable: _headerStateNotifier,
-                    builder: (_, headerState, ___) {
-                      final index =
-                          headerState.currentIndex > state.groupNames.length - 1
-                              ? 0
-                              : headerState.currentIndex;
-                      return Stack(
-                        children: [
-                          Positioned(
-                            top: -headerState.offset,
-                            child: Container(
-                              width: container.maxWidth,
-                              color: context.colorScheme.surface,
-                              padding: const EdgeInsets.only(
-                                top: 16,
-                                left: 16,
-                                right: 16,
-                                bottom: 8,
-                              ),
-                              child: _buildHeader(
-                                groupName: state.groupNames[index],
-                                currentUnfoldSet: state.currentUnfoldSet,
-                              ),
+              ),
+              LayoutBuilder(builder: (_, container) {
+                return ValueListenableBuilder(
+                  valueListenable: _headerStateNotifier,
+                  builder: (_, headerState, ___) {
+                    final index =
+                        headerState.currentIndex > state.groupNames.length - 1
+                            ? 0
+                            : headerState.currentIndex;
+                    return Stack(
+                      children: [
+                        Positioned(
+                          top: -headerState.offset,
+                          child: Container(
+                            width: container.maxWidth,
+                            color: context.colorScheme.surface,
+                            padding: const EdgeInsets.only(
+                              top: 16,
+                              left: 16,
+                              right: 16,
+                              bottom: 8,
+                            ),
+                            child: _buildHeader(
+                              groupName: state.groupNames[index],
+                              currentUnfoldSet: state.currentUnfoldSet,
                            ),
                          ),
-                        ],
-                      );
-                    },
-                  );
-                }),
-              ],
-            ),
-          );
-        });
+                        ),
+                      ],
+                    );
+                  },
+                );
+              }),
+            ],
+          ),
+        );
      },
    );
  }
@@ -379,11 +372,6 @@ class _ListHeaderState extends State<ListHeader>
  }

  _handleChange(String groupName) {
-    if (isExpand) {
-      _animationController.reverse();
-    } else {
-      _animationController.forward();
-    }
    widget.onChange(groupName);
  }

@@ -413,13 +401,69 @@ class _ListHeaderState extends State<ListHeader>
    super.didUpdateWidget(oldWidget);
    if (oldWidget.isExpand != widget.isExpand) {
      if (isExpand) {
-        _animationController.value = 1.0;
+        _animationController.forward();
      } else {
-        _animationController.value = 0.0;
+        _animationController.reverse();
      }
    }
  }

+  Widget _buildIcon() {
+    return Selector<Config, ProxiesIconStyle>(
+      selector: (_, config) => config.proxiesStyle.iconStyle,
+      builder: (_, iconStyle, child) {
+        return Selector<Config, String>(
+          selector: (_, config) {
+            final iconMapEntryList =
+                config.proxiesStyle.iconMap.entries.toList();
+            final index = iconMapEntryList.indexWhere((item) {
+              try{
+                return RegExp(item.key).hasMatch(groupName);
+              }catch(_){
+                return false;
+              }
+            });
+            if (index != -1) {
+              return iconMapEntryList[index].value;
+            }
+            return icon;
+          },
+          builder: (_, icon, __) {
+            return switch (iconStyle) {
+              ProxiesIconStyle.standard => Container(
+                  height: 48,
+                  width: 48,
+                  margin: const EdgeInsets.only(
+                    right: 16,
+                  ),
+                  padding: const EdgeInsets.all(8),
+                  decoration: BoxDecoration(
+                    color: context.colorScheme.secondaryContainer,
+                    borderRadius: BorderRadius.circular(16),
+                  ),
+                  clipBehavior: Clip.antiAlias,
+                  child: CommonIcon(
+                    src: icon,
+                    size: 32,
+                  ),
+                ),
+              ProxiesIconStyle.icon => Container(
+                  margin: const EdgeInsets.only(
+                    right: 16,
+                  ),
+                  child: CommonIcon(
+                    src: icon,
+                    size: 42,
+                  ),
+                ),
+              ProxiesIconStyle.none => Container(),
+            };
+          },
+        );
+      },
+    );
+  }
+
  @override
  Widget build(BuildContext context) {
    return CommonCard(
@@ -427,41 +471,17 @@ class _ListHeaderState extends State<ListHeader>
      radius: 24,
      type: CommonCardType.filled,
      child: Container(
-        padding: const EdgeInsets.all(12),
+        padding: const EdgeInsets.symmetric(
+          horizontal: 16,
+          vertical: 12,
+        ),
        child: Row(
          mainAxisAlignment: MainAxisAlignment.spaceBetween,
          children: [
            Flexible(
              child: Row(
                children: [
-                  const SizedBox(
-                    width: 4,
-                  ),
-                  Container(
-                    height: 48,
-                    width: 48,
-                    padding: const EdgeInsets.all(8),
-                    decoration: BoxDecoration(
-                      color: context.colorScheme.secondaryContainer,
-                      borderRadius: BorderRadius.circular(16),
-                    ),
-                    clipBehavior: Clip.antiAlias,
-                    child: icon.isNotEmpty
-                        ? CachedNetworkImage(
-                            imageUrl: icon,
-                            errorWidget: (_, __, ___) => const Icon(
-                              IconsExt.target,
-                              size: 32,
-                            ),
-                          )
-                        : const Icon(
-                            IconsExt.target,
-                            size: 32,
-                          ),
-                  ),
-                  const SizedBox(
-                    width: 16,
-                  ),
+                  _buildIcon(),
                  Flexible(
                    child: Column(
                      mainAxisSize: MainAxisSize.min,
@@ -487,7 +507,7 @@ class _ListHeaderState extends State<ListHeader>
                              ),
                              Flexible(
                                flex: 1,
-                                child: currentGroupProxyNameBuilder(
+                                child: currentSelectedProxyNameBuilder(
                                  groupName: groupName,
                                  builder: (currentGroupName) {
                                    return Row(
--- a/lib/fragments/proxies/proxies.dart
+++ b/lib/fragments/proxies/proxies.dart
@@ -1,11 +1,11 @@
-import 'package:fl_clash/common/app_localizations.dart';
+import 'package:fl_clash/common/common.dart';
 import 'package:fl_clash/enum/enum.dart';
 import 'package:fl_clash/fragments/proxies/list.dart';
 import 'package:fl_clash/models/models.dart';
+import 'package:fl_clash/state.dart';
 import 'package:fl_clash/widgets/widgets.dart';
 import 'package:flutter/material.dart';
 import 'package:provider/provider.dart';
-
 import 'providers.dart';
 import 'setting.dart';
 import 'tab.dart';
@@ -37,7 +37,7 @@ class _ProxiesFragmentState extends State<ProxiesFragment> {
              );
            },
            icon: const Icon(
-              Icons.swap_vert_circle_outlined,
+              Icons.poll_outlined,
            ),
          ),
          const SizedBox(
@@ -56,6 +56,63 @@ class _ProxiesFragmentState extends State<ProxiesFragment> {
          const SizedBox(
            width: 8,
          )
+        ] else ...[
+          IconButton(
+            onPressed: () {
+              showExtendPage(
+                context,
+                extendPageWidth: 360,
+                title: appLocalizations.iconConfiguration,
+                body: Selector<Config, Map<String, String>>(
+                  selector: (_, config) => config.proxiesStyle.iconMap,
+                  shouldRebuild: (prev, next) {
+                    return !stringAndStringMapEntryIterableEquality.equals(
+                      prev.entries,
+                      next.entries,
+                    );
+                  },
+                  builder: (_, iconMap, __) {
+                    final entries = iconMap.entries.toList();
+                    return ListPage(
+                      title: appLocalizations.iconConfiguration,
+                      items: entries,
+                      keyLabel: appLocalizations.regExp,
+                      valueLabel: appLocalizations.icon,
+                      keyBuilder: (item) => Key(item.key),
+                      titleBuilder: (item) => Text(item.key),
+                      leadingBuilder: (item) => Container(
+                        decoration: BoxDecoration(
+                          borderRadius: BorderRadius.circular(16),
+                        ),
+                        clipBehavior: Clip.antiAlias,
+                        child: CommonIcon(
+                          src: item.value,
+                          size: 42,
+                        ),
+                      ),
+                      subtitleBuilder: (item) => Text(
+                        item.value,
+                        maxLines: 2,
+                        overflow: TextOverflow.ellipsis,
+                      ),
+                      onChange: (entries) {
+                        final config = globalState.appController.config;
+                        config.proxiesStyle = config.proxiesStyle.copyWith(
+                          iconMap: Map.fromEntries(entries),
+                        );
+                      },
+                    );
+                  },
+                ),
+              );
+            },
+            icon: const Icon(
+              Icons.style_outlined,
+            ),
+          ),
+          const SizedBox(
+            width: 8,
+          )
        ],
        IconButton(
          onPressed: () {
@@ -63,7 +120,7 @@ class _ProxiesFragmentState extends State<ProxiesFragment> {
              title: appLocalizations.proxiesSetting,
              context: context,
              builder: (context) {
-                return const ProxiesSettingWidget();
+                return const ProxiesSetting();
              },
            );
          },
@@ -78,7 +135,7 @@ class _ProxiesFragmentState extends State<ProxiesFragment> {
  @override
  Widget build(BuildContext context) {
    return Selector<Config, ProxiesType>(
-      selector: (_, config) => config.proxiesType,
+      selector: (_, config) => config.proxiesStyle.type,
      builder: (_, proxiesType, __) {
        return ProxiesActionsBuilder(
          builder: (state, child) {
--- a/lib/fragments/proxies/setting.dart
+++ b/lib/fragments/proxies/setting.dart
@@ -7,8 +7,8 @@ import 'package:flutter/material.dart';
 import 'package:intl/intl.dart';
 import 'package:provider/provider.dart';

-class ProxiesSettingWidget extends StatelessWidget {
-  const ProxiesSettingWidget({super.key});
+class ProxiesSetting extends StatelessWidget {
+  const ProxiesSetting({super.key});

  IconData _getIconWithProxiesType(ProxiesType type) {
    return switch (type) {
@@ -41,6 +41,14 @@ class ProxiesSettingWidget extends StatelessWidget {
    };
  }

+  String _getTextWithProxiesIconStyle(ProxiesIconStyle style) {
+    return switch (style) {
+      ProxiesIconStyle.standard => appLocalizations.standard,
+      ProxiesIconStyle.none => appLocalizations.noIcon,
+      ProxiesIconStyle.icon => appLocalizations.onlyIcon,
+    };
+  }
+
  List<Widget> _buildStyleSetting() {
    return generateSection(
      title: appLocalizations.style,
@@ -49,7 +57,7 @@ class ProxiesSettingWidget extends StatelessWidget {
          padding: const EdgeInsets.symmetric(horizontal: 16),
          scrollDirection: Axis.horizontal,
          child: Selector<Config, ProxiesType>(
-            selector: (_, config) => config.proxiesType,
+            selector: (_, config) => config.proxiesStyle.type,
            builder: (_, proxiesType, __) {
              final config = globalState.appController.config;
              return Wrap(
@@ -63,7 +71,9 @@ class ProxiesSettingWidget extends StatelessWidget {
                      ),
                      isSelected: proxiesType == item,
                      onPressed: () {
-                        config.proxiesType = item;
+                        config.proxiesStyle = config.proxiesStyle.copyWith(
+                          type: item,
+                        );
                      },
                    )
                ],
@@ -83,7 +93,7 @@ class ProxiesSettingWidget extends StatelessWidget {
          padding: const EdgeInsets.symmetric(horizontal: 16),
          scrollDirection: Axis.horizontal,
          child: Selector<Config, ProxiesSortType>(
-            selector: (_, config) => config.proxiesSortType,
+            selector: (_, config) => config.proxiesStyle.sortType,
            builder: (_, proxiesSortType, __) {
              final config = globalState.appController.config;
              return Wrap(
@@ -97,7 +107,9 @@ class ProxiesSettingWidget extends StatelessWidget {
                      ),
                      isSelected: proxiesSortType == item,
                      onPressed: () {
-                        config.proxiesSortType = item;
+                        config.proxiesStyle = config.proxiesStyle.copyWith(
+                          sortType: item,
+                        );
                      },
                    ),
                ],
@@ -117,7 +129,7 @@ class ProxiesSettingWidget extends StatelessWidget {
          padding: const EdgeInsets.symmetric(horizontal: 16),
          scrollDirection: Axis.horizontal,
          child: Selector<Config, ProxyCardType>(
-            selector: (_, config) => config.proxyCardType,
+            selector: (_, config) => config.proxiesStyle.cardType,
            builder: (_, proxyCardType, __) {
              final config = globalState.appController.config;
              return Wrap(
@@ -128,7 +140,9 @@ class ProxiesSettingWidget extends StatelessWidget {
                      Intl.message(item.name),
                      isSelected: item == proxyCardType,
                      onPressed: () {
-                        config.proxyCardType = item;
+                        config.proxiesStyle = config.proxiesStyle.copyWith(
+                          cardType: item,
+                        );
                      },
                    )
                ],
@@ -149,8 +163,8 @@ class ProxiesSettingWidget extends StatelessWidget {
            horizontal: 16,
          ),
          scrollDirection: Axis.horizontal,
-          child: Selector< Config, ProxiesLayout>(
-            selector: (_, config) => config.proxiesLayout,
+          child: Selector<Config, ProxiesLayout>(
+            selector: (_, config) => config.proxiesStyle.layout,
            builder: (_, proxiesLayout, __) {
              final config = globalState.appController.config;
              return Wrap(
@@ -161,7 +175,9 @@ class ProxiesSettingWidget extends StatelessWidget {
                      getTextForProxiesLayout(item),
                      isSelected: item == proxiesLayout,
                      onPressed: () {
-                        config.proxiesLayout = item;
+                        config.proxiesStyle = config.proxiesStyle.copyWith(
+                          layout: item,
+                        );
                      },
                    )
                ],
@@ -173,6 +189,39 @@ class ProxiesSettingWidget extends StatelessWidget {
    );
  }

+  _buildGroupStyleSetting() {
+    return generateSection(
+      title: appLocalizations.iconStyle,
+      items: [
+        SingleChildScrollView(
+          padding: const EdgeInsets.symmetric(horizontal: 16),
+          scrollDirection: Axis.horizontal,
+          child: Selector<Config, ProxiesIconStyle>(
+            selector: (_, config) => config.proxiesStyle.iconStyle,
+            builder: (_, iconStyle, __) {
+              return Wrap(
+                spacing: 16,
+                children: [
+                  for (final item in ProxiesIconStyle.values)
+                    SettingTextCard(
+                      _getTextWithProxiesIconStyle(item),
+                      isSelected: iconStyle == item,
+                      onPressed: () {
+                        final config = globalState.appController.config;
+                        config.proxiesStyle = config.proxiesStyle.copyWith(
+                          iconStyle: item,
+                        );
+                      },
+                    ),
+                ],
+              );
+            },
+          ),
+        ),
+      ],
+    );
+  }
+
  @override
  Widget build(BuildContext context) {
    return Padding(
@@ -185,6 +234,22 @@ class ProxiesSettingWidget extends StatelessWidget {
          ..._buildSortSetting(),
          ..._buildLayoutSetting(),
          ..._buildSizeSetting(),
+          Selector<Config, bool>(
+            selector: (_, config) =>
+                config.proxiesStyle.type == ProxiesType.list,
+            builder: (_, value, child) {
+              if (value) {
+                return child!;
+              }
+              return Container();
+            },
+            child: Column(
+              crossAxisAlignment: CrossAxisAlignment.start,
+              children: [
+                ..._buildGroupStyleSetting(),
+              ],
+            ),
+          ),
        ],
      ),
    );
--- a/lib/fragments/proxies/tab.dart
+++ b/lib/fragments/proxies/tab.dart
@@ -1,6 +1,4 @@
 import 'dart:math';
-
-import 'package:collection/collection.dart';
 import 'package:fl_clash/common/common.dart';
 import 'package:fl_clash/enum/enum.dart';
 import 'package:fl_clash/models/models.dart';
@@ -120,8 +118,7 @@ class ProxiesTabFragmentState extends State<ProxiesTabFragment>
        );
      },
      shouldRebuild: (prev, next) {
-        if (!const ListEquality<String>()
-            .equals(prev.groupNames, next.groupNames)) {
+        if (!stringListEquality.equals(prev.groupNames, next.groupNames)) {
          _tabController?.dispose();
          _tabController = null;
          return true;
@@ -281,17 +278,34 @@ class ProxyGroupViewState extends State<ProxyGroupView> {
    );
  }

+  initFab(bool isCurrent, List<Proxy> proxies) {
+    if (!isCurrent) {
+      return;
+    }
+    WidgetsBinding.instance.addPostFrameCallback((_) {
+      final commonScaffoldState =
+          context.findAncestorStateOfType<CommonScaffoldState>();
+      commonScaffoldState?.floatingActionButton = DelayTestButton(
+        onClick: () async {
+          await _delayTest(
+            proxies,
+          );
+        },
+      );
+    });
+  }
+
  @override
  Widget build(BuildContext context) {
    return Selector2<AppState, Config, ProxyGroupSelectorState>(
      selector: (_, appState, config) {
        final group = appState.getGroupWithName(groupName)!;
        return ProxyGroupSelectorState(
-          proxyCardType: config.proxyCardType,
-          proxiesSortType: config.proxiesSortType,
+          proxyCardType: config.proxiesStyle.cardType,
+          proxiesSortType: config.proxiesStyle.sortType,
          columns: other.getProxiesColumns(
            appState.viewWidth,
-            config.proxiesLayout,
+            config.proxiesStyle.layout,
          ),
          sortNum: appState.sortNum,
          proxies: group.all,
@@ -306,41 +320,39 @@ class ProxyGroupViewState extends State<ProxyGroupView> {
          proxies,
        );
        _lastProxies = sortedProxies;
-        return DelayTestButtonContainer(
-          onClick: () async {
-            await _delayTest(
-              proxies,
-            );
+        return ActiveBuilder(
+          label: "proxies",
+          builder: (isCurrent, child) {
+            initFab(isCurrent, proxies);
+            return child!;
          },
          child: Align(
            alignment: Alignment.topCenter,
-            child: ScaleBuilder(
-              builder: (_) => GridView.builder(
-                controller: _controller,
-                padding: const EdgeInsets.only(
-                  top: 16,
-                  left: 16,
-                  right: 16,
-                  bottom: 80,
-                ),
-                gridDelegate: SliverGridDelegateWithFixedCrossAxisCount(
-                  crossAxisCount: columns,
-                  mainAxisSpacing: 8,
-                  crossAxisSpacing: 8,
-                  mainAxisExtent: getItemHeight(proxyCardType),
-                ),
-                itemCount: sortedProxies.length,
-                itemBuilder: (_, index) {
-                  final proxy = sortedProxies[index];
-                  return ProxyCard(
-                    groupType: state.groupType,
-                    type: proxyCardType,
-                    key: ValueKey('$groupName.${proxy.name}'),
-                    proxy: proxy,
-                    groupName: groupName,
-                  );
-                },
+            child: GridView.builder(
+              controller: _controller,
+              padding: const EdgeInsets.only(
+                top: 16,
+                left: 16,
+                right: 16,
+                bottom: 96,
              ),
+              gridDelegate: SliverGridDelegateWithFixedCrossAxisCount(
+                crossAxisCount: columns,
+                mainAxisSpacing: 8,
+                crossAxisSpacing: 8,
+                mainAxisExtent: getItemHeight(proxyCardType),
+              ),
+              itemCount: sortedProxies.length,
+              itemBuilder: (_, index) {
+                final proxy = sortedProxies[index];
+                return ProxyCard(
+                  groupType: state.groupType,
+                  type: proxyCardType,
+                  key: ValueKey('$groupName.${proxy.name}'),
+                  proxy: proxy,
+                  groupName: groupName,
+                );
+              },
            ),
          ),
        );
@@ -349,22 +361,19 @@ class ProxyGroupViewState extends State<ProxyGroupView> {
  }
 }

-class DelayTestButtonContainer extends StatefulWidget {
-  final Widget child;
+class DelayTestButton extends StatefulWidget {
  final Future Function() onClick;

-  const DelayTestButtonContainer({
+  const DelayTestButton({
    super.key,
-    required this.child,
    required this.onClick,
  });

  @override
-  State<DelayTestButtonContainer> createState() =>
-      _DelayTestButtonContainerState();
+  State<DelayTestButton> createState() => _DelayTestButtonState();
 }

-class _DelayTestButtonContainerState extends State<DelayTestButtonContainer>
+class _DelayTestButtonState extends State<DelayTestButton>
    with SingleTickerProviderStateMixin {
  late AnimationController _controller;
  late Animation<double> _scale;
@@ -406,29 +415,23 @@ class _DelayTestButtonContainerState extends State<DelayTestButtonContainer>

  @override
  Widget build(BuildContext context) {
-    _controller.reverse();
-    return FloatLayout(
-      floatingWidget: FloatWrapper(
-        child: AnimatedBuilder(
-          animation: _controller.view,
-          builder: (_, child) {
-            return SizedBox(
-              width: 56,
-              height: 56,
-              child: Transform.scale(
-                scale: _scale.value,
-                child: child,
-              ),
-            );
-          },
-          child: FloatingActionButton(
-            heroTag: null,
-            onPressed: _healthcheck,
-            child: const Icon(Icons.network_ping),
+    return AnimatedBuilder(
+      animation: _controller.view,
+      builder: (_, child) {
+        return SizedBox(
+          width: 56,
+          height: 56,
+          child: Transform.scale(
+            scale: _scale.value,
+            child: child,
          ),
-        ),
+        );
+      },
+      child: FloatingActionButton(
+        heroTag: null,
+        onPressed: _healthcheck,
+        child: const Icon(Icons.network_ping),
      ),
-      child: widget.child,
    );
  }
 }
--- a/lib/fragments/requests.dart
+++ b/lib/fragments/requests.dart
@@ -1,6 +1,5 @@
 import 'dart:async';
-
-import 'package:collection/collection.dart';
+import 'dart:io';
 import 'package:fl_clash/common/common.dart';
 import 'package:fl_clash/enum/enum.dart';
 import 'package:fl_clash/models/models.dart';
@@ -37,8 +36,11 @@ class _RequestsFragmentState extends State<RequestsFragment> {
        timer = null;
      }
      timer = Timer.periodic(const Duration(milliseconds: 200), (timer) {
-        final requests = appState.requests;
-        if (!const ListEquality<Connection>().equals(
+        final maxLength = Platform.isAndroid ? 1000 : 60;
+        final requests = appState.requests.safeSublist(
+          appState.requests.length - maxLength,
+        );
+        if (!connectionListEquality.equals(
          requestsNotifier.value.connections,
          requests,
        )) {
--- a/lib/fragments/theme.dart
+++ b/lib/fragments/theme.dart
@@ -1,4 +1,5 @@
 import 'package:fl_clash/common/common.dart';
+import 'package:fl_clash/enum/enum.dart';
 import 'package:fl_clash/models/models.dart';
 import 'package:fl_clash/state.dart';
 import 'package:flutter/material.dart';
@@ -18,6 +19,16 @@ class ThemeModeItem {
  });
 }

+class FontFamilyItem {
+  final FontFamily fontFamily;
+  final String label;
+
+  const FontFamilyItem({
+    required this.fontFamily,
+    required this.label,
+  });
+}
+
 class ThemeFragment extends StatelessWidget {
  const ThemeFragment({super.key});

@@ -92,7 +103,11 @@ class _ThemeColorsBoxState extends State<ThemeColorsBox> {
    return CommonCard(
      isSelected: isSelected,
      onPressed: () {
-        globalState.appController.config.themeMode = themeModeItem.themeMode;
+        final appController = globalState.appController;
+        appController.config.themeProps =
+            appController.config.themeProps.copyWith(
+          themeMode: themeModeItem.themeMode,
+        );
      },
      child: Padding(
        padding: const EdgeInsets.symmetric(horizontal: 16),
@@ -125,11 +140,45 @@ class _ThemeColorsBoxState extends State<ThemeColorsBox> {
      isSelected: isSelected,
      primaryColor: color,
      onPressed: () {
-        globalState.appController.config.primaryColor = color?.value;
+        final appController = globalState.appController;
+        appController.config.themeProps =
+            appController.config.themeProps.copyWith(
+          primaryColor: color?.value,
+        );
      },
    );
  }

+  Widget _fontFamilyCheckBox({
+    bool? isSelected,
+    required FontFamilyItem fontFamilyItem,
+  }) {
+    return CommonCard(
+      isSelected: isSelected,
+      onPressed: () {
+        final appController = globalState.appController;
+        appController.config.themeProps =
+            appController.config.themeProps.copyWith(
+          fontFamily: fontFamilyItem.fontFamily,
+        );
+      },
+      child: Padding(
+        padding: const EdgeInsets.symmetric(horizontal: 16),
+        child: Row(
+          mainAxisSize: MainAxisSize.min,
+          mainAxisAlignment: MainAxisAlignment.start,
+          children: [
+            Flexible(
+              child: Text(
+                fontFamilyItem.label,
+              ),
+            ),
+          ],
+        ),
+      ),
+    );
+  }
+
  @override
  Widget build(BuildContext context) {
    List<ThemeModeItem> themeModeItems = [
@@ -158,15 +207,59 @@ class _ThemeColorsBoxState extends State<ThemeColorsBox> {
      Colors.yellowAccent,
      Colors.purple,
    ];
+    List<FontFamilyItem> fontFamilyItems = [
+      FontFamilyItem(
+        label: appLocalizations.systemFont,
+        fontFamily: FontFamily.system,
+      ),
+      const FontFamilyItem(
+        label: "MiSans",
+        fontFamily: FontFamily.miSans,
+      ),
+    ];
    return Column(
      children: [
+        ItemCard(
+          info: Info(
+            label: appLocalizations.fontFamily,
+            iconData: Icons.text_fields,
+          ),
+          child: Container(
+            margin: const EdgeInsets.only(
+              left: 16,
+              right: 16,
+            ),
+            height: 48,
+            child: Selector<Config, FontFamily>(
+              selector: (_, config) => config.themeProps.fontFamily,
+              builder: (_, fontFamily, __) {
+                return ListView.separated(
+                  scrollDirection: Axis.horizontal,
+                  itemBuilder: (_, index) {
+                    final fontFamilyItem = fontFamilyItems[index];
+                    return _fontFamilyCheckBox(
+                      isSelected: fontFamily == fontFamilyItem.fontFamily,
+                      fontFamilyItem: fontFamilyItem,
+                    );
+                  },
+                  separatorBuilder: (_, __) {
+                    return const SizedBox(
+                      width: 16,
+                    );
+                  },
+                  itemCount: fontFamilyItems.length,
+                );
+              },
+            ),
+          ),
+        ),
        ItemCard(
          info: Info(
            label: appLocalizations.themeMode,
            iconData: Icons.brightness_high,
          ),
          child: Selector<Config, ThemeMode>(
-            selector: (_, config) => config.themeMode,
+            selector: (_, config) => config.themeProps.themeMode,
            builder: (_, themeMode, __) {
              return Container(
                padding: const EdgeInsets.symmetric(horizontal: 16),
@@ -204,7 +297,7 @@ class _ThemeColorsBoxState extends State<ThemeColorsBox> {
            ),
            height: 88,
            child: Selector<Config, int?>(
-              selector: (_, config) => config.primaryColor,
+              selector: (_, config) => config.themeProps.primaryColor,
              builder: (_, currentPrimaryColor, __) {
                return ListView.separated(
                  scrollDirection: Axis.horizontal,
@@ -229,7 +322,7 @@ class _ThemeColorsBoxState extends State<ThemeColorsBox> {
        Padding(
          padding: const EdgeInsets.symmetric(vertical: 16),
          child: Selector<Config, bool>(
-            selector: (_, config) => config.prueBlack,
+            selector: (_, config) => config.themeProps.prueBlack,
            builder: (_, value, ___) {
              return ListItem.switchItem(
                leading: Icon(
@@ -238,63 +331,19 @@ class _ThemeColorsBoxState extends State<ThemeColorsBox> {
                ),
                title: Text(appLocalizations.prueBlackMode),
                delegate: SwitchDelegate(
-                    value: value,
-                    onChanged: (value) {
-                      globalState.appController.config.prueBlack = value;
-                    }),
+                  value: value,
+                  onChanged: (value) {
+                    final appController = globalState.appController;
+                    appController.config.themeProps =
+                        appController.config.themeProps.copyWith(
+                      prueBlack: value,
+                    );
+                  },
+                ),
              );
            },
          ),
        ),
-        // Padding(
-        //   padding: const EdgeInsets.symmetric(vertical: 16),
-        //   child: Selector<Config, bool>(
-        //     selector: (_, config) => config.scaleProps.custom,
-        //     builder: (_, value, ___) {
-        //       return ListItem.switchItem(
-        //         leading: Icon(
-        //           Icons.format_size_sharp,
-        //           color: context.colorScheme.primary,
-        //         ),
-        //         title: const Text("自定义字体大小"),
-        //         delegate: SwitchDelegate(
-        //           value: value,
-        //           onChanged: (value) {
-        //             globalState.appController.config.scaleProps =
-        //                 globalState.appController.config.scaleProps.copyWith(
-        //               custom: value,
-        //             );
-        //           },
-        //         ),
-        //       );
-        //     },
-        //   ),
-        // ),
-        // SizedBox(
-        //   height: 20,
-        //   child: Selector<Config, ScaleProps>(
-        //     selector: (_, config) => config.scaleProps,
-        //     builder: (_, props, ___) {
-        //       return AbsorbPointer(
-        //         absorbing: !props.custom,
-        //         child: DisabledMask(
-        //           status: !props.custom,
-        //           child: Slider(
-        //             value: props.scale,
-        //             min: 0.8,
-        //             max: 1.2,
-        //             onChanged: (value) {
-        //               globalState.appController.config.scaleProps =
-        //                   globalState.appController.config.scaleProps.copyWith(
-        //                 scale: value,
-        //               );
-        //             },
-        //           ),
-        //         ),
-        //       );
-        //     },
-        //   ),
-        // ),
        const SizedBox(
          height: 64,
        ),
--- a/lib/fragments/tools.dart
+++ b/lib/fragments/tools.dart
@@ -70,7 +70,7 @@ class _ToolboxFragmentState extends State<ToolsFragment> {
            final isDisclaimerAccepted =
                await globalState.appController.showDisclaimer();
            if (!isDisclaimerAccepted) {
-              system.exit();
+              globalState.appController.handleExit();
            }
          },
        ),
@@ -91,7 +91,7 @@ class _ToolboxFragmentState extends State<ToolsFragment> {
      title: appLocalizations.settings,
      items: [
        Selector<Config, String?>(
-          selector: (_, config) => config.locale,
+          selector: (_, config) => config.appSetting.locale,
          builder: (_, localeString, __) {
            final subTitle = localeString ?? appLocalizations.defaultText;
            final currentLocale = other.getLocaleForString(localeString);
@@ -103,8 +103,10 @@ class _ToolboxFragmentState extends State<ToolsFragment> {
                title: appLocalizations.language,
                options: [null, ...AppLocalizations.delegate.supportedLocales],
                onChanged: (Locale? value) {
-                  final config = context.read<Config>();
-                  config.locale = value?.toString();
+                  final config = globalState.appController.config;
+                  config.appSetting = config.appSetting.copyWith(
+                    locale: value?.toString(),
+                  );
                },
                textBuilder: (locale) => _getLocaleString(locale),
                value: currentLocale,
--- a/lib/l10n/arb/intl_en.arb
+++ b/lib/l10n/arb/intl_en.arb
@@ -41,7 +41,7 @@
  "tunDesc": "only effective in administrator mode",
  "minimizeOnExit": "Minimize on exit",
  "minimizeOnExitDesc": "Modify the default system exit event",
-  "autoLaunch": "AutoLaunch",
+  "autoLaunch": "Auto launch",
  "autoLaunchDesc": "Follow the system self startup",
  "silentLaunch": "SilentLaunch",
  "silentLaunchDesc": "Start in the background",
@@ -123,7 +123,7 @@
  "tabAnimation": "Tab animation",
  "tabAnimationDesc": "When enabled, the home tab will add a toggle animation",
  "desc": "A multi-platform proxy client based on ClashMeta, simple and easy to use, open-source and ad-free.",
-  "startVpn": "Staring VPN...",
+  "startVpn": "Starting VPN...",
  "stopVpn": "Stopping VPN...",
  "discovery": "Discovery a new version",
  "compatible": "Compatibility mode",
@@ -250,8 +250,7 @@
  "dnsDesc": "Update DNS related settings",
  "key": "Key",
  "value": "Value",
-  "keyNotEmpty": "The key cannot be empty",
-  "valueNotEmpty": "The value cannot be empty",
+  "notEmpty": "Cannot be empty",
  "hostsDesc": "Add Hosts",
  "vpnTip": "Changes take effect after restarting the VPN",
  "vpnEnableDesc": "Auto routes all system traffic through VpnService",
@@ -287,7 +286,6 @@
  "geoipCode": "Geoip code",
  "ipcidr": "Ipcidr",
  "domain": "Domain",
-  "resetDns": "Reset Dns",
  "reset": "Reset",
  "action_view": "Show/Hide",
  "action_start": "Start/Stop",
@@ -303,5 +301,27 @@
  "inputCorrectHotkey": "Please enter the correct hotkey",
  "hotkeyConflict": "Hotkey conflict",
  "remove": "Remove",
-  "noHotKey": "No HotKey"
+  "noHotKey": "No HotKey",
+  "noNetwork": "No network",
+  "ipv6InboundDesc": "Allow IPv6 inbound",
+  "exportLogs": "Export logs",
+  "exportSuccess": "Export Success",
+  "iconStyle": "Icon style",
+  "onlyIcon": "Icon",
+  "noIcon": "None",
+  "stackMode": "Stack mode",
+  "network": "Network",
+  "networkDesc": "Modify network-related settings",
+  "bypassDomain": "Bypass domain",
+  "bypassDomainDesc": "Only takes effect when the system proxy is enabled",
+  "resetTip": "Make sure to reset",
+  "regExp": "RegExp",
+  "icon": "Icon",
+  "iconConfiguration": "Icon configuration",
+  "noData": "No data",
+  "adminAutoLaunch": "Admin auto launch",
+  "adminAutoLaunchDesc": "Boot up by using admin mode",
+  "fontFamily": "FontFamily",
+  "systemFont": "System font",
+  "toggle": "Toggle"
 }
--- a/lib/l10n/arb/intl_zh_CN.arb
+++ b/lib/l10n/arb/intl_zh_CN.arb
@@ -250,8 +250,7 @@
  "dnsDesc": "更新DNS相关设置",
  "key": "键",
  "value": "值",
-  "keyNotEmpty": "键不能为空",
-  "valueNotEmpty": "值不能为空",
+  "notEmpty": "不能为空",
  "hostsDesc": "追加Hosts",
  "vpnTip": "重启VPN后改变生效",
  "vpnEnableDesc": "通过VpnService自动路由系统所有流量",
@@ -287,7 +286,6 @@
  "geoipCode": "Geoip代码",
  "ipcidr": "IP/掩码",
  "domain": "域名",
-  "resetDns": "重置DNS",
  "reset": "重置",
  "action_view": "显示/隐藏",
  "action_start": "启动/停止",
@@ -303,5 +301,27 @@
  "inputCorrectHotkey": "请输入正确的快捷键",
  "hotkeyConflict": "快捷键冲突",
  "remove": "移除",
-  "noHotKey": "暂无快捷键"
+  "noHotKey": "暂无快捷键",
+  "noNetwork": "无网络",
+  "ipv6InboundDesc": "允许IPv6入站",
+  "exportLogs": "导出日志",
+  "exportSuccess": "导出成功",
+  "iconStyle": "图标样式",
+  "onlyIcon": "仅图标",
+  "noIcon": "无图标",
+  "stackMode": "栈模式",
+  "network": "网络",
+  "networkDesc": "修改网络相关设置",
+  "bypassDomain": "排除域名",
+  "bypassDomainDesc": "仅在系统代理启用时生效",
+  "resetTip": "确定要重置吗?",
+  "regExp": "正则",
+  "icon": "图片",
+  "iconConfiguration": "图片配置",
+  "noData": "暂无数据",
+  "adminAutoLaunch": "管理员自启动",
+  "adminAutoLaunchDesc": "使用管理员模式开机自启动",
+  "fontFamily": "字体",
+  "systemFont": "系统字体",
+  "toggle": "切换"
 }
--- a/lib/l10n/intl/messages_en.dart
+++ b/lib/l10n/intl/messages_en.dart
@@ -45,6 +45,10 @@ class MessageLookup extends MessageLookupByLibrary {
            MessageLookupByLibrary.simpleMessage("WebDAV server address"),
        "addressTip": MessageLookupByLibrary.simpleMessage(
            "Please enter a valid WebDAV address"),
+        "adminAutoLaunch":
+            MessageLookupByLibrary.simpleMessage("Admin auto launch"),
+        "adminAutoLaunchDesc":
+            MessageLookupByLibrary.simpleMessage("Boot up by using admin mode"),
        "ago": MessageLookupByLibrary.simpleMessage(" Ago"),
        "agree": MessageLookupByLibrary.simpleMessage("Agree"),
        "allApps": MessageLookupByLibrary.simpleMessage("All apps"),
@@ -72,7 +76,7 @@ class MessageLookup extends MessageLookupByLibrary {
            MessageLookupByLibrary.simpleMessage("Auto lose connections"),
        "autoCloseConnectionsDesc": MessageLookupByLibrary.simpleMessage(
            "Auto close connections after change node"),
-        "autoLaunch": MessageLookupByLibrary.simpleMessage("AutoLaunch"),
+        "autoLaunch": MessageLookupByLibrary.simpleMessage("Auto launch"),
        "autoLaunchDesc": MessageLookupByLibrary.simpleMessage(
            "Follow the system self startup"),
        "autoRun": MessageLookupByLibrary.simpleMessage("AutoRun"),
@@ -89,6 +93,9 @@ class MessageLookup extends MessageLookupByLibrary {
        "backupSuccess": MessageLookupByLibrary.simpleMessage("Backup success"),
        "bind": MessageLookupByLibrary.simpleMessage("Bind"),
        "blacklistMode": MessageLookupByLibrary.simpleMessage("Blacklist mode"),
+        "bypassDomain": MessageLookupByLibrary.simpleMessage("Bypass domain"),
+        "bypassDomainDesc": MessageLookupByLibrary.simpleMessage(
+            "Only takes effect when the system proxy is enabled"),
        "cancelFilterSystemApp":
            MessageLookupByLibrary.simpleMessage("Cancel filter system app"),
        "cancelSelectAll":
@@ -161,6 +168,8 @@ class MessageLookup extends MessageLookupByLibrary {
        "expand": MessageLookupByLibrary.simpleMessage("Standard"),
        "expirationTime":
            MessageLookupByLibrary.simpleMessage("Expiration time"),
+        "exportLogs": MessageLookupByLibrary.simpleMessage("Export logs"),
+        "exportSuccess": MessageLookupByLibrary.simpleMessage("Export Success"),
        "externalController":
            MessageLookupByLibrary.simpleMessage("ExternalController"),
        "externalControllerDesc": MessageLookupByLibrary.simpleMessage(
@@ -183,6 +192,7 @@ class MessageLookup extends MessageLookupByLibrary {
        "findProcessMode": MessageLookupByLibrary.simpleMessage("Find process"),
        "findProcessModeDesc": MessageLookupByLibrary.simpleMessage(
            "There is a risk of flashback after opening"),
+        "fontFamily": MessageLookupByLibrary.simpleMessage("FontFamily"),
        "fourColumns": MessageLookupByLibrary.simpleMessage("Four columns"),
        "general": MessageLookupByLibrary.simpleMessage("General"),
        "generalDesc":
@@ -204,6 +214,10 @@ class MessageLookup extends MessageLookupByLibrary {
        "hotkeyManagementDesc": MessageLookupByLibrary.simpleMessage(
            "Use keyboard to control applications"),
        "hours": MessageLookupByLibrary.simpleMessage("Hours"),
+        "icon": MessageLookupByLibrary.simpleMessage("Icon"),
+        "iconConfiguration":
+            MessageLookupByLibrary.simpleMessage("Icon configuration"),
+        "iconStyle": MessageLookupByLibrary.simpleMessage("Icon style"),
        "importFromURL":
            MessageLookupByLibrary.simpleMessage("Import from URL"),
        "infiniteTime":
@@ -217,12 +231,12 @@ class MessageLookup extends MessageLookupByLibrary {
        "ipcidr": MessageLookupByLibrary.simpleMessage("Ipcidr"),
        "ipv6Desc": MessageLookupByLibrary.simpleMessage(
            "When turned on it will be able to receive IPv6 traffic"),
+        "ipv6InboundDesc":
+            MessageLookupByLibrary.simpleMessage("Allow IPv6 inbound"),
        "just": MessageLookupByLibrary.simpleMessage("Just"),
        "keepAliveIntervalDesc":
            MessageLookupByLibrary.simpleMessage("Tcp keep alive interval"),
        "key": MessageLookupByLibrary.simpleMessage("Key"),
-        "keyNotEmpty":
-            MessageLookupByLibrary.simpleMessage("The key cannot be empty"),
        "language": MessageLookupByLibrary.simpleMessage("Language"),
        "layout": MessageLookupByLibrary.simpleMessage("Layout"),
        "light": MessageLookupByLibrary.simpleMessage("Light"),
@@ -261,15 +275,22 @@ class MessageLookup extends MessageLookupByLibrary {
            MessageLookupByLibrary.simpleMessage("Nameserver policy"),
        "nameserverPolicyDesc": MessageLookupByLibrary.simpleMessage(
            "Specify the corresponding nameserver policy"),
+        "network": MessageLookupByLibrary.simpleMessage("Network"),
+        "networkDesc": MessageLookupByLibrary.simpleMessage(
+            "Modify network-related settings"),
        "networkDetection":
            MessageLookupByLibrary.simpleMessage("Network detection"),
        "networkSpeed": MessageLookupByLibrary.simpleMessage("Network speed"),
+        "noData": MessageLookupByLibrary.simpleMessage("No data"),
        "noHotKey": MessageLookupByLibrary.simpleMessage("No HotKey"),
+        "noIcon": MessageLookupByLibrary.simpleMessage("None"),
        "noInfo": MessageLookupByLibrary.simpleMessage("No info"),
        "noMoreInfoDesc": MessageLookupByLibrary.simpleMessage("No more info"),
+        "noNetwork": MessageLookupByLibrary.simpleMessage("No network"),
        "noProxy": MessageLookupByLibrary.simpleMessage("No proxy"),
        "noProxyDesc": MessageLookupByLibrary.simpleMessage(
            "Please create a profile or add a valid profile"),
+        "notEmpty": MessageLookupByLibrary.simpleMessage("Cannot be empty"),
        "notSelectedTip": MessageLookupByLibrary.simpleMessage(
            "The current proxy group cannot be selected."),
        "nullConnectionsDesc":
@@ -281,6 +302,7 @@ class MessageLookup extends MessageLookupByLibrary {
            "No profile, Please add a profile"),
        "nullRequestsDesc": MessageLookupByLibrary.simpleMessage("No requests"),
        "oneColumn": MessageLookupByLibrary.simpleMessage("One column"),
+        "onlyIcon": MessageLookupByLibrary.simpleMessage("Icon"),
        "onlyOtherApps":
            MessageLookupByLibrary.simpleMessage("Only third-party apps"),
        "onlyStatisticsProxy":
@@ -358,6 +380,7 @@ class MessageLookup extends MessageLookupByLibrary {
            MessageLookupByLibrary.simpleMessage("Only recovery profiles"),
        "recoverySuccess":
            MessageLookupByLibrary.simpleMessage("Recovery success"),
+        "regExp": MessageLookupByLibrary.simpleMessage("RegExp"),
        "remote": MessageLookupByLibrary.simpleMessage("Remote"),
        "remoteBackupDesc":
            MessageLookupByLibrary.simpleMessage("Backup local data to WebDAV"),
@@ -368,7 +391,7 @@ class MessageLookup extends MessageLookupByLibrary {
        "requestsDesc": MessageLookupByLibrary.simpleMessage(
            "View recently request records"),
        "reset": MessageLookupByLibrary.simpleMessage("Reset"),
-        "resetDns": MessageLookupByLibrary.simpleMessage("Reset Dns"),
+        "resetTip": MessageLookupByLibrary.simpleMessage("Make sure to reset"),
        "resources": MessageLookupByLibrary.simpleMessage("Resources"),
        "resourcesDesc": MessageLookupByLibrary.simpleMessage(
            "External resource related info"),
@@ -391,9 +414,10 @@ class MessageLookup extends MessageLookupByLibrary {
        "size": MessageLookupByLibrary.simpleMessage("Size"),
        "sort": MessageLookupByLibrary.simpleMessage("Sort"),
        "source": MessageLookupByLibrary.simpleMessage("Source"),
+        "stackMode": MessageLookupByLibrary.simpleMessage("Stack mode"),
        "standard": MessageLookupByLibrary.simpleMessage("Standard"),
        "start": MessageLookupByLibrary.simpleMessage("Start"),
-        "startVpn": MessageLookupByLibrary.simpleMessage("Staring VPN..."),
+        "startVpn": MessageLookupByLibrary.simpleMessage("Starting VPN..."),
        "status": MessageLookupByLibrary.simpleMessage("Status"),
        "statusDesc": MessageLookupByLibrary.simpleMessage(
            "System DNS will be used when turned off"),
@@ -402,6 +426,7 @@ class MessageLookup extends MessageLookupByLibrary {
        "style": MessageLookupByLibrary.simpleMessage("Style"),
        "submit": MessageLookupByLibrary.simpleMessage("Submit"),
        "sync": MessageLookupByLibrary.simpleMessage("Sync"),
+        "systemFont": MessageLookupByLibrary.simpleMessage("System font"),
        "systemProxy": MessageLookupByLibrary.simpleMessage("System proxy"),
        "systemProxyDesc": MessageLookupByLibrary.simpleMessage(
            "Attach HTTP proxy to VpnService"),
@@ -422,6 +447,7 @@ class MessageLookup extends MessageLookupByLibrary {
        "tight": MessageLookupByLibrary.simpleMessage("Tight"),
        "time": MessageLookupByLibrary.simpleMessage("Time"),
        "tip": MessageLookupByLibrary.simpleMessage("tip"),
+        "toggle": MessageLookupByLibrary.simpleMessage("Toggle"),
        "tools": MessageLookupByLibrary.simpleMessage("Tools"),
        "trafficUsage": MessageLookupByLibrary.simpleMessage("Traffic usage"),
        "tun": MessageLookupByLibrary.simpleMessage("TUN"),
@@ -444,8 +470,6 @@ class MessageLookup extends MessageLookupByLibrary {
        "useSystemHosts":
            MessageLookupByLibrary.simpleMessage("Use system hosts"),
        "value": MessageLookupByLibrary.simpleMessage("Value"),
-        "valueNotEmpty":
-            MessageLookupByLibrary.simpleMessage("The value cannot be empty"),
        "view": MessageLookupByLibrary.simpleMessage("View"),
        "vpnDesc":
            MessageLookupByLibrary.simpleMessage("Modify VPN related settings"),
--- a/lib/l10n/intl/messages_zh_CN.dart
+++ b/lib/l10n/intl/messages_zh_CN.dart
@@ -41,6 +41,9 @@ class MessageLookup extends MessageLookupByLibrary {
        "address": MessageLookupByLibrary.simpleMessage("地址"),
        "addressHelp": MessageLookupByLibrary.simpleMessage("WebDAV服务器地址"),
        "addressTip": MessageLookupByLibrary.simpleMessage("请输入有效的WebDAV地址"),
+        "adminAutoLaunch": MessageLookupByLibrary.simpleMessage("管理员自启动"),
+        "adminAutoLaunchDesc":
+            MessageLookupByLibrary.simpleMessage("使用管理员模式开机自启动"),
        "ago": MessageLookupByLibrary.simpleMessage("前"),
        "agree": MessageLookupByLibrary.simpleMessage("同意"),
        "allApps": MessageLookupByLibrary.simpleMessage("所有应用"),
@@ -75,6 +78,8 @@ class MessageLookup extends MessageLookupByLibrary {
        "backupSuccess": MessageLookupByLibrary.simpleMessage("备份成功"),
        "bind": MessageLookupByLibrary.simpleMessage("绑定"),
        "blacklistMode": MessageLookupByLibrary.simpleMessage("黑名单模式"),
+        "bypassDomain": MessageLookupByLibrary.simpleMessage("排除域名"),
+        "bypassDomainDesc": MessageLookupByLibrary.simpleMessage("仅在系统代理启用时生效"),
        "cancelFilterSystemApp":
            MessageLookupByLibrary.simpleMessage("取消过滤系统应用"),
        "cancelSelectAll": MessageLookupByLibrary.simpleMessage("取消全选"),
@@ -132,6 +137,8 @@ class MessageLookup extends MessageLookupByLibrary {
        "exit": MessageLookupByLibrary.simpleMessage("退出"),
        "expand": MessageLookupByLibrary.simpleMessage("标准"),
        "expirationTime": MessageLookupByLibrary.simpleMessage("到期时间"),
+        "exportLogs": MessageLookupByLibrary.simpleMessage("导出日志"),
+        "exportSuccess": MessageLookupByLibrary.simpleMessage("导出成功"),
        "externalController": MessageLookupByLibrary.simpleMessage("外部控制器"),
        "externalControllerDesc":
            MessageLookupByLibrary.simpleMessage("开启后将可以通过9090端口控制Clash内核"),
@@ -148,6 +155,7 @@ class MessageLookup extends MessageLookupByLibrary {
        "findProcessMode": MessageLookupByLibrary.simpleMessage("查找进程"),
        "findProcessModeDesc":
            MessageLookupByLibrary.simpleMessage("开启后存在闪退风险"),
+        "fontFamily": MessageLookupByLibrary.simpleMessage("字体"),
        "fourColumns": MessageLookupByLibrary.simpleMessage("四列"),
        "general": MessageLookupByLibrary.simpleMessage("基础"),
        "generalDesc": MessageLookupByLibrary.simpleMessage("覆写基础设置"),
@@ -165,6 +173,9 @@ class MessageLookup extends MessageLookupByLibrary {
        "hotkeyManagementDesc":
            MessageLookupByLibrary.simpleMessage("使用键盘控制应用程序"),
        "hours": MessageLookupByLibrary.simpleMessage("小时"),
+        "icon": MessageLookupByLibrary.simpleMessage("图片"),
+        "iconConfiguration": MessageLookupByLibrary.simpleMessage("图片配置"),
+        "iconStyle": MessageLookupByLibrary.simpleMessage("图标样式"),
        "importFromURL": MessageLookupByLibrary.simpleMessage("从URL导入"),
        "infiniteTime": MessageLookupByLibrary.simpleMessage("长期有效"),
        "init": MessageLookupByLibrary.simpleMessage("初始化"),
@@ -173,11 +184,11 @@ class MessageLookup extends MessageLookupByLibrary {
        "intranetIP": MessageLookupByLibrary.simpleMessage("内网 IP"),
        "ipcidr": MessageLookupByLibrary.simpleMessage("IP/掩码"),
        "ipv6Desc": MessageLookupByLibrary.simpleMessage("开启后将可以接收IPv6流量"),
+        "ipv6InboundDesc": MessageLookupByLibrary.simpleMessage("允许IPv6入站"),
        "just": MessageLookupByLibrary.simpleMessage("刚刚"),
        "keepAliveIntervalDesc":
            MessageLookupByLibrary.simpleMessage("TCP保持活动间隔"),
        "key": MessageLookupByLibrary.simpleMessage("键"),
-        "keyNotEmpty": MessageLookupByLibrary.simpleMessage("键不能为空"),
        "language": MessageLookupByLibrary.simpleMessage("语言"),
        "layout": MessageLookupByLibrary.simpleMessage("布局"),
        "light": MessageLookupByLibrary.simpleMessage("浅色"),
@@ -208,14 +219,20 @@ class MessageLookup extends MessageLookupByLibrary {
        "nameserverPolicy": MessageLookupByLibrary.simpleMessage("域名服务器策略"),
        "nameserverPolicyDesc":
            MessageLookupByLibrary.simpleMessage("指定对应域名服务器策略"),
+        "network": MessageLookupByLibrary.simpleMessage("网络"),
+        "networkDesc": MessageLookupByLibrary.simpleMessage("修改网络相关设置"),
        "networkDetection": MessageLookupByLibrary.simpleMessage("网络检测"),
        "networkSpeed": MessageLookupByLibrary.simpleMessage("网络速度"),
+        "noData": MessageLookupByLibrary.simpleMessage("暂无数据"),
        "noHotKey": MessageLookupByLibrary.simpleMessage("暂无快捷键"),
+        "noIcon": MessageLookupByLibrary.simpleMessage("无图标"),
        "noInfo": MessageLookupByLibrary.simpleMessage("暂无信息"),
        "noMoreInfoDesc": MessageLookupByLibrary.simpleMessage("暂无更多信息"),
+        "noNetwork": MessageLookupByLibrary.simpleMessage("无网络"),
        "noProxy": MessageLookupByLibrary.simpleMessage("暂无代理"),
        "noProxyDesc":
            MessageLookupByLibrary.simpleMessage("请创建配置文件或者添加有效配置文件"),
+        "notEmpty": MessageLookupByLibrary.simpleMessage("不能为空"),
        "notSelectedTip": MessageLookupByLibrary.simpleMessage("当前代理组无法选中"),
        "nullConnectionsDesc": MessageLookupByLibrary.simpleMessage("暂无连接"),
        "nullCoreInfoDesc": MessageLookupByLibrary.simpleMessage("无法获取内核信息"),
@@ -224,6 +241,7 @@ class MessageLookup extends MessageLookupByLibrary {
            MessageLookupByLibrary.simpleMessage("没有配置文件,请先添加配置文件"),
        "nullRequestsDesc": MessageLookupByLibrary.simpleMessage("暂无请求"),
        "oneColumn": MessageLookupByLibrary.simpleMessage("一列"),
+        "onlyIcon": MessageLookupByLibrary.simpleMessage("仅图标"),
        "onlyOtherApps": MessageLookupByLibrary.simpleMessage("仅第三方应用"),
        "onlyStatisticsProxy": MessageLookupByLibrary.simpleMessage("仅统计代理"),
        "onlyStatisticsProxyDesc":
@@ -281,6 +299,7 @@ class MessageLookup extends MessageLookupByLibrary {
        "recoveryAll": MessageLookupByLibrary.simpleMessage("恢复所有数据"),
        "recoveryProfiles": MessageLookupByLibrary.simpleMessage("仅恢复配置文件"),
        "recoverySuccess": MessageLookupByLibrary.simpleMessage("恢复成功"),
+        "regExp": MessageLookupByLibrary.simpleMessage("正则"),
        "remote": MessageLookupByLibrary.simpleMessage("远程"),
        "remoteBackupDesc": MessageLookupByLibrary.simpleMessage("备份数据到WebDAV"),
        "remoteRecoveryDesc":
@@ -289,7 +308,7 @@ class MessageLookup extends MessageLookupByLibrary {
        "requests": MessageLookupByLibrary.simpleMessage("请求"),
        "requestsDesc": MessageLookupByLibrary.simpleMessage("查看最近请求记录"),
        "reset": MessageLookupByLibrary.simpleMessage("重置"),
-        "resetDns": MessageLookupByLibrary.simpleMessage("重置DNS"),
+        "resetTip": MessageLookupByLibrary.simpleMessage("确定要重置吗?"),
        "resources": MessageLookupByLibrary.simpleMessage("资源"),
        "resourcesDesc": MessageLookupByLibrary.simpleMessage("外部资源相关信息"),
        "respectRules": MessageLookupByLibrary.simpleMessage("遵守规则"),
@@ -310,6 +329,7 @@ class MessageLookup extends MessageLookupByLibrary {
        "size": MessageLookupByLibrary.simpleMessage("尺寸"),
        "sort": MessageLookupByLibrary.simpleMessage("排序"),
        "source": MessageLookupByLibrary.simpleMessage("来源"),
+        "stackMode": MessageLookupByLibrary.simpleMessage("栈模式"),
        "standard": MessageLookupByLibrary.simpleMessage("标准"),
        "start": MessageLookupByLibrary.simpleMessage("启动"),
        "startVpn": MessageLookupByLibrary.simpleMessage("正在启动VPN..."),
@@ -320,6 +340,7 @@ class MessageLookup extends MessageLookupByLibrary {
        "style": MessageLookupByLibrary.simpleMessage("风格"),
        "submit": MessageLookupByLibrary.simpleMessage("提交"),
        "sync": MessageLookupByLibrary.simpleMessage("同步"),
+        "systemFont": MessageLookupByLibrary.simpleMessage("系统字体"),
        "systemProxy": MessageLookupByLibrary.simpleMessage("系统代理"),
        "systemProxyDesc":
            MessageLookupByLibrary.simpleMessage("为VpnService附加HTTP代理"),
@@ -338,6 +359,7 @@ class MessageLookup extends MessageLookupByLibrary {
        "tight": MessageLookupByLibrary.simpleMessage("紧凑"),
        "time": MessageLookupByLibrary.simpleMessage("时间"),
        "tip": MessageLookupByLibrary.simpleMessage("提示"),
+        "toggle": MessageLookupByLibrary.simpleMessage("切换"),
        "tools": MessageLookupByLibrary.simpleMessage("工具"),
        "trafficUsage": MessageLookupByLibrary.simpleMessage("流量统计"),
        "tun": MessageLookupByLibrary.simpleMessage("虚拟网卡"),
@@ -355,7 +377,6 @@ class MessageLookup extends MessageLookupByLibrary {
        "useHosts": MessageLookupByLibrary.simpleMessage("使用Hosts"),
        "useSystemHosts": MessageLookupByLibrary.simpleMessage("使用系统Hosts"),
        "value": MessageLookupByLibrary.simpleMessage("值"),
-        "valueNotEmpty": MessageLookupByLibrary.simpleMessage("值不能为空"),
        "view": MessageLookupByLibrary.simpleMessage("查看"),
        "vpnDesc": MessageLookupByLibrary.simpleMessage("修改VPN相关设置"),
        "vpnEnableDesc":
--- a/lib/l10n/l10n.dart
+++ b/lib/l10n/l10n.dart
@@ -470,10 +470,10 @@ class AppLocalizations {
    );
  }

-  /// `AutoLaunch`
+  /// `Auto launch`
  String get autoLaunch {
    return Intl.message(
-      'AutoLaunch',
+      'Auto launch',
      name: 'autoLaunch',
      desc: '',
      args: [],
@@ -1290,10 +1290,10 @@ class AppLocalizations {
    );
  }

-  /// `Staring VPN...`
+  /// `Starting VPN...`
  String get startVpn {
    return Intl.message(
-      'Staring VPN...',
+      'Starting VPN...',
      name: 'startVpn',
      desc: '',
      args: [],
@@ -2560,21 +2560,11 @@ class AppLocalizations {
    );
  }

-  /// `The key cannot be empty`
-  String get keyNotEmpty {
+  /// `Cannot be empty`
+  String get notEmpty {
    return Intl.message(
-      'The key cannot be empty',
-      name: 'keyNotEmpty',
-      desc: '',
-      args: [],
-    );
-  }
-
-  /// `The value cannot be empty`
-  String get valueNotEmpty {
-    return Intl.message(
-      'The value cannot be empty',
-      name: 'valueNotEmpty',
+      'Cannot be empty',
+      name: 'notEmpty',
      desc: '',
      args: [],
    );
@@ -2930,16 +2920,6 @@ class AppLocalizations {
    );
  }

-  /// `Reset Dns`
-  String get resetDns {
-    return Intl.message(
-      'Reset Dns',
-      name: 'resetDns',
-      desc: '',
-      args: [],
-    );
-  }
-
  /// `Reset`
  String get reset {
    return Intl.message(
@@ -3099,6 +3079,226 @@ class AppLocalizations {
      args: [],
    );
  }
+
+  /// `No network`
+  String get noNetwork {
+    return Intl.message(
+      'No network',
+      name: 'noNetwork',
+      desc: '',
+      args: [],
+    );
+  }
+
+  /// `Allow IPv6 inbound`
+  String get ipv6InboundDesc {
+    return Intl.message(
+      'Allow IPv6 inbound',
+      name: 'ipv6InboundDesc',
+      desc: '',
+      args: [],
+    );
+  }
+
+  /// `Export logs`
+  String get exportLogs {
+    return Intl.message(
+      'Export logs',
+      name: 'exportLogs',
+      desc: '',
+      args: [],
+    );
+  }
+
+  /// `Export Success`
+  String get exportSuccess {
+    return Intl.message(
+      'Export Success',
+      name: 'exportSuccess',
+      desc: '',
+      args: [],
+    );
+  }
+
+  /// `Icon style`
+  String get iconStyle {
+    return Intl.message(
+      'Icon style',
+      name: 'iconStyle',
+      desc: '',
+      args: [],
+    );
+  }
+
+  /// `Icon`
+  String get onlyIcon {
+    return Intl.message(
+      'Icon',
+      name: 'onlyIcon',
+      desc: '',
+      args: [],
+    );
+  }
+
+  /// `None`
+  String get noIcon {
+    return Intl.message(
+      'None',
+      name: 'noIcon',
+      desc: '',
+      args: [],
+    );
+  }
+
+  /// `Stack mode`
+  String get stackMode {
+    return Intl.message(
+      'Stack mode',
+      name: 'stackMode',
+      desc: '',
+      args: [],
+    );
+  }
+
+  /// `Network`
+  String get network {
+    return Intl.message(
+      'Network',
+      name: 'network',
+      desc: '',
+      args: [],
+    );
+  }
+
+  /// `Modify network-related settings`
+  String get networkDesc {
+    return Intl.message(
+      'Modify network-related settings',
+      name: 'networkDesc',
+      desc: '',
+      args: [],
+    );
+  }
+
+  /// `Bypass domain`
+  String get bypassDomain {
+    return Intl.message(
+      'Bypass domain',
+      name: 'bypassDomain',
+      desc: '',
+      args: [],
+    );
+  }
+
+  /// `Only takes effect when the system proxy is enabled`
+  String get bypassDomainDesc {
+    return Intl.message(
+      'Only takes effect when the system proxy is enabled',
+      name: 'bypassDomainDesc',
+      desc: '',
+      args: [],
+    );
+  }
+
+  /// `Make sure to reset`
+  String get resetTip {
+    return Intl.message(
+      'Make sure to reset',
+      name: 'resetTip',
+      desc: '',
+      args: [],
+    );
+  }
+
+  /// `RegExp`
+  String get regExp {
+    return Intl.message(
+      'RegExp',
+      name: 'regExp',
+      desc: '',
+      args: [],
+    );
+  }
+
+  /// `Icon`
+  String get icon {
+    return Intl.message(
+      'Icon',
+      name: 'icon',
+      desc: '',
+      args: [],
+    );
+  }
+
+  /// `Icon configuration`
+  String get iconConfiguration {
+    return Intl.message(
+      'Icon configuration',
+      name: 'iconConfiguration',
+      desc: '',
+      args: [],
+    );
+  }
+
+  /// `No data`
+  String get noData {
+    return Intl.message(
+      'No data',
+      name: 'noData',
+      desc: '',
+      args: [],
+    );
+  }
+
+  /// `Admin auto launch`
+  String get adminAutoLaunch {
+    return Intl.message(
+      'Admin auto launch',
+      name: 'adminAutoLaunch',
+      desc: '',
+      args: [],
+    );
+  }
+
+  /// `Boot up by using admin mode`
+  String get adminAutoLaunchDesc {
+    return Intl.message(
+      'Boot up by using admin mode',
+      name: 'adminAutoLaunchDesc',
+      desc: '',
+      args: [],
+    );
+  }
+
+  /// `FontFamily`
+  String get fontFamily {
+    return Intl.message(
+      'FontFamily',
+      name: 'fontFamily',
+      desc: '',
+      args: [],
+    );
+  }
+
+  /// `System font`
+  String get systemFont {
+    return Intl.message(
+      'System font',
+      name: 'systemFont',
+      desc: '',
+      args: [],
+    );
+  }
+
+  /// `Toggle`
+  String get toggle {
+    return Intl.message(
+      'Toggle',
+      name: 'toggle',
+      desc: '',
+      args: [],
+    );
+  }
 }

 class AppLocalizationDelegate extends LocalizationsDelegate<AppLocalizations> {
--- a/lib/main.dart
+++ b/lib/main.dart
@@ -2,7 +2,6 @@ import 'dart:async';
 import 'dart:io';

 import 'package:fl_clash/clash/clash.dart';
-import 'package:fl_clash/common/http.dart';
 import 'package:fl_clash/plugins/app.dart';
 import 'package:fl_clash/plugins/tile.dart';
 import 'package:fl_clash/plugins/vpn.dart';
@@ -20,18 +19,16 @@ Future<void> main() async {
  globalState.packageInfo = await PackageInfo.fromPlatform();
  final version = await system.version;
  final config = await preferences.getConfig() ?? Config();
-  globalState.autoRun = config.autoRun;
  final clashConfig = await preferences.getClashConfig() ?? ClashConfig();
  await android?.init();
  await window?.init(config.windowProps, version);
  final appState = AppState(
    mode: clashConfig.mode,
    version: version,
-    isCompatible: config.isCompatible,
    selectedMap: config.currentSelectedMap,
  );
  appState.navigationItems = navigation.getItems(
-    openLogs: config.openLogs,
+    openLogs: config.appSetting.openLogs,
    hasProxies: false,
  );
  await globalState.init(
@@ -56,9 +53,12 @@ Future<void> vpnService() async {
  final version = await system.version;
  final config = await preferences.getConfig() ?? Config();
  final clashConfig = await preferences.getClashConfig() ?? ClashConfig();
+  await AppLocalizations.load(
+    other.getLocaleForString(config.appSetting.locale) ??
+        WidgetsBinding.instance.platformDispatcher.locale,
+  );
  final appState = AppState(
    mode: clashConfig.mode,
-    isCompatible: config.isCompatible,
    selectedMap: config.currentSelectedMap,
    version: version,
  );
@@ -102,15 +102,8 @@ Future<void> vpnService() async {
      },
    ),
  );
-  final appLocalizations = await AppLocalizations.load(
-    other.getLocaleForString(config.locale) ??
-        WidgetsBinding.instance.platformDispatcher.locale,
-  );
  await app?.tip(appLocalizations.startVpn);
-  await globalState.handleStart(
-    config: config,
-    clashConfig: clashConfig,
-  );
+  await globalState.handleStart();

  tile?.addListener(
    TileListenerWithVpn(
--- a/lib/manager/android_manager.dart
+++ b/lib/manager/android_manager.dart
@@ -1,6 +1,5 @@
 import 'package:fl_clash/models/models.dart';
 import 'package:fl_clash/plugins/app.dart';
-import 'package:fl_clash/state.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
 import 'package:provider/provider.dart';
@@ -20,39 +19,23 @@ class AndroidManager extends StatefulWidget {
 class _AndroidContainerState extends State<AndroidManager> {
  @override
  void initState() {
-    SystemChrome.setEnabledSystemUIMode(SystemUiMode.edgeToEdge);
    super.initState();
+    SystemChrome.setEnabledSystemUIMode(SystemUiMode.edgeToEdge);
  }

  Widget _excludeContainer(Widget child) {
    return Selector<Config, bool>(
-      selector: (_, config) => config.isExclude,
-      builder: (_, isExclude, child) {
-        app?.updateExcludeFromRecents(isExclude);
+      selector: (_, config) => config.appSetting.hidden,
+      builder: (_, hidden, child) {
+        app?.updateExcludeFromRecents(hidden);
        return child!;
      },
      child: child,
    );
  }

-  Widget _systemUiOverlayContainer(Widget child) {
-    return AnnotatedRegion(
-      value: SystemUiOverlayStyle(
-        statusBarColor: Colors.transparent,
-        statusBarIconBrightness: Theme.of(context).brightness == Brightness.dark
-            ? Brightness.light
-            : Brightness.dark,
-        systemNavigationBarColor: Colors.transparent,
-        systemNavigationBarDividerColor: Colors.transparent,
-      ),
-      child: child,
-    );
-  }
-
  @override
  Widget build(BuildContext context) {
-    return _systemUiOverlayContainer(
-      _excludeContainer(widget.child),
-    );
+    return _excludeContainer(widget.child);
  }
 }
--- a/lib/manager/app_state_manager.dart
+++ b/lib/manager/app_state_manager.dart
@@ -1,3 +1,5 @@
+import 'dart:convert';
+
 import 'package:fl_clash/common/common.dart';
 import 'package:fl_clash/models/models.dart';
 import 'package:fl_clash/state.dart';
@@ -24,7 +26,7 @@ class _AppStateManagerState extends State<AppStateManager>
        final group = appState.currentGroups;
        final hasProfile = config.profiles.isNotEmpty;
        return UpdateNavigationsSelector(
-          openLogs: config.openLogs,
+          openLogs: config.appSetting.openLogs,
          hasProxies: group.isNotEmpty && hasProfile,
        );
      },
@@ -44,6 +46,22 @@ class _AppStateManagerState extends State<AppStateManager>
    );
  }

+  _cacheStateChange(Widget child) {
+    return Selector2<Config, ClashConfig, String>(
+      selector: (_, config, clashConfig) => "$clashConfig $config",
+      shouldRebuild: (prev, next) {
+        if (prev != next) {
+          globalState.appController.savePreferencesDebounce();
+        }
+        return prev != next;
+      },
+      builder: (context, state, child) {
+        return child!;
+      },
+      child: child,
+    );
+  }
+
  @override
  void initState() {
    super.initState();
@@ -60,7 +78,7 @@ class _AppStateManagerState extends State<AppStateManager>
  Future<void> didChangeAppLifecycleState(AppLifecycleState state) async {
    final isPaused = state == AppLifecycleState.paused;
    if (isPaused) {
-      await globalState.appController.savePreferences();
+      globalState.appController.savePreferencesDebounce();
    }
  }

@@ -72,8 +90,10 @@ class _AppStateManagerState extends State<AppStateManager>

  @override
  Widget build(BuildContext context) {
-    return _updateNavigationsContainer(
-      widget.child,
+    return _cacheStateChange(
+      _updateNavigationsContainer(
+        widget.child,
+      ),
    );
  }
 }
--- a/lib/manager/clash_manager.dart
+++ b/lib/manager/clash_manager.dart
@@ -19,9 +19,9 @@ class ClashManager extends StatefulWidget {
  State<ClashManager> createState() => _ClashContainerState();
 }

-class _ClashContainerState extends State<ClashManager>
-    with AppMessageListener {
+class _ClashContainerState extends State<ClashManager> with AppMessageListener {
  Function? updateClashConfigDebounce;
+  Function? updateDelayDebounce;

  Widget _updateContainer(Widget child) {
    return Selector2<Config, ClashConfig, ClashConfigState>(
@@ -64,12 +64,13 @@ class _ClashContainerState extends State<ClashManager>
  Widget _updateCoreState(Widget child) {
    return Selector2<Config, ClashConfig, CoreState>(
      selector: (_, config, clashConfig) => CoreState(
-        accessControl: config.isAccessControl ? config.accessControl : null,
        enable: config.vpnProps.enable,
+        accessControl: config.isAccessControl ? config.accessControl : null,
+        ipv6: config.vpnProps.ipv6,
        allowBypass: config.vpnProps.allowBypass,
+        bypassDomain: config.vpnProps.bypassDomain,
        systemProxy: config.vpnProps.systemProxy,
-        mixedPort: clashConfig.mixedPort,
-        onlyProxy: config.onlyProxy,
+        onlyProxy: config.appSetting.onlyProxy,
        currentProfileName:
            config.currentProfile?.label ?? config.currentProfileId ?? "",
      ),
@@ -83,10 +84,6 @@ class _ClashContainerState extends State<ClashManager>

  _changeProfile() async {
    WidgetsBinding.instance.addPostFrameCallback((_) async {
-      if (globalState.autoRun) {
-        globalState.autoRun = false;
-        return;
-      }
      final appController = globalState.appController;
      appController.appState.delayMap = {};
      await appController.applyProfile();
@@ -132,19 +129,28 @@ class _ClashContainerState extends State<ClashManager>
    final appController = globalState.appController;
    appController.setDelay(delay);
    super.onDelay(delay);
-    await globalState.appController.updateGroupDebounce();
+    updateDelayDebounce ??= debounce(() async {
+      await appController.updateGroupDebounce();
+      await appController.addCheckIpNumDebounce();
+    }, milliseconds: 5000);
+    updateDelayDebounce!();
  }

  @override
  void onLog(Log log) {
-    globalState.appController.appState.addLog(log);
+    globalState.appController.appFlowingState.addLog(log);
    if (log.logLevel == LogLevel.error) {
      globalState.appController.showSnackBar(log.payload ?? '');
    }
-    debugPrint("$log");
    super.onLog(log);
  }

+  @override
+  void onStarted(String runTime) {
+    super.onStarted(runTime);
+    globalState.appController.applyProfileDebounce();
+  }
+
  @override
  void onRequest(Connection connection) async {
    globalState.appController.appState.addRequest(connection);
@@ -152,14 +158,14 @@ class _ClashContainerState extends State<ClashManager>
  }

  @override
-  void onLoaded(String providerName) {
+  Future<void> onLoaded(String providerName) async {
    final appController = globalState.appController;
    appController.appState.setProvider(
      clashCore.getExternalProvider(
        providerName,
      ),
    );
-    appController.addCheckIpNumDebounce();
+    await appController.updateGroupDebounce();
    super.onLoaded(providerName);
  }
 }
--- a/lib/manager/hotkey_manager.dart
+++ b/lib/manager/hotkey_manager.dart
@@ -1,3 +1,4 @@
+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/models/config.dart';
@@ -63,7 +64,7 @@ class HotKeyManager extends StatelessWidget {
    return Selector<Config, List<HotKeyAction>>(
      selector: (_, config) => config.hotKeyActions,
      shouldRebuild: (prev, next) {
-        return !hotKeyActionsEquality.equals(prev, next);
+        return !hotKeyActionListEquality.equals(prev, next);
      },
      builder: (_, hotKeyActions, __) {
        _updateHotKeys(hotKeyActions: hotKeyActions);
--- a/lib/manager/media_manager.dart
+++ b/lib/manager/media_manager.dart
@@ -1,8 +1,6 @@
 import 'package:fl_clash/common/common.dart';
-import 'package:fl_clash/models/config.dart';
 import 'package:fl_clash/state.dart';
 import 'package:flutter/material.dart';
-import 'package:provider/provider.dart';

 class MediaManager extends StatelessWidget {
  final Widget child;
@@ -14,28 +12,7 @@ class MediaManager extends StatelessWidget {

  @override
  Widget build(BuildContext context) {
-    return Selector<Config, ScaleProps>(
-      selector: (_, config) => config.scaleProps,
-      builder: (_, props, child) {
-        globalState.measure = Measure.of(context);
-        return child!;
-        // final textScaleFactor =
-        //     WidgetsBinding.instance.platformDispatcher.textScaleFactor;
-        // return MediaQuery(
-        //   data: MediaQuery.of(context).copyWith(
-        //     textScaler: props.custom
-        //         ? TextScaler.linear(props.scale * textScaleFactor)
-        //         : null,
-        //   ),
-        //   child: Builder(
-        //     builder: (context) {
-        //       globalState.measure = Measure.of(context);
-        //       return child!;
-        //     },
-        //   ),
-        // );
-      },
-      child: child,
-    );
+    globalState.measure = Measure.of(context);
+    return child;
  }
 }
--- a/lib/manager/proxy_manager.dart
+++ b/lib/manager/proxy_manager.dart
@@ -21,9 +21,9 @@ class ProxyManager extends StatelessWidget {

  @override
  Widget build(BuildContext context) {
-    return Selector3<AppState, Config, ClashConfig, ProxyState>(
-      selector: (_, appState, config, clashConfig) => ProxyState(
-        isStart: appState.isStart,
+    return Selector3<AppFlowingState, Config, ClashConfig, ProxyState>(
+      selector: (_, appFlowingState, config, clashConfig) => ProxyState(
+        isStart: appFlowingState.isStart,
        systemProxy: config.desktopProps.systemProxy,
        port: clashConfig.mixedPort,
      ),
--- a/lib/manager/tile_manager.dart
+++ b/lib/manager/tile_manager.dart
@@ -1,3 +1,4 @@
+import 'package:fl_clash/plugins/app.dart';
 import 'package:fl_clash/plugins/tile.dart';
 import 'package:fl_clash/state.dart';
 import 'package:flutter/material.dart';
@@ -29,7 +30,7 @@ class _TileContainerState extends State<TileManager> with TileListener {
  }

  @override
-  void onStop() {
+  Future<void> onStop() async {
    globalState.appController.updateStatus(false);
    super.onStop();
  }
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
chen08209	72bef5f672	Add android shortcuts Fix init params issues Fix dynamic color issues Optimize navigator animate Optimize window init Optimize fab Optimize save	2024-11-09 17:42:08 +08:00
chen08209	526ccdf3ad	Fix the collapse issues Add fontFamily options	2024-10-26 16:52:10 +08:00
chen08209	8282a9a474	Update core version Update flutter version Optimize ip check Optimize url-test	2024-10-26 01:46:55 +08:00
chen08209	dfa6d31673	Update release message Init auto gen changelog	2024-10-12 17:53:40 +08:00
chen08209	89bbbc6864	Fix windows tray issues Fix urltest issues Add auto changelog	2024-10-12 15:06:55 +08:00
chen08209	a3e1b38201	Fix windows admin auto launch issues Add android vpn options Support proxies icon configuration Optimize android immersion display Fix some issues	2024-10-12 15:06:55 +08:00
chen08209	4e3dc45f13	Optimize ip detection Support android vpn ipv6 inbound switch Support log export Optimize more details	2024-10-12 15:06:55 +08:00
chen08209	13d31cf708	Fix android system dns issues Optimize dns default option Fix some issues	2024-10-12 15:06:54 +08:00
chen08209	62a7772b92	Update readme	2024-10-12 15:06:54 +08:00