Fix submit error 2

Fix the problem that the tray is not displayed in some cases

Optimize tray

Update core

Fix some error

core/common.go

@@ -4,6 +4,7 @@ import "C"
 import (
 	"context"
 	"errors"
+	route "github.com/metacubex/mihomo/hub/route"
 	"math"
 	"os"
 	"os/exec"
@@ -21,13 +22,11 @@ import (
 	"github.com/metacubex/mihomo/common/batch"
 	"github.com/metacubex/mihomo/component/dialer"
 	"github.com/metacubex/mihomo/component/resolver"
-	"github.com/metacubex/mihomo/component/sniffer"
 	"github.com/metacubex/mihomo/config"
 	"github.com/metacubex/mihomo/constant"
 	cp "github.com/metacubex/mihomo/constant/provider"
 	"github.com/metacubex/mihomo/hub"
 	"github.com/metacubex/mihomo/hub/executor"
-	"github.com/metacubex/mihomo/hub/route"
 	"github.com/metacubex/mihomo/listener"
 	"github.com/metacubex/mihomo/log"
 	rp "github.com/metacubex/mihomo/rules/provider"
@@ -39,6 +38,7 @@ type ConfigExtendedParams struct {
 	IsCompatible bool              `json:"is-compatible"`
 	SelectedMap  map[string]string `json:"selected-map"`
 	TestURL      *string           `json:"test-url"`
+	OverrideDns  bool              `json:"override-dns"`
 }
 
 type GenerateConfigParams struct {
@@ -190,7 +190,7 @@ func toExternalProvider(p cp.Provider) (*ExternalProvider, error) {
 			VehicleType: psp.VehicleType().String(),
 			Count:       psp.Count(),
 			Path:        psp.Vehicle().Path(),
-			UpdateAt:    psp.UpdatedAt,
+			UpdateAt:    psp.UpdatedAt(),
 		}, nil
 	case *rp.RuleSetProvider:
 		rsp := p.(*rp.RuleSetProvider)
@@ -200,7 +200,7 @@ func toExternalProvider(p cp.Provider) (*ExternalProvider, error) {
 			VehicleType: rsp.VehicleType().String(),
 			Count:       rsp.Count(),
 			Path:        rsp.Vehicle().Path(),
-			UpdateAt:    rsp.UpdatedAt,
+			UpdateAt:    rsp.UpdatedAt(),
 		}, nil
 	default:
 		return nil, errors.New("not external provider")
@@ -380,6 +380,12 @@ func generateProxyGroupAndRule(proxyGroup *[]map[string]any, rule *[]string) {
 	*rule = computedRule
 }
 
+func genHosts(hosts, patchHosts map[string]any) {
+	for k, v := range patchHosts {
+		hosts[k] = v
+	}
+}
+
 func overwriteConfig(targetConfig *config.RawConfig, patchConfig config.RawConfig) {
 	targetConfig.ExternalController = patchConfig.ExternalController
 	targetConfig.ExternalUI = ""
@@ -387,7 +393,6 @@ func overwriteConfig(targetConfig *config.RawConfig, patchConfig config.RawConfi
 	targetConfig.ExternalUIURL = ""
 	targetConfig.TCPConcurrent = patchConfig.TCPConcurrent
 	targetConfig.UnifiedDelay = patchConfig.UnifiedDelay
-	//targetConfig.GeodataMode = false
 	targetConfig.IPv6 = patchConfig.IPv6
 	targetConfig.LogLevel = patchConfig.LogLevel
 	targetConfig.Port = 0
@@ -405,27 +410,30 @@ func overwriteConfig(targetConfig *config.RawConfig, patchConfig config.RawConfi
 	targetConfig.Profile.StoreSelected = false
 	targetConfig.GeoXUrl = patchConfig.GeoXUrl
 	targetConfig.GlobalUA = patchConfig.GlobalUA
-	if targetConfig.DNS.Enable == false {
+	genHosts(targetConfig.Hosts, patchConfig.Hosts)
+	if configParams.OverrideDns {
 		targetConfig.DNS = patchConfig.DNS
+	} else {
+		if targetConfig.DNS.Enable == false {
+			targetConfig.DNS.Enable = true
+		}
 	}
 	//if runtime.GOOS == "android" {
 	//	targetConfig.DNS.NameServer = append(targetConfig.DNS.NameServer, "dhcp://"+dns.SystemDNSPlaceholder)
 	//} else if runtime.GOOS == "windows" {
 	//	targetConfig.DNS.NameServer = append(targetConfig.DNS.NameServer, dns.SystemDNSPlaceholder)
 	//}
-	if configParams.IsCompatible == false {
-		targetConfig.ProxyProvider = make(map[string]map[string]any)
-		targetConfig.RuleProvider = make(map[string]map[string]any)
-		generateProxyGroupAndRule(&targetConfig.ProxyGroup, &targetConfig.Rule)
-	}
+	//if configParams.IsCompatible == false {
+	//	targetConfig.ProxyProvider = make(map[string]map[string]any)
+	//	targetConfig.RuleProvider = make(map[string]map[string]any)
+	//	generateProxyGroupAndRule(&targetConfig.ProxyGroup, &targetConfig.Rule)
+	//}
 }
 
-func patchConfig(general *config.General) {
+func patchConfig(general *config.General, controller *config.Controller) {
 	log.Infoln("[Apply] patch")
-	route.ReStartServer(general.ExternalController)
-	if sniffer.Dispatcher != nil {
-		tunnel.SetSniffing(general.Sniffing)
-	}
+	route.ReStartServer(controller.ExternalController)
+	tunnel.SetSniffing(general.Sniffing)
 	tunnel.SetFindProcessMode(general.FindProcessMode)
 	dialer.SetTcpConcurrent(general.TCPConcurrent)
 	dialer.DefaultInterface.Store(general.Interface)
@@ -440,6 +448,12 @@ var isRunning = false
 var runLock sync.Mutex
 
 func updateListeners(general *config.General, listeners map[string]constant.InboundListener) {
+	if !isRunning {
+		return
+	}
+	runLock.Lock()
+	defer runLock.Unlock()
+
 	listener.PatchInboundListeners(listeners, tunnel.Tunnel, true)
 	listener.SetAllowLan(general.AllowLan)
 	inbound.SetSkipAuthPrefixes(general.SkipAuthPrefixes)
@@ -449,14 +463,12 @@ func updateListeners(general *config.General, listeners map[string]constant.Inbo
 	listener.ReCreateHTTP(general.Port, tunnel.Tunnel)
 	listener.ReCreateSocks(general.SocksPort, tunnel.Tunnel)
 	listener.ReCreateRedir(general.RedirPort, tunnel.Tunnel)
-	listener.ReCreateAutoRedir(general.EBpf.AutoRedir, tunnel.Tunnel)
 	listener.ReCreateTProxy(general.TProxyPort, tunnel.Tunnel)
 	listener.ReCreateMixed(general.MixedPort, tunnel.Tunnel)
 	listener.ReCreateShadowSocks(general.ShadowSocksConfig, tunnel.Tunnel)
 	listener.ReCreateVmess(general.VmessConfig, tunnel.Tunnel)
 	listener.ReCreateTuic(general.TuicServer, tunnel.Tunnel)
 	listener.ReCreateTun(general.Tun, tunnel.Tunnel)
-	listener.ReCreateRedirToTun(general.EBpf.RedirectToTun)
 }
 
 func stopListeners() {
@@ -518,15 +530,15 @@ func applyConfig() error {
 		constant.DefaultTestURL = *configParams.TestURL
 	}
 	if configParams.IsPatch {
-		patchConfig(cfg.General)
+		patchConfig(cfg.General, cfg.Controller)
 	} else {
 		closeConnections()
 		runtime.GC()
 		hub.UltraApplyConfig(cfg)
 		patchSelectGroup()
 	}
+	updateListeners(cfg.General, cfg.Listeners)
 	if isRunning {
-		updateListeners(cfg.General, cfg.Listeners)
 		hcCompatibleProvider(cfg.Providers)
 	}
 	externalProviders = getExternalProvidersRaw()

core/go.mod

@@ -7,9 +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.61
-	golang.org/x/net v0.26.0
-	golang.org/x/sync v0.7.0
+	github.com/miekg/dns v1.1.62
+	golang.org/x/sync v0.8.0
 )
 
 require (
@@ -20,17 +19,16 @@ require (
 	github.com/andybalholm/brotli v1.0.6 // indirect
 	github.com/bahlo/generic-list-go v0.2.0 // indirect
 	github.com/buger/jsonparser v1.1.1 // indirect
-	github.com/cilium/ebpf v0.12.3 // indirect
 	github.com/cloudflare/circl v1.3.7 // indirect
 	github.com/coreos/go-iptables v0.7.0 // indirect
-	github.com/dlclark/regexp2 v1.11.0 // indirect
+	github.com/dlclark/regexp2 v1.11.4 // indirect
 	github.com/ericlagergren/aegis v0.0.0-20230312195928-b4ce538b56f9 // indirect
 	github.com/ericlagergren/polyval v0.0.0-20220411101811-e25bc10ba391 // indirect
 	github.com/ericlagergren/siv v0.0.0-20220507050439-0b757b3aa5f1 // indirect
 	github.com/ericlagergren/subtle v0.0.0-20220507045147-890d697da010 // indirect
 	github.com/fsnotify/fsnotify v1.7.0 // indirect
 	github.com/gaukas/godicttls v0.0.4 // indirect
-	github.com/go-chi/chi/v5 v5.0.14 // indirect
+	github.com/go-chi/chi/v5 v5.1.0 // indirect
 	github.com/go-chi/cors v1.2.1 // indirect
 	github.com/go-chi/render v1.0.3 // indirect
 	github.com/go-ole/go-ole v1.3.0 // indirect
@@ -38,12 +36,12 @@ require (
 	github.com/gobwas/httphead v0.1.0 // indirect
 	github.com/gobwas/pool v0.2.1 // indirect
 	github.com/gobwas/ws v1.4.0 // indirect
-	github.com/gofrs/uuid/v5 v5.2.0 // indirect
+	github.com/gofrs/uuid/v5 v5.3.0 // indirect
 	github.com/google/btree v1.1.2 // indirect
 	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-20240529192340-51bc6136a0a6 // indirect
+	github.com/insomniacslk/dhcp v0.0.0-20240812123929-b105c29bd1b5 // indirect
 	github.com/josharian/native v1.1.0 // indirect
 	github.com/klauspost/compress v1.17.9 // indirect
 	github.com/klauspost/cpuid/v2 v2.2.8 // indirect
@@ -52,18 +50,19 @@ require (
 	github.com/mailru/easyjson v0.7.7 // indirect
 	github.com/mdlayher/netlink v1.7.2 // indirect
 	github.com/mdlayher/socket v0.4.1 // indirect
+	github.com/metacubex/bbolt v0.0.0-20240822011022-aed6d4850399 // indirect
 	github.com/metacubex/chacha v0.1.0 // 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.45.1-0.20240610004319-163fee60637e // indirect
+	github.com/metacubex/quic-go v0.46.1-0.20240807232329-1c6cb2d67f58 // 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.7 // indirect
-	github.com/metacubex/sing-shadowsocks2 v0.2.1 // indirect
-	github.com/metacubex/sing-tun v0.2.7-0.20240719141246-19c49ac9589d // indirect
+	github.com/metacubex/sing-quic v0.0.0-20240827003841-cd97758ed8b4 // indirect
+	github.com/metacubex/sing-shadowsocks v0.2.8 // indirect
+	github.com/metacubex/sing-shadowsocks2 v0.2.2 // indirect
+	github.com/metacubex/sing-tun v0.2.7-0.20240729131039-ed03f557dee1 // indirect
 	github.com/metacubex/sing-vmess v0.1.9-0.20240719134745-1df6fb20bbf9 // indirect
-	github.com/metacubex/sing-wireguard v0.0.0-20240618022557-a6efaa37127a // indirect
-	github.com/metacubex/tfo-go v0.0.0-20240228025757-be1269474a66 // indirect
+	github.com/metacubex/sing-wireguard v0.0.0-20240826061955-1e4e67afe5cd // indirect
+	github.com/metacubex/tfo-go v0.0.0-20240830120620-c5e019b67785 // indirect
 	github.com/metacubex/utls v1.6.6 // indirect
 	github.com/mroth/weightedrand/v2 v2.1.0 // indirect
 	github.com/oasisprotocol/deoxysii v0.0.0-20220228165953-2091330c22b7 // indirect
@@ -72,10 +71,9 @@ 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.2.0 // indirect
+	github.com/puzpuzpuz/xsync/v3 v3.4.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/fswatch v0.1.1 // indirect
 	github.com/sagernet/netlink v0.0.0-20240612041022-b9a21c07ac6a // indirect
 	github.com/sagernet/nftables v0.3.0-beta.4 // indirect
@@ -84,7 +82,7 @@ require (
 	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/samber/lo v1.47.0 // 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
@@ -101,13 +99,14 @@ require (
 	gitlab.com/yawning/bsaes.git v0.0.0-20190805113838-0a714cd429ec // indirect
 	go.uber.org/mock v0.4.0 // indirect
 	go4.org/netipx v0.0.0-20231129151722-fdeea329fbba // indirect
-	golang.org/x/crypto v0.24.0 // indirect
-	golang.org/x/exp v0.0.0-20240613232115-7f521ea00fb8 // indirect
-	golang.org/x/mod v0.18.0 // indirect
-	golang.org/x/sys v0.22.0 // indirect
-	golang.org/x/text v0.16.0 // indirect
+	golang.org/x/crypto v0.26.0 // indirect
+	golang.org/x/exp v0.0.0-20240808152545-0cdaa3abc0fa // indirect
+	golang.org/x/mod v0.20.0 // indirect
+	golang.org/x/net v0.28.0 // indirect
+	golang.org/x/sys v0.24.0 // indirect
+	golang.org/x/text v0.17.0 // indirect
 	golang.org/x/time v0.5.0 // indirect
-	golang.org/x/tools v0.22.0 // indirect
+	golang.org/x/tools v0.24.0 // 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

@@ -19,8 +19,6 @@ github.com/buger/jsonparser v1.1.1/go.mod h1:6RYKKt7H4d4+iWqouImQ9R2FZql3VbhNgx2
 github.com/chzyer/logex v1.1.10/go.mod h1:+Ywpsq7O8HXn0nuIou7OrIPyXbp3wmkHB+jjWRnGsAI=
 github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e/go.mod h1:nSuG5e5PlCu98SY8svDHJxuZscDgtXS6KTTbou5AhLI=
 github.com/chzyer/test v0.0.0-20180213035817-a1ea475d72b1/go.mod h1:Q3SI9o4m/ZMnBNeIyt5eFwwo7qiLfzFZmjNmxjkiQlU=
-github.com/cilium/ebpf v0.12.3 h1:8ht6F9MquybnY97at+VDZb3eQQr8ev79RueWeVaEcG4=
-github.com/cilium/ebpf v0.12.3/go.mod h1:TctK1ivibvI3znr66ljgi4hqOT8EYQjz1KWBfb1UVgM=
 github.com/cloudflare/circl v1.3.7 h1:qlCDlTPz2n9fu58M0Nh1J/JzcFpfgkFHHX3O35r5vcU=
 github.com/cloudflare/circl v1.3.7/go.mod h1:sRTcRWXGLrKw6yIGJ+l7amYJFfAXbZG0kBSc8r4zxgA=
 github.com/coreos/go-iptables v0.7.0 h1:XWM3V+MPRr5/q51NuWSgU0fqMad64Zyxs8ZUoMsamr8=
@@ -28,8 +26,8 @@ github.com/coreos/go-iptables v0.7.0/go.mod h1:Qe8Bv2Xik5FyTXwgIbLAnv2sWSBmvWdFE
 github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
 github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
-github.com/dlclark/regexp2 v1.11.0 h1:G/nrcoOa7ZXlpoa/91N3X7mM3r8eIlMBBJZvsz/mxKI=
-github.com/dlclark/regexp2 v1.11.0/go.mod h1:DHkYz0B9wPfa6wondMfaivmHpzrQ3v9q8cnmRbL6yW8=
+github.com/dlclark/regexp2 v1.11.4 h1:rPYF9/LECdNymJufQKmri9gV604RvvABwgOA8un7yAo=
+github.com/dlclark/regexp2 v1.11.4/go.mod h1:DHkYz0B9wPfa6wondMfaivmHpzrQ3v9q8cnmRbL6yW8=
 github.com/ericlagergren/aegis v0.0.0-20230312195928-b4ce538b56f9 h1:/5RkVc9Rc81XmMyVqawCiDyrBHZbLAZgTTCqou4mwj8=
 github.com/ericlagergren/aegis v0.0.0-20230312195928-b4ce538b56f9/go.mod h1:hkIFzoiIPZYxdFOOLyDho59b7SrDfo+w3h+yWdlg45I=
 github.com/ericlagergren/polyval v0.0.0-20220411101811-e25bc10ba391 h1:8j2RH289RJplhA6WfdaPqzg1MjH2K8wX5e0uhAxrw2g=
@@ -40,14 +38,12 @@ github.com/ericlagergren/siv v0.0.0-20220507050439-0b757b3aa5f1 h1:tlDMEdcPRQKBE
 github.com/ericlagergren/siv v0.0.0-20220507050439-0b757b3aa5f1/go.mod h1:4RfsapbGx2j/vU5xC/5/9qB3kn9Awp1YDiEnN43QrJ4=
 github.com/ericlagergren/subtle v0.0.0-20220507045147-890d697da010 h1:fuGucgPk5dN6wzfnxl3D0D3rVLw4v2SbBT9jb4VnxzA=
 github.com/ericlagergren/subtle v0.0.0-20220507045147-890d697da010/go.mod h1:JtBcj7sBuTTRupn7c2bFspMDIObMJsVK8TeUvpShPok=
-github.com/frankban/quicktest v1.14.5 h1:dfYrrRyLtiqT9GyKXgdh+k4inNeTvmGbuSgZ3lx3GhA=
-github.com/frankban/quicktest v1.14.5/go.mod h1:4ptaffx2x8+WTWXmUCuVU6aPUX1/Mz7zb5vbUoiM6w0=
 github.com/fsnotify/fsnotify v1.7.0 h1:8JEhPFa5W2WU7YfeZzPNqzMP6Lwt7L2715Ggo0nosvA=
 github.com/fsnotify/fsnotify v1.7.0/go.mod h1:40Bi/Hjc2AVfZrqy+aj+yEI+/bRxZnMJyTJwOpGvigM=
 github.com/gaukas/godicttls v0.0.4 h1:NlRaXb3J6hAnTmWdsEKb9bcSBD6BvcIjdGdeb0zfXbk=
 github.com/gaukas/godicttls v0.0.4/go.mod h1:l6EenT4TLWgTdwslVb4sEMOCf7Bv0JAK67deKr9/NCI=
-github.com/go-chi/chi/v5 v5.0.14 h1:PyEwo2Vudraa0x/Wl6eDRRW2NXBvekgfxyydcM0WGE0=
-github.com/go-chi/chi/v5 v5.0.14/go.mod h1:DslCQbL2OYiznFReuXYUmQ2hGd1aDpCnlMNITLSKoi8=
+github.com/go-chi/chi/v5 v5.1.0 h1:acVI1TYaD+hhedDJ3r54HyA6sExp3HfXq7QWEEY/xMw=
+github.com/go-chi/chi/v5 v5.1.0/go.mod h1:DslCQbL2OYiznFReuXYUmQ2hGd1aDpCnlMNITLSKoi8=
 github.com/go-chi/cors v1.2.1 h1:xEC8UT3Rlp2QuWNEr4Fs/c2EAGVKBwy/1vHx3bppil4=
 github.com/go-chi/cors v1.2.1/go.mod h1:sSbTewc+6wYHBBCW7ytsFSn836hqM7JxpglAy2Vzc58=
 github.com/go-chi/render v1.0.3 h1:AsXqd2a1/INaIfUSKq3G5uA8weYx20FOsM7uSoCyyt4=
@@ -65,8 +61,8 @@ github.com/gobwas/pool v0.2.1 h1:xfeeEhW7pwmX8nuLVlqbzVc7udMDrwetjEv+TZIz1og=
 github.com/gobwas/pool v0.2.1/go.mod h1:q8bcK0KcYlCgd9e7WYLm9LpyS+YeLd8JVDW6WezmKEw=
 github.com/gobwas/ws v1.4.0 h1:CTaoG1tojrh4ucGPcoJFiAQUAsEWekEWvLy7GsVNqGs=
 github.com/gobwas/ws v1.4.0/go.mod h1:G3gNqMNtPppf5XUz7O4shetPpcZ1VJ7zt18dlUeakrc=
-github.com/gofrs/uuid/v5 v5.2.0 h1:qw1GMx6/y8vhVsx626ImfKMuS5CvJmhIKKtuyvfajMM=
-github.com/gofrs/uuid/v5 v5.2.0/go.mod h1:CDOjlDMVAtN56jqyRUZh58JT31Tiw7/oQyEXZV+9bD8=
+github.com/gofrs/uuid/v5 v5.3.0 h1:m0mUMr+oVYUdxpMLgSYCZiXe7PuVPnI94+OMeVBNedk=
+github.com/gofrs/uuid/v5 v5.3.0/go.mod h1:CDOjlDMVAtN56jqyRUZh58JT31Tiw7/oQyEXZV+9bD8=
 github.com/golang/protobuf v1.3.1/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
 github.com/golang/protobuf v1.5.3 h1:KhyjKVUg7Usr/dYsdSqoFveMYd5ko72D+zANwlG1mmg=
 github.com/golang/protobuf v1.5.3/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY=
@@ -82,8 +78,8 @@ github.com/google/tink/go v1.6.1/go.mod h1:IGW53kTgag+st5yPhKKwJ6u2l+SSp5/v9XF7s
 github.com/hashicorp/yamux v0.1.1 h1:yrQxtgseBDrq9Y652vSRDvsKCJKOUD+GzTS4Y0Y8pvE=
 github.com/hashicorp/yamux v0.1.1/go.mod h1:CtWFDAQgb7dxtzFs4tWbplKIe2jSi3+5vKbgIO0SLnQ=
 github.com/ianlancetaylor/demangle v0.0.0-20200824232613-28f6c0f3b639/go.mod h1:aSSvb/t6k1mPoxDqO4vJh6VOCGPwU4O0C2/Eqndh1Sc=
-github.com/insomniacslk/dhcp v0.0.0-20240529192340-51bc6136a0a6 h1:dh8D8FksyMhD64mRMbUhZHWYJfNoNMCxfVq6eexleMw=
-github.com/insomniacslk/dhcp v0.0.0-20240529192340-51bc6136a0a6/go.mod h1:KclMyHxX06VrVr0DJmeFSUb1ankt7xTfoOA35pCkoic=
+github.com/insomniacslk/dhcp v0.0.0-20240812123929-b105c29bd1b5 h1:GkMacU5ftc+IEg1449N3UEy2XLDz58W4fkrRu2fibb8=
+github.com/insomniacslk/dhcp v0.0.0-20240812123929-b105c29bd1b5/go.mod h1:KclMyHxX06VrVr0DJmeFSUb1ankt7xTfoOA35pCkoic=
 github.com/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=
@@ -92,10 +88,6 @@ github.com/klauspost/compress v1.17.9 h1:6KIumPrER1LHsvBVuDa0r5xaG0Es51mhhB9BQB2
 github.com/klauspost/compress v1.17.9/go.mod h1:Di0epgTjJY877eYKx5yC51cX2A2Vl2ibi7bDH9ttBbw=
 github.com/klauspost/cpuid/v2 v2.2.8 h1:+StwCXwm9PdpiEkPyzBXIy+M9KUb4ODm0Zarf1kS5BM=
 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=
-github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE=
 github.com/lufia/plan9stats v0.0.0-20211012122336-39d0f177ccd0 h1:6E+4a0GO5zZEnZ81pIr0yLvtUWk2if982qA3F3QD6H4=
 github.com/lufia/plan9stats v0.0.0-20211012122336-39d0f177ccd0/go.mod h1:zJYVVT2jmtg6P3p1VtQj7WsuWi/y4VnjVBn7F8KPB3I=
 github.com/lunixbochs/struc v0.0.0-20200707160740-784aaebc1d40 h1:EnfXoSqDfSNJv0VBNqY/88RNnhSGYkrHaO0mmFGbVsc=
@@ -106,34 +98,36 @@ github.com/mdlayher/netlink v1.7.2 h1:/UtM3ofJap7Vl4QWCPDGXY8d3GIY2UGSDbK+QWmY8/
 github.com/mdlayher/netlink v1.7.2/go.mod h1:xraEF7uJbxLhc5fpHL4cPe221LI2bdttWlU+ZGLfQSw=
 github.com/mdlayher/socket v0.4.1 h1:eM9y2/jlbs1M615oshPQOHZzj6R6wMT7bX5NPiQvn2U=
 github.com/mdlayher/socket v0.4.1/go.mod h1:cAqeGjoufqdxWkD7DkpyS+wcefOtmu5OQ8KuoJGIReA=
+github.com/metacubex/bbolt v0.0.0-20240822011022-aed6d4850399 h1:oBowHVKZycNtAFbZ6avaCSZJYeme2Nrj+4RpV2cNJig=
+github.com/metacubex/bbolt v0.0.0-20240822011022-aed6d4850399/go.mod h1:4xcieuIK+M4bGQmQYZVqEaIYqjS1ahO4kXG7EmDgEro=
 github.com/metacubex/chacha v0.1.0 h1:tg9RSJ18NvL38cCWNyYH1eiG6qDCyyXIaTLQthon0sc=
 github.com/metacubex/chacha v0.1.0/go.mod h1:Djn9bPZxLTXbJFSeyo0/qzEzQI+gUSSzttuzZM75GH8=
 github.com/metacubex/gopacket v1.1.20-0.20230608035415-7e2f98a3e759 h1:cjd4biTvOzK9ubNCCkQ+ldc4YSH/rILn53l/xGBFHHI=
 github.com/metacubex/gopacket v1.1.20-0.20230608035415-7e2f98a3e759/go.mod h1:UHOv2xu+RIgLwpXca7TLrXleEd4oR3sPatW6IF8wU88=
 github.com/metacubex/gvisor v0.0.0-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.45.1-0.20240610004319-163fee60637e h1:bLYn3GuRvWDcBDAkIv5kUYIhzHwafDVq635BuybnKqI=
-github.com/metacubex/quic-go v0.45.1-0.20240610004319-163fee60637e/go.mod h1:Yza2H7Ax1rxWPUcJx0vW+oAt9EsPuSiyQFhFabUPzwU=
+github.com/metacubex/quic-go v0.46.1-0.20240807232329-1c6cb2d67f58 h1:T6OxROLZBr9SOQxN5TzUslv81hEREy/dEgaUKVjaG7U=
+github.com/metacubex/quic-go v0.46.1-0.20240807232329-1c6cb2d67f58/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.7 h1:9f3Dt2+71TNp0e202llA2ug5h/rkWs2EZxQ5IMpf+9g=
-github.com/metacubex/sing-shadowsocks v0.2.7/go.mod h1:X3x88XtJpBxG0W0/ECOJL6Ib0SJ3xdniAkU/6/RMWU0=
-github.com/metacubex/sing-shadowsocks2 v0.2.1 h1:XIZBXlazp8EEoPp1S0DViAhLkJakjQ2f+AOwwdKKNYg=
-github.com/metacubex/sing-shadowsocks2 v0.2.1/go.mod h1:BhOug03a/RbI7y6hp6q+6ITM1dXjnLTmeWBHSTwvv2Q=
-github.com/metacubex/sing-tun v0.2.7-0.20240719141246-19c49ac9589d h1:iYlepjRCYlPXtELupDL+pQjGqkCnQz4KQOfKImP9sog=
-github.com/metacubex/sing-tun v0.2.7-0.20240719141246-19c49ac9589d/go.mod h1:olbEx9yVcaw5tHTNlRamRoxmMKcvDvcVS1YLnQGzvWE=
+github.com/metacubex/sing-quic v0.0.0-20240827003841-cd97758ed8b4 h1:HobpULaPK6OoxrHMmgcwLkwwIduXVmwdcznwUfH1GQM=
+github.com/metacubex/sing-quic v0.0.0-20240827003841-cd97758ed8b4/go.mod h1:g7Mxj7b7zm7YVqD975mk/hSmrb0A0G4bVvIMr2MMzn8=
+github.com/metacubex/sing-shadowsocks v0.2.8 h1:wIhlaigswzjPw4hej75sEvWte3QR0+AJRafgwBHO5B4=
+github.com/metacubex/sing-shadowsocks v0.2.8/go.mod h1:X3x88XtJpBxG0W0/ECOJL6Ib0SJ3xdniAkU/6/RMWU0=
+github.com/metacubex/sing-shadowsocks2 v0.2.2 h1:eaf42uVx4Lr21S6MDYs0ZdTvGA0GEhDpb9no4+gdXPo=
+github.com/metacubex/sing-shadowsocks2 v0.2.2/go.mod h1:BhOug03a/RbI7y6hp6q+6ITM1dXjnLTmeWBHSTwvv2Q=
+github.com/metacubex/sing-tun v0.2.7-0.20240729131039-ed03f557dee1 h1:ypfofGDZbP8p3Y4P/m74JYu7sQViesi3c8nbmT6cS0Y=
+github.com/metacubex/sing-tun v0.2.7-0.20240729131039-ed03f557dee1/go.mod h1:olbEx9yVcaw5tHTNlRamRoxmMKcvDvcVS1YLnQGzvWE=
 github.com/metacubex/sing-vmess v0.1.9-0.20240719134745-1df6fb20bbf9 h1:OAXiCosqY8xKDp3pqTW3qbrCprZ1l6WkrXSFSCwyY4I=
 github.com/metacubex/sing-vmess v0.1.9-0.20240719134745-1df6fb20bbf9/go.mod h1:olVkD4FChQ5gKMHG4ZzuD7+fMkJY1G8vwOKpRehjrmY=
-github.com/metacubex/sing-wireguard v0.0.0-20240618022557-a6efaa37127a h1:NpSGclHJUYndUwBmyIpFBSoBVg8PoVX7QQKhYg0DjM0=
-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/sing-wireguard v0.0.0-20240826061955-1e4e67afe5cd h1:r7alry8u4qlUFLNMwGvG1A8ZcfPM6AMSmrm6E2yKdB4=
+github.com/metacubex/sing-wireguard v0.0.0-20240826061955-1e4e67afe5cd/go.mod h1:uY+BYb0UEknLrqvbGcwi9i++KgrKxsurysgI6G1Pveo=
+github.com/metacubex/tfo-go v0.0.0-20240830120620-c5e019b67785 h1:NNmI+ZV0DzNuqaAInRQuZFLHlWVuyHeow8jYpdKjHjo=
+github.com/metacubex/tfo-go v0.0.0-20240830120620-c5e019b67785/go.mod h1:c7bVFM9f5+VzeZ/6Kg77T/jrg1Xp8QpqlSHvG/aXVts=
 github.com/metacubex/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.61 h1:nLxbwF3XxhwVSm8g9Dghm9MHPaUZuqhPiGL+675ZmEs=
-github.com/miekg/dns v1.1.61/go.mod h1:mnAarhS3nWaW+NVP2wTkYVIZyHNJ098SJZUki3eykwQ=
+github.com/miekg/dns v1.1.62 h1:cN8OuEF1/x5Rq6Np+h1epln8OiyPWV+lROx9LxcGgIQ=
+github.com/miekg/dns v1.1.62/go.mod h1:mvDlcItzm+br7MToIKqkglaGhlFMHJ9DTNNWONWXbNQ=
 github.com/mroth/weightedrand/v2 v2.1.0 h1:o1ascnB1CIVzsqlfArQQjeMy1U0NcIbBO5rfd5E/OeU=
 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=
@@ -156,16 +150,12 @@ 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.2.0 h1:9AzuUeF88YC5bK8u2vEG1Fpvu4wgpM1wfPIExfaaDxQ=
-github.com/puzpuzpuz/xsync/v3 v3.2.0/go.mod h1:VjzYrABPabuM4KyBh1Ftq6u8nhwY5tBPKP9jpmh0nnA=
+github.com/puzpuzpuz/xsync/v3 v3.4.0 h1:DuVBAdXuGFHv8adVXjWWZ63pJq+NRXOWVXlKDBZ+mJ4=
+github.com/puzpuzpuz/xsync/v3 v3.4.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=
 github.com/quic-go/qtls-go1-20 v0.4.1/go.mod h1:X9Nh97ZL80Z+bX/gUXMbipO6OxdiDi58b/fMC9mAL+k=
-github.com/rogpeppe/go-internal v1.9.0 h1:73kH8U+JUqXU8lRuOHeVHaa/SZPifC7BkcraZVejAe8=
-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/fswatch v0.1.1 h1:YqID+93B7VRfqIH3PArW/XpJv5H4OLEVWDfProGoRQs=
 github.com/sagernet/fswatch v0.1.1/go.mod h1:nz85laH0mkQqJfaOrqPpkwtU1znMFNVTpT/5oRsVz/o=
 github.com/sagernet/netlink v0.0.0-20240612041022-b9a21c07ac6a h1:ObwtHN2VpqE0ZNjr6sGeT00J8uU7JF4cNUdb44/Duis=
@@ -183,8 +173,8 @@ github.com/sagernet/smux v0.0.0-20231208180855-7041f6ea79e7 h1:DImB4lELfQhplLTxe
 github.com/sagernet/smux v0.0.0-20231208180855-7041f6ea79e7/go.mod h1:FP9X2xjT/Az1EsG/orYYoC+5MojWnuI7hrffz8fGwwo=
 github.com/sagernet/wireguard-go v0.0.0-20231209092712-9a439356a62e h1:iGH0RMv2FzELOFNFQtvsxH7NPmlo7X5JizEK51UCojo=
 github.com/sagernet/wireguard-go v0.0.0-20231209092712-9a439356a62e/go.mod h1:YbL4TKHRR6APYQv3U2RGfwLDpPYSyWz6oUlpISBEzBE=
-github.com/samber/lo v1.39.0 h1:4gTz1wUhNYLhFSKl6O+8peW0v2F4BCY034GRpU9WnuA=
-github.com/samber/lo v1.39.0/go.mod h1:+m/ZKRl6ClXCE2Lgf3MsQlWfh4bn1bz6CXEOxnEXnEA=
+github.com/samber/lo v1.47.0 h1:z7RynLwP5nbyRscyvcD043DWYoOcYRv3mV8lBeqOCLc=
+github.com/samber/lo v1.47.0/go.mod h1:RmDH9Ct32Qy3gduHQuKJ3gW1fMHAnE/fAzQuf6He5cU=
 github.com/shirou/gopsutil/v3 v3.24.5 h1:i0t8kL+kQTvpAYToeuiVk3TgDeKOFioZO3Ztz/iZ9pI=
 github.com/shirou/gopsutil/v3 v3.24.5/go.mod h1:bsoOS1aStSs9ErQ1WWfxllSeS1K5D+U30r2NfcubMVk=
 github.com/shoenig/go-m1cpu v0.1.6 h1:nxdKQNcEB6vzgA2E2bvzKIYRuNj7XNJ4S/aRSwKzFtM=
@@ -230,21 +220,21 @@ 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.24.0 h1:mnl8DM0o513X8fdIkmyFE/5hTYxbwYOjDS/+rK6qpRI=
-golang.org/x/crypto v0.24.0/go.mod h1:Z1PMYSOR5nyMcyAVAIQSKCDwalqy85Aqn1x3Ws4L5DM=
-golang.org/x/exp v0.0.0-20240613232115-7f521ea00fb8 h1:yixxcjnhBmY0nkL253HFVIm0JsFHwrHdT3Yh6szTnfY=
-golang.org/x/exp v0.0.0-20240613232115-7f521ea00fb8/go.mod h1:jj3sYF3dwk5D+ghuXyeI3r5MFf+NT2An6/9dOA95KSI=
+golang.org/x/crypto v0.26.0 h1:RrRspgV4mU+YwB4FYnuBoKsUapNIL5cohGAmSH3azsw=
+golang.org/x/crypto v0.26.0/go.mod h1:GY7jblb9wI+FOo5y8/S2oY4zWP07AkOJ4+jxCqdqn54=
+golang.org/x/exp v0.0.0-20240808152545-0cdaa3abc0fa h1:ELnwvuAXPNtPk1TJRuGkI9fDTwym6AYBu0qzT8AcHdI=
+golang.org/x/exp v0.0.0-20240808152545-0cdaa3abc0fa/go.mod h1:akd2r19cwCdwSwWeIdzYQGa/EZZyqcOdwWiwj5L5eKQ=
 golang.org/x/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.18.0 h1:5+9lSbEzPSdWkH32vYPBwEpX8KwDbM52Ud9xBUvNlb0=
-golang.org/x/mod v0.18.0/go.mod h1:hTbmBsO62+eylJbnUtE2MGJUyE7QWk4xUqPFrRgJ+7c=
+golang.org/x/mod v0.20.0 h1:utOm6MM3R3dnawAiJgn0y+xvuYRsm1RKM/4giyfDgV0=
+golang.org/x/mod v0.20.0/go.mod h1:hTbmBsO62+eylJbnUtE2MGJUyE7QWk4xUqPFrRgJ+7c=
 golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
 golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
-golang.org/x/net v0.26.0 h1:soB7SVo0PWrY4vPW/+ay0jKDNScG2X9wFeYlXIvJsOQ=
-golang.org/x/net v0.26.0/go.mod h1:5YKkiSynbBIh3p6iOc/vibscux0x38BZDkn8sCUPxHE=
+golang.org/x/net v0.28.0 h1:a9JDOJc5GMUJ0+UDqmLT86WiEy7iWyIhz8gz8E4e5hE=
+golang.org/x/net v0.28.0/go.mod h1:yqtgsTWOOnlGLG9GFRrK3++bGOUEkNBoHZc8MEDWPNg=
 golang.org/x/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=
+golang.org/x/sync v0.8.0 h1:3NFvSEYkUoMifnESzZl15y791HH1qU2xm6eCJU5ZPXQ=
+golang.org/x/sync v0.8.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk=
 golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20190606203320-7fc4e5ec1444/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
@@ -261,18 +251,18 @@ 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.22.0 h1:RI27ohtqKCnwULzJLqkv897zojh5/DwS/ENaMzUOaWI=
-golang.org/x/sys v0.22.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
-golang.org/x/term v0.21.0 h1:WVXCp+/EBEHOj53Rvu+7KiT/iElMrO8ACK16SMZ3jaA=
-golang.org/x/term v0.21.0/go.mod h1:ooXLefLobQVslOqselCNF4SxFAaoS6KujMbsGzSDmX0=
+golang.org/x/sys v0.24.0 h1:Twjiwq9dn6R1fQcyiK+wQyHWfaz/BJB+YIpzU/Cv3Xg=
+golang.org/x/sys v0.24.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
+golang.org/x/term v0.23.0 h1:F6D4vR+EHoL9/sWAWgAR1H2DcHr4PareCbAaCo1RpuU=
+golang.org/x/term v0.23.0/go.mod h1:DgV24QBUrK6jhZXl+20l6UWznPlwAHm1Q1mGHtydmSk=
 golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
-golang.org/x/text v0.16.0 h1:a94ExnEXNtEwYLGJSIUxnWoxoRz/ZcCsV63ROupILh4=
-golang.org/x/text v0.16.0/go.mod h1:GhwF1Be+LQoKShO3cGOHzqOgRrGaYc9AvblQOmPVHnI=
+golang.org/x/text v0.17.0 h1:XtiM5bkSOt+ewxlOE/aE/AKEHibwj/6gvWMl9Rsh0Qc=
+golang.org/x/text v0.17.0/go.mod h1:BuEKDfySbSR4drPmRPG/7iBdf8hvFMuRexcpahXilzY=
 golang.org/x/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.22.0 h1:gqSGLZqv+AI9lIQzniJ0nZDRG5GBPsSi+DRNHWNz6yA=
-golang.org/x/tools v0.22.0/go.mod h1:aCwcsjqvq7Yqt6TNyX7QMU2enbQ/Gt0bo6krSeEri+c=
+golang.org/x/tools v0.24.0 h1:J1shsA93PJUEVaUSaay7UXAyE8aimq3GW0pjlolpa24=
+golang.org/x/tools v0.24.0/go.mod h1:YhNqVBIfWHdzvTLs0d8LCuMhkKUgSUKldakyV7W/WDQ=
 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.2 h1:6xV6lTsCfpGD21XK49h7MhtcApnLqkfYgPcdHftf6hg=

core/hub.go

@@ -5,9 +5,11 @@ package main
 */
 import "C"
 import (
+	"context"
 	bridge "core/dart-bridge"
 	"encoding/json"
 	"fmt"
+	"github.com/metacubex/mihomo/common/utils"
 	"os"
 	"runtime"
 	"sort"
@@ -18,7 +20,6 @@ import (
 	"github.com/metacubex/mihomo/adapter"
 	"github.com/metacubex/mihomo/adapter/outboundgroup"
 	"github.com/metacubex/mihomo/adapter/provider"
-	"github.com/metacubex/mihomo/common/utils"
 	"github.com/metacubex/mihomo/component/updater"
 	"github.com/metacubex/mihomo/config"
 	"github.com/metacubex/mihomo/constant"
@@ -27,7 +28,6 @@ import (
 	"github.com/metacubex/mihomo/log"
 	"github.com/metacubex/mihomo/tunnel"
 	"github.com/metacubex/mihomo/tunnel/statistic"
-	"golang.org/x/net/context"
 )
 
 var currentRawConfig = config.DefaultRawConfig()
@@ -48,9 +48,11 @@ func start() {
 //export stop
 func stop() {
 	runLock.Lock()
-	defer runLock.Unlock()
-	isRunning = false
-	stopListeners()
+	go func() {
+		defer runLock.Unlock()
+		isRunning = false
+		stopListeners()
+	}()
 }
 
 //export initClash
@@ -223,11 +225,13 @@ func asyncTestDelay(s *C.char, port C.longlong) {
 		var params = &TestDelayParams{}
 		err := json.Unmarshal([]byte(paramsString), params)
 		if err != nil {
+			bridge.SendToPort(i, "")
 			return false, nil
 		}
 
 		expectedStatus, err := utils.NewUnsignedRanges[uint16]("")
 		if err != nil {
+			bridge.SendToPort(i, "")
 			return false, nil
 		}
 

core/tun.go

@@ -109,7 +109,6 @@ func stopTun() {
 		runTime = nil
 
 		if tun != nil {
-			log.Errorln("[Tun] stopTun")
 			tun.Close()
 			tun = nil
 		}

core/tun/tun.go

@@ -67,7 +67,6 @@ func Start(fd int, gateway, portal, dns string) (io.Closer, error) {
 		for stack.TCP().SetDeadline(time.Time{}) == nil {
 			conn, err := stack.TCP().Accept()
 			if err != nil {
-				log.Errorln("Accept connection: %v", err)
 				continue
 			}
 			lAddr := conn.LocalAddr().(*net.TCPAddr)

lib/application.dart

@@ -109,6 +109,17 @@ class ApplicationState extends State<Application> {
     );
   }
 
+  _buildPage(Widget page) {
+    if (system.isDesktop) {
+      return WindowHeaderContainer(
+        child: page,
+      );
+    }
+    return VpnContainer(
+      child: page,
+    );
+  }
+
   _updateSystemColorSchemes(
     ColorScheme? lightDynamic,
     ColorScheme? darkDynamic,
@@ -147,10 +158,9 @@ class ApplicationState extends State<Application> {
                       GlobalWidgetsLocalizations.delegate
                     ],
                     builder: (_, child) {
-                      if (system.isDesktop) {
-                        return WindowHeaderContainer(child: child!);
-                      }
-                      return child!;
+                      return MediaContainer(
+                        child: _buildPage(child!),
+                      );
                     },
                     scrollBehavior: BaseScrollBehavior(),
                     title: appName,

lib/common/common.dart

@@ -25,4 +25,6 @@ export 'package.dart';
 export 'measure.dart';
 export 'windows.dart';
 export 'iterable.dart';
-export 'scroll.dart';
+export 'scroll.dart';
+export 'icons.dart';
+export 'http.dart';

lib/common/dav_client.dart

@@ -8,6 +8,7 @@ import 'package:webdav_client/webdav_client.dart';
 class DAVClient {
   late Client client;
   Completer<bool> pingCompleter = Completer();
+  late String fileName;
 
   DAVClient(DAV dav) {
     client = newClient(
@@ -15,6 +16,7 @@ class DAVClient {
       user: dav.user,
       password: dav.password,
     );
+    fileName = dav.fileName;
     client.setHeaders(
       {
         'accept-charset': 'utf-8',
@@ -38,7 +40,7 @@ class DAVClient {
 
   get root => "/$appName";
 
-  get backupFile => "$root/backup.zip";
+  get backupFile => "$root/$fileName";
 
   backup(Uint8List data) async {
     await client.mkdir("$root");

lib/common/http.dart

@@ -0,0 +1,21 @@
+import 'dart:io';
+
+import 'package:flutter/cupertino.dart';
+
+import '../state.dart';
+
+class FlClashHttpOverrides extends HttpOverrides {
+  @override
+  HttpClient createHttpClient(SecurityContext? context) {
+    final client = super.createHttpClient(context);
+    client.badCertificateCallback = (_, __, ___) => true;
+    client.findProxy = (url) {
+      debugPrint("find $url");
+      final port = globalState.appController.clashConfig.mixedPort;
+      final isStart = globalState.appController.appState.isStart;
+      if (!isStart) return "DIRECT";
+      return "PROXY localhost:$port";
+    };
+    return client;
+  }
+}

lib/common/icons.dart

@@ -0,0 +1,6 @@
+import 'package:flutter/material.dart';
+
+class IconsExt{
+  static const IconData target =
+      IconData(0xe900, fontFamily: "Icons");
+}

lib/common/launch.dart

@@ -67,7 +67,7 @@ class AutoLaunch {
             '/TN',
             appName,
             '/TR',
-            Platform.resolvedExecutable,
+            '"${Platform.resolvedExecutable}"',
             '/RL',
             'HIGHEST',
             '/F'

lib/common/list.dart

@@ -2,4 +2,17 @@ extension ListExtension<T> on List<T> {
   List<T> intersection(List<T> list) {
     return where((item) => list.contains(item)).toList();
   }
-}
+
+  List<List<T>> batch(int maxConcurrent) {
+    final batches = (length / maxConcurrent).ceil();
+    final List<List<T>> res = [];
+    for (int i = 0; i < batches; i++) {
+      if (i != batches - 1) {
+        res.add(sublist(i * maxConcurrent, maxConcurrent * (i + 1)));
+      } else {
+        res.add(sublist(i * maxConcurrent, length));
+      }
+    }
+    return res;
+  }
+}

lib/common/measure.dart

@@ -3,23 +3,21 @@ import 'package:flutter/cupertino.dart';
 import 'package:flutter/material.dart';
 
 class Measure {
-  Measure.of(this.context);
+  final TextScaler _textScale;
+  late BuildContext context;
 
-  final _textScaleFactor =
-      WidgetsBinding.instance.platformDispatcher.textScaleFactor;
+  Measure.of(this.context) : _textScale = MediaQuery.of(context).textScaler;
 
   Size computeTextSize(Text text) {
     final textPainter = TextPainter(
       text: TextSpan(text: text.data, style: text.style),
       maxLines: text.maxLines,
-      textScaler: TextScaler.linear(_textScaleFactor),
+      textScaler: _textScale,
       textDirection: text.textDirection ?? TextDirection.ltr,
     )..layout();
     return textPainter.size;
   }
 
-  late BuildContext context;
-
   double? _bodyMediumHeight;
   double? _bodySmallHeight;
   double? _labelSmallHeight;

lib/common/other.dart

@@ -6,6 +6,7 @@ import 'dart:typed_data';
 import 'package:fl_clash/common/common.dart';
 import 'package:fl_clash/enum/enum.dart';
 import 'package:flutter/material.dart';
+import 'package:lpinyin/lpinyin.dart';
 import 'package:zxing2/qrcode.dart';
 import 'package:image/image.dart' as img;
 
@@ -130,6 +131,12 @@ class Other {
     return build1.compareTo(build2);
   }
 
+  String getPinyin(String value) {
+    return value.isNotEmpty
+        ? PinyinHelper.getFirstWordPinyin(value.substring(0, 1))
+        : "";
+  }
+
   Future<String?> parseQRCode(Uint8List? bytes) {
     return Isolate.run<String?>(() {
       if (bytes == null) return null;

lib/common/request.dart

@@ -1,50 +1,27 @@
-import 'dart:io';
 import 'dart:math';
+import 'dart:typed_data';
 
 import 'package:dio/dio.dart';
-import 'package:dio/io.dart';
 import 'package:fl_clash/common/common.dart';
 import 'package:fl_clash/models/ip.dart';
 import 'package:fl_clash/state.dart';
+import 'package:flutter/cupertino.dart';
 
 class Request {
   late final Dio _dio;
-  int? _port;
-  bool _isStart = false;
+  String? userAgent;
 
   Request() {
     _dio = Dio();
     _dio.interceptors.add(
       InterceptorsWrapper(
         onRequest: (options, handler) {
-          _updateAdapter();
           return handler.next(options); // 继续请求
         },
       ),
     );
   }
 
-  _updateAdapter() {
-    final port = globalState.appController.clashConfig.mixedPort;
-    final isStart = globalState.appController.appState.isStart;
-    if (_port != port || isStart != _isStart) {
-      _port = port;
-      _isStart = isStart;
-      _dio.httpClientAdapter = IOHttpClientAdapter(
-        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,
-      );
-    }
-  }
-
   Future<Response> getFileResponseForUrl(String url) async {
     final response = await _dio
         .get(
@@ -62,6 +39,19 @@ class Request {
     return response;
   }
 
+  Future<MemoryImage?> getImage(String url) async {
+    if (url.isEmpty) return null;
+    final response = await _dio.get<Uint8List>(
+      url,
+      options: Options(
+        responseType: ResponseType.bytes,
+      ),
+    );
+    final data = response.data;
+    if (data == null) return null;
+    return MemoryImage(data);
+  }
+
   Future<Map<String, dynamic>?> checkForUpdate() async {
     final response = await _dio.get(
       "https://api.github.com/repos/$repository/releases/latest",
@@ -101,7 +91,7 @@ class Request {
           return source.value(response.data!);
         }
       } catch (e) {
-        if(cancelToken?.isCancelled  == true){
+        if (cancelToken?.isCancelled == true) {
           throw "cancelled";
         }
         continue;

lib/common/window.dart

@@ -34,7 +34,7 @@ class Window {
     //   await windowManager.setTitleBarStyle(TitleBarStyle.hidden);
     // }
     await windowManager.waitUntilReadyToShow(windowOptions, () async {
-      // await windowManager.setPreventClose(true);
+      await windowManager.setPreventClose(true);
     });
   }
 

lib/controller.dart

@@ -8,7 +8,6 @@ import 'package:fl_clash/common/archive.dart';
 import 'package:fl_clash/enum/enum.dart';
 import 'package:fl_clash/state.dart';
 import 'package:flutter/material.dart';
-import 'package:lpinyin/lpinyin.dart';
 import 'package:path/path.dart';
 import 'package:provider/provider.dart';
 import 'package:url_launcher/url_launcher.dart';
@@ -22,7 +21,6 @@ class AppController {
   late AppState appState;
   late Config config;
   late ClashConfig clashConfig;
-  late Measure measure;
   late Function updateClashConfigDebounce;
   late Function updateGroupDebounce;
   late Function addCheckIpNumDebounce;
@@ -44,7 +42,6 @@ class AppController {
     updateGroupDebounce = debounce(() async {
       await updateGroups();
     });
-    measure = Measure.of(context);
   }
 
   updateStatus(bool isStart) async {
@@ -232,6 +229,7 @@ class AppController {
 
   handleExit() async {
     await updateStatus(false);
+    await proxy?.stopProxy();
     await savePreferences();
     clashCore.shutdown();
     system.exit();
@@ -312,6 +310,14 @@ class AppController {
     autoCheckUpdate();
   }
 
+  updateTray() {
+    globalState.updateTray(
+      appState: appState,
+      config: config,
+      clashConfig: clashConfig,
+    );
+  }
+
   setDelay(Delay delay) {
     appState.setDelay(delay);
   }
@@ -433,8 +439,8 @@ class AppController {
     return List.of(proxies)
       ..sort(
         (a, b) => other.sortByChar(
-          PinyinHelper.getPinyin(a.name),
-          PinyinHelper.getPinyin(b.name),
+          other.getPinyin(a.name),
+          other.getPinyin(b.name),
         ),
       );
   }

lib/enum/enum.dart

@@ -1,5 +1,7 @@
 // ignore_for_file: constant_identifier_names
 
+import 'package:freezed_annotation/freezed_annotation.dart';
+
 enum GroupType { Selector, URLTest, Fallback, LoadBalance, Relay }
 
 enum GroupName { GLOBAL, Proxy, Auto, Fallback }
@@ -86,6 +88,17 @@ enum CommonCardType { plain, filled }
 
 enum ProxiesType { tab, list }
 
-enum ProxiesLayout{ loose, standard, tight }
+enum ProxiesLayout { loose, standard, tight }
 
 enum ProxyCardType { expand, shrink, min }
+
+
+enum DnsMode {
+  normal,
+  @JsonValue("fake-ip")
+  fakeIp,
+  @JsonValue("redir-host")
+  redirHost,
+  hosts
+}
+

lib/fragments/backup_and_recovery.dart

@@ -73,11 +73,11 @@ class BackupAndRecovery extends StatelessWidget {
     final res = await commonScaffoldState?.loadingRun<bool>(
       () async {
         final backupData = await globalState.appController.backupData();
-        final value =  await picker.saveFile(
+        final value = await picker.saveFile(
           other.getBackupFileName(),
           Uint8List.fromList(backupData),
         );
-        if(value == null) return false;
+        if (value == null) return false;
         return true;
       },
       title: appLocalizations.backup,
@@ -204,6 +204,24 @@ class BackupAndRecovery extends StatelessWidget {
               const SizedBox(
                 height: 4,
               ),
+              ListItem.input(
+                title: Text(appLocalizations.file),
+                subtitle: Text(dav.fileName),
+                delegate: InputDelegate(
+                  title: appLocalizations.file,
+                  value: dav.fileName,
+                  resetValue: defaultDavFileName,
+                  onChanged: (String? value) {
+                    if (value == null) {
+                      return;
+                    }
+                    globalState.appController.config.dav =
+                        globalState.appController.config.dav?.copyWith(
+                      fileName: value,
+                    );
+                  },
+                ),
+              ),
               ListItem(
                 onTap: () {
                   _backupOnWebDAV(context, client);

lib/fragments/config.dart

@@ -1,689 +0,0 @@
-import 'dart:io';
-
-import 'package:fl_clash/common/common.dart';
-import 'package:fl_clash/enum/enum.dart';
-import 'package:fl_clash/models/models.dart';
-import 'package:fl_clash/state.dart';
-import 'package:fl_clash/widgets/widgets.dart';
-import 'package:flutter/material.dart';
-import 'package:provider/provider.dart';
-
-class ConfigFragment extends StatefulWidget {
-  const ConfigFragment({super.key});
-
-  @override
-  State<ConfigFragment> createState() => _ConfigFragmentState();
-}
-
-class _ConfigFragmentState extends State<ConfigFragment> {
-  _modifyMixedPort(num mixedPort) async {
-    final port = await globalState.showCommonDialog(
-      child: MixedPortFormDialog(
-        mixedPort: mixedPort,
-      ),
-    );
-    if (port != null && port != mixedPort && mounted) {
-      try {
-        final mixedPort = int.parse(port);
-        if (mixedPort < 1024 || mixedPort > 49151) throw "Invalid port";
-        globalState.appController.clashConfig.mixedPort = mixedPort;
-      } catch (e) {
-        globalState.showMessage(
-          title: appLocalizations.proxyPort,
-          message: TextSpan(
-            text: e.toString(),
-          ),
-        );
-      }
-    }
-  }
-
-  _showLogLevelDialog(LogLevel value) {
-    globalState.showCommonDialog(
-      child: AlertDialog(
-        title: Text(appLocalizations.logLevel),
-        contentPadding: const EdgeInsets.symmetric(
-          horizontal: 8,
-          vertical: 16,
-        ),
-        content: SizedBox(
-          width: 250,
-          child: Wrap(
-            children: [
-              for (final logLevel in LogLevel.values)
-                ListItem.radio(
-                  delegate: RadioDelegate<LogLevel>(
-                    value: logLevel,
-                    groupValue: value,
-                    onChanged: (LogLevel? value) {
-                      if (value == null) {
-                        return;
-                      }
-                      final appController = globalState.appController;
-                      appController.clashConfig.logLevel = value;
-                      Navigator.of(context).pop();
-                    },
-                  ),
-                  title: Text(logLevel.name),
-                )
-            ],
-          ),
-        ),
-      ),
-    );
-  }
-
-  _showUaDialog(String? value) {
-    const uas = [
-      null,
-      "clash-verge/v1.6.6",
-      "ClashforWindows/0.19.23",
-    ];
-    globalState.showCommonDialog(
-      child: AlertDialog(
-        title: const Text("UA"),
-        contentPadding: const EdgeInsets.symmetric(
-          horizontal: 8,
-          vertical: 16,
-        ),
-        content: SizedBox(
-          width: 250,
-          child: Wrap(
-            children: [
-              for (final ua in uas)
-                ListItem.radio(
-                  delegate: RadioDelegate<String?>(
-                    value: ua,
-                    groupValue: value,
-                    onChanged: (String? value) {
-                      final appController = globalState.appController;
-                      appController.clashConfig.globalRealUa = value;
-                      Navigator.of(context).pop();
-                    },
-                  ),
-                  title: Text(ua ?? appLocalizations.defaultText),
-                )
-            ],
-          ),
-        ),
-      ),
-    );
-  }
-
-  _modifyTestUrl(String testUrl) async {
-    final newTestUrl = await globalState.showCommonDialog<String>(
-      child: TestUrlFormDialog(
-        testUrl: testUrl,
-      ),
-    );
-    if (newTestUrl != null && newTestUrl != testUrl && mounted) {
-      try {
-        if (!newTestUrl.isUrl) {
-          throw "Invalid url";
-        }
-        globalState.appController.config.testUrl = newTestUrl;
-      } catch (e) {
-        globalState.showMessage(
-          title: appLocalizations.testUrl,
-          message: TextSpan(
-            text: e.toString(),
-          ),
-        );
-      }
-    }
-  }
-
-  _updateKeepAliveInterval(int keepAliveInterval) async {
-    final newKeepAliveIntervalString =
-        await globalState.showCommonDialog<String>(
-      child: KeepAliveIntervalFormDialog(
-        keepAliveInterval: keepAliveInterval,
-      ),
-    );
-    if (newKeepAliveIntervalString != null &&
-        newKeepAliveIntervalString != "$keepAliveInterval" &&
-        mounted) {
-      try {
-        final newKeepAliveInterval = int.parse(newKeepAliveIntervalString);
-        if (newKeepAliveInterval <= 0) {
-          throw "Invalid keepAliveInterval";
-        }
-        globalState.appController.clashConfig.keepAliveInterval =
-            newKeepAliveInterval;
-        globalState.appController.updateClashConfigDebounce();
-      } catch (e) {
-        globalState.showMessage(
-          title: appLocalizations.testUrl,
-          message: TextSpan(
-            text: e.toString(),
-          ),
-        );
-      }
-    }
-  }
-
-  List<Widget> _buildAppSection() {
-    return generateSection(
-      title: appLocalizations.app,
-      items: [
-        if (Platform.isAndroid) ...[
-          Selector<Config, bool>(
-            selector: (_, config) => config.vpnProps.allowBypass,
-            builder: (_, allowBypass, __) {
-              return ListItem.switchItem(
-                leading: const Icon(Icons.arrow_forward_outlined),
-                title: Text(appLocalizations.allowBypass),
-                subtitle: Text(appLocalizations.allowBypassDesc),
-                delegate: SwitchDelegate(
-                  value: allowBypass,
-                  onChanged: (bool value) async {
-                    final config = globalState.appController.config;
-                    final vpnProps = config.vpnProps;
-                    config.vpnProps = vpnProps.copyWith(
-                      allowBypass: value,
-                    );
-                  },
-                ),
-              );
-            },
-          ),
-          Selector<Config, bool>(
-            selector: (_, config) => config.vpnProps.systemProxy,
-            builder: (_, systemProxy, __) {
-              return ListItem.switchItem(
-                leading: const Icon(Icons.settings_ethernet),
-                title: Text(appLocalizations.systemProxy),
-                subtitle: Text(appLocalizations.systemProxyDesc),
-                delegate: SwitchDelegate(
-                  value: systemProxy,
-                  onChanged: (bool value) async {
-                    final config = globalState.appController.config;
-                    final vpnProps = config.vpnProps;
-                    config.vpnProps = vpnProps.copyWith(
-                      systemProxy: value,
-                    );
-                  },
-                ),
-              );
-            },
-          ),
-        ],
-        Selector<Config, bool>(
-          selector: (_, config) => config.isCloseConnections,
-          builder: (_, isCloseConnections, __) {
-            return ListItem.switchItem(
-              leading: const Icon(Icons.auto_delete_outlined),
-              title: Text(appLocalizations.autoCloseConnections),
-              subtitle: Text(appLocalizations.autoCloseConnectionsDesc),
-              delegate: SwitchDelegate(
-                value: isCloseConnections,
-                onChanged: (bool value) async {
-                  final appController = globalState.appController;
-                  appController.config.isCloseConnections = value;
-                },
-              ),
-            );
-          },
-        ),
-        Selector<Config, bool>(
-          selector: (_, config) => config.onlyProxy,
-          builder: (_, onlyProxy, __) {
-            return ListItem.switchItem(
-              leading: const Icon(Icons.data_usage_outlined),
-              title: Text(appLocalizations.onlyStatisticsProxy),
-              subtitle: Text(appLocalizations.onlyStatisticsProxyDesc),
-              delegate: SwitchDelegate(
-                value: onlyProxy,
-                onChanged: (bool value) async {
-                  final appController = globalState.appController;
-                  appController.config.onlyProxy = value;
-                },
-              ),
-            );
-          },
-        ),
-        // Selector<Config, bool>(
-        //   selector: (_, config) => config.isCompatible,
-        //   builder: (_, isCompatible, __) {
-        //     return ListItem.switchItem(
-        //       leading: const Icon(Icons.expand_outlined),
-        //       title: Text(appLocalizations.compatible),
-        //       subtitle: Text(appLocalizations.compatibleDesc),
-        //       delegate: SwitchDelegate(
-        //         value: isCompatible,
-        //         onChanged: (bool value) async {
-        //           final appController = globalState.appController;
-        //           appController.config.isCompatible = value;
-        //           await appController.applyProfile();
-        //         },
-        //       ),
-        //     );
-        //   },
-        // ),
-      ],
-    );
-  }
-
-  List<Widget> _buildGeneralSection() {
-    return generateSection(
-      title: appLocalizations.general,
-      items: [
-        Selector<ClashConfig, LogLevel>(
-          selector: (_, clashConfig) => clashConfig.logLevel,
-          builder: (_, value, __) {
-            return ListItem(
-              leading: const Icon(Icons.info_outline),
-              title: Text(appLocalizations.logLevel),
-              subtitle: Text(value.name),
-              onTap: () {
-                _showLogLevelDialog(value);
-              },
-            );
-          },
-        ),
-        Selector<ClashConfig, String?>(
-          selector: (_, clashConfig) => clashConfig.globalRealUa,
-          builder: (_, value, __) {
-            return ListItem(
-              leading: const Icon(Icons.computer_outlined),
-              title: const Text("UA"),
-              subtitle: Text(value ?? appLocalizations.defaultText),
-              onTap: () {
-                _showUaDialog(value);
-              },
-            );
-          },
-        ),
-        Selector<ClashConfig, int>(
-          selector: (_, config) => config.keepAliveInterval,
-          builder: (_, value, __) {
-            return ListItem(
-              leading: const Icon(Icons.timer_outlined),
-              title: Text(appLocalizations.keepAliveIntervalDesc),
-              subtitle: Text("$value ${appLocalizations.seconds}"),
-              onTap: () {
-                _updateKeepAliveInterval(value);
-              },
-            );
-          },
-        ),
-        Selector<Config, String>(
-          selector: (_, config) => config.testUrl,
-          builder: (_, value, __) {
-            return ListItem(
-              leading: const Icon(Icons.timeline),
-              title: Text(appLocalizations.testUrl),
-              subtitle: Text(value),
-              onTap: () {
-                _modifyTestUrl(value);
-              },
-            );
-          },
-        ),
-        Selector<ClashConfig, int>(
-          selector: (_, clashConfig) => clashConfig.mixedPort,
-          builder: (_, mixedPort, __) {
-            return ListItem(
-              onTap: () {
-                _modifyMixedPort(mixedPort);
-              },
-              leading: const Icon(Icons.adjust_outlined),
-              title: Text(appLocalizations.proxyPort),
-              subtitle: Text(appLocalizations.proxyPortDesc),
-              trailing: FilledButton.tonal(
-                onPressed: () {
-                  _modifyMixedPort(mixedPort);
-                },
-                child: Text(
-                  "$mixedPort",
-                ),
-              ),
-            );
-          },
-        ),
-        Selector<ClashConfig, bool>(
-          selector: (_, clashConfig) => clashConfig.ipv6,
-          builder: (_, ipv6, __) {
-            return ListItem.switchItem(
-              leading: const Icon(Icons.water_outlined),
-              title: const Text("IPv6"),
-              subtitle: Text(appLocalizations.ipv6Desc),
-              delegate: SwitchDelegate(
-                value: ipv6,
-                onChanged: (bool value) async {
-                  final appController = globalState.appController;
-                  appController.clashConfig.ipv6 = value;
-                },
-              ),
-            );
-          },
-        ),
-        Selector<ClashConfig, bool>(
-          selector: (_, clashConfig) => clashConfig.allowLan,
-          builder: (_, allowLan, __) {
-            return ListItem.switchItem(
-              leading: const Icon(Icons.device_hub),
-              title: Text(appLocalizations.allowLan),
-              subtitle: Text(appLocalizations.allowLanDesc),
-              delegate: SwitchDelegate(
-                value: allowLan,
-                onChanged: (bool value) async {
-                  final clashConfig = context.read<ClashConfig>();
-                  clashConfig.allowLan = value;
-                },
-              ),
-            );
-          },
-        ),
-        Selector<ClashConfig, bool>(
-          selector: (_, clashConfig) => clashConfig.unifiedDelay,
-          builder: (_, unifiedDelay, __) {
-            return ListItem.switchItem(
-              leading: const Icon(Icons.compress_outlined),
-              title: Text(appLocalizations.unifiedDelay),
-              subtitle: Text(appLocalizations.unifiedDelayDesc),
-              delegate: SwitchDelegate(
-                value: unifiedDelay,
-                onChanged: (bool value) async {
-                  final appController = globalState.appController;
-                  appController.clashConfig.unifiedDelay = value;
-                },
-              ),
-            );
-          },
-        ),
-        Selector<ClashConfig, bool>(
-          selector: (_, clashConfig) =>
-              clashConfig.findProcessMode == FindProcessMode.always,
-          builder: (_, findProcess, __) {
-            return ListItem.switchItem(
-              leading: const Icon(Icons.polymer_outlined),
-              title: Text(appLocalizations.findProcessMode),
-              subtitle: Text(appLocalizations.findProcessModeDesc),
-              delegate: SwitchDelegate(
-                value: findProcess,
-                onChanged: (bool value) async {
-                  final appController = globalState.appController;
-                  appController.clashConfig.findProcessMode =
-                      value ? FindProcessMode.always : FindProcessMode.off;
-                },
-              ),
-            );
-          },
-        ),
-        Selector<ClashConfig, bool>(
-          selector: (_, clashConfig) => clashConfig.tcpConcurrent,
-          builder: (_, tcpConcurrent, __) {
-            return ListItem.switchItem(
-              leading: const Icon(Icons.double_arrow_outlined),
-              title: Text(appLocalizations.tcpConcurrent),
-              subtitle: Text(appLocalizations.tcpConcurrentDesc),
-              delegate: SwitchDelegate(
-                value: tcpConcurrent,
-                onChanged: (bool value) async {
-                  final appController = globalState.appController;
-                  appController.clashConfig.tcpConcurrent = value;
-                },
-              ),
-            );
-          },
-        ),
-        Selector<ClashConfig, bool>(
-          selector: (_, clashConfig) =>
-              clashConfig.geodataLoader == geodataLoaderMemconservative,
-          builder: (_, memconservative, __) {
-            return ListItem.switchItem(
-              leading: const Icon(Icons.memory),
-              title: Text(appLocalizations.geodataLoader),
-              subtitle: Text(appLocalizations.geodataLoaderDesc),
-              delegate: SwitchDelegate(
-                value: memconservative,
-                onChanged: (bool value) async {
-                  final appController = globalState.appController;
-                  appController.clashConfig.geodataLoader = value
-                      ? geodataLoaderMemconservative
-                      : geodataLoaderStandard;
-                },
-              ),
-            );
-          },
-        ),
-        Selector<ClashConfig, bool>(
-          selector: (_, clashConfig) =>
-              clashConfig.externalController.isNotEmpty,
-          builder: (_, hasExternalController, __) {
-            return ListItem.switchItem(
-              leading: const Icon(Icons.api_outlined),
-              title: Text(appLocalizations.externalController),
-              subtitle: Text(appLocalizations.externalControllerDesc),
-              delegate: SwitchDelegate(
-                value: hasExternalController,
-                onChanged: (bool value) async {
-                  final appController = globalState.appController;
-                  appController.clashConfig.externalController =
-                      value ? defaultExternalController : '';
-                },
-              ),
-            );
-          },
-        ),
-      ],
-    );
-  }
-
-  List<Widget> _buildMoreSection() {
-    return generateSection(
-      title: appLocalizations.more,
-      items: [
-        if (system.isDesktop)
-          Selector<ClashConfig, bool>(
-            selector: (_, clashConfig) => clashConfig.tun.enable,
-            builder: (_, tunEnable, __) {
-              return ListItem.switchItem(
-                leading: const Icon(Icons.important_devices_outlined),
-                title: Text(appLocalizations.tun),
-                subtitle: Text(appLocalizations.tunDesc),
-                delegate: SwitchDelegate(
-                  value: tunEnable,
-                  onChanged: (bool value) async {
-                    final clashConfig = context.read<ClashConfig>();
-                    clashConfig.tun = Tun(enable: value);
-                  },
-                ),
-              );
-            },
-          ),
-      ],
-    );
-  }
-
-  @override
-  Widget build(BuildContext context) {
-    List<Widget> items = [
-      ..._buildAppSection(),
-      ..._buildGeneralSection(),
-      ..._buildMoreSection(),
-    ];
-    return ListView.builder(
-      padding: const EdgeInsets.only(bottom: 32),
-      itemBuilder: (_, index) {
-        return Container(
-          alignment: Alignment.center,
-          child: items[index],
-        );
-      },
-      itemCount: items.length,
-    );
-  }
-}
-
-class MixedPortFormDialog extends StatefulWidget {
-  final num mixedPort;
-
-  const MixedPortFormDialog({super.key, required this.mixedPort});
-
-  @override
-  State<MixedPortFormDialog> createState() => _MixedPortFormDialogState();
-}
-
-class _MixedPortFormDialogState extends State<MixedPortFormDialog> {
-  late TextEditingController portController;
-
-  @override
-  void initState() {
-    super.initState();
-    portController = TextEditingController(text: "${widget.mixedPort}");
-  }
-
-  _handleUpdate() async {
-    final port = portController.value.text;
-    if (port.isEmpty) return;
-    Navigator.of(context).pop<String>(port);
-  }
-
-  @override
-  Widget build(BuildContext context) {
-    return AlertDialog(
-      title: Text(appLocalizations.proxyPort),
-      content: SizedBox(
-        width: 300,
-        child: Wrap(
-          runSpacing: 16,
-          children: [
-            TextField(
-              controller: portController,
-              decoration: const InputDecoration(
-                border: OutlineInputBorder(),
-              ),
-            ),
-          ],
-        ),
-      ),
-      actions: [
-        TextButton(
-          onPressed: _handleUpdate,
-          child: Text(appLocalizations.submit),
-        )
-      ],
-    );
-  }
-}
-
-class TestUrlFormDialog extends StatefulWidget {
-  final String testUrl;
-
-  const TestUrlFormDialog({
-    super.key,
-    required this.testUrl,
-  });
-
-  @override
-  State<TestUrlFormDialog> createState() => _TestUrlFormDialogState();
-}
-
-class _TestUrlFormDialogState extends State<TestUrlFormDialog> {
-  late TextEditingController testUrlController;
-
-  @override
-  void initState() {
-    super.initState();
-    testUrlController = TextEditingController(text: widget.testUrl);
-  }
-
-  _handleUpdate() async {
-    final testUrl = testUrlController.value.text;
-    if (testUrl.isEmpty) return;
-    Navigator.of(context).pop<String>(testUrl);
-  }
-
-  @override
-  Widget build(BuildContext context) {
-    return AlertDialog(
-      title: Text(appLocalizations.testUrl),
-      content: SizedBox(
-        width: 300,
-        child: Wrap(
-          runSpacing: 16,
-          children: [
-            TextField(
-              maxLines: 5,
-              minLines: 1,
-              controller: testUrlController,
-              decoration: const InputDecoration(
-                border: OutlineInputBorder(),
-              ),
-            ),
-          ],
-        ),
-      ),
-      actions: [
-        TextButton(
-          onPressed: _handleUpdate,
-          child: Text(appLocalizations.submit),
-        )
-      ],
-    );
-  }
-}
-
-class KeepAliveIntervalFormDialog extends StatefulWidget {
-  final int keepAliveInterval;
-
-  const KeepAliveIntervalFormDialog({
-    super.key,
-    required this.keepAliveInterval,
-  });
-
-  @override
-  State<KeepAliveIntervalFormDialog> createState() =>
-      _KeepAliveIntervalFormDialogState();
-}
-
-class _KeepAliveIntervalFormDialogState
-    extends State<KeepAliveIntervalFormDialog> {
-  late TextEditingController keepAliveIntervalController;
-
-  @override
-  void initState() {
-    super.initState();
-    keepAliveIntervalController = TextEditingController(
-      text: "${widget.keepAliveInterval}",
-    );
-  }
-
-  _handleUpdate() async {
-    final keepAliveInterval = keepAliveIntervalController.value.text;
-    if (keepAliveInterval.isEmpty) return;
-    Navigator.of(context).pop<String>(keepAliveInterval);
-  }
-
-  @override
-  Widget build(BuildContext context) {
-    return AlertDialog(
-      title: Text(appLocalizations.keepAliveIntervalDesc),
-      content: SizedBox(
-        width: 300,
-        child: Wrap(
-          runSpacing: 16,
-          children: [
-            TextField(
-              maxLines: 1,
-              minLines: 1,
-              controller: keepAliveIntervalController,
-              decoration: InputDecoration(
-                border: const OutlineInputBorder(),
-                suffixText: appLocalizations.seconds,
-              ),
-            ),
-          ],
-        ),
-      ),
-      actions: [
-        TextButton(
-          onPressed: _handleUpdate,
-          child: Text(appLocalizations.submit),
-        )
-      ],
-    );
-  }
-}

lib/fragments/config/app.dart

@@ -0,0 +1,89 @@
+import 'dart:io';
+
+import 'package:fl_clash/common/common.dart';
+import 'package:fl_clash/models/config.dart';
+import 'package:fl_clash/state.dart';
+import 'package:fl_clash/widgets/widgets.dart';
+import 'package:flutter/material.dart';
+import 'package:path/path.dart' show dirname, join;
+import 'package:provider/provider.dart';
+
+class CloseConnectionsSwitch extends StatelessWidget {
+  const CloseConnectionsSwitch({super.key});
+
+  @override
+  Widget build(BuildContext context) {
+    return Selector<Config, bool>(
+      selector: (_, config) => config.isCloseConnections,
+      builder: (_, isCloseConnections, __) {
+        return ListItem.switchItem(
+          leading: const Icon(Icons.auto_delete_outlined),
+          title: Text(appLocalizations.autoCloseConnections),
+          subtitle: Text(appLocalizations.autoCloseConnectionsDesc),
+          delegate: SwitchDelegate(
+            value: isCloseConnections,
+            onChanged: (bool value) async {
+              final appController = globalState.appController;
+              appController.config.isCloseConnections = value;
+            },
+          ),
+        );
+      },
+    );
+  }
+}
+
+class UsageSwitch extends StatelessWidget {
+  const UsageSwitch({super.key});
+
+  @override
+  Widget build(BuildContext context) {
+    return Selector<Config, bool>(
+      selector: (_, config) => config.onlyProxy,
+      builder: (_, onlyProxy, __) {
+        return ListItem.switchItem(
+          leading: const Icon(Icons.data_usage_outlined),
+          title: Text(appLocalizations.onlyStatisticsProxy),
+          subtitle: Text(appLocalizations.onlyStatisticsProxyDesc),
+          delegate: SwitchDelegate(
+            value: onlyProxy,
+            onChanged: (bool value) async {
+              final appController = globalState.appController;
+              appController.config.onlyProxy = value;
+            },
+          ),
+        );
+      },
+    );
+  }
+}
+
+class UWPLoopbackUtil extends StatelessWidget {
+  const UWPLoopbackUtil({super.key});
+
+  @override
+  Widget build(BuildContext context) {
+    return Selector<Config, bool>(
+      selector: (_, config) => config.onlyProxy,
+      builder: (_, onlyProxy, __) {
+        return ListItem(
+          leading: const Icon(Icons.lock_open),
+          title: Text(appLocalizations.loopback),
+          subtitle: Text(appLocalizations.loopbackDesc),
+          onTap: () {
+            windows?.runas(
+              '"${join(dirname(Platform.resolvedExecutable), "EnableLoopback.exe")}"',
+              "",
+            );
+          },
+        );
+      },
+    );
+  }
+}
+
+final appItems = [
+  if (Platform.isWindows) const UWPLoopbackUtil(),
+  const CloseConnectionsSwitch(),
+  const UsageSwitch(),
+];

lib/fragments/config/config.dart

@@ -0,0 +1,91 @@
+import 'dart:io';
+
+import 'package:fl_clash/common/common.dart';
+import 'package:fl_clash/fragments/config/app.dart';
+import 'package:fl_clash/fragments/config/dns.dart';
+import 'package:fl_clash/fragments/config/general.dart';
+import 'package:fl_clash/fragments/config/vpn.dart';
+import 'package:fl_clash/widgets/widgets.dart';
+import 'package:flutter/material.dart';
+
+class ConfigFragment extends StatefulWidget {
+  const ConfigFragment({super.key});
+
+  @override
+  State<ConfigFragment> createState() => _ConfigFragmentState();
+}
+
+class _ConfigFragmentState extends State<ConfigFragment> {
+  @override
+  Widget build(BuildContext context) {
+    List<Widget> items = [
+      ListItem.open(
+        title: Text(appLocalizations.app),
+        subtitle: Text(appLocalizations.appDesc),
+        leading: const Icon(Icons.settings_applications),
+        delegate: OpenDelegate(
+          title: appLocalizations.app,
+          isBlur: false,
+          widget: generateListView(
+            appItems
+                .separated(
+                  const Divider(
+                    height: 0,
+                  ),
+                )
+                .toList(),
+          ),
+        ),
+      ),
+      if (Platform.isAndroid)
+        ListItem.open(
+          title: const Text("VPN"),
+          subtitle: Text(appLocalizations.vpnDesc),
+          leading: const Icon(Icons.vpn_key),
+          delegate: OpenDelegate(
+            title: "VPN",
+            isBlur: false,
+            widget: generateListView(
+              vpnItems,
+            ),
+          ),
+        ),
+      ListItem.open(
+        title: Text(appLocalizations.general),
+        subtitle: Text(appLocalizations.generalDesc),
+        leading: const Icon(Icons.build),
+        delegate: OpenDelegate(
+          title: appLocalizations.general,
+          widget: generateListView(
+            generalItems,
+          ),
+          isBlur: false,
+          extendPageWidth: 360,
+        ),
+      ),
+      ListItem.open(
+        title: const Text("DNS"),
+        subtitle: Text(appLocalizations.dnsDesc),
+        leading: const Icon(Icons.dns),
+        delegate: OpenDelegate(
+          title: "DNS",
+          widget: generateListView(
+            dnsItems,
+          ),
+          isScaffold: true,
+          isBlur: false,
+          extendPageWidth: 360,
+        ),
+      )
+    ];
+    return generateListView(
+      items
+          .separated(
+            const Divider(
+              height: 0,
+            ),
+          )
+          .toList(),
+    );
+  }
+}

lib/fragments/config/dns.dart

@@ -0,0 +1,854 @@
+import 'package:collection/collection.dart';
+import 'package:fl_clash/common/app_localizations.dart';
+import 'package:fl_clash/common/common.dart';
+import 'package:fl_clash/enum/enum.dart';
+import 'package:fl_clash/models/models.dart';
+import 'package:fl_clash/state.dart';
+import 'package:fl_clash/widgets/widgets.dart';
+import 'package:flutter/material.dart';
+import 'package:provider/provider.dart';
+
+class OverrideItem extends StatelessWidget {
+  const OverrideItem({super.key});
+
+  _initActions(BuildContext context) {
+    WidgetsBinding.instance.addPostFrameCallback((timeStamp) {
+      final commonScaffoldState =
+      context.findAncestorStateOfType<CommonScaffoldState>();
+      commonScaffoldState?.actions = [
+        IconButton(
+          onPressed: () {
+            globalState.appController.clashConfig.dns = const Dns();
+          },
+          tooltip: appLocalizations.resetDns,
+          icon: const Icon(
+            Icons.replay,
+          ),
+        )
+      ];
+    });
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    _initActions(context);
+    return Selector<Config, bool>(
+      selector: (_, config) => config.overrideDns,
+      builder: (_, override, __) {
+        return ListItem.switchItem(
+          title: Text(appLocalizations.overrideDns),
+          subtitle: Text(appLocalizations.overrideDnsDesc),
+          delegate: SwitchDelegate(
+            value: override,
+            onChanged: (bool value) async {
+              final config = globalState.appController.config;
+              config.overrideDns = value;
+            },
+          ),
+        );
+      },
+    );
+  }
+}
+
+class DnsDisabledContainer extends StatelessWidget {
+  final Widget child;
+
+  const DnsDisabledContainer(this.child, {
+    super.key,
+  });
+
+  @override
+  Widget build(BuildContext context) {
+    return Selector<Config, bool>(
+      selector: (_, config) => config.overrideDns,
+      builder: (_, enable, child) {
+        return AbsorbPointer(
+          absorbing: !enable,
+          child: DisabledMask(
+            status: !enable,
+            child: Container(
+              color: context.colorScheme.surface,
+              child: child!,
+            ),
+          ),
+        );
+      },
+      child: child,
+    );
+  }
+}
+
+class StatusItem extends StatelessWidget {
+  const StatusItem({super.key});
+
+  @override
+  Widget build(BuildContext context) {
+    return Selector<ClashConfig, bool>(
+      selector: (_, clashConfig) => clashConfig.dns.enable,
+      builder: (_, enable, __) {
+        return ListItem.switchItem(
+          title: Text(appLocalizations.status),
+          subtitle: Text(appLocalizations.statusDesc),
+          delegate: SwitchDelegate(
+            value: enable,
+            onChanged: (bool value) async {
+              final clashConfig = globalState.appController.clashConfig;
+              final dns = clashConfig.dns;
+              clashConfig.dns = dns.copyWith(
+                enable: value,
+              );
+            },
+          ),
+        );
+      },
+    );
+  }
+}
+
+class PreferH3Item extends StatelessWidget {
+  const PreferH3Item({super.key});
+
+  @override
+  Widget build(BuildContext context) {
+    return Selector<ClashConfig, bool>(
+      selector: (_, clashConfig) => clashConfig.dns.preferH3,
+      builder: (_, preferH3, __) {
+        return ListItem.switchItem(
+          title: const Text("PreferH3"),
+          subtitle: Text(appLocalizations.preferH3Desc),
+          delegate: SwitchDelegate(
+            value: preferH3,
+            onChanged: (bool value) async {
+              final clashConfig = globalState.appController.clashConfig;
+              final dns = clashConfig.dns;
+              clashConfig.dns = dns.copyWith(
+                preferH3: value,
+              );
+            },
+          ),
+        );
+      },
+    );
+  }
+}
+
+class IPv6Item extends StatelessWidget {
+  const IPv6Item({super.key});
+
+  @override
+  Widget build(BuildContext context) {
+    return Selector<ClashConfig, bool>(
+      selector: (_, clashConfig) => clashConfig.dns.ipv6,
+      builder: (_, ipv6, __) {
+        return ListItem.switchItem(
+          title: const Text("IPv6"),
+          delegate: SwitchDelegate(
+            value: ipv6,
+            onChanged: (bool value) async {
+              final clashConfig = globalState.appController.clashConfig;
+              final dns = clashConfig.dns;
+              clashConfig.dns = dns.copyWith(
+                ipv6: value,
+              );
+            },
+          ),
+        );
+      },
+    );
+  }
+}
+
+class RespectRulesItem extends StatelessWidget {
+  const RespectRulesItem({super.key});
+
+  @override
+  Widget build(BuildContext context) {
+    return Selector<ClashConfig, bool>(
+      selector: (_, clashConfig) => clashConfig.dns.respectRules,
+      builder: (_, respectRules, __) {
+        return ListItem.switchItem(
+          title: Text(appLocalizations.respectRules),
+          subtitle: Text(appLocalizations.respectRulesDesc),
+          delegate: SwitchDelegate(
+            value: respectRules,
+            onChanged: (bool value) async {
+              final clashConfig = globalState.appController.clashConfig;
+              final dns = clashConfig.dns;
+              clashConfig.dns = dns.copyWith(
+                respectRules: value,
+              );
+            },
+          ),
+        );
+      },
+    );
+  }
+}
+
+class DnsModeItem extends StatelessWidget {
+  const DnsModeItem({super.key});
+
+  @override
+  Widget build(BuildContext context) {
+    return Selector<ClashConfig, DnsMode>(
+      selector: (_, clashConfig) => clashConfig.dns.enhancedMode,
+      builder: (_, enhancedMode, __) {
+        return ListItem<DnsMode>.options(
+          title: Text(appLocalizations.dnsMode),
+          subtitle: Text(enhancedMode.name),
+          delegate: OptionsDelegate(
+            title: appLocalizations.dnsMode,
+            options: DnsMode.values,
+            onChanged: (value) {
+              if (value == null) {
+                return;
+              }
+              final clashConfig = globalState.appController.clashConfig;
+              final dns = clashConfig.dns;
+              clashConfig.dns = dns.copyWith(enhancedMode: value);
+            },
+            textBuilder: (dnsMode) => dnsMode.name,
+            value: enhancedMode,
+          ),
+        );
+      },
+    );
+  }
+}
+
+class FakeIpRangeItem extends StatelessWidget {
+  const FakeIpRangeItem({super.key});
+
+  @override
+  Widget build(BuildContext context) {
+    return Selector<ClashConfig, String>(
+      selector: (_, clashConfig) => clashConfig.dns.fakeIpRange,
+      builder: (_, fakeIpRange, __) {
+        return ListItem.input(
+          title: Text(appLocalizations.fakeipRange),
+          subtitle: Text(fakeIpRange),
+          delegate: InputDelegate(
+            title: appLocalizations.fakeipRange,
+            value: fakeIpRange,
+            onChanged: (String? value) {
+              if (value != null) {
+                try {
+                  final clashConfig = globalState.appController.clashConfig;
+                  clashConfig.dns = clashConfig.dns.copyWith(
+                    fakeIpRange: value,
+                  );
+                } catch (e) {
+                  globalState.showMessage(
+                    title: appLocalizations.fakeipRange,
+                    message: TextSpan(
+                      text: e.toString(),
+                    ),
+                  );
+                }
+              }
+            },
+          ),
+        );
+      },
+    );
+  }
+}
+
+class FakeIpFilterItem extends StatelessWidget {
+  const FakeIpFilterItem({super.key});
+
+  @override
+  Widget build(BuildContext context) {
+    return ListItem.open(
+      title: Text(appLocalizations.fakeipFilter),
+      delegate: OpenDelegate(
+        isBlur: false,
+        title: appLocalizations.fakeipFilter,
+        widget: Selector<ClashConfig, List<String>>(
+          selector: (_, clashConfig) => clashConfig.dns.fakeIpFilter,
+          shouldRebuild: (prev, next) =>
+          !const ListEquality<String>().equals(prev, next),
+          builder: (_, fakeIpFilter, __) {
+            return UpdatePage(
+              title: appLocalizations.fakeipFilter,
+              items: fakeIpFilter,
+              titleBuilder: (item) => Text(item),
+              onRemove: (value) {
+                final clashConfig = globalState.appController.clashConfig;
+                final dns = clashConfig.dns;
+                clashConfig.dns = dns.copyWith(
+                  fakeIpFilter: List.from(dns.fakeIpFilter)
+                    ..remove(value),
+                );
+              },
+              onAdd: (value) {
+                final clashConfig = globalState.appController.clashConfig;
+                final dns = clashConfig.dns;
+                if (fakeIpFilter.contains(value)) return;
+                clashConfig.dns = dns.copyWith(
+                  fakeIpFilter: List.from(dns.fakeIpFilter)
+                    ..add(value),
+                );
+              },
+            );
+          },
+        ),
+        extendPageWidth: 360,
+      ),
+    );
+  }
+}
+
+class DefaultNameserverItem extends StatelessWidget {
+  const DefaultNameserverItem({super.key});
+
+  @override
+  Widget build(BuildContext context) {
+    return ListItem.open(
+      title: Text(appLocalizations.defaultNameserver),
+      subtitle: Text(appLocalizations.defaultNameserverDesc),
+      delegate: OpenDelegate(
+        isBlur: false,
+        title: appLocalizations.defaultNameserver,
+        widget: Selector<ClashConfig, List<String>>(
+          selector: (_, clashConfig) => clashConfig.dns.defaultNameserver,
+          shouldRebuild: (prev, next) =>
+          !const ListEquality<String>().equals(prev, next),
+          builder: (_, defaultNameserver, __) {
+            return UpdatePage(
+              title: appLocalizations.defaultNameserver,
+              items: defaultNameserver,
+              titleBuilder: (item) => Text(item),
+              onRemove: (value) {
+                final clashConfig = globalState.appController.clashConfig;
+                final dns = clashConfig.dns;
+                clashConfig.dns = dns.copyWith(
+                  defaultNameserver: List.from(dns.defaultNameserver)
+                    ..remove(value),
+                );
+              },
+              onAdd: (value) {
+                final clashConfig = globalState.appController.clashConfig;
+                final dns = clashConfig.dns;
+                if (defaultNameserver.contains(value)) return;
+                clashConfig.dns = dns.copyWith(
+                  defaultNameserver: List.from(dns.defaultNameserver)
+                    ..add(value),
+                );
+              },
+            );
+          },
+        ),
+        extendPageWidth: 360,
+      ),
+    );
+  }
+}
+
+class NameserverItem extends StatelessWidget {
+  const NameserverItem({super.key});
+
+  @override
+  Widget build(BuildContext context) {
+    return ListItem.open(
+      title: Text(appLocalizations.nameserver),
+      subtitle: Text(appLocalizations.nameserverDesc),
+      delegate: OpenDelegate(
+        title: appLocalizations.nameserver,
+        isBlur: false,
+        widget: Selector<ClashConfig, List<String>>(
+          selector: (_, clashConfig) => clashConfig.dns.nameserver,
+          shouldRebuild: (prev, next) =>
+          !const ListEquality<String>().equals(prev, next),
+          builder: (_, nameserver, __) {
+            return UpdatePage(
+              title: "域名服务器",
+              items: nameserver,
+              titleBuilder: (item) => Text(item),
+              onRemove: (value) {
+                final clashConfig = globalState.appController.clashConfig;
+                final dns = clashConfig.dns;
+                clashConfig.dns = dns.copyWith(
+                  nameserver: List.from(dns.nameserver)
+                    ..remove(value),
+                );
+              },
+              onAdd: (value) {
+                final clashConfig = globalState.appController.clashConfig;
+                final dns = clashConfig.dns;
+                if (nameserver.contains(value)) return;
+                clashConfig.dns = dns.copyWith(
+                  nameserver: List.from(dns.nameserver)
+                    ..add(value),
+                );
+              },
+            );
+          },
+        ),
+        extendPageWidth: 360,
+      ),
+    );
+  }
+}
+
+class UseHostsItem extends StatelessWidget {
+  const UseHostsItem({super.key});
+
+  @override
+  Widget build(BuildContext context) {
+    return Selector<ClashConfig, bool>(
+      selector: (_, clashConfig) => clashConfig.dns.useHosts,
+      builder: (_, useHosts, __) {
+        return ListItem.switchItem(
+          title: Text(appLocalizations.useHosts),
+          delegate: SwitchDelegate(
+            value: useHosts,
+            onChanged: (bool value) async {
+              final clashConfig = globalState.appController.clashConfig;
+              final dns = clashConfig.dns;
+              clashConfig.dns = dns.copyWith(
+                useHosts: value,
+              );
+            },
+          ),
+        );
+      },
+    );
+  }
+}
+
+class UseSystemHostsItem extends StatelessWidget {
+  const UseSystemHostsItem({super.key});
+
+  @override
+  Widget build(BuildContext context) {
+    return Selector<ClashConfig, bool>(
+      selector: (_, clashConfig) => clashConfig.dns.useSystemHosts,
+      builder: (_, useSystemHosts, __) {
+        return ListItem.switchItem(
+          title: Text(appLocalizations.useSystemHosts),
+          delegate: SwitchDelegate(
+            value: useSystemHosts,
+            onChanged: (bool value) async {
+              final clashConfig = globalState.appController.clashConfig;
+              final dns = clashConfig.dns;
+              clashConfig.dns = dns.copyWith(
+                useSystemHosts: value,
+              );
+            },
+          ),
+        );
+      },
+    );
+  }
+}
+
+class NameserverPolicyItem extends StatelessWidget {
+  const NameserverPolicyItem({super.key});
+
+  @override
+  Widget build(BuildContext context) {
+    return ListItem.open(
+      title: Text(appLocalizations.nameserverPolicy),
+      subtitle: Text(appLocalizations.nameserverPolicyDesc),
+      delegate: OpenDelegate(
+        isBlur: false,
+        title: appLocalizations.nameserverPolicy,
+        widget: Selector<ClashConfig, Map<String, String>>(
+          selector: (_, clashConfig) => clashConfig.dns.nameserverPolicy,
+          shouldRebuild: (prev, next) =>
+          !const MapEquality<String, String>().equals(prev, next),
+          builder: (_, nameserverPolicy, __) {
+            return UpdatePage(
+              title: appLocalizations.nameserverPolicy,
+              items: nameserverPolicy.entries,
+              titleBuilder: (item) => Text(item.key),
+              subtitleBuilder: (item) => Text(item.value),
+              isMap: true,
+              onRemove: (value) {
+                final clashConfig = globalState.appController.clashConfig;
+                final dns = clashConfig.dns;
+                clashConfig.dns = dns.copyWith(
+                  nameserverPolicy: Map.from(dns.nameserverPolicy)
+                    ..remove(value.key),
+                );
+              },
+              onAdd: (value) {
+                final clashConfig = globalState.appController.clashConfig;
+                final dns = clashConfig.dns;
+                clashConfig.dns = dns.copyWith(
+                  nameserverPolicy: Map.from(dns.nameserverPolicy)
+                    ..addEntries([value]),
+                );
+              },
+            );
+          },
+        ),
+        extendPageWidth: 360,
+      ),
+    );
+  }
+}
+
+class ProxyServerNameserverItem extends StatelessWidget {
+  const ProxyServerNameserverItem({super.key});
+
+  @override
+  Widget build(BuildContext context) {
+    return ListItem.open(
+      title: Text(appLocalizations.proxyNameserver),
+      subtitle: Text(appLocalizations.proxyNameserverDesc),
+      delegate: OpenDelegate(
+        isBlur: false,
+        title: appLocalizations.proxyNameserver,
+        widget: Selector<ClashConfig, List<String>>(
+          selector: (_, clashConfig) => clashConfig.dns.proxyServerNameserver,
+          shouldRebuild: (prev, next) =>
+          !const ListEquality<String>().equals(prev, next),
+          builder: (_, proxyServerNameserver, __) {
+            return UpdatePage(
+              title: appLocalizations.proxyNameserver,
+              items: proxyServerNameserver,
+              titleBuilder: (item) => Text(item),
+              onRemove: (value) {
+                final clashConfig = globalState.appController.clashConfig;
+                final dns = clashConfig.dns;
+                clashConfig.dns = dns.copyWith(
+                  proxyServerNameserver: List.from(dns.proxyServerNameserver)
+                    ..remove(value),
+                );
+              },
+              onAdd: (value) {
+                final clashConfig = globalState.appController.clashConfig;
+                final dns = clashConfig.dns;
+                if (proxyServerNameserver.contains(value)) return;
+                clashConfig.dns = dns.copyWith(
+                  proxyServerNameserver: List.from(dns.proxyServerNameserver)
+                    ..add(value),
+                );
+              },
+            );
+          },
+        ),
+        extendPageWidth: 360,
+      ),
+    );
+  }
+}
+
+class FallbackItem extends StatelessWidget {
+  const FallbackItem({super.key});
+
+  @override
+  Widget build(BuildContext context) {
+    return ListItem.open(
+      title: Text(appLocalizations.fallback),
+      subtitle: Text(appLocalizations.fallbackDesc),
+      delegate: OpenDelegate(
+        isBlur: false,
+        title: appLocalizations.fallback,
+        widget: Selector<ClashConfig, List<String>>(
+          selector: (_, clashConfig) => clashConfig.dns.fallback,
+          shouldRebuild: (prev, next) =>
+          !const ListEquality<String>().equals(prev, next),
+          builder: (_, fallback, __) {
+            return UpdatePage(
+              title: appLocalizations.fallback,
+              items: fallback,
+              titleBuilder: (item) => Text(item),
+              onRemove: (value) {
+                final clashConfig = globalState.appController.clashConfig;
+                final dns = clashConfig.dns;
+                clashConfig.dns = dns.copyWith(
+                  fallback: List.from(dns.fallback)
+                    ..remove(value),
+                );
+              },
+              onAdd: (value) {
+                final clashConfig = globalState.appController.clashConfig;
+                final dns = clashConfig.dns;
+                if (fallback.contains(value)) return;
+                clashConfig.dns = dns.copyWith(
+                  fallback: List.from(dns.fallback)
+                    ..add(value),
+                );
+              },
+            );
+          },
+        ),
+        extendPageWidth: 360,
+      ),
+    );
+  }
+}
+
+class GeoipItem extends StatelessWidget {
+  const GeoipItem({super.key});
+
+  @override
+  Widget build(BuildContext context) {
+    return Selector<ClashConfig, bool>(
+      selector: (_, clashConfig) => clashConfig.dns.fallbackFilter.geoip,
+      builder: (_, geoip, __) {
+        return ListItem.switchItem(
+          title: const Text("Geoip"),
+          delegate: SwitchDelegate(
+            value: geoip,
+            onChanged: (bool value) async {
+              final clashConfig = globalState.appController.clashConfig;
+              final dns = clashConfig.dns;
+              clashConfig.dns = dns.copyWith(
+                fallbackFilter: dns.fallbackFilter.copyWith(geoip: value),
+              );
+            },
+          ),
+        );
+      },
+    );
+  }
+}
+
+class GeoipCodeItem extends StatelessWidget {
+  const GeoipCodeItem({super.key});
+
+  @override
+  Widget build(BuildContext context) {
+    return Selector<ClashConfig, String>(
+      selector: (_, clashConfig) => clashConfig.dns.fallbackFilter.geoipCode,
+      builder: (_, geoipCode, __) {
+        return ListItem.input(
+          title: Text(appLocalizations.geoipCode),
+          subtitle: Text(geoipCode),
+          delegate: InputDelegate(
+            title: appLocalizations.geoipCode,
+            value: geoipCode,
+            onChanged: (String? value) {
+              if (value != null) {
+                try {
+                  final clashConfig = globalState.appController.clashConfig;
+                  final dns = clashConfig.dns;
+                  clashConfig.dns = dns.copyWith(
+                    fallbackFilter: dns.fallbackFilter.copyWith(
+                      geoipCode: value,
+                    ),
+                  );
+                } catch (e) {
+                  globalState.showMessage(
+                    title: appLocalizations.geoipCode,
+                    message: TextSpan(
+                      text: e.toString(),
+                    ),
+                  );
+                }
+              }
+            },
+          ),
+        );
+      },
+    );
+  }
+}
+
+class GeositeItem extends StatelessWidget {
+  const GeositeItem({super.key});
+
+  @override
+  Widget build(BuildContext context) {
+    return ListItem.open(
+      title: const Text("Geosite"),
+      delegate: OpenDelegate(
+        isBlur: false,
+        title: "Geosite",
+        widget: Selector<ClashConfig, List<String>>(
+          selector: (_, clashConfig) => clashConfig.dns.fallbackFilter.geosite,
+          shouldRebuild: (prev, next) =>
+          !const ListEquality<String>().equals(prev, next),
+          builder: (_, geosite, __) {
+            return UpdatePage(
+              title: "Geosite",
+              items: geosite,
+              titleBuilder: (item) => Text(item),
+              onRemove: (value) {
+                final clashConfig = globalState.appController.clashConfig;
+                final dns = clashConfig.dns;
+                clashConfig.dns = dns.copyWith(
+                  fallbackFilter: dns.fallbackFilter.copyWith(
+                    geosite: List.from(geosite)
+                      ..remove(value),
+                  ),
+                );
+              },
+              onAdd: (value) {
+                final clashConfig = globalState.appController.clashConfig;
+                final dns = clashConfig.dns;
+                clashConfig.dns = dns.copyWith(
+                  fallbackFilter: dns.fallbackFilter.copyWith(
+                    geosite: List.from(geosite)
+                      ..add(value),
+                  ),
+                );
+              },
+            );
+          },
+        ),
+        extendPageWidth: 360,
+      ),
+    );
+  }
+}
+
+class IpcidrItem extends StatelessWidget {
+  const IpcidrItem({super.key});
+
+  @override
+  Widget build(BuildContext context) {
+    return ListItem.open(
+      title: Text(appLocalizations.ipcidr),
+      delegate: OpenDelegate(
+        isBlur: false,
+        title: appLocalizations.ipcidr,
+        widget: Selector<ClashConfig, List<String>>(
+          selector: (_, clashConfig) => clashConfig.dns.fallbackFilter.ipcidr,
+          shouldRebuild: (prev, next) =>
+          !const ListEquality<String>().equals(prev, next),
+          builder: (_, ipcidr, __) {
+            return UpdatePage(
+              title: appLocalizations.ipcidr,
+              items: ipcidr,
+              titleBuilder: (item) => Text(item),
+              onRemove: (value) {
+                final clashConfig = globalState.appController.clashConfig;
+                final dns = clashConfig.dns;
+                clashConfig.dns = dns.copyWith(
+                  fallbackFilter: dns.fallbackFilter.copyWith(
+                    ipcidr: List.from(ipcidr)
+                      ..remove(value),
+                  ),
+                );
+              },
+              onAdd: (value) {
+                final clashConfig = globalState.appController.clashConfig;
+                final dns = clashConfig.dns;
+                clashConfig.dns = dns.copyWith(
+                  fallbackFilter: dns.fallbackFilter.copyWith(
+                    ipcidr: List.from(ipcidr)
+                      ..add(value),
+                  ),
+                );
+              },
+            );
+          },
+        ),
+        extendPageWidth: 360,
+      ),
+    );
+  }
+}
+
+class DomainItem extends StatelessWidget {
+  const DomainItem({super.key});
+
+  @override
+  Widget build(BuildContext context) {
+    return ListItem.open(
+      title: Text(appLocalizations.domain),
+      delegate: OpenDelegate(
+        isBlur: false,
+        title: appLocalizations.domain,
+        widget: Selector<ClashConfig, List<String>>(
+          selector: (_, clashConfig) => clashConfig.dns.fallbackFilter.domain,
+          shouldRebuild: (prev, next) =>
+          !const ListEquality<String>().equals(prev, next),
+          builder: (_, domain, __) {
+            return UpdatePage(
+              title: appLocalizations.domain,
+              items: domain,
+              titleBuilder: (item) => Text(item),
+              onRemove: (value) {
+                final clashConfig = globalState.appController.clashConfig;
+                final dns = clashConfig.dns;
+                clashConfig.dns = dns.copyWith(
+                  fallbackFilter: dns.fallbackFilter.copyWith(
+                    domain: List.from(domain)
+                      ..remove(value),
+                  ),
+                );
+              },
+              onAdd: (value) {
+                final clashConfig = globalState.appController.clashConfig;
+                final dns = clashConfig.dns;
+                clashConfig.dns = dns.copyWith(
+                  fallbackFilter: dns.fallbackFilter.copyWith(
+                    domain: List.from(domain)
+                      ..add(value),
+                  ),
+                );
+              },
+            );
+          },
+        ),
+        extendPageWidth: 360,
+      ),
+    );
+  }
+}
+
+class DnsOptions extends StatelessWidget {
+  const DnsOptions({super.key});
+
+  @override
+  Widget build(BuildContext context) {
+    return DnsDisabledContainer(
+      Column(
+        children: generateSection(
+          title: appLocalizations.options,
+          items: [
+            const StatusItem(),
+            const UseHostsItem(),
+            const UseSystemHostsItem(),
+            const IPv6Item(),
+            const RespectRulesItem(),
+            const PreferH3Item(),
+            const DnsModeItem(),
+            const FakeIpRangeItem(),
+            const FakeIpFilterItem(),
+            const DefaultNameserverItem(),
+            const NameserverPolicyItem(),
+            const NameserverItem(),
+            const FallbackItem(),
+            const ProxyServerNameserverItem(),
+          ],
+        ),
+      ),
+    );
+  }
+}
+
+class FallbackFilterOptions extends StatelessWidget {
+  const FallbackFilterOptions({super.key});
+
+  @override
+  Widget build(BuildContext context) {
+    return DnsDisabledContainer(
+      Column(
+        children: generateSection(
+          title: appLocalizations.fallbackFilter,
+          items: [
+            const GeoipItem(),
+            const GeoipCodeItem(),
+            const GeositeItem(),
+            const IpcidrItem(),
+            const DomainItem(),
+          ],
+        ),
+      ),
+    );
+  }
+}
+
+const dnsItems = <Widget>[
+  OverrideItem(),
+  DnsOptions(),
+  FallbackFilterOptions(),
+];

lib/fragments/config/general.dart

@@ -0,0 +1,439 @@
+import 'package:collection/collection.dart';
+import 'package:fl_clash/common/common.dart';
+import 'package:fl_clash/enum/enum.dart';
+import 'package:fl_clash/models/models.dart';
+import 'package:fl_clash/state.dart';
+import 'package:fl_clash/widgets/widgets.dart';
+import 'package:flutter/material.dart';
+import 'package:provider/provider.dart';
+
+class LogLevelItem extends StatelessWidget {
+  const LogLevelItem({super.key});
+
+  @override
+  Widget build(BuildContext context) {
+    return Selector<ClashConfig, LogLevel>(
+      selector: (_, clashConfig) => clashConfig.logLevel,
+      builder: (_, value, __) {
+        return ListItem<LogLevel>.options(
+          leading: const Icon(Icons.info_outline),
+          title: Text(appLocalizations.logLevel),
+          subtitle: Text(value.name),
+          delegate: OptionsDelegate<LogLevel>(
+            title: appLocalizations.logLevel,
+            options: LogLevel.values,
+            onChanged: (LogLevel? value) {
+              if (value == null) {
+                return;
+              }
+              final appController = globalState.appController;
+              appController.clashConfig.logLevel = value;
+            },
+            textBuilder: (logLevel) => logLevel.name,
+            value: value,
+          ),
+        );
+      },
+    );
+  }
+}
+
+class UaItem extends StatelessWidget {
+  const UaItem({super.key});
+
+  @override
+  Widget build(BuildContext context) {
+    return Selector<ClashConfig, String?>(
+      selector: (_, clashConfig) => clashConfig.globalRealUa,
+      builder: (_, value, __) {
+        return ListItem<String?>.options(
+          leading: const Icon(Icons.computer_outlined),
+          title: const Text("UA"),
+          subtitle: Text(value ?? appLocalizations.defaultText),
+          delegate: OptionsDelegate<String?>(
+            title: "UA",
+            options: [
+              null,
+              "clash-verge/v1.6.6",
+              "ClashforWindows/0.19.23",
+            ],
+            value: value,
+            onChanged: (ua) {
+              final appController = globalState.appController;
+              appController.clashConfig.globalRealUa = ua;
+            },
+            textBuilder: (ua) => ua ?? appLocalizations.defaultText,
+          ),
+        );
+      },
+    );
+  }
+}
+
+class KeepAliveIntervalItem extends StatelessWidget {
+  const KeepAliveIntervalItem({super.key});
+
+  @override
+  Widget build(BuildContext context) {
+    return Selector<ClashConfig, int>(
+      selector: (_, config) => config.keepAliveInterval,
+      builder: (_, value, __) {
+        return ListItem.input(
+          leading: const Icon(Icons.timer_outlined),
+          title: Text(appLocalizations.keepAliveIntervalDesc),
+          subtitle: Text("$value ${appLocalizations.seconds}"),
+          delegate: InputDelegate(
+            title: appLocalizations.keepAliveIntervalDesc,
+            suffixText: appLocalizations.seconds,
+            resetValue: "$defaultKeepAliveInterval",
+            value: "$value",
+            onChanged: (String? value) {
+              if (value != null) {
+                try {
+                  final intValue = int.parse(value);
+                  if (intValue <= 0) {
+                    throw "Invalid keepAliveInterval";
+                  }
+                  globalState.appController.clashConfig.keepAliveInterval =
+                      intValue;
+                } catch (e) {
+                  globalState.showMessage(
+                    title: appLocalizations.keepAliveIntervalDesc,
+                    message: TextSpan(
+                      text: e.toString(),
+                    ),
+                  );
+                }
+              }
+            },
+          ),
+        );
+      },
+    );
+  }
+}
+
+class TestUrlItem extends StatelessWidget {
+  const TestUrlItem({super.key});
+
+  @override
+  Widget build(BuildContext context) {
+    return Selector<Config, String>(
+      selector: (_, config) => config.testUrl,
+      builder: (_, value, __) {
+        return ListItem.input(
+          leading: const Icon(Icons.timeline),
+          title: Text(appLocalizations.testUrl),
+          subtitle: Text(value),
+          delegate: InputDelegate(
+            resetValue: defaultTestUrl,
+            title: appLocalizations.testUrl,
+            value: value,
+            onChanged: (String? value) {
+              if (value != null) {
+                try {
+                  if (!value.isUrl) {
+                    throw "Invalid url";
+                  }
+                  globalState.appController.config.testUrl = value;
+                } catch (e) {
+                  globalState.showMessage(
+                    title: appLocalizations.testUrl,
+                    message: TextSpan(
+                      text: e.toString(),
+                    ),
+                  );
+                }
+              }
+            },
+          ),
+        );
+      },
+    );
+  }
+}
+
+class MixedPortItem extends StatelessWidget {
+  const MixedPortItem({super.key});
+
+  @override
+  Widget build(BuildContext context) {
+    return Selector<ClashConfig, int>(
+      selector: (_, clashConfig) => clashConfig.mixedPort,
+      builder: (_, value, __) {
+        return ListItem.input(
+          leading: const Icon(Icons.adjust_outlined),
+          title: Text(appLocalizations.proxyPort),
+          subtitle: Text("$value"),
+          delegate: InputDelegate(
+            title: appLocalizations.proxyPort,
+            value: "$value",
+            onChanged: (String? value) {
+              if (value != null) {
+                try {
+                  final mixedPort = int.parse(value);
+                  if (mixedPort < 1024 || mixedPort > 49151) {
+                    throw "Invalid port";
+                  }
+                  globalState.appController.clashConfig.mixedPort = mixedPort;
+                } catch (e) {
+                  globalState.showMessage(
+                    title: appLocalizations.proxyPort,
+                    message: TextSpan(
+                      text: e.toString(),
+                    ),
+                  );
+                }
+              }
+            },
+            resetValue: "$defaultMixedPort",
+          ),
+        );
+      },
+    );
+  }
+}
+
+class HostsItem extends StatelessWidget {
+  const HostsItem({super.key});
+
+  @override
+  Widget build(BuildContext context) {
+    return ListItem.open(
+      leading: const Icon(Icons.view_list_outlined),
+      title: const Text("Hosts"),
+      subtitle: Text(appLocalizations.hostsDesc),
+      delegate: OpenDelegate(
+        isBlur: false,
+        title: "Hosts",
+        widget: Selector<ClashConfig, HostsMap>(
+          selector: (_, clashConfig) => clashConfig.hosts,
+          shouldRebuild: (prev, next) =>
+              !const MapEquality<String, String>().equals(prev, next),
+          builder: (_, hosts, ___) {
+            final entries = hosts.entries;
+            return UpdatePage(
+              title: "Hosts",
+              items: entries,
+              titleBuilder: (item) => Text(item.key),
+              subtitleBuilder: (item) => Text(item.value),
+              onRemove: (value) {
+                final clashConfig = globalState.appController.clashConfig;
+                clashConfig.hosts = Map.from(hosts)..remove(value.key);
+              },
+              onAdd: (value) {
+                final clashConfig = globalState.appController.clashConfig;
+                clashConfig.hosts = Map.from(clashConfig.hosts)
+                  ..addEntries([value]);
+              },
+              isMap: true,
+            );
+          },
+        ),
+        extendPageWidth: 360,
+      ),
+    );
+  }
+}
+
+class Ipv6Item extends StatelessWidget {
+  const Ipv6Item({super.key});
+
+  @override
+  Widget build(BuildContext context) {
+    return Selector<ClashConfig, bool>(
+      selector: (_, clashConfig) => clashConfig.ipv6,
+      builder: (_, ipv6, __) {
+        return ListItem.switchItem(
+          leading: const Icon(Icons.water_outlined),
+          title: const Text("IPv6"),
+          subtitle: Text(appLocalizations.ipv6Desc),
+          delegate: SwitchDelegate(
+            value: ipv6,
+            onChanged: (bool value) async {
+              final appController = globalState.appController;
+              appController.clashConfig.ipv6 = value;
+            },
+          ),
+        );
+      },
+    );
+  }
+}
+
+class AllowLanItem extends StatelessWidget {
+  const AllowLanItem({super.key});
+
+  @override
+  Widget build(BuildContext context) {
+    return Selector<ClashConfig, bool>(
+      selector: (_, clashConfig) => clashConfig.allowLan,
+      builder: (_, allowLan, __) {
+        return ListItem.switchItem(
+          leading: const Icon(Icons.device_hub),
+          title: Text(appLocalizations.allowLan),
+          subtitle: Text(appLocalizations.allowLanDesc),
+          delegate: SwitchDelegate(
+            value: allowLan,
+            onChanged: (bool value) async {
+              final clashConfig = context.read<ClashConfig>();
+              clashConfig.allowLan = value;
+            },
+          ),
+        );
+      },
+    );
+  }
+}
+
+class UnifiedDelayItem extends StatelessWidget {
+  const UnifiedDelayItem({super.key});
+
+  @override
+  Widget build(BuildContext context) {
+    return Selector<ClashConfig, bool>(
+      selector: (_, clashConfig) => clashConfig.unifiedDelay,
+      builder: (_, unifiedDelay, __) {
+        return ListItem.switchItem(
+          leading: const Icon(Icons.compress_outlined),
+          title: Text(appLocalizations.unifiedDelay),
+          subtitle: Text(appLocalizations.unifiedDelayDesc),
+          delegate: SwitchDelegate(
+            value: unifiedDelay,
+            onChanged: (bool value) async {
+              final appController = globalState.appController;
+              appController.clashConfig.unifiedDelay = value;
+            },
+          ),
+        );
+      },
+    );
+  }
+}
+
+class FindProcessItem extends StatelessWidget {
+  const FindProcessItem({super.key});
+
+  @override
+  Widget build(BuildContext context) {
+    return Selector<ClashConfig, bool>(
+      selector: (_, clashConfig) =>
+          clashConfig.findProcessMode == FindProcessMode.always,
+      builder: (_, findProcess, __) {
+        return ListItem.switchItem(
+          leading: const Icon(Icons.polymer_outlined),
+          title: Text(appLocalizations.findProcessMode),
+          subtitle: Text(appLocalizations.findProcessModeDesc),
+          delegate: SwitchDelegate(
+            value: findProcess,
+            onChanged: (bool value) async {
+              final appController = globalState.appController;
+              appController.clashConfig.findProcessMode =
+                  value ? FindProcessMode.always : FindProcessMode.off;
+            },
+          ),
+        );
+      },
+    );
+  }
+}
+
+class TcpConcurrentItem extends StatelessWidget {
+  const TcpConcurrentItem({super.key});
+
+  @override
+  Widget build(BuildContext context) {
+    return Selector<ClashConfig, bool>(
+      selector: (_, clashConfig) => clashConfig.tcpConcurrent,
+      builder: (_, tcpConcurrent, __) {
+        return ListItem.switchItem(
+          leading: const Icon(Icons.double_arrow_outlined),
+          title: Text(appLocalizations.tcpConcurrent),
+          subtitle: Text(appLocalizations.tcpConcurrentDesc),
+          delegate: SwitchDelegate(
+            value: tcpConcurrent,
+            onChanged: (bool value) async {
+              final appController = globalState.appController;
+              appController.clashConfig.tcpConcurrent = value;
+            },
+          ),
+        );
+      },
+    );
+  }
+}
+
+class GeodataLoaderItem extends StatelessWidget {
+  const GeodataLoaderItem({super.key});
+
+  @override
+  Widget build(BuildContext context) {
+    return Selector<ClashConfig, bool>(
+      selector: (_, clashConfig) =>
+          clashConfig.geodataLoader == geodataLoaderMemconservative,
+      builder: (_, memconservative, __) {
+        return ListItem.switchItem(
+          leading: const Icon(Icons.memory),
+          title: Text(appLocalizations.geodataLoader),
+          subtitle: Text(appLocalizations.geodataLoaderDesc),
+          delegate: SwitchDelegate(
+            value: memconservative,
+            onChanged: (bool value) async {
+              final appController = globalState.appController;
+              appController.clashConfig.geodataLoader =
+                  value ? geodataLoaderMemconservative : geodataLoaderStandard;
+            },
+          ),
+        );
+      },
+    );
+  }
+}
+
+class ExternalControllerItem extends StatelessWidget {
+  const ExternalControllerItem({super.key});
+
+  @override
+  Widget build(BuildContext context) {
+    return Selector<ClashConfig, bool>(
+      selector: (_, clashConfig) => clashConfig.externalController.isNotEmpty,
+      builder: (_, hasExternalController, __) {
+        return ListItem.switchItem(
+          leading: const Icon(Icons.api_outlined),
+          title: Text(appLocalizations.externalController),
+          subtitle: Text(appLocalizations.externalControllerDesc),
+          delegate: SwitchDelegate(
+            value: hasExternalController,
+            onChanged: (bool value) async {
+              final appController = globalState.appController;
+              appController.clashConfig.externalController =
+                  value ? defaultExternalController : '';
+            },
+          ),
+        );
+      },
+    );
+  }
+}
+
+final generalItems = const [
+  LogLevelItem(),
+  UaItem(),
+  KeepAliveIntervalItem(),
+  TestUrlItem(),
+  MixedPortItem(),
+  HostsItem(),
+  Ipv6Item(),
+  AllowLanItem(),
+  UnifiedDelayItem(),
+  FindProcessItem(),
+  TcpConcurrentItem(),
+  GeodataLoaderItem(),
+  ExternalControllerItem(),
+]
+    .separated(
+      const Divider(
+        height: 0,
+      ),
+    )
+    .toList();

lib/fragments/config/vpn.dart

@@ -0,0 +1,140 @@
+import 'package:fl_clash/common/common.dart';
+import 'package:fl_clash/models/models.dart';
+import 'package:fl_clash/state.dart';
+import 'package:fl_clash/widgets/widgets.dart';
+import 'package:flutter/material.dart';
+import 'package:provider/provider.dart';
+
+class VPNSwitch extends StatelessWidget {
+  const VPNSwitch({super.key});
+
+  @override
+  Widget build(BuildContext context) {
+    return Selector<Config, bool>(
+      selector: (_, config) => config.vpnProps.enable,
+      builder: (_, enable, __) {
+        return ListItem.switchItem(
+          leading: const Icon(Icons.stacked_line_chart),
+          title: const Text("VPN"),
+          subtitle: Text(appLocalizations.vpnEnableDesc),
+          delegate: SwitchDelegate(
+            value: enable,
+            onChanged: (bool value) async {
+              final config = globalState.appController.config;
+              final vpnProps = config.vpnProps;
+              config.vpnProps = vpnProps.copyWith(
+                enable: value,
+              );
+            },
+          ),
+        );
+      },
+    );
+  }
+}
+
+class VPNDisabledContainer extends StatelessWidget {
+  final Widget child;
+
+  const VPNDisabledContainer(
+    this.child, {
+    super.key,
+  });
+
+  @override
+  Widget build(BuildContext context) {
+    return Selector<Config, bool>(
+      selector: (_, config) => config.vpnProps.enable,
+      builder: (_, enable, child) {
+        return AbsorbPointer(
+          absorbing: !enable,
+          child: DisabledMask(
+            status: !enable,
+            child: child!,
+          ),
+        );
+      },
+      child: child,
+    );
+  }
+}
+
+class AllowBypassSwitch extends StatelessWidget {
+  const AllowBypassSwitch({super.key});
+
+  @override
+  Widget build(BuildContext context) {
+    return Selector<Config, bool>(
+      selector: (_, config) => config.vpnProps.allowBypass,
+      builder: (_, allowBypass, __) {
+        return ListItem.switchItem(
+          leading: const Icon(Icons.arrow_forward_outlined),
+          title: Text(appLocalizations.allowBypass),
+          subtitle: Text(appLocalizations.allowBypassDesc),
+          delegate: SwitchDelegate(
+            value: allowBypass,
+            onChanged: (bool value) async {
+              final config = globalState.appController.config;
+              final vpnProps = config.vpnProps;
+              config.vpnProps = vpnProps.copyWith(
+                allowBypass: value,
+              );
+            },
+          ),
+        );
+      },
+    );
+  }
+}
+
+class SystemProxySwitch extends StatelessWidget {
+  const SystemProxySwitch({super.key});
+
+  @override
+  Widget build(BuildContext context) {
+    return Selector<Config, bool>(
+      selector: (_, config) => config.vpnProps.systemProxy,
+      builder: (_, systemProxy, __) {
+        return ListItem.switchItem(
+          leading: const Icon(Icons.settings_ethernet),
+          title: Text(appLocalizations.systemProxy),
+          subtitle: Text(appLocalizations.systemProxyDesc),
+          delegate: SwitchDelegate(
+            value: systemProxy,
+            onChanged: (bool value) async {
+              final config = globalState.appController.config;
+              final vpnProps = config.vpnProps;
+              config.vpnProps = vpnProps.copyWith(
+                systemProxy: value,
+              );
+            },
+          ),
+        );
+      },
+    );
+  }
+}
+
+class VpnOptions extends StatelessWidget {
+  const VpnOptions({super.key});
+
+  @override
+  Widget build(BuildContext context) {
+    return VPNDisabledContainer(
+      Column(
+        children: generateSection(
+          title: appLocalizations.options,
+          items: [
+            const SystemProxySwitch(),
+            const AllowBypassSwitch(),
+          ],
+        ),
+      ),
+    );
+  }
+}
+
+final vpnItems = [
+  const VPNSwitch(),
+  const VpnOptions(),
+];

lib/fragments/dashboard/dashboard.dart

@@ -48,11 +48,11 @@ class _DashboardFragmentState extends State<DashboardFragment> {
                     crossAxisCellCount: 8,
                     child: NetworkSpeed(),
                   ),
-                  if (Platform.isAndroid)
-                    GridItem(
-                      crossAxisCellCount: switchCount,
-                      child: const VPNSwitch(),
-                    ),
+                  // if (Platform.isAndroid)
+                  //   GridItem(
+                  //     crossAxisCellCount: switchCount,
+                  //     child: const VPNSwitch(),
+                  //   ),
                   if (system.isDesktop) ...[
                     GridItem(
                       crossAxisCellCount: switchCount,

lib/fragments/dashboard/intranet_ip.dart

@@ -53,7 +53,7 @@ class _IntranetIPState extends State<IntranetIP> {
       },
       child: Container(
         padding: const EdgeInsets.all(16).copyWith(top: 0),
-        height: globalState.appController.measure.titleLargeHeight + 24 - 2,
+        height: globalState.measure.titleLargeHeight + 24 - 2,
         child: ValueListenableBuilder(
           valueListenable: ipNotifier,
           builder: (_, value, __) {

lib/fragments/dashboard/network_detection.dart

@@ -46,9 +46,7 @@ class _NetworkDetectionState extends State<NetworkDetection> {
         isTesting: false,
         ipInfo: ipInfo,
       );
-    } catch (_) {
-
-    }
+    } catch (_) {}
   }
 
   _checkIpContainer(Widget child) {
@@ -122,7 +120,7 @@ class _NetworkDetectionState extends State<NetworkDetection> {
                                 : ipInfo != null
                                     ? Container(
                                         alignment: Alignment.centerLeft,
-                                        height: globalState.appController
+                                        height: globalState
                                             .measure.titleMediumHeight,
                                         child: Text(
                                           countryCodeToEmoji(
@@ -150,9 +148,7 @@ class _NetworkDetectionState extends State<NetworkDetection> {
                   ),
                 ),
                 Container(
-                  height: globalState.appController.measure.titleLargeHeight +
-                      24 -
-                      2,
+                  height: globalState.measure.titleLargeHeight + 24 - 2,
                   alignment: Alignment.centerLeft,
                   padding: const EdgeInsets.all(16).copyWith(top: 0),
                   child: FadeBox(

lib/fragments/dashboard/network_speed.dart

@@ -59,7 +59,7 @@ class _NetworkSpeedState extends State<NetworkSpeed> {
       style: bodyMedium,
       maxLines: 1,
     );
-    final size = globalState.appController.measure.computeTextSize(valueText);
+    final size = globalState.measure.computeTextSize(valueText);
 
     return Column(
       crossAxisAlignment: CrossAxisAlignment.center,

lib/fragments/dashboard/start_button.dart

@@ -74,7 +74,7 @@ class _StartButtonState extends State<StartButton>
         if (!state.isInit || !state.hasProfile) {
           return Container();
         }
-        final textWidth = globalState.appController.measure
+        final textWidth = globalState.measure
                 .computeTextSize(
                   Text(
                     other.getTimeDifference(

lib/fragments/dashboard/status_switch.dart

@@ -5,34 +5,34 @@ import 'package:fl_clash/widgets/widgets.dart';
 import 'package:flutter/material.dart';
 import 'package:provider/provider.dart';
 
-class VPNSwitch extends StatelessWidget {
-  const VPNSwitch({super.key});
-
-  @override
-  Widget build(BuildContext context) {
-    return SwitchContainer(
-      info: const Info(
-        label: "VPN",
-        iconData: Icons.stacked_line_chart,
-      ),
-      child: Selector<Config, bool>(
-        selector: (_, config) => config.vpnProps.enable,
-        builder: (_, enable, __) {
-          return Switch(
-            materialTapTargetSize: MaterialTapTargetSize.shrinkWrap,
-            value: enable,
-            onChanged: (value) {
-              final config = globalState.appController.config;
-              config.vpnProps = config.vpnProps.copyWith(
-                enable: value,
-              );
-            },
-          );
-        },
-      ),
-    );
-  }
-}
+// class VPNSwitch extends StatelessWidget {
+//   const VPNSwitch({super.key});
+//
+//   @override
+//   Widget build(BuildContext context) {
+//     return SwitchContainer(
+//       info: const Info(
+//         label: "VPN",
+//         iconData: Icons.stacked_line_chart,
+//       ),
+//       child: Selector<Config, bool>(
+//         selector: (_, config) => config.vpnProps.enable,
+//         builder: (_, enable, __) {
+//           return Switch(
+//             materialTapTargetSize: MaterialTapTargetSize.shrinkWrap,
+//             value: enable,
+//             onChanged: (value) {
+//               final config = globalState.appController.config;
+//               config.vpnProps = config.vpnProps.copyWith(
+//                 enable: value,
+//               );
+//             },
+//           );
+//         },
+//       ),
+//     );
+//   }
+// }
 
 class TUNSwitch extends StatelessWidget {
   const TUNSwitch({super.key});

lib/fragments/fragments.dart

@@ -5,9 +5,9 @@ export 'profiles/profiles.dart';
 export 'logs.dart';
 export 'connections.dart';
 export 'access.dart';
-export 'config.dart';
+export 'config/config.dart';
 export 'application_setting.dart';
 export 'about.dart';
 export 'backup_and_recovery.dart';
 export 'resources.dart';
-export 'requests.dart';
+export 'requests.dart';

lib/fragments/profiles/profiles.dart

@@ -46,6 +46,7 @@ class _ProfilesFragmentState extends State<ProfilesFragment> {
     final messages = [];
     final updateProfiles = profiles.map<Future>(
       (profile) async {
+        if (profile.type == ProfileType.file) return;
         config.setProfile(
           profile.copyWith(isUpdating: true),
         );
@@ -494,26 +495,29 @@ class _ReorderableProfilesState extends State<ReorderableProfiles> {
             itemCount: profiles.length,
           ),
         ),
-        Padding(
+        Container(
           padding: const EdgeInsets.symmetric(
             vertical: 8,
-            horizontal: 12,
+            horizontal: 24,
           ),
-          child: Row(
-            mainAxisAlignment: MainAxisAlignment.end,
-            children: [
-              IconButton(
-                onPressed: () {
-                  Navigator.of(context).pop();
-                  globalState.appController.config.profiles = profiles;
-                },
-                icon: const Icon(
-                  Icons.check,
-                ),
-                iconSize: 32,
-                padding: const EdgeInsets.all(8),
+          child: FilledButton(
+            onPressed: () {
+              Navigator.of(context).pop();
+              globalState.appController.config.profiles = profiles;
+            },
+            style: ButtonStyle(
+              padding: WidgetStateProperty.all(
+                const EdgeInsets.symmetric(vertical: 16),
               ),
-            ],
+            ),
+            child: Row(
+              mainAxisAlignment: MainAxisAlignment.center,
+              children: [
+                Text(
+                  appLocalizations.confirm,
+                ),
+              ],
+            ),
           ),
         ),
       ],

lib/fragments/proxies/card.dart

@@ -23,7 +23,7 @@ class ProxyCard extends StatelessWidget {
     required this.type,
   });
 
-  Measure get measure => globalState.appController.measure;
+  Measure get measure => globalState.measure;
 
   Widget _buildDelayText() {
     return SizedBox(
@@ -119,7 +119,7 @@ class ProxyCard extends StatelessWidget {
 
   @override
   Widget build(BuildContext context) {
-    final measure = globalState.appController.measure;
+    final measure = globalState.measure;
     final delayText = _buildDelayText();
     final proxyNameText = _buildProxyNameText(context);
     return currentGroupProxyNameBuilder(

lib/fragments/proxies/common.dart

@@ -1,7 +1,7 @@
 import 'dart:math';
 
 import 'package:fl_clash/clash/clash.dart';
-import 'package:fl_clash/common/other.dart';
+import 'package:fl_clash/common/common.dart';
 import 'package:fl_clash/enum/enum.dart';
 import 'package:fl_clash/models/models.dart';
 import 'package:fl_clash/state.dart';
@@ -25,12 +25,12 @@ Widget currentGroupProxyNameBuilder({
 }
 
 double get listHeaderHeight {
-  final measure = globalState.appController.measure;
+  final measure = globalState.measure;
   return 24 + measure.titleMediumHeight + 4 + measure.bodyMediumHeight;
 }
 
 double getItemHeight(ProxyCardType proxyCardType) {
-  final measure = globalState.appController.measure;
+  final measure = globalState.measure;
   final baseHeight =
       12 * 2 + measure.bodyMediumHeight * 2 + measure.bodySmallHeight + 8;
   return switch (proxyCardType) {
@@ -51,8 +51,12 @@ delayTest(List<Proxy> proxies) async {
       ),
     );
     globalState.appController.setDelay(await clashCore.getDelay(proxyName));
-  });
-  await Future.wait(delayProxies);
+  }).toList();
+
+  final batchesDelayProxies = delayProxies.batch(100);
+  for (final batchDelayProxies in batchesDelayProxies) {
+    await Future.wait(batchDelayProxies);
+  }
   appController.appState.sortNum++;
 }
 

lib/fragments/proxies/list.dart

@@ -1,9 +1,11 @@
+import 'package:cached_network_image/cached_network_image.dart';
 import 'package:collection/collection.dart';
 import 'package:fl_clash/common/common.dart';
 import 'package:fl_clash/enum/enum.dart';
 import 'package:fl_clash/models/models.dart';
 import 'package:fl_clash/state.dart';
 import 'package:fl_clash/widgets/card.dart';
+import 'package:fl_clash/widgets/fade_box.dart';
 import 'package:fl_clash/widgets/text.dart';
 import 'package:flutter/material.dart';
 import 'package:provider/provider.dart';
@@ -353,6 +355,8 @@ class _ListHeaderState extends State<ListHeader>
   late Animation<double> _iconTurns;
   var isLock = false;
 
+  String get icon => widget.group.icon;
+
   String get groupName => widget.group.name;
 
   String get groupType => widget.group.type.name;
@@ -412,6 +416,7 @@ class _ListHeaderState extends State<ListHeader>
   Widget build(BuildContext context) {
     return CommonCard(
       key: widget.key,
+      radius: 24,
       type: CommonCardType.filled,
       child: Container(
         padding: const EdgeInsets.all(12),
@@ -419,57 +424,96 @@ class _ListHeaderState extends State<ListHeader>
           mainAxisAlignment: MainAxisAlignment.spaceBetween,
           children: [
             Flexible(
-              child: Column(
-                mainAxisSize: MainAxisSize.min,
-                crossAxisAlignment: CrossAxisAlignment.start,
+              child: Row(
                 children: [
-                  Text(
-                    groupName,
-                    style: context.textTheme.titleMedium,
+                  const SizedBox(
+                    width: 4,
+                  ),
+                  Container(
+                    height: 48,
+                    width: 48,
+                    padding: const EdgeInsets.all(8),
+                    decoration: BoxDecoration(
+                      color: context.colorScheme.secondaryContainer,
+                      borderRadius: BorderRadius.circular(16),
+                    ),
+                    clipBehavior: Clip.antiAlias,
+                    child: icon.isNotEmpty
+                        ? CachedNetworkImage(
+                            imageUrl: icon,
+                            errorWidget: (_, __, ___) => const Icon(
+                              IconsExt.target,
+                              size: 32,
+                            ),
+                          )
+                        : const Icon(
+                            IconsExt.target,
+                            size: 32,
+                          ),
                   ),
                   const SizedBox(
-                    height: 4,
+                    width: 16,
                   ),
                   Flexible(
-                    flex: 1,
-                    child: Row(
+                    child: Column(
                       mainAxisSize: MainAxisSize.min,
-                      mainAxisAlignment: MainAxisAlignment.start,
-                      crossAxisAlignment: CrossAxisAlignment.center,
+                      crossAxisAlignment: CrossAxisAlignment.start,
                       children: [
                         Text(
-                          groupType,
-                          style: context.textTheme.labelMedium?.toLight,
+                          groupName,
+                          style: context.textTheme.titleMedium,
+                        ),
+                        const SizedBox(
+                          height: 4,
                         ),
                         Flexible(
                           flex: 1,
-                          child: currentGroupProxyNameBuilder(
-                            groupName: groupName,
-                            builder: (currentGroupName) {
-                              return Row(
-                                mainAxisSize: MainAxisSize.min,
-                                mainAxisAlignment: MainAxisAlignment.start,
-                                crossAxisAlignment: CrossAxisAlignment.center,
-                                children: [
-                                  if (currentGroupName.isNotEmpty) ...[
-                                    Flexible(
-                                      flex: 1,
-                                      child: EmojiText(
-                                        overflow: TextOverflow.ellipsis,
-                                        " · $currentGroupName",
-                                        style: context
-                                            .textTheme.labelMedium?.toLight,
-                                      ),
-                                    ),
-                                  ]
-                                ],
-                              );
-                            },
+                          child: Row(
+                            mainAxisSize: MainAxisSize.min,
+                            mainAxisAlignment: MainAxisAlignment.start,
+                            crossAxisAlignment: CrossAxisAlignment.center,
+                            children: [
+                              Text(
+                                groupType,
+                                style: context.textTheme.labelMedium?.toLight,
+                              ),
+                              Flexible(
+                                flex: 1,
+                                child: currentGroupProxyNameBuilder(
+                                  groupName: groupName,
+                                  builder: (currentGroupName) {
+                                    return Row(
+                                      mainAxisSize: MainAxisSize.min,
+                                      mainAxisAlignment:
+                                          MainAxisAlignment.start,
+                                      crossAxisAlignment:
+                                          CrossAxisAlignment.center,
+                                      children: [
+                                        if (currentGroupName.isNotEmpty) ...[
+                                          Flexible(
+                                            flex: 1,
+                                            child: EmojiText(
+                                              overflow: TextOverflow.ellipsis,
+                                              " · $currentGroupName",
+                                              style: context.textTheme
+                                                  .labelMedium?.toLight,
+                                            ),
+                                          ),
+                                        ]
+                                      ],
+                                    );
+                                  },
+                                ),
+                              ),
+                            ],
                           ),
                         ),
+                        const SizedBox(
+                          width: 4,
+                        ),
                       ],
                     ),
-                  ),
+                  )
                 ],
               ),
             ),

lib/fragments/proxies/providers.dart

@@ -68,19 +68,30 @@ class _ProvidersState extends State<Providers> {
     return Selector<AppState, List<ExternalProvider>>(
       selector: (_, appState) => appState.providers,
       builder: (_, providers, ___) {
-        return ListView.separated(
-          itemBuilder: (_, index) {
-            return ProviderItem(
-              provider: providers[index],
-            );
-          },
-          separatorBuilder: (_, index) {
-            return const Divider(
-              height: 0,
-            );
-          },
-          itemCount: providers.length,
+        final proxyProviders =
+            providers.where((item) => item.type == "Proxy").map(
+                  (item) => ProviderItem(
+                    provider: item,
+                  ),
+                );
+        final ruleProviders =
+            providers.where((item) => item.type == "Rule").map(
+                  (item) => ProviderItem(
+                    provider: item,
+                  ),
+                );
+        final proxySection = generateSection(
+          title: appLocalizations.proxyProviders,
+          items: proxyProviders,
         );
+        final ruleSection = generateSection(
+          title: appLocalizations.ruleProviders,
+          items: ruleProviders,
+        );
+        return generateListView([
+          ...proxySection,
+          ...ruleSection,
+        ]);
       },
     );
   }

lib/fragments/proxies/proxies.dart

@@ -29,11 +29,11 @@ class _ProxiesFragmentState extends State<ProxiesFragment> {
           IconButton(
             onPressed: () {
               showExtendPage(
-                forceNotSide: true,
+                isScaffold: true,
                 extendPageWidth: 360,
                 context,
                 body: const Providers(),
-                title: appLocalizations.externalResources,
+                title: appLocalizations.providers,
               );
             },
             icon: const Icon(

lib/fragments/resources.dart

@@ -33,13 +33,21 @@ class Resources extends StatelessWidget {
         fileName: geoIpFileName,
         key: "geoip",
       ),
-      GeoItem(label: "GeoSite", fileName: geoSiteFileName, key: "geosite"),
+      GeoItem(
+        label: "GeoSite",
+        fileName: geoSiteFileName,
+        key: "geosite",
+      ),
       GeoItem(
         label: "MMDB",
         fileName: mmdbFileName,
         key: "mmdb",
       ),
-      GeoItem(label: "ASN", fileName: asnFileName, key: "asn"),
+      GeoItem(
+        label: "ASN",
+        fileName: asnFileName,
+        key: "asn",
+      ),
     ];
 
     return ListView.separated(
@@ -81,6 +89,7 @@ class _GeoDataListItemState extends State<GeoDataListItem> {
       child: UpdateGeoUrlFormDialog(
         title: geoItem.label,
         url: url,
+        defaultValue: defaultGeoXMap[geoItem.key],
       ),
     );
     if (newUrl != null && newUrl != url && mounted) {
@@ -238,11 +247,13 @@ class _GeoDataListItemState extends State<GeoDataListItem> {
 class UpdateGeoUrlFormDialog extends StatefulWidget {
   final String title;
   final String url;
+  final String? defaultValue;
 
   const UpdateGeoUrlFormDialog({
     super.key,
     required this.title,
     required this.url,
+    this.defaultValue
   });
 
   @override
@@ -258,6 +269,13 @@ class _UpdateGeoUrlFormDialogState extends State<UpdateGeoUrlFormDialog> {
     urlController = TextEditingController(text: widget.url);
   }
 
+  _handleReset() async {
+    if (widget.defaultValue == null) {
+      return;
+    }
+    Navigator.of(context).pop<String>(widget.defaultValue);
+  }
+
   _handleUpdate() async {
     final url = urlController.value.text;
     if (url.isEmpty) return;
@@ -285,6 +303,16 @@ class _UpdateGeoUrlFormDialogState extends State<UpdateGeoUrlFormDialog> {
         ),
       ),
       actions: [
+        if (widget.defaultValue != null &&
+            urlController.value.text != widget.defaultValue) ...[
+          TextButton(
+            onPressed: _handleReset,
+            child: Text(appLocalizations.reset),
+          ),
+          const SizedBox(
+            width: 4,
+          ),
+        ],
         TextButton(
           onPressed: _handleUpdate,
           child: Text(appLocalizations.submit),

lib/fragments/theme.dart

@@ -238,15 +238,66 @@ class _ThemeColorsBoxState extends State<ThemeColorsBox> {
                 ),
                 title: Text(appLocalizations.prueBlackMode),
                 delegate: SwitchDelegate(
-                  value: value,
-                  onChanged: (value){
-                    globalState.appController.config.prueBlack = value;
-                  }
-                ),
+                    value: value,
+                    onChanged: (value) {
+                      globalState.appController.config.prueBlack = value;
+                    }),
               );
             },
           ),
-        )
+        ),
+        // Padding(
+        //   padding: const EdgeInsets.symmetric(vertical: 16),
+        //   child: Selector<Config, bool>(
+        //     selector: (_, config) => config.scaleProps.custom,
+        //     builder: (_, value, ___) {
+        //       return ListItem.switchItem(
+        //         leading: Icon(
+        //           Icons.format_size_sharp,
+        //           color: context.colorScheme.primary,
+        //         ),
+        //         title: const Text("自定义字体大小"),
+        //         delegate: SwitchDelegate(
+        //           value: value,
+        //           onChanged: (value) {
+        //             globalState.appController.config.scaleProps =
+        //                 globalState.appController.config.scaleProps.copyWith(
+        //               custom: value,
+        //             );
+        //           },
+        //         ),
+        //       );
+        //     },
+        //   ),
+        // ),
+        // SizedBox(
+        //   height: 20,
+        //   child: Selector<Config, ScaleProps>(
+        //     selector: (_, config) => config.scaleProps,
+        //     builder: (_, props, ___) {
+        //       return AbsorbPointer(
+        //         absorbing: !props.custom,
+        //         child: DisabledMask(
+        //           status: !props.custom,
+        //           child: Slider(
+        //             value: props.scale,
+        //             min: 0.8,
+        //             max: 1.2,
+        //             onChanged: (value) {
+        //               globalState.appController.config.scaleProps =
+        //                   globalState.appController.config.scaleProps.copyWith(
+        //                 scale: value,
+        //               );
+        //             },
+        //           ),
+        //         ),
+        //       );
+        //     },
+        //   ),
+        // ),
+        const SizedBox(
+          height: 64,
+        ),
       ],
     );
   }

lib/fragments/tools.dart

@@ -4,7 +4,7 @@ import 'package:fl_clash/enum/enum.dart';
 import 'package:fl_clash/fragments/about.dart';
 import 'package:fl_clash/fragments/access.dart';
 import 'package:fl_clash/fragments/application_setting.dart';
-import 'package:fl_clash/fragments/config.dart';
+import 'package:fl_clash/fragments/config/config.dart';
 import 'package:fl_clash/l10n/l10n.dart';
 import 'package:fl_clash/models/models.dart';
 import 'package:fl_clash/state.dart';
@@ -82,44 +82,23 @@ class _ToolboxFragmentState extends State<ToolsFragment> {
           builder: (_, localeString, __) {
             final subTitle = localeString ?? appLocalizations.defaultText;
             final currentLocale = other.getLocaleForString(localeString);
-            return ListTile(
+            return ListItem<Locale?>.options(
               leading: const Icon(Icons.language_outlined),
               title: Text(appLocalizations.language),
               subtitle: Text(Intl.message(subTitle)),
-              onTap: () {
-                globalState.showCommonDialog(
-                  child: AlertDialog(
-                    title: Text(appLocalizations.language),
-                    contentPadding: const EdgeInsets.symmetric(
-                      horizontal: 8,
-                      vertical: 16,
-                    ),
-                    content: SizedBox(
-                      width: 250,
-                      child: Wrap(
-                        children: [
-                          for (final locale in [
-                            null,
-                            ...AppLocalizations.delegate.supportedLocales
-                          ])
-                            ListItem.radio(
-                              delegate: RadioDelegate<Locale?>(
-                                value: locale,
-                                groupValue: currentLocale,
-                                onChanged: (Locale? value) {
-                                  final config = context.read<Config>();
-                                  config.locale = value?.toString();
-                                  Navigator.of(context).pop();
-                                },
-                              ),
-                              title: Text(_getLocaleString(locale)),
-                            )
-                        ],
-                      ),
-                    ),
-                  ),
-                );
-              },
+              delegate: OptionsDelegate(
+                title: appLocalizations.language,
+                options: [
+                  null,
+                  ...AppLocalizations.delegate.supportedLocales
+                ],
+                onChanged: (Locale? value) {
+                  final config = context.read<Config>();
+                  config.locale = value?.toString();
+                },
+                textBuilder: (locale) => _getLocaleString(locale),
+                value: currentLocale,
+              ),
             );
           },
         ),
@@ -159,11 +138,10 @@ class _ToolboxFragmentState extends State<ToolsFragment> {
           delegate: OpenDelegate(
             title: appLocalizations.override,
             widget: const ConfigFragment(),
-            extendPageWidth: 360,
           ),
         ),
         ListItem.open(
-          leading: const Icon(Icons.settings_applications),
+          leading: const Icon(Icons.settings),
           title: Text(appLocalizations.application),
           subtitle: Text(appLocalizations.applicationDesc),
           delegate: OpenDelegate(

lib/l10n/arb/intl_en.arb

@@ -243,5 +243,50 @@
   "loose": "Loose",
   "profilesSort": "Profiles sort",
   "start": "Start",
-  "stop": "Stop"
+  "stop": "Stop",
+  "appDesc": "Processing app related settings",
+  "vpnDesc": "Modify VPN related settings",
+  "generalDesc": "Overwrite general settings",
+  "dnsDesc": "Update DNS related settings",
+  "key": "Key",
+  "value": "Value",
+  "keyNotEmpty": "The key cannot be empty",
+  "valueNotEmpty": "The value cannot be empty",
+  "hostsDesc": "Add Hosts",
+  "vpnTip": "Changes take effect after restarting the VPN",
+  "vpnEnableDesc": "Auto routes all system traffic through VpnService",
+  "options": "Options",
+  "loopback": "Loopback unlock tool",
+  "loopbackDesc": "Used for UWP loopback unlocking",
+  "providers": "Providers",
+  "proxyProviders": "Proxy providers",
+  "ruleProviders": "Rule providers",
+  "overrideDns": "Override Dns",
+  "overrideDnsDesc": "Turning it on will override the DNS options in the profile",
+  "status": "Status",
+  "statusDesc": "System DNS will be used when turned off",
+  "preferH3Desc": "Prioritize the use of DOH's http/3",
+  "respectRules": "Respect rules",
+  "respectRulesDesc": "DNS connection following rules, need to configure proxy-server-nameserver",
+  "dnsMode": "DNS mode",
+  "fakeipRange": "Fakeip range",
+  "fakeipFilter": "Fakeip filter",
+  "defaultNameserver": "Default nameserver",
+  "defaultNameserverDesc": "For resolving DNS server",
+  "nameserver": "Nameserver",
+  "nameserverDesc": "For resolving domain",
+  "useHosts": "Use hosts",
+  "useSystemHosts": "Use system hosts",
+  "nameserverPolicy": "Nameserver policy",
+  "nameserverPolicyDesc": "Specify the corresponding nameserver policy",
+  "proxyNameserver": "Proxy nameserver",
+  "proxyNameserverDesc": "Domain for resolving proxy nodes",
+  "fallback": "Fallback",
+  "fallbackDesc": "Generally use offshore DNS",
+  "fallbackFilter": "Fallback filter",
+  "geoipCode": "Geoip code",
+  "ipcidr": "Ipcidr",
+  "domain": "Domain",
+  "resetDns": "Reset Dns",
+  "reset": "Reset"
 }

lib/l10n/arb/intl_zh_CN.arb

@@ -243,5 +243,50 @@
   "loose": "紧凑",
   "profilesSort": "配置排序",
   "start": "启动",
-  "stop": "暂停"
+  "stop": "暂停",
+  "appDesc": "处理应用相关设置",
+  "vpnDesc": "修改VPN相关设置",
+  "generalDesc": "覆写基础设置",
+  "dnsDesc": "更新DNS相关设置",
+  "key": "键",
+  "value": "值",
+  "keyNotEmpty": "键不能为空",
+  "valueNotEmpty": "值不能为空",
+  "hostsDesc": "追加Hosts",
+  "vpnTip": "重启VPN后改变生效",
+  "vpnEnableDesc": "通过VpnService自动路由系统所有流量",
+  "options": "选项",
+  "loopback": "回环解锁工具",
+  "loopbackDesc": "用于UWP回环解锁",
+  "providers": "提供者",
+  "proxyProviders": "代理提供者",
+  "ruleProviders": "规则提供者",
+  "overrideDns": "覆写DNS",
+  "overrideDnsDesc": "开启后将覆盖配置中的DNS选项",
+  "status": "状态",
+  "statusDesc": "关闭后将使用系统DNS",
+  "preferH3Desc": "优先使用DOH的http/3",
+  "respectRules": "遵守规则",
+  "respectRulesDesc": "DNS连接跟随rules,需配置proxy-server-nameserver",
+  "dnsMode": "DNS模式",
+  "fakeipRange": "Fakeip范围",
+  "fakeipFilter": "Fakeip过滤",
+  "defaultNameserver": "默认域名服务器",
+  "defaultNameserverDesc": "用于解析DNS服务器",
+  "nameserver": "域名服务器",
+  "nameserverDesc": "用于解析域名",
+  "useHosts": "使用Hosts",
+  "useSystemHosts": "使用系统Hosts",
+  "nameserverPolicy": "域名服务器策略",
+  "nameserverPolicyDesc": "指定对应域名服务器策略",
+  "proxyNameserver": "代理域名服务器",
+  "proxyNameserverDesc": "用于解析代理节点的域名",
+  "fallback": "Fallback",
+  "fallbackDesc": "一般情况下使用境外DNS",
+  "fallbackFilter": "Fallback过滤",
+  "geoipCode": "Geoip代码",
+  "ipcidr": "IP/掩码",
+  "domain": "域名",
+  "resetDns": "重置DNS",
+  "reset": "重置"
 }

lib/l10n/intl/messages_en.dart

@@ -52,6 +52,8 @@ class MessageLookup extends MessageLookupByLibrary {
         "app": MessageLookupByLibrary.simpleMessage("App"),
         "appAccessControl":
             MessageLookupByLibrary.simpleMessage("App access control"),
+        "appDesc": MessageLookupByLibrary.simpleMessage(
+            "Processing app related settings"),
         "application": MessageLookupByLibrary.simpleMessage("Application"),
         "applicationDesc": MessageLookupByLibrary.simpleMessage(
             "Modify application related settings"),
@@ -114,6 +116,10 @@ class MessageLookup extends MessageLookupByLibrary {
         "dark": MessageLookupByLibrary.simpleMessage("Dark"),
         "dashboard": MessageLookupByLibrary.simpleMessage("Dashboard"),
         "days": MessageLookupByLibrary.simpleMessage("Days"),
+        "defaultNameserver":
+            MessageLookupByLibrary.simpleMessage("Default nameserver"),
+        "defaultNameserverDesc":
+            MessageLookupByLibrary.simpleMessage("For resolving DNS server"),
         "defaultSort": MessageLookupByLibrary.simpleMessage("Sort by default"),
         "defaultText": MessageLookupByLibrary.simpleMessage("Default"),
         "delay": MessageLookupByLibrary.simpleMessage("Delay"),
@@ -128,8 +134,12 @@ class MessageLookup extends MessageLookupByLibrary {
             MessageLookupByLibrary.simpleMessage("Discover the new version"),
         "discovery":
             MessageLookupByLibrary.simpleMessage("Discovery a new version"),
+        "dnsDesc":
+            MessageLookupByLibrary.simpleMessage("Update DNS related settings"),
+        "dnsMode": MessageLookupByLibrary.simpleMessage("DNS mode"),
         "doYouWantToPass":
             MessageLookupByLibrary.simpleMessage("Do you want to pass"),
+        "domain": MessageLookupByLibrary.simpleMessage("Domain"),
         "download": MessageLookupByLibrary.simpleMessage("Download"),
         "edit": MessageLookupByLibrary.simpleMessage("Edit"),
         "en": MessageLookupByLibrary.simpleMessage("English"),
@@ -149,6 +159,13 @@ class MessageLookup extends MessageLookupByLibrary {
         "externalLink": MessageLookupByLibrary.simpleMessage("External link"),
         "externalResources":
             MessageLookupByLibrary.simpleMessage("External resources"),
+        "fakeipFilter": MessageLookupByLibrary.simpleMessage("Fakeip filter"),
+        "fakeipRange": MessageLookupByLibrary.simpleMessage("Fakeip range"),
+        "fallback": MessageLookupByLibrary.simpleMessage("Fallback"),
+        "fallbackDesc":
+            MessageLookupByLibrary.simpleMessage("Generally use offshore DNS"),
+        "fallbackFilter":
+            MessageLookupByLibrary.simpleMessage("Fallback filter"),
         "file": MessageLookupByLibrary.simpleMessage("File"),
         "fileDesc":
             MessageLookupByLibrary.simpleMessage("Directly upload profile"),
@@ -159,14 +176,18 @@ class MessageLookup extends MessageLookupByLibrary {
             "There is a risk of flashback after opening"),
         "fourColumns": MessageLookupByLibrary.simpleMessage("Four columns"),
         "general": MessageLookupByLibrary.simpleMessage("General"),
+        "generalDesc":
+            MessageLookupByLibrary.simpleMessage("Overwrite general settings"),
         "geoData": MessageLookupByLibrary.simpleMessage("GeoData"),
         "geodataLoader":
             MessageLookupByLibrary.simpleMessage("Geo Low Memory Mode"),
         "geodataLoaderDesc": MessageLookupByLibrary.simpleMessage(
             "Enabling will use the Geo low memory loader"),
+        "geoipCode": MessageLookupByLibrary.simpleMessage("Geoip code"),
         "global": MessageLookupByLibrary.simpleMessage("Global"),
         "go": MessageLookupByLibrary.simpleMessage("Go"),
         "goDownload": MessageLookupByLibrary.simpleMessage("Go to download"),
+        "hostsDesc": MessageLookupByLibrary.simpleMessage("Add Hosts"),
         "hours": MessageLookupByLibrary.simpleMessage("Hours"),
         "importFromURL":
             MessageLookupByLibrary.simpleMessage("Import from URL"),
@@ -176,11 +197,15 @@ class MessageLookup extends MessageLookupByLibrary {
         "intelligentSelected":
             MessageLookupByLibrary.simpleMessage("Intelligent selection"),
         "intranetIP": MessageLookupByLibrary.simpleMessage("Intranet IP"),
+        "ipcidr": MessageLookupByLibrary.simpleMessage("Ipcidr"),
         "ipv6Desc": MessageLookupByLibrary.simpleMessage(
             "When turned on it will be able to receive IPv6 traffic"),
         "just": MessageLookupByLibrary.simpleMessage("Just"),
         "keepAliveIntervalDesc":
             MessageLookupByLibrary.simpleMessage("Tcp keep alive interval"),
+        "key": MessageLookupByLibrary.simpleMessage("Key"),
+        "keyNotEmpty":
+            MessageLookupByLibrary.simpleMessage("The key cannot be empty"),
         "language": MessageLookupByLibrary.simpleMessage("Language"),
         "layout": MessageLookupByLibrary.simpleMessage("Layout"),
         "light": MessageLookupByLibrary.simpleMessage("Light"),
@@ -196,6 +221,10 @@ class MessageLookup extends MessageLookupByLibrary {
             "Disabling will hide the log entry"),
         "logs": MessageLookupByLibrary.simpleMessage("Logs"),
         "logsDesc": MessageLookupByLibrary.simpleMessage("Log capture records"),
+        "loopback":
+            MessageLookupByLibrary.simpleMessage("Loopback unlock tool"),
+        "loopbackDesc": MessageLookupByLibrary.simpleMessage(
+            "Used for UWP loopback unlocking"),
         "loose": MessageLookupByLibrary.simpleMessage("Loose"),
         "min": MessageLookupByLibrary.simpleMessage("Min"),
         "minimizeOnExit":
@@ -208,6 +237,13 @@ class MessageLookup extends MessageLookupByLibrary {
         "more": MessageLookupByLibrary.simpleMessage("More"),
         "name": MessageLookupByLibrary.simpleMessage("Name"),
         "nameSort": MessageLookupByLibrary.simpleMessage("Sort by name"),
+        "nameserver": MessageLookupByLibrary.simpleMessage("Nameserver"),
+        "nameserverDesc":
+            MessageLookupByLibrary.simpleMessage("For resolving domain"),
+        "nameserverPolicy":
+            MessageLookupByLibrary.simpleMessage("Nameserver policy"),
+        "nameserverPolicyDesc": MessageLookupByLibrary.simpleMessage(
+            "Specify the corresponding nameserver policy"),
         "networkDetection":
             MessageLookupByLibrary.simpleMessage("Network detection"),
         "networkSpeed": MessageLookupByLibrary.simpleMessage("Network speed"),
@@ -233,6 +269,7 @@ class MessageLookup extends MessageLookupByLibrary {
             MessageLookupByLibrary.simpleMessage("Only statistics proxy"),
         "onlyStatisticsProxyDesc": MessageLookupByLibrary.simpleMessage(
             "When turned on, only statistics proxy traffic"),
+        "options": MessageLookupByLibrary.simpleMessage("Options"),
         "other": MessageLookupByLibrary.simpleMessage("Other"),
         "otherContributors":
             MessageLookupByLibrary.simpleMessage("Other contributors"),
@@ -240,6 +277,9 @@ class MessageLookup extends MessageLookupByLibrary {
         "override": MessageLookupByLibrary.simpleMessage("Override"),
         "overrideDesc": MessageLookupByLibrary.simpleMessage(
             "Override Proxy related config"),
+        "overrideDns": MessageLookupByLibrary.simpleMessage("Override Dns"),
+        "overrideDnsDesc": MessageLookupByLibrary.simpleMessage(
+            "Turning it on will override the DNS options in the profile"),
         "password": MessageLookupByLibrary.simpleMessage("Password"),
         "passwordTip":
             MessageLookupByLibrary.simpleMessage("Password cannot be empty"),
@@ -251,6 +291,8 @@ class MessageLookup extends MessageLookupByLibrary {
         "pleaseUploadValidQrcode": MessageLookupByLibrary.simpleMessage(
             "Please upload a valid QR code"),
         "port": MessageLookupByLibrary.simpleMessage("Port"),
+        "preferH3Desc": MessageLookupByLibrary.simpleMessage(
+            "Prioritize the use of DOH\'s http/3"),
         "preview": MessageLookupByLibrary.simpleMessage("Preview"),
         "profile": MessageLookupByLibrary.simpleMessage("Profile"),
         "profileAutoUpdateIntervalInvalidValidationDesc":
@@ -270,13 +312,20 @@ class MessageLookup extends MessageLookupByLibrary {
         "profiles": MessageLookupByLibrary.simpleMessage("Profiles"),
         "profilesSort": MessageLookupByLibrary.simpleMessage("Profiles sort"),
         "project": MessageLookupByLibrary.simpleMessage("Project"),
+        "providers": MessageLookupByLibrary.simpleMessage("Providers"),
         "proxies": MessageLookupByLibrary.simpleMessage("Proxies"),
         "proxiesSetting":
             MessageLookupByLibrary.simpleMessage("Proxies setting"),
         "proxyGroup": MessageLookupByLibrary.simpleMessage("Proxy group"),
+        "proxyNameserver":
+            MessageLookupByLibrary.simpleMessage("Proxy nameserver"),
+        "proxyNameserverDesc": MessageLookupByLibrary.simpleMessage(
+            "Domain for resolving proxy nodes"),
         "proxyPort": MessageLookupByLibrary.simpleMessage("ProxyPort"),
         "proxyPortDesc": MessageLookupByLibrary.simpleMessage(
             "Set the Clash listening port"),
+        "proxyProviders":
+            MessageLookupByLibrary.simpleMessage("Proxy providers"),
         "prueBlackMode":
             MessageLookupByLibrary.simpleMessage("Prue black mode"),
         "qrcode": MessageLookupByLibrary.simpleMessage("QR code"),
@@ -297,10 +346,16 @@ class MessageLookup extends MessageLookupByLibrary {
         "requests": MessageLookupByLibrary.simpleMessage("Requests"),
         "requestsDesc": MessageLookupByLibrary.simpleMessage(
             "View recently request records"),
+        "reset": MessageLookupByLibrary.simpleMessage("Reset"),
+        "resetDns": MessageLookupByLibrary.simpleMessage("Reset Dns"),
         "resources": MessageLookupByLibrary.simpleMessage("Resources"),
         "resourcesDesc": MessageLookupByLibrary.simpleMessage(
             "External resource related info"),
+        "respectRules": MessageLookupByLibrary.simpleMessage("Respect rules"),
+        "respectRulesDesc": MessageLookupByLibrary.simpleMessage(
+            "DNS connection following rules, need to configure proxy-server-nameserver"),
         "rule": MessageLookupByLibrary.simpleMessage("Rule"),
+        "ruleProviders": MessageLookupByLibrary.simpleMessage("Rule providers"),
         "save": MessageLookupByLibrary.simpleMessage("Save"),
         "search": MessageLookupByLibrary.simpleMessage("Search"),
         "seconds": MessageLookupByLibrary.simpleMessage("Seconds"),
@@ -318,6 +373,9 @@ class MessageLookup extends MessageLookupByLibrary {
         "standard": MessageLookupByLibrary.simpleMessage("Standard"),
         "start": MessageLookupByLibrary.simpleMessage("Start"),
         "startVpn": MessageLookupByLibrary.simpleMessage("Staring VPN..."),
+        "status": MessageLookupByLibrary.simpleMessage("Status"),
+        "statusDesc": MessageLookupByLibrary.simpleMessage(
+            "System DNS will be used when turned off"),
         "stop": MessageLookupByLibrary.simpleMessage("Stop"),
         "stopVpn": MessageLookupByLibrary.simpleMessage("Stopping VPN..."),
         "style": MessageLookupByLibrary.simpleMessage("Style"),
@@ -361,7 +419,19 @@ class MessageLookup extends MessageLookupByLibrary {
         "url": MessageLookupByLibrary.simpleMessage("URL"),
         "urlDesc":
             MessageLookupByLibrary.simpleMessage("Obtain profile through URL"),
+        "useHosts": MessageLookupByLibrary.simpleMessage("Use hosts"),
+        "useSystemHosts":
+            MessageLookupByLibrary.simpleMessage("Use system hosts"),
+        "value": MessageLookupByLibrary.simpleMessage("Value"),
+        "valueNotEmpty":
+            MessageLookupByLibrary.simpleMessage("The value cannot be empty"),
         "view": MessageLookupByLibrary.simpleMessage("View"),
+        "vpnDesc":
+            MessageLookupByLibrary.simpleMessage("Modify VPN related settings"),
+        "vpnEnableDesc": MessageLookupByLibrary.simpleMessage(
+            "Auto routes all system traffic through VpnService"),
+        "vpnTip": MessageLookupByLibrary.simpleMessage(
+            "Changes take effect after restarting the VPN"),
         "webDAVConfiguration":
             MessageLookupByLibrary.simpleMessage("WebDAV configuration"),
         "whitelistMode": MessageLookupByLibrary.simpleMessage("Whitelist mode"),

lib/l10n/intl/messages_zh_CN.dart

@@ -45,6 +45,7 @@ class MessageLookup extends MessageLookupByLibrary {
         "allowLanDesc": MessageLookupByLibrary.simpleMessage("允许通过局域网访问代理"),
         "app": MessageLookupByLibrary.simpleMessage("应用"),
         "appAccessControl": MessageLookupByLibrary.simpleMessage("应用访问控制"),
+        "appDesc": MessageLookupByLibrary.simpleMessage("处理应用相关设置"),
         "application": MessageLookupByLibrary.simpleMessage("应用程序"),
         "applicationDesc": MessageLookupByLibrary.simpleMessage("修改应用程序相关设置"),
         "auto": MessageLookupByLibrary.simpleMessage("自动"),
@@ -94,6 +95,9 @@ class MessageLookup extends MessageLookupByLibrary {
         "dark": MessageLookupByLibrary.simpleMessage("深色"),
         "dashboard": MessageLookupByLibrary.simpleMessage("仪表盘"),
         "days": MessageLookupByLibrary.simpleMessage("天"),
+        "defaultNameserver": MessageLookupByLibrary.simpleMessage("默认域名服务器"),
+        "defaultNameserverDesc":
+            MessageLookupByLibrary.simpleMessage("用于解析DNS服务器"),
         "defaultSort": MessageLookupByLibrary.simpleMessage("按默认排序"),
         "defaultText": MessageLookupByLibrary.simpleMessage("默认"),
         "delay": MessageLookupByLibrary.simpleMessage("延迟"),
@@ -105,7 +109,10 @@ class MessageLookup extends MessageLookupByLibrary {
         "direct": MessageLookupByLibrary.simpleMessage("直连"),
         "discoverNewVersion": MessageLookupByLibrary.simpleMessage("发现新版本"),
         "discovery": MessageLookupByLibrary.simpleMessage("发现新版本"),
+        "dnsDesc": MessageLookupByLibrary.simpleMessage("更新DNS相关设置"),
+        "dnsMode": MessageLookupByLibrary.simpleMessage("DNS模式"),
         "doYouWantToPass": MessageLookupByLibrary.simpleMessage("是否要通过"),
+        "domain": MessageLookupByLibrary.simpleMessage("域名"),
         "download": MessageLookupByLibrary.simpleMessage("下载"),
         "edit": MessageLookupByLibrary.simpleMessage("编辑"),
         "en": MessageLookupByLibrary.simpleMessage("英语"),
@@ -121,6 +128,11 @@ class MessageLookup extends MessageLookupByLibrary {
             MessageLookupByLibrary.simpleMessage("开启后将可以通过9090端口控制Clash内核"),
         "externalLink": MessageLookupByLibrary.simpleMessage("外部链接"),
         "externalResources": MessageLookupByLibrary.simpleMessage("外部资源"),
+        "fakeipFilter": MessageLookupByLibrary.simpleMessage("Fakeip过滤"),
+        "fakeipRange": MessageLookupByLibrary.simpleMessage("Fakeip范围"),
+        "fallback": MessageLookupByLibrary.simpleMessage("Fallback"),
+        "fallbackDesc": MessageLookupByLibrary.simpleMessage("一般情况下使用境外DNS"),
+        "fallbackFilter": MessageLookupByLibrary.simpleMessage("Fallback过滤"),
         "file": MessageLookupByLibrary.simpleMessage("文件"),
         "fileDesc": MessageLookupByLibrary.simpleMessage("直接上传配置文件"),
         "filterSystemApp": MessageLookupByLibrary.simpleMessage("过滤系统应用"),
@@ -129,23 +141,29 @@ class MessageLookup extends MessageLookupByLibrary {
             MessageLookupByLibrary.simpleMessage("开启后存在闪退风险"),
         "fourColumns": MessageLookupByLibrary.simpleMessage("四列"),
         "general": MessageLookupByLibrary.simpleMessage("基础"),
+        "generalDesc": MessageLookupByLibrary.simpleMessage("覆写基础设置"),
         "geoData": MessageLookupByLibrary.simpleMessage("地理数据"),
         "geodataLoader": MessageLookupByLibrary.simpleMessage("Geo低内存模式"),
         "geodataLoaderDesc":
             MessageLookupByLibrary.simpleMessage("开启将使用Geo低内存加载器"),
+        "geoipCode": MessageLookupByLibrary.simpleMessage("Geoip代码"),
         "global": MessageLookupByLibrary.simpleMessage("全局"),
         "go": MessageLookupByLibrary.simpleMessage("前往"),
         "goDownload": MessageLookupByLibrary.simpleMessage("前往下载"),
+        "hostsDesc": MessageLookupByLibrary.simpleMessage("追加Hosts"),
         "hours": MessageLookupByLibrary.simpleMessage("小时"),
         "importFromURL": MessageLookupByLibrary.simpleMessage("从URL导入"),
         "infiniteTime": MessageLookupByLibrary.simpleMessage("长期有效"),
         "init": MessageLookupByLibrary.simpleMessage("初始化"),
         "intelligentSelected": MessageLookupByLibrary.simpleMessage("智能选择"),
         "intranetIP": MessageLookupByLibrary.simpleMessage("内网 IP"),
+        "ipcidr": MessageLookupByLibrary.simpleMessage("IP/掩码"),
         "ipv6Desc": MessageLookupByLibrary.simpleMessage("开启后将可以接收IPv6流量"),
         "just": MessageLookupByLibrary.simpleMessage("刚刚"),
         "keepAliveIntervalDesc":
             MessageLookupByLibrary.simpleMessage("TCP保持活动间隔"),
+        "key": MessageLookupByLibrary.simpleMessage("键"),
+        "keyNotEmpty": MessageLookupByLibrary.simpleMessage("键不能为空"),
         "language": MessageLookupByLibrary.simpleMessage("语言"),
         "layout": MessageLookupByLibrary.simpleMessage("布局"),
         "light": MessageLookupByLibrary.simpleMessage("浅色"),
@@ -158,6 +176,8 @@ class MessageLookup extends MessageLookupByLibrary {
         "logcatDesc": MessageLookupByLibrary.simpleMessage("禁用将会隐藏日志入口"),
         "logs": MessageLookupByLibrary.simpleMessage("日志"),
         "logsDesc": MessageLookupByLibrary.simpleMessage("日志捕获记录"),
+        "loopback": MessageLookupByLibrary.simpleMessage("回环解锁工具"),
+        "loopbackDesc": MessageLookupByLibrary.simpleMessage("用于UWP回环解锁"),
         "loose": MessageLookupByLibrary.simpleMessage("紧凑"),
         "min": MessageLookupByLibrary.simpleMessage("最小"),
         "minimizeOnExit": MessageLookupByLibrary.simpleMessage("退出时最小化"),
@@ -169,6 +189,11 @@ class MessageLookup extends MessageLookupByLibrary {
         "more": MessageLookupByLibrary.simpleMessage("更多"),
         "name": MessageLookupByLibrary.simpleMessage("名称"),
         "nameSort": MessageLookupByLibrary.simpleMessage("按名称排序"),
+        "nameserver": MessageLookupByLibrary.simpleMessage("域名服务器"),
+        "nameserverDesc": MessageLookupByLibrary.simpleMessage("用于解析域名"),
+        "nameserverPolicy": MessageLookupByLibrary.simpleMessage("域名服务器策略"),
+        "nameserverPolicyDesc":
+            MessageLookupByLibrary.simpleMessage("指定对应域名服务器策略"),
         "networkDetection": MessageLookupByLibrary.simpleMessage("网络检测"),
         "networkSpeed": MessageLookupByLibrary.simpleMessage("网络速度"),
         "noInfo": MessageLookupByLibrary.simpleMessage("暂无信息"),
@@ -188,11 +213,15 @@ class MessageLookup extends MessageLookupByLibrary {
         "onlyStatisticsProxy": MessageLookupByLibrary.simpleMessage("仅统计代理"),
         "onlyStatisticsProxyDesc":
             MessageLookupByLibrary.simpleMessage("开启后，将只统计代理流量"),
+        "options": MessageLookupByLibrary.simpleMessage("选项"),
         "other": MessageLookupByLibrary.simpleMessage("其他"),
         "otherContributors": MessageLookupByLibrary.simpleMessage("其他贡献者"),
         "outboundMode": MessageLookupByLibrary.simpleMessage("出站模式"),
         "override": MessageLookupByLibrary.simpleMessage("覆写"),
         "overrideDesc": MessageLookupByLibrary.simpleMessage("覆写代理相关配置"),
+        "overrideDns": MessageLookupByLibrary.simpleMessage("覆写DNS"),
+        "overrideDnsDesc":
+            MessageLookupByLibrary.simpleMessage("开启后将覆盖配置中的DNS选项"),
         "password": MessageLookupByLibrary.simpleMessage("密码"),
         "passwordTip": MessageLookupByLibrary.simpleMessage("密码不能为空"),
         "paste": MessageLookupByLibrary.simpleMessage("粘贴"),
@@ -201,6 +230,7 @@ class MessageLookup extends MessageLookupByLibrary {
         "pleaseUploadValidQrcode":
             MessageLookupByLibrary.simpleMessage("请上传有效的二维码"),
         "port": MessageLookupByLibrary.simpleMessage("端口"),
+        "preferH3Desc": MessageLookupByLibrary.simpleMessage("优先使用DOH的http/3"),
         "preview": MessageLookupByLibrary.simpleMessage("预览"),
         "profile": MessageLookupByLibrary.simpleMessage("配置"),
         "profileAutoUpdateIntervalInvalidValidationDesc":
@@ -218,11 +248,16 @@ class MessageLookup extends MessageLookupByLibrary {
         "profiles": MessageLookupByLibrary.simpleMessage("配置"),
         "profilesSort": MessageLookupByLibrary.simpleMessage("配置排序"),
         "project": MessageLookupByLibrary.simpleMessage("项目"),
+        "providers": MessageLookupByLibrary.simpleMessage("提供者"),
         "proxies": MessageLookupByLibrary.simpleMessage("代理"),
         "proxiesSetting": MessageLookupByLibrary.simpleMessage("代理设置"),
         "proxyGroup": MessageLookupByLibrary.simpleMessage("代理组"),
+        "proxyNameserver": MessageLookupByLibrary.simpleMessage("代理域名服务器"),
+        "proxyNameserverDesc":
+            MessageLookupByLibrary.simpleMessage("用于解析代理节点的域名"),
         "proxyPort": MessageLookupByLibrary.simpleMessage("代理端口"),
         "proxyPortDesc": MessageLookupByLibrary.simpleMessage("设置Clash监听端口"),
+        "proxyProviders": MessageLookupByLibrary.simpleMessage("代理提供者"),
         "prueBlackMode": MessageLookupByLibrary.simpleMessage("纯黑模式"),
         "qrcode": MessageLookupByLibrary.simpleMessage("二维码"),
         "qrcodeDesc": MessageLookupByLibrary.simpleMessage("扫描二维码获取配置文件"),
@@ -236,9 +271,15 @@ class MessageLookup extends MessageLookupByLibrary {
             MessageLookupByLibrary.simpleMessage("通过WebDAV恢复数据"),
         "requests": MessageLookupByLibrary.simpleMessage("请求"),
         "requestsDesc": MessageLookupByLibrary.simpleMessage("查看最近请求记录"),
+        "reset": MessageLookupByLibrary.simpleMessage("重置"),
+        "resetDns": MessageLookupByLibrary.simpleMessage("重置DNS"),
         "resources": MessageLookupByLibrary.simpleMessage("资源"),
         "resourcesDesc": MessageLookupByLibrary.simpleMessage("外部资源相关信息"),
+        "respectRules": MessageLookupByLibrary.simpleMessage("遵守规则"),
+        "respectRulesDesc": MessageLookupByLibrary.simpleMessage(
+            "DNS连接跟随rules,需配置proxy-server-nameserver"),
         "rule": MessageLookupByLibrary.simpleMessage("规则"),
+        "ruleProviders": MessageLookupByLibrary.simpleMessage("规则提供者"),
         "save": MessageLookupByLibrary.simpleMessage("保存"),
         "search": MessageLookupByLibrary.simpleMessage("搜索"),
         "seconds": MessageLookupByLibrary.simpleMessage("秒"),
@@ -255,6 +296,8 @@ class MessageLookup extends MessageLookupByLibrary {
         "standard": MessageLookupByLibrary.simpleMessage("标准"),
         "start": MessageLookupByLibrary.simpleMessage("启动"),
         "startVpn": MessageLookupByLibrary.simpleMessage("正在启动VPN..."),
+        "status": MessageLookupByLibrary.simpleMessage("状态"),
+        "statusDesc": MessageLookupByLibrary.simpleMessage("关闭后将使用系统DNS"),
         "stop": MessageLookupByLibrary.simpleMessage("暂停"),
         "stopVpn": MessageLookupByLibrary.simpleMessage("正在停止VPN..."),
         "style": MessageLookupByLibrary.simpleMessage("风格"),
@@ -292,7 +335,15 @@ class MessageLookup extends MessageLookupByLibrary {
         "upload": MessageLookupByLibrary.simpleMessage("上传"),
         "url": MessageLookupByLibrary.simpleMessage("URL"),
         "urlDesc": MessageLookupByLibrary.simpleMessage("通过URL获取配置文件"),
+        "useHosts": MessageLookupByLibrary.simpleMessage("使用Hosts"),
+        "useSystemHosts": MessageLookupByLibrary.simpleMessage("使用系统Hosts"),
+        "value": MessageLookupByLibrary.simpleMessage("值"),
+        "valueNotEmpty": MessageLookupByLibrary.simpleMessage("值不能为空"),
         "view": MessageLookupByLibrary.simpleMessage("查看"),
+        "vpnDesc": MessageLookupByLibrary.simpleMessage("修改VPN相关设置"),
+        "vpnEnableDesc":
+            MessageLookupByLibrary.simpleMessage("通过VpnService自动路由系统所有流量"),
+        "vpnTip": MessageLookupByLibrary.simpleMessage("重启VPN后改变生效"),
         "webDAVConfiguration": MessageLookupByLibrary.simpleMessage("WebDAV配置"),
         "whitelistMode": MessageLookupByLibrary.simpleMessage("白名单模式"),
         "years": MessageLookupByLibrary.simpleMessage("年"),

lib/l10n/l10n.dart

@@ -2499,6 +2499,456 @@ class AppLocalizations {
       args: [],
     );
   }
+
+  /// `Processing app related settings`
+  String get appDesc {
+    return Intl.message(
+      'Processing app related settings',
+      name: 'appDesc',
+      desc: '',
+      args: [],
+    );
+  }
+
+  /// `Modify VPN related settings`
+  String get vpnDesc {
+    return Intl.message(
+      'Modify VPN related settings',
+      name: 'vpnDesc',
+      desc: '',
+      args: [],
+    );
+  }
+
+  /// `Overwrite general settings`
+  String get generalDesc {
+    return Intl.message(
+      'Overwrite general settings',
+      name: 'generalDesc',
+      desc: '',
+      args: [],
+    );
+  }
+
+  /// `Update DNS related settings`
+  String get dnsDesc {
+    return Intl.message(
+      'Update DNS related settings',
+      name: 'dnsDesc',
+      desc: '',
+      args: [],
+    );
+  }
+
+  /// `Key`
+  String get key {
+    return Intl.message(
+      'Key',
+      name: 'key',
+      desc: '',
+      args: [],
+    );
+  }
+
+  /// `Value`
+  String get value {
+    return Intl.message(
+      'Value',
+      name: 'value',
+      desc: '',
+      args: [],
+    );
+  }
+
+  /// `The key cannot be empty`
+  String get keyNotEmpty {
+    return Intl.message(
+      'The key cannot be empty',
+      name: 'keyNotEmpty',
+      desc: '',
+      args: [],
+    );
+  }
+
+  /// `The value cannot be empty`
+  String get valueNotEmpty {
+    return Intl.message(
+      'The value cannot be empty',
+      name: 'valueNotEmpty',
+      desc: '',
+      args: [],
+    );
+  }
+
+  /// `Add Hosts`
+  String get hostsDesc {
+    return Intl.message(
+      'Add Hosts',
+      name: 'hostsDesc',
+      desc: '',
+      args: [],
+    );
+  }
+
+  /// `Changes take effect after restarting the VPN`
+  String get vpnTip {
+    return Intl.message(
+      'Changes take effect after restarting the VPN',
+      name: 'vpnTip',
+      desc: '',
+      args: [],
+    );
+  }
+
+  /// `Auto routes all system traffic through VpnService`
+  String get vpnEnableDesc {
+    return Intl.message(
+      'Auto routes all system traffic through VpnService',
+      name: 'vpnEnableDesc',
+      desc: '',
+      args: [],
+    );
+  }
+
+  /// `Options`
+  String get options {
+    return Intl.message(
+      'Options',
+      name: 'options',
+      desc: '',
+      args: [],
+    );
+  }
+
+  /// `Loopback unlock tool`
+  String get loopback {
+    return Intl.message(
+      'Loopback unlock tool',
+      name: 'loopback',
+      desc: '',
+      args: [],
+    );
+  }
+
+  /// `Used for UWP loopback unlocking`
+  String get loopbackDesc {
+    return Intl.message(
+      'Used for UWP loopback unlocking',
+      name: 'loopbackDesc',
+      desc: '',
+      args: [],
+    );
+  }
+
+  /// `Providers`
+  String get providers {
+    return Intl.message(
+      'Providers',
+      name: 'providers',
+      desc: '',
+      args: [],
+    );
+  }
+
+  /// `Proxy providers`
+  String get proxyProviders {
+    return Intl.message(
+      'Proxy providers',
+      name: 'proxyProviders',
+      desc: '',
+      args: [],
+    );
+  }
+
+  /// `Rule providers`
+  String get ruleProviders {
+    return Intl.message(
+      'Rule providers',
+      name: 'ruleProviders',
+      desc: '',
+      args: [],
+    );
+  }
+
+  /// `Override Dns`
+  String get overrideDns {
+    return Intl.message(
+      'Override Dns',
+      name: 'overrideDns',
+      desc: '',
+      args: [],
+    );
+  }
+
+  /// `Turning it on will override the DNS options in the profile`
+  String get overrideDnsDesc {
+    return Intl.message(
+      'Turning it on will override the DNS options in the profile',
+      name: 'overrideDnsDesc',
+      desc: '',
+      args: [],
+    );
+  }
+
+  /// `Status`
+  String get status {
+    return Intl.message(
+      'Status',
+      name: 'status',
+      desc: '',
+      args: [],
+    );
+  }
+
+  /// `System DNS will be used when turned off`
+  String get statusDesc {
+    return Intl.message(
+      'System DNS will be used when turned off',
+      name: 'statusDesc',
+      desc: '',
+      args: [],
+    );
+  }
+
+  /// `Prioritize the use of DOH's http/3`
+  String get preferH3Desc {
+    return Intl.message(
+      'Prioritize the use of DOH\'s http/3',
+      name: 'preferH3Desc',
+      desc: '',
+      args: [],
+    );
+  }
+
+  /// `Respect rules`
+  String get respectRules {
+    return Intl.message(
+      'Respect rules',
+      name: 'respectRules',
+      desc: '',
+      args: [],
+    );
+  }
+
+  /// `DNS connection following rules, need to configure proxy-server-nameserver`
+  String get respectRulesDesc {
+    return Intl.message(
+      'DNS connection following rules, need to configure proxy-server-nameserver',
+      name: 'respectRulesDesc',
+      desc: '',
+      args: [],
+    );
+  }
+
+  /// `DNS mode`
+  String get dnsMode {
+    return Intl.message(
+      'DNS mode',
+      name: 'dnsMode',
+      desc: '',
+      args: [],
+    );
+  }
+
+  /// `Fakeip range`
+  String get fakeipRange {
+    return Intl.message(
+      'Fakeip range',
+      name: 'fakeipRange',
+      desc: '',
+      args: [],
+    );
+  }
+
+  /// `Fakeip filter`
+  String get fakeipFilter {
+    return Intl.message(
+      'Fakeip filter',
+      name: 'fakeipFilter',
+      desc: '',
+      args: [],
+    );
+  }
+
+  /// `Default nameserver`
+  String get defaultNameserver {
+    return Intl.message(
+      'Default nameserver',
+      name: 'defaultNameserver',
+      desc: '',
+      args: [],
+    );
+  }
+
+  /// `For resolving DNS server`
+  String get defaultNameserverDesc {
+    return Intl.message(
+      'For resolving DNS server',
+      name: 'defaultNameserverDesc',
+      desc: '',
+      args: [],
+    );
+  }
+
+  /// `Nameserver`
+  String get nameserver {
+    return Intl.message(
+      'Nameserver',
+      name: 'nameserver',
+      desc: '',
+      args: [],
+    );
+  }
+
+  /// `For resolving domain`
+  String get nameserverDesc {
+    return Intl.message(
+      'For resolving domain',
+      name: 'nameserverDesc',
+      desc: '',
+      args: [],
+    );
+  }
+
+  /// `Use hosts`
+  String get useHosts {
+    return Intl.message(
+      'Use hosts',
+      name: 'useHosts',
+      desc: '',
+      args: [],
+    );
+  }
+
+  /// `Use system hosts`
+  String get useSystemHosts {
+    return Intl.message(
+      'Use system hosts',
+      name: 'useSystemHosts',
+      desc: '',
+      args: [],
+    );
+  }
+
+  /// `Nameserver policy`
+  String get nameserverPolicy {
+    return Intl.message(
+      'Nameserver policy',
+      name: 'nameserverPolicy',
+      desc: '',
+      args: [],
+    );
+  }
+
+  /// `Specify the corresponding nameserver policy`
+  String get nameserverPolicyDesc {
+    return Intl.message(
+      'Specify the corresponding nameserver policy',
+      name: 'nameserverPolicyDesc',
+      desc: '',
+      args: [],
+    );
+  }
+
+  /// `Proxy nameserver`
+  String get proxyNameserver {
+    return Intl.message(
+      'Proxy nameserver',
+      name: 'proxyNameserver',
+      desc: '',
+      args: [],
+    );
+  }
+
+  /// `Domain for resolving proxy nodes`
+  String get proxyNameserverDesc {
+    return Intl.message(
+      'Domain for resolving proxy nodes',
+      name: 'proxyNameserverDesc',
+      desc: '',
+      args: [],
+    );
+  }
+
+  /// `Fallback`
+  String get fallback {
+    return Intl.message(
+      'Fallback',
+      name: 'fallback',
+      desc: '',
+      args: [],
+    );
+  }
+
+  /// `Generally use offshore DNS`
+  String get fallbackDesc {
+    return Intl.message(
+      'Generally use offshore DNS',
+      name: 'fallbackDesc',
+      desc: '',
+      args: [],
+    );
+  }
+
+  /// `Fallback filter`
+  String get fallbackFilter {
+    return Intl.message(
+      'Fallback filter',
+      name: 'fallbackFilter',
+      desc: '',
+      args: [],
+    );
+  }
+
+  /// `Geoip code`
+  String get geoipCode {
+    return Intl.message(
+      'Geoip code',
+      name: 'geoipCode',
+      desc: '',
+      args: [],
+    );
+  }
+
+  /// `Ipcidr`
+  String get ipcidr {
+    return Intl.message(
+      'Ipcidr',
+      name: 'ipcidr',
+      desc: '',
+      args: [],
+    );
+  }
+
+  /// `Domain`
+  String get domain {
+    return Intl.message(
+      'Domain',
+      name: 'domain',
+      desc: '',
+      args: [],
+    );
+  }
+
+  /// `Reset Dns`
+  String get resetDns {
+    return Intl.message(
+      'Reset Dns',
+      name: 'resetDns',
+      desc: '',
+      args: [],
+    );
+  }
+
+  /// `Reset`
+  String get reset {
+    return Intl.message(
+      'Reset',
+      name: 'reset',
+      desc: '',
+      args: [],
+    );
+  }
 }
 
 class AppLocalizationDelegate extends LocalizationsDelegate<AppLocalizations> {

lib/main.dart

@@ -2,6 +2,7 @@ import 'dart:async';
 import 'dart:io';
 
 import 'package:fl_clash/clash/clash.dart';
+import 'package:fl_clash/common/http.dart';
 import 'package:fl_clash/plugins/app.dart';
 import 'package:fl_clash/plugins/tile.dart';
 import 'package:fl_clash/plugins/vpn.dart';
@@ -31,11 +32,17 @@ Future<void> main() async {
     openLogs: config.openLogs,
     hasProxies: false,
   );
+  globalState.updateTray(
+    appState: appState,
+    config: config,
+    clashConfig: clashConfig,
+  );
   await globalState.init(
     appState: appState,
     config: config,
     clashConfig: clashConfig,
   );
+  HttpOverrides.global = FlClashHttpOverrides();
   runAppWithPreferences(
     const Application(),
     appState: appState,

lib/models/clash_config.dart

@@ -26,89 +26,94 @@ class Tun with _$Tun {
   factory Tun.fromJson(Map<String, Object?> json) => _$TunFromJson(json);
 }
 
-@JsonSerializable()
-class Dns {
-  bool enable;
-  bool ipv6;
-  @JsonKey(name: "default-nameserver")
-  List<String> defaultNameserver;
-  @JsonKey(name: "enhanced-mode")
-  String enhancedMode;
-  @JsonKey(name: "fake-ip-range")
-  String fakeIpRange;
-  @JsonKey(name: "use-hosts")
-  bool useHosts;
-  List<String> nameserver;
-  List<String> fallback;
-  @JsonKey(name: "fake-ip-filter")
-  List<String> fakeIpFilter;
+@freezed
+class FallbackFilter with _$FallbackFilter {
+  const factory FallbackFilter({
+    @Default(true) bool geoip,
+    @Default("CN") @JsonKey(name: "geoip-code") String geoipCode,
+    @Default(["gfw"]) List<String> geosite,
+    @Default(["240.0.0.0/4"]) List<String> ipcidr,
+    @Default([
+      "+.google.com",
+      "+.facebook.com",
+      "+.youtube.com",
+    ])
+    List<String> domain,
+  }) = _FallbackFilter;
 
-  Dns()
-      : enable = true,
-        ipv6 = false,
-        defaultNameserver = [
-          "223.5.5.5",
-          "119.29.29.29",
-          "8.8.4.4",
-          "1.0.0.1",
-        ],
-        enhancedMode = "fake-ip",
-        fakeIpRange = "198.18.0.1/16",
-        useHosts = true,
-        nameserver = [
-          "8.8.8.8",
-          "114.114.114.114",
-          "https://doh.pub/dns-query",
-          "https://dns.alidns.com/dns-query",
-        ],
-        fallback = [
-          'https://doh.dns.sb/dns-query',
-          'https://dns.cloudflare.com/dns-query',
-          'https://dns.twnic.tw/dns-query',
-          'tls://8.8.4.4:853',
-        ],
-        fakeIpFilter = [
-          // Stun Services
-          "+.stun.*.*",
-          "+.stun.*.*.*",
-          "+.stun.*.*.*.*",
-          "+.stun.*.*.*.*.*",
+  factory FallbackFilter.fromJson(Map<String, Object?> json) =>
+      _$FallbackFilterFromJson(json);
+}
 
-          // Google Voices
-          "lens.l.google.com",
+@freezed
+class Dns with _$Dns {
+  const factory Dns({
+    @Default(true) bool enable,
+    @Default(false) @JsonKey(name: "prefer-h3") bool preferH3,
+    @Default(true) @JsonKey(name: "use-hosts") bool useHosts,
+    @Default(true) @JsonKey(name: "use-system-hosts") bool useSystemHosts,
+    @Default(true) @JsonKey(name: "respect-rules") bool respectRules,
+    @Default(false) bool ipv6,
+    @Default(["223.5.5.5"])
+    @JsonKey(name: "default-nameserver")
+    List<String> defaultNameserver,
+    @Default(DnsMode.fakeIp)
+    @JsonKey(name: "enhanced-mode")
+    DnsMode enhancedMode,
+    @Default("198.18.0.1/16")
+    @JsonKey(name: "fake-ip-range")
+    String fakeIpRange,
+    @Default([
+      "*.lan",
+      "localhost.ptlogin2.qq.com",
+    ])
+    @JsonKey(name: "fake-ip-filter")
+    List<String> fakeIpFilter,
+    @Default({
+      "www.baidu.com": "114.114.114.114",
+      "+.internal.crop.com": "10.0.0.1",
+      "geosite:cn": "https://doh.pub/dns-query"
+    })
+    @JsonKey(name: "nameserver-policy")
+    Map<String, String> nameserverPolicy,
+    @Default([
+      "https://doh.pub/dns-query",
+      "https://dns.alidns.com/dns-query",
+    ])
+    List<String> nameserver,
+    @Default([
+      "tls://8.8.4.4",
+      "tls://1.1.1.1",
+    ])
+    List<String> fallback,
+    @Default([
+      "https://doh.pub/dns-query",
+    ])
+    @JsonKey(name: "proxy-server-nameserver")
+    List<String> proxyServerNameserver,
+    @Default(FallbackFilter())
+    @JsonKey(name: "fallback-filter")
+    FallbackFilter fallbackFilter,
+  }) = _Dns;
 
-          // Nintendo Switch STUN
-          "*.n.n.srv.nintendo.net",
+  factory Dns.fromJson(Map<String, Object?> json) => _$DnsFromJson(json);
 
-          // PlayStation STUN
-          "+.stun.playstation.net",
-
-          // XBox
-          "xbox.*.*.microsoft.com",
-          "*.*.xboxlive.com",
-
-          // Microsoft Captive Portal
-          "*.msftncsi.com",
-          "*.msftconnecttest.com",
-
-          // Bilibili CDN
-          "*.mcdn.bilivideo.cn",
-
-          // Windows Default LAN WorkGroup
-          "WORKGROUP",
-        ];
-
-  factory Dns.fromJson(Map<String, dynamic> json) {
-    return _$DnsFromJson(json);
-  }
-
-  Map<String, dynamic> toJson() {
-    return _$DnsToJson(this);
+  factory Dns.safeDnsFromJson(Map<String, Object?> json) {
+    try {
+      return Dns.fromJson(json);
+    } catch (_) {
+      return const Dns();
+    }
   }
 }
 
 typedef GeoXMap = Map<String, String>;
 
+typedef HostsMap = Map<String, String>;
+
+const defaultMixedPort = 7890;
+const defaultKeepAliveInterval = 30;
+
 @JsonSerializable()
 class ClashConfig extends ChangeNotifier {
   int _mixedPort;
@@ -127,9 +132,10 @@ class ClashConfig extends ChangeNotifier {
   GeoXMap _geoXUrl;
   List<String> _rules;
   String? _globalRealUa;
+  HostsMap _hosts;
 
   ClashConfig()
-      : _mixedPort = 7890,
+      : _mixedPort = defaultMixedPort,
         _mode = Mode.rule,
         _ipv6 = false,
         _findProcessMode = FindProcessMode.off,
@@ -140,12 +146,13 @@ class ClashConfig extends ChangeNotifier {
         _unifiedDelay = false,
         _geodataLoader = geodataLoaderMemconservative,
         _externalController = '',
-        _keepAliveInterval = 30,
-        _dns = Dns(),
+        _keepAliveInterval = defaultKeepAliveInterval,
+        _dns = const Dns(),
         _geoXUrl = defaultGeoXMap,
-        _rules = [];
+        _rules = [],
+        _hosts = {};
 
-  @JsonKey(name: "mixed-port", defaultValue: 7890)
+  @JsonKey(name: "mixed-port", defaultValue: defaultMixedPort)
   int get mixedPort => _mixedPort;
 
   set mixedPort(int value) {
@@ -205,7 +212,7 @@ class ClashConfig extends ChangeNotifier {
     }
   }
 
-  @JsonKey(name: "keep-alive-interval", defaultValue: 30)
+  @JsonKey(name: "keep-alive-interval", defaultValue: defaultKeepAliveInterval)
   int get keepAliveInterval => _keepAliveInterval;
 
   set keepAliveInterval(int value) {
@@ -269,6 +276,7 @@ class ClashConfig extends ChangeNotifier {
     }
   }
 
+  @JsonKey(fromJson: Dns.safeDnsFromJson)
   Dns get dns => _dns;
 
   set dns(Dns value) {
@@ -316,10 +324,21 @@ class ClashConfig extends ChangeNotifier {
     }
   }
 
+  @JsonKey(defaultValue: {})
+  HostsMap get hosts => _hosts;
+
+  set hosts(HostsMap value) {
+    if (!const MapEquality<String, String>().equals(value, _hosts)) {
+      _hosts = value;
+      notifyListeners();
+    }
+  }
+
   update([ClashConfig? clashConfig]) {
     if (clashConfig != null) {
       _mixedPort = clashConfig._mixedPort;
       _allowLan = clashConfig._allowLan;
+      _hosts = clashConfig._hosts;
       _mode = clashConfig._mode;
       _logLevel = clashConfig._logLevel;
       _tun = clashConfig._tun;

lib/models/config.dart

@@ -49,6 +49,17 @@ class CoreState with _$CoreState {
       _$CoreStateFromJson(json);
 }
 
+@freezed
+class VPNState with _$VPNState {
+  const factory VPNState({
+    required AccessControl? accessControl,
+    required VpnProps vpnProps,
+  }) = _VPNState;
+
+  factory VPNState.fromJson(Map<String, Object?> json) =>
+      _$VPNStateFromJson(json);
+}
+
 @freezed
 class WindowProps with _$WindowProps {
   const factory WindowProps({
@@ -84,6 +95,21 @@ class DesktopProps with _$DesktopProps {
       json == null ? const DesktopProps() : _$DesktopPropsFromJson(json);
 }
 
+const defaultCustomFontSizeScale = 1.0;
+
+const defaultScaleProps = ScaleProps();
+
+@freezed
+class ScaleProps with _$ScaleProps {
+  const factory ScaleProps({
+    @Default(false) bool custom,
+    @Default(defaultCustomFontSizeScale) double scale,
+  }) = _ScaleProps;
+
+  factory ScaleProps.fromJson(Map<String, Object?>? json) =>
+      json == null ? defaultScaleProps : _$ScalePropsFromJson(json);
+}
+
 @JsonSerializable()
 class Config extends ChangeNotifier {
   List<Profile> _profiles;
@@ -113,8 +139,10 @@ class Config extends ChangeNotifier {
   bool _onlyProxy;
   bool _prueBlack;
   VpnProps _vpnProps;
+  ScaleProps _scaleProps;
   DesktopProps _desktopProps;
   bool _showLabel;
+  bool _overrideDns;
 
   Config()
       : _profiles = [],
@@ -142,7 +170,9 @@ class Config extends ChangeNotifier {
         _proxiesLayout = ProxiesLayout.standard,
         _vpnProps = const VpnProps(),
         _desktopProps = const DesktopProps(),
-        _showLabel = false;
+        _showLabel = false,
+        _overrideDns = false,
+        _scaleProps = const ScaleProps();
 
   deleteProfileById(String id) {
     _profiles = profiles.where((element) => element.id != id).toList();
@@ -538,6 +568,15 @@ class Config extends ChangeNotifier {
     }
   }
 
+  ScaleProps get scaleProps => _scaleProps;
+
+  set scaleProps(ScaleProps value) {
+    if (_scaleProps != value) {
+      _scaleProps = value;
+      notifyListeners();
+    }
+  }
+
   @JsonKey(defaultValue: false)
   bool get showLabel => _showLabel;
 
@@ -548,6 +587,16 @@ class Config extends ChangeNotifier {
     }
   }
 
+  @JsonKey(defaultValue: false)
+  bool get overrideDns => _overrideDns;
+
+  set overrideDns(bool value) {
+    if (_overrideDns != value) {
+      _overrideDns = value;
+      notifyListeners();
+    }
+  }
+
   update([
     Config? config,
     RecoveryOption recoveryOptions = RecoveryOption.all,
@@ -566,6 +615,7 @@ class Config extends ChangeNotifier {
       _isCloseConnections = config._isCloseConnections;
       _isCompatible = config._isCompatible;
       _autoLaunch = config._autoLaunch;
+      _dav = config._dav;
       _silentLaunch = config._silentLaunch;
       _autoRun = config._autoRun;
       _proxiesType = config._proxiesType;
@@ -584,6 +634,7 @@ class Config extends ChangeNotifier {
       _isExclude = config._isExclude;
       _windowProps = config._windowProps;
       _vpnProps = config._vpnProps;
+      _overrideDns = config._overrideDns;
       _desktopProps = config._desktopProps;
     }
     notifyListeners();

lib/models/dav.dart

@@ -4,14 +4,16 @@ part 'generated/dav.g.dart';
 
 part 'generated/dav.freezed.dart';
 
+const defaultDavFileName = "backup.zip";
+
 @freezed
-class DAV with _$DAV{
+class DAV with _$DAV {
   const factory DAV({
     required String uri,
     required String user,
     required String password,
+    @Default(defaultDavFileName) String fileName,
   }) = _DAV;
 
-  factory DAV.fromJson(Map<String, Object?> json) =>
-      _$DAVFromJson(json);
-}
+  factory DAV.fromJson(Map<String, Object?> json) => _$DAVFromJson(json);
+}

lib/models/ffi.dart

@@ -14,6 +14,7 @@ class ConfigExtendedParams with _$ConfigExtendedParams {
     @JsonKey(name: "is-patch") required bool isPatch,
     @JsonKey(name: "is-compatible") required bool isCompatible,
     @JsonKey(name: "selected-map") required SelectedMap selectedMap,
+    @JsonKey(name: "override-dns") required bool overrideDns,
     @JsonKey(name: "test-url") required String testUrl,
   }) = _ConfigExtendedParams;
 

lib/models/generated/clash_config.freezed.dart

@@ -220,3 +220,818 @@ abstract class _Tun implements Tun {
   _$$TunImplCopyWith<_$TunImpl> get copyWith =>
       throw _privateConstructorUsedError;
 }
+
+FallbackFilter _$FallbackFilterFromJson(Map<String, dynamic> json) {
+  return _FallbackFilter.fromJson(json);
+}
+
+/// @nodoc
+mixin _$FallbackFilter {
+  bool get geoip => throw _privateConstructorUsedError;
+  @JsonKey(name: "geoip-code")
+  String get geoipCode => throw _privateConstructorUsedError;
+  List<String> get geosite => throw _privateConstructorUsedError;
+  List<String> get ipcidr => throw _privateConstructorUsedError;
+  List<String> get domain => throw _privateConstructorUsedError;
+
+  Map<String, dynamic> toJson() => throw _privateConstructorUsedError;
+  @JsonKey(ignore: true)
+  $FallbackFilterCopyWith<FallbackFilter> get copyWith =>
+      throw _privateConstructorUsedError;
+}
+
+/// @nodoc
+abstract class $FallbackFilterCopyWith<$Res> {
+  factory $FallbackFilterCopyWith(
+          FallbackFilter value, $Res Function(FallbackFilter) then) =
+      _$FallbackFilterCopyWithImpl<$Res, FallbackFilter>;
+  @useResult
+  $Res call(
+      {bool geoip,
+      @JsonKey(name: "geoip-code") String geoipCode,
+      List<String> geosite,
+      List<String> ipcidr,
+      List<String> domain});
+}
+
+/// @nodoc
+class _$FallbackFilterCopyWithImpl<$Res, $Val extends FallbackFilter>
+    implements $FallbackFilterCopyWith<$Res> {
+  _$FallbackFilterCopyWithImpl(this._value, this._then);
+
+  // ignore: unused_field
+  final $Val _value;
+  // ignore: unused_field
+  final $Res Function($Val) _then;
+
+  @pragma('vm:prefer-inline')
+  @override
+  $Res call({
+    Object? geoip = null,
+    Object? geoipCode = null,
+    Object? geosite = null,
+    Object? ipcidr = null,
+    Object? domain = null,
+  }) {
+    return _then(_value.copyWith(
+      geoip: null == geoip
+          ? _value.geoip
+          : geoip // ignore: cast_nullable_to_non_nullable
+              as bool,
+      geoipCode: null == geoipCode
+          ? _value.geoipCode
+          : geoipCode // ignore: cast_nullable_to_non_nullable
+              as String,
+      geosite: null == geosite
+          ? _value.geosite
+          : geosite // ignore: cast_nullable_to_non_nullable
+              as List<String>,
+      ipcidr: null == ipcidr
+          ? _value.ipcidr
+          : ipcidr // ignore: cast_nullable_to_non_nullable
+              as List<String>,
+      domain: null == domain
+          ? _value.domain
+          : domain // ignore: cast_nullable_to_non_nullable
+              as List<String>,
+    ) as $Val);
+  }
+}
+
+/// @nodoc
+abstract class _$$FallbackFilterImplCopyWith<$Res>
+    implements $FallbackFilterCopyWith<$Res> {
+  factory _$$FallbackFilterImplCopyWith(_$FallbackFilterImpl value,
+          $Res Function(_$FallbackFilterImpl) then) =
+      __$$FallbackFilterImplCopyWithImpl<$Res>;
+  @override
+  @useResult
+  $Res call(
+      {bool geoip,
+      @JsonKey(name: "geoip-code") String geoipCode,
+      List<String> geosite,
+      List<String> ipcidr,
+      List<String> domain});
+}
+
+/// @nodoc
+class __$$FallbackFilterImplCopyWithImpl<$Res>
+    extends _$FallbackFilterCopyWithImpl<$Res, _$FallbackFilterImpl>
+    implements _$$FallbackFilterImplCopyWith<$Res> {
+  __$$FallbackFilterImplCopyWithImpl(
+      _$FallbackFilterImpl _value, $Res Function(_$FallbackFilterImpl) _then)
+      : super(_value, _then);
+
+  @pragma('vm:prefer-inline')
+  @override
+  $Res call({
+    Object? geoip = null,
+    Object? geoipCode = null,
+    Object? geosite = null,
+    Object? ipcidr = null,
+    Object? domain = null,
+  }) {
+    return _then(_$FallbackFilterImpl(
+      geoip: null == geoip
+          ? _value.geoip
+          : geoip // ignore: cast_nullable_to_non_nullable
+              as bool,
+      geoipCode: null == geoipCode
+          ? _value.geoipCode
+          : geoipCode // ignore: cast_nullable_to_non_nullable
+              as String,
+      geosite: null == geosite
+          ? _value._geosite
+          : geosite // ignore: cast_nullable_to_non_nullable
+              as List<String>,
+      ipcidr: null == ipcidr
+          ? _value._ipcidr
+          : ipcidr // ignore: cast_nullable_to_non_nullable
+              as List<String>,
+      domain: null == domain
+          ? _value._domain
+          : domain // ignore: cast_nullable_to_non_nullable
+              as List<String>,
+    ));
+  }
+}
+
+/// @nodoc
+@JsonSerializable()
+class _$FallbackFilterImpl implements _FallbackFilter {
+  const _$FallbackFilterImpl(
+      {this.geoip = true,
+      @JsonKey(name: "geoip-code") this.geoipCode = "CN",
+      final List<String> geosite = const ["gfw"],
+      final List<String> ipcidr = const ["240.0.0.0/4"],
+      final List<String> domain = const [
+        "+.google.com",
+        "+.facebook.com",
+        "+.youtube.com"
+      ]})
+      : _geosite = geosite,
+        _ipcidr = ipcidr,
+        _domain = domain;
+
+  factory _$FallbackFilterImpl.fromJson(Map<String, dynamic> json) =>
+      _$$FallbackFilterImplFromJson(json);
+
+  @override
+  @JsonKey()
+  final bool geoip;
+  @override
+  @JsonKey(name: "geoip-code")
+  final String geoipCode;
+  final List<String> _geosite;
+  @override
+  @JsonKey()
+  List<String> get geosite {
+    if (_geosite is EqualUnmodifiableListView) return _geosite;
+    // ignore: implicit_dynamic_type
+    return EqualUnmodifiableListView(_geosite);
+  }
+
+  final List<String> _ipcidr;
+  @override
+  @JsonKey()
+  List<String> get ipcidr {
+    if (_ipcidr is EqualUnmodifiableListView) return _ipcidr;
+    // ignore: implicit_dynamic_type
+    return EqualUnmodifiableListView(_ipcidr);
+  }
+
+  final List<String> _domain;
+  @override
+  @JsonKey()
+  List<String> get domain {
+    if (_domain is EqualUnmodifiableListView) return _domain;
+    // ignore: implicit_dynamic_type
+    return EqualUnmodifiableListView(_domain);
+  }
+
+  @override
+  String toString() {
+    return 'FallbackFilter(geoip: $geoip, geoipCode: $geoipCode, geosite: $geosite, ipcidr: $ipcidr, domain: $domain)';
+  }
+
+  @override
+  bool operator ==(Object other) {
+    return identical(this, other) ||
+        (other.runtimeType == runtimeType &&
+            other is _$FallbackFilterImpl &&
+            (identical(other.geoip, geoip) || other.geoip == geoip) &&
+            (identical(other.geoipCode, geoipCode) ||
+                other.geoipCode == geoipCode) &&
+            const DeepCollectionEquality().equals(other._geosite, _geosite) &&
+            const DeepCollectionEquality().equals(other._ipcidr, _ipcidr) &&
+            const DeepCollectionEquality().equals(other._domain, _domain));
+  }
+
+  @JsonKey(ignore: true)
+  @override
+  int get hashCode => Object.hash(
+      runtimeType,
+      geoip,
+      geoipCode,
+      const DeepCollectionEquality().hash(_geosite),
+      const DeepCollectionEquality().hash(_ipcidr),
+      const DeepCollectionEquality().hash(_domain));
+
+  @JsonKey(ignore: true)
+  @override
+  @pragma('vm:prefer-inline')
+  _$$FallbackFilterImplCopyWith<_$FallbackFilterImpl> get copyWith =>
+      __$$FallbackFilterImplCopyWithImpl<_$FallbackFilterImpl>(
+          this, _$identity);
+
+  @override
+  Map<String, dynamic> toJson() {
+    return _$$FallbackFilterImplToJson(
+      this,
+    );
+  }
+}
+
+abstract class _FallbackFilter implements FallbackFilter {
+  const factory _FallbackFilter(
+      {final bool geoip,
+      @JsonKey(name: "geoip-code") final String geoipCode,
+      final List<String> geosite,
+      final List<String> ipcidr,
+      final List<String> domain}) = _$FallbackFilterImpl;
+
+  factory _FallbackFilter.fromJson(Map<String, dynamic> json) =
+      _$FallbackFilterImpl.fromJson;
+
+  @override
+  bool get geoip;
+  @override
+  @JsonKey(name: "geoip-code")
+  String get geoipCode;
+  @override
+  List<String> get geosite;
+  @override
+  List<String> get ipcidr;
+  @override
+  List<String> get domain;
+  @override
+  @JsonKey(ignore: true)
+  _$$FallbackFilterImplCopyWith<_$FallbackFilterImpl> get copyWith =>
+      throw _privateConstructorUsedError;
+}
+
+Dns _$DnsFromJson(Map<String, dynamic> json) {
+  return _Dns.fromJson(json);
+}
+
+/// @nodoc
+mixin _$Dns {
+  bool get enable => throw _privateConstructorUsedError;
+  @JsonKey(name: "prefer-h3")
+  bool get preferH3 => throw _privateConstructorUsedError;
+  @JsonKey(name: "use-hosts")
+  bool get useHosts => throw _privateConstructorUsedError;
+  @JsonKey(name: "use-system-hosts")
+  bool get useSystemHosts => throw _privateConstructorUsedError;
+  @JsonKey(name: "respect-rules")
+  bool get respectRules => throw _privateConstructorUsedError;
+  bool get ipv6 => throw _privateConstructorUsedError;
+  @JsonKey(name: "default-nameserver")
+  List<String> get defaultNameserver => throw _privateConstructorUsedError;
+  @JsonKey(name: "enhanced-mode")
+  DnsMode get enhancedMode => throw _privateConstructorUsedError;
+  @JsonKey(name: "fake-ip-range")
+  String get fakeIpRange => throw _privateConstructorUsedError;
+  @JsonKey(name: "fake-ip-filter")
+  List<String> get fakeIpFilter => throw _privateConstructorUsedError;
+  @JsonKey(name: "nameserver-policy")
+  Map<String, String> get nameserverPolicy =>
+      throw _privateConstructorUsedError;
+  List<String> get nameserver => throw _privateConstructorUsedError;
+  List<String> get fallback => throw _privateConstructorUsedError;
+  @JsonKey(name: "proxy-server-nameserver")
+  List<String> get proxyServerNameserver => throw _privateConstructorUsedError;
+  @JsonKey(name: "fallback-filter")
+  FallbackFilter get fallbackFilter => throw _privateConstructorUsedError;
+
+  Map<String, dynamic> toJson() => throw _privateConstructorUsedError;
+  @JsonKey(ignore: true)
+  $DnsCopyWith<Dns> get copyWith => throw _privateConstructorUsedError;
+}
+
+/// @nodoc
+abstract class $DnsCopyWith<$Res> {
+  factory $DnsCopyWith(Dns value, $Res Function(Dns) then) =
+      _$DnsCopyWithImpl<$Res, Dns>;
+  @useResult
+  $Res call(
+      {bool enable,
+      @JsonKey(name: "prefer-h3") bool preferH3,
+      @JsonKey(name: "use-hosts") bool useHosts,
+      @JsonKey(name: "use-system-hosts") bool useSystemHosts,
+      @JsonKey(name: "respect-rules") bool respectRules,
+      bool ipv6,
+      @JsonKey(name: "default-nameserver") List<String> defaultNameserver,
+      @JsonKey(name: "enhanced-mode") DnsMode enhancedMode,
+      @JsonKey(name: "fake-ip-range") String fakeIpRange,
+      @JsonKey(name: "fake-ip-filter") List<String> fakeIpFilter,
+      @JsonKey(name: "nameserver-policy") Map<String, String> nameserverPolicy,
+      List<String> nameserver,
+      List<String> fallback,
+      @JsonKey(name: "proxy-server-nameserver")
+      List<String> proxyServerNameserver,
+      @JsonKey(name: "fallback-filter") FallbackFilter fallbackFilter});
+
+  $FallbackFilterCopyWith<$Res> get fallbackFilter;
+}
+
+/// @nodoc
+class _$DnsCopyWithImpl<$Res, $Val extends Dns> implements $DnsCopyWith<$Res> {
+  _$DnsCopyWithImpl(this._value, this._then);
+
+  // ignore: unused_field
+  final $Val _value;
+  // ignore: unused_field
+  final $Res Function($Val) _then;
+
+  @pragma('vm:prefer-inline')
+  @override
+  $Res call({
+    Object? enable = null,
+    Object? preferH3 = null,
+    Object? useHosts = null,
+    Object? useSystemHosts = null,
+    Object? respectRules = null,
+    Object? ipv6 = null,
+    Object? defaultNameserver = null,
+    Object? enhancedMode = null,
+    Object? fakeIpRange = null,
+    Object? fakeIpFilter = null,
+    Object? nameserverPolicy = null,
+    Object? nameserver = null,
+    Object? fallback = null,
+    Object? proxyServerNameserver = null,
+    Object? fallbackFilter = null,
+  }) {
+    return _then(_value.copyWith(
+      enable: null == enable
+          ? _value.enable
+          : enable // ignore: cast_nullable_to_non_nullable
+              as bool,
+      preferH3: null == preferH3
+          ? _value.preferH3
+          : preferH3 // ignore: cast_nullable_to_non_nullable
+              as bool,
+      useHosts: null == useHosts
+          ? _value.useHosts
+          : useHosts // ignore: cast_nullable_to_non_nullable
+              as bool,
+      useSystemHosts: null == useSystemHosts
+          ? _value.useSystemHosts
+          : useSystemHosts // ignore: cast_nullable_to_non_nullable
+              as bool,
+      respectRules: null == respectRules
+          ? _value.respectRules
+          : respectRules // ignore: cast_nullable_to_non_nullable
+              as bool,
+      ipv6: null == ipv6
+          ? _value.ipv6
+          : ipv6 // ignore: cast_nullable_to_non_nullable
+              as bool,
+      defaultNameserver: null == defaultNameserver
+          ? _value.defaultNameserver
+          : defaultNameserver // ignore: cast_nullable_to_non_nullable
+              as List<String>,
+      enhancedMode: null == enhancedMode
+          ? _value.enhancedMode
+          : enhancedMode // ignore: cast_nullable_to_non_nullable
+              as DnsMode,
+      fakeIpRange: null == fakeIpRange
+          ? _value.fakeIpRange
+          : fakeIpRange // ignore: cast_nullable_to_non_nullable
+              as String,
+      fakeIpFilter: null == fakeIpFilter
+          ? _value.fakeIpFilter
+          : fakeIpFilter // ignore: cast_nullable_to_non_nullable
+              as List<String>,
+      nameserverPolicy: null == nameserverPolicy
+          ? _value.nameserverPolicy
+          : nameserverPolicy // ignore: cast_nullable_to_non_nullable
+              as Map<String, String>,
+      nameserver: null == nameserver
+          ? _value.nameserver
+          : nameserver // ignore: cast_nullable_to_non_nullable
+              as List<String>,
+      fallback: null == fallback
+          ? _value.fallback
+          : fallback // ignore: cast_nullable_to_non_nullable
+              as List<String>,
+      proxyServerNameserver: null == proxyServerNameserver
+          ? _value.proxyServerNameserver
+          : proxyServerNameserver // ignore: cast_nullable_to_non_nullable
+              as List<String>,
+      fallbackFilter: null == fallbackFilter
+          ? _value.fallbackFilter
+          : fallbackFilter // ignore: cast_nullable_to_non_nullable
+              as FallbackFilter,
+    ) as $Val);
+  }
+
+  @override
+  @pragma('vm:prefer-inline')
+  $FallbackFilterCopyWith<$Res> get fallbackFilter {
+    return $FallbackFilterCopyWith<$Res>(_value.fallbackFilter, (value) {
+      return _then(_value.copyWith(fallbackFilter: value) as $Val);
+    });
+  }
+}
+
+/// @nodoc
+abstract class _$$DnsImplCopyWith<$Res> implements $DnsCopyWith<$Res> {
+  factory _$$DnsImplCopyWith(_$DnsImpl value, $Res Function(_$DnsImpl) then) =
+      __$$DnsImplCopyWithImpl<$Res>;
+  @override
+  @useResult
+  $Res call(
+      {bool enable,
+      @JsonKey(name: "prefer-h3") bool preferH3,
+      @JsonKey(name: "use-hosts") bool useHosts,
+      @JsonKey(name: "use-system-hosts") bool useSystemHosts,
+      @JsonKey(name: "respect-rules") bool respectRules,
+      bool ipv6,
+      @JsonKey(name: "default-nameserver") List<String> defaultNameserver,
+      @JsonKey(name: "enhanced-mode") DnsMode enhancedMode,
+      @JsonKey(name: "fake-ip-range") String fakeIpRange,
+      @JsonKey(name: "fake-ip-filter") List<String> fakeIpFilter,
+      @JsonKey(name: "nameserver-policy") Map<String, String> nameserverPolicy,
+      List<String> nameserver,
+      List<String> fallback,
+      @JsonKey(name: "proxy-server-nameserver")
+      List<String> proxyServerNameserver,
+      @JsonKey(name: "fallback-filter") FallbackFilter fallbackFilter});
+
+  @override
+  $FallbackFilterCopyWith<$Res> get fallbackFilter;
+}
+
+/// @nodoc
+class __$$DnsImplCopyWithImpl<$Res> extends _$DnsCopyWithImpl<$Res, _$DnsImpl>
+    implements _$$DnsImplCopyWith<$Res> {
+  __$$DnsImplCopyWithImpl(_$DnsImpl _value, $Res Function(_$DnsImpl) _then)
+      : super(_value, _then);
+
+  @pragma('vm:prefer-inline')
+  @override
+  $Res call({
+    Object? enable = null,
+    Object? preferH3 = null,
+    Object? useHosts = null,
+    Object? useSystemHosts = null,
+    Object? respectRules = null,
+    Object? ipv6 = null,
+    Object? defaultNameserver = null,
+    Object? enhancedMode = null,
+    Object? fakeIpRange = null,
+    Object? fakeIpFilter = null,
+    Object? nameserverPolicy = null,
+    Object? nameserver = null,
+    Object? fallback = null,
+    Object? proxyServerNameserver = null,
+    Object? fallbackFilter = null,
+  }) {
+    return _then(_$DnsImpl(
+      enable: null == enable
+          ? _value.enable
+          : enable // ignore: cast_nullable_to_non_nullable
+              as bool,
+      preferH3: null == preferH3
+          ? _value.preferH3
+          : preferH3 // ignore: cast_nullable_to_non_nullable
+              as bool,
+      useHosts: null == useHosts
+          ? _value.useHosts
+          : useHosts // ignore: cast_nullable_to_non_nullable
+              as bool,
+      useSystemHosts: null == useSystemHosts
+          ? _value.useSystemHosts
+          : useSystemHosts // ignore: cast_nullable_to_non_nullable
+              as bool,
+      respectRules: null == respectRules
+          ? _value.respectRules
+          : respectRules // ignore: cast_nullable_to_non_nullable
+              as bool,
+      ipv6: null == ipv6
+          ? _value.ipv6
+          : ipv6 // ignore: cast_nullable_to_non_nullable
+              as bool,
+      defaultNameserver: null == defaultNameserver
+          ? _value._defaultNameserver
+          : defaultNameserver // ignore: cast_nullable_to_non_nullable
+              as List<String>,
+      enhancedMode: null == enhancedMode
+          ? _value.enhancedMode
+          : enhancedMode // ignore: cast_nullable_to_non_nullable
+              as DnsMode,
+      fakeIpRange: null == fakeIpRange
+          ? _value.fakeIpRange
+          : fakeIpRange // ignore: cast_nullable_to_non_nullable
+              as String,
+      fakeIpFilter: null == fakeIpFilter
+          ? _value._fakeIpFilter
+          : fakeIpFilter // ignore: cast_nullable_to_non_nullable
+              as List<String>,
+      nameserverPolicy: null == nameserverPolicy
+          ? _value._nameserverPolicy
+          : nameserverPolicy // ignore: cast_nullable_to_non_nullable
+              as Map<String, String>,
+      nameserver: null == nameserver
+          ? _value._nameserver
+          : nameserver // ignore: cast_nullable_to_non_nullable
+              as List<String>,
+      fallback: null == fallback
+          ? _value._fallback
+          : fallback // ignore: cast_nullable_to_non_nullable
+              as List<String>,
+      proxyServerNameserver: null == proxyServerNameserver
+          ? _value._proxyServerNameserver
+          : proxyServerNameserver // ignore: cast_nullable_to_non_nullable
+              as List<String>,
+      fallbackFilter: null == fallbackFilter
+          ? _value.fallbackFilter
+          : fallbackFilter // ignore: cast_nullable_to_non_nullable
+              as FallbackFilter,
+    ));
+  }
+}
+
+/// @nodoc
+@JsonSerializable()
+class _$DnsImpl implements _Dns {
+  const _$DnsImpl(
+      {this.enable = true,
+      @JsonKey(name: "prefer-h3") this.preferH3 = false,
+      @JsonKey(name: "use-hosts") this.useHosts = true,
+      @JsonKey(name: "use-system-hosts") this.useSystemHosts = true,
+      @JsonKey(name: "respect-rules") this.respectRules = true,
+      this.ipv6 = false,
+      @JsonKey(name: "default-nameserver")
+      final List<String> defaultNameserver = const ["223.5.5.5"],
+      @JsonKey(name: "enhanced-mode") this.enhancedMode = DnsMode.fakeIp,
+      @JsonKey(name: "fake-ip-range") this.fakeIpRange = "198.18.0.1/16",
+      @JsonKey(name: "fake-ip-filter") final List<String> fakeIpFilter = const [
+        "*.lan",
+        "localhost.ptlogin2.qq.com"
+      ],
+      @JsonKey(name: "nameserver-policy")
+      final Map<String, String> nameserverPolicy = const {
+        "www.baidu.com": "114.114.114.114",
+        "+.internal.crop.com": "10.0.0.1",
+        "geosite:cn": "https://doh.pub/dns-query"
+      },
+      final List<String> nameserver = const [
+        "https://doh.pub/dns-query",
+        "https://dns.alidns.com/dns-query"
+      ],
+      final List<String> fallback = const ["tls://8.8.4.4", "tls://1.1.1.1"],
+      @JsonKey(name: "proxy-server-nameserver")
+      final List<String> proxyServerNameserver = const [
+        "https://doh.pub/dns-query"
+      ],
+      @JsonKey(name: "fallback-filter")
+      this.fallbackFilter = const FallbackFilter()})
+      : _defaultNameserver = defaultNameserver,
+        _fakeIpFilter = fakeIpFilter,
+        _nameserverPolicy = nameserverPolicy,
+        _nameserver = nameserver,
+        _fallback = fallback,
+        _proxyServerNameserver = proxyServerNameserver;
+
+  factory _$DnsImpl.fromJson(Map<String, dynamic> json) =>
+      _$$DnsImplFromJson(json);
+
+  @override
+  @JsonKey()
+  final bool enable;
+  @override
+  @JsonKey(name: "prefer-h3")
+  final bool preferH3;
+  @override
+  @JsonKey(name: "use-hosts")
+  final bool useHosts;
+  @override
+  @JsonKey(name: "use-system-hosts")
+  final bool useSystemHosts;
+  @override
+  @JsonKey(name: "respect-rules")
+  final bool respectRules;
+  @override
+  @JsonKey()
+  final bool ipv6;
+  final List<String> _defaultNameserver;
+  @override
+  @JsonKey(name: "default-nameserver")
+  List<String> get defaultNameserver {
+    if (_defaultNameserver is EqualUnmodifiableListView)
+      return _defaultNameserver;
+    // ignore: implicit_dynamic_type
+    return EqualUnmodifiableListView(_defaultNameserver);
+  }
+
+  @override
+  @JsonKey(name: "enhanced-mode")
+  final DnsMode enhancedMode;
+  @override
+  @JsonKey(name: "fake-ip-range")
+  final String fakeIpRange;
+  final List<String> _fakeIpFilter;
+  @override
+  @JsonKey(name: "fake-ip-filter")
+  List<String> get fakeIpFilter {
+    if (_fakeIpFilter is EqualUnmodifiableListView) return _fakeIpFilter;
+    // ignore: implicit_dynamic_type
+    return EqualUnmodifiableListView(_fakeIpFilter);
+  }
+
+  final Map<String, String> _nameserverPolicy;
+  @override
+  @JsonKey(name: "nameserver-policy")
+  Map<String, String> get nameserverPolicy {
+    if (_nameserverPolicy is EqualUnmodifiableMapView) return _nameserverPolicy;
+    // ignore: implicit_dynamic_type
+    return EqualUnmodifiableMapView(_nameserverPolicy);
+  }
+
+  final List<String> _nameserver;
+  @override
+  @JsonKey()
+  List<String> get nameserver {
+    if (_nameserver is EqualUnmodifiableListView) return _nameserver;
+    // ignore: implicit_dynamic_type
+    return EqualUnmodifiableListView(_nameserver);
+  }
+
+  final List<String> _fallback;
+  @override
+  @JsonKey()
+  List<String> get fallback {
+    if (_fallback is EqualUnmodifiableListView) return _fallback;
+    // ignore: implicit_dynamic_type
+    return EqualUnmodifiableListView(_fallback);
+  }
+
+  final List<String> _proxyServerNameserver;
+  @override
+  @JsonKey(name: "proxy-server-nameserver")
+  List<String> get proxyServerNameserver {
+    if (_proxyServerNameserver is EqualUnmodifiableListView)
+      return _proxyServerNameserver;
+    // ignore: implicit_dynamic_type
+    return EqualUnmodifiableListView(_proxyServerNameserver);
+  }
+
+  @override
+  @JsonKey(name: "fallback-filter")
+  final FallbackFilter fallbackFilter;
+
+  @override
+  String toString() {
+    return 'Dns(enable: $enable, preferH3: $preferH3, useHosts: $useHosts, useSystemHosts: $useSystemHosts, respectRules: $respectRules, ipv6: $ipv6, defaultNameserver: $defaultNameserver, enhancedMode: $enhancedMode, fakeIpRange: $fakeIpRange, fakeIpFilter: $fakeIpFilter, nameserverPolicy: $nameserverPolicy, nameserver: $nameserver, fallback: $fallback, proxyServerNameserver: $proxyServerNameserver, fallbackFilter: $fallbackFilter)';
+  }
+
+  @override
+  bool operator ==(Object other) {
+    return identical(this, other) ||
+        (other.runtimeType == runtimeType &&
+            other is _$DnsImpl &&
+            (identical(other.enable, enable) || other.enable == enable) &&
+            (identical(other.preferH3, preferH3) ||
+                other.preferH3 == preferH3) &&
+            (identical(other.useHosts, useHosts) ||
+                other.useHosts == useHosts) &&
+            (identical(other.useSystemHosts, useSystemHosts) ||
+                other.useSystemHosts == useSystemHosts) &&
+            (identical(other.respectRules, respectRules) ||
+                other.respectRules == respectRules) &&
+            (identical(other.ipv6, ipv6) || other.ipv6 == ipv6) &&
+            const DeepCollectionEquality()
+                .equals(other._defaultNameserver, _defaultNameserver) &&
+            (identical(other.enhancedMode, enhancedMode) ||
+                other.enhancedMode == enhancedMode) &&
+            (identical(other.fakeIpRange, fakeIpRange) ||
+                other.fakeIpRange == fakeIpRange) &&
+            const DeepCollectionEquality()
+                .equals(other._fakeIpFilter, _fakeIpFilter) &&
+            const DeepCollectionEquality()
+                .equals(other._nameserverPolicy, _nameserverPolicy) &&
+            const DeepCollectionEquality()
+                .equals(other._nameserver, _nameserver) &&
+            const DeepCollectionEquality().equals(other._fallback, _fallback) &&
+            const DeepCollectionEquality()
+                .equals(other._proxyServerNameserver, _proxyServerNameserver) &&
+            (identical(other.fallbackFilter, fallbackFilter) ||
+                other.fallbackFilter == fallbackFilter));
+  }
+
+  @JsonKey(ignore: true)
+  @override
+  int get hashCode => Object.hash(
+      runtimeType,
+      enable,
+      preferH3,
+      useHosts,
+      useSystemHosts,
+      respectRules,
+      ipv6,
+      const DeepCollectionEquality().hash(_defaultNameserver),
+      enhancedMode,
+      fakeIpRange,
+      const DeepCollectionEquality().hash(_fakeIpFilter),
+      const DeepCollectionEquality().hash(_nameserverPolicy),
+      const DeepCollectionEquality().hash(_nameserver),
+      const DeepCollectionEquality().hash(_fallback),
+      const DeepCollectionEquality().hash(_proxyServerNameserver),
+      fallbackFilter);
+
+  @JsonKey(ignore: true)
+  @override
+  @pragma('vm:prefer-inline')
+  _$$DnsImplCopyWith<_$DnsImpl> get copyWith =>
+      __$$DnsImplCopyWithImpl<_$DnsImpl>(this, _$identity);
+
+  @override
+  Map<String, dynamic> toJson() {
+    return _$$DnsImplToJson(
+      this,
+    );
+  }
+}
+
+abstract class _Dns implements Dns {
+  const factory _Dns(
+      {final bool enable,
+      @JsonKey(name: "prefer-h3") final bool preferH3,
+      @JsonKey(name: "use-hosts") final bool useHosts,
+      @JsonKey(name: "use-system-hosts") final bool useSystemHosts,
+      @JsonKey(name: "respect-rules") final bool respectRules,
+      final bool ipv6,
+      @JsonKey(name: "default-nameserver") final List<String> defaultNameserver,
+      @JsonKey(name: "enhanced-mode") final DnsMode enhancedMode,
+      @JsonKey(name: "fake-ip-range") final String fakeIpRange,
+      @JsonKey(name: "fake-ip-filter") final List<String> fakeIpFilter,
+      @JsonKey(name: "nameserver-policy")
+      final Map<String, String> nameserverPolicy,
+      final List<String> nameserver,
+      final List<String> fallback,
+      @JsonKey(name: "proxy-server-nameserver")
+      final List<String> proxyServerNameserver,
+      @JsonKey(name: "fallback-filter")
+      final FallbackFilter fallbackFilter}) = _$DnsImpl;
+
+  factory _Dns.fromJson(Map<String, dynamic> json) = _$DnsImpl.fromJson;
+
+  @override
+  bool get enable;
+  @override
+  @JsonKey(name: "prefer-h3")
+  bool get preferH3;
+  @override
+  @JsonKey(name: "use-hosts")
+  bool get useHosts;
+  @override
+  @JsonKey(name: "use-system-hosts")
+  bool get useSystemHosts;
+  @override
+  @JsonKey(name: "respect-rules")
+  bool get respectRules;
+  @override
+  bool get ipv6;
+  @override
+  @JsonKey(name: "default-nameserver")
+  List<String> get defaultNameserver;
+  @override
+  @JsonKey(name: "enhanced-mode")
+  DnsMode get enhancedMode;
+  @override
+  @JsonKey(name: "fake-ip-range")
+  String get fakeIpRange;
+  @override
+  @JsonKey(name: "fake-ip-filter")
+  List<String> get fakeIpFilter;
+  @override
+  @JsonKey(name: "nameserver-policy")
+  Map<String, String> get nameserverPolicy;
+  @override
+  List<String> get nameserver;
+  @override
+  List<String> get fallback;
+  @override
+  @JsonKey(name: "proxy-server-nameserver")
+  List<String> get proxyServerNameserver;
+  @override
+  @JsonKey(name: "fallback-filter")
+  FallbackFilter get fallbackFilter;
+  @override
+  @JsonKey(ignore: true)
+  _$$DnsImplCopyWith<_$DnsImpl> get copyWith =>
+      throw _privateConstructorUsedError;
+}

lib/models/generated/clash_config.g.dart

@@ -6,35 +6,6 @@ part of '../clash_config.dart';
 // JsonSerializableGenerator
 // **************************************************************************
 
-Dns _$DnsFromJson(Map<String, dynamic> json) => Dns()
-  ..enable = json['enable'] as bool
-  ..ipv6 = json['ipv6'] as bool
-  ..defaultNameserver = (json['default-nameserver'] as List<dynamic>)
-      .map((e) => e as String)
-      .toList()
-  ..enhancedMode = json['enhanced-mode'] as String
-  ..fakeIpRange = json['fake-ip-range'] as String
-  ..useHosts = json['use-hosts'] as bool
-  ..nameserver =
-      (json['nameserver'] as List<dynamic>).map((e) => e as String).toList()
-  ..fallback =
-      (json['fallback'] as List<dynamic>).map((e) => e as String).toList()
-  ..fakeIpFilter = (json['fake-ip-filter'] as List<dynamic>)
-      .map((e) => e as String)
-      .toList();
-
-Map<String, dynamic> _$DnsToJson(Dns instance) => <String, dynamic>{
-      'enable': instance.enable,
-      'ipv6': instance.ipv6,
-      'default-nameserver': instance.defaultNameserver,
-      'enhanced-mode': instance.enhancedMode,
-      'fake-ip-range': instance.fakeIpRange,
-      'use-hosts': instance.useHosts,
-      'nameserver': instance.nameserver,
-      'fallback': instance.fallback,
-      'fake-ip-filter': instance.fakeIpFilter,
-    };
-
 ClashConfig _$ClashConfigFromJson(Map<String, dynamic> json) => ClashConfig()
   ..mixedPort = (json['mixed-port'] as num?)?.toInt() ?? 7890
   ..mode = $enumDecodeNullable(_$ModeEnumMap, json['mode']) ?? Mode.rule
@@ -51,7 +22,7 @@ ClashConfig _$ClashConfigFromJson(Map<String, dynamic> json) => ClashConfig()
   ..unifiedDelay = json['unified-delay'] as bool? ?? false
   ..tcpConcurrent = json['tcp-concurrent'] as bool? ?? false
   ..tun = Tun.fromJson(json['tun'] as Map<String, dynamic>)
-  ..dns = Dns.fromJson(json['dns'] as Map<String, dynamic>)
+  ..dns = Dns.safeDnsFromJson(json['dns'] as Map<String, Object?>)
   ..rules = (json['rules'] as List<dynamic>).map((e) => e as String).toList()
   ..globalRealUa = json['global-real-ua'] as String?
   ..geoXUrl = (json['geox-url'] as Map<String, dynamic>?)?.map(
@@ -66,7 +37,11 @@ ClashConfig _$ClashConfigFromJson(Map<String, dynamic> json) => ClashConfig()
             'https://github.com/MetaCubeX/meta-rules-dat/releases/download/latest/GeoIP.dat',
         'geosite':
             'https://github.com/MetaCubeX/meta-rules-dat/releases/download/latest/geosite.dat'
-      };
+      }
+  ..hosts = (json['hosts'] as Map<String, dynamic>?)?.map(
+        (k, e) => MapEntry(k, e as String),
+      ) ??
+      {};
 
 Map<String, dynamic> _$ClashConfigToJson(ClashConfig instance) =>
     <String, dynamic>{
@@ -87,6 +62,7 @@ Map<String, dynamic> _$ClashConfigToJson(ClashConfig instance) =>
       'global-ua': instance.globalUa,
       'global-real-ua': instance.globalRealUa,
       'geox-url': instance.geoXUrl,
+      'hosts': instance.hosts,
     };
 
 const _$ModeEnumMap = {
@@ -131,3 +107,105 @@ const _$TunStackEnumMap = {
   TunStack.system: 'system',
   TunStack.mixed: 'mixed',
 };
+
+_$FallbackFilterImpl _$$FallbackFilterImplFromJson(Map<String, dynamic> json) =>
+    _$FallbackFilterImpl(
+      geoip: json['geoip'] as bool? ?? true,
+      geoipCode: json['geoip-code'] as String? ?? "CN",
+      geosite: (json['geosite'] as List<dynamic>?)
+              ?.map((e) => e as String)
+              .toList() ??
+          const ["gfw"],
+      ipcidr: (json['ipcidr'] as List<dynamic>?)
+              ?.map((e) => e as String)
+              .toList() ??
+          const ["240.0.0.0/4"],
+      domain: (json['domain'] as List<dynamic>?)
+              ?.map((e) => e as String)
+              .toList() ??
+          const ["+.google.com", "+.facebook.com", "+.youtube.com"],
+    );
+
+Map<String, dynamic> _$$FallbackFilterImplToJson(
+        _$FallbackFilterImpl instance) =>
+    <String, dynamic>{
+      'geoip': instance.geoip,
+      'geoip-code': instance.geoipCode,
+      'geosite': instance.geosite,
+      'ipcidr': instance.ipcidr,
+      'domain': instance.domain,
+    };
+
+_$DnsImpl _$$DnsImplFromJson(Map<String, dynamic> json) => _$DnsImpl(
+      enable: json['enable'] as bool? ?? true,
+      preferH3: json['prefer-h3'] as bool? ?? false,
+      useHosts: json['use-hosts'] as bool? ?? true,
+      useSystemHosts: json['use-system-hosts'] as bool? ?? true,
+      respectRules: json['respect-rules'] as bool? ?? true,
+      ipv6: json['ipv6'] as bool? ?? false,
+      defaultNameserver: (json['default-nameserver'] as List<dynamic>?)
+              ?.map((e) => e as String)
+              .toList() ??
+          const ["223.5.5.5"],
+      enhancedMode:
+          $enumDecodeNullable(_$DnsModeEnumMap, json['enhanced-mode']) ??
+              DnsMode.fakeIp,
+      fakeIpRange: json['fake-ip-range'] as String? ?? "198.18.0.1/16",
+      fakeIpFilter: (json['fake-ip-filter'] as List<dynamic>?)
+              ?.map((e) => e as String)
+              .toList() ??
+          const ["*.lan", "localhost.ptlogin2.qq.com"],
+      nameserverPolicy:
+          (json['nameserver-policy'] as Map<String, dynamic>?)?.map(
+                (k, e) => MapEntry(k, e as String),
+              ) ??
+              const {
+                "www.baidu.com": "114.114.114.114",
+                "+.internal.crop.com": "10.0.0.1",
+                "geosite:cn": "https://doh.pub/dns-query"
+              },
+      nameserver: (json['nameserver'] as List<dynamic>?)
+              ?.map((e) => e as String)
+              .toList() ??
+          const [
+            "https://doh.pub/dns-query",
+            "https://dns.alidns.com/dns-query"
+          ],
+      fallback: (json['fallback'] as List<dynamic>?)
+              ?.map((e) => e as String)
+              .toList() ??
+          const ["tls://8.8.4.4", "tls://1.1.1.1"],
+      proxyServerNameserver: (json['proxy-server-nameserver'] as List<dynamic>?)
+              ?.map((e) => e as String)
+              .toList() ??
+          const ["https://doh.pub/dns-query"],
+      fallbackFilter: json['fallback-filter'] == null
+          ? const FallbackFilter()
+          : FallbackFilter.fromJson(
+              json['fallback-filter'] as Map<String, dynamic>),
+    );
+
+Map<String, dynamic> _$$DnsImplToJson(_$DnsImpl instance) => <String, dynamic>{
+      'enable': instance.enable,
+      'prefer-h3': instance.preferH3,
+      'use-hosts': instance.useHosts,
+      'use-system-hosts': instance.useSystemHosts,
+      'respect-rules': instance.respectRules,
+      'ipv6': instance.ipv6,
+      'default-nameserver': instance.defaultNameserver,
+      'enhanced-mode': _$DnsModeEnumMap[instance.enhancedMode]!,
+      'fake-ip-range': instance.fakeIpRange,
+      'fake-ip-filter': instance.fakeIpFilter,
+      'nameserver-policy': instance.nameserverPolicy,
+      'nameserver': instance.nameserver,
+      'fallback': instance.fallback,
+      'proxy-server-nameserver': instance.proxyServerNameserver,
+      'fallback-filter': instance.fallbackFilter,
+    };
+
+const _$DnsModeEnumMap = {
+  DnsMode.normal: 'normal',
+  DnsMode.fakeIp: 'fake-ip',
+  DnsMode.redirHost: 'redir-host',
+  DnsMode.hosts: 'hosts',
+};

lib/models/generated/config.freezed.dart

@@ -552,6 +552,189 @@ abstract class _CoreState implements CoreState {
       throw _privateConstructorUsedError;
 }
 
+VPNState _$VPNStateFromJson(Map<String, dynamic> json) {
+  return _VPNState.fromJson(json);
+}
+
+/// @nodoc
+mixin _$VPNState {
+  AccessControl? get accessControl => throw _privateConstructorUsedError;
+  VpnProps get vpnProps => throw _privateConstructorUsedError;
+
+  Map<String, dynamic> toJson() => throw _privateConstructorUsedError;
+  @JsonKey(ignore: true)
+  $VPNStateCopyWith<VPNState> get copyWith =>
+      throw _privateConstructorUsedError;
+}
+
+/// @nodoc
+abstract class $VPNStateCopyWith<$Res> {
+  factory $VPNStateCopyWith(VPNState value, $Res Function(VPNState) then) =
+      _$VPNStateCopyWithImpl<$Res, VPNState>;
+  @useResult
+  $Res call({AccessControl? accessControl, VpnProps vpnProps});
+
+  $AccessControlCopyWith<$Res>? get accessControl;
+  $VpnPropsCopyWith<$Res> get vpnProps;
+}
+
+/// @nodoc
+class _$VPNStateCopyWithImpl<$Res, $Val extends VPNState>
+    implements $VPNStateCopyWith<$Res> {
+  _$VPNStateCopyWithImpl(this._value, this._then);
+
+  // ignore: unused_field
+  final $Val _value;
+  // ignore: unused_field
+  final $Res Function($Val) _then;
+
+  @pragma('vm:prefer-inline')
+  @override
+  $Res call({
+    Object? accessControl = freezed,
+    Object? vpnProps = null,
+  }) {
+    return _then(_value.copyWith(
+      accessControl: freezed == accessControl
+          ? _value.accessControl
+          : accessControl // ignore: cast_nullable_to_non_nullable
+              as AccessControl?,
+      vpnProps: null == vpnProps
+          ? _value.vpnProps
+          : vpnProps // ignore: cast_nullable_to_non_nullable
+              as VpnProps,
+    ) as $Val);
+  }
+
+  @override
+  @pragma('vm:prefer-inline')
+  $AccessControlCopyWith<$Res>? get accessControl {
+    if (_value.accessControl == null) {
+      return null;
+    }
+
+    return $AccessControlCopyWith<$Res>(_value.accessControl!, (value) {
+      return _then(_value.copyWith(accessControl: value) as $Val);
+    });
+  }
+
+  @override
+  @pragma('vm:prefer-inline')
+  $VpnPropsCopyWith<$Res> get vpnProps {
+    return $VpnPropsCopyWith<$Res>(_value.vpnProps, (value) {
+      return _then(_value.copyWith(vpnProps: value) as $Val);
+    });
+  }
+}
+
+/// @nodoc
+abstract class _$$VPNStateImplCopyWith<$Res>
+    implements $VPNStateCopyWith<$Res> {
+  factory _$$VPNStateImplCopyWith(
+          _$VPNStateImpl value, $Res Function(_$VPNStateImpl) then) =
+      __$$VPNStateImplCopyWithImpl<$Res>;
+  @override
+  @useResult
+  $Res call({AccessControl? accessControl, VpnProps vpnProps});
+
+  @override
+  $AccessControlCopyWith<$Res>? get accessControl;
+  @override
+  $VpnPropsCopyWith<$Res> get vpnProps;
+}
+
+/// @nodoc
+class __$$VPNStateImplCopyWithImpl<$Res>
+    extends _$VPNStateCopyWithImpl<$Res, _$VPNStateImpl>
+    implements _$$VPNStateImplCopyWith<$Res> {
+  __$$VPNStateImplCopyWithImpl(
+      _$VPNStateImpl _value, $Res Function(_$VPNStateImpl) _then)
+      : super(_value, _then);
+
+  @pragma('vm:prefer-inline')
+  @override
+  $Res call({
+    Object? accessControl = freezed,
+    Object? vpnProps = null,
+  }) {
+    return _then(_$VPNStateImpl(
+      accessControl: freezed == accessControl
+          ? _value.accessControl
+          : accessControl // ignore: cast_nullable_to_non_nullable
+              as AccessControl?,
+      vpnProps: null == vpnProps
+          ? _value.vpnProps
+          : vpnProps // ignore: cast_nullable_to_non_nullable
+              as VpnProps,
+    ));
+  }
+}
+
+/// @nodoc
+@JsonSerializable()
+class _$VPNStateImpl implements _VPNState {
+  const _$VPNStateImpl({required this.accessControl, required this.vpnProps});
+
+  factory _$VPNStateImpl.fromJson(Map<String, dynamic> json) =>
+      _$$VPNStateImplFromJson(json);
+
+  @override
+  final AccessControl? accessControl;
+  @override
+  final VpnProps vpnProps;
+
+  @override
+  String toString() {
+    return 'VPNState(accessControl: $accessControl, vpnProps: $vpnProps)';
+  }
+
+  @override
+  bool operator ==(Object other) {
+    return identical(this, other) ||
+        (other.runtimeType == runtimeType &&
+            other is _$VPNStateImpl &&
+            (identical(other.accessControl, accessControl) ||
+                other.accessControl == accessControl) &&
+            (identical(other.vpnProps, vpnProps) ||
+                other.vpnProps == vpnProps));
+  }
+
+  @JsonKey(ignore: true)
+  @override
+  int get hashCode => Object.hash(runtimeType, accessControl, vpnProps);
+
+  @JsonKey(ignore: true)
+  @override
+  @pragma('vm:prefer-inline')
+  _$$VPNStateImplCopyWith<_$VPNStateImpl> get copyWith =>
+      __$$VPNStateImplCopyWithImpl<_$VPNStateImpl>(this, _$identity);
+
+  @override
+  Map<String, dynamic> toJson() {
+    return _$$VPNStateImplToJson(
+      this,
+    );
+  }
+}
+
+abstract class _VPNState implements VPNState {
+  const factory _VPNState(
+      {required final AccessControl? accessControl,
+      required final VpnProps vpnProps}) = _$VPNStateImpl;
+
+  factory _VPNState.fromJson(Map<String, dynamic> json) =
+      _$VPNStateImpl.fromJson;
+
+  @override
+  AccessControl? get accessControl;
+  @override
+  VpnProps get vpnProps;
+  @override
+  @JsonKey(ignore: true)
+  _$$VPNStateImplCopyWith<_$VPNStateImpl> get copyWith =>
+      throw _privateConstructorUsedError;
+}
+
 WindowProps _$WindowPropsFromJson(Map<String, dynamic> json) {
   return _WindowProps.fromJson(json);
 }
@@ -1057,3 +1240,159 @@ abstract class _DesktopProps implements DesktopProps {
   _$$DesktopPropsImplCopyWith<_$DesktopPropsImpl> get copyWith =>
       throw _privateConstructorUsedError;
 }
+
+ScaleProps _$ScalePropsFromJson(Map<String, dynamic> json) {
+  return _ScaleProps.fromJson(json);
+}
+
+/// @nodoc
+mixin _$ScaleProps {
+  bool get custom => throw _privateConstructorUsedError;
+  double get scale => throw _privateConstructorUsedError;
+
+  Map<String, dynamic> toJson() => throw _privateConstructorUsedError;
+  @JsonKey(ignore: true)
+  $ScalePropsCopyWith<ScaleProps> get copyWith =>
+      throw _privateConstructorUsedError;
+}
+
+/// @nodoc
+abstract class $ScalePropsCopyWith<$Res> {
+  factory $ScalePropsCopyWith(
+          ScaleProps value, $Res Function(ScaleProps) then) =
+      _$ScalePropsCopyWithImpl<$Res, ScaleProps>;
+  @useResult
+  $Res call({bool custom, double scale});
+}
+
+/// @nodoc
+class _$ScalePropsCopyWithImpl<$Res, $Val extends ScaleProps>
+    implements $ScalePropsCopyWith<$Res> {
+  _$ScalePropsCopyWithImpl(this._value, this._then);
+
+  // ignore: unused_field
+  final $Val _value;
+  // ignore: unused_field
+  final $Res Function($Val) _then;
+
+  @pragma('vm:prefer-inline')
+  @override
+  $Res call({
+    Object? custom = null,
+    Object? scale = null,
+  }) {
+    return _then(_value.copyWith(
+      custom: null == custom
+          ? _value.custom
+          : custom // ignore: cast_nullable_to_non_nullable
+              as bool,
+      scale: null == scale
+          ? _value.scale
+          : scale // ignore: cast_nullable_to_non_nullable
+              as double,
+    ) as $Val);
+  }
+}
+
+/// @nodoc
+abstract class _$$ScalePropsImplCopyWith<$Res>
+    implements $ScalePropsCopyWith<$Res> {
+  factory _$$ScalePropsImplCopyWith(
+          _$ScalePropsImpl value, $Res Function(_$ScalePropsImpl) then) =
+      __$$ScalePropsImplCopyWithImpl<$Res>;
+  @override
+  @useResult
+  $Res call({bool custom, double scale});
+}
+
+/// @nodoc
+class __$$ScalePropsImplCopyWithImpl<$Res>
+    extends _$ScalePropsCopyWithImpl<$Res, _$ScalePropsImpl>
+    implements _$$ScalePropsImplCopyWith<$Res> {
+  __$$ScalePropsImplCopyWithImpl(
+      _$ScalePropsImpl _value, $Res Function(_$ScalePropsImpl) _then)
+      : super(_value, _then);
+
+  @pragma('vm:prefer-inline')
+  @override
+  $Res call({
+    Object? custom = null,
+    Object? scale = null,
+  }) {
+    return _then(_$ScalePropsImpl(
+      custom: null == custom
+          ? _value.custom
+          : custom // ignore: cast_nullable_to_non_nullable
+              as bool,
+      scale: null == scale
+          ? _value.scale
+          : scale // ignore: cast_nullable_to_non_nullable
+              as double,
+    ));
+  }
+}
+
+/// @nodoc
+@JsonSerializable()
+class _$ScalePropsImpl implements _ScaleProps {
+  const _$ScalePropsImpl(
+      {this.custom = false, this.scale = defaultCustomFontSizeScale});
+
+  factory _$ScalePropsImpl.fromJson(Map<String, dynamic> json) =>
+      _$$ScalePropsImplFromJson(json);
+
+  @override
+  @JsonKey()
+  final bool custom;
+  @override
+  @JsonKey()
+  final double scale;
+
+  @override
+  String toString() {
+    return 'ScaleProps(custom: $custom, scale: $scale)';
+  }
+
+  @override
+  bool operator ==(Object other) {
+    return identical(this, other) ||
+        (other.runtimeType == runtimeType &&
+            other is _$ScalePropsImpl &&
+            (identical(other.custom, custom) || other.custom == custom) &&
+            (identical(other.scale, scale) || other.scale == scale));
+  }
+
+  @JsonKey(ignore: true)
+  @override
+  int get hashCode => Object.hash(runtimeType, custom, scale);
+
+  @JsonKey(ignore: true)
+  @override
+  @pragma('vm:prefer-inline')
+  _$$ScalePropsImplCopyWith<_$ScalePropsImpl> get copyWith =>
+      __$$ScalePropsImplCopyWithImpl<_$ScalePropsImpl>(this, _$identity);
+
+  @override
+  Map<String, dynamic> toJson() {
+    return _$$ScalePropsImplToJson(
+      this,
+    );
+  }
+}
+
+abstract class _ScaleProps implements ScaleProps {
+  const factory _ScaleProps({final bool custom, final double scale}) =
+      _$ScalePropsImpl;
+
+  factory _ScaleProps.fromJson(Map<String, dynamic> json) =
+      _$ScalePropsImpl.fromJson;
+
+  @override
+  bool get custom;
+  @override
+  double get scale;
+  @override
+  @JsonKey(ignore: true)
+  _$$ScalePropsImplCopyWith<_$ScalePropsImpl> get copyWith =>
+      throw _privateConstructorUsedError;
+}

lib/models/generated/config.g.dart

@@ -53,7 +53,10 @@ Config _$ConfigFromJson(Map<String, dynamic> json) => Config()
   ..vpnProps = VpnProps.fromJson(json['vpnProps'] as Map<String, dynamic>?)
   ..desktopProps =
       DesktopProps.fromJson(json['desktopProps'] as Map<String, dynamic>?)
-  ..showLabel = json['showLabel'] as bool? ?? false;
+  ..scaleProps =
+      ScaleProps.fromJson(json['scaleProps'] as Map<String, dynamic>?)
+  ..showLabel = json['showLabel'] as bool? ?? false
+  ..overrideDns = json['overrideDns'] as bool? ?? false;
 
 Map<String, dynamic> _$ConfigToJson(Config instance) => <String, dynamic>{
       'profiles': instance.profiles,
@@ -84,7 +87,9 @@ Map<String, dynamic> _$ConfigToJson(Config instance) => <String, dynamic>{
       'windowProps': instance.windowProps,
       'vpnProps': instance.vpnProps,
       'desktopProps': instance.desktopProps,
+      'scaleProps': instance.scaleProps,
       'showLabel': instance.showLabel,
+      'overrideDns': instance.overrideDns,
     };
 
 const _$ThemeModeEnumMap = {
@@ -178,6 +183,21 @@ Map<String, dynamic> _$$CoreStateImplToJson(_$CoreStateImpl instance) =>
       'onlyProxy': instance.onlyProxy,
     };
 
+_$VPNStateImpl _$$VPNStateImplFromJson(Map<String, dynamic> json) =>
+    _$VPNStateImpl(
+      accessControl: json['accessControl'] == null
+          ? null
+          : AccessControl.fromJson(
+              json['accessControl'] as Map<String, dynamic>),
+      vpnProps: VpnProps.fromJson(json['vpnProps'] as Map<String, dynamic>?),
+    );
+
+Map<String, dynamic> _$$VPNStateImplToJson(_$VPNStateImpl instance) =>
+    <String, dynamic>{
+      'accessControl': instance.accessControl,
+      'vpnProps': instance.vpnProps,
+    };
+
 _$WindowPropsImpl _$$WindowPropsImplFromJson(Map<String, dynamic> json) =>
     _$WindowPropsImpl(
       width: (json['width'] as num?)?.toDouble() ?? 1000,
@@ -217,3 +237,15 @@ Map<String, dynamic> _$$DesktopPropsImplToJson(_$DesktopPropsImpl instance) =>
     <String, dynamic>{
       'systemProxy': instance.systemProxy,
     };
+
+_$ScalePropsImpl _$$ScalePropsImplFromJson(Map<String, dynamic> json) =>
+    _$ScalePropsImpl(
+      custom: json['custom'] as bool? ?? false,
+      scale: (json['scale'] as num?)?.toDouble() ?? defaultCustomFontSizeScale,
+    );
+
+Map<String, dynamic> _$$ScalePropsImplToJson(_$ScalePropsImpl instance) =>
+    <String, dynamic>{
+      'custom': instance.custom,
+      'scale': instance.scale,
+    };

lib/models/generated/dav.freezed.dart

@@ -23,6 +23,7 @@ mixin _$DAV {
   String get uri => throw _privateConstructorUsedError;
   String get user => throw _privateConstructorUsedError;
   String get password => throw _privateConstructorUsedError;
+  String get fileName => throw _privateConstructorUsedError;
 
   Map<String, dynamic> toJson() => throw _privateConstructorUsedError;
   @JsonKey(ignore: true)
@@ -34,7 +35,7 @@ abstract class $DAVCopyWith<$Res> {
   factory $DAVCopyWith(DAV value, $Res Function(DAV) then) =
       _$DAVCopyWithImpl<$Res, DAV>;
   @useResult
-  $Res call({String uri, String user, String password});
+  $Res call({String uri, String user, String password, String fileName});
 }
 
 /// @nodoc
@@ -52,6 +53,7 @@ class _$DAVCopyWithImpl<$Res, $Val extends DAV> implements $DAVCopyWith<$Res> {
     Object? uri = null,
     Object? user = null,
     Object? password = null,
+    Object? fileName = null,
   }) {
     return _then(_value.copyWith(
       uri: null == uri
@@ -66,6 +68,10 @@ class _$DAVCopyWithImpl<$Res, $Val extends DAV> implements $DAVCopyWith<$Res> {
           ? _value.password
           : password // ignore: cast_nullable_to_non_nullable
               as String,
+      fileName: null == fileName
+          ? _value.fileName
+          : fileName // ignore: cast_nullable_to_non_nullable
+              as String,
     ) as $Val);
   }
 }
@@ -76,7 +82,7 @@ abstract class _$$DAVImplCopyWith<$Res> implements $DAVCopyWith<$Res> {
       __$$DAVImplCopyWithImpl<$Res>;
   @override
   @useResult
-  $Res call({String uri, String user, String password});
+  $Res call({String uri, String user, String password, String fileName});
 }
 
 /// @nodoc
@@ -91,6 +97,7 @@ class __$$DAVImplCopyWithImpl<$Res> extends _$DAVCopyWithImpl<$Res, _$DAVImpl>
     Object? uri = null,
     Object? user = null,
     Object? password = null,
+    Object? fileName = null,
   }) {
     return _then(_$DAVImpl(
       uri: null == uri
@@ -105,6 +112,10 @@ class __$$DAVImplCopyWithImpl<$Res> extends _$DAVCopyWithImpl<$Res, _$DAVImpl>
           ? _value.password
           : password // ignore: cast_nullable_to_non_nullable
               as String,
+      fileName: null == fileName
+          ? _value.fileName
+          : fileName // ignore: cast_nullable_to_non_nullable
+              as String,
     ));
   }
 }
@@ -113,7 +124,10 @@ class __$$DAVImplCopyWithImpl<$Res> extends _$DAVCopyWithImpl<$Res, _$DAVImpl>
 @JsonSerializable()
 class _$DAVImpl implements _DAV {
   const _$DAVImpl(
-      {required this.uri, required this.user, required this.password});
+      {required this.uri,
+      required this.user,
+      required this.password,
+      this.fileName = defaultDavFileName});
 
   factory _$DAVImpl.fromJson(Map<String, dynamic> json) =>
       _$$DAVImplFromJson(json);
@@ -124,10 +138,13 @@ class _$DAVImpl implements _DAV {
   final String user;
   @override
   final String password;
+  @override
+  @JsonKey()
+  final String fileName;
 
   @override
   String toString() {
-    return 'DAV(uri: $uri, user: $user, password: $password)';
+    return 'DAV(uri: $uri, user: $user, password: $password, fileName: $fileName)';
   }
 
   @override
@@ -138,12 +155,14 @@ class _$DAVImpl implements _DAV {
             (identical(other.uri, uri) || other.uri == uri) &&
             (identical(other.user, user) || other.user == user) &&
             (identical(other.password, password) ||
-                other.password == password));
+                other.password == password) &&
+            (identical(other.fileName, fileName) ||
+                other.fileName == fileName));
   }
 
   @JsonKey(ignore: true)
   @override
-  int get hashCode => Object.hash(runtimeType, uri, user, password);
+  int get hashCode => Object.hash(runtimeType, uri, user, password, fileName);
 
   @JsonKey(ignore: true)
   @override
@@ -163,7 +182,8 @@ abstract class _DAV implements DAV {
   const factory _DAV(
       {required final String uri,
       required final String user,
-      required final String password}) = _$DAVImpl;
+      required final String password,
+      final String fileName}) = _$DAVImpl;
 
   factory _DAV.fromJson(Map<String, dynamic> json) = _$DAVImpl.fromJson;
 
@@ -174,6 +194,8 @@ abstract class _DAV implements DAV {
   @override
   String get password;
   @override
+  String get fileName;
+  @override
   @JsonKey(ignore: true)
   _$$DAVImplCopyWith<_$DAVImpl> get copyWith =>
       throw _privateConstructorUsedError;

lib/models/generated/dav.g.dart

@@ -10,10 +10,12 @@ _$DAVImpl _$$DAVImplFromJson(Map<String, dynamic> json) => _$DAVImpl(
       uri: json['uri'] as String,
       user: json['user'] as String,
       password: json['password'] as String,
+      fileName: json['fileName'] as String? ?? defaultDavFileName,
     );
 
 Map<String, dynamic> _$$DAVImplToJson(_$DAVImpl instance) => <String, dynamic>{
       'uri': instance.uri,
       'user': instance.user,
       'password': instance.password,
+      'fileName': instance.fileName,
     };

lib/models/generated/ffi.freezed.dart

@@ -26,6 +26,8 @@ mixin _$ConfigExtendedParams {
   bool get isCompatible => throw _privateConstructorUsedError;
   @JsonKey(name: "selected-map")
   Map<String, String> get selectedMap => throw _privateConstructorUsedError;
+  @JsonKey(name: "override-dns")
+  bool get overrideDns => throw _privateConstructorUsedError;
   @JsonKey(name: "test-url")
   String get testUrl => throw _privateConstructorUsedError;
 
@@ -45,6 +47,7 @@ abstract class $ConfigExtendedParamsCopyWith<$Res> {
       {@JsonKey(name: "is-patch") bool isPatch,
       @JsonKey(name: "is-compatible") bool isCompatible,
       @JsonKey(name: "selected-map") Map<String, String> selectedMap,
+      @JsonKey(name: "override-dns") bool overrideDns,
       @JsonKey(name: "test-url") String testUrl});
 }
 
@@ -65,6 +68,7 @@ class _$ConfigExtendedParamsCopyWithImpl<$Res,
     Object? isPatch = null,
     Object? isCompatible = null,
     Object? selectedMap = null,
+    Object? overrideDns = null,
     Object? testUrl = null,
   }) {
     return _then(_value.copyWith(
@@ -80,6 +84,10 @@ class _$ConfigExtendedParamsCopyWithImpl<$Res,
           ? _value.selectedMap
           : selectedMap // ignore: cast_nullable_to_non_nullable
               as Map<String, String>,
+      overrideDns: null == overrideDns
+          ? _value.overrideDns
+          : overrideDns // ignore: cast_nullable_to_non_nullable
+              as bool,
       testUrl: null == testUrl
           ? _value.testUrl
           : testUrl // ignore: cast_nullable_to_non_nullable
@@ -100,6 +108,7 @@ abstract class _$$ConfigExtendedParamsImplCopyWith<$Res>
       {@JsonKey(name: "is-patch") bool isPatch,
       @JsonKey(name: "is-compatible") bool isCompatible,
       @JsonKey(name: "selected-map") Map<String, String> selectedMap,
+      @JsonKey(name: "override-dns") bool overrideDns,
       @JsonKey(name: "test-url") String testUrl});
 }
 
@@ -117,6 +126,7 @@ class __$$ConfigExtendedParamsImplCopyWithImpl<$Res>
     Object? isPatch = null,
     Object? isCompatible = null,
     Object? selectedMap = null,
+    Object? overrideDns = null,
     Object? testUrl = null,
   }) {
     return _then(_$ConfigExtendedParamsImpl(
@@ -132,6 +142,10 @@ class __$$ConfigExtendedParamsImplCopyWithImpl<$Res>
           ? _value._selectedMap
           : selectedMap // ignore: cast_nullable_to_non_nullable
               as Map<String, String>,
+      overrideDns: null == overrideDns
+          ? _value.overrideDns
+          : overrideDns // ignore: cast_nullable_to_non_nullable
+              as bool,
       testUrl: null == testUrl
           ? _value.testUrl
           : testUrl // ignore: cast_nullable_to_non_nullable
@@ -148,6 +162,7 @@ class _$ConfigExtendedParamsImpl implements _ConfigExtendedParams {
       @JsonKey(name: "is-compatible") required this.isCompatible,
       @JsonKey(name: "selected-map")
       required final Map<String, String> selectedMap,
+      @JsonKey(name: "override-dns") required this.overrideDns,
       @JsonKey(name: "test-url") required this.testUrl})
       : _selectedMap = selectedMap;
 
@@ -169,13 +184,16 @@ class _$ConfigExtendedParamsImpl implements _ConfigExtendedParams {
     return EqualUnmodifiableMapView(_selectedMap);
   }
 
+  @override
+  @JsonKey(name: "override-dns")
+  final bool overrideDns;
   @override
   @JsonKey(name: "test-url")
   final String testUrl;
 
   @override
   String toString() {
-    return 'ConfigExtendedParams(isPatch: $isPatch, isCompatible: $isCompatible, selectedMap: $selectedMap, testUrl: $testUrl)';
+    return 'ConfigExtendedParams(isPatch: $isPatch, isCompatible: $isCompatible, selectedMap: $selectedMap, overrideDns: $overrideDns, testUrl: $testUrl)';
   }
 
   @override
@@ -188,13 +206,15 @@ class _$ConfigExtendedParamsImpl implements _ConfigExtendedParams {
                 other.isCompatible == isCompatible) &&
             const DeepCollectionEquality()
                 .equals(other._selectedMap, _selectedMap) &&
+            (identical(other.overrideDns, overrideDns) ||
+                other.overrideDns == overrideDns) &&
             (identical(other.testUrl, testUrl) || other.testUrl == testUrl));
   }
 
   @JsonKey(ignore: true)
   @override
   int get hashCode => Object.hash(runtimeType, isPatch, isCompatible,
-      const DeepCollectionEquality().hash(_selectedMap), testUrl);
+      const DeepCollectionEquality().hash(_selectedMap), overrideDns, testUrl);
 
   @JsonKey(ignore: true)
   @override
@@ -218,6 +238,7 @@ abstract class _ConfigExtendedParams implements ConfigExtendedParams {
           @JsonKey(name: "is-compatible") required final bool isCompatible,
           @JsonKey(name: "selected-map")
           required final Map<String, String> selectedMap,
+          @JsonKey(name: "override-dns") required final bool overrideDns,
           @JsonKey(name: "test-url") required final String testUrl}) =
       _$ConfigExtendedParamsImpl;
 
@@ -234,6 +255,9 @@ abstract class _ConfigExtendedParams implements ConfigExtendedParams {
   @JsonKey(name: "selected-map")
   Map<String, String> get selectedMap;
   @override
+  @JsonKey(name: "override-dns")
+  bool get overrideDns;
+  @override
   @JsonKey(name: "test-url")
   String get testUrl;
   @override

lib/models/generated/ffi.g.dart

@@ -12,6 +12,7 @@ _$ConfigExtendedParamsImpl _$$ConfigExtendedParamsImplFromJson(
       isPatch: json['is-patch'] as bool,
       isCompatible: json['is-compatible'] as bool,
       selectedMap: Map<String, String>.from(json['selected-map'] as Map),
+      overrideDns: json['override-dns'] as bool,
       testUrl: json['test-url'] as String,
     );
 
@@ -21,6 +22,7 @@ Map<String, dynamic> _$$ConfigExtendedParamsImplToJson(
       'is-patch': instance.isPatch,
       'is-compatible': instance.isCompatible,
       'selected-map': instance.selectedMap,
+      'override-dns': instance.overrideDns,
       'test-url': instance.testUrl,
     };
 

lib/models/generated/proxy.freezed.dart

@@ -24,6 +24,7 @@ mixin _$Group {
   List<Proxy> get all => throw _privateConstructorUsedError;
   String? get now => throw _privateConstructorUsedError;
   bool? get hidden => throw _privateConstructorUsedError;
+  String get icon => throw _privateConstructorUsedError;
   String get name => throw _privateConstructorUsedError;
 
   Map<String, dynamic> toJson() => throw _privateConstructorUsedError;
@@ -41,6 +42,7 @@ abstract class $GroupCopyWith<$Res> {
       List<Proxy> all,
       String? now,
       bool? hidden,
+      String icon,
       String name});
 }
 
@@ -61,6 +63,7 @@ class _$GroupCopyWithImpl<$Res, $Val extends Group>
     Object? all = null,
     Object? now = freezed,
     Object? hidden = freezed,
+    Object? icon = null,
     Object? name = null,
   }) {
     return _then(_value.copyWith(
@@ -80,6 +83,10 @@ class _$GroupCopyWithImpl<$Res, $Val extends Group>
           ? _value.hidden
           : hidden // ignore: cast_nullable_to_non_nullable
               as bool?,
+      icon: null == icon
+          ? _value.icon
+          : icon // ignore: cast_nullable_to_non_nullable
+              as String,
       name: null == name
           ? _value.name
           : name // ignore: cast_nullable_to_non_nullable
@@ -100,6 +107,7 @@ abstract class _$$GroupImplCopyWith<$Res> implements $GroupCopyWith<$Res> {
       List<Proxy> all,
       String? now,
       bool? hidden,
+      String icon,
       String name});
 }
 
@@ -118,6 +126,7 @@ class __$$GroupImplCopyWithImpl<$Res>
     Object? all = null,
     Object? now = freezed,
     Object? hidden = freezed,
+    Object? icon = null,
     Object? name = null,
   }) {
     return _then(_$GroupImpl(
@@ -137,6 +146,10 @@ class __$$GroupImplCopyWithImpl<$Res>
           ? _value.hidden
           : hidden // ignore: cast_nullable_to_non_nullable
               as bool?,
+      icon: null == icon
+          ? _value.icon
+          : icon // ignore: cast_nullable_to_non_nullable
+              as String,
       name: null == name
           ? _value.name
           : name // ignore: cast_nullable_to_non_nullable
@@ -153,6 +166,7 @@ class _$GroupImpl implements _Group {
       final List<Proxy> all = const [],
       this.now,
       this.hidden,
+      this.icon = "",
       required this.name})
       : _all = all;
 
@@ -175,11 +189,14 @@ class _$GroupImpl implements _Group {
   @override
   final bool? hidden;
   @override
+  @JsonKey()
+  final String icon;
+  @override
   final String name;
 
   @override
   String toString() {
-    return 'Group(type: $type, all: $all, now: $now, hidden: $hidden, name: $name)';
+    return 'Group(type: $type, all: $all, now: $now, hidden: $hidden, icon: $icon, name: $name)';
   }
 
   @override
@@ -191,13 +208,14 @@ class _$GroupImpl implements _Group {
             const DeepCollectionEquality().equals(other._all, _all) &&
             (identical(other.now, now) || other.now == now) &&
             (identical(other.hidden, hidden) || other.hidden == hidden) &&
+            (identical(other.icon, icon) || other.icon == icon) &&
             (identical(other.name, name) || other.name == name));
   }
 
   @JsonKey(ignore: true)
   @override
   int get hashCode => Object.hash(runtimeType, type,
-      const DeepCollectionEquality().hash(_all), now, hidden, name);
+      const DeepCollectionEquality().hash(_all), now, hidden, icon, name);
 
   @JsonKey(ignore: true)
   @override
@@ -219,6 +237,7 @@ abstract class _Group implements Group {
       final List<Proxy> all,
       final String? now,
       final bool? hidden,
+      final String icon,
       required final String name}) = _$GroupImpl;
 
   factory _Group.fromJson(Map<String, dynamic> json) = _$GroupImpl.fromJson;
@@ -232,6 +251,8 @@ abstract class _Group implements Group {
   @override
   bool? get hidden;
   @override
+  String get icon;
+  @override
   String get name;
   @override
   @JsonKey(ignore: true)

lib/models/generated/proxy.g.dart

@@ -14,6 +14,7 @@ _$GroupImpl _$$GroupImplFromJson(Map<String, dynamic> json) => _$GroupImpl(
           const [],
       now: json['now'] as String?,
       hidden: json['hidden'] as bool?,
+      icon: json['icon'] as String? ?? "",
       name: json['name'] as String,
     );
 
@@ -23,6 +24,7 @@ Map<String, dynamic> _$$GroupImplToJson(_$GroupImpl instance) =>
       'all': instance.all,
       'now': instance.now,
       'hidden': instance.hidden,
+      'icon': instance.icon,
       'name': instance.name,
     };
 

lib/models/generated/selector.freezed.dart

@@ -3331,11 +3331,148 @@ abstract class _ProxyState implements ProxyState {
       throw _privateConstructorUsedError;
 }
 
+/// @nodoc
+mixin _$HttpOverridesState {
+  bool get isStart => throw _privateConstructorUsedError;
+  int get port => throw _privateConstructorUsedError;
+
+  @JsonKey(ignore: true)
+  $HttpOverridesStateCopyWith<HttpOverridesState> get copyWith =>
+      throw _privateConstructorUsedError;
+}
+
+/// @nodoc
+abstract class $HttpOverridesStateCopyWith<$Res> {
+  factory $HttpOverridesStateCopyWith(
+          HttpOverridesState value, $Res Function(HttpOverridesState) then) =
+      _$HttpOverridesStateCopyWithImpl<$Res, HttpOverridesState>;
+  @useResult
+  $Res call({bool isStart, int port});
+}
+
+/// @nodoc
+class _$HttpOverridesStateCopyWithImpl<$Res, $Val extends HttpOverridesState>
+    implements $HttpOverridesStateCopyWith<$Res> {
+  _$HttpOverridesStateCopyWithImpl(this._value, this._then);
+
+  // ignore: unused_field
+  final $Val _value;
+  // ignore: unused_field
+  final $Res Function($Val) _then;
+
+  @pragma('vm:prefer-inline')
+  @override
+  $Res call({
+    Object? isStart = null,
+    Object? port = null,
+  }) {
+    return _then(_value.copyWith(
+      isStart: null == isStart
+          ? _value.isStart
+          : isStart // ignore: cast_nullable_to_non_nullable
+              as bool,
+      port: null == port
+          ? _value.port
+          : port // ignore: cast_nullable_to_non_nullable
+              as int,
+    ) as $Val);
+  }
+}
+
+/// @nodoc
+abstract class _$$HttpOverridesStateImplCopyWith<$Res>
+    implements $HttpOverridesStateCopyWith<$Res> {
+  factory _$$HttpOverridesStateImplCopyWith(_$HttpOverridesStateImpl value,
+          $Res Function(_$HttpOverridesStateImpl) then) =
+      __$$HttpOverridesStateImplCopyWithImpl<$Res>;
+  @override
+  @useResult
+  $Res call({bool isStart, int port});
+}
+
+/// @nodoc
+class __$$HttpOverridesStateImplCopyWithImpl<$Res>
+    extends _$HttpOverridesStateCopyWithImpl<$Res, _$HttpOverridesStateImpl>
+    implements _$$HttpOverridesStateImplCopyWith<$Res> {
+  __$$HttpOverridesStateImplCopyWithImpl(_$HttpOverridesStateImpl _value,
+      $Res Function(_$HttpOverridesStateImpl) _then)
+      : super(_value, _then);
+
+  @pragma('vm:prefer-inline')
+  @override
+  $Res call({
+    Object? isStart = null,
+    Object? port = null,
+  }) {
+    return _then(_$HttpOverridesStateImpl(
+      isStart: null == isStart
+          ? _value.isStart
+          : isStart // ignore: cast_nullable_to_non_nullable
+              as bool,
+      port: null == port
+          ? _value.port
+          : port // ignore: cast_nullable_to_non_nullable
+              as int,
+    ));
+  }
+}
+
+/// @nodoc
+
+class _$HttpOverridesStateImpl implements _HttpOverridesState {
+  const _$HttpOverridesStateImpl({required this.isStart, required this.port});
+
+  @override
+  final bool isStart;
+  @override
+  final int port;
+
+  @override
+  String toString() {
+    return 'HttpOverridesState(isStart: $isStart, port: $port)';
+  }
+
+  @override
+  bool operator ==(Object other) {
+    return identical(this, other) ||
+        (other.runtimeType == runtimeType &&
+            other is _$HttpOverridesStateImpl &&
+            (identical(other.isStart, isStart) || other.isStart == isStart) &&
+            (identical(other.port, port) || other.port == port));
+  }
+
+  @override
+  int get hashCode => Object.hash(runtimeType, isStart, port);
+
+  @JsonKey(ignore: true)
+  @override
+  @pragma('vm:prefer-inline')
+  _$$HttpOverridesStateImplCopyWith<_$HttpOverridesStateImpl> get copyWith =>
+      __$$HttpOverridesStateImplCopyWithImpl<_$HttpOverridesStateImpl>(
+          this, _$identity);
+}
+
+abstract class _HttpOverridesState implements HttpOverridesState {
+  const factory _HttpOverridesState(
+      {required final bool isStart,
+      required final int port}) = _$HttpOverridesStateImpl;
+
+  @override
+  bool get isStart;
+  @override
+  int get port;
+  @override
+  @JsonKey(ignore: true)
+  _$$HttpOverridesStateImplCopyWith<_$HttpOverridesStateImpl> get copyWith =>
+      throw _privateConstructorUsedError;
+}
+
 /// @nodoc
 mixin _$ClashConfigState {
   int get mixedPort => throw _privateConstructorUsedError;
   bool get allowLan => throw _privateConstructorUsedError;
   bool get ipv6 => throw _privateConstructorUsedError;
+  bool get overrideDns => throw _privateConstructorUsedError;
   String get geodataLoader => throw _privateConstructorUsedError;
   LogLevel get logLevel => throw _privateConstructorUsedError;
   String get externalController => throw _privateConstructorUsedError;
@@ -3344,6 +3481,7 @@ mixin _$ClashConfigState {
   int get keepAliveInterval => throw _privateConstructorUsedError;
   bool get unifiedDelay => throw _privateConstructorUsedError;
   bool get tcpConcurrent => throw _privateConstructorUsedError;
+  Map<String, String> get hosts => throw _privateConstructorUsedError;
   Tun get tun => throw _privateConstructorUsedError;
   Dns get dns => throw _privateConstructorUsedError;
   Map<String, String> get geoXUrl => throw _privateConstructorUsedError;
@@ -3365,6 +3503,7 @@ abstract class $ClashConfigStateCopyWith<$Res> {
       {int mixedPort,
       bool allowLan,
       bool ipv6,
+      bool overrideDns,
       String geodataLoader,
       LogLevel logLevel,
       String externalController,
@@ -3373,6 +3512,7 @@ abstract class $ClashConfigStateCopyWith<$Res> {
       int keepAliveInterval,
       bool unifiedDelay,
       bool tcpConcurrent,
+      Map<String, String> hosts,
       Tun tun,
       Dns dns,
       Map<String, String> geoXUrl,
@@ -3380,6 +3520,7 @@ abstract class $ClashConfigStateCopyWith<$Res> {
       String? globalRealUa});
 
   $TunCopyWith<$Res> get tun;
+  $DnsCopyWith<$Res> get dns;
 }
 
 /// @nodoc
@@ -3398,6 +3539,7 @@ class _$ClashConfigStateCopyWithImpl<$Res, $Val extends ClashConfigState>
     Object? mixedPort = null,
     Object? allowLan = null,
     Object? ipv6 = null,
+    Object? overrideDns = null,
     Object? geodataLoader = null,
     Object? logLevel = null,
     Object? externalController = null,
@@ -3406,6 +3548,7 @@ class _$ClashConfigStateCopyWithImpl<$Res, $Val extends ClashConfigState>
     Object? keepAliveInterval = null,
     Object? unifiedDelay = null,
     Object? tcpConcurrent = null,
+    Object? hosts = null,
     Object? tun = null,
     Object? dns = null,
     Object? geoXUrl = null,
@@ -3425,6 +3568,10 @@ class _$ClashConfigStateCopyWithImpl<$Res, $Val extends ClashConfigState>
           ? _value.ipv6
           : ipv6 // ignore: cast_nullable_to_non_nullable
               as bool,
+      overrideDns: null == overrideDns
+          ? _value.overrideDns
+          : overrideDns // ignore: cast_nullable_to_non_nullable
+              as bool,
       geodataLoader: null == geodataLoader
           ? _value.geodataLoader
           : geodataLoader // ignore: cast_nullable_to_non_nullable
@@ -3457,6 +3604,10 @@ class _$ClashConfigStateCopyWithImpl<$Res, $Val extends ClashConfigState>
           ? _value.tcpConcurrent
           : tcpConcurrent // ignore: cast_nullable_to_non_nullable
               as bool,
+      hosts: null == hosts
+          ? _value.hosts
+          : hosts // ignore: cast_nullable_to_non_nullable
+              as Map<String, String>,
       tun: null == tun
           ? _value.tun
           : tun // ignore: cast_nullable_to_non_nullable
@@ -3487,6 +3638,14 @@ class _$ClashConfigStateCopyWithImpl<$Res, $Val extends ClashConfigState>
       return _then(_value.copyWith(tun: value) as $Val);
     });
   }
+
+  @override
+  @pragma('vm:prefer-inline')
+  $DnsCopyWith<$Res> get dns {
+    return $DnsCopyWith<$Res>(_value.dns, (value) {
+      return _then(_value.copyWith(dns: value) as $Val);
+    });
+  }
 }
 
 /// @nodoc
@@ -3501,6 +3660,7 @@ abstract class _$$ClashConfigStateImplCopyWith<$Res>
       {int mixedPort,
       bool allowLan,
       bool ipv6,
+      bool overrideDns,
       String geodataLoader,
       LogLevel logLevel,
       String externalController,
@@ -3509,6 +3669,7 @@ abstract class _$$ClashConfigStateImplCopyWith<$Res>
       int keepAliveInterval,
       bool unifiedDelay,
       bool tcpConcurrent,
+      Map<String, String> hosts,
       Tun tun,
       Dns dns,
       Map<String, String> geoXUrl,
@@ -3517,6 +3678,8 @@ abstract class _$$ClashConfigStateImplCopyWith<$Res>
 
   @override
   $TunCopyWith<$Res> get tun;
+  @override
+  $DnsCopyWith<$Res> get dns;
 }
 
 /// @nodoc
@@ -3533,6 +3696,7 @@ class __$$ClashConfigStateImplCopyWithImpl<$Res>
     Object? mixedPort = null,
     Object? allowLan = null,
     Object? ipv6 = null,
+    Object? overrideDns = null,
     Object? geodataLoader = null,
     Object? logLevel = null,
     Object? externalController = null,
@@ -3541,6 +3705,7 @@ class __$$ClashConfigStateImplCopyWithImpl<$Res>
     Object? keepAliveInterval = null,
     Object? unifiedDelay = null,
     Object? tcpConcurrent = null,
+    Object? hosts = null,
     Object? tun = null,
     Object? dns = null,
     Object? geoXUrl = null,
@@ -3560,6 +3725,10 @@ class __$$ClashConfigStateImplCopyWithImpl<$Res>
           ? _value.ipv6
           : ipv6 // ignore: cast_nullable_to_non_nullable
               as bool,
+      overrideDns: null == overrideDns
+          ? _value.overrideDns
+          : overrideDns // ignore: cast_nullable_to_non_nullable
+              as bool,
       geodataLoader: null == geodataLoader
           ? _value.geodataLoader
           : geodataLoader // ignore: cast_nullable_to_non_nullable
@@ -3592,6 +3761,10 @@ class __$$ClashConfigStateImplCopyWithImpl<$Res>
           ? _value.tcpConcurrent
           : tcpConcurrent // ignore: cast_nullable_to_non_nullable
               as bool,
+      hosts: null == hosts
+          ? _value._hosts
+          : hosts // ignore: cast_nullable_to_non_nullable
+              as Map<String, String>,
       tun: null == tun
           ? _value.tun
           : tun // ignore: cast_nullable_to_non_nullable
@@ -3623,6 +3796,7 @@ class _$ClashConfigStateImpl implements _ClashConfigState {
       {required this.mixedPort,
       required this.allowLan,
       required this.ipv6,
+      required this.overrideDns,
       required this.geodataLoader,
       required this.logLevel,
       required this.externalController,
@@ -3631,12 +3805,14 @@ class _$ClashConfigStateImpl implements _ClashConfigState {
       required this.keepAliveInterval,
       required this.unifiedDelay,
       required this.tcpConcurrent,
+      required final Map<String, String> hosts,
       required this.tun,
       required this.dns,
       required final Map<String, String> geoXUrl,
       required final List<String> rules,
       required this.globalRealUa})
-      : _geoXUrl = geoXUrl,
+      : _hosts = hosts,
+        _geoXUrl = geoXUrl,
         _rules = rules;
 
   @override
@@ -3646,6 +3822,8 @@ class _$ClashConfigStateImpl implements _ClashConfigState {
   @override
   final bool ipv6;
   @override
+  final bool overrideDns;
+  @override
   final String geodataLoader;
   @override
   final LogLevel logLevel;
@@ -3661,6 +3839,14 @@ class _$ClashConfigStateImpl implements _ClashConfigState {
   final bool unifiedDelay;
   @override
   final bool tcpConcurrent;
+  final Map<String, String> _hosts;
+  @override
+  Map<String, String> get hosts {
+    if (_hosts is EqualUnmodifiableMapView) return _hosts;
+    // ignore: implicit_dynamic_type
+    return EqualUnmodifiableMapView(_hosts);
+  }
+
   @override
   final Tun tun;
   @override
@@ -3686,7 +3872,7 @@ class _$ClashConfigStateImpl implements _ClashConfigState {
 
   @override
   String toString() {
-    return 'ClashConfigState(mixedPort: $mixedPort, allowLan: $allowLan, ipv6: $ipv6, geodataLoader: $geodataLoader, logLevel: $logLevel, externalController: $externalController, mode: $mode, findProcessMode: $findProcessMode, keepAliveInterval: $keepAliveInterval, unifiedDelay: $unifiedDelay, tcpConcurrent: $tcpConcurrent, tun: $tun, dns: $dns, geoXUrl: $geoXUrl, rules: $rules, globalRealUa: $globalRealUa)';
+    return 'ClashConfigState(mixedPort: $mixedPort, allowLan: $allowLan, ipv6: $ipv6, overrideDns: $overrideDns, geodataLoader: $geodataLoader, logLevel: $logLevel, externalController: $externalController, mode: $mode, findProcessMode: $findProcessMode, keepAliveInterval: $keepAliveInterval, unifiedDelay: $unifiedDelay, tcpConcurrent: $tcpConcurrent, hosts: $hosts, tun: $tun, dns: $dns, geoXUrl: $geoXUrl, rules: $rules, globalRealUa: $globalRealUa)';
   }
 
   @override
@@ -3699,6 +3885,8 @@ class _$ClashConfigStateImpl implements _ClashConfigState {
             (identical(other.allowLan, allowLan) ||
                 other.allowLan == allowLan) &&
             (identical(other.ipv6, ipv6) || other.ipv6 == ipv6) &&
+            (identical(other.overrideDns, overrideDns) ||
+                other.overrideDns == overrideDns) &&
             (identical(other.geodataLoader, geodataLoader) ||
                 other.geodataLoader == geodataLoader) &&
             (identical(other.logLevel, logLevel) ||
@@ -3714,6 +3902,7 @@ class _$ClashConfigStateImpl implements _ClashConfigState {
                 other.unifiedDelay == unifiedDelay) &&
             (identical(other.tcpConcurrent, tcpConcurrent) ||
                 other.tcpConcurrent == tcpConcurrent) &&
+            const DeepCollectionEquality().equals(other._hosts, _hosts) &&
             (identical(other.tun, tun) || other.tun == tun) &&
             (identical(other.dns, dns) || other.dns == dns) &&
             const DeepCollectionEquality().equals(other._geoXUrl, _geoXUrl) &&
@@ -3728,6 +3917,7 @@ class _$ClashConfigStateImpl implements _ClashConfigState {
       mixedPort,
       allowLan,
       ipv6,
+      overrideDns,
       geodataLoader,
       logLevel,
       externalController,
@@ -3736,6 +3926,7 @@ class _$ClashConfigStateImpl implements _ClashConfigState {
       keepAliveInterval,
       unifiedDelay,
       tcpConcurrent,
+      const DeepCollectionEquality().hash(_hosts),
       tun,
       dns,
       const DeepCollectionEquality().hash(_geoXUrl),
@@ -3755,6 +3946,7 @@ abstract class _ClashConfigState implements ClashConfigState {
       {required final int mixedPort,
       required final bool allowLan,
       required final bool ipv6,
+      required final bool overrideDns,
       required final String geodataLoader,
       required final LogLevel logLevel,
       required final String externalController,
@@ -3763,6 +3955,7 @@ abstract class _ClashConfigState implements ClashConfigState {
       required final int keepAliveInterval,
       required final bool unifiedDelay,
       required final bool tcpConcurrent,
+      required final Map<String, String> hosts,
       required final Tun tun,
       required final Dns dns,
       required final Map<String, String> geoXUrl,
@@ -3776,6 +3969,8 @@ abstract class _ClashConfigState implements ClashConfigState {
   @override
   bool get ipv6;
   @override
+  bool get overrideDns;
+  @override
   String get geodataLoader;
   @override
   LogLevel get logLevel;
@@ -3792,6 +3987,8 @@ abstract class _ClashConfigState implements ClashConfigState {
   @override
   bool get tcpConcurrent;
   @override
+  Map<String, String> get hosts;
+  @override
   Tun get tun;
   @override
   Dns get dns;

lib/models/proxy.dart

@@ -15,6 +15,7 @@ class Group with _$Group {
     @Default([]) List<Proxy> all,
     String? now,
     bool? hidden,
+    @Default("") String icon,
     required String name,
   }) = _Group;
 
@@ -41,4 +42,4 @@ class Proxy with _$Proxy {
   }) = _Proxy;
 
   factory Proxy.fromJson(Map<String, Object?> json) => _$ProxyFromJson(json);
-}
+}

lib/models/selector.dart

@@ -4,7 +4,6 @@ import 'package:fl_clash/enum/enum.dart';
 import 'package:fl_clash/models/models.dart';
 import 'package:flutter/material.dart';
 import 'package:freezed_annotation/freezed_annotation.dart';
-import 'package:lpinyin/lpinyin.dart';
 
 part 'generated/selector.freezed.dart';
 
@@ -162,8 +161,8 @@ extension PackageListSelectorStateExt on PackageListSelectorState {
         return switch (sort) {
           AccessSortType.none => 0,
           AccessSortType.name => other.sortByChar(
-              PinyinHelper.getPinyin(a.label),
-              PinyinHelper.getPinyin(b.label),
+              other.getPinyin(a.label),
+              other.getPinyin(b.label),
             ),
           AccessSortType.time =>
             a.firstInstallTime.compareTo(b.firstInstallTime),
@@ -215,12 +214,21 @@ class ProxyState with _$ProxyState {
   }) = _ProxyState;
 }
 
+@freezed
+class HttpOverridesState with _$HttpOverridesState {
+  const factory HttpOverridesState({
+    required bool isStart,
+    required int port,
+  }) = _HttpOverridesState;
+}
+
 @freezed
 class ClashConfigState with _$ClashConfigState {
   const factory ClashConfigState({
     required int mixedPort,
     required bool allowLan,
     required bool ipv6,
+    required bool overrideDns,
     required String geodataLoader,
     required LogLevel logLevel,
     required String externalController,
@@ -229,6 +237,7 @@ class ClashConfigState with _$ClashConfigState {
     required int keepAliveInterval,
     required bool unifiedDelay,
     required bool tcpConcurrent,
+    required HostsMap hosts,
     required Tun tun,
     required Dns dns,
     required GeoXMap geoXUrl,

lib/state.dart

@@ -7,11 +7,15 @@ import 'package:fl_clash/plugins/service.dart';
 import 'package:fl_clash/plugins/vpn.dart';
 import 'package:fl_clash/widgets/scaffold.dart';
 import 'package:flutter/material.dart';
+import 'package:intl/intl.dart';
 import 'package:package_info_plus/package_info_plus.dart';
+import 'package:tray_manager/tray_manager.dart';
 import 'package:url_launcher/url_launcher.dart';
 
 import 'controller.dart';
 
+import 'enum/enum.dart';
+import 'l10n/l10n.dart';
 import 'models/models.dart';
 import 'common/common.dart';
 
@@ -23,11 +27,13 @@ class GlobalState {
   late PackageInfo packageInfo;
   Function? updateCurrentDelayDebounce;
   PageController? pageController;
+  late Measure measure;
   DateTime? startTime;
   final navigatorKey = GlobalKey<NavigatorState>();
   late AppController appController;
   GlobalKey<CommonScaffoldState> homeScaffoldKey = GlobalKey();
   List<Function> updateFunctionLists = [];
+  var isTrayInit = false;
 
   bool get isStart => startTime != null && startTime!.isBeforeNow;
 
@@ -59,6 +65,7 @@ class GlobalState {
           isPatch: isPatch,
           isCompatible: true,
           selectedMap: config.currentSelectedMap,
+          overrideDns: config.overrideDns,
           testUrl: config.testUrl,
         ),
       ),
@@ -189,6 +196,121 @@ class GlobalState {
     );
   }
 
+  _updateOtherTray() async {
+    if (isTrayInit == false) {
+      await trayManager.setIcon(
+        other.getTrayIconPath(),
+      );
+      await trayManager.setToolTip(
+        appName,
+      );
+      isTrayInit = true;
+    }
+  }
+
+  _updateLinuxTray() async {
+    await trayManager.destroy();
+    await trayManager.setIcon(
+      other.getTrayIconPath(),
+    );
+    await trayManager.setToolTip(
+      appName,
+    );
+  }
+
+  updateTray({
+    required AppState appState,
+    required Config config,
+    required ClashConfig clashConfig,
+  }) async {
+    final appLocalizations = await AppLocalizations.load(
+      other.getLocaleForString(config.locale) ??
+          WidgetsBinding.instance.platformDispatcher.locale,
+    );
+    if (!Platform.isLinux) {
+      _updateOtherTray();
+    }
+    List<MenuItem> menuItems = [];
+    final showMenuItem = MenuItem(
+      label: appLocalizations.show,
+      onClick: (_) {
+        window?.show();
+      },
+    );
+    menuItems.add(showMenuItem);
+    final startMenuItem = MenuItem.checkbox(
+      label: appState.isStart ? appLocalizations.stop : appLocalizations.start,
+      onClick: (_) async {
+        globalState.appController.updateStatus(!appState.isStart);
+      },
+      checked: false,
+    );
+    menuItems.add(startMenuItem);
+    menuItems.add(MenuItem.separator());
+    for (final mode in Mode.values) {
+      menuItems.add(
+        MenuItem.checkbox(
+          label: Intl.message(mode.name),
+          onClick: (_) {
+            globalState.appController.clashConfig.mode = mode;
+          },
+          checked: mode == appState.mode,
+        ),
+      );
+    }
+    menuItems.add(MenuItem.separator());
+    if (appState.isStart) {
+      menuItems.add(
+        MenuItem.checkbox(
+          label: appLocalizations.tun,
+          onClick: (_) {
+            final clashConfig = globalState.appController.clashConfig;
+            clashConfig.tun = clashConfig.tun.copyWith(
+              enable: !clashConfig.tun.enable,
+            );
+          },
+          checked: clashConfig.tun.enable,
+        ),
+      );
+      menuItems.add(
+        MenuItem.checkbox(
+          label: appLocalizations.systemProxy,
+          onClick: (_) {
+            final config = globalState.appController.config;
+            config.desktopProps = config.desktopProps.copyWith(
+              systemProxy: !config.desktopProps.systemProxy,
+            );
+          },
+          checked: config.desktopProps.systemProxy,
+        ),
+      );
+      menuItems.add(MenuItem.separator());
+    }
+    final autoStartMenuItem = MenuItem.checkbox(
+      label: appLocalizations.autoLaunch,
+      onClick: (_) async {
+        globalState.appController.config.autoLaunch =
+            !globalState.appController.config.autoLaunch;
+      },
+      checked: config.autoLaunch,
+    );
+    menuItems.add(autoStartMenuItem);
+    menuItems.add(MenuItem.separator());
+    final exitMenuItem = MenuItem(
+      label: appLocalizations.exit,
+      onClick: (_) async {
+        await globalState.appController.handleExit();
+      },
+    );
+    menuItems.add(exitMenuItem);
+    final menu = Menu();
+    menu.items = menuItems;
+    trayManager.setContextMenu(menu);
+    if (Platform.isLinux) {
+      _updateLinuxTray();
+    }
+  }
+
   changeProxy({
     required Config config,
     required String groupName,

lib/widgets/clash_container.dart

@@ -24,8 +24,9 @@ class _ClashContainerState extends State<ClashContainer>
   Function? updateClashConfigDebounce;
 
   Widget _updateContainer(Widget child) {
-    return Selector<ClashConfig, ClashConfigState>(
-      selector: (_, clashConfig) => ClashConfigState(
+    return Selector2<Config,ClashConfig, ClashConfigState>(
+      selector: (_,config, clashConfig) => ClashConfigState(
+        overrideDns: config.overrideDns,
         mixedPort: clashConfig.mixedPort,
         allowLan: clashConfig.allowLan,
         ipv6: clashConfig.ipv6,
@@ -39,6 +40,7 @@ class _ClashContainerState extends State<ClashContainer>
         tcpConcurrent: clashConfig.tcpConcurrent,
         tun: clashConfig.tun,
         dns: clashConfig.dns,
+        hosts: clashConfig.hosts,
         geoXUrl: clashConfig.geoXUrl,
         rules: clashConfig.rules,
         globalRealUa: clashConfig.globalRealUa,
@@ -137,7 +139,7 @@ class _ClashContainerState extends State<ClashContainer>
     if (log.logLevel == LogLevel.error) {
       globalState.appController.showSnackBar(log.payload ?? '');
     }
-    debugPrint("$log");
+    // debugPrint("$log");
     super.onLog(log);
   }
 

lib/widgets/color_scheme_box.dart

@@ -33,66 +33,68 @@ class ColorSchemeBox extends StatelessWidget {
 
   @override
   Widget build(BuildContext context) {
-    return Theme(
-      data: _getTheme(context),
-      child: Builder(
-        builder: (context) {
-          final colorScheme = Theme.of(context).colorScheme;
-          return Stack(
-            children: [
-              CommonCard(
-                isSelected: isSelected,
-                onPressed: onPressed,
-                selectWidget: Container(
-                  alignment: Alignment.center,
-                  child: const SelectIcon(),
-                ),
-                child: Container(
-                  padding: const EdgeInsets.all(8),
-                  child: ClipRRect(
-                    borderRadius: BorderRadius.circular(36),
-                    child: SizedBox(
-                      width: 72,
-                      height: 72,
-                      child: Grid(
-                        crossAxisCount: 2,
-                        children: [
-                          GridItem(
-                            mainAxisCellCount: 2,
-                            child: Container(
-                              color: colorScheme.primary,
+    return AspectRatio(aspectRatio: 1,
+      child: Theme(
+        data: _getTheme(context),
+        child: Builder(
+          builder: (context) {
+            final colorScheme = Theme.of(context).colorScheme;
+            return Stack(
+              children: [
+                CommonCard(
+                  isSelected: isSelected,
+                  onPressed: onPressed,
+                  selectWidget: Container(
+                    alignment: Alignment.center,
+                    child: const SelectIcon(),
+                  ),
+                  child: Container(
+                    padding: const EdgeInsets.all(8),
+                    child: ClipRRect(
+                      borderRadius: BorderRadius.circular(36),
+                      child: SizedBox(
+                        width: 72,
+                        height: 72,
+                        child: Grid(
+                          crossAxisCount: 2,
+                          children: [
+                            GridItem(
+                              mainAxisCellCount: 2,
+                              child: Container(
+                                color: colorScheme.primary,
+                              ),
                             ),
-                          ),
-                          GridItem(
-                            mainAxisCellCount: 1,
-                            child: Container(
-                              color: colorScheme.secondary,
+                            GridItem(
+                              mainAxisCellCount: 1,
+                              child: Container(
+                                color: colorScheme.secondary,
+                              ),
                             ),
-                          ),
-                          GridItem(
-                            mainAxisCellCount: 1,
-                            child: Container(
-                              color: colorScheme.tertiary,
-                            ),
-                          )
-                        ],
+                            GridItem(
+                              mainAxisCellCount: 1,
+                              child: Container(
+                                color: colorScheme.tertiary,
+                              ),
+                            )
+                          ],
+                        ),
                       ),
                     ),
                   ),
                 ),
-              ),
-              if (primaryColor == null)
-                const Positioned(
-                  bottom: 4,
-                  right: 4,
-                  child: Icon(
-                    Icons.colorize,
-                    size: 20,
-                  ),
-                )
-            ],
-          );
-        },
+                if (primaryColor == null)
+                  const Positioned(
+                    bottom: 4,
+                    right: 4,
+                    child: Icon(
+                      Icons.colorize,
+                      size: 20,
+                    ),
+                  )
+              ],
+            );
+          },
+        ),
       ),
     );
   }

lib/widgets/input.dart

@@ -0,0 +1,312 @@
+import 'package:fl_clash/common/constant.dart';
+import 'package:fl_clash/state.dart';
+import 'package:flutter/material.dart';
+
+import '../common/app_localizations.dart';
+import 'card.dart';
+import 'float_layout.dart';
+import 'list.dart';
+
+class OptionsDialog<T> extends StatelessWidget {
+  final String title;
+  final List<T> options;
+  final T value;
+  final String Function(T value) textBuilder;
+
+  const OptionsDialog({
+    super.key,
+    required this.title,
+    required this.options,
+    required this.textBuilder,
+    required this.value,
+  });
+
+  @override
+  Widget build(BuildContext context) {
+    return AlertDialog(
+      title: Text(title),
+      contentPadding: const EdgeInsets.symmetric(
+        horizontal: 8,
+        vertical: 16,
+      ),
+      content: SizedBox(
+        width: 250,
+        child: Wrap(
+          children: [
+            for (final option in options)
+              ListItem.radio(
+                delegate: RadioDelegate(
+                  value: option,
+                  groupValue: value,
+                  onChanged: (T? value) {
+                    Navigator.of(context).pop(value);
+                  },
+                ),
+                title: Text(
+                  this.textBuilder(option),
+                ),
+              ),
+          ],
+        ),
+      ),
+    );
+  }
+}
+
+class InputDialog extends StatefulWidget {
+  final String title;
+  final String value;
+  final String? suffixText;
+  final String? resetValue;
+
+  const InputDialog({
+    super.key,
+    required this.title,
+    required this.value,
+    this.suffixText,
+    this.resetValue,
+  });
+
+  @override
+  State<InputDialog> createState() => _InputDialogState();
+}
+
+class _InputDialogState extends State<InputDialog> {
+  late TextEditingController textController;
+
+  String get value => widget.value;
+
+  String get title => widget.title;
+
+  String? get suffixText => widget.suffixText;
+
+  @override
+  void initState() {
+    super.initState();
+    textController = TextEditingController(
+      text: value,
+    );
+  }
+
+  _handleUpdate() async {
+    final text = textController.value.text;
+    if (text.isEmpty) return;
+    Navigator.of(context).pop<String>(text);
+  }
+
+  _handleReset() async {
+    if (widget.resetValue == null) {
+      return;
+    }
+    Navigator.of(context).pop<String>(widget.resetValue);
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    return AlertDialog(
+      title: Text(title),
+      content: SizedBox(
+        width: 300,
+        child: Wrap(
+          runSpacing: 16,
+          children: [
+            TextField(
+              maxLines: 1,
+              minLines: 1,
+              controller: textController,
+              decoration: InputDecoration(
+                border: const OutlineInputBorder(),
+                suffixText: suffixText,
+              ),
+            ),
+          ],
+        ),
+      ),
+      actions: [
+        if (widget.resetValue != null &&
+            textController.value.text != widget.resetValue) ...[
+          TextButton(
+            onPressed: _handleReset,
+            child: Text(appLocalizations.reset),
+          ),
+          const SizedBox(
+            width: 4,
+          ),
+        ],
+        TextButton(
+          onPressed: _handleUpdate,
+          child: Text(appLocalizations.submit),
+        )
+      ],
+    );
+  }
+}
+
+class UpdatePage<T> extends StatelessWidget {
+  final String title;
+  final Iterable<T> items;
+  final Widget Function(T item) titleBuilder;
+  final Widget Function(T item)? subtitleBuilder;
+  final Function(T item) onAdd;
+  final Function(T item) onRemove;
+  final bool isMap;
+
+  const UpdatePage({
+    super.key,
+    required this.title,
+    required this.items,
+    required this.titleBuilder,
+    required this.onRemove,
+    required this.onAdd,
+    this.isMap = false,
+    this.subtitleBuilder,
+  });
+
+  @override
+  Widget build(BuildContext context) {
+    return FloatLayout(
+      floatingWidget: FloatWrapper(
+        child: FloatingActionButton(
+          onPressed: () async {
+            final value = await globalState.showCommonDialog<T>(
+              child: AddDialog(
+                isMap: isMap,
+                title: title,
+              ),
+            );
+            if (value == null) return;
+            onAdd(value);
+          },
+          child: const Icon(Icons.add),
+        ),
+      ),
+      child: ListView.builder(
+        padding: const EdgeInsets.only(
+          bottom: 16 + 64,
+          left: 16,
+          right: 16,
+        ),
+        itemCount: items.length,
+        itemBuilder: (_, index) {
+          final e = items.toList()[index];
+          return Padding(
+            padding: const EdgeInsets.symmetric(vertical: 8),
+            child: CommonCard(
+              child: ListItem(
+                title: titleBuilder(e),
+                subtitle: subtitleBuilder != null ? subtitleBuilder!(e) : null,
+                trailing: IconButton(
+                  icon: const Icon(Icons.delete_outline),
+                  onPressed: () {
+                    onRemove(e);
+                  },
+                ),
+              ),
+              onPressed: () {},
+            ),
+          );
+        },
+      ),
+    );
+  }
+}
+
+class AddDialog extends StatefulWidget {
+  final String title;
+  final bool isMap;
+
+  const AddDialog({
+    super.key,
+    required this.title,
+    required this.isMap,
+  });
+
+  @override
+  State<AddDialog> createState() => _AddDialogState();
+}
+
+class _AddDialogState extends State<AddDialog> {
+  late TextEditingController keyController;
+  late TextEditingController valueController;
+  final GlobalKey<FormState> _formKey = GlobalKey<FormState>();
+
+  @override
+  void initState() {
+    super.initState();
+    keyController = TextEditingController();
+    valueController = TextEditingController();
+  }
+
+  _submit() {
+    if (!_formKey.currentState!.validate()) return;
+    if (widget.isMap) {
+      Navigator.of(context).pop<MapEntry<String, String>>(
+        MapEntry(
+          keyController.text,
+          valueController.text,
+        ),
+      );
+    } else {
+      Navigator.of(context).pop<String>(
+        valueController.text,
+      );
+    }
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    return AlertDialog(
+      title: Text(widget.title),
+      content: Form(
+        key: _formKey,
+        child: SizedBox(
+          width: dialogCommonWidth,
+          child: Wrap(
+            runSpacing: 16,
+            children: [
+              if (widget.isMap)
+                TextFormField(
+                  maxLines: 2,
+                  minLines: 1,
+                  controller: keyController,
+                  decoration: InputDecoration(
+                    prefixIcon: const Icon(Icons.key),
+                    border: const OutlineInputBorder(),
+                    labelText: appLocalizations.key,
+                  ),
+                  validator: (String? value) {
+                    if (value == null || value.isEmpty) {
+                      return appLocalizations.keyNotEmpty;
+                    }
+                    return null;
+                  },
+                ),
+              TextFormField(
+                maxLines: 3,
+                minLines: 1,
+                controller: valueController,
+                decoration: InputDecoration(
+                  prefixIcon: const Icon(Icons.label),
+                  border: const OutlineInputBorder(),
+                  labelText: appLocalizations.value,
+                ),
+                validator: (String? value) {
+                  if (value == null || value.isEmpty) {
+                    return appLocalizations.valueNotEmpty;
+                  }
+                  return null;
+                },
+              ),
+            ],
+          ),
+        ),
+      ),
+      actions: [
+        TextButton(
+          onPressed: _submit,
+          child: Text(appLocalizations.confirm),
+        )
+      ],
+    );
+  }
+}

lib/widgets/line_chart.dart

@@ -120,9 +120,19 @@ class _LineChartState extends State<LineChart>
   Path getPath(List<Point> points, Size size) {
     final path = Path()
       ..moveTo(points[0].x * size.width, (1 - points[0].y) * size.height);
-    for (var i = 1; i < points.length; i++) {
-      path.lineTo(points[i].x * size.width, (1 - points[i].y) * size.height);
+
+    for (var i = 1; i < points.length - 1; i++) {
+      final nextPoint = points[i + 1];
+      final currentPoint = points[i];
+      final midX = (currentPoint.x + nextPoint.x) / 2;
+      final midY = (currentPoint.y + nextPoint.y) / 2;
+      path.quadraticBezierTo(
+        currentPoint.x * size.width, (1 - currentPoint.y) * size.height,
+        midX * size.width, (1 - midY) * size.height,
+      );
     }
+    path.lineTo(points.last.x * size.width, (1 - points.last.y) * size.height);
+
     return path;
   }
 
@@ -132,7 +142,7 @@ class _LineChartState extends State<LineChart>
     required progress,
   }) {
     nextPoints = getInterpolatePoints(prevPoints, points, progress);
-    Path setSize(Size size) {
+    return (size) {
       final prevPath = getPath(prevPoints, size);
       final nextPath = getPath(nextPoints, size);
       final prevMetric = prevPath.computeMetrics().first;
@@ -143,9 +153,7 @@ class _LineChartState extends State<LineChart>
         0,
         prevLength + (nextLength - prevLength) * progress,
       );
-    }
-
-    return setSize;
+    };
   }
 
   @override

lib/widgets/list.dart

@@ -5,6 +5,7 @@ import 'package:fl_clash/widgets/open_container.dart';
 import 'package:flutter/material.dart';
 
 import 'card.dart';
+import 'input.dart';
 import 'sheet.dart';
 import 'scaffold.dart';
 
@@ -48,11 +49,15 @@ class OpenDelegate extends Delegate {
   final Widget widget;
   final String title;
   final double? extendPageWidth;
+  final bool isBlur;
+  final bool isScaffold;
 
   const OpenDelegate({
     required this.title,
     required this.widget,
     this.extendPageWidth,
+    this.isBlur = true,
+    this.isScaffold = false,
   });
 }
 
@@ -68,6 +73,38 @@ class NextDelegate extends Delegate {
   });
 }
 
+class OptionsDelegate<T> extends Delegate {
+  final List<T> options;
+  final String title;
+  final T value;
+  final String Function(T value) textBuilder;
+  final Function(T? value) onChanged;
+
+  const OptionsDelegate({
+    required this.title,
+    required this.options,
+    required this.textBuilder,
+    required this.value,
+    required this.onChanged,
+  });
+}
+
+class InputDelegate extends Delegate {
+  final String title;
+  final String value;
+  final String? suffixText;
+  final Function(String? value) onChanged;
+  final String? resetValue;
+
+  const InputDelegate({
+    required this.title,
+    required this.value,
+    this.suffixText,
+    required this.onChanged,
+    this.resetValue,
+  });
+}
+
 class ListItem<T> extends StatelessWidget {
   final Widget? leading;
   final Widget title;
@@ -106,6 +143,32 @@ class ListItem<T> extends StatelessWidget {
     this.tileTitleAlignment = ListTileTitleAlignment.center,
   }) : onTap = null;
 
+  const ListItem.options({
+    super.key,
+    required this.title,
+    this.subtitle,
+    this.leading,
+    this.padding = const EdgeInsets.symmetric(horizontal: 16),
+    this.trailing,
+    required OptionsDelegate<T> this.delegate,
+    this.horizontalTitleGap,
+    this.prue,
+    this.tileTitleAlignment = ListTileTitleAlignment.center,
+  }) : onTap = null;
+
+  const ListItem.input({
+    super.key,
+    required this.title,
+    this.subtitle,
+    this.leading,
+    this.padding = const EdgeInsets.symmetric(horizontal: 16),
+    this.trailing,
+    required InputDelegate this.delegate,
+    this.horizontalTitleGap,
+    this.prue,
+    this.tileTitleAlignment = ListTileTitleAlignment.center,
+  }) : onTap = null;
+
   const ListItem.next({
     super.key,
     required this.title,
@@ -125,7 +188,7 @@ class ListItem<T> extends StatelessWidget {
     this.subtitle,
     this.leading,
     this.padding = const EdgeInsets.only(left: 16, right: 8),
-    required CheckboxDelegate this.delegate,
+    required CheckboxDelegate<T> this.delegate,
     this.horizontalTitleGap,
     this.prue,
     this.tileTitleAlignment = ListTileTitleAlignment.center,
@@ -138,7 +201,7 @@ class ListItem<T> extends StatelessWidget {
     this.subtitle,
     this.leading,
     this.padding = const EdgeInsets.only(left: 16, right: 8),
-    required SwitchDelegate this.delegate,
+    required SwitchDelegate<T> this.delegate,
     this.horizontalTitleGap,
     this.prue,
     this.tileTitleAlignment = ListTileTitleAlignment.center,
@@ -227,6 +290,8 @@ class ListItem<T> extends StatelessWidget {
                 body: child,
                 title: openDelegate.title,
                 extendPageWidth: openDelegate.extendPageWidth,
+                isBlur: openDelegate.isBlur,
+                isScaffold: openDelegate.isScaffold,
               );
               return;
             }
@@ -247,6 +312,38 @@ class ListItem<T> extends StatelessWidget {
         },
       );
     }
+    if (delegate is OptionsDelegate) {
+      final optionsDelegate = delegate as OptionsDelegate<T>;
+      return _buildListTile(
+        onTap: () async {
+          final value = await globalState.showCommonDialog<T>(
+            child: OptionsDialog<T>(
+              title: optionsDelegate.title,
+              options: optionsDelegate.options,
+              textBuilder: optionsDelegate.textBuilder,
+              value: optionsDelegate.value,
+            ),
+          );
+          optionsDelegate.onChanged(value);
+        },
+      );
+    }
+    if (delegate is InputDelegate) {
+      final inputDelegate = delegate as InputDelegate;
+      return _buildListTile(
+        onTap: () async {
+          final value = await globalState.showCommonDialog<String>(
+            child: InputDialog(
+              title: inputDelegate.title,
+              value: inputDelegate.value,
+              suffixText: inputDelegate.suffixText,
+              resetValue: inputDelegate.resetValue,
+            ),
+          );
+          inputDelegate.onChanged(value);
+        },
+      );
+    }
     if (delegate is NextDelegate) {
       final nextDelegate = delegate as NextDelegate;
       return _buildListTile(
@@ -423,5 +520,8 @@ Widget generateListView(List<Widget> items) {
   return ListView.builder(
     itemCount: items.length,
     itemBuilder: (_, index) => items[index],
+    padding: const EdgeInsets.only(
+      bottom: 16,
+    ),
   );
 }

lib/widgets/media_container.dart

@@ -0,0 +1,35 @@
+import 'package:fl_clash/common/common.dart';
+import 'package:fl_clash/models/config.dart';
+import 'package:fl_clash/state.dart';
+import 'package:flutter/material.dart';
+import 'package:provider/provider.dart';
+
+class MediaContainer extends StatelessWidget {
+  final Widget child;
+
+  const MediaContainer({
+    super.key,
+    required this.child,
+  });
+
+  @override
+  Widget build(BuildContext context) {
+    return Selector<Config, ScaleProps>(
+      selector: (_, config) => config.scaleProps,
+      builder: (_, props, child) {
+        return MediaQuery(
+          data: MediaQuery.of(context).copyWith(
+            textScaler: props.custom ? TextScaler.linear(props.scale) : null,
+          ),
+          child: Builder(
+            builder: (context) {
+              globalState.measure = Measure.of(context);
+              return child!;
+            },
+          ),
+        );
+      },
+      child: child,
+    );
+  }
+}

lib/widgets/open_container.dart

@@ -286,23 +286,6 @@ class _OpenContainerRoute<T> extends ModalRoute<T> {
   final _FlippableTweenSequence<double> _closedOpacityTween;
   final _FlippableTweenSequence<double> _openOpacityTween;
   late _FlippableTweenSequence<Color?> _colorTween;
-
-  static final TweenSequence<Color?> _scrimFadeInTween = TweenSequence<Color?>(
-    <TweenSequenceItem<Color?>>[
-      TweenSequenceItem<Color?>(
-        tween: ColorTween(begin: Colors.transparent, end: Colors.black54),
-        weight: 1 / 5,
-      ),
-      TweenSequenceItem<Color>(
-        tween: ConstantTween<Color>(Colors.black54),
-        weight: 4 / 5,
-      ),
-    ],
-  );
-  static final Tween<Color?> _scrimFadeOutTween = ColorTween(
-    begin: Colors.transparent,
-    end: Colors.black54,
-  );
   final GlobalKey _openBuilderKey = GlobalKey();
   final RectTween _rectTween = RectTween();
 
@@ -486,20 +469,17 @@ class _OpenContainerRoute<T> extends ModalRoute<T> {
                   closedOpacityTween = _closedOpacityTween;
                   openOpacityTween = _openOpacityTween;
                   colorTween = _colorTween;
-                  scrimTween = _scrimFadeInTween;
                   break;
                 case AnimationStatus.reverse:
                   if (_transitionWasInterrupted) {
                     closedOpacityTween = _closedOpacityTween;
                     openOpacityTween = _openOpacityTween;
                     colorTween = _colorTween;
-                    scrimTween = _scrimFadeInTween;
                     break;
                   }
                   closedOpacityTween = _closedOpacityTween.flipped;
                   openOpacityTween = _openOpacityTween.flipped;
                   colorTween = _colorTween.flipped;
-                  scrimTween = _scrimFadeOutTween;
                   break;
                 case AnimationStatus.completed:
                   assert(false); // Unreachable.
@@ -508,74 +488,70 @@ class _OpenContainerRoute<T> extends ModalRoute<T> {
               assert(colorTween != null);
               assert(closedOpacityTween != null);
               assert(openOpacityTween != null);
-              assert(scrimTween != null);
 
               final Rect rect = _rectTween.evaluate(curvedAnimation)!;
               return SizedBox.expand(
-                child: Container(
-                  color: scrimTween!.evaluate(curvedAnimation),
-                  child: Align(
-                    alignment: Alignment.topLeft,
-                    child: Transform.translate(
-                      offset: Offset(rect.left, rect.top),
-                      child: SizedBox(
-                        width: rect.width,
-                        height: rect.height,
-                        child: Material(
-                          clipBehavior: Clip.antiAlias,
-                          animationDuration: Duration.zero,
-                          color: colorTween!.evaluate(animation),
-                          child: Stack(
-                            fit: StackFit.passthrough,
-                            children: <Widget>[
-                              // Closed child fading out.
-                              FittedBox(
-                                fit: BoxFit.fitWidth,
-                                alignment: Alignment.topLeft,
-                                child: SizedBox(
-                                  width: _rectTween.begin!.width,
-                                  height: _rectTween.begin!.height,
-                                  child: (hideableKey.currentState?.isInTree ??
-                                          false)
-                                      ? null
-                                      : FadeTransition(
-                                          opacity: closedOpacityTween!
-                                              .animate(animation),
-                                          child: Builder(
-                                            key: closedBuilderKey,
-                                            builder: (BuildContext context) {
-                                              // Use dummy "open container" callback
-                                              // since we are in the process of opening.
-                                              return closedBuilder(
-                                                  context, () {});
-                                            },
-                                          ),
+                child: Align(
+                  alignment: Alignment.topLeft,
+                  child: Transform.translate(
+                    offset: Offset(rect.left, rect.top),
+                    child: SizedBox(
+                      width: rect.width,
+                      height: rect.height,
+                      child: Material(
+                        clipBehavior: Clip.antiAlias,
+                        animationDuration: Duration.zero,
+                        color: colorTween!.evaluate(animation),
+                        child: Stack(
+                          fit: StackFit.passthrough,
+                          children: <Widget>[
+                            // Closed child fading out.
+                            FittedBox(
+                              fit: BoxFit.fitWidth,
+                              alignment: Alignment.topLeft,
+                              child: SizedBox(
+                                width: _rectTween.begin!.width,
+                                height: _rectTween.begin!.height,
+                                child: (hideableKey.currentState?.isInTree ??
+                                        false)
+                                    ? null
+                                    : FadeTransition(
+                                        opacity: closedOpacityTween!
+                                            .animate(animation),
+                                        child: Builder(
+                                          key: closedBuilderKey,
+                                          builder: (BuildContext context) {
+                                            // Use dummy "open container" callback
+                                            // since we are in the process of opening.
+                                            return closedBuilder(
+                                                context, () {});
+                                          },
                                         ),
-                                ),
+                                      ),
                               ),
+                            ),
 
-                              // Open child fading in.
-                              FittedBox(
-                                fit: BoxFit.fitWidth,
-                                alignment: Alignment.topLeft,
-                                child: SizedBox(
-                                  width: _rectTween.end!.width,
-                                  height: _rectTween.end!.height,
-                                  child: FadeTransition(
-                                    opacity:
-                                        openOpacityTween!.animate(animation),
-                                    child: Builder(
-                                      key: _openBuilderKey,
-                                      builder: (BuildContext context) {
-                                        return openBuilder(
-                                            context, closeContainer);
-                                      },
-                                    ),
+                            // Open child fading in.
+                            FittedBox(
+                              fit: BoxFit.fitWidth,
+                              alignment: Alignment.topLeft,
+                              child: SizedBox(
+                                width: _rectTween.end!.width,
+                                height: _rectTween.end!.height,
+                                child: FadeTransition(
+                                  opacity:
+                                      openOpacityTween!.animate(animation),
+                                  child: Builder(
+                                    key: _openBuilderKey,
+                                    builder: (BuildContext context) {
+                                      return openBuilder(
+                                          context, closeContainer);
+                                    },
                                   ),
                                 ),
                               ),
-                            ],
-                          ),
+                            ),
+                          ],
                         ),
                       ),
                     ),

lib/widgets/sheet.dart

@@ -10,7 +10,8 @@ showExtendPage(
   required Widget body,
   required String title,
   double? extendPageWidth,
-  bool forceNotSide = false,
+  bool isScaffold = false,
+  bool isBlur = true,
   Widget? action,
 }) {
   final NavigatorState navigator = Navigator.of(context);
@@ -21,7 +22,18 @@ showExtendPage(
   );
   final isMobile =
       globalState.appController.appState.viewMode == ViewMode.mobile;
-  final isNotSide = isMobile || forceNotSide;
+  if (isMobile) {
+    Navigator.of(context).push(
+      MaterialPageRoute(
+        builder: (_) => CommonScaffold(
+          title: title,
+          body: uniqueBody,
+        ),
+      ),
+    );
+    return;
+  }
+  final isNotSide = isMobile || isScaffold;
   navigator.push(
     ModalSideSheetRoute(
       modalBarrierColor: Colors.black38,
@@ -46,7 +58,7 @@ showExtendPage(
         );
       },
       constraints: const BoxConstraints(),
-      filter: filter,
+      filter: isBlur ? filter : null,
     ),
   );
 }

lib/widgets/text.dart

@@ -16,7 +16,7 @@ class TooltipText extends StatelessWidget {
     return LayoutBuilder(
       builder: (context, container) {
         final maxWidth = container.maxWidth;
-        final size = globalState.appController.measure.computeTextSize(
+        final size = globalState.measure.computeTextSize(
           text,
         );
         if (maxWidth < size.width) {

lib/widgets/tray_container.dart

@@ -22,7 +22,6 @@ class TrayContainer extends StatefulWidget {
 }
 
 class _TrayContainerState extends State<TrayContainer> with TrayListener {
-  var isTrayInit = false;
 
   @override
   void initState() {
@@ -30,145 +29,6 @@ class _TrayContainerState extends State<TrayContainer> with TrayListener {
     trayManager.addListener(this);
   }
 
-  _updateOtherTray() async {
-    if (isTrayInit == false) {
-      await trayManager.setIcon(
-        other.getTrayIconPath(),
-      );
-      await trayManager.setToolTip(
-        appName,
-      );
-      isTrayInit = true;
-    }
-  }
-
-  _updateLinuxTray() async {
-    await trayManager.destroy();
-    await trayManager.setIcon(
-      other.getTrayIconPath(),
-    );
-    await trayManager.setToolTip(
-      appName,
-    );
-  }
-
-  updateMenu(TrayContainerSelectorState state) {
-    WidgetsBinding.instance.addPostFrameCallback((_) {
-      if (!Platform.isLinux) {
-        _updateOtherTray();
-      }
-      List<MenuItem> menuItems = [];
-      final showMenuItem = MenuItem(
-        label: appLocalizations.show,
-        onClick: (_) {
-          window?.show();
-        },
-      );
-      menuItems.add(showMenuItem);
-      final startMenuItem = MenuItem.checkbox(
-        label: state.isStart ? appLocalizations.stop : appLocalizations.start,
-        onClick: (_) async {
-          globalState.appController.updateStatus(!state.isStart);
-        },
-        checked: false,
-      );
-      menuItems.add(startMenuItem);
-      menuItems.add(MenuItem.separator());
-      // for (final group in state.groups) {
-      //   List<MenuItem> subMenuItems = [];
-      //   final isCurrentGroup = group.name == state.currentGroupName;
-      //   for (final proxy in group.all) {
-      //     final isCurrentProxy = proxy.name == state.currentProxyName;
-      //     subMenuItems.add(
-      //       MenuItem.checkbox(
-      //           label: proxy.name,
-      //           checked: isCurrentGroup && isCurrentProxy,
-      //           onClick: (_) {
-      //             final config = globalState.appController.config;
-      //             config.currentProfile?.groupName = group.name;
-      //             config.currentProfile?.proxyName = proxy.name;
-      //             config.update();
-      //             globalState.appController.changeProxy();
-      //           }),
-      //     );
-      //   }
-      //   menuItems.add(
-      //     MenuItem.submenu(
-      //       label: group.name,
-      //       submenu: Menu(
-      //         items: subMenuItems,
-      //       ),
-      //     ),
-      //   );
-      // }
-      // if (state.groups.isNotEmpty) {
-      //   menuItems.add(MenuItem.separator());
-      // }
-      for (final mode in Mode.values) {
-        menuItems.add(
-          MenuItem.checkbox(
-            label: Intl.message(mode.name),
-            onClick: (_) {
-              globalState.appController.clashConfig.mode = mode;
-            },
-            checked: mode == state.mode,
-          ),
-        );
-      }
-      menuItems.add(MenuItem.separator());
-
-      if (state.isStart) {
-        menuItems.add(
-          MenuItem.checkbox(
-            label: appLocalizations.tun,
-            onClick: (_) {
-              final clashConfig = globalState.appController.clashConfig;
-              clashConfig.tun =
-                  clashConfig.tun.copyWith(enable: !state.tunEnable);
-            },
-            checked: state.tunEnable,
-          ),
-        );
-        menuItems.add(
-          MenuItem.checkbox(
-            label: appLocalizations.systemProxy,
-            onClick: (_) {
-              final config = globalState.appController.config;
-              config.desktopProps =
-                  config.desktopProps.copyWith(systemProxy: !state.systemProxy);
-            },
-            checked: state.systemProxy,
-          ),
-        );
-        menuItems.add(MenuItem.separator());
-      }
-
-      final autoStartMenuItem = MenuItem.checkbox(
-        label: appLocalizations.autoLaunch,
-        onClick: (_) async {
-          globalState.appController.config.autoLaunch =
-              !globalState.appController.config.autoLaunch;
-        },
-        checked: state.autoLaunch,
-      );
-      menuItems.add(autoStartMenuItem);
-      menuItems.add(MenuItem.separator());
-      final exitMenuItem = MenuItem(
-        label: appLocalizations.exit,
-        onClick: (_) async {
-          await globalState.appController.handleExit();
-        },
-      );
-      menuItems.add(exitMenuItem);
-      final menu = Menu();
-      menu.items = menuItems;
-      trayManager.setContextMenu(menu);
-      if (Platform.isLinux) {
-        _updateLinuxTray();
-      }
-    });
-  }
-
   @override
   Widget build(BuildContext context) {
     return Selector3<AppState, Config, ClashConfig, TrayContainerSelectorState>(
@@ -181,8 +41,13 @@ class _TrayContainerState extends State<TrayContainer> with TrayListener {
         systemProxy: config.desktopProps.systemProxy,
         tunEnable: clashConfig.tun.enable,
       ),
+      shouldRebuild: (prev,next){
+        if(prev != next){
+          globalState.appController.updateTray();
+        }
+        return prev != next;
+      },
       builder: (_, state, child) {
-        updateMenu(state);
         return child!;
       },
       child: widget.child,

lib/widgets/vpn_container.dart

@@ -0,0 +1,58 @@
+import 'package:fl_clash/common/app_localizations.dart';
+import 'package:fl_clash/models/config.dart';
+import 'package:fl_clash/state.dart';
+import 'package:flutter/material.dart';
+import 'package:provider/provider.dart';
+
+import '../common/function.dart';
+
+class VpnContainer extends StatefulWidget {
+  final Widget child;
+
+  const VpnContainer({
+    super.key,
+    required this.child,
+  });
+
+  @override
+  State<VpnContainer> createState() => _VpnContainerState();
+}
+
+class _VpnContainerState extends State<VpnContainer> {
+  Function? vpnTipDebounce;
+
+  showTip() {
+    vpnTipDebounce ??= debounce<Function()>(() async {
+      WidgetsBinding.instance.addPostFrameCallback((_) {
+        final appState = globalState.appController.appState;
+        if (appState.isStart) {
+          globalState.showSnackBar(
+            context,
+            message: appLocalizations.vpnTip,
+          );
+        }
+      });
+    });
+    vpnTipDebounce!();
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    return Selector<Config, VPNState>(
+      selector: (_, config) => VPNState(
+        accessControl: config.accessControl,
+        vpnProps: config.vpnProps,
+      ),
+      shouldRebuild: (prev,next){
+        if(prev != next){
+          showTip();
+        }
+        return prev != next;
+      },
+      builder: (_, __, child) {
+        return child!;
+      },
+      child: widget.child,
+    );
+  }
+}

lib/widgets/widgets.dart

@@ -25,4 +25,7 @@ export 'app_state_container.dart';
 export 'text.dart';
 export 'connection_item.dart';
 export 'builder.dart';
-export 'setting.dart';
+export 'setting.dart';
+export 'vpn_container.dart';
+export 'input.dart';
+export 'media_container.dart';

macos/Flutter/GeneratedPluginRegistrant.swift

@@ -13,6 +13,7 @@ import package_info_plus
 import path_provider_foundation
 import screen_retriever
 import shared_preferences_foundation
+import sqflite
 import tray_manager
 import url_launcher_macos
 import window_manager
@@ -26,6 +27,7 @@ func RegisterGeneratedPlugins(registry: FlutterPluginRegistry) {
   PathProviderPlugin.register(with: registry.registrar(forPlugin: "PathProviderPlugin"))
   ScreenRetrieverPlugin.register(with: registry.registrar(forPlugin: "ScreenRetrieverPlugin"))
   SharedPreferencesPlugin.register(with: registry.registrar(forPlugin: "SharedPreferencesPlugin"))
+  SqflitePlugin.register(with: registry.registrar(forPlugin: "SqflitePlugin"))
   TrayManagerPlugin.register(with: registry.registrar(forPlugin: "TrayManagerPlugin"))
   UrlLauncherPlugin.register(with: registry.registrar(forPlugin: "UrlLauncherPlugin"))
   WindowManagerPlugin.register(with: registry.registrar(forPlugin: "WindowManagerPlugin"))

pubspec.lock

@@ -129,6 +129,30 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "8.9.2"
+  cached_network_image:
+    dependency: "direct main"
+    description:
+      name: cached_network_image
+      sha256: "4a5d8d2c728b0f3d0245f69f921d7be90cae4c2fd5288f773088672c0893f819"
+      url: "https://pub.dev"
+    source: hosted
+    version: "3.4.0"
+  cached_network_image_platform_interface:
+    dependency: transitive
+    description:
+      name: cached_network_image_platform_interface
+      sha256: "35814b016e37fbdc91f7ae18c8caf49ba5c88501813f73ce8a07027a395e2829"
+      url: "https://pub.dev"
+    source: hosted
+    version: "4.1.1"
+  cached_network_image_web:
+    dependency: transitive
+    description:
+      name: cached_network_image_web
+      sha256: "6322dde7a5ad92202e64df659241104a43db20ed594c41ca18de1014598d7996"
+      url: "https://pub.dev"
+    source: hosted
+    version: "1.3.0"
   characters:
     dependency: transitive
     description:
@@ -197,18 +221,18 @@ packages:
     dependency: transitive
     description:
       name: cross_file
-      sha256: "55d7b444feb71301ef6b8838dbc1ae02e63dd48c8773f3810ff53bb1e2945b32"
+      sha256: "7caf6a750a0c04effbb52a676dce9a4a592e10ad35c34d6d2d0e4811160d5670"
       url: "https://pub.dev"
     source: hosted
-    version: "0.3.4+1"
+    version: "0.3.4+2"
   crypto:
     dependency: transitive
     description:
       name: crypto
-      sha256: ff625774173754681d66daaf4a448684fb04b78f902da9cb3d308c19cc5e8bab
+      sha256: ec30d999af904f33454ba22ed9a86162b35e52b44ac4807d1d93c288041d7d27
       url: "https://pub.dev"
     source: hosted
-    version: "3.0.3"
+    version: "3.0.5"
   dart_style:
     dependency: transitive
     description:
@@ -221,18 +245,18 @@ packages:
     dependency: "direct main"
     description:
       name: dio
-      sha256: e17f6b3097b8c51b72c74c9f071a605c47bcc8893839bd66732457a5ebe73714
+      sha256: "0dfb6b6a1979dac1c1245e17cef824d7b452ea29bd33d3467269f9bef3715fb0"
       url: "https://pub.dev"
     source: hosted
-    version: "5.5.0+1"
+    version: "5.6.0"
   dio_web_adapter:
     dependency: transitive
     description:
       name: dio_web_adapter
-      sha256: "36c5b2d79eb17cdae41e974b7a8284fec631651d2a6f39a8a2ff22327e90aeac"
+      sha256: "33259a9276d6cea88774a0000cfae0d861003497755969c92faa223108620dc8"
       url: "https://pub.dev"
     source: hosted
-    version: "1.0.1"
+    version: "2.0.0"
   dynamic_color:
     dependency: "direct main"
     description:
@@ -261,10 +285,10 @@ packages:
     dependency: "direct main"
     description:
       name: ffi
-      sha256: "493f37e7df1804778ff3a53bd691d8692ddf69702cf4c1c1096a2e41b4779e21"
+      sha256: "16ed7b077ef01ad6170a3d0c57caa4a112a38d7a2ed5602e0aca9ca6f3d98da6"
       url: "https://pub.dev"
     source: hosted
-    version: "2.1.2"
+    version: "2.1.3"
   ffigen:
     dependency: "direct dev"
     description:
@@ -285,10 +309,10 @@ packages:
     dependency: "direct main"
     description:
       name: file_picker
-      sha256: "824f5b9f389bfc4dddac3dea76cd70c51092d9dff0b2ece7ef4f53db8547d258"
+      sha256: "825aec673606875c33cd8d3c4083f1a3c3999015a84178b317b7ef396b7384f3"
       url: "https://pub.dev"
     source: hosted
-    version: "8.0.6"
+    version: "8.0.7"
   file_selector_linux:
     dependency: transitive
     description:
@@ -334,6 +358,14 @@ packages:
     description: flutter
     source: sdk
     version: "0.0.0"
+  flutter_cache_manager:
+    dependency: transitive
+    description:
+      name: flutter_cache_manager
+      sha256: "400b6592f16a4409a7f2bb929a9a7e38c72cceb8ffb99ee57bbf2cb2cecf8386"
+      url: "https://pub.dev"
+    source: hosted
+    version: "3.4.1"
   flutter_lints:
     dependency: "direct dev"
     description:
@@ -351,10 +383,10 @@ packages:
     dependency: transitive
     description:
       name: flutter_plugin_android_lifecycle
-      sha256: c6b0b4c05c458e1c01ad9bcc14041dd7b1f6783d487be4386f793f47a8a4d03e
+      sha256: "9ee02950848f61c4129af3d6ec84a1cfc0e47931abc746b03e7a3bc3e8ff6eda"
       url: "https://pub.dev"
     source: hosted
-    version: "2.0.20"
+    version: "2.0.22"
   flutter_test:
     dependency: "direct dev"
     description: flutter
@@ -457,18 +489,18 @@ packages:
     dependency: transitive
     description:
       name: image_picker_android
-      sha256: a26dc9a03fe042440c1e4be554fb0fceae2bf6d887d7467fc48c688fa4a81889
+      sha256: "8c5abf0dcc24fe6e8e0b4a5c0b51a5cf30cefdf6407a3213dae61edc75a70f56"
       url: "https://pub.dev"
     source: hosted
-    version: "0.8.12+7"
+    version: "0.8.12+12"
   image_picker_for_web:
     dependency: transitive
     description:
       name: image_picker_for_web
-      sha256: "5d6eb13048cd47b60dbf1a5495424dea226c5faf3950e20bf8120a58efb5b5f3"
+      sha256: "65d94623e15372c5c51bebbcb820848d7bcb323836e12dfdba60b5d3a8b39e50"
       url: "https://pub.dev"
     source: hosted
-    version: "3.0.4"
+    version: "3.0.5"
   image_picker_ios:
     dependency: transitive
     description:
@@ -665,10 +697,10 @@ packages:
     dependency: "direct main"
     description:
       name: mobile_scanner
-      sha256: b8c0e9afcfd52534f85ec666f3d52156f560b5e6c25b1e3d4fe2087763607926
+      sha256: "6ac2913ad98c83f558d2c8a55bc8f511bdcf28b86639701c04b04c16da1e9ee1"
       url: "https://pub.dev"
     source: hosted
-    version: "5.1.1"
+    version: "5.2.1"
   nested:
     dependency: transitive
     description:
@@ -677,6 +709,14 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "1.0.0"
+  octo_image:
+    dependency: transitive
+    description:
+      name: octo_image
+      sha256: "34faa6639a78c7e3cbe79be6f9f96535867e879748ade7d17c9b1ae7536293bd"
+      url: "https://pub.dev"
+    source: hosted
+    version: "2.1.0"
   package_config:
     dependency: transitive
     description:
@@ -697,10 +737,10 @@ packages:
     dependency: transitive
     description:
       name: package_info_plus_platform_interface
-      sha256: f49918f3433a3146047372f9d4f1f847511f2acd5cd030e1f44fe5a50036b70e
+      sha256: ac1f4a4847f1ade8e6a87d1f39f5d7c67490738642e2542f559ec38c37489a66
       url: "https://pub.dev"
     source: hosted
-    version: "3.0.0"
+    version: "3.0.1"
   path:
     dependency: "direct main"
     description:
@@ -713,18 +753,18 @@ packages:
     dependency: "direct main"
     description:
       name: path_provider
-      sha256: c9e7d3a4cd1410877472158bee69963a4579f78b68c65a2b7d40d1a7a88bb161
+      sha256: fec0d61223fba3154d87759e3cc27fe2c8dc498f6386c6d6fc80d1afdd1bf378
       url: "https://pub.dev"
     source: hosted
-    version: "2.1.3"
+    version: "2.1.4"
   path_provider_android:
     dependency: transitive
     description:
       name: path_provider_android
-      sha256: "30c5aa827a6ae95ce2853cdc5fe3971daaac00f6f081c419c013f7f57bff2f5e"
+      sha256: "6f01f8e37ec30b07bc424b4deabac37cacb1bc7e2e515ad74486039918a37eb7"
       url: "https://pub.dev"
     source: hosted
-    version: "2.2.7"
+    version: "2.2.10"
   path_provider_foundation:
     dependency: transitive
     description:
@@ -789,6 +829,14 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "1.5.1"
+  process_run:
+    dependency: "direct main"
+    description:
+      name: process_run
+      sha256: c917dfb5f7afad4c7485bc00a4df038621248fce046105020cea276d1a87c820
+      url: "https://pub.dev"
+    source: hosted
+    version: "1.1.0"
   provider:
     dependency: "direct main"
     description:
@@ -844,6 +892,14 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "0.0.3"
+  rxdart:
+    dependency: transitive
+    description:
+      name: rxdart
+      sha256: "5c3004a4a8dbb94bd4bf5412a4def4acdaa12e12f269737a5751369e12d1a962"
+      url: "https://pub.dev"
+    source: hosted
+    version: "0.28.0"
   screen_retriever:
     dependency: transitive
     description:
@@ -856,58 +912,58 @@ packages:
     dependency: "direct main"
     description:
       name: shared_preferences
-      sha256: d3bbe5553a986e83980916ded2f0b435ef2e1893dfaa29d5a7a790d0eca12180
+      sha256: "746e5369a43170c25816cc472ee016d3a66bc13fcf430c0bc41ad7b4b2922051"
       url: "https://pub.dev"
     source: hosted
-    version: "2.2.3"
+    version: "2.3.2"
   shared_preferences_android:
     dependency: transitive
     description:
       name: shared_preferences_android
-      sha256: "93d0ec9dd902d85f326068e6a899487d1f65ffcd5798721a95330b26c8131577"
+      sha256: "480ba4345773f56acda9abf5f50bd966f581dac5d514e5fc4a18c62976bbba7e"
       url: "https://pub.dev"
     source: hosted
-    version: "2.2.3"
+    version: "2.3.2"
   shared_preferences_foundation:
     dependency: transitive
     description:
       name: shared_preferences_foundation
-      sha256: "0a8a893bf4fd1152f93fec03a415d11c27c74454d96e2318a7ac38dd18683ab7"
+      sha256: c4b35f6cb8f63c147312c054ce7c2254c8066745125264f0c88739c417fc9d9f
       url: "https://pub.dev"
     source: hosted
-    version: "2.4.0"
+    version: "2.5.2"
   shared_preferences_linux:
     dependency: transitive
     description:
       name: shared_preferences_linux
-      sha256: "9f2cbcf46d4270ea8be39fa156d86379077c8a5228d9dfdb1164ae0bb93f1faa"
+      sha256: "580abfd40f415611503cae30adf626e6656dfb2f0cee8f465ece7b6defb40f2f"
       url: "https://pub.dev"
     source: hosted
-    version: "2.3.2"
+    version: "2.4.1"
   shared_preferences_platform_interface:
     dependency: transitive
     description:
       name: shared_preferences_platform_interface
-      sha256: "034650b71e73629ca08a0bd789fd1d83cc63c2d1e405946f7cef7bc37432f93a"
+      sha256: "57cbf196c486bc2cf1f02b85784932c6094376284b3ad5779d1b1c6c6a816b80"
       url: "https://pub.dev"
     source: hosted
-    version: "2.4.0"
+    version: "2.4.1"
   shared_preferences_web:
     dependency: transitive
     description:
       name: shared_preferences_web
-      sha256: "9aee1089b36bd2aafe06582b7d7817fd317ef05fc30e6ba14bff247d0933042a"
+      sha256: d2ca4132d3946fec2184261726b355836a82c33d7d5b67af32692aff18a4684e
       url: "https://pub.dev"
     source: hosted
-    version: "2.3.0"
+    version: "2.4.2"
   shared_preferences_windows:
     dependency: transitive
     description:
       name: shared_preferences_windows
-      sha256: "841ad54f3c8381c480d0c9b508b89a34036f512482c407e6df7a9c4aa2ef8f59"
+      sha256: "94ef0f72b2d71bc3e700e025db3710911bd51a71cefb65cc609dd0d9a982e3c1"
       url: "https://pub.dev"
     source: hosted
-    version: "2.3.2"
+    version: "2.4.1"
   shelf:
     dependency: transitive
     description:
@@ -961,6 +1017,30 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "1.10.0"
+  sprintf:
+    dependency: transitive
+    description:
+      name: sprintf
+      sha256: "1fc9ffe69d4df602376b52949af107d8f5703b77cda567c4d7d86a0693120f23"
+      url: "https://pub.dev"
+    source: hosted
+    version: "7.0.0"
+  sqflite:
+    dependency: transitive
+    description:
+      name: sqflite
+      sha256: a43e5a27235518c03ca238e7b4732cf35eabe863a369ceba6cbefa537a66f16d
+      url: "https://pub.dev"
+    source: hosted
+    version: "2.3.3+1"
+  sqflite_common:
+    dependency: transitive
+    description:
+      name: sqflite_common
+      sha256: "3da423ce7baf868be70e2c0976c28a1bb2f73644268b7ffa7d2e08eab71f16a4"
+      url: "https://pub.dev"
+    source: hosted
+    version: "2.5.4"
   stack_trace:
     dependency: transitive
     description:
@@ -993,6 +1073,14 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "1.2.0"
+  synchronized:
+    dependency: transitive
+    description:
+      name: synchronized
+      sha256: "539ef412b170d65ecdafd780f924e5be3f60032a1128df156adad6c5b373d558"
+      url: "https://pub.dev"
+    source: hosted
+    version: "3.1.0+1"
   term_glyph:
     dependency: transitive
     description:
@@ -1045,10 +1133,10 @@ packages:
     dependency: transitive
     description:
       name: url_launcher_android
-      sha256: "95d8027db36a0e52caf55680f91e33ea6aa12a3ce608c90b06f4e429a21067ac"
+      sha256: f0c73347dfcfa5b3db8bc06e1502668265d39c08f310c29bff4e28eea9699f79
       url: "https://pub.dev"
     source: hosted
-    version: "6.3.5"
+    version: "6.3.9"
   url_launcher_ios:
     dependency: transitive
     description:
@@ -1061,10 +1149,10 @@ packages:
     dependency: transitive
     description:
       name: url_launcher_linux
-      sha256: ab360eb661f8879369acac07b6bb3ff09d9471155357da8443fd5d3cf7363811
+      sha256: e2b9622b4007f97f504cd64c0128309dfb978ae66adbe944125ed9e1750f06af
       url: "https://pub.dev"
     source: hosted
-    version: "3.1.1"
+    version: "3.2.0"
   url_launcher_macos:
     dependency: transitive
     description:
@@ -1085,10 +1173,10 @@ packages:
     dependency: transitive
     description:
       name: url_launcher_web
-      sha256: "8d9e750d8c9338601e709cd0885f95825086bd8b642547f26bda435aade95d8a"
+      sha256: "772638d3b34c779ede05ba3d38af34657a05ac55b06279ea6edd409e323dca8e"
       url: "https://pub.dev"
     source: hosted
-    version: "2.3.1"
+    version: "2.3.3"
   url_launcher_windows:
     dependency: transitive
     description:
@@ -1097,6 +1185,14 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "3.1.2"
+  uuid:
+    dependency: transitive
+    description:
+      name: uuid
+      sha256: f33d6bb662f0e4f79dcd7ada2e6170f3b3a2530c28fc41f49a411ddedd576a77
+      url: "https://pub.dev"
+    source: hosted
+    version: "4.5.0"
   vector_math:
     dependency: transitive
     description:
@@ -1157,18 +1253,18 @@ packages:
     dependency: "direct main"
     description:
       name: win32
-      sha256: a79dbe579cb51ecd6d30b17e0cae4e0ea15e2c0e66f69ad4198f22a6789e94f4
+      sha256: "68d1e89a91ed61ad9c370f9f8b6effed9ae5e0ede22a270bdfa6daf79fc2290a"
       url: "https://pub.dev"
     source: hosted
-    version: "5.5.1"
+    version: "5.5.4"
   win32_registry:
     dependency: "direct main"
     description:
       name: win32_registry
-      sha256: "10589e0d7f4e053f2c61023a31c9ce01146656a70b7b7f0828c0b46d7da2a9bb"
+      sha256: "723b7f851e5724c55409bb3d5a32b203b3afe8587eaf5dafb93a5fed8ecda0d6"
       url: "https://pub.dev"
     source: hosted
-    version: "1.1.3"
+    version: "1.1.4"
   window_manager:
     dependency: "direct main"
     description:

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.55+202408251
+version: 0.8.58+202409081
 environment:
   sdk: '>=3.1.0 <4.0.0'
   flutter: 3.22.3
@@ -45,6 +45,8 @@ dependencies:
   archive: ^3.6.1
   lpinyin: ^2.0.3
   emoji_regex: ^0.0.5
+  process_run: ^1.1.0
+  cached_network_image: ^3.4.0
 dev_dependencies:
   flutter_test:
     sdk: flutter
@@ -66,6 +68,9 @@ flutter:
     - family: Twemoji
       fonts:
         - asset: assets/fonts/Twemoji.Mozilla.ttf
+    - family: Icons
+      fonts:
+        - asset: assets/fonts/Icons.ttf
 ffigen:
   name: "ClashFFI"
   output: 'lib/clash/generated/clash_ffi.dart'

test/command_test.dart

@@ -2,15 +2,14 @@
 
 import 'dart:io';
 
+import 'package:fl_clash/common/common.dart';
 import 'package:fl_clash/common/other.dart';
 import 'package:lpinyin/lpinyin.dart';
 
 void main() {
-  print(PinyinHelper.getPinyin("ABC"));
-  print(PinyinHelper.getPinyin("阿里巴巴"));
+  final res = [1, 2, 3, 4, 5, 6,7,8,9,10,11];
 
-  print('a'.compareTo('B'));
-  print('A'.compareTo('B'));
+  print(res.batch(5));
 }
 
 startService() async {

windows/CMakeLists.txt

@@ -93,6 +93,9 @@ set(CLASH_DIR "../libclash/windows")
 install(FILES "${CLASH_DIR}/libclash.dll" DESTINATION "${INSTALL_BUNDLE_LIB_DIR}"
   COMPONENT Runtime)
 
+install(FILES "EnableLoopback.exe" DESTINATION "${INSTALL_BUNDLE_LIB_DIR}"
+  COMPONENT Runtime)
+
 if(PLUGIN_BUNDLED_LIBRARIES)
   install(FILES "${PLUGIN_BUNDLED_LIBRARIES}"
     DESTINATION "${INSTALL_BUNDLE_LIB_DIR}"