Update app icon

Fix desktop backup error

.github/workflows/build.yml

@@ -15,10 +15,16 @@ jobs:
             os: ubuntu-latest
           - platform: windows
             os: windows-latest
+            arch: amd64
           - platform: linux
             os: ubuntu-latest
+            arch: amd64
           - platform: macos
             os: macos-13
+            arch: amd64
+          - platform: macos
+            os: macos-latest
+            arch: arm64
 
     steps:
       - name: Setup Mingw64
@@ -89,13 +95,12 @@ jobs:
         run: flutter pub get
 
       - name: Setup
-        run: |
+        run: dart setup.dart ${{ matrix.platform }} ${{ matrix.arch && format('--arch {0}', matrix.arch) }}
-          dart setup.dart ${{ matrix.platform }}
 
       - name: Upload
         uses: actions/upload-artifact@v4
         with:
-          name: artifact-${{ matrix.platform }}
+          name: artifact-${{ matrix.platform }}${{ matrix.arch && format('-{0}', matrix.arch) }}
           path: ./dist
           retention-days: 1
           overwrite: true

android/app/src/main/AndroidManifest.xml

@@ -24,8 +24,9 @@
         android:icon="@mipmap/ic_launcher"
         android:networkSecurityConfig="@xml/network_security_config"
         android:extractNativeLibs="true"
+        android:enableOnBackInvokedCallback="true"
         android:label="FlClash"
-        tools:targetApi="n">
+        tools:targetApi="tiramisu">
         <activity
             android:name="com.follow.clash.MainActivity"
             android:configChanges="orientation|keyboardHidden|keyboard|screenSize|smallestScreenSize|locale|layoutDirection|fontScale|screenLayout|density|uiMode"
@@ -74,7 +75,7 @@
         <service
             android:name=".services.FlClashTileService"
             android:exported="true"
-            android:icon="@drawable/icon"
+            android:icon="@drawable/ic_stat_name"
             android:foregroundServiceType="specialUse"
             android:label="FlClash"
             android:permission="android.permission.BIND_QUICK_SETTINGS_TILE">

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

@@ -1,6 +1,7 @@
 package com.follow.clash
 
 import android.content.Context
+import android.util.Log
 import androidx.lifecycle.MutableLiveData
 import com.follow.clash.plugins.AppPlugin
 import com.follow.clash.plugins.ProxyPlugin
@@ -56,6 +57,8 @@ object GlobalState {
             serviceEngine?.dartExecutor?.executeDartEntrypoint(
                 vpnService,
             )
+
+            Log.e("FlClashVpnService", "initServiceEngine ===>")
         }
     }
 }

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

@@ -10,6 +10,7 @@ import android.content.pm.PackageManager
 import android.net.VpnService
 import android.os.Build
 import android.os.IBinder
+import android.util.Log
 import androidx.core.app.ActivityCompat
 import androidx.core.content.ContextCompat
 import com.follow.clash.GlobalState
@@ -131,7 +132,13 @@ class ProxyPlugin : FlutterPlugin, MethodChannel.MethodCallHandler, ActivityAwar
         }
         if (GlobalState.runState.value == RunState.START) return
         GlobalState.runState.value = RunState.START
-        flutterMethodChannel.invokeMethod("started", flClashVpnService?.start(port, props))
+        val intent = VpnService.prepare(context)
+        if (intent != null) {
+            stopVpn()
+            return
+        }
+        val fd = flClashVpnService?.start(port, props)
+        flutterMethodChannel.invokeMethod("started", fd)
     }
 
     private fun stopVpn() {

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

@@ -13,6 +13,7 @@ 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.GlobalState
 import com.follow.clash.MainActivity

android/app/src/main/res/drawable/ic_launcher_foreground.xml

@@ -0,0 +1,25 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="108dp"
+    android:height="108dp"
+    android:viewportWidth="240"
+    android:viewportHeight="240">
+  <group android:scaleX="0.924"
+      android:scaleY="0.924"
+      android:translateX="9.12"
+      android:translateY="9.12">
+    <group android:scaleX="0.63461536"
+        android:scaleY="0.63461536"
+        android:translateX="45.96154"
+        android:translateY="43.846153">
+      <path
+          android:pathData="M60.65,89.6L154.18,35.6A18,18 107.59,0 1,178.77 42.19L178.77,42.19A18,18 107.59,0 1,172.18 66.78L78.65,120.78A18,18 106.67,0 1,54.06 114.19L54.06,114.19A18,18 106.67,0 1,60.65 89.6z"
+          android:fillColor="#6666FB"/>
+      <path
+          android:pathData="M84.65,131.17L131.42,104.17A18,18 107.83,0 1,156 110.76L156,110.76A18,18 107.83,0 1,149.42 135.35L102.65,162.35A18,18 106.67,0 1,78.06 155.76L78.06,155.76A18,18 106.67,0 1,84.65 131.17z"
+          android:fillColor="#336AB6"/>
+      <path
+          android:pathData="M108.65,172.74L108.65,172.74A18,18 116.03,0 1,133.24 179.33L133.24,179.33A18,18 116.03,0 1,126.65 203.92L126.65,203.92A18,18 116.03,0 1,102.06 197.33L102.06,197.33A18,18 116.03,0 1,108.65 172.74z"
+          android:fillColor="#5CA8E9"/>
+    </group>
+  </group>
+</vector>

android/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
     <background android:drawable="@color/ic_launcher_background"/>
-    <foreground android:drawable="@mipmap/ic_launcher_foreground"/>
+    <foreground android:drawable="@drawable/ic_launcher_foreground"/>
-    <monochrome android:drawable="@mipmap/ic_launcher_foreground" />
+    <monochrome android:drawable="@drawable/ic_launcher_foreground" />
 </adaptive-icon>

android/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
     <background android:drawable="@color/ic_launcher_background"/>
-    <foreground android:drawable="@mipmap/ic_launcher_foreground"/>
+    <foreground android:drawable="@drawable/ic_launcher_foreground"/>
-    <monochrome android:drawable="@mipmap/ic_launcher_foreground" />
+    <monochrome android:drawable="@drawable/ic_launcher_foreground" />
 </adaptive-icon>

android/app/src/main/res/values-night-v27/styles.xml

@@ -6,7 +6,7 @@
         <item name="android:windowDrawsSystemBarBackgrounds">false</item>
         <item name="android:windowLayoutInDisplayCutoutMode">shortEdges</item>
         <item name="android:windowSplashScreenBackground" tools:targetApi="s">#121212</item>
-        <item name="android:windowSplashScreenAnimatedIcon" tools:targetApi="s">@mipmap/ic_launcher_foreground</item>
+        <item name="android:windowSplashScreenAnimatedIcon" tools:targetApi="s">@drawable/ic_launcher_foreground</item>
         <item name="postSplashScreenTheme">@style/NormalTheme</item>
     </style>
 </resources>

android/app/src/main/res/values-v27/styles.xml

@@ -6,7 +6,7 @@
         <item name="android:windowDrawsSystemBarBackgrounds">false</item>
         <item name="android:windowLayoutInDisplayCutoutMode">shortEdges</item>
         <item name="android:windowSplashScreenBackground" tools:targetApi="s">@color/ic_launcher_background</item>
-        <item name="android:windowSplashScreenAnimatedIcon" tools:targetApi="s">@mipmap/ic_launcher_foreground</item>
+        <item name="android:windowSplashScreenAnimatedIcon" tools:targetApi="s">@drawable/ic_launcher_foreground</item>
         <item name="postSplashScreenTheme">@style/NormalTheme</item>
     </style>
 </resources>

android/app/src/main/res/values/ic_launcher_background.xml

@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <color name="ic_launcher_background">#EFEFEF</color>
+    <color name="ic_launcher_background">#FAFAFA</color>
 </resources>

core/go.mod

@@ -7,8 +7,8 @@ replace github.com/metacubex/mihomo => ./Clash.Meta
 require (
 	github.com/Kr328/tun2socket v0.0.0-20220414050025-d07c78d06d34
 	github.com/metacubex/mihomo v1.17.1
-	github.com/miekg/dns v1.1.59
+	github.com/miekg/dns v1.1.61
-	golang.org/x/net v0.25.0
+	golang.org/x/net v0.26.0
 	golang.org/x/sync v0.7.0
 )
 
@@ -31,7 +31,7 @@ require (
 	github.com/ericlagergren/subtle v0.0.0-20220507045147-890d697da010 // indirect
 	github.com/fsnotify/fsnotify v1.7.0 // indirect
 	github.com/gaukas/godicttls v0.0.4 // indirect
-	github.com/go-chi/chi/v5 v5.0.12 // indirect
+	github.com/go-chi/chi/v5 v5.0.14 // 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
@@ -44,10 +44,10 @@ 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-20240419123447-f1cffa2c0c49 // indirect
+	github.com/insomniacslk/dhcp v0.0.0-20240529192340-51bc6136a0a6 // indirect
 	github.com/josharian/native v1.1.0 // indirect
 	github.com/klauspost/compress v1.17.4 // indirect
-	github.com/klauspost/cpuid/v2 v2.2.7 // indirect
+	github.com/klauspost/cpuid/v2 v2.2.8 // indirect
 	github.com/lufia/plan9stats v0.0.0-20211012122336-39d0f177ccd0 // indirect
 	github.com/lunixbochs/struc v0.0.0-20200707160740-784aaebc1d40 // indirect
 	github.com/mailru/easyjson v0.7.7 // indirect
@@ -55,13 +55,14 @@ require (
 	github.com/mdlayher/socket v0.4.1 // indirect
 	github.com/metacubex/gopacket v1.1.20-0.20230608035415-7e2f98a3e759 // indirect
 	github.com/metacubex/gvisor v0.0.0-20240320004321-933faba989ec // indirect
-	github.com/metacubex/quic-go v0.43.2-0.20240518033621-2c3d14c6b38e // indirect
+	github.com/metacubex/quic-go v0.45.1-0.20240610004319-163fee60637e // indirect
+	github.com/metacubex/randv2 v0.2.0 // indirect
 	github.com/metacubex/sing-quic v0.0.0-20240518034124-7696d3f7da72 // indirect
 	github.com/metacubex/sing-shadowsocks v0.2.6 // indirect
 	github.com/metacubex/sing-shadowsocks2 v0.2.0 // indirect
-	github.com/metacubex/sing-tun v0.2.7-0.20240512075008-89e7c6208eec // indirect
+	github.com/metacubex/sing-tun v0.2.7-0.20240627012306-9d1f5fc0b45e // indirect
 	github.com/metacubex/sing-vmess v0.1.9-0.20231207122118-72303677451f // indirect
-	github.com/metacubex/sing-wireguard v0.0.0-20240321042214-224f96122a63 // indirect
+	github.com/metacubex/sing-wireguard v0.0.0-20240618022557-a6efaa37127a // indirect
 	github.com/metacubex/tfo-go v0.0.0-20240228025757-be1269474a66 // indirect
 	github.com/metacubex/utls v1.6.6 // indirect
 	github.com/mroth/weightedrand/v2 v2.1.0 // indirect
@@ -71,18 +72,19 @@ require (
 	github.com/oschwald/maxminddb-golang v1.12.0 // indirect
 	github.com/pierrec/lz4/v4 v4.1.14 // indirect
 	github.com/power-devops/perfstat v0.0.0-20210106213030-5aafc221ea8c // indirect
-	github.com/puzpuzpuz/xsync/v3 v3.1.0 // indirect
+	github.com/puzpuzpuz/xsync/v3 v3.2.0 // indirect
 	github.com/quic-go/qpack v0.4.0 // indirect
 	github.com/quic-go/qtls-go1-20 v0.4.1 // indirect
 	github.com/sagernet/bbolt v0.0.0-20231014093535-ea5cb2fe9f0a // indirect
-	github.com/sagernet/netlink v0.0.0-20220905062125-8043b4a9aa97 // indirect
+	github.com/sagernet/netlink v0.0.0-20240612041022-b9a21c07ac6a // indirect
-	github.com/sagernet/sing v0.3.8 // indirect
+	github.com/sagernet/nftables v0.3.0-beta.4 // indirect
+	github.com/sagernet/sing v0.5.0-alpha.10 // indirect
 	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.39.0 // indirect
-	github.com/shirou/gopsutil/v3 v3.24.4 // indirect
+	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
 	github.com/sina-ghaderi/rabaead v0.0.0-20220730151906-ab6e06b96e8c // indirect
@@ -91,21 +93,20 @@ require (
 	github.com/tklauser/go-sysconf v0.3.12 // indirect
 	github.com/tklauser/numcpus v0.6.1 // indirect
 	github.com/u-root/uio v0.0.0-20230220225925-ffce2a382923 // indirect
-	github.com/vishvananda/netns v0.0.0-20211101163701-50045581ed74 // indirect
+	github.com/vishvananda/netns v0.0.4 // indirect
 	github.com/wk8/go-ordered-map/v2 v2.1.8 // indirect
 	github.com/yusufpapurcu/wmi v1.2.4 // indirect
-	github.com/zhangyunhao116/fastrand v0.4.0 // indirect
 	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.23.0 // indirect
+	golang.org/x/crypto v0.24.0 // indirect
-	golang.org/x/exp v0.0.0-20240506185415-9bf2ced13842 // indirect
+	golang.org/x/exp v0.0.0-20240613232115-7f521ea00fb8 // indirect
-	golang.org/x/mod v0.17.0 // indirect
+	golang.org/x/mod v0.18.0 // indirect
-	golang.org/x/sys v0.20.0 // indirect
+	golang.org/x/sys v0.21.0 // indirect
-	golang.org/x/text v0.15.0 // indirect
+	golang.org/x/text v0.16.0 // indirect
 	golang.org/x/time v0.5.0 // indirect
-	golang.org/x/tools v0.21.0 // indirect
+	golang.org/x/tools v0.22.0 // indirect
-	google.golang.org/protobuf v1.34.1 // indirect
+	google.golang.org/protobuf v1.34.2 // indirect
 	gopkg.in/yaml.v3 v3.0.1 // indirect
 	lukechampine.com/blake3 v1.3.0 // indirect
 )

core/go.sum

@@ -48,8 +48,8 @@ github.com/fsnotify/fsnotify v1.7.0 h1:8JEhPFa5W2WU7YfeZzPNqzMP6Lwt7L2715Ggo0nos
 github.com/fsnotify/fsnotify v1.7.0/go.mod h1:40Bi/Hjc2AVfZrqy+aj+yEI+/bRxZnMJyTJwOpGvigM=
 github.com/gaukas/godicttls v0.0.4 h1:NlRaXb3J6hAnTmWdsEKb9bcSBD6BvcIjdGdeb0zfXbk=
 github.com/gaukas/godicttls v0.0.4/go.mod h1:l6EenT4TLWgTdwslVb4sEMOCf7Bv0JAK67deKr9/NCI=
-github.com/go-chi/chi/v5 v5.0.12 h1:9euLV5sTrTNTRUU9POmDUvfxyj6LAABLUcEWO+JJb4s=
+github.com/go-chi/chi/v5 v5.0.14 h1:PyEwo2Vudraa0x/Wl6eDRRW2NXBvekgfxyydcM0WGE0=
-github.com/go-chi/chi/v5 v5.0.12/go.mod h1:DslCQbL2OYiznFReuXYUmQ2hGd1aDpCnlMNITLSKoi8=
+github.com/go-chi/chi/v5 v5.0.14/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=
@@ -75,7 +75,6 @@ github.com/golang/protobuf v1.5.3/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiu
 github.com/google/btree v1.1.2 h1:xf4v41cLI2Z6FxbKm+8Bu+m8ifhj15JuZ9sa0jZCMUU=
 github.com/google/btree v1.1.2/go.mod h1:qOPhT0dTNdNzV6Z/lhRX0YXUafgPLFUh+gZMl761Gm4=
 github.com/google/go-cmp v0.5.6/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
-github.com/google/go-cmp v0.5.9/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
 github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI=
 github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
 github.com/google/pprof v0.0.0-20210407192527-94a9f03dee38 h1:yAJXTCF9TqKcTiHJAE8dj7HMvPfh66eeA2JYW7eFpSE=
@@ -85,16 +84,16 @@ 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-20240419123447-f1cffa2c0c49 h1:/OuvSMGT9+xnyZ+7MZQ1zdngaCCAdPoSw8B/uurZ7pg=
+github.com/insomniacslk/dhcp v0.0.0-20240529192340-51bc6136a0a6 h1:dh8D8FksyMhD64mRMbUhZHWYJfNoNMCxfVq6eexleMw=
-github.com/insomniacslk/dhcp v0.0.0-20240419123447-f1cffa2c0c49/go.mod h1:KclMyHxX06VrVr0DJmeFSUb1ankt7xTfoOA35pCkoic=
+github.com/insomniacslk/dhcp v0.0.0-20240529192340-51bc6136a0a6/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=
 github.com/josharian/native v1.1.0/go.mod h1:7X/raswPFr05uY3HiLlYeyQntB6OO7E/d2Cu7qoaN2w=
 github.com/klauspost/compress v1.17.4 h1:Ej5ixsIri7BrIjBkRZLTo6ghwrEtHFk7ijlczPW4fZ4=
 github.com/klauspost/compress v1.17.4/go.mod h1:/dCuZOvVtNoHsyb+cuJD3itjs3NbnF6KH9zAO4BDxPM=
-github.com/klauspost/cpuid/v2 v2.2.7 h1:ZWSB3igEs+d0qvnxR/ZBzXVmxkgt8DdzP6m9pfuVLDM=
+github.com/klauspost/cpuid/v2 v2.2.8 h1:+StwCXwm9PdpiEkPyzBXIy+M9KUb4ODm0Zarf1kS5BM=
-github.com/klauspost/cpuid/v2 v2.2.7/go.mod h1:Lcz8mBdAVJIBVzewtcLocK12l3Y+JytZYpaMropDUws=
+github.com/klauspost/cpuid/v2 v2.2.8/go.mod h1:Lcz8mBdAVJIBVzewtcLocK12l3Y+JytZYpaMropDUws=
 github.com/kr/pretty v0.3.1 h1:flRD4NNwYAUpkphVc1HcthR4KEIFJ65n8Mw5qdRn3LE=
 github.com/kr/pretty v0.3.1/go.mod h1:hoEshYVHaxMs3cyo3Yncou5ZscifuDolrwPKZanG3xk=
 github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY=
@@ -113,26 +112,28 @@ github.com/metacubex/gopacket v1.1.20-0.20230608035415-7e2f98a3e759 h1:cjd4biTvO
 github.com/metacubex/gopacket v1.1.20-0.20230608035415-7e2f98a3e759/go.mod h1:UHOv2xu+RIgLwpXca7TLrXleEd4oR3sPatW6IF8wU88=
 github.com/metacubex/gvisor v0.0.0-20240320004321-933faba989ec h1:HxreOiFTUrJXJautEo8rnE1uKTVGY8wtZepY1Tii/Nc=
 github.com/metacubex/gvisor v0.0.0-20240320004321-933faba989ec/go.mod h1:8BVmQ+3cxjqzWElafm24rb2Ae4jRI6vAXNXWqWjfrXw=
-github.com/metacubex/quic-go v0.43.2-0.20240518033621-2c3d14c6b38e h1:Nzwe08FNIJpExWpy9iXkG336dN/8nJqn69yijB7vJ8g=
+github.com/metacubex/quic-go v0.45.1-0.20240610004319-163fee60637e h1:bLYn3GuRvWDcBDAkIv5kUYIhzHwafDVq635BuybnKqI=
-github.com/metacubex/quic-go v0.43.2-0.20240518033621-2c3d14c6b38e/go.mod h1:uXHODgJFUfUnkkCMWLd5Er6L5QY/LFRZb9LD5jyyhsk=
+github.com/metacubex/quic-go v0.45.1-0.20240610004319-163fee60637e/go.mod h1:Yza2H7Ax1rxWPUcJx0vW+oAt9EsPuSiyQFhFabUPzwU=
+github.com/metacubex/randv2 v0.2.0 h1:uP38uBvV2SxYfLj53kuvAjbND4RUDfFJjwr4UigMiLs=
+github.com/metacubex/randv2 v0.2.0/go.mod h1:kFi2SzrQ5WuneuoLLCMkABtiBu6VRrMrWFqSPyj2cxY=
 github.com/metacubex/sing-quic v0.0.0-20240518034124-7696d3f7da72 h1:Wr4g1HCb5Z/QIFwFiVNjO2qL+dRu25+Mdn9xtAZZ+ew=
 github.com/metacubex/sing-quic v0.0.0-20240518034124-7696d3f7da72/go.mod h1:g7Mxj7b7zm7YVqD975mk/hSmrb0A0G4bVvIMr2MMzn8=
 github.com/metacubex/sing-shadowsocks v0.2.6 h1:6oEB3QcsFYnNiFeoevcXrCwJ3sAablwVSgtE9R3QeFQ=
 github.com/metacubex/sing-shadowsocks v0.2.6/go.mod h1:zIkMeSnb8Mbf4hdqhw0pjzkn1d99YJ3JQm/VBg5WMTg=
 github.com/metacubex/sing-shadowsocks2 v0.2.0 h1:hqwT/AfI5d5UdPefIzR6onGHJfDXs5zgOM5QSgaM/9A=
 github.com/metacubex/sing-shadowsocks2 v0.2.0/go.mod h1:LCKF6j1P94zN8ZS+LXRK1gmYTVGB3squivBSXAFnOg8=
-github.com/metacubex/sing-tun v0.2.7-0.20240512075008-89e7c6208eec h1:K4Wq3GOdLZ/xcqwyzAt4kmYQrjokyKQ3u/Xh5Yft14U=
+github.com/metacubex/sing-tun v0.2.7-0.20240627012306-9d1f5fc0b45e h1:o+zohxPRo45P35fS9u1zfdBgr+L/7S0ObGU6YjbVBIc=
-github.com/metacubex/sing-tun v0.2.7-0.20240512075008-89e7c6208eec/go.mod h1:4VsMwZH1IlgPGFK1ZbBomZ/B2MYkTgs2+gnBAr5GOIo=
+github.com/metacubex/sing-tun v0.2.7-0.20240627012306-9d1f5fc0b45e/go.mod h1:WwJGbCx7bQcBzuQXiDOJvZH27R0kIjKNNlISIWsL6kM=
 github.com/metacubex/sing-vmess v0.1.9-0.20231207122118-72303677451f h1:QjXrHKbTMBip/C+R79bvbfr42xH1gZl3uFb0RELdZiQ=
 github.com/metacubex/sing-vmess v0.1.9-0.20231207122118-72303677451f/go.mod h1:olVkD4FChQ5gKMHG4ZzuD7+fMkJY1G8vwOKpRehjrmY=
-github.com/metacubex/sing-wireguard v0.0.0-20240321042214-224f96122a63 h1:AGyIB55UfQm/0ZH0HtQO9u3l//yjtHUpjeRjjPGfGRI=
+github.com/metacubex/sing-wireguard v0.0.0-20240618022557-a6efaa37127a h1:NpSGclHJUYndUwBmyIpFBSoBVg8PoVX7QQKhYg0DjM0=
-github.com/metacubex/sing-wireguard v0.0.0-20240321042214-224f96122a63/go.mod h1:uY+BYb0UEknLrqvbGcwi9i++KgrKxsurysgI6G1Pveo=
+github.com/metacubex/sing-wireguard v0.0.0-20240618022557-a6efaa37127a/go.mod h1:uY+BYb0UEknLrqvbGcwi9i++KgrKxsurysgI6G1Pveo=
 github.com/metacubex/tfo-go v0.0.0-20240228025757-be1269474a66 h1:as/aO/fM8nv4W4pOr9EETP6kV/Oaujk3fUNyQSJK61c=
 github.com/metacubex/tfo-go v0.0.0-20240228025757-be1269474a66/go.mod h1:c7bVFM9f5+VzeZ/6Kg77T/jrg1Xp8QpqlSHvG/aXVts=
 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/miekg/dns v1.1.59 h1:C9EXc/UToRwKLhK5wKU/I4QVsBUc8kE6MkHBkeypWZs=
+github.com/miekg/dns v1.1.61 h1:nLxbwF3XxhwVSm8g9Dghm9MHPaUZuqhPiGL+675ZmEs=
-github.com/miekg/dns v1.1.59/go.mod h1:nZpewl5p6IvctfgrckopVx2OlSEHPRO/U4SYkRklrEk=
+github.com/miekg/dns v1.1.61/go.mod h1:mnAarhS3nWaW+NVP2wTkYVIZyHNJ098SJZUki3eykwQ=
 github.com/mroth/weightedrand/v2 v2.1.0 h1:o1ascnB1CIVzsqlfArQQjeMy1U0NcIbBO5rfd5E/OeU=
 github.com/mroth/weightedrand/v2 v2.1.0/go.mod h1:f2faGsfOGOwc1p94wzHKKZyTpcJUW7OJ/9U4yfiNAOU=
 github.com/oasisprotocol/deoxysii v0.0.0-20220228165953-2091330c22b7 h1:1102pQc2SEPp5+xrS26wEaeb26sZy6k9/ZXlZN+eXE4=
@@ -155,8 +156,8 @@ github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZb
 github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
 github.com/power-devops/perfstat v0.0.0-20210106213030-5aafc221ea8c h1:ncq/mPwQF4JjgDlrVEn3C11VoGHZN7m8qihwgMEtzYw=
 github.com/power-devops/perfstat v0.0.0-20210106213030-5aafc221ea8c/go.mod h1:OmDBASR4679mdNQnz2pUhc2G8CO2JrUAVFDRBDP/hJE=
-github.com/puzpuzpuz/xsync/v3 v3.1.0 h1:EewKT7/LNac5SLiEblJeUu8z5eERHrmRLnMQL2d7qX4=
+github.com/puzpuzpuz/xsync/v3 v3.2.0 h1:9AzuUeF88YC5bK8u2vEG1Fpvu4wgpM1wfPIExfaaDxQ=
-github.com/puzpuzpuz/xsync/v3 v3.1.0/go.mod h1:VjzYrABPabuM4KyBh1Ftq6u8nhwY5tBPKP9jpmh0nnA=
+github.com/puzpuzpuz/xsync/v3 v3.2.0/go.mod h1:VjzYrABPabuM4KyBh1Ftq6u8nhwY5tBPKP9jpmh0nnA=
 github.com/quic-go/qpack v0.4.0 h1:Cr9BXA1sQS2SmDUWjSofMPNKmvF6IiIfDRmgU0w1ZCo=
 github.com/quic-go/qpack v0.4.0/go.mod h1:UZVnYIfi5GRk+zI9UMaCPsmZ2xKJP7XBUvVyT1Knj9A=
 github.com/quic-go/qtls-go1-20 v0.4.1 h1:D33340mCNDAIKBqXuAvexTNMUByrYmFYVfKfDN5nfFs=
@@ -165,11 +166,13 @@ github.com/rogpeppe/go-internal v1.9.0 h1:73kH8U+JUqXU8lRuOHeVHaa/SZPifC7BkcraZV
 github.com/rogpeppe/go-internal v1.9.0/go.mod h1:WtVeX8xhTBvf0smdhujwtBcq4Qrzq/fJaraNFVN+nFs=
 github.com/sagernet/bbolt v0.0.0-20231014093535-ea5cb2fe9f0a h1:+NkI2670SQpQWvkkD2QgdTuzQG263YZ+2emfpeyGqW0=
 github.com/sagernet/bbolt v0.0.0-20231014093535-ea5cb2fe9f0a/go.mod h1:63s7jpZqcDAIpj8oI/1v4Izok+npJOHACFCU6+huCkM=
-github.com/sagernet/netlink v0.0.0-20220905062125-8043b4a9aa97 h1:iL5gZI3uFp0X6EslacyapiRz7LLSJyr4RajF/BhMVyE=
+github.com/sagernet/netlink v0.0.0-20240612041022-b9a21c07ac6a h1:ObwtHN2VpqE0ZNjr6sGeT00J8uU7JF4cNUdb44/Duis=
-github.com/sagernet/netlink v0.0.0-20220905062125-8043b4a9aa97/go.mod h1:xLnfdiJbSp8rNqYEdIW/6eDO4mVoogml14Bh2hSiFpM=
+github.com/sagernet/netlink v0.0.0-20240612041022-b9a21c07ac6a/go.mod h1:xLnfdiJbSp8rNqYEdIW/6eDO4mVoogml14Bh2hSiFpM=
+github.com/sagernet/nftables v0.3.0-beta.4 h1:kbULlAwAC3jvdGAC1P5Fa3GSxVwQJibNenDW2zaXr8I=
+github.com/sagernet/nftables v0.3.0-beta.4/go.mod h1:OQXAjvjNGGFxaTgVCSTRIhYB5/llyVDeapVoENYBDS8=
 github.com/sagernet/sing v0.2.18/go.mod h1:OL6k2F0vHmEzXz2KW19qQzu172FDgSbUSODylighuVo=
-github.com/sagernet/sing v0.3.8 h1:gm4JKalPhydMYX2zFOTnnd4TXtM/16WFRqSjMepYQQk=
+github.com/sagernet/sing v0.5.0-alpha.10 h1:kuHl10gpjbKQAdQfyogQU3u0CVnpqC3wrAHe/+BFaXc=
-github.com/sagernet/sing v0.3.8/go.mod h1:+60H3Cm91RnL9dpVGWDPHt0zTQImO9Vfqt9a4rSambI=
+github.com/sagernet/sing v0.5.0-alpha.10/go.mod h1:ARkL0gM13/Iv5VCZmci/NuoOlePoIsW0m7BWfln/Hak=
 github.com/sagernet/sing-mux v0.2.1-0.20240124034317-9bfb33698bb6 h1:5bCAkvDDzSMITiHFjolBwpdqYsvycdTu71FsMEFXQ14=
 github.com/sagernet/sing-mux v0.2.1-0.20240124034317-9bfb33698bb6/go.mod h1:khzr9AOPocLa+g53dBplwNDz4gdsyx/YM3swtAhlkHQ=
 github.com/sagernet/sing-shadowtls v0.1.4 h1:aTgBSJEgnumzFenPvc+kbD9/W0PywzWevnVpEx6Tw3k=
@@ -180,8 +183,8 @@ github.com/sagernet/wireguard-go v0.0.0-20231209092712-9a439356a62e h1:iGH0RMv2F
 github.com/sagernet/wireguard-go v0.0.0-20231209092712-9a439356a62e/go.mod h1:YbL4TKHRR6APYQv3U2RGfwLDpPYSyWz6oUlpISBEzBE=
 github.com/samber/lo v1.39.0 h1:4gTz1wUhNYLhFSKl6O+8peW0v2F4BCY034GRpU9WnuA=
 github.com/samber/lo v1.39.0/go.mod h1:+m/ZKRl6ClXCE2Lgf3MsQlWfh4bn1bz6CXEOxnEXnEA=
-github.com/shirou/gopsutil/v3 v3.24.4 h1:dEHgzZXt4LMNm+oYELpzl9YCqV65Yr/6SfrvgRBtXeU=
+github.com/shirou/gopsutil/v3 v3.24.5 h1:i0t8kL+kQTvpAYToeuiVk3TgDeKOFioZO3Ztz/iZ9pI=
-github.com/shirou/gopsutil/v3 v3.24.4/go.mod h1:lTd2mdiOspcqLgAnr9/nGi71NkeMpWKdmhuxm9GusH8=
+github.com/shirou/gopsutil/v3 v3.24.5/go.mod h1:bsoOS1aStSs9ErQ1WWfxllSeS1K5D+U30r2NfcubMVk=
 github.com/shoenig/go-m1cpu v0.1.6 h1:nxdKQNcEB6vzgA2E2bvzKIYRuNj7XNJ4S/aRSwKzFtM=
 github.com/shoenig/go-m1cpu v0.1.6/go.mod h1:1JJMcUBvfNwpq05QDQVAnx3gUHr9IYF7GNg9SUEw2VQ=
 github.com/shoenig/test v0.6.4 h1:kVTaSd7WLz5WZ2IaoM0RSzRsUD+m8wRR+5qvntpn4LU=
@@ -195,15 +198,9 @@ github.com/sina-ghaderi/rabbitio v0.0.0-20220730151941-9ce26f4f872e/go.mod h1:+e
 github.com/sirupsen/logrus v1.9.3 h1:dueUQJ1C2q9oE3F7wvmSGAaVtTmUizReu6fjN8uqzbQ=
 github.com/sirupsen/logrus v1.9.3/go.mod h1:naHLuLoDiP4jHNo9R0sCBMtWGeIprob74mVsIT4qYEQ=
 github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
-github.com/stretchr/objx v0.4.0/go.mod h1:YvHI0jy2hoMjB+UWwv71VJQ9isScKT/TqJzVSSt89Yw=
-github.com/stretchr/objx v0.5.0/go.mod h1:Yh+to48EsGEfYuaHDzXPcE3xhTkx73EhmCGUpEOglKo=
-github.com/stretchr/objx v0.5.2/go.mod h1:FRsXN1f5AsAjCGJKqEizvkpNtU+EGNCLh3NxZ/8L+MA=
 github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI=
 github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
 github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
-github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
-github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU=
-github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo=
 github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsTg=
 github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY=
 github.com/tklauser/go-sysconf v0.3.12 h1:0QaGUFOdQaIVdPgfITYzaTegZvdCjmYO52cSFAEVmqU=
@@ -215,14 +212,12 @@ github.com/u-root/uio v0.0.0-20230220225925-ffce2a382923/go.mod h1:eLL9Nub3yfAho
 github.com/vishvananda/netlink v1.1.0/go.mod h1:cTgwzPIzzgDAYoQrMm0EdrjRUBkTqKYppBueQtXaqoE=
 github.com/vishvananda/netns v0.0.0-20191106174202-0a2b9b5464df/go.mod h1:JP3t17pCcGlemwknint6hfoeCVQrEMVwxRLRjXpq+BU=
 github.com/vishvananda/netns v0.0.0-20210104183010-2eb08e3e575f/go.mod h1:DD4vA1DwXk04H54A1oHXtwZmA0grkVMdPxx/VGLCah0=
-github.com/vishvananda/netns v0.0.0-20211101163701-50045581ed74 h1:gga7acRE695APm9hlsSMoOoE65U4/TcqNj90mc69Rlg=
+github.com/vishvananda/netns v0.0.4 h1:Oeaw1EM2JMxD51g9uhtC0D7erkIjgmj8+JZc26m1YX8=
-github.com/vishvananda/netns v0.0.0-20211101163701-50045581ed74/go.mod h1:DD4vA1DwXk04H54A1oHXtwZmA0grkVMdPxx/VGLCah0=
+github.com/vishvananda/netns v0.0.4/go.mod h1:SpkAiCQRtJ6TvvxPnOSyH3BMl6unz3xZlaprSwhNNJM=
 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=
 github.com/yusufpapurcu/wmi v1.2.4/go.mod h1:SBZ9tNy3G9/m5Oi98Zks0QjeHVDvuK0qfxQmPyzfmi0=
-github.com/zhangyunhao116/fastrand v0.4.0 h1:86QB6Y+GGgLZRFRDCjMmAS28QULwspK9sgL5d1Bx3H4=
-github.com/zhangyunhao116/fastrand v0.4.0/go.mod h1:vIyo6EyBhjGKpZv6qVlkPl4JVAklpMM4DSKzbAkMguA=
 gitlab.com/yawning/bsaes.git v0.0.0-20190805113838-0a714cd429ec h1:FpfFs4EhNehiVfzQttTuxanPIT43FtkkCFypIod8LHo=
 gitlab.com/yawning/bsaes.git v0.0.0-20190805113838-0a714cd429ec/go.mod h1:BZ1RAoRPbCxum9Grlv5aeksu2H8BiKehBYooU2LFiOQ=
 go.uber.org/mock v0.4.0 h1:VcM4ZOtdbR4f6VXfiOpwpVJDL6lCReaZ6mw31wqh7KU=
@@ -231,18 +226,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.23.0 h1:dIJU/v2J8Mdglj/8rJ6UUOM3Zc9zLZxVZwwxMooUSAI=
+golang.org/x/crypto v0.24.0 h1:mnl8DM0o513X8fdIkmyFE/5hTYxbwYOjDS/+rK6qpRI=
-golang.org/x/crypto v0.23.0/go.mod h1:CKFgDieR+mRhux2Lsu27y0fO304Db0wZe70UKqHu0v8=
+golang.org/x/crypto v0.24.0/go.mod h1:Z1PMYSOR5nyMcyAVAIQSKCDwalqy85Aqn1x3Ws4L5DM=
-golang.org/x/exp v0.0.0-20240506185415-9bf2ced13842 h1:vr/HnozRka3pE4EsMEg1lgkXJkTFJCVUX+S/ZT6wYzM=
+golang.org/x/exp v0.0.0-20240613232115-7f521ea00fb8 h1:yixxcjnhBmY0nkL253HFVIm0JsFHwrHdT3Yh6szTnfY=
-golang.org/x/exp v0.0.0-20240506185415-9bf2ced13842/go.mod h1:XtvwrStGgqGPLc4cjQfWqZHG1YFdYs6swckp8vpsjnc=
+golang.org/x/exp v0.0.0-20240613232115-7f521ea00fb8/go.mod h1:jj3sYF3dwk5D+ghuXyeI3r5MFf+NT2An6/9dOA95KSI=
 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.17.0 h1:zY54UmvipHiNd+pm+m0x9KhZ9hl1/7QNMyxXbc6ICqA=
+golang.org/x/mod v0.18.0 h1:5+9lSbEzPSdWkH32vYPBwEpX8KwDbM52Ud9xBUvNlb0=
-golang.org/x/mod v0.17.0/go.mod h1:hTbmBsO62+eylJbnUtE2MGJUyE7QWk4xUqPFrRgJ+7c=
+golang.org/x/mod v0.18.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.25.0 h1:d/OCCoBEUq33pjydKrGQhw7IlUPI2Oylr+8qLx49kac=
+golang.org/x/net v0.26.0 h1:soB7SVo0PWrY4vPW/+ay0jKDNScG2X9wFeYlXIvJsOQ=
-golang.org/x/net v0.25.0/go.mod h1:JkAGAh7GEvH74S6FOH42FLoXpXbE/aqXSrIQjXgsiwM=
+golang.org/x/net v0.26.0/go.mod h1:5YKkiSynbBIh3p6iOc/vibscux0x38BZDkn8sCUPxHE=
 golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.7.0 h1:YsImfSBoP9QPYL0xyKJPq0gcaJdG3rInoqxTWbfQu9M=
 golang.org/x/sync v0.7.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk=
@@ -262,26 +257,24 @@ 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.14.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
-golang.org/x/sys v0.19.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
+golang.org/x/sys v0.21.0 h1:rF+pYz3DAGSQAxAu1CbC7catZg4ebC4UIeIhKxBZvws=
-golang.org/x/sys v0.20.0 h1:Od9JTbYCk261bKm4M/mw7AklTlFYIa0bIp9BgSm1S8Y=
+golang.org/x/sys v0.21.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
-golang.org/x/sys v0.20.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
+golang.org/x/term v0.21.0 h1:WVXCp+/EBEHOj53Rvu+7KiT/iElMrO8ACK16SMZ3jaA=
-golang.org/x/term v0.20.0 h1:VnkxpohqXaOBYJtBmEppKUG6mXpi+4O6purfc2+sMhw=
+golang.org/x/term v0.21.0/go.mod h1:ooXLefLobQVslOqselCNF4SxFAaoS6KujMbsGzSDmX0=
-golang.org/x/term v0.20.0/go.mod h1:8UkIAJTvZgivsXaD6/pH6U9ecQzZ45awqEOzuCvwpFY=
 golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
-golang.org/x/text v0.15.0 h1:h1V/4gjBv8v9cjcR6+AR5+/cIYK5N/WAgiv4xlsEtAk=
+golang.org/x/text v0.16.0 h1:a94ExnEXNtEwYLGJSIUxnWoxoRz/ZcCsV63ROupILh4=
-golang.org/x/text v0.15.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU=
+golang.org/x/text v0.16.0/go.mod h1:GhwF1Be+LQoKShO3cGOHzqOgRrGaYc9AvblQOmPVHnI=
 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=
-golang.org/x/tools v0.21.0 h1:qc0xYgIbsSDt9EyWz05J5wfa7LOVW0YTLOXrqdLAWIw=
+golang.org/x/tools v0.22.0 h1:gqSGLZqv+AI9lIQzniJ0nZDRG5GBPsSi+DRNHWNz6yA=
-golang.org/x/tools v0.21.0/go.mod h1:aiJjzUbINMkxbQROHiO6hDPo2LHcIPhhQsa9DLh0yGk=
+golang.org/x/tools v0.22.0/go.mod h1:aCwcsjqvq7Yqt6TNyX7QMU2enbQ/Gt0bo6krSeEri+c=
 golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
-google.golang.org/protobuf v1.34.1 h1:9ddQBjfCyZPOHPUiPxpYESBLc+T8P3E+Vo4IbKZgFWg=
+google.golang.org/protobuf v1.34.2 h1:6xV6lTsCfpGD21XK49h7MhtcApnLqkfYgPcdHftf6hg=
-google.golang.org/protobuf v1.34.1/go.mod h1:c6P6GXX6sHbq/GpV6MGZEdwhWPcYBgnhAHhKbcUYpos=
+google.golang.org/protobuf v1.34.2/go.mod h1:qYOHts0dSfpeUzUFpOMr/WGzszTmLH+DiWniOlNbLDw=
+gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
-gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127 h1:qIbj1fsPNlZgppZ+VLlY7N33q108Sa+fhmuc+sWQYwY=
-gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
 gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
 gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=

core/status.go

@@ -0,0 +1,43 @@
+//go:build android
+
+package main
+
+import "C"
+import (
+	"encoding/json"
+	"fmt"
+)
+
+type AccessControl struct {
+	Mode              string   `json:"mode"`
+	AcceptList        []string `json:"acceptList"`
+	RejectList        []string `json:"rejectList"`
+	IsFilterSystemApp bool     `json:"isFilterSystemApp"`
+}
+
+type AndroidProps struct {
+	AccessControl *AccessControl `json:"accessControl"`
+	AllowBypass   bool           `json:"allowBypass"`
+	SystemProxy   bool           `json:"systemProxy"`
+}
+
+var androidProps AndroidProps
+
+//export getAndroidProps
+func getAndroidProps() *C.char {
+	data, err := json.Marshal(androidProps)
+	if err != nil {
+		fmt.Println("Error:", err)
+		return C.CString("")
+	}
+	return C.CString(string(data))
+}
+
+//export setAndroidProps
+func setAndroidProps(s *C.char) {
+	paramsString := C.GoString(s)
+	err := json.Unmarshal([]byte(paramsString), &androidProps)
+	if err != nil {
+		return
+	}
+}

lib/application.dart

@@ -137,57 +137,59 @@ class ApplicationState extends State<Application> {
   Widget build(context) {
     return AppStateContainer(
       child: ClashMessageContainer(
-        child: _buildApp(
+        child: Selector2<AppState, Config, ApplicationSelectorState>(
-          Selector2<AppState, Config, ApplicationSelectorState>(
+          selector: (_, appState, config) => ApplicationSelectorState(
-            selector: (_, appState, config) => ApplicationSelectorState(
+            locale: config.locale,
-              locale: config.locale,
+            themeMode: config.themeMode,
-              themeMode: config.themeMode,
+            primaryColor: config.primaryColor,
-              primaryColor: config.primaryColor,
-            ),
-            builder: (_, state, child) {
-              return DynamicColorBuilder(
-                builder: (lightDynamic, darkDynamic) {
-                  _updateSystemColorSchemes(lightDynamic, darkDynamic);
-                  return MaterialApp(
-                    debugShowCheckedModeBanner: false,
-                    navigatorKey: globalState.navigatorKey,
-                    localizationsDelegates: const [
-                      AppLocalizations.delegate,
-                      GlobalMaterialLocalizations.delegate,
-                      GlobalCupertinoLocalizations.delegate,
-                      GlobalWidgetsLocalizations.delegate
-                    ],
-                    scrollBehavior: BaseScrollBehavior(),
-                    title: appName,
-                    locale: other.getLocaleForString(state.locale),
-                    supportedLocales:
-                        AppLocalizations.delegate.supportedLocales,
-                    themeMode: state.themeMode,
-                    theme: ThemeData(
-                      useMaterial3: true,
-                      pageTransitionsTheme: _pageTransitionsTheme,
-                      colorScheme: _getAppColorScheme(
-                        brightness: Brightness.light,
-                        systemColorSchemes: systemColorSchemes,
-                        primaryColor: state.primaryColor,
-                      ),
-                    ),
-                    darkTheme: ThemeData(
-                      useMaterial3: true,
-                      pageTransitionsTheme: _pageTransitionsTheme,
-                      colorScheme: _getAppColorScheme(
-                        brightness: Brightness.dark,
-                        systemColorSchemes: systemColorSchemes,
-                        primaryColor: state.primaryColor,
-                      ),
-                    ),
-                    home: child,
-                  );
-                },
-              );
-            },
-            child: const HomePage(),
           ),
+          builder: (_, state, child) {
+            return DynamicColorBuilder(
+              builder: (lightDynamic, darkDynamic) {
+                _updateSystemColorSchemes(lightDynamic, darkDynamic);
+                return MaterialApp(
+                  debugShowCheckedModeBanner: false,
+                  navigatorKey: globalState.navigatorKey,
+                  localizationsDelegates: const [
+                    AppLocalizations.delegate,
+                    GlobalMaterialLocalizations.delegate,
+                    GlobalCupertinoLocalizations.delegate,
+                    GlobalWidgetsLocalizations.delegate
+                  ],
+                  builder: (_, child) {
+                    return PopContainer(
+                      child: _buildApp(child!),
+                    );
+                  },
+                  scrollBehavior: BaseScrollBehavior(),
+                  title: appName,
+                  locale: other.getLocaleForString(state.locale),
+                  supportedLocales: AppLocalizations.delegate.supportedLocales,
+                  themeMode: state.themeMode,
+                  theme: ThemeData(
+                    useMaterial3: true,
+                    pageTransitionsTheme: _pageTransitionsTheme,
+                    colorScheme: _getAppColorScheme(
+                      brightness: Brightness.light,
+                      systemColorSchemes: systemColorSchemes,
+                      primaryColor: state.primaryColor,
+                    ),
+                  ),
+                  darkTheme: ThemeData(
+                    useMaterial3: true,
+                    pageTransitionsTheme: _pageTransitionsTheme,
+                    colorScheme: _getAppColorScheme(
+                      brightness: Brightness.dark,
+                      systemColorSchemes: systemColorSchemes,
+                      primaryColor: state.primaryColor,
+                    ),
+                  ),
+                  home: child,
+                );
+              },
+            );
+          },
+          child: const HomePage(),
         ),
       ),
     );

lib/clash/core.dart

@@ -237,6 +237,21 @@ class ClashCore {
     return VersionInfo.fromJson(versionInfo);
   }
 
+  setProps(Props props) {
+    final propsChar = json.encode(props).toNativeUtf8().cast<Char>();
+    clashFFI.setAndroidProps(propsChar);
+    malloc.free(propsChar);
+  }
+
+  Props getProps() {
+    final androidPropsRaw = clashFFI.getAndroidProps();
+    final androidProps = json.decode(
+      androidPropsRaw.cast<Utf8>().toDartString(),
+    );
+    clashFFI.freeCString(androidPropsRaw);
+    return Props.fromJson(androidProps);
+  }
+
   Traffic getTraffic() {
     final trafficRaw = clashFFI.getTraffic();
     final trafficMap = json.decode(trafficRaw.cast<Utf8>().toDartString());

lib/clash/generated/clash_ffi.dart

@@ -5499,6 +5499,30 @@ class ClashFFI {
   late final _setProcessMap =
       _setProcessMapPtr.asFunction<void Function(ffi.Pointer<ffi.Char>)>();
 
+  ffi.Pointer<ffi.Char> getAndroidProps() {
+    return _getAndroidProps();
+  }
+
+  late final _getAndroidPropsPtr =
+      _lookup<ffi.NativeFunction<ffi.Pointer<ffi.Char> Function()>>(
+          'getAndroidProps');
+  late final _getAndroidProps =
+      _getAndroidPropsPtr.asFunction<ffi.Pointer<ffi.Char> Function()>();
+
+  void setAndroidProps(
+    ffi.Pointer<ffi.Char> s,
+  ) {
+    return _setAndroidProps(
+      s,
+    );
+  }
+
+  late final _setAndroidPropsPtr =
+      _lookup<ffi.NativeFunction<ffi.Void Function(ffi.Pointer<ffi.Char>)>>(
+          'setAndroidProps');
+  late final _setAndroidProps =
+      _setAndroidPropsPtr.asFunction<void Function(ffi.Pointer<ffi.Char>)>();
+
   void startTUN(
     int fd,
     int port,

lib/common/constant.dart

@@ -1,8 +1,10 @@
+import 'dart:io';
 import 'dart:ui';
 
 import 'package:fl_clash/enum/enum.dart';
 import 'package:fl_clash/models/clash_config.dart';
 import 'package:flutter/material.dart';
+import 'system.dart';
 
 const appName = "FlClash";
 const coreName = "clash.meta";
@@ -15,6 +17,7 @@ const mmdbFileName = "geoip.metadb";
 const asnFileName = "ASN.mmdb";
 const geoIpFileName = "GeoIP.dat";
 const geoSiteFileName = "GeoSite.dat";
+final double kHeaderHeight = system.isDesktop ? (Platform.isMacOS ? 28 : 40) : 0;
 const GeoXMap defaultGeoXMap = {
   "mmdb":
       "https://github.com/MetaCubeX/meta-rules-dat/releases/download/latest/geoip.metadb",

lib/common/other.dart

@@ -101,9 +101,9 @@ class Other {
 
   String getTrayIconPath() {
     if (Platform.isWindows) {
-      return "assets/images/app_icon.ico";
+      return "assets/images/icon.ico";
     } else {
-      return "assets/images/launch_icon.png";
+      return "assets/images/icon_monochrome.png";
     }
   }
 

lib/common/proxy.dart

@@ -15,8 +15,8 @@ class ProxyManager {
 
   DateTime? get startTime => _proxy.startTime;
 
-  Future<bool?> startProxy({required int port, String? args}) async {
+  Future<bool?> startProxy({required int port}) async {
-    return await _proxy.startProxy(port, args);
+    return await _proxy.startProxy(port);
   }
 
   Future<bool?> stopProxy() async {

lib/common/request.dart

@@ -19,14 +19,14 @@ class Request {
     _dio.interceptors.add(
       InterceptorsWrapper(
         onRequest: (options, handler) {
-          _syncProxy();
+          _updateAdapter();
           return handler.next(options); // 继续请求
         },
       ),
     );
   }
 
-  _syncProxy() {
+  _updateAdapter() {
     final port = globalState.appController.clashConfig.mixedPort;
     final isStart = globalState.appController.appState.isStart;
     if (_port != port || isStart != _isStart) {
@@ -36,11 +36,13 @@ class Request {
         createHttpClient: () {
           final client = HttpClient();
           if (!_isStart) return client;
+          client.userAgent = globalState.appController.clashConfig.globalUa;
           client.findProxy = (url) {
             return "PROXY localhost:$_port;DIRECT";
           };
           return client;
         },
+        validateCertificate: (_, __, ___) => true,
       );
     }
   }

lib/common/window.dart

@@ -20,6 +20,7 @@ class Window {
     WindowOptions windowOptions = WindowOptions(
       size: Size(props.width, props.height),
       minimumSize: const Size(380, 600),
+      titleBarStyle: TitleBarStyle.hidden,
     );
     if (props.left != null || props.top != null) {
       await windowManager.setPosition(
@@ -28,6 +29,9 @@ class Window {
     } else {
       await windowManager.setAlignment(Alignment.center);
     }
+    // if(Platform.isWindows){
+    //   await windowManager.setTitleBarStyle(TitleBarStyle.hidden);
+    // }
     await windowManager.waitUntilReadyToShow(windowOptions, () async {
       await windowManager.setPreventClose(true);
     });

lib/fragments/about.dart

@@ -1,16 +1,29 @@
 import 'package:fl_clash/common/common.dart';
 import 'package:fl_clash/state.dart';
+import 'package:fl_clash/widgets/list.dart';
 import 'package:flutter/material.dart';
 import 'package:url_launcher/url_launcher.dart';
 
+@immutable
+class Contributor {
+  final String avatar;
+  final String name;
+  final String link;
+
+  const Contributor({
+    required this.avatar,
+    required this.name,
+    required this.link,
+  });
+}
+
 class AboutFragment extends StatelessWidget {
   const AboutFragment({super.key});
 
   _checkUpdate(BuildContext context) async {
     final commonScaffoldState = context.commonScaffoldState;
     if (commonScaffoldState?.mounted != true) return;
-    final data =
+    final data = await commonScaffoldState?.loadingRun<Map<String, dynamic>?>(
-        await commonScaffoldState?.loadingRun<Map<String, dynamic>?>(
       request.checkForUpdate,
       title: appLocalizations.checkUpdate,
     );
@@ -20,84 +33,40 @@ class AboutFragment extends StatelessWidget {
     );
   }
 
-  @override
+  List<Widget> _buildMoreSection(BuildContext context) {
-  Widget build(BuildContext context) {
+    return generateSection(
-    return ListView(
+      separated: false,
-      padding: kMaterialListPadding.copyWith(
+      title: appLocalizations.more,
-        top: 16,
+      items: [
-        bottom: 16,
+        ListItem(
-      ),
-      children: [
-        ListTile(
-          title: Column(
-            crossAxisAlignment: CrossAxisAlignment.start,
-            children: [
-              Wrap(
-                spacing: 16,
-                crossAxisAlignment: WrapCrossAlignment.center,
-                children: [
-                  Image.asset(
-                    'assets/images/launch_icon.png',
-                    width: 100,
-                    height: 100,
-                  ),
-                  Column(
-                    crossAxisAlignment: CrossAxisAlignment.start,
-                    children: [
-                      Text(
-                        appName,
-                        style: Theme.of(context).textTheme.headlineSmall,
-                      ),
-                      Text(
-                        globalState.packageInfo.version,
-                        style: Theme.of(context).textTheme.labelLarge,
-                      )
-                    ],
-                  )
-                ],
-              ),
-              const SizedBox(
-                height: 24,
-              ),
-              Text(
-                appLocalizations.desc,
-                style: Theme.of(context).textTheme.bodySmall,
-              ),
-            ],
-          ),
-        ),
-        const SizedBox(
-          height: 12,
-        ),
-        ListTile(
           title: Text(appLocalizations.checkUpdate),
           onTap: () {
             _checkUpdate(context);
           },
         ),
-        ListTile(
+        ListItem(
           title: const Text("Telegram"),
           onTap: () {
-            launchUrl(
+            globalState.openUrl(
-              Uri.parse("https://t.me/+G-veVtwBOl4wODc1"),
+              "https://t.me/+G-veVtwBOl4wODc1",
             );
           },
           trailing: const Icon(Icons.launch),
         ),
-        ListTile(
+        ListItem(
           title: Text(appLocalizations.project),
           onTap: () {
-            launchUrl(
+            globalState.openUrl(
-              Uri.parse("https://github.com/$repository"),
+              "https://github.com/$repository",
             );
           },
           trailing: const Icon(Icons.launch),
         ),
-        ListTile(
+        ListItem(
           title: Text(appLocalizations.core),
           onTap: () {
-            launchUrl(
+            globalState.openUrl(
-              Uri.parse("https://github.com/chen08209/Clash.Meta/tree/FlClash"),
+              "https://github.com/chen08209/Clash.Meta/tree/FlClash",
             );
           },
           trailing: const Icon(Icons.launch),
@@ -105,4 +74,139 @@ class AboutFragment extends StatelessWidget {
       ],
     );
   }
+
+  List<Widget> _buildContributorsSection() {
+    const contributors = [
+      Contributor(
+        avatar: "assets/images/avatars/june2.jpg",
+        name: "June2",
+        link: "https://t.me/Jibadong",
+      ),
+      Contributor(
+        avatar: "assets/images/avatars/arue.jpg",
+        name: "Arue",
+        link: "https://t.me/xrcm6868",
+      ),
+    ];
+    return generateSection(
+      separated: false,
+      title: appLocalizations.contributors,
+      items: [
+        ListItem(
+          title: SingleChildScrollView(
+            scrollDirection: Axis.horizontal,
+            child: Wrap(
+              spacing: 24,
+              children: [
+                for (final contributor in contributors)
+                  Avatar(
+                    contributor: contributor,
+                  ),
+              ],
+            ),
+          ),
+        )
+      ],
+    );
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    final items = [
+      ListTile(
+        title: Column(
+          crossAxisAlignment: CrossAxisAlignment.start,
+          children: [
+            Wrap(
+              spacing: 16,
+              crossAxisAlignment: WrapCrossAlignment.center,
+              children: [
+                Padding(
+                  padding: const EdgeInsets.all(12),
+                  child: Image.asset(
+                    'assets/images/icon.png',
+                    width: 64,
+                    height: 64,
+                  ),
+                ),
+                Column(
+                  crossAxisAlignment: CrossAxisAlignment.start,
+                  children: [
+                    Text(
+                      appName,
+                      style: Theme.of(context).textTheme.headlineSmall,
+                    ),
+                    Text(
+                      globalState.packageInfo.version,
+                      style: Theme.of(context).textTheme.labelLarge,
+                    )
+                  ],
+                )
+              ],
+            ),
+            const SizedBox(
+              height: 24,
+            ),
+            Text(
+              appLocalizations.desc,
+              style: Theme.of(context).textTheme.bodySmall,
+            ),
+          ],
+        ),
+      ),
+      const SizedBox(
+        height: 12,
+      ),
+      ..._buildContributorsSection(),
+      ..._buildMoreSection(context),
+    ];
+    return Padding(
+      padding: kMaterialListPadding.copyWith(
+        top: 16,
+        bottom: 16,
+      ),
+      child: generateListView(items),
+    );
+  }
+}
+
+class Avatar extends StatelessWidget {
+  final Contributor contributor;
+
+  const Avatar({
+    super.key,
+    required this.contributor,
+  });
+
+  @override
+  Widget build(BuildContext context) {
+    return InkWell(
+      splashColor: Colors.transparent,
+      highlightColor: Colors.transparent,
+      hoverColor: Colors.transparent,
+      child: Column(
+        children: [
+          SizedBox(
+            width: 36,
+            height: 36,
+            child: CircleAvatar(
+              foregroundImage: AssetImage(
+                contributor.avatar,
+              ),
+            ),
+          ),
+          const SizedBox(
+            height: 4,
+          ),
+          Text(
+            contributor.name,
+            style: context.textTheme.bodySmall,
+          )
+        ],
+      ),
+      onTap: () {
+        globalState.openUrl(contributor.link);
+      },
+    );
+  }
 }

lib/fragments/backup_and_recovery.dart

@@ -113,8 +113,7 @@ class _BackupAndRecoveryState extends State<BackupAndRecovery> {
                         return Center(
                           child: FadeBox(
                             key: const Key("fade_box_1"),
-                            child: snapshot.connectionState ==
+                            child: snapshot.connectionState == ConnectionState.waiting
-                                    ConnectionState.waiting
                                 ? const SizedBox(
                                     width: 12,
                                     height: 12,
@@ -159,12 +158,12 @@ class _BackupAndRecoveryState extends State<BackupAndRecovery> {
                             ListHeader(
                                 title: appLocalizations.backupAndRecovery),
                             ListItem(
-                              onTab: _backup,
+                              onTap: _backup,
                               title: Text(appLocalizations.backup),
                               subtitle: Text(appLocalizations.backupDesc),
                             ),
                             ListItem(
-                              onTab: _handleRecovery,
+                              onTap: _handleRecovery,
                               title: Text(appLocalizations.recovery),
                               subtitle: Text(appLocalizations.recoveryDesc),
                             ),
@@ -341,13 +340,13 @@ class _RecoveryOptionsDialogState extends State<RecoveryOptionsDialog> {
         child: Wrap(
           children: [
             ListItem(
-              onTab: () {
+              onTap: () {
                 _handleOnTab(RecoveryOption.onlyProfiles);
               },
               title: Text(appLocalizations.recoveryProfiles),
             ),
             ListItem(
-              onTab: () {
+              onTap: () {
                 _handleOnTab(RecoveryOption.all);
               },
               title: Text(appLocalizations.recoveryAll),

lib/fragments/config.dart

@@ -210,7 +210,7 @@ class _ConfigFragmentState extends State<ConfigFragment> {
               leading: const Icon(Icons.info_outline),
               title: Text(appLocalizations.logLevel),
               subtitle: Text(value.name),
-              onTab: () {
+              onTap: () {
                 _showLogLevelDialog(value);
               },
             );
@@ -223,7 +223,7 @@ class _ConfigFragmentState extends State<ConfigFragment> {
               leading: const Icon(Icons.computer_outlined),
               title: const Text("UA"),
               subtitle: Text(value ?? appLocalizations.defaultText),
-              onTab: () {
+              onTap: () {
                 _showUaDialog(value);
               },
             );
@@ -236,7 +236,7 @@ class _ConfigFragmentState extends State<ConfigFragment> {
               leading: const Icon(Icons.timeline),
               title: Text(appLocalizations.testUrl),
               subtitle: Text(value),
-              onTab: () {
+              onTap: () {
                 _modifyTestUrl(value);
               },
             );
@@ -246,7 +246,7 @@ class _ConfigFragmentState extends State<ConfigFragment> {
           selector: (_, clashConfig) => clashConfig.mixedPort,
           builder: (_, mixedPort, __) {
             return ListItem(
-              onTab: () {
+              onTap: () {
                 _modifyMixedPort(mixedPort);
               },
               leading: const Icon(Icons.adjust_outlined),

lib/fragments/dashboard/dashboard.dart

@@ -1,10 +1,10 @@
-import 'package:fl_clash/enum/enum.dart';
+import 'dart:math';
+
 import 'package:fl_clash/fragments/dashboard/intranet_ip.dart';
 import 'package:fl_clash/models/models.dart';
 import 'package:flutter/material.dart';
 import 'package:fl_clash/widgets/widgets.dart';
 import 'package:provider/provider.dart';
-
 import 'network_detection.dart';
 import 'outbound_mode.dart';
 import 'start_button.dart';
@@ -29,34 +29,35 @@ class _DashboardFragmentState extends State<DashboardFragment> {
         alignment: Alignment.topCenter,
         child: SingleChildScrollView(
           padding: const EdgeInsets.all(16),
-          child: Selector<AppState, ViewMode>(
+          child: Selector<AppState, double>(
-            selector: (_, appState) => appState.viewMode,
+            selector: (_, appState) => appState.viewWidth,
-            builder: (_, viewMode, ___) {
+            builder: (_, viewWidth, ___) {
-              final isDesktop = viewMode == ViewMode.desktop;
+              // final viewMode = other.getViewMode(viewWidth);
+              // final isDesktop = viewMode == ViewMode.desktop;
               return Grid(
-                crossAxisCount: 12,
+                crossAxisCount: max(4 * ((viewWidth / 320).ceil()), 8),
                 crossAxisSpacing: 16,
                 mainAxisSpacing: 16,
-                children: [
+                children: const [
                   GridItem(
-                    crossAxisCellCount: isDesktop ? 8 : 12,
+                    crossAxisCellCount: 8,
-                    child: const NetworkSpeed(),
+                    child: NetworkSpeed(),
                   ),
                   GridItem(
-                    crossAxisCellCount: isDesktop ? 4 : 6,
+                    crossAxisCellCount: 4,
-                    child: const OutboundMode(),
+                    child: OutboundMode(),
                   ),
                   GridItem(
-                    crossAxisCellCount: isDesktop ? 4 : 6,
+                    crossAxisCellCount: 4,
-                    child: const NetworkDetection(),
+                    child: NetworkDetection(),
                   ),
                   GridItem(
-                    crossAxisCellCount: isDesktop ? 4 : 6,
+                    crossAxisCellCount: 4,
-                    child: const TrafficUsage(),
+                    child: TrafficUsage(),
                   ),
                   GridItem(
-                    crossAxisCellCount: isDesktop ? 4 : 6,
+                    crossAxisCellCount: 4,
-                    child: const IntranetIP(),
+                    child: IntranetIP(),
                   ),
                 ],
               );

lib/fragments/profiles/add_profile.dart

@@ -48,19 +48,19 @@ class AddProfile extends StatelessWidget {
             leading: const Icon(Icons.qr_code),
             title: Text(appLocalizations.qrcode),
             subtitle: Text(appLocalizations.qrcodeDesc),
-            onTab: _toScan,
+            onTap: _toScan,
           ),
         ListItem(
           leading: const Icon(Icons.upload_file),
           title: Text(appLocalizations.file),
           subtitle: Text(appLocalizations.fileDesc),
-          onTab: _handleAddProfileFormFile,
+          onTap: _handleAddProfileFormFile,
         ),
         ListItem(
           leading: const Icon(Icons.cloud_download),
           title: Text(appLocalizations.url),
           subtitle: Text(appLocalizations.urlDesc),
-          onTab: _toAdd,
+          onTap: _toAdd,
         )
       ],
     );

lib/fragments/proxies/tab.dart

@@ -67,6 +67,7 @@ class _ProxiesTabFragmentState extends State<ProxiesTabFragment>
               return SizedBox(
                 width: double.infinity,
                 child: Wrap(
+                  alignment: WrapAlignment.center,
                   runSpacing: 8,
                   spacing: 8,
                   children: [

lib/l10n/arb/intl_en.arb

@@ -177,14 +177,14 @@
   "geodataLoader": "Geo Low Memory Mode",
   "geodataLoaderDesc": "Enabling will use the Geo low memory loader",
   "requests": "Requests",
-  "requestsDesc": "View recently requested data",
+  "requestsDesc": "View recently request records",
   "findProcessMode": "Find process",
   "findProcessModeDesc": "There is a risk of flashback after opening",
   "init": "Init",
   "infiniteTime": "Long term effective",
   "expirationTime": "Expiration time",
   "connections": "Connections",
-  "connectionsDesc": "View current connection",
+  "connectionsDesc": "View current connections data",
   "nullRequestsDesc": "No requests",
   "nullConnectionsDesc": "No connections",
   "intranetIP": "Intranet IP",
@@ -211,5 +211,8 @@
   "sort": "Sort",
   "columns": "Columns",
   "proxiesSetting": "Proxies setting",
-  "proxyGroup": "Proxy group"
+  "proxyGroup": "Proxy group",
+  "go": "Go",
+  "externalLink": "External link",
+  "contributors": "Contributors"
 }

lib/l10n/arb/intl_zh_CN.arb

@@ -71,7 +71,7 @@
   "qrcode": "二维码",
   "qrcodeDesc": "扫描二维码获取配置文件",
   "url": "URL",
-  "urlDesc": "直接上传配置文件",
+  "urlDesc": "通过URL获取配置文件",
   "file": "文件",
   "fileDesc": "直接上传配置文件",
   "name": "名称",
@@ -177,14 +177,14 @@
   "geodataLoader": "Geo低内存模式",
   "geodataLoaderDesc": "开启将使用Geo低内存加载器",
   "requests": "请求",
-  "requestsDesc": "查看最近请求数据",
+  "requestsDesc": "查看最近请求记录",
   "findProcessMode": "查找进程",
   "findProcessModeDesc": "开启后存在闪退风险",
   "init": "初始化",
   "infiniteTime": "长期有效",
   "expirationTime": "到期时间",
   "connections": "连接",
-  "connectionsDesc": "查看当前连接",
+  "connectionsDesc": "查看当前连接数据",
   "nullRequestsDesc": "暂无请求",
   "nullConnectionsDesc": "暂无连接",
   "intranetIP": "内网 IP",
@@ -211,5 +211,8 @@
   "sort": "排序",
   "columns": "列数",
   "proxiesSetting": "代理设置",
-  "proxyGroup": "代理组"
+  "proxyGroup": "代理组",
+  "go": "前往",
+  "externalLink": "外部链接",
+  "contributors": "贡献者"
 }

lib/l10n/intl/messages_en.dart

@@ -94,9 +94,10 @@ class MessageLookup extends MessageLookupByLibrary {
             "Opening it will lose part of its application ability and gain the support of full amount of Clash."),
         "confirm": MessageLookupByLibrary.simpleMessage("Confirm"),
         "connections": MessageLookupByLibrary.simpleMessage("Connections"),
-        "connectionsDesc":
+        "connectionsDesc": MessageLookupByLibrary.simpleMessage(
-            MessageLookupByLibrary.simpleMessage("View current connection"),
+            "View current connections data"),
         "connectivity": MessageLookupByLibrary.simpleMessage("Connectivity："),
+        "contributors": MessageLookupByLibrary.simpleMessage("Contributors"),
         "copy": MessageLookupByLibrary.simpleMessage("Copy"),
         "core": MessageLookupByLibrary.simpleMessage("Core"),
         "coreInfo": MessageLookupByLibrary.simpleMessage("Core info"),
@@ -135,6 +136,7 @@ class MessageLookup extends MessageLookupByLibrary {
             MessageLookupByLibrary.simpleMessage("ExternalController"),
         "externalControllerDesc": MessageLookupByLibrary.simpleMessage(
             "Once enabled, the Clash kernel can be controlled on port 9090"),
+        "externalLink": MessageLookupByLibrary.simpleMessage("External link"),
         "externalResources":
             MessageLookupByLibrary.simpleMessage("External resources"),
         "file": MessageLookupByLibrary.simpleMessage("File"),
@@ -153,6 +155,7 @@ class MessageLookup extends MessageLookupByLibrary {
         "geodataLoaderDesc": MessageLookupByLibrary.simpleMessage(
             "Enabling will use the Geo low memory loader"),
         "global": MessageLookupByLibrary.simpleMessage("Global"),
+        "go": MessageLookupByLibrary.simpleMessage("Go"),
         "goDownload": MessageLookupByLibrary.simpleMessage("Go to download"),
         "hours": MessageLookupByLibrary.simpleMessage("Hours"),
         "importFromURL":
@@ -257,7 +260,7 @@ class MessageLookup extends MessageLookupByLibrary {
             MessageLookupByLibrary.simpleMessage("Recovery success"),
         "requests": MessageLookupByLibrary.simpleMessage("Requests"),
         "requestsDesc": MessageLookupByLibrary.simpleMessage(
-            "View recently requested data"),
+            "View recently request records"),
         "resources": MessageLookupByLibrary.simpleMessage("Resources"),
         "resourcesDesc": MessageLookupByLibrary.simpleMessage(
             "External resource related info"),

lib/l10n/intl/messages_zh_CN.dart

@@ -77,8 +77,9 @@ class MessageLookup extends MessageLookupByLibrary {
             MessageLookupByLibrary.simpleMessage("开启将失去部分应用能力，获得全量的Clash的支持"),
         "confirm": MessageLookupByLibrary.simpleMessage("确定"),
         "connections": MessageLookupByLibrary.simpleMessage("连接"),
-        "connectionsDesc": MessageLookupByLibrary.simpleMessage("查看当前连接"),
+        "connectionsDesc": MessageLookupByLibrary.simpleMessage("查看当前连接数据"),
         "connectivity": MessageLookupByLibrary.simpleMessage("连通性："),
+        "contributors": MessageLookupByLibrary.simpleMessage("贡献者"),
         "copy": MessageLookupByLibrary.simpleMessage("复制"),
         "core": MessageLookupByLibrary.simpleMessage("内核"),
         "coreInfo": MessageLookupByLibrary.simpleMessage("内核信息"),
@@ -111,6 +112,7 @@ class MessageLookup extends MessageLookupByLibrary {
         "externalController": MessageLookupByLibrary.simpleMessage("外部控制器"),
         "externalControllerDesc":
             MessageLookupByLibrary.simpleMessage("开启后将可以通过9090端口控制Clash内核"),
+        "externalLink": MessageLookupByLibrary.simpleMessage("外部链接"),
         "externalResources": MessageLookupByLibrary.simpleMessage("外部资源"),
         "file": MessageLookupByLibrary.simpleMessage("文件"),
         "fileDesc": MessageLookupByLibrary.simpleMessage("直接上传配置文件"),
@@ -125,6 +127,7 @@ class MessageLookup extends MessageLookupByLibrary {
         "geodataLoaderDesc":
             MessageLookupByLibrary.simpleMessage("开启将使用Geo低内存加载器"),
         "global": MessageLookupByLibrary.simpleMessage("全局"),
+        "go": MessageLookupByLibrary.simpleMessage("前往"),
         "goDownload": MessageLookupByLibrary.simpleMessage("前往下载"),
         "hours": MessageLookupByLibrary.simpleMessage("小时"),
         "importFromURL": MessageLookupByLibrary.simpleMessage("从URL导入"),
@@ -206,7 +209,7 @@ class MessageLookup extends MessageLookupByLibrary {
         "recoveryProfiles": MessageLookupByLibrary.simpleMessage("仅恢复配置文件"),
         "recoverySuccess": MessageLookupByLibrary.simpleMessage("恢复成功"),
         "requests": MessageLookupByLibrary.simpleMessage("请求"),
-        "requestsDesc": MessageLookupByLibrary.simpleMessage("查看最近请求数据"),
+        "requestsDesc": MessageLookupByLibrary.simpleMessage("查看最近请求记录"),
         "resources": MessageLookupByLibrary.simpleMessage("资源"),
         "resourcesDesc": MessageLookupByLibrary.simpleMessage("外部资源相关信息"),
         "rule": MessageLookupByLibrary.simpleMessage("规则"),
@@ -255,7 +258,7 @@ class MessageLookup extends MessageLookupByLibrary {
         "update": MessageLookupByLibrary.simpleMessage("更新"),
         "upload": MessageLookupByLibrary.simpleMessage("上传"),
         "url": MessageLookupByLibrary.simpleMessage("URL"),
-        "urlDesc": MessageLookupByLibrary.simpleMessage("直接上传配置文件"),
+        "urlDesc": MessageLookupByLibrary.simpleMessage("通过URL获取配置文件"),
         "view": MessageLookupByLibrary.simpleMessage("查看"),
         "webDAVConfiguration": MessageLookupByLibrary.simpleMessage("WebDAV配置"),
         "whitelistMode": MessageLookupByLibrary.simpleMessage("白名单模式"),

lib/l10n/l10n.dart

@@ -1830,10 +1830,10 @@ class AppLocalizations {
     );
   }
 
-  /// `View recently requested data`
+  /// `View recently request records`
   String get requestsDesc {
     return Intl.message(
-      'View recently requested data',
+      'View recently request records',
       name: 'requestsDesc',
       desc: '',
       args: [],
@@ -1900,10 +1900,10 @@ class AppLocalizations {
     );
   }
 
-  /// `View current connection`
+  /// `View current connections data`
   String get connectionsDesc {
     return Intl.message(
-      'View current connection',
+      'View current connections data',
       name: 'connectionsDesc',
       desc: '',
       args: [],
@@ -2179,6 +2179,36 @@ class AppLocalizations {
       args: [],
     );
   }
+
+  /// `Go`
+  String get go {
+    return Intl.message(
+      'Go',
+      name: 'go',
+      desc: '',
+      args: [],
+    );
+  }
+
+  /// `External link`
+  String get externalLink {
+    return Intl.message(
+      'External link',
+      name: 'externalLink',
+      desc: '',
+      args: [],
+    );
+  }
+
+  /// `Contributors`
+  String get contributors {
+    return Intl.message(
+      'Contributors',
+      name: 'contributors',
+      desc: '',
+      args: [],
+    );
+  }
 }
 
 class AppLocalizationDelegate extends LocalizationsDelegate<AppLocalizations> {

lib/models/config.dart

@@ -29,8 +29,8 @@ class AccessControl with _$AccessControl {
 class Props with _$Props {
   const factory Props({
     AccessControl? accessControl,
-    bool? allowBypass,
+    required bool allowBypass,
-    bool? systemProxy,
+    required bool systemProxy,
   }) = _Props;
 
   factory Props.fromJson(Map<String, Object?> json) => _$PropsFromJson(json);
@@ -92,7 +92,7 @@ class Config extends ChangeNotifier {
         _isMinimizeOnExit = true,
         _isAccessControl = false,
         _autoCheckUpdate = true,
-        _systemProxy = true,
+        _systemProxy = false,
         _testUrl = defaultTestUrl,
         _accessControl = const AccessControl(),
         _isAnimateToPage = true,
@@ -393,7 +393,7 @@ class Config extends ChangeNotifier {
     }
   }
 
-  @JsonKey(defaultValue: true)
+  @JsonKey(defaultValue: false)
   bool get systemProxy {
     return _systemProxy;
   }
@@ -498,7 +498,6 @@ class Config extends ChangeNotifier {
       _accessControl = config._accessControl;
       _isAnimateToPage = config._isAnimateToPage;
       _autoCheckUpdate = config._autoCheckUpdate;
-      _dav = config._dav;
       _testUrl = config._testUrl;
       _isExclude = config._isExclude;
       _windowProps = config._windowProps;

lib/models/generated/config.freezed.dart

@@ -247,8 +247,8 @@ Props _$PropsFromJson(Map<String, dynamic> json) {
 /// @nodoc
 mixin _$Props {
   AccessControl? get accessControl => throw _privateConstructorUsedError;
-  bool? get allowBypass => throw _privateConstructorUsedError;
+  bool get allowBypass => throw _privateConstructorUsedError;
-  bool? get systemProxy => throw _privateConstructorUsedError;
+  bool get systemProxy => throw _privateConstructorUsedError;
 
   Map<String, dynamic> toJson() => throw _privateConstructorUsedError;
   @JsonKey(ignore: true)
@@ -260,8 +260,7 @@ abstract class $PropsCopyWith<$Res> {
   factory $PropsCopyWith(Props value, $Res Function(Props) then) =
       _$PropsCopyWithImpl<$Res, Props>;
   @useResult
-  $Res call(
+  $Res call({AccessControl? accessControl, bool allowBypass, bool systemProxy});
-      {AccessControl? accessControl, bool? allowBypass, bool? systemProxy});
 
   $AccessControlCopyWith<$Res>? get accessControl;
 }
@@ -280,22 +279,22 @@ class _$PropsCopyWithImpl<$Res, $Val extends Props>
   @override
   $Res call({
     Object? accessControl = freezed,
-    Object? allowBypass = freezed,
+    Object? allowBypass = null,
-    Object? systemProxy = freezed,
+    Object? systemProxy = null,
   }) {
     return _then(_value.copyWith(
       accessControl: freezed == accessControl
           ? _value.accessControl
           : accessControl // ignore: cast_nullable_to_non_nullable
               as AccessControl?,
-      allowBypass: freezed == allowBypass
+      allowBypass: null == allowBypass
           ? _value.allowBypass
           : allowBypass // ignore: cast_nullable_to_non_nullable
-              as bool?,
+              as bool,
-      systemProxy: freezed == systemProxy
+      systemProxy: null == systemProxy
           ? _value.systemProxy
           : systemProxy // ignore: cast_nullable_to_non_nullable
-              as bool?,
+              as bool,
     ) as $Val);
   }
 
@@ -319,8 +318,7 @@ abstract class _$$PropsImplCopyWith<$Res> implements $PropsCopyWith<$Res> {
       __$$PropsImplCopyWithImpl<$Res>;
   @override
   @useResult
-  $Res call(
+  $Res call({AccessControl? accessControl, bool allowBypass, bool systemProxy});
-      {AccessControl? accessControl, bool? allowBypass, bool? systemProxy});
 
   @override
   $AccessControlCopyWith<$Res>? get accessControl;
@@ -338,22 +336,22 @@ class __$$PropsImplCopyWithImpl<$Res>
   @override
   $Res call({
     Object? accessControl = freezed,
-    Object? allowBypass = freezed,
+    Object? allowBypass = null,
-    Object? systemProxy = freezed,
+    Object? systemProxy = null,
   }) {
     return _then(_$PropsImpl(
       accessControl: freezed == accessControl
           ? _value.accessControl
           : accessControl // ignore: cast_nullable_to_non_nullable
               as AccessControl?,
-      allowBypass: freezed == allowBypass
+      allowBypass: null == allowBypass
           ? _value.allowBypass
           : allowBypass // ignore: cast_nullable_to_non_nullable
-              as bool?,
+              as bool,
-      systemProxy: freezed == systemProxy
+      systemProxy: null == systemProxy
           ? _value.systemProxy
           : systemProxy // ignore: cast_nullable_to_non_nullable
-              as bool?,
+              as bool,
     ));
   }
 }
@@ -361,7 +359,10 @@ class __$$PropsImplCopyWithImpl<$Res>
 /// @nodoc
 @JsonSerializable()
 class _$PropsImpl implements _Props {
-  const _$PropsImpl({this.accessControl, this.allowBypass, this.systemProxy});
+  const _$PropsImpl(
+      {this.accessControl,
+      required this.allowBypass,
+      required this.systemProxy});
 
   factory _$PropsImpl.fromJson(Map<String, dynamic> json) =>
       _$$PropsImplFromJson(json);
@@ -369,9 +370,9 @@ class _$PropsImpl implements _Props {
   @override
   final AccessControl? accessControl;
   @override
-  final bool? allowBypass;
+  final bool allowBypass;
   @override
-  final bool? systemProxy;
+  final bool systemProxy;
 
   @override
   String toString() {
@@ -413,17 +414,17 @@ class _$PropsImpl implements _Props {
 abstract class _Props implements Props {
   const factory _Props(
       {final AccessControl? accessControl,
-      final bool? allowBypass,
+      required final bool allowBypass,
-      final bool? systemProxy}) = _$PropsImpl;
+      required final bool systemProxy}) = _$PropsImpl;
 
   factory _Props.fromJson(Map<String, dynamic> json) = _$PropsImpl.fromJson;
 
   @override
   AccessControl? get accessControl;
   @override
-  bool? get allowBypass;
+  bool get allowBypass;
   @override
-  bool? get systemProxy;
+  bool get systemProxy;
   @override
   @JsonKey(ignore: true)
   _$$PropsImplCopyWith<_$PropsImpl> get copyWith =>

lib/models/generated/config.g.dart

@@ -132,8 +132,8 @@ _$PropsImpl _$$PropsImplFromJson(Map<String, dynamic> json) => _$PropsImpl(
           ? null
           : AccessControl.fromJson(
               json['accessControl'] as Map<String, dynamic>),
-      allowBypass: json['allowBypass'] as bool?,
+      allowBypass: json['allowBypass'] as bool,
-      systemProxy: json['systemProxy'] as bool?,
+      systemProxy: json['systemProxy'] as bool,
     );
 
 Map<String, dynamic> _$$PropsImplToJson(_$PropsImpl instance) =>

lib/pages/home.dart

@@ -13,6 +13,20 @@ typedef OnSelected = void Function(int index);
 class HomePage extends StatelessWidget {
   const HomePage({super.key});
 
+  _navigationBarContainer({
+    required BuildContext context,
+    required Widget child,
+  }) {
+    // if (!system.isDesktop) return child;
+    return Container(
+      padding: const EdgeInsets.all(16).copyWith(
+        right: 0,
+      ),
+      color: context.colorScheme.surface,
+      child: child,
+    );
+  }
+
   _getNavigationBar({
     required BuildContext context,
     required ViewMode viewMode,
@@ -34,9 +48,31 @@ class HomePage extends StatelessWidget {
       );
     }
     final extended = viewMode == ViewMode.desktop;
+    return _navigationBarContainer(
+      context: context,
+      child: NavigationRail(
+        groupAlignment: -0.8,
+        destinations: navigationItems
+            .map(
+              (e) => NavigationRailDestination(
+                icon: e.icon,
+                label: Text(
+                  Intl.message(e.label),
+                ),
+              ),
+            )
+            .toList(),
+        onDestinationSelected: globalState.appController.toPage,
+        extended: extended,
+        minExtendedWidth: 172,
+        selectedIndex: currentIndex,
+        labelType: extended
+            ? NavigationRailLabelType.none
+            : NavigationRailLabelType.selected,
+      ),
+    );
     return NavigationRail(
-      backgroundColor: context.colorScheme.surfaceContainer,
+      groupAlignment: -0.95,
-      groupAlignment: -0.8,
       destinations: navigationItems
           .map(
             (e) => NavigationRailDestination(
@@ -59,72 +95,55 @@ class HomePage extends StatelessWidget {
 
   @override
   Widget build(BuildContext context) {
-    return PopContainer(
+    return LayoutBuilder(
-      child: LayoutBuilder(
+      builder: (_, container) {
-        builder: (_, container) {
+        final appController = globalState.appController;
-          final appController = globalState.appController;
+        final maxWidth = container.maxWidth;
-          final maxWidth = container.maxWidth;
+        if (appController.appState.viewWidth != maxWidth) {
-          if (appController.appState.viewWidth != maxWidth) {
+          globalState.appController.updateViewWidth(maxWidth);
-            globalState.appController.updateViewWidth(maxWidth);
+        }
-          }
+        return Selector2<AppState, Config, HomeSelectorState>(
-          return Selector2<AppState, Config, HomeSelectorState>(
+          selector: (_, appState, config) {
-            selector: (_, appState, config) {
+            return HomeSelectorState(
-              return HomeSelectorState(
+              currentLabel: appState.currentLabel,
-                currentLabel: appState.currentLabel,
+              navigationItems: appState.currentNavigationItems,
-                navigationItems: appState.currentNavigationItems,
+              viewMode: other.getViewMode(maxWidth),
-                viewMode: other.getViewMode(maxWidth),
+              locale: config.locale,
-                locale: config.locale,
+            );
-              );
+          },
-            },
+          builder: (_, state, child) {
-            builder: (_, state, child) {
+            final viewMode = state.viewMode;
-              final viewMode = state.viewMode;
+            final navigationItems = state.navigationItems;
-              final navigationItems = state.navigationItems;
+            final currentLabel = state.currentLabel;
-              final currentLabel = state.currentLabel;
+            final index = navigationItems.lastIndexWhere(
-              final index = navigationItems.lastIndexWhere(
+              (element) => element.label == currentLabel,
-                (element) => element.label == currentLabel,
+            );
-              );
+            final currentIndex = index == -1 ? 0 : index;
-              final currentIndex = index == -1 ? 0 : index;
+            final navigationBar = _getNavigationBar(
-              final navigationBar = _getNavigationBar(
+              context: context,
-                context: context,
+              viewMode: viewMode,
-                viewMode: viewMode,
+              navigationItems: navigationItems,
-                navigationItems: navigationItems,
+              currentIndex: currentIndex,
-                currentIndex: currentIndex,
+            );
-              );
+            final bottomNavigationBar =
-              final bottomNavigationBar =
+                viewMode == ViewMode.mobile ? navigationBar : null;
-                  viewMode == ViewMode.mobile ? navigationBar : null;
+            final sideNavigationBar =
-              if (viewMode != ViewMode.mobile) {
+                viewMode != ViewMode.mobile ? navigationBar : null;
-                return Row(
+            return CommonScaffold(
-                  children: [
+              key: globalState.homeScaffoldKey,
-                    navigationBar,
+              title: Intl.message(
-                    Expanded(
+                currentLabel,
-                      flex: 1,
+              ),
-                      child: CommonScaffold(
+              sideNavigationBar: sideNavigationBar,
-                        key: globalState.homeScaffoldKey,
+              body: child!,
-                        title: Intl.message(
+              bottomNavigationBar: bottomNavigationBar,
-                          currentLabel,
+            );
-                        ),
+          },
-                        body: child!,
+          child: const HomeBody(
-                        bottomNavigationBar: bottomNavigationBar,
+            key: Key("home_boy"),
-                      ),
+          ),
-                    )
+        );
-                  ],
+      },
-                );
-              }
-              return CommonScaffold(
-                key: globalState.homeScaffoldKey,
-                title: Intl.message(
-                  currentLabel,
-                ),
-                body: child!,
-                bottomNavigationBar: bottomNavigationBar,
-              );
-            },
-            child: const HomeBody(
-              key: Key("home_boy"),
-            ),
-          );
-        },
-      ),
     );
   }
 }

lib/plugins/proxy.dart

@@ -37,7 +37,7 @@ class Proxy extends ProxyPlatform {
     return _instance!;
   }
 
-  Future<bool?> _initService() async {
+  Future<bool?> initService() async {
     return await methodChannel.invokeMethod<bool>("initService");
   }
 
@@ -46,12 +46,11 @@ class Proxy extends ProxyPlatform {
   }
 
   @override
-  Future<bool?> startProxy(port, args) async {
+  Future<bool?> startProxy(port) async {
-    if (!globalState.isVpnService) {
+    return await methodChannel.invokeMethod<bool>("startProxy", {
-      return await _initService();
+      'port': port,
-    }
+      'args': json.encode(clashCore.getProps()),
-    return await methodChannel
+    });
-        .invokeMethod<bool>("startProxy", {'port': port, 'args': args});
   }
 
   @override

lib/state.dart

@@ -1,14 +1,13 @@
 import 'dart:async';
-import 'dart:convert';
 import 'dart:io';
 
 import 'package:animations/animations.dart';
 import 'package:fl_clash/clash/clash.dart';
-import 'package:fl_clash/enum/enum.dart';
 import 'package:fl_clash/plugins/proxy.dart';
 import 'package:fl_clash/widgets/scaffold.dart';
 import 'package:flutter/material.dart';
 import 'package:package_info_plus/package_info_plus.dart';
+import 'package:url_launcher/url_launcher.dart';
 
 import 'controller.dart';
 
@@ -72,18 +71,20 @@ class GlobalState {
     required Config config,
     required ClashConfig clashConfig,
   }) async {
-    final args = config.isAccessControl
+    if (!globalState.isVpnService && Platform.isAndroid) {
-        ? json.encode(
+      clashCore.setProps(
-            Props(
+        Props(
-              accessControl: config.accessControl,
+          accessControl: config.isAccessControl ? config.accessControl : null,
-              allowBypass: config.allowBypass,
+          allowBypass: config.allowBypass,
-            ),
+          systemProxy: config.systemProxy,
-          )
+        ),
-        : null;
+      );
-    await proxyManager.startProxy(
+      await proxy?.initService();
-      port: clashConfig.mixedPort,
+    } else {
-      args: args,
+      await proxyManager.startProxy(
-    );
+        port: clashConfig.mixedPort,
+      );
+    }
     startListenUpdate();
     if (Platform.isAndroid) {
       return;
@@ -123,6 +124,15 @@ class GlobalState {
   }) async {
     appState.isInit = clashCore.isInit;
     if (!appState.isInit) {
+      if (Platform.isAndroid) {
+        clashCore.setProps(
+          Props(
+            accessControl: config.isAccessControl ? config.accessControl : null,
+            allowBypass: config.allowBypass,
+            systemProxy: config.systemProxy,
+          ),
+        );
+      }
       appState.isInit = await clashService.init(
         config: config,
         clashConfig: clashConfig,
@@ -252,6 +262,17 @@ class GlobalState {
       return null;
     }
   }
+
+  openUrl(String url) {
+    showMessage(
+      message: TextSpan(text: url),
+      title: appLocalizations.externalLink,
+      confirmText: appLocalizations.go,
+      onTab: () {
+        launchUrl(Uri.parse(url));
+      },
+    );
+  }
 }
 
 final globalState = GlobalState();

lib/widgets/android_container.dart

@@ -19,8 +19,7 @@ class AndroidContainer extends StatefulWidget {
 
 class _AndroidContainerState extends State<AndroidContainer>
     with WidgetsBindingObserver {
-
+  Widget _excludeContainer(Widget child) {
-  _excludeContainer(Widget child) {
     return Selector<Config, bool>(
       selector: (_, config) => config.isExclude,
       builder: (_, isExclude, child) {
@@ -31,6 +30,20 @@ class _AndroidContainerState extends State<AndroidContainer>
     );
   }
 
+  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
   void initState() {
     super.initState();
@@ -48,7 +61,9 @@ class _AndroidContainerState extends State<AndroidContainer>
 
   @override
   Widget build(BuildContext context) {
-    return _excludeContainer(widget.child);
+    return _systemUiOverlayContainer(
+      _excludeContainer(widget.child),
+    );
   }
 
   @override

lib/widgets/clash_message_container.dart

@@ -3,7 +3,6 @@ import 'package:fl_clash/models/models.dart';
 import 'package:fl_clash/plugins/proxy.dart';
 import 'package:fl_clash/state.dart';
 import 'package:flutter/material.dart';
-import 'package:fl_clash/plugins/app.dart';
 
 class ClashMessageContainer extends StatefulWidget {
   final Widget child;

lib/widgets/list.dart

@@ -78,7 +78,7 @@ class ListItem<T> extends StatelessWidget {
   final Widget? trailing;
   final Delegate delegate;
   final double? horizontalTitleGap;
-  final void Function()? onTab;
+  final void Function()? onTap;
 
   const ListItem({
     super.key,
@@ -89,7 +89,7 @@ class ListItem<T> extends StatelessWidget {
     this.trailing,
     this.horizontalTitleGap,
     this.prue,
-    this.onTab,
+    this.onTap,
     this.tileTitleAlignment = ListTileTitleAlignment.center,
   }) : delegate = const Delegate();
 
@@ -104,7 +104,7 @@ class ListItem<T> extends StatelessWidget {
     this.horizontalTitleGap,
     this.prue,
     this.tileTitleAlignment = ListTileTitleAlignment.center,
-  }) : onTab = null;
+  }) : onTap = null;
 
   const ListItem.next({
     super.key,
@@ -117,7 +117,7 @@ class ListItem<T> extends StatelessWidget {
     this.horizontalTitleGap,
     this.prue,
     this.tileTitleAlignment = ListTileTitleAlignment.center,
-  }) : onTab = null;
+  }) : onTap = null;
 
   const ListItem.checkbox({
     super.key,
@@ -130,7 +130,7 @@ class ListItem<T> extends StatelessWidget {
     this.prue,
     this.tileTitleAlignment = ListTileTitleAlignment.center,
   })  : trailing = null,
-        onTab = null;
+        onTap = null;
 
   const ListItem.switchItem({
     super.key,
@@ -143,7 +143,7 @@ class ListItem<T> extends StatelessWidget {
     this.prue,
     this.tileTitleAlignment = ListTileTitleAlignment.center,
   })  : trailing = null,
-        onTab = null;
+        onTap = null;
 
   const ListItem.radio({
     super.key,
@@ -156,10 +156,10 @@ class ListItem<T> extends StatelessWidget {
     this.prue,
     this.tileTitleAlignment = ListTileTitleAlignment.center,
   })  : leading = null,
-        onTab = null;
+        onTap = null;
 
   _buildListTile({
-    void Function()? onTab,
+    void Function()? onTap,
     Widget? trailing,
     Widget? leading,
   }) {
@@ -188,7 +188,7 @@ class ListItem<T> extends StatelessWidget {
       }
       return InkWell(
         splashFactory: NoSplash.splashFactory,
-        onTap: onTab,
+        onTap: onTap,
         child: Container(
           padding: padding,
           child: Row(
@@ -203,7 +203,7 @@ class ListItem<T> extends StatelessWidget {
       title: title,
       subtitle: subtitle,
       titleAlignment: tileTitleAlignment,
-      onTap: onTab,
+      onTap: onTap,
       trailing: trailing ?? this.trailing,
       contentPadding: padding,
     );
@@ -230,7 +230,7 @@ class ListItem<T> extends StatelessWidget {
             action();
           }
 
-          return _buildListTile(onTab: openAction);
+          return _buildListTile(onTap: openAction);
         },
         openBuilder: (_, action) {
           return CommonScaffold.open(
@@ -245,7 +245,7 @@ class ListItem<T> extends StatelessWidget {
     if (delegate is NextDelegate) {
       final nextDelegate = delegate as NextDelegate;
       return _buildListTile(
-        onTab: () {
+        onTap: () {
           final isMobile =
               globalState.appController.appState.viewMode == ViewMode.mobile;
           if (!isMobile) {
@@ -272,7 +272,7 @@ class ListItem<T> extends StatelessWidget {
     if (delegate is CheckboxDelegate) {
       final checkboxDelegate = delegate as CheckboxDelegate;
       return _buildListTile(
-        onTab: () {
+        onTap: () {
           if (checkboxDelegate.onChanged != null) {
             checkboxDelegate.onChanged!(!checkboxDelegate.value);
           }
@@ -286,7 +286,7 @@ class ListItem<T> extends StatelessWidget {
     if (delegate is SwitchDelegate) {
       final switchDelegate = delegate as SwitchDelegate;
       return _buildListTile(
-        onTab: () {
+        onTap: () {
           if (switchDelegate.onChanged != null) {
             switchDelegate.onChanged!(!switchDelegate.value);
           }
@@ -300,7 +300,7 @@ class ListItem<T> extends StatelessWidget {
     if (delegate is RadioDelegate) {
       final radioDelegate = delegate as RadioDelegate<T>;
       return _buildListTile(
-        onTab: () {
+        onTap: () {
           if (radioDelegate.onChanged != null) {
             radioDelegate.onChanged!(radioDelegate.value);
           }
@@ -319,7 +319,7 @@ class ListItem<T> extends StatelessWidget {
     }
 
     return _buildListTile(
-      onTab: onTab,
+      onTap: onTap,
     );
   }
 }

lib/widgets/scaffold.dart

@@ -1,5 +1,4 @@
-import 'package:fl_clash/common/app_localizations.dart';
+import 'package:fl_clash/common/common.dart';
-import 'package:fl_clash/common/system.dart';
 import 'package:fl_clash/state.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
@@ -7,6 +6,7 @@ import 'package:flutter/services.dart';
 class CommonScaffold extends StatefulWidget {
   final Widget body;
   final Widget? bottomNavigationBar;
+  final Widget? sideNavigationBar;
   final String title;
   final Widget? leading;
   final List<Widget>? actions;
@@ -15,6 +15,7 @@ class CommonScaffold extends StatefulWidget {
   const CommonScaffold({
     super.key,
     required this.body,
+    this.sideNavigationBar,
     this.bottomNavigationBar,
     this.leading,
     required this.title,
@@ -92,85 +93,66 @@ class CommonScaffoldState extends State<CommonScaffold> {
     }
   }
 
-  _platformContainer({required Widget child}) {
+  Widget? get _sideNavigationBar => widget.sideNavigationBar;
-    if (system.isDesktop) {
-      return 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 _platformContainer(
+    final scaffold = Scaffold(
-      child: Scaffold(
+      resizeToAvoidBottomInset: true,
-        resizeToAvoidBottomInset: true,
+      appBar: PreferredSize(
-        appBar: PreferredSize(
+        preferredSize: const Size.fromHeight(kToolbarHeight),
-          preferredSize: const Size.fromHeight(kToolbarHeight),
+        child: Stack(
-          child: Stack(
+          alignment: Alignment.bottomCenter,
-            alignment: Alignment.bottomCenter,
+          children: [
+            ValueListenableBuilder<List<Widget>>(
+              valueListenable: _actions,
+              builder: (_, actions, __) {
+                final realActions =
+                    actions.isNotEmpty ? actions : widget.actions;
+                return AppBar(
+                  centerTitle: false,
+                  automaticallyImplyLeading: widget.automaticallyImplyLeading,
+                  leading: widget.leading,
+                  title: Text(widget.title),
+                  actions: [
+                    ...?realActions,
+                    const SizedBox(
+                      width: 8,
+                    )
+                  ],
+                );
+              },
+            ),
+            ValueListenableBuilder(
+              valueListenable: _loading,
+              builder: (_, value, __) {
+                return value == true
+                    ? const LinearProgressIndicator()
+                    : Container();
+              },
+            ),
+          ],
+        ),
+      ),
+      body: widget.body,
+      bottomNavigationBar: widget.bottomNavigationBar,
+    );
+    return _sideNavigationBar != null
+        ? Row(
+            mainAxisSize: MainAxisSize.min,
             children: [
-              ValueListenableBuilder<List<Widget>>(
+              _sideNavigationBar!,
-                valueListenable: _actions,
+              Expanded(
-                builder: (_, actions, __) {
+                flex: 1,
-                  final realActions =
+                child: Material(
-                      actions.isNotEmpty ? actions : widget.actions;
+                  child: Container(
-                  return AppBar(
+                    padding: const EdgeInsets.symmetric(vertical: 8),
-                    automaticallyImplyLeading: widget.automaticallyImplyLeading,
+                    child: scaffold,
-                    leading: widget.leading,
+                  ),
-                    title: Text(widget.title),
+                ),
-                    actions: [
-                      ...?realActions,
-                      const SizedBox(
-                        width: 8,
-                      )
-                    ],
-                  );
-                },
-              ),
-              ValueListenableBuilder(
-                valueListenable: _loading,
-                builder: (_, value, __) {
-                  return value == true
-                      ? const LinearProgressIndicator()
-                      : Container();
-                },
               ),
             ],
-          ),
+          )
-        ),
+        : scaffold;
-        body: widget.body,
-        bottomNavigationBar: widget.bottomNavigationBar,
-      ),
-    );
-  }
-}
-
-class AppIcon extends StatelessWidget {
-  const AppIcon({super.key});
-
-  @override
-  Widget build(BuildContext context) {
-    return Container(
-      margin: const EdgeInsets.symmetric(
-        horizontal: 16,
-        vertical: 16,
-      ),
-      width: 30,
-      height: 30,
-      child: const CircleAvatar(
-        foregroundImage: AssetImage("assets/images/launch_icon.png"),
-        backgroundColor: Colors.transparent,
-      ),
-    );
   }
 }

lib/widgets/side_sheet.dart

@@ -85,10 +85,7 @@ class _SideSheetState extends State<SideSheet> {
         );
 
     final BoxConstraints constraints = widget.constraints ??
-        const BoxConstraints(
+        const BoxConstraints(maxWidth: 320, minWidth: 320);
-          maxWidth: 320,
-          minWidth: 320
-        );
 
     final Clip clipBehavior = widget.clipBehavior ?? Clip.none;
 
@@ -594,31 +591,17 @@ Future<T?> showModalSideSheet<T>({
     builder: (context) {
       return Column(
         children: [
-          Flexible(
+          AppBar(
-            flex: 0,
+            automaticallyImplyLeading: false,
-            child: Row(
+            title: Text(title),
-              children: [
+            centerTitle: false,
-                const SizedBox(
+            actions: const [
-                  height: kToolbarHeight,
+              SizedBox(
-                  width: kToolbarHeight,
+                height: kToolbarHeight,
-                  child: BackButton(),
+                width: kToolbarHeight,
-                ),
+                child: CloseButton(),
-                const SizedBox(
+              )
-                  width: 8,
+            ],
-                ),
-                Expanded(
-                  child: Text(
-                    title,
-                    style: Theme.of(context).textTheme.titleMedium,
-                  ),
-                ),
-                const SizedBox(
-                  height: kToolbarHeight,
-                  width: kToolbarHeight,
-                  child: CloseButton(),
-                ),
-              ],
-            ),
           ),
           Expanded(
             flex: 1,

lib/widgets/window_container.dart

@@ -1,3 +1,5 @@
+import 'dart:io';
+
 import 'package:fl_clash/common/common.dart';
 import 'package:fl_clash/models/models.dart';
 import 'package:fl_clash/state.dart';
@@ -31,7 +33,22 @@ class _WindowContainerState extends State<WindowContainer> with WindowListener {
 
   @override
   Widget build(BuildContext context) {
-    return _autoLaunchContainer(widget.child);
+    return Stack(
+      children: [
+        Column(
+          children: [
+            SizedBox(
+              height: kHeaderHeight,
+            ),
+            Expanded(
+              flex: 1,
+              child: _autoLaunchContainer(widget.child),
+            ),
+          ],
+        ),
+        const WindowHeader(),
+      ],
+    );
   }
 
   @override
@@ -80,3 +97,170 @@ class _WindowContainerState extends State<WindowContainer> with WindowListener {
     super.dispose();
   }
 }
+
+class WindowHeader extends StatefulWidget {
+  const WindowHeader({super.key});
+
+  @override
+  State<WindowHeader> createState() => _WindowHeaderState();
+}
+
+class _WindowHeaderState extends State<WindowHeader> {
+  final isMaximizedNotifier = ValueNotifier<bool>(false);
+  final isPinNotifier = ValueNotifier<bool>(false);
+
+  @override
+  void initState() {
+    super.initState();
+    _initNotifier();
+  }
+
+  _initNotifier() async {
+    isMaximizedNotifier.value = await windowManager.isMaximized();
+    isPinNotifier.value = await windowManager.isAlwaysOnTop();
+  }
+
+  @override
+  void dispose() {
+    super.dispose();
+    isMaximizedNotifier.dispose();
+    isPinNotifier.dispose();
+  }
+
+  _updateMaximized() {
+    isMaximizedNotifier.value = !isMaximizedNotifier.value;
+    switch (isMaximizedNotifier.value) {
+      case true:
+        windowManager.maximize();
+      case false:
+        windowManager.unmaximize();
+    }
+  }
+
+  _updatePin() {
+    isPinNotifier.value = !isPinNotifier.value;
+    windowManager.setAlwaysOnTop(isPinNotifier.value);
+  }
+
+  _buildActions() {
+    return Row(
+      children: [
+        IconButton(
+          onPressed: () async {
+            _updatePin();
+          },
+          icon: ValueListenableBuilder(
+            valueListenable: isPinNotifier,
+            builder: (_, value, ___) {
+              return value
+                  ? const Icon(
+                      Icons.push_pin,
+                    )
+                  : const Icon(
+                      Icons.push_pin_outlined,
+                    );
+            },
+          ),
+        ),
+        IconButton(
+          onPressed: () {
+            windowManager.minimize();
+          },
+          icon: const Icon(Icons.remove),
+        ),
+        IconButton(
+          onPressed: () async {
+            _updateMaximized();
+          },
+          icon: ValueListenableBuilder(
+            valueListenable: isMaximizedNotifier,
+            builder: (_, value, ___) {
+              return value
+                  ? const Icon(
+                      Icons.filter_none,
+                      size: 20,
+                    )
+                  : const Icon(
+                      Icons.crop_square,
+                    );
+            },
+          ),
+        ),
+        IconButton(
+          onPressed: () {
+            windowManager.close();
+          },
+          icon: const Icon(Icons.close),
+        ),
+        // const SizedBox(
+        //   width: 8,
+        // ),
+      ],
+    );
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    return Material(
+      child: Stack(
+        alignment: AlignmentDirectional.center,
+        children: [
+          Positioned(
+            child: GestureDetector(
+              onPanStart: (_) {
+                windowManager.startDragging();
+              },
+              onDoubleTap: () {
+                _updateMaximized();
+              },
+              child: Container(
+                color: context.colorScheme.surface,
+                alignment: Alignment.centerLeft,
+                height: kHeaderHeight,
+              ),
+            ),
+          ),
+          if (!Platform.isMacOS) ...[
+            const Positioned(
+              left: 0,
+              child: AppIcon(),
+            ),
+            Positioned(
+              right: 0,
+              child: _buildActions(),
+            ),
+          ]
+        ],
+      ),
+    );
+  }
+}
+
+class AppIcon extends StatelessWidget {
+  const AppIcon({super.key});
+
+  @override
+  Widget build(BuildContext context) {
+    return Container(
+      margin: const EdgeInsets.only(left: 8),
+      child: const Row(
+        children: [
+          SizedBox(
+            width: 24,
+            height: 24,
+            child: CircleAvatar(
+              foregroundImage: AssetImage("assets/images/icon.png"),
+              backgroundColor: Colors.transparent,
+            ),
+          ),
+          SizedBox(
+            width: 8,
+          ),
+          Text(
+            appName,
+          ),
+        ],
+      ),
+    );
+  }
+}

linux/CMakeLists.txt

@@ -118,7 +118,7 @@ install(FILES "${FLUTTER_LIBRARY}" DESTINATION "${INSTALL_BUNDLE_LIB_DIR}"
   COMPONENT Runtime)
 
 # libclash.so
-set(CLASH_DIR "../libclash/linux/amd64")
+set(CLASH_DIR "../libclash/linux")
 install(FILES "${CLASH_DIR}/libclash.so" DESTINATION "${INSTALL_BUNDLE_LIB_DIR}"
   COMPONENT Runtime)
 

linux/packaging/appimage/make_config.yaml

@@ -1,6 +1,6 @@
 display_name: FlClash
 
-icon: ./assets/images/launch_icon.png
+icon: ./assets/images/icon.png
 
 keywords:
   - FlClash

linux/packaging/deb/make_config.yaml

@@ -8,7 +8,7 @@ priority: optional
 section: x11
 installed_size: 6604
 essential: false
-icon: ./assets/images/launch_icon.png
+icon: ./assets/images/icon.png
 
 
 keywords:

linux/packaging/rpm/make_config.yaml

@@ -8,7 +8,7 @@ priority: optional
 section: x11
 installed_size: 6604
 essential: false
-icon: ./assets/images/launch_icon.png
+icon: ./assets/images/icon.png
 
 keywords:
   - FlClash

macos/Runner.xcodeproj/project.pbxproj

@@ -87,7 +87,7 @@
 		4121E8CCDC7DC35194714CDE /* Pods_Runner.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_Runner.framework; sourceTree = BUILT_PRODUCTS_DIR; };
 		72CBDF47BB69EDEFE644C48D /* Pods_RunnerTests.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_RunnerTests.framework; sourceTree = BUILT_PRODUCTS_DIR; };
 		779829C96DE7998FCC810C37 /* Pods-Runner.profile.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.profile.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.profile.xcconfig"; sourceTree = "<group>"; };
-		7AC277A92B90DE1400E026B1 /* libclash.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libclash.dylib; path = ../libclash/macos/amd64/libclash.dylib; sourceTree = "<group>"; };
+		7AC277A92B90DE1400E026B1 /* libclash.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libclash.dylib; path = ../libclash/macos/libclash.dylib; sourceTree = "<group>"; };
 		7AF070893C29500AB9129D89 /* Pods-Runner.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.debug.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.debug.xcconfig"; sourceTree = "<group>"; };
 		7AFA3C8E1D35360C0083082E /* Release.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = Release.xcconfig; sourceTree = "<group>"; };
 		7D929F2AFD80E155D78F3718 /* Pods-RunnerTests.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-RunnerTests.debug.xcconfig"; path = "Target Support Files/Pods-RunnerTests/Pods-RunnerTests.debug.xcconfig"; sourceTree = "<group>"; };
@@ -582,7 +582,7 @@
 					"$(inherited)",
 					"@executable_path/../Frameworks",
 				);
-				LIBRARY_SEARCH_PATHS = "${SRCROOT}/../libclash/macos/amd64/";
+				LIBRARY_SEARCH_PATHS = "${SRCROOT}/../libclash/macos/";
 				PRODUCT_BUNDLE_IDENTIFIER = com.clash.follow;
 				PROVISIONING_PROFILE_SPECIFIER = "";
 				SWIFT_VERSION = 5.0;
@@ -710,7 +710,7 @@
 					"$(inherited)",
 					"@executable_path/../Frameworks",
 				);
-				LIBRARY_SEARCH_PATHS = "${SRCROOT}/../libclash/macos/amd64/";
+				LIBRARY_SEARCH_PATHS = "${SRCROOT}/../libclash/macos/";
 				PRODUCT_BUNDLE_IDENTIFIER = com.clash.follow;
 				PROVISIONING_PROFILE_SPECIFIER = "";
 				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
@@ -732,7 +732,7 @@
 					"$(inherited)",
 					"@executable_path/../Frameworks",
 				);
-				LIBRARY_SEARCH_PATHS = "${SRCROOT}/../libclash/macos/amd64/";
+				LIBRARY_SEARCH_PATHS = "${SRCROOT}/../libclash/macos/";
 				PRODUCT_BUNDLE_IDENTIFIER = com.clash.follow;
 				PROVISIONING_PROFILE_SPECIFIER = "";
 				SWIFT_VERSION = 5.0;

plugins/proxy/lib/proxy.dart

@@ -9,7 +9,7 @@ class Proxy extends ProxyPlatform {
   static String url = "127.0.0.1";
 
   @override
-  Future<bool?> startProxy(int port, String? args) async {
+  Future<bool?> startProxy(int port) async {
     bool? isStart = false;
     switch (Platform.operatingSystem) {
       case "macos":
@@ -19,7 +19,7 @@ class Proxy extends ProxyPlatform {
         isStart = await _startProxyWithLinux(port);
         break;
       case "windows":
-        isStart = await ProxyPlatform.instance.startProxy(port, args);
+        isStart = await ProxyPlatform.instance.startProxy(port);
         break;
     }
     if (isStart == true) {

plugins/proxy/lib/proxy_method_channel.dart

@@ -12,7 +12,7 @@ class MethodChannelProxy extends ProxyPlatform {
   MethodChannelProxy();
 
   @override
-  Future<bool?> startProxy(int port, String? args) async {
+  Future<bool?> startProxy(int port) async {
     return await methodChannel.invokeMethod<bool>("StartProxy", {'port': port});
   }
 

plugins/proxy/lib/proxy_platform_interface.dart

@@ -22,7 +22,7 @@ abstract class ProxyPlatform extends PlatformInterface {
 
   DateTime? startTime;
 
-  Future<bool?> startProxy(int port, String? args) {
+  Future<bool?> startProxy(int port) {
     throw UnimplementedError('startProxy() has not been implemented.');
   }
 

pubspec.yaml

@@ -1,7 +1,7 @@
 name: fl_clash
 description: A multi-platform proxy client based on ClashMeta, simple and easy to use, open-source and ad-free.
 publish_to: 'none'
-version: 0.8.41+202407171
+version: 0.8.46+202407221
 environment:
   sdk: '>=3.1.0 <4.0.0'
 
@@ -58,6 +58,7 @@ flutter:
   assets:
     - assets/data/
     - assets/images/
+    - assets/images/avatars/
 ffigen:
   name: "ClashFFI"
   output: 'lib/clash/generated/clash_ffi.dart'

setup.dart

@@ -47,6 +47,11 @@ class BuildLibItem {
     }
     return platform.name;
   }
+
+  @override
+  String toString() {
+    return 'BuildLibItem{platform: $platform, arch: $arch, archName: $archName}';
+  }
 }
 
 class Build {
@@ -54,12 +59,22 @@ class Build {
         BuildLibItem(
           platform: PlatformType.macos,
           arch: Arch.amd64,
-          archName: 'amd64',
+          archName: '',
+        ),
+        BuildLibItem(
+          platform: PlatformType.macos,
+          arch: Arch.arm64,
+          archName: '',
         ),
         BuildLibItem(
           platform: PlatformType.windows,
           arch: Arch.amd64,
-          archName: 'amd64',
+          archName: '',
+        ),
+        BuildLibItem(
+          platform: PlatformType.windows,
+          arch: Arch.arm64,
+          archName: '',
         ),
         BuildLibItem(
           platform: PlatformType.android,
@@ -79,7 +94,7 @@ class Build {
         BuildLibItem(
           platform: PlatformType.linux,
           arch: Arch.amd64,
-          archName: 'amd64',
+          archName: '',
         ),
       ];
 
@@ -149,9 +164,8 @@ class Build {
   }) async {
     final items = buildItems.where(
       (element) {
-        return element.platform == platform && arch == null
+        return element.platform == platform &&
-            ? true
+            (arch == null ? true : element.arch == arch);
-            : element.arch == arch;
       },
     ).toList();
     for (final item in items) {
@@ -173,10 +187,6 @@ class Build {
       env["GOARCH"] = item.arch.name;
       env["CGO_ENABLED"] = "1";
       env["CC"] = _getCc(item);
-      if (item.platform == PlatformType.macos) {
-        env["CGO_CFLAGS"] = "-mmacosx-version-min=10.11";
-        env["CGO_LDFLAGS"] = "-mmacosx-version-min=10.11";
-      }
 
       await exec(
         [
@@ -337,6 +347,9 @@ class BuildCommand extends Command {
     final currentArches =
         arches.where((element) => element.name == archName).toList();
     final arch = currentArches.isEmpty ? null : currentArches.first;
+    if (arch == null && platform == PlatformType.windows) {
+      throw "Invalid arch";
+    }
     await _buildLib(arch);
     if (build != "all") {
       return;
@@ -346,17 +359,15 @@ class BuildCommand extends Command {
         _buildDistributor(
           platform: platform,
           targets: "exe,zip",
-          args: "--description amd64",
+          args: "--description ${arch!.name}",
         );
-        break;
       case PlatformType.linux:
         await _getLinuxDependencies();
         _buildDistributor(
           platform: platform,
           targets: "appimage,deb,rpm",
-          args: "--description amd64",
+          args: "--description ${arch!.name}",
         );
-        break;
       case PlatformType.android:
         final targetMap = {
           Arch.arm: "android-arm",
@@ -374,15 +385,13 @@ class BuildCommand extends Command {
           args:
               "--flutter-build-args split-per-abi --build-target-platform ${defaultTargets.join(",")}",
         );
-        break;
       case PlatformType.macos:
         await _getMacosDependencies();
         _buildDistributor(
           platform: platform,
           targets: "dmg",
-          args: "--description amd64",
+          args: "--description ${arch!.name}",
         );
-        break;
     }
   }
 }
@@ -399,8 +408,5 @@ main(args) async {
   if (Platform.isMacOS) {
     runner.addCommand(BuildCommand(platform: PlatformType.macos));
   }
-  if (args.isEmpty) {
-    args = [Platform.operatingSystem];
-  }
   runner.run(args);
 }

windows/CMakeLists.txt

@@ -82,7 +82,7 @@ install(FILES "${FLUTTER_LIBRARY}" DESTINATION "${INSTALL_BUNDLE_LIB_DIR}"
   COMPONENT Runtime)
 
 # libclash.so
-set(CLASH_DIR "../libclash/windows/amd64")
+set(CLASH_DIR "../libclash/windows")
 
 # if(CMAKE_SYSTEM_PROCESSOR STREQUAL "ARM64" OR CMAKE_SYSTEM_PROCESSOR MATCHES "aarch64")
 # elseif(CMAKE_SYSTEM_PROCESSOR STREQUAL "ARM" OR CMAKE_SYSTEM_PROCESSOR MATCHES "armv[0-9]+")

windows/packaging/exe/make_config.yaml

@@ -5,7 +5,7 @@ publisher_url: https://github.com/chen08209/FlClash
 display_name: FlClash
 executable_name: FlClash.exe
 output_base_file_name: FlClash.exe
-setup_icon_file: ..\windows\runner\resources\app_icon.ico
+setup_icon_file: ..\windows\runner\resources\icon.ico
 locales:
   - lang: zh
     file: ..\windows\packaging\exe\ChineseSimplified.isl