Compare commits

..

33 Commits

Author SHA1 Message Date
chen08209
a134c32493 Update kernel
Add import profile via QR code image
2024-05-15 20:21:02 +08:00
chen08209
472cea9037 Add compatibility mode and adapt clash scheme. 2024-05-11 14:10:06 +08:00
chen08209
08d07498b9 update Version 2024-05-07 18:32:21 +08:00
chen08209
d5aa09949a Reconstruction application proxy logic 2024-05-07 18:31:14 +08:00
chen08209
fd1dfe5c60 Fix Tab destroy error 2024-05-06 19:05:27 +08:00
chen08209
9f89fe8b29 Optimize repeat healthcheck 2024-05-06 17:17:26 +08:00
chen08209
78081a12e8 Optimize Direct mode ui 2024-05-06 15:27:37 +08:00
chen08209
6896837f28 Optimize Healthcheck 2024-05-06 14:32:23 +08:00
chen08209
85eb903402 Remove proxies position animation, improve performance
Add Telegram Link
2024-05-06 14:32:22 +08:00
chen08209
9aa9180f1f Update healthcheck policy 2024-05-06 14:32:21 +08:00
chen08209
feb9688a29 New Check URLTest 2024-05-06 14:32:21 +08:00
chen08209
5c71992174 Fix the problem of invalid auto-selection 2024-05-05 16:14:34 +08:00
chen08209
74c3d0ae25 New Async UpdateConfig 2024-05-05 03:13:52 +08:00
chen08209
ecd1bcafd5 add changeProfileDebounce 2024-05-05 03:13:51 +08:00
chen08209
184d2d117a Update Workflow 2024-05-05 03:13:50 +08:00
chen08209
89e6f17794 Fix ChangeProfile block 2024-05-05 03:13:49 +08:00
chen08209
aef50fe0e3 Fix Release Message Error 2024-05-04 16:14:03 +08:00
chen08209
fc0767ed25 Update Selector 2 2024-05-04 01:14:56 +08:00
chen08209
dbf1724cca Update Version 2024-05-04 00:14:34 +08:00
chen08209
909aa4038e Fix Proxies Select Error 2024-05-04 00:14:07 +08:00
chen08209
2d0a7d8d46 Fix the problem that the proxy group is empty in global mode. 2024-05-03 23:08:06 +08:00
chen08209
ca96cd1d82 Fix the problem that the proxy group is empty in global mode. 2024-05-03 23:07:38 +08:00
chen08209
91ab1e5dac Add ProxyProvider2 2024-05-03 21:48:22 +08:00
chen08209
b3a5f74df8 Add ProxyProvider 2024-05-03 21:28:22 +08:00
chen08209
1f98be8ad8 Update Version 2024-05-03 15:33:46 +08:00
chen08209
453c7c98d0 Update ProxyGroup Sort 2024-05-03 15:33:45 +08:00
chen08209
91faed35c0 Fix Android quickStart VpnService some problems 2024-05-02 00:32:11 +08:00
chen08209
07bbaf6b6f Update version 2024-05-01 23:40:04 +08:00
chen08209
e8feb7c431 Set Android notification low importance 2024-05-01 23:40:03 +08:00
chen08209
4d16820526 Fix the issue that VpnService can't be closed correctly in special cases 2024-05-01 23:40:00 +08:00
chen08209
92294b49c6 Fix the problem that TileService is not destroyed correctly in some cases
Adjust tab animation defaults
2024-05-01 23:39:59 +08:00
chen08209
8a188a37c9 Add Telegram in README_zh_CN.md 2024-05-01 21:52:07 +08:00
chen08209
48af16c265 Add Telegram 2024-05-01 21:50:26 +08:00
80 changed files with 2549 additions and 898 deletions

View File

@@ -89,7 +89,7 @@ jobs:
- name: Checkout
uses: actions/checkout@v4
with:
submodules: recursive
fetch-depth: 0
- name: Download
uses: actions/download-artifact@v4
@@ -101,13 +101,13 @@ jobs:
- name: Pre Release
run: |
pip install gitchangelog pystache mustache markdown
prelease=$(curl --silent "https://api.github.com/repos/chen08209/FlClash/releases/latest" | grep -Po '"tag_name": "\K.*?(?=")' || echo "")
if [ -z "$prelease" ]; then
pre=$(curl --silent "https://api.github.com/repos/chen08209/FlClash/releases/latest" | grep -Po '"tag_name": "\K.*?(?=")' || echo "")
if [ -z "pre" ]; then
echo "init" > release.md
else
current="${{ github.ref_name }}"
echo -e "\n\n<details markdown=1><summary>All changes from $current to the latest commit:</summary>\n\n" >> release.md
gitchangelog "${prelease}" >> release.md 2>&1 || echo "Error in gitchangelog"
gitchangelog "${pre}.." >> release.md 2>&1 || echo "Error in gitchangelog"
echo -e "\n\n</details>" >> release.md
fi
- name: Release

View File

@@ -3,25 +3,67 @@ package main
import "C"
import (
"github.com/metacubex/mihomo/adapter/inbound"
ap "github.com/metacubex/mihomo/adapter/provider"
"github.com/metacubex/mihomo/component/dialer"
"github.com/metacubex/mihomo/component/process"
"github.com/metacubex/mihomo/component/resolver"
"github.com/metacubex/mihomo/config"
"github.com/metacubex/mihomo/constant/provider"
"github.com/metacubex/mihomo/dns"
"github.com/metacubex/mihomo/hub/executor"
"github.com/metacubex/mihomo/listener"
"github.com/metacubex/mihomo/log"
"github.com/metacubex/mihomo/tunnel"
"math"
"os"
"os/exec"
"path/filepath"
"runtime"
"strings"
"sync"
"syscall"
)
type healthCheckSchema struct {
Enable bool `provider:"enable"`
URL string `provider:"url"`
Interval int `provider:"interval"`
TestTimeout int `provider:"timeout,omitempty"`
Lazy bool `provider:"lazy,omitempty"`
ExpectedStatus string `provider:"expected-status,omitempty"`
}
type proxyProviderSchema struct {
Type string `provider:"type"`
Path string `provider:"path,omitempty"`
URL string `provider:"url,omitempty"`
Proxy string `provider:"proxy,omitempty"`
Interval int `provider:"interval,omitempty"`
Filter string `provider:"filter,omitempty"`
ExcludeFilter string `provider:"exclude-filter,omitempty"`
ExcludeType string `provider:"exclude-type,omitempty"`
DialerProxy string `provider:"dialer-proxy,omitempty"`
HealthCheck healthCheckSchema `provider:"health-check,omitempty"`
Override ap.OverrideSchema `provider:"override,omitempty"`
Header map[string][]string `provider:"header,omitempty"`
}
type ruleProviderSchema struct {
Type string `provider:"type"`
Behavior string `provider:"behavior"`
Path string `provider:"path,omitempty"`
URL string `provider:"url,omitempty"`
Proxy string `provider:"proxy,omitempty"`
Format string `provider:"format,omitempty"`
Interval int `provider:"interval,omitempty"`
}
type GenerateConfigParams struct {
ProfilePath *string `json:"profile-path"`
Config *config.RawConfig `json:"config" `
IsPatch *bool `json:"is-patch"`
ProfilePath *string `json:"profile-path"`
Config *config.RawConfig `json:"config" `
IsPatch *bool `json:"is-patch"`
IsCompatible *bool `json:"is-compatible"`
}
type ChangeProxyParams struct {
@@ -46,6 +88,11 @@ type Process struct {
Target string `json:"target"`
}
type Now struct {
Name string `json:"name"`
Value string `json:"value"`
}
func restartExecutable(execPath string) {
var err error
executor.Shutdown()
@@ -82,6 +129,19 @@ func readFile(path string) ([]byte, error) {
return data, err
}
func removeFile(path string) error {
absPath, err := filepath.Abs(path)
if err != nil {
return err
}
err = os.Remove(absPath)
if err != nil {
return err
}
return nil
}
func getRawConfigWithPath(path *string) *config.RawConfig {
if path == nil {
return config.DefaultRawConfig()
@@ -100,18 +160,164 @@ func getRawConfigWithPath(path *string) *config.RawConfig {
}
}
func decorationConfig(profilePath *string, cfg config.RawConfig) *config.RawConfig {
func decorationConfig(profilePath *string, cfg config.RawConfig, compatible bool) *config.RawConfig {
prof := getRawConfigWithPath(profilePath)
overwriteConfig(prof, cfg)
overwriteConfig(prof, cfg, compatible)
return prof
}
func overwriteConfig(targetConfig *config.RawConfig, patchConfig config.RawConfig) {
func Reduce[T any, U any](s []T, initVal U, f func(U, T) U) U {
for _, v := range s {
initVal = f(initVal, v)
}
return initVal
}
func Map[T, U any](slice []T, fn func(T) U) []U {
result := make([]U, len(slice))
for i, v := range slice {
result[i] = fn(v)
}
return result
}
func replaceFromMap(s string, m map[string]string) string {
for k, v := range m {
s = strings.ReplaceAll(s, k, v)
}
return s
}
func removeDuplicateFromSlice[T any](slice []T) []T {
result := make([]T, 0)
seen := make(map[any]struct{})
for _, value := range slice {
if _, ok := seen[value]; !ok {
result = append(result, value)
seen[value] = struct{}{}
}
}
return result
}
func generateProxyGroupAndRule(proxyGroup *[]map[string]any, rule *[]string) {
var replacements = map[string]string{}
var selectArr []map[string]any
var urlTestArr []map[string]any
var fallbackArr []map[string]any
for _, group := range *proxyGroup {
switch group["type"] {
case "select":
selectArr = append(selectArr, group)
replacements[group["name"].(string)] = "Proxy"
break
case "url-test":
urlTestArr = append(urlTestArr, group)
replacements[group["name"].(string)] = "Auto"
break
case "fallback":
fallbackArr = append(fallbackArr, group)
replacements[group["name"].(string)] = "Fallback"
break
default:
break
}
}
ProxyProxies := Reduce(selectArr, []string{}, func(res []string, cur map[string]any) []string {
if cur["proxies"] == nil {
return res
}
for _, proxyName := range cur["proxies"].([]interface{}) {
if str, ok := proxyName.(string); ok {
str = replaceFromMap(str, replacements)
if str != "Proxy" {
res = append(res, str)
}
}
}
return res
})
ProxyProxies = removeDuplicateFromSlice(ProxyProxies)
AutoProxies := Reduce(urlTestArr, []string{}, func(res []string, cur map[string]any) []string {
if cur["proxies"] == nil {
return res
}
for _, proxyName := range cur["proxies"].([]interface{}) {
if str, ok := proxyName.(string); ok {
str = replaceFromMap(str, replacements)
if str != "Auto" {
res = append(res, str)
}
}
}
return res
})
AutoProxies = removeDuplicateFromSlice(AutoProxies)
FallbackProxies := Reduce(fallbackArr, []string{}, func(res []string, cur map[string]any) []string {
if cur["proxies"] == nil {
return res
}
for _, proxyName := range cur["proxies"].([]interface{}) {
if str, ok := proxyName.(string); ok {
str = replaceFromMap(str, replacements)
if str != "Fallback" {
res = append(res, str)
}
}
}
return res
})
FallbackProxies = removeDuplicateFromSlice(FallbackProxies)
var computedProxyGroup []map[string]any
if len(ProxyProxies) > 0 {
computedProxyGroup = append(computedProxyGroup,
map[string]any{
"name": "Proxy",
"type": "select",
"proxies": ProxyProxies,
})
}
if len(AutoProxies) > 0 {
computedProxyGroup = append(computedProxyGroup,
map[string]any{
"name": "Auto",
"type": "url-test",
"proxies": AutoProxies,
})
}
if len(FallbackProxies) > 0 {
computedProxyGroup = append(computedProxyGroup,
map[string]any{
"name": "Fallback",
"type": "fallback",
"proxies": FallbackProxies,
})
}
computedRule := Map(*rule, func(value string) string {
return replaceFromMap(value, replacements)
})
*proxyGroup = computedProxyGroup
*rule = computedRule
}
func overwriteConfig(targetConfig *config.RawConfig, patchConfig config.RawConfig, compatible bool) {
targetConfig.ExternalController = ""
targetConfig.ExternalUI = ""
targetConfig.Interface = ""
targetConfig.ExternalUIURL = ""
targetConfig.IPv6 = patchConfig.IPv6
//targetConfig.IPv6 = patchConfig.IPv6
targetConfig.LogLevel = patchConfig.LogLevel
targetConfig.FindProcessMode = process.FindProcessAlways
targetConfig.AllowLan = patchConfig.AllowLan
@@ -121,22 +327,22 @@ func overwriteConfig(targetConfig *config.RawConfig, patchConfig config.RawConfi
targetConfig.Tun.Device = patchConfig.Tun.Device
targetConfig.Tun.DNSHijack = patchConfig.Tun.DNSHijack
targetConfig.Tun.Stack = patchConfig.Tun.Stack
targetConfig.GeodataLoader = "standard"
targetConfig.Profile.StoreSelected = false
if targetConfig.DNS.Enable == false {
targetConfig.DNS = patchConfig.DNS
} else {
targetConfig.DNS.UseHosts = patchConfig.DNS.UseHosts
targetConfig.DNS.EnhancedMode = patchConfig.DNS.EnhancedMode
targetConfig.DNS.IPv6 = patchConfig.DNS.IPv6
targetConfig.DNS.DefaultNameserver = append(patchConfig.DNS.DefaultNameserver, targetConfig.DNS.DefaultNameserver...)
targetConfig.DNS.NameServer = append(patchConfig.DNS.NameServer, targetConfig.DNS.NameServer...)
targetConfig.DNS.FakeIPFilter = append(patchConfig.DNS.FakeIPFilter, targetConfig.DNS.FakeIPFilter...)
targetConfig.DNS.Fallback = append(patchConfig.DNS.Fallback, targetConfig.DNS.Fallback...)
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 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 compatible == 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) {
@@ -164,10 +370,29 @@ func patchConfig(general *config.General) {
resolver.DisableIPv6 = !general.IPv6
}
func applyConfig(isPatch bool) bool {
if currentConfig == nil {
return false
const concurrentCount = math.MaxInt
func hcCompatibleProvider(proxyProviders map[string]provider.ProxyProvider) {
wg := sync.WaitGroup{}
ch := make(chan struct{}, concurrentCount)
for _, proxyProvider := range proxyProviders {
proxyProvider := proxyProvider
if proxyProvider.VehicleType() == provider.Compatible {
log.Infoln("Start initial Compatible provider %s", proxyProvider.Name())
wg.Add(1)
ch <- struct{}{}
go func() {
defer func() { <-ch; wg.Done() }()
if err := proxyProvider.Initial(); err != nil {
log.Errorln("initial Compatible provider %s error: %v", proxyProvider.Name(), err)
}
}()
}
}
}
func applyConfig(isPatch bool) {
cfg, err := config.ParseRawConfig(currentConfig)
if err != nil {
cfg, _ = config.ParseRawConfig(config.DefaultRawConfig())
@@ -176,7 +401,6 @@ func applyConfig(isPatch bool) bool {
patchConfig(cfg.General)
} else {
executor.ApplyConfig(cfg, true)
healthcheck()
}
return true
}

View File

@@ -24,7 +24,7 @@ func InitDartApi(api unsafe.Pointer) {
}
}
func sendToPort(port int64, msg string) {
func SendToPort(port int64, msg string) {
var obj C.Dart_CObject
obj._type = C.Dart_CObject_kString
msgString := C.CString(msg)

View File

@@ -10,6 +10,7 @@ const (
Log MessageType = "log"
Tun MessageType = "tun"
Delay MessageType = "delay"
Now MessageType = "now"
Process MessageType = "process"
)
@@ -18,11 +19,11 @@ type Message struct {
Data interface{} `json:"data"`
}
func (message *Message) toJson() string {
func (message *Message) Json() string {
data, _ := json.Marshal(message)
return string(data)
}
func SendMessage(message Message) {
sendToPort(*Port, message.toJson())
SendToPort(*Port, message.Json())
}

View File

@@ -7,6 +7,8 @@ import (
"fmt"
"github.com/metacubex/mihomo/adapter"
"github.com/metacubex/mihomo/adapter/outboundgroup"
"github.com/metacubex/mihomo/adapter/provider"
"github.com/metacubex/mihomo/common/structure"
"github.com/metacubex/mihomo/common/utils"
"github.com/metacubex/mihomo/config"
"github.com/metacubex/mihomo/constant"
@@ -63,26 +65,63 @@ func validateConfig(s *C.char) bool {
}
//export updateConfig
func updateConfig(s *C.char) bool {
paramsString := C.GoString(s)
var params = &GenerateConfigParams{}
err := json.Unmarshal([]byte(paramsString), params)
if err != nil {
log.Errorln("generateConfig Unmarshal error %v", err)
return false
}
prof := decorationConfig(params.ProfilePath, *params.Config)
currentConfig = prof
if *params.IsPatch {
return applyConfig(true)
} else {
return applyConfig(false)
}
func updateConfig(s *C.char, port C.longlong) {
i := int64(port)
go func() {
paramsString := C.GoString(s)
var params = &GenerateConfigParams{}
err := json.Unmarshal([]byte(paramsString), params)
if err != nil {
bridge.SendToPort(i, err.Error())
return
}
prof := decorationConfig(params.ProfilePath, *params.Config, *params.IsCompatible)
currentConfig = prof
if *params.IsPatch {
applyConfig(true)
} else {
applyConfig(false)
}
bridge.SendToPort(i, "")
}()
}
//export clearEffect
func clearEffect(s *C.char) {
path := C.GoString(s)
go func() {
rawCfg := getRawConfigWithPath(&path)
for _, mapping := range rawCfg.RuleProvider {
schema := &ruleProviderSchema{}
decoder := structure.NewDecoder(structure.Option{TagName: "provider", WeaklyTypedInput: true})
if err := decoder.Decode(mapping, schema); err != nil {
return
}
if schema.Type == "http" {
_ = removeFile(constant.Path.Resolve(schema.Path))
}
}
for _, mapping := range rawCfg.ProxyProvider {
schema := &proxyProviderSchema{
HealthCheck: healthCheckSchema{
Lazy: true,
},
}
decoder := structure.NewDecoder(structure.Option{TagName: "provider", WeaklyTypedInput: true})
if err := decoder.Decode(mapping, schema); err != nil {
return
}
if schema.Type == "http" {
_ = removeFile(constant.Path.Resolve(schema.Path))
}
}
_ = removeFile(path)
}()
}
//export getProxies
func getProxies() *C.char {
data, err := json.Marshal(tunnel.Proxies())
data, err := json.Marshal(tunnel.ProxiesWithProviders())
if err != nil {
return C.CString("")
}
@@ -91,27 +130,28 @@ func getProxies() *C.char {
//export changeProxy
func changeProxy(s *C.char) bool {
paramsString := C.GoString(s)
var params = &ChangeProxyParams{}
err := json.Unmarshal([]byte(paramsString), params)
if err != nil {
log.Infoln("Unmarshal ChangeProxyParams %v", err)
return false
}
proxies := tunnel.Proxies()
proxy := proxies[*params.GroupName]
if proxy == nil {
return false
}
log.Infoln("change proxy %s", proxy.Name())
adapterProxy := proxy.(*adapter.Proxy)
selector, ok := adapterProxy.ProxyAdapter.(*outboundgroup.Selector)
if !ok {
return false
}
if err := selector.Set(*params.ProxyName); err != nil {
return false
}
go func() {
paramsString := C.GoString(s)
var params = &ChangeProxyParams{}
err := json.Unmarshal([]byte(paramsString), params)
if err != nil {
log.Infoln("Unmarshal ChangeProxyParams %v", err)
}
proxies := tunnel.ProxiesWithProviders()
proxy := proxies[*params.GroupName]
if proxy == nil {
return
}
log.Infoln("change proxy %s", proxy.Name())
adapterProxy := proxy.(*adapter.Proxy)
selector, ok := adapterProxy.ProxyAdapter.(*outboundgroup.Selector)
if !ok {
return
}
if err := selector.Set(*params.ProxyName); err != nil {
return
}
}()
return true
}
@@ -148,7 +188,7 @@ func asyncTestDelay(s *C.char) {
ctx, cancel := context.WithTimeout(context.Background(), time.Millisecond*time.Duration(params.Timeout))
defer cancel()
proxies := tunnel.Proxies()
proxies := tunnel.ProxiesWithProviders()
proxy := proxies[params.ProxyName]
delayData := &Delay{
@@ -235,22 +275,42 @@ func getProviders() *C.char {
return C.CString(string(data))
}
//export getProvider
func getProvider(name *C.char) *C.char {
providerName := C.GoString(name)
providers := tunnel.Providers()
var provider = providers[providerName]
data, err := json.Marshal(provider)
data, err := json.Marshal(providers[providerName])
if err != nil {
return C.CString("")
}
return C.CString(string(data))
}
//export healthcheck
func healthcheck() {
hcCompatibleProvider(tunnel.Providers())
}
//export initNativeApiBridge
func initNativeApiBridge(api unsafe.Pointer, port C.longlong) {
bridge.InitDartApi(api)
i := int64(port)
bridge.Port = &i
}
func init() {
provider.HealthcheckHook = func(name string, delay uint16) {
delayData := &Delay{
Name: name,
}
if delay == 0 {
delayData.Value = -1
} else {
delayData.Value = int32(delay)
}
bridge.SendMessage(bridge.Message{
Type: bridge.Delay,
Data: delayData,
})
}
}

View File

@@ -1,3 +1,5 @@
import 'dart:async';
import 'package:dynamic_color/dynamic_color.dart';
import 'package:fl_clash/l10n/l10n.dart';
import 'package:fl_clash/common/common.dart';
@@ -25,8 +27,14 @@ runAppWithPreferences(
ChangeNotifierProvider<Config>(
create: (_) => config,
),
ChangeNotifierProvider<AppState>(
ChangeNotifierProxyProvider2<Config, ClashConfig, AppState>(
create: (_) => appState,
update: (_, config, clashConfig, appState) {
appState?.mode = clashConfig.mode;
appState?.isCompatible = config.isCompatible;
appState?.selectedMap = config.currentSelectedMap;
return appState!;
},
)
],
child: child,
@@ -43,7 +51,6 @@ class Application extends StatefulWidget {
}
class ApplicationState extends State<Application> {
late AppController appController;
late SystemColorSchemes systemColorSchemes;
ColorScheme _getAppColorScheme({
@@ -64,10 +71,11 @@ class ApplicationState extends State<Application> {
@override
void initState() {
super.initState();
appController = AppController(context);
globalState.appController = AppController(context);
WidgetsBinding.instance.addPostFrameCallback((timeStamp) async {
appController.afterInit();
appController.initLink();
globalState.appController.afterInit();
globalState.appController.initLink();
_updateGroups();
});
}
@@ -96,10 +104,24 @@ class ApplicationState extends State<Application> {
);
WidgetsBinding.instance.addPostFrameCallback((_) {
appController.updateSystemColorSchemes(systemColorSchemes);
globalState.appController.updateSystemColorSchemes(systemColorSchemes);
});
}
_updateGroups() {
if (globalState.groupsUpdateTimer != null) {
globalState.groupsUpdateTimer?.cancel();
globalState.groupsUpdateTimer = null;
}
globalState.groupsUpdateTimer ??= Timer.periodic(
appConstant.httpTimeoutDuration,
(timer) async {
await globalState.appController.updateGroups();
globalState.appController.appState.sortNum++;
},
);
}
@override
Widget build(context) {
return AppStateContainer(
@@ -112,7 +134,6 @@ class ApplicationState extends State<Application> {
primaryColor: config.primaryColor,
),
builder: (_, state, child) {
debugPrint("[Application] update===>");
return DynamicColorBuilder(
builder: (lightDynamic, darkDynamic) {
_updateSystemColorSchemes(lightDynamic, darkDynamic);
@@ -125,9 +146,9 @@ class ApplicationState extends State<Application> {
GlobalWidgetsLocalizations.delegate
],
title: appConstant.name,
locale: Other.getLocaleForString(state.locale),
locale: other.getLocaleForString(state.locale),
supportedLocales:
AppLocalizations.delegate.supportedLocales,
AppLocalizations.delegate.supportedLocales,
themeMode: state.themeMode,
theme: ThemeData(
useMaterial3: true,
@@ -160,7 +181,7 @@ class ApplicationState extends State<Application> {
@override
Future<void> dispose() async {
linkManager.destroy();
await appController.savePreferences();
await globalState.appController.savePreferences();
super.dispose();
}
}

View File

@@ -1,3 +1,4 @@
import 'dart:async';
import 'dart:convert';
import 'dart:ffi';
import 'dart:io';
@@ -16,19 +17,22 @@ class ClashCore {
late final ClashFFI clashFFI;
late final DynamicLibrary lib;
ClashCore._internal() {
DynamicLibrary _getClashLib() {
if (Platform.isWindows) {
lib = DynamicLibrary.open("libclash.dll");
clashFFI = ClashFFI(lib);
return DynamicLibrary.open("libclash.dll");
}
if (Platform.isMacOS) {
lib = DynamicLibrary.open("libclash.dylib");
clashFFI = ClashFFI(lib);
return DynamicLibrary.open("libclash.dylib");
}
if (Platform.isAndroid || Platform.isLinux) {
lib = DynamicLibrary.open("libclash.so");
clashFFI = ClashFFI(lib);
return DynamicLibrary.open("libclash.so");
}
throw "Platform is not supported";
}
ClashCore._internal() {
lib = _getClashLib();
clashFFI = ClashFFI(lib);
clashFFI.initNativeApiBridge(
NativeApi.initializeApiDLData,
receiver.sendPort.nativePort,
@@ -61,12 +65,21 @@ class ClashCore {
1;
}
bool updateConfig(UpdateConfigParams updateConfigParams) {
Future<String> updateConfig(UpdateConfigParams updateConfigParams) {
final completer = Completer<String>();
final receiver = ReceivePort();
receiver.listen((message) {
if (!completer.isCompleted) {
completer.complete(message);
receiver.close();
}
});
final params = json.encode(updateConfigParams);
return clashFFI.updateConfig(
params.toNativeUtf8().cast(),
) ==
1;
clashFFI.updateConfig(
params.toNativeUtf8().cast(),
receiver.sendPort.nativePort,
);
return completer.future;
}
Future<List<Group>> getProxiesGroups() {
@@ -74,15 +87,14 @@ class ClashCore {
final proxiesRawString = proxiesRaw.cast<Utf8>().toDartString();
return Isolate.run<List<Group>>(() {
final proxies = json.decode(proxiesRawString);
final groupsRaw = (proxies[UsedProxy.GLOBAL.name]["all"] as List)
.where((e) {
final proxy = proxies[e];
final excludeName = !UsedProxyExtension.valueList
.where((element) => element != UsedProxy.GLOBAL.name)
.contains(proxy['name']);
final validType = GroupTypeExtension.valueList.contains(proxy['type']);
return excludeName && validType;
}).map((groupName) {
final groupNames = [
UsedProxy.GLOBAL.name,
...(proxies[UsedProxy.GLOBAL.name]["all"] as List).where((e) {
final proxy = proxies[e];
return GroupTypeExtension.valueList.contains(proxy['type']);
})
];
final groupsRaw = groupNames.map((groupName) {
final group = proxies[groupName];
group["all"] = ((group["all"] ?? []) as List)
.map(
@@ -95,6 +107,31 @@ class ClashCore {
});
}
Future<DelayMap> getDelayMap() {
final proxiesRaw = clashFFI.getProxies();
final proxiesRawString = proxiesRaw.cast<Utf8>().toDartString();
return Isolate.run<DelayMap>(() {
final proxies = json.decode(proxiesRawString) as Map<String, dynamic>;
return proxies.map<String, int?>(
(k, v) {
final history = v["history"] as List<dynamic>;
if (history.isEmpty) {
return MapEntry(
k,
null,
);
} else {
final delay = history.last["delay"];
return MapEntry(
k,
delay != 0 ? delay : -1,
);
}
},
);
});
}
bool changeProxy(ChangeProxyParams changeProxyParams) {
final params = json.encode(changeProxyParams);
return clashFFI.changeProxy(params.toNativeUtf8().cast()) == 1;
@@ -109,6 +146,14 @@ class ClashCore {
return true;
}
clearEffect(String path) {
clashFFI.clearEffect(path.toNativeUtf8().cast());
}
healthcheck() {
clashFFI.healthcheck();
}
VersionInfo getVersionInfo() {
final versionInfoRaw = clashFFI.getVersionInfo();
final versionInfo = json.decode(versionInfoRaw.cast<Utf8>().toDartString());

View File

@@ -907,19 +907,36 @@ class ClashFFI {
late final _validateConfig =
_validateConfigPtr.asFunction<int Function(ffi.Pointer<ffi.Char>)>();
int updateConfig(
void updateConfig(
ffi.Pointer<ffi.Char> s,
int port,
) {
return _updateConfig(
s,
port,
);
}
late final _updateConfigPtr = _lookup<
ffi.NativeFunction<
ffi.Void Function(
ffi.Pointer<ffi.Char>, ffi.LongLong)>>('updateConfig');
late final _updateConfig =
_updateConfigPtr.asFunction<void Function(ffi.Pointer<ffi.Char>, int)>();
void clearEffect(
ffi.Pointer<ffi.Char> s,
) {
return _clearEffect(
s,
);
}
late final _updateConfigPtr =
_lookup<ffi.NativeFunction<GoUint8 Function(ffi.Pointer<ffi.Char>)>>(
'updateConfig');
late final _updateConfig =
_updateConfigPtr.asFunction<int Function(ffi.Pointer<ffi.Char>)>();
late final _clearEffectPtr =
_lookup<ffi.NativeFunction<ffi.Void Function(ffi.Pointer<ffi.Char>)>>(
'clearEffect');
late final _clearEffect =
_clearEffectPtr.asFunction<void Function(ffi.Pointer<ffi.Char>)>();
ffi.Pointer<ffi.Char> getProxies() {
return _getProxies();
@@ -1037,6 +1054,14 @@ class ClashFFI {
late final _getProvider = _getProviderPtr
.asFunction<ffi.Pointer<ffi.Char> Function(ffi.Pointer<ffi.Char>)>();
void healthcheck() {
return _healthcheck();
}
late final _healthcheckPtr =
_lookup<ffi.NativeFunction<ffi.Void Function()>>('healthcheck');
late final _healthcheck = _healthcheckPtr.asFunction<void Function()>();
void initNativeApiBridge(
ffi.Pointer<ffi.Void> api,
int port,

View File

@@ -15,6 +15,8 @@ abstract mixin class ClashMessageListener {
void onDelay(Delay delay) {}
void onProcess(Metadata metadata) {}
void onNow(Now now) {}
}
class ClashMessage {
@@ -41,6 +43,9 @@ class ClashMessage {
case MessageType.process:
listener.onProcess(Metadata.fromJson(m.data));
break;
case MessageType.now:
listener.onNow(Now.fromJson(m.data));
break;
}
}
});

View File

@@ -2,6 +2,7 @@ import 'dart:io';
import 'package:fl_clash/common/common.dart';
import 'package:fl_clash/models/models.dart';
import 'package:flutter/services.dart';
import 'core.dart';
class ClashService {

View File

@@ -8,7 +8,7 @@ export 'num.dart';
export 'navigation.dart';
export 'window.dart';
export 'system.dart';
export 'file.dart';
export 'picker.dart';
export 'android.dart';
export 'launch.dart';
export 'protocol.dart';

View File

@@ -2,6 +2,8 @@ import 'dart:ui';
import 'package:flutter/material.dart';
const appName = "FlClash";
class AppConstant {
final packageName = "com.follow.clash";
final name = "FlClash";

View File

@@ -1,15 +1,7 @@
import 'package:fl_clash/application.dart';
import 'package:fl_clash/controller.dart';
import 'package:fl_clash/widgets/scaffold.dart';
import 'package:flutter/material.dart';
extension BuildContextExtension on BuildContext {
AppController get appController {
final appController =
findAncestorStateOfType<ApplicationState>()?.appController;
assert(appController != null, "only use application environment");
return appController!;
}
CommonScaffoldState? get commonScaffoldState {
return findAncestorStateOfType<CommonScaffoldState>();

View File

@@ -19,8 +19,8 @@ Function debounce<F extends Function>(F func,{int milliseconds = 600}) {
if (timer != null) {
timer!.cancel();
}
timer = Timer(Duration(milliseconds: milliseconds), () {
Function.apply(func, args ?? [], namedArgs);
timer = Timer(Duration(milliseconds: milliseconds), () async {
await Function.apply(func, args ?? [], namedArgs);
});
};
}

View File

@@ -1,23 +1,27 @@
import 'dart:io';
import 'dart:isolate';
import 'dart:typed_data';
import 'package:flutter/material.dart';
import 'package:zxing2/qrcode.dart';
import 'package:image/image.dart' as img;
class Other {
static Color? getDelayColor(int? delay) {
Color? getDelayColor(int? delay) {
if (delay == null) return null;
if (delay < 0) return Colors.red;
if (delay < 600) return Colors.green;
return const Color(0xFFC57F0A);
}
static String getDateStringLast2(int value) {
String getDateStringLast2(int value) {
var valueRaw = "0$value";
return valueRaw.substring(
valueRaw.length - 2,
);
}
static String getTimeDifference(DateTime dateTime) {
String getTimeDifference(DateTime dateTime) {
var currentDateTime = DateTime.now();
var difference = currentDateTime.difference(dateTime);
var inHours = difference.inHours;
@@ -27,7 +31,7 @@ class Other {
return "${getDateStringLast2(inHours)}:${getDateStringLast2(inMinutes)}:${getDateStringLast2(inSeconds)}";
}
static String getTimeText(int? timeStamp) {
String getTimeText(int? timeStamp) {
if (timeStamp == null) {
return '00:00:00';
}
@@ -39,7 +43,7 @@ class Other {
return "${getDateStringLast2(inHours)}:${getDateStringLast2(inMinutes)}:${getDateStringLast2(inSeconds)}";
}
static Locale? getLocaleForString(String? localString) {
Locale? getLocaleForString(String? localString) {
if (localString == null) return null;
var localSplit = localString.split("_");
if (localSplit.length == 1) {
@@ -57,7 +61,7 @@ class Other {
return null;
}
static int sortByChar(String a, String b) {
int sortByChar(String a, String b) {
if (a.isEmpty && b.isEmpty) {
return 0;
}
@@ -77,7 +81,7 @@ class Other {
}
}
static String getOverwriteLabel(String label) {
String getOverwriteLabel(String label) {
final reg = RegExp(r'\((\d+)\)$');
final matches = reg.allMatches(label);
if (matches.isNotEmpty) {
@@ -89,21 +93,7 @@ class Other {
}
}
// static FutureOr<void> Function(T p) debounce<T>(void Function(T? p) func,
// {Duration? duration}) {
// Timer? timer;
// return ([T? p]) {
// if (timer != null) {
// timer?.cancel();
// }
// timer = Timer(duration ?? const Duration(milliseconds: 300), () {
// func(p);
// });
// };
// }
static String getTrayIconPath() {
String getTrayIconPath() {
if (Platform.isWindows) {
return "assets/images/app_icon.ico";
} else {
@@ -111,7 +101,7 @@ class Other {
}
}
static int compareVersions(String version1, String version2) {
int compareVersions(String version1, String version2) {
List<String> v1 = version1.split('+')[0].split('.');
List<String> v2 = version2.split('+')[0].split('.');
int major1 = int.parse(v1[0]);
@@ -133,4 +123,30 @@ class Other {
int build2 = version2.contains('+') ? int.parse(version2.split('+')[1]) : 0;
return build1.compareTo(build2);
}
Future<String?> parseQRCode(Uint8List? bytes) {
return Isolate.run<String?>(() {
if (bytes == null) return null;
img.Image? image = img.decodeImage(bytes);
LuminanceSource source = RGBLuminanceSource(
image!.width,
image.height,
image
.convert(numChannels: 4)
.getBytes(order: img.ChannelOrder.abgr)
.buffer
.asInt32List(),
);
final bitmap = BinaryBitmap(GlobalHistogramBinarizer(source));
final reader = QRCodeReader();
try {
final result = reader.decode(bitmap);
return result.text;
} catch (_) {
return null;
}
});
}
}
final other = Other();

View File

@@ -1,11 +1,12 @@
import 'dart:io';
import 'package:file_picker/file_picker.dart';
import 'package:fl_clash/common/app_localizations.dart';
import 'package:fl_clash/common/common.dart';
import 'package:image_picker/image_picker.dart';
import 'package:fl_clash/models/models.dart';
class FileUtil {
static Future<Result<PlatformFile>> pickerConfig() async {
class Picker {
Future<Result<PlatformFile>> pickerConfigFile() async {
FilePickerResult? filePickerResult;
if (Platform.isAndroid) {
filePickerResult = await FilePicker.platform.pickFiles(
@@ -26,4 +27,17 @@ class FileUtil {
}
return Result.success(data: file);
}
Future<Result<String>> pickerConfigQRCode() async {
final xFile = await ImagePicker().pickImage(source: ImageSource.gallery);
final bytes = await xFile?.readAsBytes();
if (bytes == null) return Result.error();
final result = await other.parseQRCode(bytes);
if (result == null || !result.isUrl) {
return Result.error(message: appLocalizations.pleaseUploadValidQrcode);
}
return Result.success(data: result);
}
}
final picker = Picker();

View File

@@ -1,7 +1,6 @@
import 'dart:async';
import 'dart:convert';
import 'package:flutter/cupertino.dart';
import 'package:shared_preferences/shared_preferences.dart';
import '../models/models.dart';
@@ -29,8 +28,7 @@ class Preferences {
try {
return ClashConfig.fromJson(clashConfigMap);
} catch (e) {
debugPrint(e.toString());
return null;
throw e.toString();
}
}
@@ -50,8 +48,7 @@ class Preferences {
try {
return Config.fromJson(configMap);
} catch (e) {
debugPrint(e.toString());
return null;
throw e.toString();
}
}

View File

@@ -29,7 +29,7 @@ class Request {
final packageInfo = await appPackage.packageInfoCompleter.future;
final version = packageInfo.version;
final hasUpdate =
Other.compareVersions(remoteVersion.replaceAll('v', ''), version) > 0;
other.compareVersions(remoteVersion.replaceAll('v', ''), version) > 0;
if (!hasUpdate) return Result.error();
return Result.success(data: body['body']);
}

View File

@@ -1,6 +1,4 @@
import 'dart:async';
import 'dart:io';
import 'dart:isolate';
import 'package:fl_clash/state.dart';
import 'package:flutter/material.dart';
@@ -35,7 +33,6 @@ class AppController {
config: config,
clashConfig: clashConfig,
);
updateRunTime();
updateTraffic();
globalState.updateFunctionLists = [
@@ -88,13 +85,7 @@ class AppController {
config.deleteProfileById(id);
final profilePath = await appPath.getProfilePath(id);
if (profilePath == null) return;
final file = File(profilePath);
Isolate.run(() async {
final isExists = await file.exists();
if (isExists) {
file.delete();
}
});
clashCore.clearEffect(profilePath);
if (config.currentProfileId == id) {
if (config.profiles.isNotEmpty) {
final updateId = config.profiles.first.id;
@@ -115,7 +106,7 @@ class AppController {
}
}
Future<bool> updateClashConfig({bool isPatch = true}) async {
Future<String> updateClashConfig({bool isPatch = true}) async {
return await globalState.updateClashConfig(
clashConfig: clashConfig,
config: config,
@@ -123,12 +114,31 @@ class AppController {
);
}
applyProfile() async {
await globalState.applyProfile(
appState: appState,
config: config,
clashConfig: clashConfig,
);
}
Function? _changeProfileDebounce;
changeProfileDebounce(String? profileId) {
if (profileId == config.currentProfileId) return;
config.currentProfileId = profileId;
_changeProfileDebounce ??= debounce<Function(String?)>((profileId) async {
await applyProfile();
appState.delayMap = {};
saveConfigPreferences();
});
_changeProfileDebounce!([profileId]);
}
changeProfile(String? value) async {
if (value == config.currentProfileId) return;
config.currentProfileId = value;
await updateClashConfig(isPatch: false);
await updateGroups();
changeProxy();
await applyProfile();
appState.delayMap = {};
saveConfigPreferences();
}
@@ -142,10 +152,7 @@ class AppController {
)
.isBeforeNow();
if (isNotNeedUpdate == false) continue;
final result = await profile.update();
if (result.type == ResultType.error) continue;
await updateGroups();
changeProxy();
await profile.update();
}
}
@@ -157,13 +164,6 @@ class AppController {
appState.systemColorSchemes = systemColorSchemes;
}
clearCurrentDelay() {
final currentProxyName =
appState.getCurrentProxyName(config.currentProxyName, clashConfig.mode);
if (currentProxyName == null) return;
appState.setDelay(Delay(name: currentProxyName, value: null));
}
savePreferences() async {
await saveConfigPreferences();
await saveClashConfigPreferences();
@@ -207,25 +207,39 @@ class AppController {
}
afterInit() async {
if (appState.isInit) {
if (config.autoRun) {
await updateSystemProxy(true);
} else {
await proxyManager.updateStartTime();
await updateSystemProxy(proxyManager.isStart);
}
autoUpdateProfiles();
updateLogStatus();
if (!config.silentLaunch) {
window?.show();
}
if (config.autoRun) {
await updateSystemProxy(true);
} else {
await proxyManager.updateStartTime();
await updateSystemProxy(proxyManager.isStart);
}
autoUpdateProfiles();
updateLogStatus();
if (!config.silentLaunch) {
window?.show();
}
}
healthcheck() {
for (final delay in appState.delayMap.entries) {
setDelay(
Delay(
name: delay.key,
value: 0,
),
);
}
clashCore.healthcheck();
}
setDelay(Delay delay) {
appState.setDelay(delay);
}
updateDelayMap() async {
appState.delayMap = await clashCore.getDelayMap();
}
toPage(int index, {bool hasAnimate = false}) {
final nextLabel = globalState.currentNavigationItems[index].label;
appState.currentLabel = nextLabel;
@@ -253,31 +267,6 @@ class AppController {
}
}
addProfileFormURL(String url) async {
globalState.navigatorKey.currentState?.popUntil((route) => route.isFirst);
toProfiles();
final commonScaffoldState = globalState.homeScaffoldKey.currentState;
if (commonScaffoldState?.mounted != true) return;
commonScaffoldState?.loadingRun(
() async {
await Future.delayed(const Duration(milliseconds: 300));
final profile = Profile(
url: url,
);
final res = await profile.update();
if (res.type == ResultType.success) {
addProfile(profile);
} else {
debugPrint(res.message);
globalState.showMessage(
title: "${appLocalizations.add}${appLocalizations.profile}",
message: TextSpan(text: res.message!),
);
}
},
);
}
initLink() {
linkManager.initAppLinksListen(
(url) {
@@ -307,8 +296,33 @@ class AppController {
);
}
addProfileFormURL(String url) async {
globalState.navigatorKey.currentState?.popUntil((route) => route.isFirst);
toProfiles();
final commonScaffoldState = globalState.homeScaffoldKey.currentState;
if (commonScaffoldState?.mounted != true) return;
commonScaffoldState?.loadingRun(
() async {
await Future.delayed(const Duration(milliseconds: 300));
final profile = Profile(
url: url,
);
final res = await profile.update();
if (res.type == ResultType.success) {
addProfile(profile);
} else {
debugPrint(res.message);
globalState.showMessage(
title: "${appLocalizations.add}${appLocalizations.profile}",
message: TextSpan(text: res.message!),
);
}
},
);
}
addProfileFormFile() async {
final result = await FileUtil.pickerConfig();
final result = await picker.pickerConfigFile();
if (result.type == ResultType.error) return;
if (!context.mounted) return;
globalState.navigatorKey.currentState?.popUntil((route) => route.isFirst);
@@ -336,4 +350,29 @@ class AppController {
},
);
}
addProfileFormQrCode() async {
final result = await picker.pickerConfigQRCode();
if (result.type == ResultType.error) {
if(result.message != null){
globalState.showMessage(
title: appLocalizations.tip,
message: TextSpan(
text: result.message,
),
);
}
return;
}
addProfileFormURL(result.data!);
}
clearShowProxyDelay() {
final showProxyDelay = appState.getRealProxyName(appState.showProxyName);
if (showProxyDelay != null) {
appState.setDelay(
Delay(name: showProxyDelay, value: null),
);
}
}
}

View File

@@ -2,6 +2,8 @@
enum GroupType { Selector, URLTest, Fallback }
enum GroupName { GLOBAL, Proxy, Auto, Fallback }
extension GroupTypeExtension on GroupType {
static List<String> get valueList => GroupType.values
.map(
@@ -52,4 +54,4 @@ enum ProfileType { file, url }
enum ResultType { success, error }
enum MessageType { log, tun, delay, process }
enum MessageType { log, tun, delay, process, now }

View File

@@ -80,6 +80,15 @@ class AboutFragment extends StatelessWidget {
});
},
),
ListTile(
title: const Text("Telegram"),
onTap: () {
launchUrl(
Uri.parse("https://t.me/+G-veVtwBOl4wODc1"),
);
},
trailing: const Icon(Icons.launch),
),
ListTile(
title: Text(appLocalizations.project),
onTap: () {

View File

@@ -2,6 +2,7 @@ import 'package:fl_clash/enum/enum.dart';
import 'package:fl_clash/models/models.dart';
import 'package:fl_clash/plugins/app.dart';
import 'package:fl_clash/common/common.dart';
import 'package:fl_clash/state.dart';
import 'package:fl_clash/widgets/widgets.dart';
import 'package:flutter/material.dart';
import 'package:provider/provider.dart';
@@ -292,9 +293,9 @@ class AccessFragment extends StatelessWidget {
@override
Widget build(BuildContext context) {
if (context.appController.appState.packages.isEmpty) {
if (globalState.appController.appState.packages.isEmpty) {
WidgetsBinding.instance.addPostFrameCallback((_) {
context.appController.updatePackages();
globalState.appController.updatePackages();
});
}
return Selector<Config, bool>(

View File

@@ -2,6 +2,7 @@ import 'dart:io';
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:intl/intl.dart';
@@ -35,6 +36,26 @@ class ApplicationSettingFragment extends StatelessWidget {
);
},
),
Selector<Config, bool>(
selector: (_, config) => config.isCompatible,
builder: (_, isCompatible, __) {
return ListItem.switchItem(
leading: const Icon(Icons.expand),
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.updateClashConfig(isPatch: false);
await appController.updateGroups();
appController.changeProxy();
},
),
);
},
),
if (system.isDesktop)
Selector<Config, bool>(
selector: (_, config) => config.autoLaunch,
@@ -100,7 +121,7 @@ class ApplicationSettingFragment extends StatelessWidget {
onChanged: (bool value) {
final config = context.read<Config>();
config.openLogs = value;
context.appController.updateLogStatus();
globalState.appController.updateLogStatus();
},
),
);

View File

@@ -24,8 +24,8 @@ class _ConfigFragmentState extends State<ConfigFragment> {
try {
final mixedPort = int.parse(port);
if (mixedPort < 1024 || mixedPort > 49151) throw "Invalid port";
context.appController.clashConfig.mixedPort = mixedPort;
context.appController.updateClashConfigDebounce();
globalState.appController.clashConfig.mixedPort = mixedPort;
globalState.appController.updateClashConfigDebounce();
} catch (e) {
globalState.showMessage(
title: appLocalizations.proxyPort,
@@ -39,9 +39,9 @@ class _ConfigFragmentState extends State<ConfigFragment> {
_updateLoglevel(LogLevel? logLevel) {
if (logLevel == null ||
logLevel == context.appController.clashConfig.logLevel) return;
context.appController.clashConfig.logLevel = logLevel;
context.appController.updateClashConfigDebounce();
logLevel == globalState.appController.clashConfig.logLevel) return;
globalState.appController.clashConfig.logLevel = logLevel;
globalState.appController.updateClashConfigDebounce();
}
@override
@@ -59,12 +59,31 @@ class _ConfigFragmentState extends State<ConfigFragment> {
onChanged: (bool value) async {
final clashConfig = context.read<ClashConfig>();
clashConfig.allowLan = value;
context.appController.updateClashConfigDebounce();
globalState.appController.updateClashConfigDebounce();
},
),
);
},
),
if (system.isDesktop)
Selector<ClashConfig, bool>(
selector: (_, clashConfig) => clashConfig.tun.enable,
builder: (_, tunEnable, __) {
return ListItem.switchItem(
leading: const Icon(Icons.support),
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);
globalState.appController.updateClashConfigDebounce();
},
),
);
},
),
Selector<ClashConfig, int>(
selector: (_, clashConfig) => clashConfig.mixedPort,
builder: (_, mixedPort, __) {
@@ -120,7 +139,7 @@ class _ConfigFragmentState extends State<ConfigFragment> {
return ListView.separated(
itemBuilder: (_, index) {
return Container(
height: 84,
padding: kMaterialListPadding,
alignment: Alignment.center,
child: items[index],
);

View File

@@ -12,7 +12,6 @@ class CoreInfo extends StatelessWidget {
return Selector<AppState, VersionInfo?>(
selector: (_, appState) => appState.versionInfo,
builder: (_, versionInfo, __) {
debugPrint("[CoreInfo] update===>");
return CommonCard(
info: Info(
label: appLocalizations.coreInfo,

View File

@@ -82,7 +82,7 @@ class _NetworkDetectionState extends State<NetworkDetection> {
if (!isCurrent || currentProxyName == null || !isInit) return;
WidgetsBinding.instance.addPostFrameCallback((timeStamp) {
if (delay == null) {
context.appController.setDelay(
globalState.appController.setDelay(
Delay(
name: currentProxyName,
value: 0,
@@ -96,22 +96,17 @@ class _NetworkDetectionState extends State<NetworkDetection> {
}
_updateCurrentDelayContainer(Widget child) {
return Selector3<AppState, Config, ClashConfig,
UpdateCurrentDelaySelectorState>(
selector: (_, appState, config, clashConfig) {
final proxyName = appState.getCurrentProxyName(
config.currentProxyName,
clashConfig.mode,
);
return Selector2<AppState, Config, UpdateCurrentDelaySelectorState>(
selector: (_, appState, config) {
return UpdateCurrentDelaySelectorState(
isInit: appState.isInit,
currentProxyName: proxyName,
delay: appState.delayMap[proxyName],
currentProxyName: appState.getRealProxyName(appState.showProxyName),
delay: appState
.delayMap[appState.getRealProxyName(appState.showProxyName)],
isCurrent: appState.currentLabel == 'dashboard',
);
},
builder: (_, state, __) {
debugPrint("[UpdateCurrentDelay] update===>");
_updateCurrentDelay(
state.currentProxyName,
state.delay,
@@ -132,20 +127,16 @@ class _NetworkDetectionState extends State<NetworkDetection> {
label: appLocalizations.networkDetection,
),
child: _updateCurrentDelayContainer(
Selector3<AppState, Config, ClashConfig, NetworkDetectionSelectorState>(
selector: (_, appState, config, clashConfig) {
final proxyName = appState.getCurrentProxyName(
config.currentProxyName,
clashConfig.mode,
);
Selector<AppState, NetworkDetectionSelectorState>(
selector: (_, appState) {
return NetworkDetectionSelectorState(
isInit: appState.isInit,
currentProxyName: proxyName,
delay: appState.delayMap[proxyName],
currentProxyName: appState.showProxyName,
delay: appState.getDelay(
appState.showProxyName,
),
);
},
builder: (_, state, __) {
debugPrint("[NetworkDetection] update===>");
return Container(
padding: const EdgeInsets.all(16).copyWith(top: 0),
child: Column(
@@ -159,8 +150,10 @@ class _NetworkDetectionState extends State<NetworkDetection> {
state.currentProxyName ?? appLocalizations.noProxy,
overflow: TextOverflow.ellipsis,
maxLines: 1,
style:
Theme.of(context).textTheme.titleMedium?.toSoftBold(),
style: Theme.of(context)
.textTheme
.titleMedium
?.toSoftBold(),
),
),
),
@@ -169,7 +162,7 @@ class _NetworkDetectionState extends State<NetworkDetection> {
),
Flexible(
child: Container(
height: context.appController.measure.titleLargeHeight,
height: globalState.appController.measure.titleLargeHeight,
alignment: Alignment.centerLeft,
child: FadeBox(
child: _buildDescription(

View File

@@ -1,5 +1,6 @@
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';
@@ -68,7 +69,7 @@ class _NetworkSpeedState extends State<NetworkSpeed> {
style: bodyMedium,
maxLines: 1,
);
final size = context.appController.measure.computeTextSize(valueText);
final size = globalState.appController.measure.computeTextSize(valueText);
return Column(
crossAxisAlignment: CrossAxisAlignment.center,

View File

@@ -1,6 +1,7 @@
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:intl/intl.dart';
@@ -10,11 +11,19 @@ class OutboundMode extends StatelessWidget {
const OutboundMode({super.key});
_changeMode(BuildContext context, Mode? value) async {
final appController = context.appController;
final clashConfig = context.read<ClashConfig>();
final appController = globalState.appController;
final clashConfig = appController.clashConfig;
final config = appController.config;
if (value == null || clashConfig.mode == value) return;
clashConfig.mode = value;
await appController.updateClashConfig();
if (!config.isCompatible) {
final proxySelected = config.currentSelectedMap[GroupName.Proxy.name];
final globalSelected = config.currentSelectedMap[GroupName.GLOBAL.name];
if (proxySelected != null && globalSelected == null) {
config.updateCurrentSelectedMap(GroupName.GLOBAL.name, proxySelected);
}
}
appController.changeProxy();
}
@@ -54,7 +63,8 @@ class OutboundMode extends StatelessWidget {
),
title: Text(
Intl.message(item.name),
style: Theme.of(context)
style: Theme
.of(context)
.textTheme
.titleMedium
?.toSoftBold(),

View File

@@ -1,5 +1,6 @@
import 'package:fl_clash/common/common.dart';
import 'package:fl_clash/models/models.dart';
import 'package:fl_clash/state.dart';
import 'package:flutter/material.dart';
import 'package:provider/provider.dart';
@@ -48,10 +49,10 @@ class _StartButtonState extends State<StartButton>
}
updateSystemProxy() async {
final appController = context.appController;
final appController = globalState.appController;
await appController.updateSystemProxy(isStart);
if (isStart && mounted) {
appController.clearCurrentDelay();
appController.clearShowProxyDelay();
}
}
@@ -63,18 +64,20 @@ class _StartButtonState extends State<StartButton>
hasProfile: config.profiles.isNotEmpty,
),
builder: (_, state, child) {
debugPrint("[StartButton] update===>");
if (!state.isInit || !state.hasProfile) {
return Container();
}
final textWidth = context.appController.measure.computeTextSize(
Text(
Other.getTimeDifference(
DateTime.now(),
),
style: Theme.of(context).textTheme.titleMedium?.toSoftBold(),
),
).width +
final textWidth = globalState.appController.measure
.computeTextSize(
Text(
other.getTimeDifference(
DateTime.now(),
),
style:
Theme.of(context).textTheme.titleMedium?.toSoftBold(),
),
)
.width +
16;
return AnimatedBuilder(
animation: _controller.view,
@@ -131,7 +134,7 @@ class _StartButtonState extends State<StartButton>
child: Selector<AppState, int?>(
selector: (_, appState) => appState.runTime,
builder: (_, int? value, __) {
final text = Other.getTimeText(value);
final text = other.getTimeText(value);
return Text(
text,
style: Theme.of(context).textTheme.titleMedium?.toSoftBold(),

View File

@@ -1,4 +1,3 @@
import 'dart:io';
import 'package:fl_clash/common/common.dart';
import 'package:fl_clash/pages/scan.dart';
import 'package:fl_clash/state.dart';
@@ -8,17 +7,21 @@ import 'package:flutter/material.dart';
class AddProfile extends StatelessWidget {
final BuildContext context;
const AddProfile({super.key, required this.context});
const AddProfile({super.key, required this.context,});
_handleAddProfileFormFile() async {
context.appController.addProfileFormFile();
globalState.appController.addProfileFormFile();
}
_handleAddProfileFormURL(String url) async {
context.appController.addProfileFormURL(url);
globalState.appController.addProfileFormURL(url);
}
_toScan() async {
if(system.isDesktop){
globalState.appController.addProfileFormQrCode();
return;
}
final url = await Navigator.of(context)
.push<String>(MaterialPageRoute(builder: (_) => const ScanPage()));
if (url != null) {
@@ -39,7 +42,6 @@ class AddProfile extends StatelessWidget {
Widget build(context) {
return ListView(
children: [
if (Platform.isAndroid)
ListItem(
leading: const Icon(Icons.qr_code),
title: Text(appLocalizations.qrcode),

View File

@@ -1,5 +1,6 @@
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';
@@ -38,7 +39,7 @@ class _EditProfileState extends State<EditProfile> {
_handleConfirm() {
if (!_formKey.currentState!.validate()) return;
final config = context.read<Config>();
final config = widget.context.read<Config>();
final hasUpdate = widget.profile.url != urlController.text;
widget.profile.url = urlController.text;
widget.profile.label = labelController.text;
@@ -48,7 +49,7 @@ class _EditProfileState extends State<EditProfile> {
config.setProfile(widget.profile);
if (hasUpdate) {
widget.context.findAncestorStateOfType<CommonScaffoldState>()?.loadingRun(
() => context.appController.updateProfile(
() => globalState.appController.updateProfile(
widget.profile.id,
),
);

View File

@@ -1,6 +1,7 @@
import 'package:fl_clash/fragments/profiles/edit_profile.dart';
import 'package:fl_clash/models/models.dart';
import 'package:fl_clash/common/common.dart';
import 'package:fl_clash/state.dart';
import 'package:fl_clash/widgets/widgets.dart';
import 'package:flutter/material.dart';
import 'package:flutter_adaptive_scaffold/flutter_adaptive_scaffold.dart';
@@ -49,12 +50,12 @@ class _ProfilesFragmentState extends State<ProfilesFragment> {
}
_handleDeleteProfile(String id) async {
context.appController.deleteProfile(id);
globalState.appController.deleteProfile(id);
}
_handleUpdateProfile(String id) async {
context.findAncestorStateOfType<CommonScaffoldState>()?.loadingRun(
() => context.appController.updateProfile(id),
() => globalState.appController.updateProfile(id),
);
}
@@ -174,9 +175,9 @@ class _ProfilesFragmentState extends State<ProfilesFragment> {
_handleShowAddExtendPage() {
showExtendPage(
context,
globalState.navigatorKey.currentState!.context,
body: AddProfile(
context: context,
context: globalState.navigatorKey.currentState!.context,
),
title: "${appLocalizations.add}${appLocalizations.profile}",
);
@@ -209,7 +210,7 @@ class _ProfilesFragmentState extends State<ProfilesFragment> {
child: _profileItem(
profile: profile,
groupValue: state.currentProfileId,
onChanged: context.appController.changeProfile,
onChanged: globalState.appController.changeProfileDebounce,
),
),
],
@@ -234,7 +235,6 @@ class _ProfilesFragmentState extends State<ProfilesFragment> {
currentProfileId: config.currentProfileId,
),
builder: (context, state, child) {
debugPrint("[Profiles] update===>");
if (state.profiles.isEmpty) {
return NullStatus(
label: appLocalizations.nullProfileDesc,

View File

@@ -1,4 +1,4 @@
import 'package:fl_clash/clash/clash.dart';
import 'package:fl_clash/state.dart';
import 'package:flutter/material.dart';
import 'package:flutter_adaptive_scaffold/flutter_adaptive_scaffold.dart';
import 'package:provider/provider.dart';
@@ -58,161 +58,99 @@ class _ProxiesFragmentState extends State<ProxiesFragment>
@override
Widget build(BuildContext context) {
return Selector<AppState, bool>(
selector: (_, appState) => appState.currentLabel == 'proxies',
builder: (_, isCurrent, child) {
if (isCurrent) {
_initActions();
}
return child!;
},
child: Selector3<AppState, Config, ClashConfig, ProxiesSelectorState>(
selector: (_, appState, config, clashConfig) {
final currentGroups = appState.getCurrentGroups(clashConfig.mode);
final currentProxyName = appState.getCurrentGroupNameWithGroups(
currentGroups,
config.currentGroupName,
clashConfig.mode,
);
final currentIndex = currentGroups
.indexWhere((element) => element.name == currentProxyName);
return ProxiesSelectorState(
currentIndex: currentIndex != -1 ? currentIndex : 0,
groups: currentGroups,
);
},
builder: (_, state, __) {
if (_tabController != null) {
_tabController!.dispose();
_tabController = null;
return DelayTestButtonContainer(
child: Selector<AppState, bool>(
selector: (_, appState) => appState.currentLabel == 'proxies',
builder: (_, isCurrent, child) {
if (isCurrent) {
_initActions();
}
_tabController = TabController(
length: state.groups.length,
vsync: this,
initialIndex: state.currentIndex,
);
debugPrint("[Proxies] update===>");
return Column(
mainAxisAlignment: MainAxisAlignment.start,
crossAxisAlignment: CrossAxisAlignment.start,
children: [
TabBar(
controller: _tabController,
padding: const EdgeInsets.symmetric(horizontal: 16),
dividerColor: Colors.transparent,
isScrollable: true,
tabAlignment: TabAlignment.start,
overlayColor:
const MaterialStatePropertyAll(Colors.transparent),
tabs: [
for (final group in state.groups)
Tab(
text: group.name,
),
],
),
Expanded(
child: TabBarView(
return child!;
},
child: Selector3<AppState, Config, ClashConfig, ProxiesSelectorState>(
selector: (_, appState, config, clashConfig) {
final currentGroups = appState.currentGroups;
final groupNames = currentGroups.map((e) => e.name).toList();
return ProxiesSelectorState(
groupNames: groupNames,
);
},
shouldRebuild: (prev, next) {
if (prev.groupNames.length != next.groupNames.length) {
_tabController?.dispose();
_tabController = null;
}
return prev != next;
},
builder: (_, state, __) {
_tabController ??= TabController(
length: state.groupNames.length,
vsync: this,
);
return Column(
mainAxisAlignment: MainAxisAlignment.start,
crossAxisAlignment: CrossAxisAlignment.start,
children: [
TabBar(
controller: _tabController,
children: [
for (final group in state.groups)
KeepContainer(
child: ProxiesTabView(
group: group,
),
padding: const EdgeInsets.symmetric(horizontal: 16),
dividerColor: Colors.transparent,
isScrollable: true,
tabAlignment: TabAlignment.start,
overlayColor:
const MaterialStatePropertyAll(Colors.transparent),
tabs: [
for (final groupName in state.groupNames)
Tab(
text: groupName,
),
],
),
)
],
);
},
Expanded(
child: TabBarView(
controller: _tabController,
children: [
for (final groupName in state.groupNames)
KeepContainer(
key: ObjectKey(groupName),
child: ProxiesTabView(
groupName: groupName,
),
),
],
),
)
],
);
},
),
),
);
}
}
class ProxiesTabView extends StatefulWidget {
final Group group;
class ProxiesTabView extends StatelessWidget {
final String groupName;
const ProxiesTabView({
super.key,
required this.group,
required this.groupName,
});
@override
State<ProxiesTabView> createState() => _ProxiesTabViewState();
}
class _ProxiesTabViewState extends State<ProxiesTabView>
with SingleTickerProviderStateMixin {
var lock = false;
late AnimationController _controller;
late Animation<double> _scale;
late Animation<double> _opacity;
@override
void initState() {
super.initState();
_controller = AnimationController(
vsync: this,
duration: const Duration(
milliseconds: 200,
),
);
_scale = Tween<double>(
begin: 1.0,
end: 0.8,
).animate(
CurvedAnimation(
parent: _controller,
curve: const Interval(
0.0,
0.3,
curve: Curves.easeIn,
),
),
);
_opacity = Tween<double>(
begin: 1.0,
end: 0.0,
).animate(
CurvedAnimation(
parent: _controller,
curve: const Interval(
0,
1,
curve: Curves.easeIn,
),
),
);
}
@override
void dispose() {
super.dispose();
_controller.dispose();
}
get group => widget.group;
get measure => context.appController.measure;
List<Proxy> _sortOfName(List<Proxy> proxies) {
return List.of(proxies)
..sort(
(a, b) => Other.sortByChar(a.name, b.name),
(a, b) => other.sortByChar(a.name, b.name),
);
}
List<Proxy> _sortOfDelay(List<Proxy> proxies) {
List<Proxy> _sortOfDelay(BuildContext context, List<Proxy> proxies) {
final appState = context.read<AppState>();
final delayMap = appState.delayMap;
return proxies = List.of(proxies)
..sort(
(a, b) {
final aDelay = delayMap[a.name];
final bDelay = delayMap[b.name];
final aDelay = appState.delayMap[a.name];
final bDelay = appState.delayMap[b.name];
if (aDelay == null && bDelay == null) {
return 0;
}
@@ -228,38 +166,19 @@ class _ProxiesTabViewState extends State<ProxiesTabView>
}
_getProxies(
BuildContext context,
List<Proxy> proxies,
ProxiesSortType proxiesSortType,
) {
if (proxiesSortType == ProxiesSortType.delay) return _sortOfDelay(proxies);
if (proxiesSortType == ProxiesSortType.delay) {
return _sortOfDelay(context, proxies);
}
if (proxiesSortType == ProxiesSortType.name) return _sortOfName(proxies);
return proxies;
}
_getDelayMap() async {
if (lock == true) return;
lock = true;
_controller.forward();
for (final proxy in group.all) {
context.appController.setDelay(
Delay(
name: proxy.name,
value: 0,
),
);
clashCore.delay(
proxy.name,
);
}
await Future.delayed(
appConstant.httpTimeoutDuration + appConstant.moreDuration,
);
lock = false;
_controller.reverse();
setState(() {});
}
double _getItemHeight() {
double _getItemHeight(BuildContext context) {
final measure = globalState.appController.measure;
return 12 * 2 +
measure.bodyMediumHeight * 2 +
measure.bodySmallHeight +
@@ -267,11 +186,13 @@ class _ProxiesTabViewState extends State<ProxiesTabView>
8 * 2;
}
_card({
_card(
BuildContext context, {
required void Function() onPressed,
required bool isSelected,
required Proxy proxy,
}) {
final measure = globalState.appController.measure;
return CommonCard(
isSelected: isSelected,
onPressed: onPressed,
@@ -308,12 +229,22 @@ class _ProxiesTabViewState extends State<ProxiesTabView>
),
SizedBox(
height: measure.bodySmallHeight,
child: Text(
proxy.type,
style: context.textTheme.bodySmall?.copyWith(
overflow: TextOverflow.ellipsis,
color: context.textTheme.bodySmall?.color?.toLight(),
child: Selector<AppState, String>(
selector: (context, appState) => appState.getDesc(
proxy.type,
proxy.name,
),
builder: (_, desc, __) {
return TooltipText(
text: Text(
desc,
style: context.textTheme.bodySmall?.copyWith(
overflow: TextOverflow.ellipsis,
color: context.textTheme.bodySmall?.color?.toLight(),
),
),
);
},
),
),
const SizedBox(
@@ -322,7 +253,9 @@ class _ProxiesTabViewState extends State<ProxiesTabView>
SizedBox(
height: measure.labelSmallHeight,
child: Selector<AppState, int?>(
selector: (context, appState) => appState.delayMap[proxy.name],
selector: (context, appState) => appState.getDelay(
proxy.name,
),
builder: (_, delay, __) {
return FadeBox(
child: Builder(
@@ -343,7 +276,7 @@ class _ProxiesTabViewState extends State<ProxiesTabView>
delay > 0 ? '$delay ms' : "Timeout",
style: context.textTheme.labelSmall?.copyWith(
overflow: TextOverflow.ellipsis,
color: Other.getDelayColor(
color: other.getDelayColor(
delay,
),
),
@@ -360,107 +293,212 @@ class _ProxiesTabViewState extends State<ProxiesTabView>
);
}
_buildGrid({
required ProxiesSortType proxiesSortType,
Widget _buildGrid(
BuildContext context, {
required List<Proxy> proxies,
required int columns,
}) {
return SingleChildScrollView(
return GridView.builder(
padding: const EdgeInsets.all(16),
child: AnimateGrid<Proxy>(
items: _getProxies(group.all, proxiesSortType),
columns: columns,
itemHeight: _getItemHeight(),
keyBuilder: (item) {
return ObjectKey(item);
},
builder: (_, proxy) {
return Selector3<AppState, Config, ClashConfig, String?>(
selector: (_, appState, config, clashConfig) =>
appState.getCurrentProxyName(
config.currentProxyName,
clashConfig.mode,
),
builder: (_, value, __) {
final currentProxyName =
group.type == GroupType.Selector ? value : group.now;
return _card(
isSelected: proxy.name == currentProxyName,
onPressed: () {
if (group.type == GroupType.Selector) {
final config = context.read<Config>();
config.currentProfile?.groupName = group.name;
config.currentProfile?.proxyName = proxy.name;
config.update();
context.appController.changeProxy();
}
},
proxy: proxy,
);
},
);
},
gridDelegate: SliverGridDelegateWithFixedCrossAxisCount(
crossAxisCount: columns,
mainAxisSpacing: 8,
crossAxisSpacing: 8,
mainAxisExtent: _getItemHeight(context),
),
itemCount: proxies.length,
itemBuilder: (_, index) {
final proxy = proxies[index];
return Selector3<AppState, Config, ClashConfig,
ProxiesCardSelectorState>(
selector: (_, appState, config, clashConfig) {
final group = appState.getGroupWithName(groupName)!;
bool isSelected = config.currentSelectedMap[group.name] == proxy.name ||
(config.currentSelectedMap[group.name] == null &&
group.now == proxy.name);
return ProxiesCardSelectorState(
isSelected: isSelected,
);
},
builder: (_, state, __) {
return _card(
context,
isSelected: state.isSelected,
onPressed: () {
final appController = globalState.appController;
final group =
appController.appState.getGroupWithName(groupName)!;
if (group.type != GroupType.Selector) {
globalState.showSnackBar(
context,
message: appLocalizations.notSelectedTip,
);
return;
}
globalState.appController.config.updateCurrentSelectedMap(
groupName,
proxy.name,
);
globalState.appController.changeProxy();
},
proxy: proxy,
);
},
);
},
);
}
@override
Widget build(BuildContext context) {
return Selector<Config, ProxiesSortType>(
selector: (_, config) => config.proxiesSortType,
builder: (_, proxiesSortType, __) {
return FloatLayout(
floatingWidget: FloatWrapper(
child: AnimatedBuilder(
animation: _controller,
builder: (_, __) {
return Transform.scale(
scale: _scale.value,
child: SizedBox(
width: 56,
height: 56,
child: Opacity(
opacity: _opacity.value,
child: FloatingActionButton(
heroTag: null,
onPressed: _getDelayMap,
child: const Icon(Icons.network_ping),
),
),
),
);
},
),
),
child: Align(
alignment: Alignment.topCenter,
child: SlotLayout(
config: {
Breakpoints.small: SlotLayout.from(
key: const Key('proxies_grid_small'),
builder: (_) => _buildGrid(
proxiesSortType: proxiesSortType,
columns: 2,
),
return Selector2<AppState, Config, ProxiesTabViewSelectorState>(
selector: (_, appState, config) {
return ProxiesTabViewSelectorState(
proxiesSortType: config.proxiesSortType,
sortNum: appState.sortNum,
group: appState.getGroupWithName(groupName)!,
);
},
builder: (_, state, __) {
final proxies = _getProxies(
context,
state.group.all,
state.proxiesSortType,
);
return Align(
alignment: Alignment.topCenter,
child: SlotLayout(
config: {
Breakpoints.small: SlotLayout.from(
key: const Key('proxies_grid_small'),
builder: (_) => _buildGrid(
context,
proxies: proxies,
columns: 2,
),
Breakpoints.medium: SlotLayout.from(
key: const Key('proxies_grid_medium'),
builder: (_) => _buildGrid(
proxiesSortType: proxiesSortType,
columns: 3,
),
),
Breakpoints.medium: SlotLayout.from(
key: const Key('proxies_grid_medium'),
builder: (_) => _buildGrid(
context,
proxies: proxies,
columns: 3,
),
Breakpoints.large: SlotLayout.from(
key: const Key('proxies_grid_large'),
builder: (_) => _buildGrid(
proxiesSortType: proxiesSortType,
columns: 4,
),
),
Breakpoints.large: SlotLayout.from(
key: const Key('proxies_grid_large'),
builder: (_) => _buildGrid(
context,
proxies: proxies,
columns: 4,
),
},
),
),
},
),
);
},
);
}
}
class DelayTestButtonContainer extends StatefulWidget {
final Widget child;
const DelayTestButtonContainer({
super.key,
required this.child,
});
@override
State<DelayTestButtonContainer> createState() =>
_DelayTestButtonContainerState();
}
class _DelayTestButtonContainerState extends State<DelayTestButtonContainer>
with SingleTickerProviderStateMixin {
late AnimationController _controller;
late Animation<double> _scale;
late Animation<double> _opacity;
_healthcheck() async {
_controller.forward();
globalState.appController.healthcheck();
await Future.delayed(
appConstant.httpTimeoutDuration + appConstant.moreDuration,
);
_controller.reverse();
}
@override
void initState() {
super.initState();
_controller = AnimationController(
vsync: this,
duration: const Duration(
milliseconds: 300,
),
);
_scale = Tween<double>(
begin: 1.0,
end: 0.0,
).animate(
CurvedAnimation(
parent: _controller,
curve: const Interval(
0,
1,
curve: Curves.easeIn,
),
),
);
_opacity = Tween<double>(
begin: 1.0,
end: 0.0,
).animate(
CurvedAnimation(
parent: _controller,
curve: const Interval(
0,
1,
curve: Curves.easeIn,
),
),
);
}
@override
void dispose() {
_controller.dispose();
super.dispose();
}
@override
Widget build(BuildContext context) {
return FloatLayout(
floatingWidget: FloatWrapper(
child: AnimatedBuilder(
animation: _controller,
builder: (_, child) {
return SizedBox(
width: 56,
height: 56,
child: Transform.scale(
scale: _scale.value,
child: Opacity(
opacity: _opacity.value,
child: child!,
),
),
);
},
child: FloatingActionButton(
heroTag: null,
onPressed: _healthcheck,
child: const Icon(Icons.network_ping),
),
),
),
child: widget.child,
);
}
}

View File

@@ -1,5 +1,6 @@
import 'package:fl_clash/common/common.dart';
import 'package:fl_clash/models/models.dart';
import 'package:fl_clash/state.dart';
import 'package:flutter/material.dart';
import 'package:provider/provider.dart';
@@ -28,7 +29,7 @@ class ThemeFragment extends StatelessWidget {
return CommonCard(
isSelected: isSelected,
onPressed: () {
context.appController.config.themeMode = themeModeItem.themeMode;
globalState.appController.config.themeMode = themeModeItem.themeMode;
},
child: Padding(
padding: const EdgeInsets.symmetric(horizontal:16),
@@ -62,7 +63,7 @@ class ThemeFragment extends StatelessWidget {
isSelected: isSelected,
primaryColor: color,
onPressed: () {
context.appController.config.primaryColor = color?.value;
globalState.appController.config.primaryColor = color?.value;
},
);
}

View File

@@ -114,7 +114,7 @@ class _ToolboxFragmentState extends State<ToolsFragment> {
selector: (_, config) => config.locale,
builder: (_, localeString, __) {
final subTitle = localeString ?? appLocalizations.defaultText;
final currentLocale = Other.getLocaleForString(localeString);
final currentLocale = other.getLocaleForString(localeString);
return ListTile(
leading: const Icon(Icons.language_outlined),
title: Text(appLocalizations.language),
@@ -211,31 +211,23 @@ class _ToolboxFragmentState extends State<ToolsFragment> {
@override
Widget build(BuildContext context) {
final items = [
LayoutBuilder(builder: (context, container) {
final isMobile = context.isMobile;
if (!isMobile) {
return Container(
margin: const EdgeInsets.only(top: 18),
Selector<AppState, List<NavigationItem>>(
selector: (_, appState) => appState.navigationItems,
builder: (_, navigationItems, __) {
final moreNavigationItems = navigationItems
.where(
(element) => element.modes.contains(NavigationItemMode.more),
)
.toList();
if (moreNavigationItems.isEmpty) {
return Container();
}
return _buildSection(
title: appLocalizations.more,
content: _buildNavigationMenu(moreNavigationItems),
);
}
return Selector<AppState, List<NavigationItem>>(
selector: (_, appState) => appState.navigationItems,
builder: (_, navigationItems, __) {
final moreNavigationItems = navigationItems
.where(
(element) => element.modes.contains(NavigationItemMode.more),
)
.toList();
if (moreNavigationItems.isEmpty) {
return Container();
}
return _buildSection(
title: appLocalizations.more,
content: _buildNavigationMenu(moreNavigationItems),
);
},
);
}),
},
),
_buildSection(
title: appLocalizations.settings,
content: _getSettingList(),

View File

@@ -35,7 +35,7 @@
"overrideDesc": "Override Proxy related config",
"allowLan": "AllowLan",
"allowLanDesc": "Allow access proxy through the LAN",
"tun": "Tun",
"tun": "Tun mode",
"tunDesc": "only effective in administrator mode",
"minimizeOnExit": "Minimize on exit",
"minimizeOnExitDesc": "Modify the default system exit event",
@@ -92,6 +92,7 @@
"delaySort": "Sort by delay",
"nameSort": "Sort by name",
"pleaseUploadFile": "Please upload file",
"pleaseUploadValidQrcode": "Please upload a valid QR code",
"blacklistMode": "Blacklist mode",
"whitelistMode": "Whitelist mode",
"filterSystemApp": "Filter system app",
@@ -119,5 +120,9 @@
"desc": "A multi-platform proxy client based on ClashMeta, simple and easy to use, open-source and ad-free.",
"startVpn": "Staring VPN...",
"stopVpn": "Stopping VPN...",
"discovery": "Discovery a new version"
"discovery": "Discovery a new version",
"compatible": "Compatibility mode",
"compatibleDesc": "Opening it will lose part of its application ability and gain the support of full amount of Clash.",
"notSelectedTip": "The current proxy group cannot be selected.",
"tip": "tip"
}

View File

@@ -35,7 +35,7 @@
"overrideDesc": "覆写代理相关配置",
"allowLan": "局域网代理",
"allowLanDesc": "允许通过局域网访问代理",
"tun": "虚拟网络设备",
"tun": "Tun模式",
"tunDesc": "仅在管理员模式生效",
"minimizeOnExit": "退出时最小化",
"minimizeOnExitDesc": "修改系统默认退出事件",
@@ -92,6 +92,7 @@
"delaySort": "按延迟排序",
"nameSort": "按名称排序",
"pleaseUploadFile": "请上传文件",
"pleaseUploadValidQrcode": "请上传有效的二维码",
"blacklistMode": "黑名单模式",
"whitelistMode": "白名单模式",
"filterSystemApp": "过滤系统应用",
@@ -119,5 +120,9 @@
"desc": "基于ClashMeta的多平台代理客户端简单易用开源无广告。",
"startVpn": "正在启动VPN...",
"stopVpn": "正在停止VPN...",
"discovery": "发现新版本"
"discovery": "发现新版本",
"compatible": "兼容模式",
"compatibleDesc": "开启将失去部分应用能力获得全量的Clash的支持",
"notSelectedTip": "当前代理组无法选中",
"tip": "提示"
}

View File

@@ -56,6 +56,10 @@ class MessageLookup extends MessageLookupByLibrary {
"cancelSelectAll":
MessageLookupByLibrary.simpleMessage("Cancel select all"),
"checkUpdate": MessageLookupByLibrary.simpleMessage("Check update"),
"compatible":
MessageLookupByLibrary.simpleMessage("Compatibility mode"),
"compatibleDesc": MessageLookupByLibrary.simpleMessage(
"Opening it will lose part of its application ability and gain the support of full amount of Clash."),
"confirm": MessageLookupByLibrary.simpleMessage("Confirm"),
"core": MessageLookupByLibrary.simpleMessage("Core"),
"coreInfo": MessageLookupByLibrary.simpleMessage("Core info"),
@@ -112,6 +116,8 @@ class MessageLookup extends MessageLookupByLibrary {
"noProxy": MessageLookupByLibrary.simpleMessage("No proxy"),
"noProxyDesc": MessageLookupByLibrary.simpleMessage(
"Please create a profile or add a valid profile"),
"notSelectedTip": MessageLookupByLibrary.simpleMessage(
"The current proxy group cannot be selected."),
"nullCoreInfoDesc":
MessageLookupByLibrary.simpleMessage("Unable to obtain core info"),
"nullLogsDesc": MessageLookupByLibrary.simpleMessage("No logs"),
@@ -124,6 +130,8 @@ class MessageLookup extends MessageLookupByLibrary {
"Override Proxy related config"),
"pleaseUploadFile":
MessageLookupByLibrary.simpleMessage("Please upload file"),
"pleaseUploadValidQrcode": MessageLookupByLibrary.simpleMessage(
"Please upload a valid QR code"),
"port": MessageLookupByLibrary.simpleMessage("Port"),
"preview": MessageLookupByLibrary.simpleMessage("Preview"),
"profile": MessageLookupByLibrary.simpleMessage("Profile"),
@@ -169,9 +177,10 @@ class MessageLookup extends MessageLookupByLibrary {
"themeDesc": MessageLookupByLibrary.simpleMessage(
"Set dark mode,adjust the color"),
"themeMode": MessageLookupByLibrary.simpleMessage("Theme mode"),
"tip": MessageLookupByLibrary.simpleMessage("tip"),
"tools": MessageLookupByLibrary.simpleMessage("Tools"),
"trafficUsage": MessageLookupByLibrary.simpleMessage("Traffic usage"),
"tun": MessageLookupByLibrary.simpleMessage("Tun"),
"tun": MessageLookupByLibrary.simpleMessage("Tun mode"),
"tunDesc": MessageLookupByLibrary.simpleMessage(
"only effective in administrator mode"),
"unableToUpdateCurrentProfileDesc":

View File

@@ -49,6 +49,9 @@ class MessageLookup extends MessageLookupByLibrary {
MessageLookupByLibrary.simpleMessage("取消过滤系统应用"),
"cancelSelectAll": MessageLookupByLibrary.simpleMessage("取消全选"),
"checkUpdate": MessageLookupByLibrary.simpleMessage("检查更新"),
"compatible": MessageLookupByLibrary.simpleMessage("兼容模式"),
"compatibleDesc":
MessageLookupByLibrary.simpleMessage("开启将失去部分应用能力获得全量的Clash的支持"),
"confirm": MessageLookupByLibrary.simpleMessage("确定"),
"core": MessageLookupByLibrary.simpleMessage("内核"),
"coreInfo": MessageLookupByLibrary.simpleMessage("内核信息"),
@@ -97,6 +100,7 @@ class MessageLookup extends MessageLookupByLibrary {
"noProxy": MessageLookupByLibrary.simpleMessage("暂无代理"),
"noProxyDesc":
MessageLookupByLibrary.simpleMessage("请创建配置文件或者添加有效配置文件"),
"notSelectedTip": MessageLookupByLibrary.simpleMessage("当前代理组无法选中"),
"nullCoreInfoDesc": MessageLookupByLibrary.simpleMessage("无法获取内核信息"),
"nullLogsDesc": MessageLookupByLibrary.simpleMessage("暂无日志"),
"nullProfileDesc":
@@ -106,6 +110,8 @@ class MessageLookup extends MessageLookupByLibrary {
"override": MessageLookupByLibrary.simpleMessage("覆写"),
"overrideDesc": MessageLookupByLibrary.simpleMessage("覆写代理相关配置"),
"pleaseUploadFile": MessageLookupByLibrary.simpleMessage("请上传文件"),
"pleaseUploadValidQrcode":
MessageLookupByLibrary.simpleMessage("请上传有效的二维码"),
"port": MessageLookupByLibrary.simpleMessage("端口"),
"preview": MessageLookupByLibrary.simpleMessage("预览"),
"profile": MessageLookupByLibrary.simpleMessage("配置"),
@@ -146,9 +152,10 @@ class MessageLookup extends MessageLookupByLibrary {
"themeColor": MessageLookupByLibrary.simpleMessage("主题色彩"),
"themeDesc": MessageLookupByLibrary.simpleMessage("设置深色模式,调整色彩"),
"themeMode": MessageLookupByLibrary.simpleMessage("主题模式"),
"tip": MessageLookupByLibrary.simpleMessage("提示"),
"tools": MessageLookupByLibrary.simpleMessage("工具"),
"trafficUsage": MessageLookupByLibrary.simpleMessage("流量统计"),
"tun": MessageLookupByLibrary.simpleMessage("虚拟网络设备"),
"tun": MessageLookupByLibrary.simpleMessage("Tun模式"),
"tunDesc": MessageLookupByLibrary.simpleMessage("仅在管理员模式生效"),
"unableToUpdateCurrentProfileDesc":
MessageLookupByLibrary.simpleMessage("无法更新当前配置文件"),

View File

@@ -410,10 +410,10 @@ class AppLocalizations {
);
}
/// `Tun`
/// `Tun mode`
String get tun {
return Intl.message(
'Tun',
'Tun mode',
name: 'tun',
desc: '',
args: [],
@@ -980,6 +980,16 @@ class AppLocalizations {
);
}
/// `Please upload a valid QR code`
String get pleaseUploadValidQrcode {
return Intl.message(
'Please upload a valid QR code',
name: 'pleaseUploadValidQrcode',
desc: '',
args: [],
);
}
/// `Blacklist mode`
String get blacklistMode {
return Intl.message(
@@ -1259,6 +1269,46 @@ class AppLocalizations {
args: [],
);
}
/// `Compatibility mode`
String get compatible {
return Intl.message(
'Compatibility mode',
name: 'compatible',
desc: '',
args: [],
);
}
/// `Opening it will lose part of its application ability and gain the support of full amount of Clash.`
String get compatibleDesc {
return Intl.message(
'Opening it will lose part of its application ability and gain the support of full amount of Clash.',
name: 'compatibleDesc',
desc: '',
args: [],
);
}
/// `The current proxy group cannot be selected.`
String get notSelectedTip {
return Intl.message(
'The current proxy group cannot be selected.',
name: 'notSelectedTip',
desc: '',
args: [],
);
}
/// `tip`
String get tip {
return Intl.message(
'tip',
name: 'tip',
desc: '',
args: [],
);
}
}
class AppLocalizationDelegate extends LocalizationsDelegate<AppLocalizations> {

View File

@@ -17,7 +17,11 @@ Future<void> main() async {
await window?.init();
final config = await preferences.getConfig() ?? Config();
final clashConfig = await preferences.getClashConfig() ?? ClashConfig();
final appState = AppState();
final appState = AppState(
mode: clashConfig.mode,
isCompatible: config.isCompatible,
selectedMap: config.currentSelectedMap,
);
await globalState.init(
appState: appState,
config: config,
@@ -41,7 +45,11 @@ Future<void> vpnService() async {
WidgetsFlutterBinding.ensureInitialized();
final config = await preferences.getConfig() ?? Config();
final clashConfig = await preferences.getClashConfig() ?? ClashConfig();
final appState = AppState();
final appState = AppState(
mode: clashConfig.mode,
isCompatible: config.isCompatible,
selectedMap: config.currentSelectedMap,
);
clashMessage.addListener(ClashMessageListenerWithVpn(onTun: (String fd) {
proxyManager.setProtect(
int.parse(fd),
@@ -54,7 +62,7 @@ Future<void> vpnService() async {
);
final appLocalizations = await AppLocalizations.load(
Other.getLocaleForString(config.locale) ??
other.getLocaleForString(config.locale) ??
WidgetsBinding.instance.platformDispatcher.locale,
);

View File

@@ -5,33 +5,47 @@ import 'ffi.dart';
import 'log.dart';
import 'navigation.dart';
import 'package.dart';
import 'profile.dart';
import 'proxy.dart';
import 'system_color_scheme.dart';
import 'traffic.dart';
import 'version.dart';
typedef DelayMap = Map<String, int?>;
class AppState with ChangeNotifier {
List<NavigationItem> _navigationItems;
int? _runTime;
bool _isInit;
DelayMap _delayMap;
VersionInfo? _versionInfo;
List<Traffic> _traffics;
List<Log> _logs;
List<Package> _packages;
String _currentLabel;
SystemColorSchemes _systemColorSchemes;
num _sortNum;
Mode _mode;
DelayMap _delayMap;
SelectedMap _selectedMap;
bool _isCompatible;
List<Group> _groups;
AppState()
: _navigationItems = [],
_delayMap = {},
AppState({
required Mode mode,
required bool isCompatible,
required SelectedMap selectedMap,
}) : _navigationItems = [],
_isInit = false,
_currentLabel = "dashboard",
_traffics = [],
_logs = [],
_groups = [],
_selectedMap = selectedMap,
_packages = [],
_sortNum = 0,
_mode = mode,
_delayMap = {},
_groups = [],
_isCompatible = isCompatible,
_systemColorSchemes = SystemColorSchemes();
String get currentLabel => _currentLabel;
@@ -70,20 +84,38 @@ class AppState with ChangeNotifier {
}
}
DelayMap get delayMap => _delayMap;
set delayMap(DelayMap value) {
if (_delayMap != value) {
_delayMap = value;
notifyListeners();
String getDesc(String type, String? proxyName) {
final groupTypeNamesList = GroupType.values.map((e) => e.name).toList();
if (!groupTypeNamesList.contains(type)) {
return type;
} else {
final index = groups.indexWhere((element) => element.name == proxyName);
if (index == -1) return type;
return "$type(${groups[index].now})";
}
}
setDelay(Delay delay) {
if (_delayMap[delay.name] != delay.value) {
_delayMap = Map.from(_delayMap)..[delay.name] = delay.value;
notifyListeners();
String? getRealProxyName(String? proxyName) {
if (proxyName == null) return null;
final index = groups.indexWhere((element) => element.name == proxyName);
if (index == -1) return proxyName;
final group = groups[index];
return getRealProxyName(selectedMap.containsKey(proxyName)
? selectedMap[proxyName]
: group.now);
}
String? get showProxyName {
if (currentGroups.isEmpty) {
return UsedProxy.DIRECT.name;
}
final firstGroup = currentGroups.first;
final firstGroupName = firstGroup.name;
return selectedMap[firstGroupName] ?? firstGroup.now;
}
int? getDelay(String? proxyName) {
return _delayMap[getRealProxyName(proxyName)];
}
VersionInfo? get versionInfo => _versionInfo;
@@ -144,55 +176,101 @@ class AppState with ChangeNotifier {
List<Group> get groups => _groups;
set groups(List<Group> value) {
if (_groups != value) {
if (!const ListEquality<Group>().equals(_groups, value)) {
_groups = value;
notifyListeners();
}
}
List<Group> getCurrentGroups(Mode mode) {
num get sortNum => _sortNum;
set sortNum(num value) {
if (_sortNum != value) {
_sortNum = value;
notifyListeners();
}
}
Mode get mode => _mode;
set mode(Mode value) {
if (_mode != value) {
_mode = value;
notifyListeners();
}
}
// String? get currentProxyName {
// if (mode == Mode.direct) return UsedProxy.DIRECT.name;
// if (_currentProxyName != null) return _currentProxyName!;
// return currentGroup?.now;
// }
//
// set currentProxyName(String? value) {
// if (_currentProxyName != value) {
// _currentProxyName = value;
// notifyListeners();
// }
// }
bool get isCompatible {
return _isCompatible;
}
set isCompatible(bool value) {
if (_isCompatible != value) {
_isCompatible = value;
notifyListeners();
}
}
SelectedMap get selectedMap {
return _selectedMap;
}
set selectedMap(SelectedMap value) {
if (!const MapEquality<String, String>().equals(_selectedMap, value)) {
_selectedMap = value;
notifyListeners();
}
}
List<Group> get currentGroups {
switch (mode) {
case Mode.direct:
return [];
case Mode.global:
return groups
.where((element) => element.name == UsedProxy.GLOBAL.name)
.where((element) => element.name == GroupName.GLOBAL.name)
.toList();
case Mode.rule:
return groups
.where((element) => element.name != UsedProxy.GLOBAL.name)
.where((element) => element.name != GroupName.GLOBAL.name)
.toList();
}
}
String? getCurrentGroupNameWithGroups(
List<Group> groups,
String? groupName,
Mode mode,
) {
switch (mode) {
case Mode.direct:
return null;
case Mode.global:
return UsedProxy.GLOBAL.name;
case Mode.rule:
return groupName ?? (groups.isNotEmpty ? groups.first.name : null);
DelayMap get delayMap {
return _delayMap;
}
set delayMap(DelayMap value) {
if (!const MapEquality<String, int?>().equals(_delayMap, value)) {
_delayMap = value;
notifyListeners();
}
}
String? getCurrentGroupName(String? groupName, Mode mode) {
final currentGroups = getCurrentGroups(mode);
return getCurrentGroupNameWithGroups(currentGroups, groupName, mode);
setDelay(Delay delay) {
if (_delayMap[delay.name] != delay.value) {
_delayMap = Map.from(_delayMap)..[delay.name] = delay.value;
notifyListeners();
}
}
String? getCurrentProxyName(String? proxyName, Mode mode) {
final currentGroups = getCurrentGroups(mode);
switch (mode) {
case Mode.direct:
return UsedProxy.DIRECT.name;
case Mode.global || Mode.rule:
return proxyName ??
(currentGroups.isNotEmpty ? currentGroups.first.now : null);
}
Group? getGroupWithName(String groupName) {
final index =
currentGroups.indexWhere((element) => element.name == groupName);
return index != -1 ? currentGroups[index] : null;
}
}

View File

@@ -1,37 +1,28 @@
// ignore_for_file: invalid_annotation_target
import 'package:fl_clash/common/common.dart';
import 'package:fl_clash/common/constant.dart';
import 'package:flutter/material.dart';
import 'package:json_annotation/json_annotation.dart';
import 'package:freezed_annotation/freezed_annotation.dart';
import '../enum/enum.dart';
part 'generated/clash_config.g.dart';
@JsonSerializable()
class Tun {
bool enable;
String device;
TunStack stack;
@JsonKey(name: "dns-hijack")
List<String> dnsHijack;
part 'generated/clash_config.freezed.dart';
Tun() : enable = false,
stack = TunStack.gvisor,
dnsHijack = ["any:53"],
device = appConstant.name;
factory Tun.fromJson(Map<String, dynamic> json) {
return _$TunFromJson(json);
}
@freezed
class Tun with _$Tun {
const factory Tun({
@Default(false) bool enable,
@Default(appName) String device,
@Default(TunStack.gvisor) TunStack stack,
@JsonKey(name: "dns-hijack") @Default(["any:53"])
List<String> dnsHijack,
}) = _Tun;
Map<String, dynamic> toJson() {
return _$TunToJson(this);
}
// Tun copyWith({bool? enable, int? fileDescriptor}) {
// return Tun(
// enable: enable ?? this.enable,
// );
// }
factory Tun.fromJson(Map<String, Object?> json) => _$TunFromJson(json);
}
@JsonSerializable()
@@ -137,7 +128,7 @@ class ClashConfig extends ChangeNotifier {
_mode = mode ?? Mode.rule,
_allowLan = allowLan ?? false,
_logLevel = logLevel ?? LogLevel.info,
_tun = tun ?? Tun(),
_tun = tun ?? const Tun(),
_dns = dns ?? Dns(),
_rules = rules ?? [];
@@ -225,4 +216,4 @@ class ClashConfig extends ChangeNotifier {
allowLan: allowLan,
);
}
}
}

View File

@@ -61,6 +61,7 @@ class AccessControl {
@JsonSerializable()
class Config extends ChangeNotifier {
List<Profile> _profiles;
bool _isCompatible;
String? _currentProfileId;
bool _autoLaunch;
bool _silentLaunch;
@@ -82,6 +83,7 @@ class Config extends ChangeNotifier {
_autoRun = false,
_themeMode = ThemeMode.system,
_openLog = false,
_isCompatible = false,
_primaryColor = appConstant.defaultPrimaryColor.value,
_proxiesSortType = ProxiesSortType.none,
_isMinimizeOnExit = true,
@@ -110,7 +112,7 @@ class Config extends ChangeNotifier {
(element) => element.label == label && element.id != id) !=
-1;
if (hasDup) {
return _getLabel(Other.getOverwriteLabel(label!), id);
return _getLabel(other.getOverwriteLabel(label!), id);
} else {
return label;
}
@@ -159,9 +161,18 @@ class Config extends ChangeNotifier {
}
}
String? get currentProxyName => currentProfile?.proxyName;
String? get currentGroupName => currentProfile?.groupName;
SelectedMap get currentSelectedMap {
return currentProfile?.selectedMap ?? {};
}
updateCurrentSelectedMap(String groupName, String proxyName) {
if (currentProfile?.selectedMap[groupName] != proxyName) {
currentProfile?.selectedMap = Map.from(currentProfile?.selectedMap ?? {})
..[groupName] = proxyName;
notifyListeners();
}
}
@JsonKey(defaultValue: false)
bool get autoLaunch {
@@ -289,6 +300,18 @@ class Config extends ChangeNotifier {
}
}
@JsonKey(defaultValue: false)
bool get isCompatible {
return _isCompatible;
}
set isCompatible(bool value) {
if (_isCompatible != value) {
_isCompatible = value;
notifyListeners();
}
}
update() {
notifyListeners();
}

View File

@@ -13,7 +13,8 @@ class UpdateConfigParams with _$UpdateConfigParams {
const factory UpdateConfigParams({
@JsonKey(name: "profile-path") String? profilePath,
required ClashConfig config,
@JsonKey(name: "is-patch") bool? isPatch,
@JsonKey(name: "is-patch") required bool isPatch,
@JsonKey(name: "is-compatible") required bool isCompatible,
}) = _UpdateConfigParams;
factory UpdateConfigParams.fromJson(Map<String, Object?> json) =>
@@ -52,6 +53,16 @@ class Delay with _$Delay {
factory Delay.fromJson(Map<String, Object?> json) => _$DelayFromJson(json);
}
@freezed
class Now with _$Now {
const factory Now({
required String name,
required String value,
}) = _Now;
factory Now.fromJson(Map<String, Object?> json) => _$NowFromJson(json);
}
@freezed
class Process with _$Process {
const factory Process({

View File

@@ -0,0 +1,222 @@
// coverage:ignore-file
// GENERATED CODE - DO NOT MODIFY BY HAND
// ignore_for_file: type=lint
// ignore_for_file: unused_element, deprecated_member_use, deprecated_member_use_from_same_package, use_function_type_syntax_for_parameters, unnecessary_const, avoid_init_to_null, invalid_override_different_default_values_named, prefer_expression_function_bodies, annotate_overrides, invalid_annotation_target, unnecessary_question_mark
part of '../clash_config.dart';
// **************************************************************************
// FreezedGenerator
// **************************************************************************
T _$identity<T>(T value) => value;
final _privateConstructorUsedError = UnsupportedError(
'It seems like you constructed your class using `MyClass._()`. This constructor is only meant to be used by freezed and you are not supposed to need it nor use it.\nPlease check the documentation here for more information: https://github.com/rrousselGit/freezed#adding-getters-and-methods-to-our-models');
Tun _$TunFromJson(Map<String, dynamic> json) {
return _Tun.fromJson(json);
}
/// @nodoc
mixin _$Tun {
bool get enable => throw _privateConstructorUsedError;
String get device => throw _privateConstructorUsedError;
TunStack get stack => throw _privateConstructorUsedError;
@JsonKey(name: "dns-hijack")
List<String> get dnsHijack => throw _privateConstructorUsedError;
Map<String, dynamic> toJson() => throw _privateConstructorUsedError;
@JsonKey(ignore: true)
$TunCopyWith<Tun> get copyWith => throw _privateConstructorUsedError;
}
/// @nodoc
abstract class $TunCopyWith<$Res> {
factory $TunCopyWith(Tun value, $Res Function(Tun) then) =
_$TunCopyWithImpl<$Res, Tun>;
@useResult
$Res call(
{bool enable,
String device,
TunStack stack,
@JsonKey(name: "dns-hijack") List<String> dnsHijack});
}
/// @nodoc
class _$TunCopyWithImpl<$Res, $Val extends Tun> implements $TunCopyWith<$Res> {
_$TunCopyWithImpl(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? device = null,
Object? stack = null,
Object? dnsHijack = null,
}) {
return _then(_value.copyWith(
enable: null == enable
? _value.enable
: enable // ignore: cast_nullable_to_non_nullable
as bool,
device: null == device
? _value.device
: device // ignore: cast_nullable_to_non_nullable
as String,
stack: null == stack
? _value.stack
: stack // ignore: cast_nullable_to_non_nullable
as TunStack,
dnsHijack: null == dnsHijack
? _value.dnsHijack
: dnsHijack // ignore: cast_nullable_to_non_nullable
as List<String>,
) as $Val);
}
}
/// @nodoc
abstract class _$$TunImplCopyWith<$Res> implements $TunCopyWith<$Res> {
factory _$$TunImplCopyWith(_$TunImpl value, $Res Function(_$TunImpl) then) =
__$$TunImplCopyWithImpl<$Res>;
@override
@useResult
$Res call(
{bool enable,
String device,
TunStack stack,
@JsonKey(name: "dns-hijack") List<String> dnsHijack});
}
/// @nodoc
class __$$TunImplCopyWithImpl<$Res> extends _$TunCopyWithImpl<$Res, _$TunImpl>
implements _$$TunImplCopyWith<$Res> {
__$$TunImplCopyWithImpl(_$TunImpl _value, $Res Function(_$TunImpl) _then)
: super(_value, _then);
@pragma('vm:prefer-inline')
@override
$Res call({
Object? enable = null,
Object? device = null,
Object? stack = null,
Object? dnsHijack = null,
}) {
return _then(_$TunImpl(
enable: null == enable
? _value.enable
: enable // ignore: cast_nullable_to_non_nullable
as bool,
device: null == device
? _value.device
: device // ignore: cast_nullable_to_non_nullable
as String,
stack: null == stack
? _value.stack
: stack // ignore: cast_nullable_to_non_nullable
as TunStack,
dnsHijack: null == dnsHijack
? _value._dnsHijack
: dnsHijack // ignore: cast_nullable_to_non_nullable
as List<String>,
));
}
}
/// @nodoc
@JsonSerializable()
class _$TunImpl implements _Tun {
const _$TunImpl(
{this.enable = false,
this.device = appName,
this.stack = TunStack.gvisor,
@JsonKey(name: "dns-hijack")
final List<String> dnsHijack = const ["any:53"]})
: _dnsHijack = dnsHijack;
factory _$TunImpl.fromJson(Map<String, dynamic> json) =>
_$$TunImplFromJson(json);
@override
@JsonKey()
final bool enable;
@override
@JsonKey()
final String device;
@override
@JsonKey()
final TunStack stack;
final List<String> _dnsHijack;
@override
@JsonKey(name: "dns-hijack")
List<String> get dnsHijack {
if (_dnsHijack is EqualUnmodifiableListView) return _dnsHijack;
// ignore: implicit_dynamic_type
return EqualUnmodifiableListView(_dnsHijack);
}
@override
String toString() {
return 'Tun(enable: $enable, device: $device, stack: $stack, dnsHijack: $dnsHijack)';
}
@override
bool operator ==(Object other) {
return identical(this, other) ||
(other.runtimeType == runtimeType &&
other is _$TunImpl &&
(identical(other.enable, enable) || other.enable == enable) &&
(identical(other.device, device) || other.device == device) &&
(identical(other.stack, stack) || other.stack == stack) &&
const DeepCollectionEquality()
.equals(other._dnsHijack, _dnsHijack));
}
@JsonKey(ignore: true)
@override
int get hashCode => Object.hash(runtimeType, enable, device, stack,
const DeepCollectionEquality().hash(_dnsHijack));
@JsonKey(ignore: true)
@override
@pragma('vm:prefer-inline')
_$$TunImplCopyWith<_$TunImpl> get copyWith =>
__$$TunImplCopyWithImpl<_$TunImpl>(this, _$identity);
@override
Map<String, dynamic> toJson() {
return _$$TunImplToJson(
this,
);
}
}
abstract class _Tun implements Tun {
const factory _Tun(
{final bool enable,
final String device,
final TunStack stack,
@JsonKey(name: "dns-hijack") final List<String> dnsHijack}) = _$TunImpl;
factory _Tun.fromJson(Map<String, dynamic> json) = _$TunImpl.fromJson;
@override
bool get enable;
@override
String get device;
@override
TunStack get stack;
@override
@JsonKey(name: "dns-hijack")
List<String> get dnsHijack;
@override
@JsonKey(ignore: true)
_$$TunImplCopyWith<_$TunImpl> get copyWith =>
throw _privateConstructorUsedError;
}

View File

@@ -6,26 +6,6 @@ part of '../clash_config.dart';
// JsonSerializableGenerator
// **************************************************************************
Tun _$TunFromJson(Map<String, dynamic> json) => Tun()
..enable = json['enable'] as bool
..device = json['device'] as String
..stack = $enumDecode(_$TunStackEnumMap, json['stack'])
..dnsHijack =
(json['dns-hijack'] as List<dynamic>).map((e) => e as String).toList();
Map<String, dynamic> _$TunToJson(Tun instance) => <String, dynamic>{
'enable': instance.enable,
'device': instance.device,
'stack': _$TunStackEnumMap[instance.stack]!,
'dns-hijack': instance.dnsHijack,
};
const _$TunStackEnumMap = {
TunStack.gvisor: 'gvisor',
TunStack.system: 'system',
TunStack.mixed: 'mixed',
};
Dns _$DnsFromJson(Map<String, dynamic> json) => Dns()
..enable = json['enable'] as bool
..ipv6 = json['ipv6'] as bool
@@ -94,3 +74,27 @@ const _$LogLevelEnumMap = {
LogLevel.error: 'error',
LogLevel.silent: 'silent',
};
_$TunImpl _$$TunImplFromJson(Map<String, dynamic> json) => _$TunImpl(
enable: json['enable'] as bool? ?? false,
device: json['device'] as String? ?? appName,
stack: $enumDecodeNullable(_$TunStackEnumMap, json['stack']) ??
TunStack.gvisor,
dnsHijack: (json['dns-hijack'] as List<dynamic>?)
?.map((e) => e as String)
.toList() ??
const ["any:53"],
);
Map<String, dynamic> _$$TunImplToJson(_$TunImpl instance) => <String, dynamic>{
'enable': instance.enable,
'device': instance.device,
'stack': _$TunStackEnumMap[instance.stack]!,
'dns-hijack': instance.dnsHijack,
};
const _$TunStackEnumMap = {
TunStack.gvisor: 'gvisor',
TunStack.system: 'system',
TunStack.mixed: 'mixed',
};

View File

@@ -55,7 +55,8 @@ Config _$ConfigFromJson(Map<String, dynamic> json) => Config()
..isAccessControl = json['isAccessControl'] as bool? ?? false
..accessControl =
AccessControl.fromJson(json['accessControl'] as Map<String, dynamic>)
..isAnimateToPage = json['isAnimateToPage'] as bool? ?? true;
..isAnimateToPage = json['isAnimateToPage'] as bool? ?? true
..isCompatible = json['isCompatible'] as bool? ?? false;
Map<String, dynamic> _$ConfigToJson(Config instance) => <String, dynamic>{
'profiles': instance.profiles,
@@ -72,6 +73,7 @@ Map<String, dynamic> _$ConfigToJson(Config instance) => <String, dynamic>{
'isAccessControl': instance.isAccessControl,
'accessControl': instance.accessControl,
'isAnimateToPage': instance.isAnimateToPage,
'isCompatible': instance.isCompatible,
};
const _$ThemeModeEnumMap = {

View File

@@ -24,7 +24,9 @@ mixin _$UpdateConfigParams {
String? get profilePath => throw _privateConstructorUsedError;
ClashConfig get config => throw _privateConstructorUsedError;
@JsonKey(name: "is-patch")
bool? get isPatch => throw _privateConstructorUsedError;
bool get isPatch => throw _privateConstructorUsedError;
@JsonKey(name: "is-compatible")
bool get isCompatible => throw _privateConstructorUsedError;
Map<String, dynamic> toJson() => throw _privateConstructorUsedError;
@JsonKey(ignore: true)
@@ -41,7 +43,8 @@ abstract class $UpdateConfigParamsCopyWith<$Res> {
$Res call(
{@JsonKey(name: "profile-path") String? profilePath,
ClashConfig config,
@JsonKey(name: "is-patch") bool? isPatch});
@JsonKey(name: "is-patch") bool isPatch,
@JsonKey(name: "is-compatible") bool isCompatible});
}
/// @nodoc
@@ -59,7 +62,8 @@ class _$UpdateConfigParamsCopyWithImpl<$Res, $Val extends UpdateConfigParams>
$Res call({
Object? profilePath = freezed,
Object? config = null,
Object? isPatch = freezed,
Object? isPatch = null,
Object? isCompatible = null,
}) {
return _then(_value.copyWith(
profilePath: freezed == profilePath
@@ -70,10 +74,14 @@ class _$UpdateConfigParamsCopyWithImpl<$Res, $Val extends UpdateConfigParams>
? _value.config
: config // ignore: cast_nullable_to_non_nullable
as ClashConfig,
isPatch: freezed == isPatch
isPatch: null == isPatch
? _value.isPatch
: isPatch // ignore: cast_nullable_to_non_nullable
as bool?,
as bool,
isCompatible: null == isCompatible
? _value.isCompatible
: isCompatible // ignore: cast_nullable_to_non_nullable
as bool,
) as $Val);
}
}
@@ -89,7 +97,8 @@ abstract class _$$UpdateConfigParamsImplCopyWith<$Res>
$Res call(
{@JsonKey(name: "profile-path") String? profilePath,
ClashConfig config,
@JsonKey(name: "is-patch") bool? isPatch});
@JsonKey(name: "is-patch") bool isPatch,
@JsonKey(name: "is-compatible") bool isCompatible});
}
/// @nodoc
@@ -105,7 +114,8 @@ class __$$UpdateConfigParamsImplCopyWithImpl<$Res>
$Res call({
Object? profilePath = freezed,
Object? config = null,
Object? isPatch = freezed,
Object? isPatch = null,
Object? isCompatible = null,
}) {
return _then(_$UpdateConfigParamsImpl(
profilePath: freezed == profilePath
@@ -116,10 +126,14 @@ class __$$UpdateConfigParamsImplCopyWithImpl<$Res>
? _value.config
: config // ignore: cast_nullable_to_non_nullable
as ClashConfig,
isPatch: freezed == isPatch
isPatch: null == isPatch
? _value.isPatch
: isPatch // ignore: cast_nullable_to_non_nullable
as bool?,
as bool,
isCompatible: null == isCompatible
? _value.isCompatible
: isCompatible // ignore: cast_nullable_to_non_nullable
as bool,
));
}
}
@@ -130,7 +144,8 @@ class _$UpdateConfigParamsImpl implements _UpdateConfigParams {
const _$UpdateConfigParamsImpl(
{@JsonKey(name: "profile-path") this.profilePath,
required this.config,
@JsonKey(name: "is-patch") this.isPatch});
@JsonKey(name: "is-patch") required this.isPatch,
@JsonKey(name: "is-compatible") required this.isCompatible});
factory _$UpdateConfigParamsImpl.fromJson(Map<String, dynamic> json) =>
_$$UpdateConfigParamsImplFromJson(json);
@@ -142,11 +157,14 @@ class _$UpdateConfigParamsImpl implements _UpdateConfigParams {
final ClashConfig config;
@override
@JsonKey(name: "is-patch")
final bool? isPatch;
final bool isPatch;
@override
@JsonKey(name: "is-compatible")
final bool isCompatible;
@override
String toString() {
return 'UpdateConfigParams(profilePath: $profilePath, config: $config, isPatch: $isPatch)';
return 'UpdateConfigParams(profilePath: $profilePath, config: $config, isPatch: $isPatch, isCompatible: $isCompatible)';
}
@override
@@ -157,12 +175,15 @@ class _$UpdateConfigParamsImpl implements _UpdateConfigParams {
(identical(other.profilePath, profilePath) ||
other.profilePath == profilePath) &&
(identical(other.config, config) || other.config == config) &&
(identical(other.isPatch, isPatch) || other.isPatch == isPatch));
(identical(other.isPatch, isPatch) || other.isPatch == isPatch) &&
(identical(other.isCompatible, isCompatible) ||
other.isCompatible == isCompatible));
}
@JsonKey(ignore: true)
@override
int get hashCode => Object.hash(runtimeType, profilePath, config, isPatch);
int get hashCode =>
Object.hash(runtimeType, profilePath, config, isPatch, isCompatible);
@JsonKey(ignore: true)
@override
@@ -183,7 +204,8 @@ abstract class _UpdateConfigParams implements UpdateConfigParams {
const factory _UpdateConfigParams(
{@JsonKey(name: "profile-path") final String? profilePath,
required final ClashConfig config,
@JsonKey(name: "is-patch") final bool? isPatch}) =
@JsonKey(name: "is-patch") required final bool isPatch,
@JsonKey(name: "is-compatible") required final bool isCompatible}) =
_$UpdateConfigParamsImpl;
factory _UpdateConfigParams.fromJson(Map<String, dynamic> json) =
@@ -196,7 +218,10 @@ abstract class _UpdateConfigParams implements UpdateConfigParams {
ClashConfig get config;
@override
@JsonKey(name: "is-patch")
bool? get isPatch;
bool get isPatch;
@override
@JsonKey(name: "is-compatible")
bool get isCompatible;
@override
@JsonKey(ignore: true)
_$$UpdateConfigParamsImplCopyWith<_$UpdateConfigParamsImpl> get copyWith =>
@@ -672,6 +697,151 @@ abstract class _Delay implements Delay {
throw _privateConstructorUsedError;
}
Now _$NowFromJson(Map<String, dynamic> json) {
return _Now.fromJson(json);
}
/// @nodoc
mixin _$Now {
String get name => throw _privateConstructorUsedError;
String get value => throw _privateConstructorUsedError;
Map<String, dynamic> toJson() => throw _privateConstructorUsedError;
@JsonKey(ignore: true)
$NowCopyWith<Now> get copyWith => throw _privateConstructorUsedError;
}
/// @nodoc
abstract class $NowCopyWith<$Res> {
factory $NowCopyWith(Now value, $Res Function(Now) then) =
_$NowCopyWithImpl<$Res, Now>;
@useResult
$Res call({String name, String value});
}
/// @nodoc
class _$NowCopyWithImpl<$Res, $Val extends Now> implements $NowCopyWith<$Res> {
_$NowCopyWithImpl(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? name = null,
Object? value = null,
}) {
return _then(_value.copyWith(
name: null == name
? _value.name
: name // ignore: cast_nullable_to_non_nullable
as String,
value: null == value
? _value.value
: value // ignore: cast_nullable_to_non_nullable
as String,
) as $Val);
}
}
/// @nodoc
abstract class _$$NowImplCopyWith<$Res> implements $NowCopyWith<$Res> {
factory _$$NowImplCopyWith(_$NowImpl value, $Res Function(_$NowImpl) then) =
__$$NowImplCopyWithImpl<$Res>;
@override
@useResult
$Res call({String name, String value});
}
/// @nodoc
class __$$NowImplCopyWithImpl<$Res> extends _$NowCopyWithImpl<$Res, _$NowImpl>
implements _$$NowImplCopyWith<$Res> {
__$$NowImplCopyWithImpl(_$NowImpl _value, $Res Function(_$NowImpl) _then)
: super(_value, _then);
@pragma('vm:prefer-inline')
@override
$Res call({
Object? name = null,
Object? value = null,
}) {
return _then(_$NowImpl(
name: null == name
? _value.name
: name // ignore: cast_nullable_to_non_nullable
as String,
value: null == value
? _value.value
: value // ignore: cast_nullable_to_non_nullable
as String,
));
}
}
/// @nodoc
@JsonSerializable()
class _$NowImpl implements _Now {
const _$NowImpl({required this.name, required this.value});
factory _$NowImpl.fromJson(Map<String, dynamic> json) =>
_$$NowImplFromJson(json);
@override
final String name;
@override
final String value;
@override
String toString() {
return 'Now(name: $name, value: $value)';
}
@override
bool operator ==(Object other) {
return identical(this, other) ||
(other.runtimeType == runtimeType &&
other is _$NowImpl &&
(identical(other.name, name) || other.name == name) &&
(identical(other.value, value) || other.value == value));
}
@JsonKey(ignore: true)
@override
int get hashCode => Object.hash(runtimeType, name, value);
@JsonKey(ignore: true)
@override
@pragma('vm:prefer-inline')
_$$NowImplCopyWith<_$NowImpl> get copyWith =>
__$$NowImplCopyWithImpl<_$NowImpl>(this, _$identity);
@override
Map<String, dynamic> toJson() {
return _$$NowImplToJson(
this,
);
}
}
abstract class _Now implements Now {
const factory _Now(
{required final String name, required final String value}) = _$NowImpl;
factory _Now.fromJson(Map<String, dynamic> json) = _$NowImpl.fromJson;
@override
String get name;
@override
String get value;
@override
@JsonKey(ignore: true)
_$$NowImplCopyWith<_$NowImpl> get copyWith =>
throw _privateConstructorUsedError;
}
Process _$ProcessFromJson(Map<String, dynamic> json) {
return _Process.fromJson(json);
}

View File

@@ -11,7 +11,8 @@ _$UpdateConfigParamsImpl _$$UpdateConfigParamsImplFromJson(
_$UpdateConfigParamsImpl(
profilePath: json['profile-path'] as String?,
config: ClashConfig.fromJson(json['config'] as Map<String, dynamic>),
isPatch: json['is-patch'] as bool?,
isPatch: json['is-patch'] as bool,
isCompatible: json['is-compatible'] as bool,
);
Map<String, dynamic> _$$UpdateConfigParamsImplToJson(
@@ -20,6 +21,7 @@ Map<String, dynamic> _$$UpdateConfigParamsImplToJson(
'profile-path': instance.profilePath,
'config': instance.config,
'is-patch': instance.isPatch,
'is-compatible': instance.isCompatible,
};
_$ChangeProxyParamsImpl _$$ChangeProxyParamsImplFromJson(
@@ -53,6 +55,7 @@ const _$MessageTypeEnumMap = {
MessageType.tun: 'tun',
MessageType.delay: 'delay',
MessageType.process: 'process',
MessageType.now: 'now',
};
_$DelayImpl _$$DelayImplFromJson(Map<String, dynamic> json) => _$DelayImpl(
@@ -66,6 +69,16 @@ Map<String, dynamic> _$$DelayImplToJson(_$DelayImpl instance) =>
'value': instance.value,
};
_$NowImpl _$$NowImplFromJson(Map<String, dynamic> json) => _$NowImpl(
name: json['name'] as String,
value: json['value'] as String,
);
Map<String, dynamic> _$$NowImplToJson(_$NowImpl instance) => <String, dynamic>{
'name': instance.name,
'value': instance.value,
};
_$ProcessImpl _$$ProcessImplFromJson(Map<String, dynamic> json) =>
_$ProcessImpl(
uid: (json['uid'] as num).toInt(),

View File

@@ -27,11 +27,13 @@ Profile _$ProfileFromJson(Map<String, dynamic> json) => Profile(
userInfo: json['userInfo'] == null
? null
: UserInfo.fromJson(json['userInfo'] as Map<String, dynamic>),
groupName: json['groupName'] as String?,
proxyName: json['proxyName'] as String?,
lastUpdateDate: json['lastUpdateDate'] == null
? null
: DateTime.parse(json['lastUpdateDate'] as String),
selectedMap: (json['selectedMap'] as Map<String, dynamic>?)?.map(
(k, e) => MapEntry(k, e as String),
),
autoUpdateDuration: json['autoUpdateDuration'] == null
? null
: Duration(microseconds: (json['autoUpdateDuration'] as num).toInt()),
@@ -41,11 +43,11 @@ Profile _$ProfileFromJson(Map<String, dynamic> json) => Profile(
Map<String, dynamic> _$ProfileToJson(Profile instance) => <String, dynamic>{
'id': instance.id,
'label': instance.label,
'groupName': instance.groupName,
'proxyName': instance.proxyName,
'url': instance.url,
'lastUpdateDate': instance.lastUpdateDate?.toIso8601String(),
'autoUpdateDuration': instance.autoUpdateDuration.inMicroseconds,
'userInfo': instance.userInfo,
'autoUpdate': instance.autoUpdate,
'selectedMap': instance.selectedMap,
};

View File

@@ -219,6 +219,7 @@ Proxy _$ProxyFromJson(Map<String, dynamic> json) {
mixin _$Proxy {
String get name => throw _privateConstructorUsedError;
String get type => throw _privateConstructorUsedError;
String? get now => throw _privateConstructorUsedError;
Map<String, dynamic> toJson() => throw _privateConstructorUsedError;
@JsonKey(ignore: true)
@@ -230,7 +231,7 @@ abstract class $ProxyCopyWith<$Res> {
factory $ProxyCopyWith(Proxy value, $Res Function(Proxy) then) =
_$ProxyCopyWithImpl<$Res, Proxy>;
@useResult
$Res call({String name, String type});
$Res call({String name, String type, String? now});
}
/// @nodoc
@@ -248,6 +249,7 @@ class _$ProxyCopyWithImpl<$Res, $Val extends Proxy>
$Res call({
Object? name = null,
Object? type = null,
Object? now = freezed,
}) {
return _then(_value.copyWith(
name: null == name
@@ -258,6 +260,10 @@ class _$ProxyCopyWithImpl<$Res, $Val extends Proxy>
? _value.type
: type // ignore: cast_nullable_to_non_nullable
as String,
now: freezed == now
? _value.now
: now // ignore: cast_nullable_to_non_nullable
as String?,
) as $Val);
}
}
@@ -269,7 +275,7 @@ abstract class _$$ProxyImplCopyWith<$Res> implements $ProxyCopyWith<$Res> {
__$$ProxyImplCopyWithImpl<$Res>;
@override
@useResult
$Res call({String name, String type});
$Res call({String name, String type, String? now});
}
/// @nodoc
@@ -285,6 +291,7 @@ class __$$ProxyImplCopyWithImpl<$Res>
$Res call({
Object? name = null,
Object? type = null,
Object? now = freezed,
}) {
return _then(_$ProxyImpl(
name: null == name
@@ -295,6 +302,10 @@ class __$$ProxyImplCopyWithImpl<$Res>
? _value.type
: type // ignore: cast_nullable_to_non_nullable
as String,
now: freezed == now
? _value.now
: now // ignore: cast_nullable_to_non_nullable
as String?,
));
}
}
@@ -302,21 +313,21 @@ class __$$ProxyImplCopyWithImpl<$Res>
/// @nodoc
@JsonSerializable()
class _$ProxyImpl implements _Proxy {
const _$ProxyImpl({this.name = "", this.type = ""});
const _$ProxyImpl({required this.name, required this.type, this.now});
factory _$ProxyImpl.fromJson(Map<String, dynamic> json) =>
_$$ProxyImplFromJson(json);
@override
@JsonKey()
final String name;
@override
@JsonKey()
final String type;
@override
final String? now;
@override
String toString() {
return 'Proxy(name: $name, type: $type)';
return 'Proxy(name: $name, type: $type, now: $now)';
}
@override
@@ -325,12 +336,13 @@ class _$ProxyImpl implements _Proxy {
(other.runtimeType == runtimeType &&
other is _$ProxyImpl &&
(identical(other.name, name) || other.name == name) &&
(identical(other.type, type) || other.type == type));
(identical(other.type, type) || other.type == type) &&
(identical(other.now, now) || other.now == now));
}
@JsonKey(ignore: true)
@override
int get hashCode => Object.hash(runtimeType, name, type);
int get hashCode => Object.hash(runtimeType, name, type, now);
@JsonKey(ignore: true)
@override
@@ -347,7 +359,10 @@ class _$ProxyImpl implements _Proxy {
}
abstract class _Proxy implements Proxy {
const factory _Proxy({final String name, final String type}) = _$ProxyImpl;
const factory _Proxy(
{required final String name,
required final String type,
final String? now}) = _$ProxyImpl;
factory _Proxy.fromJson(Map<String, dynamic> json) = _$ProxyImpl.fromJson;
@@ -356,6 +371,8 @@ abstract class _Proxy implements Proxy {
@override
String get type;
@override
String? get now;
@override
@JsonKey(ignore: true)
_$$ProxyImplCopyWith<_$ProxyImpl> get copyWith =>
throw _privateConstructorUsedError;

View File

@@ -31,12 +31,14 @@ const _$GroupTypeEnumMap = {
};
_$ProxyImpl _$$ProxyImplFromJson(Map<String, dynamic> json) => _$ProxyImpl(
name: json['name'] as String? ?? "",
type: json['type'] as String? ?? "",
name: json['name'] as String,
type: json['type'] as String,
now: json['now'] as String?,
);
Map<String, dynamic> _$$ProxyImplToJson(_$ProxyImpl instance) =>
<String, dynamic>{
'name': instance.name,
'type': instance.type,
'now': instance.now,
};

View File

@@ -349,7 +349,6 @@ abstract class _UpdateCurrentDelaySelectorState
mixin _$NetworkDetectionSelectorState {
String? get currentProxyName => throw _privateConstructorUsedError;
int? get delay => throw _privateConstructorUsedError;
bool get isInit => throw _privateConstructorUsedError;
@JsonKey(ignore: true)
$NetworkDetectionSelectorStateCopyWith<NetworkDetectionSelectorState>
@@ -364,7 +363,7 @@ abstract class $NetworkDetectionSelectorStateCopyWith<$Res> {
_$NetworkDetectionSelectorStateCopyWithImpl<$Res,
NetworkDetectionSelectorState>;
@useResult
$Res call({String? currentProxyName, int? delay, bool isInit});
$Res call({String? currentProxyName, int? delay});
}
/// @nodoc
@@ -383,7 +382,6 @@ class _$NetworkDetectionSelectorStateCopyWithImpl<$Res,
$Res call({
Object? currentProxyName = freezed,
Object? delay = freezed,
Object? isInit = null,
}) {
return _then(_value.copyWith(
currentProxyName: freezed == currentProxyName
@@ -394,10 +392,6 @@ class _$NetworkDetectionSelectorStateCopyWithImpl<$Res,
? _value.delay
: delay // ignore: cast_nullable_to_non_nullable
as int?,
isInit: null == isInit
? _value.isInit
: isInit // ignore: cast_nullable_to_non_nullable
as bool,
) as $Val);
}
}
@@ -411,7 +405,7 @@ abstract class _$$NetworkDetectionSelectorStateImplCopyWith<$Res>
__$$NetworkDetectionSelectorStateImplCopyWithImpl<$Res>;
@override
@useResult
$Res call({String? currentProxyName, int? delay, bool isInit});
$Res call({String? currentProxyName, int? delay});
}
/// @nodoc
@@ -429,7 +423,6 @@ class __$$NetworkDetectionSelectorStateImplCopyWithImpl<$Res>
$Res call({
Object? currentProxyName = freezed,
Object? delay = freezed,
Object? isInit = null,
}) {
return _then(_$NetworkDetectionSelectorStateImpl(
currentProxyName: freezed == currentProxyName
@@ -440,10 +433,6 @@ class __$$NetworkDetectionSelectorStateImplCopyWithImpl<$Res>
? _value.delay
: delay // ignore: cast_nullable_to_non_nullable
as int?,
isInit: null == isInit
? _value.isInit
: isInit // ignore: cast_nullable_to_non_nullable
as bool,
));
}
}
@@ -453,20 +442,16 @@ class __$$NetworkDetectionSelectorStateImplCopyWithImpl<$Res>
class _$NetworkDetectionSelectorStateImpl
implements _NetworkDetectionSelectorState {
const _$NetworkDetectionSelectorStateImpl(
{required this.currentProxyName,
required this.delay,
required this.isInit});
{required this.currentProxyName, required this.delay});
@override
final String? currentProxyName;
@override
final int? delay;
@override
final bool isInit;
@override
String toString() {
return 'NetworkDetectionSelectorState(currentProxyName: $currentProxyName, delay: $delay, isInit: $isInit)';
return 'NetworkDetectionSelectorState(currentProxyName: $currentProxyName, delay: $delay)';
}
@override
@@ -476,12 +461,11 @@ class _$NetworkDetectionSelectorStateImpl
other is _$NetworkDetectionSelectorStateImpl &&
(identical(other.currentProxyName, currentProxyName) ||
other.currentProxyName == currentProxyName) &&
(identical(other.delay, delay) || other.delay == delay) &&
(identical(other.isInit, isInit) || other.isInit == isInit));
(identical(other.delay, delay) || other.delay == delay));
}
@override
int get hashCode => Object.hash(runtimeType, currentProxyName, delay, isInit);
int get hashCode => Object.hash(runtimeType, currentProxyName, delay);
@JsonKey(ignore: true)
@override
@@ -496,16 +480,13 @@ abstract class _NetworkDetectionSelectorState
implements NetworkDetectionSelectorState {
const factory _NetworkDetectionSelectorState(
{required final String? currentProxyName,
required final int? delay,
required final bool isInit}) = _$NetworkDetectionSelectorStateImpl;
required final int? delay}) = _$NetworkDetectionSelectorStateImpl;
@override
String? get currentProxyName;
@override
int? get delay;
@override
bool get isInit;
@override
@JsonKey(ignore: true)
_$$NetworkDetectionSelectorStateImplCopyWith<
_$NetworkDetectionSelectorStateImpl>
@@ -1741,10 +1722,133 @@ abstract class _HomeNavigationSelectorState
get copyWith => throw _privateConstructorUsedError;
}
/// @nodoc
mixin _$ProxiesCardSelectorState {
bool get isSelected => throw _privateConstructorUsedError;
@JsonKey(ignore: true)
$ProxiesCardSelectorStateCopyWith<ProxiesCardSelectorState> get copyWith =>
throw _privateConstructorUsedError;
}
/// @nodoc
abstract class $ProxiesCardSelectorStateCopyWith<$Res> {
factory $ProxiesCardSelectorStateCopyWith(ProxiesCardSelectorState value,
$Res Function(ProxiesCardSelectorState) then) =
_$ProxiesCardSelectorStateCopyWithImpl<$Res, ProxiesCardSelectorState>;
@useResult
$Res call({bool isSelected});
}
/// @nodoc
class _$ProxiesCardSelectorStateCopyWithImpl<$Res,
$Val extends ProxiesCardSelectorState>
implements $ProxiesCardSelectorStateCopyWith<$Res> {
_$ProxiesCardSelectorStateCopyWithImpl(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? isSelected = null,
}) {
return _then(_value.copyWith(
isSelected: null == isSelected
? _value.isSelected
: isSelected // ignore: cast_nullable_to_non_nullable
as bool,
) as $Val);
}
}
/// @nodoc
abstract class _$$ProxiesCardSelectorStateImplCopyWith<$Res>
implements $ProxiesCardSelectorStateCopyWith<$Res> {
factory _$$ProxiesCardSelectorStateImplCopyWith(
_$ProxiesCardSelectorStateImpl value,
$Res Function(_$ProxiesCardSelectorStateImpl) then) =
__$$ProxiesCardSelectorStateImplCopyWithImpl<$Res>;
@override
@useResult
$Res call({bool isSelected});
}
/// @nodoc
class __$$ProxiesCardSelectorStateImplCopyWithImpl<$Res>
extends _$ProxiesCardSelectorStateCopyWithImpl<$Res,
_$ProxiesCardSelectorStateImpl>
implements _$$ProxiesCardSelectorStateImplCopyWith<$Res> {
__$$ProxiesCardSelectorStateImplCopyWithImpl(
_$ProxiesCardSelectorStateImpl _value,
$Res Function(_$ProxiesCardSelectorStateImpl) _then)
: super(_value, _then);
@pragma('vm:prefer-inline')
@override
$Res call({
Object? isSelected = null,
}) {
return _then(_$ProxiesCardSelectorStateImpl(
isSelected: null == isSelected
? _value.isSelected
: isSelected // ignore: cast_nullable_to_non_nullable
as bool,
));
}
}
/// @nodoc
class _$ProxiesCardSelectorStateImpl implements _ProxiesCardSelectorState {
const _$ProxiesCardSelectorStateImpl({required this.isSelected});
@override
final bool isSelected;
@override
String toString() {
return 'ProxiesCardSelectorState(isSelected: $isSelected)';
}
@override
bool operator ==(Object other) {
return identical(this, other) ||
(other.runtimeType == runtimeType &&
other is _$ProxiesCardSelectorStateImpl &&
(identical(other.isSelected, isSelected) ||
other.isSelected == isSelected));
}
@override
int get hashCode => Object.hash(runtimeType, isSelected);
@JsonKey(ignore: true)
@override
@pragma('vm:prefer-inline')
_$$ProxiesCardSelectorStateImplCopyWith<_$ProxiesCardSelectorStateImpl>
get copyWith => __$$ProxiesCardSelectorStateImplCopyWithImpl<
_$ProxiesCardSelectorStateImpl>(this, _$identity);
}
abstract class _ProxiesCardSelectorState implements ProxiesCardSelectorState {
const factory _ProxiesCardSelectorState({required final bool isSelected}) =
_$ProxiesCardSelectorStateImpl;
@override
bool get isSelected;
@override
@JsonKey(ignore: true)
_$$ProxiesCardSelectorStateImplCopyWith<_$ProxiesCardSelectorStateImpl>
get copyWith => throw _privateConstructorUsedError;
}
/// @nodoc
mixin _$ProxiesSelectorState {
int get currentIndex => throw _privateConstructorUsedError;
List<Group> get groups => throw _privateConstructorUsedError;
List<String> get groupNames => throw _privateConstructorUsedError;
@JsonKey(ignore: true)
$ProxiesSelectorStateCopyWith<ProxiesSelectorState> get copyWith =>
@@ -1757,7 +1861,7 @@ abstract class $ProxiesSelectorStateCopyWith<$Res> {
$Res Function(ProxiesSelectorState) then) =
_$ProxiesSelectorStateCopyWithImpl<$Res, ProxiesSelectorState>;
@useResult
$Res call({int currentIndex, List<Group> groups});
$Res call({List<String> groupNames});
}
/// @nodoc
@@ -1774,18 +1878,13 @@ class _$ProxiesSelectorStateCopyWithImpl<$Res,
@pragma('vm:prefer-inline')
@override
$Res call({
Object? currentIndex = null,
Object? groups = null,
Object? groupNames = null,
}) {
return _then(_value.copyWith(
currentIndex: null == currentIndex
? _value.currentIndex
: currentIndex // ignore: cast_nullable_to_non_nullable
as int,
groups: null == groups
? _value.groups
: groups // ignore: cast_nullable_to_non_nullable
as List<Group>,
groupNames: null == groupNames
? _value.groupNames
: groupNames // ignore: cast_nullable_to_non_nullable
as List<String>,
) as $Val);
}
}
@@ -1798,7 +1897,7 @@ abstract class _$$ProxiesSelectorStateImplCopyWith<$Res>
__$$ProxiesSelectorStateImplCopyWithImpl<$Res>;
@override
@useResult
$Res call({int currentIndex, List<Group> groups});
$Res call({List<String> groupNames});
}
/// @nodoc
@@ -1812,18 +1911,13 @@ class __$$ProxiesSelectorStateImplCopyWithImpl<$Res>
@pragma('vm:prefer-inline')
@override
$Res call({
Object? currentIndex = null,
Object? groups = null,
Object? groupNames = null,
}) {
return _then(_$ProxiesSelectorStateImpl(
currentIndex: null == currentIndex
? _value.currentIndex
: currentIndex // ignore: cast_nullable_to_non_nullable
as int,
groups: null == groups
? _value._groups
: groups // ignore: cast_nullable_to_non_nullable
as List<Group>,
groupNames: null == groupNames
? _value._groupNames
: groupNames // ignore: cast_nullable_to_non_nullable
as List<String>,
));
}
}
@@ -1831,23 +1925,20 @@ class __$$ProxiesSelectorStateImplCopyWithImpl<$Res>
/// @nodoc
class _$ProxiesSelectorStateImpl implements _ProxiesSelectorState {
const _$ProxiesSelectorStateImpl(
{required this.currentIndex, required final List<Group> groups})
: _groups = groups;
const _$ProxiesSelectorStateImpl({required final List<String> groupNames})
: _groupNames = groupNames;
final List<String> _groupNames;
@override
final int currentIndex;
final List<Group> _groups;
@override
List<Group> get groups {
if (_groups is EqualUnmodifiableListView) return _groups;
List<String> get groupNames {
if (_groupNames is EqualUnmodifiableListView) return _groupNames;
// ignore: implicit_dynamic_type
return EqualUnmodifiableListView(_groups);
return EqualUnmodifiableListView(_groupNames);
}
@override
String toString() {
return 'ProxiesSelectorState(currentIndex: $currentIndex, groups: $groups)';
return 'ProxiesSelectorState(groupNames: $groupNames)';
}
@override
@@ -1855,14 +1946,13 @@ class _$ProxiesSelectorStateImpl implements _ProxiesSelectorState {
return identical(this, other) ||
(other.runtimeType == runtimeType &&
other is _$ProxiesSelectorStateImpl &&
(identical(other.currentIndex, currentIndex) ||
other.currentIndex == currentIndex) &&
const DeepCollectionEquality().equals(other._groups, _groups));
const DeepCollectionEquality()
.equals(other._groupNames, _groupNames));
}
@override
int get hashCode => Object.hash(
runtimeType, currentIndex, const DeepCollectionEquality().hash(_groups));
runtimeType, const DeepCollectionEquality().hash(_groupNames));
@JsonKey(ignore: true)
@override
@@ -1875,15 +1965,190 @@ class _$ProxiesSelectorStateImpl implements _ProxiesSelectorState {
abstract class _ProxiesSelectorState implements ProxiesSelectorState {
const factory _ProxiesSelectorState(
{required final int currentIndex,
required final List<Group> groups}) = _$ProxiesSelectorStateImpl;
{required final List<String> groupNames}) = _$ProxiesSelectorStateImpl;
@override
int get currentIndex;
@override
List<Group> get groups;
List<String> get groupNames;
@override
@JsonKey(ignore: true)
_$$ProxiesSelectorStateImplCopyWith<_$ProxiesSelectorStateImpl>
get copyWith => throw _privateConstructorUsedError;
}
/// @nodoc
mixin _$ProxiesTabViewSelectorState {
ProxiesSortType get proxiesSortType => throw _privateConstructorUsedError;
num get sortNum => throw _privateConstructorUsedError;
Group get group => throw _privateConstructorUsedError;
@JsonKey(ignore: true)
$ProxiesTabViewSelectorStateCopyWith<ProxiesTabViewSelectorState>
get copyWith => throw _privateConstructorUsedError;
}
/// @nodoc
abstract class $ProxiesTabViewSelectorStateCopyWith<$Res> {
factory $ProxiesTabViewSelectorStateCopyWith(
ProxiesTabViewSelectorState value,
$Res Function(ProxiesTabViewSelectorState) then) =
_$ProxiesTabViewSelectorStateCopyWithImpl<$Res,
ProxiesTabViewSelectorState>;
@useResult
$Res call({ProxiesSortType proxiesSortType, num sortNum, Group group});
$GroupCopyWith<$Res> get group;
}
/// @nodoc
class _$ProxiesTabViewSelectorStateCopyWithImpl<$Res,
$Val extends ProxiesTabViewSelectorState>
implements $ProxiesTabViewSelectorStateCopyWith<$Res> {
_$ProxiesTabViewSelectorStateCopyWithImpl(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? proxiesSortType = null,
Object? sortNum = null,
Object? group = null,
}) {
return _then(_value.copyWith(
proxiesSortType: null == proxiesSortType
? _value.proxiesSortType
: proxiesSortType // ignore: cast_nullable_to_non_nullable
as ProxiesSortType,
sortNum: null == sortNum
? _value.sortNum
: sortNum // ignore: cast_nullable_to_non_nullable
as num,
group: null == group
? _value.group
: group // ignore: cast_nullable_to_non_nullable
as Group,
) as $Val);
}
@override
@pragma('vm:prefer-inline')
$GroupCopyWith<$Res> get group {
return $GroupCopyWith<$Res>(_value.group, (value) {
return _then(_value.copyWith(group: value) as $Val);
});
}
}
/// @nodoc
abstract class _$$ProxiesTabViewSelectorStateImplCopyWith<$Res>
implements $ProxiesTabViewSelectorStateCopyWith<$Res> {
factory _$$ProxiesTabViewSelectorStateImplCopyWith(
_$ProxiesTabViewSelectorStateImpl value,
$Res Function(_$ProxiesTabViewSelectorStateImpl) then) =
__$$ProxiesTabViewSelectorStateImplCopyWithImpl<$Res>;
@override
@useResult
$Res call({ProxiesSortType proxiesSortType, num sortNum, Group group});
@override
$GroupCopyWith<$Res> get group;
}
/// @nodoc
class __$$ProxiesTabViewSelectorStateImplCopyWithImpl<$Res>
extends _$ProxiesTabViewSelectorStateCopyWithImpl<$Res,
_$ProxiesTabViewSelectorStateImpl>
implements _$$ProxiesTabViewSelectorStateImplCopyWith<$Res> {
__$$ProxiesTabViewSelectorStateImplCopyWithImpl(
_$ProxiesTabViewSelectorStateImpl _value,
$Res Function(_$ProxiesTabViewSelectorStateImpl) _then)
: super(_value, _then);
@pragma('vm:prefer-inline')
@override
$Res call({
Object? proxiesSortType = null,
Object? sortNum = null,
Object? group = null,
}) {
return _then(_$ProxiesTabViewSelectorStateImpl(
proxiesSortType: null == proxiesSortType
? _value.proxiesSortType
: proxiesSortType // ignore: cast_nullable_to_non_nullable
as ProxiesSortType,
sortNum: null == sortNum
? _value.sortNum
: sortNum // ignore: cast_nullable_to_non_nullable
as num,
group: null == group
? _value.group
: group // ignore: cast_nullable_to_non_nullable
as Group,
));
}
}
/// @nodoc
class _$ProxiesTabViewSelectorStateImpl
implements _ProxiesTabViewSelectorState {
const _$ProxiesTabViewSelectorStateImpl(
{required this.proxiesSortType,
required this.sortNum,
required this.group});
@override
final ProxiesSortType proxiesSortType;
@override
final num sortNum;
@override
final Group group;
@override
String toString() {
return 'ProxiesTabViewSelectorState(proxiesSortType: $proxiesSortType, sortNum: $sortNum, group: $group)';
}
@override
bool operator ==(Object other) {
return identical(this, other) ||
(other.runtimeType == runtimeType &&
other is _$ProxiesTabViewSelectorStateImpl &&
(identical(other.proxiesSortType, proxiesSortType) ||
other.proxiesSortType == proxiesSortType) &&
(identical(other.sortNum, sortNum) || other.sortNum == sortNum) &&
(identical(other.group, group) || other.group == group));
}
@override
int get hashCode => Object.hash(runtimeType, proxiesSortType, sortNum, group);
@JsonKey(ignore: true)
@override
@pragma('vm:prefer-inline')
_$$ProxiesTabViewSelectorStateImplCopyWith<_$ProxiesTabViewSelectorStateImpl>
get copyWith => __$$ProxiesTabViewSelectorStateImplCopyWithImpl<
_$ProxiesTabViewSelectorStateImpl>(this, _$identity);
}
abstract class _ProxiesTabViewSelectorState
implements ProxiesTabViewSelectorState {
const factory _ProxiesTabViewSelectorState(
{required final ProxiesSortType proxiesSortType,
required final num sortNum,
required final Group group}) = _$ProxiesTabViewSelectorStateImpl;
@override
ProxiesSortType get proxiesSortType;
@override
num get sortNum;
@override
Group get group;
@override
@JsonKey(ignore: true)
_$$ProxiesTabViewSelectorStateImplCopyWith<_$ProxiesTabViewSelectorStateImpl>
get copyWith => throw _privateConstructorUsedError;
}

View File

@@ -12,6 +12,8 @@ import 'common.dart';
part 'generated/profile.g.dart';
typedef SelectedMap = Map<String, String>;
@JsonSerializable()
class UserInfo {
int upload;
@@ -62,27 +64,28 @@ class UserInfo {
class Profile {
String id;
String? label;
String? groupName;
String? proxyName;
String? url;
DateTime? lastUpdateDate;
Duration autoUpdateDuration;
UserInfo? userInfo;
bool autoUpdate;
SelectedMap selectedMap;
Profile({
String? id,
this.label,
this.url,
this.userInfo,
this.groupName,
this.proxyName,
this.lastUpdateDate,
SelectedMap? selectedMap,
Duration? autoUpdateDuration,
this.autoUpdate = true,
}) : id = id ?? DateTime.now().millisecondsSinceEpoch.toString(),
autoUpdateDuration =
autoUpdateDuration ?? appConstant.defaultUpdateDuration;
autoUpdateDuration ?? appConstant.defaultUpdateDuration,
selectedMap = selectedMap ?? {};
ProfileType get type => url == null ? ProfileType.file : ProfileType.url;
@@ -158,7 +161,6 @@ class Profile {
runtimeType == other.runtimeType &&
id == other.id &&
label == other.label &&
groupName == other.groupName &&
proxyName == other.proxyName &&
url == other.url &&
lastUpdateDate == other.lastUpdateDate &&
@@ -170,7 +172,6 @@ class Profile {
int get hashCode =>
id.hashCode ^
label.hashCode ^
groupName.hashCode ^
proxyName.hashCode ^
url.hashCode ^
lastUpdateDate.hashCode ^
@@ -180,7 +181,7 @@ class Profile {
@override
String toString() {
return 'Profile{id: $id, label: $label, groupName: $groupName, proxyName: $proxyName, url: $url, lastUpdateDate: $lastUpdateDate, autoUpdateDuration: $autoUpdateDuration, userInfo: $userInfo, autoUpdate: $autoUpdate}';
return 'Profile{id: $id, label: $label, proxyName: $proxyName, url: $url, lastUpdateDate: $lastUpdateDate, autoUpdateDuration: $autoUpdateDuration, userInfo: $userInfo, autoUpdate: $autoUpdate}';
}
Profile copyWith({
@@ -192,14 +193,15 @@ class Profile {
DateTime? lastUpdateDate,
Duration? autoUpdateDuration,
bool? autoUpdate,
SelectedMap? selectedMap,
}) {
return Profile(
id: id,
label: label ?? this.label,
url: url ?? this.url,
groupName: groupName ?? this.groupName,
proxyName: proxyName ?? this.proxyName,
userInfo: userInfo ?? this.userInfo,
selectedMap: selectedMap ?? this.selectedMap,
lastUpdateDate: lastUpdateDate ?? this.lastUpdateDate,
autoUpdateDuration: autoUpdateDuration ?? this.autoUpdateDuration,
autoUpdate: autoUpdate ?? this.autoUpdate,

View File

@@ -6,7 +6,7 @@ part 'generated/proxy.g.dart';
part 'generated/proxy.freezed.dart';
typedef DelayMap = Map<String, int?>;
typedef ProxyMap = Map<String, Proxy>;
@freezed
class Group with _$Group {
@@ -23,8 +23,9 @@ class Group with _$Group {
@freezed
class Proxy with _$Proxy {
const factory Proxy({
@Default("") String name,
@Default("") String type,
required String name,
required String type,
String? now,
}) = _Proxy;
factory Proxy.fromJson(Map<String, Object?> json) => _$ProxyFromJson(json);

View File

@@ -32,7 +32,6 @@ class NetworkDetectionSelectorState with _$NetworkDetectionSelectorState {
const factory NetworkDetectionSelectorState({
required String? currentProxyName,
required int? delay,
required bool isInit,
}) = _NetworkDetectionSelectorState;
}
@@ -103,11 +102,25 @@ class HomeNavigationSelectorState with _$HomeNavigationSelectorState{
}) = _HomeNavigationSelectorState;
}
@freezed
class ProxiesCardSelectorState with _$ProxiesCardSelectorState{
const factory ProxiesCardSelectorState({
required bool isSelected,
}) = _ProxiesCardSelectorState;
}
@freezed
class ProxiesSelectorState with _$ProxiesSelectorState{
const factory ProxiesSelectorState({
required int currentIndex,
required List<Group> groups,
required List<String> groupNames,
}) = _ProxiesSelectorState;
}
@freezed
class ProxiesTabViewSelectorState with _$ProxiesTabViewSelectorState{
const factory ProxiesTabViewSelectorState({
required ProxiesSortType proxiesSortType,
required num sortNum,
required Group group,
}) = _ProxiesTabViewSelectorState;
}

View File

@@ -1,4 +1,3 @@
import 'package:fl_clash/common/common.dart';
import 'package:fl_clash/models/models.dart';
import 'package:fl_clash/state.dart';
import 'package:flutter/material.dart';
@@ -28,7 +27,7 @@ class HomePage extends StatelessWidget {
builder: (context, currentIndex, __) {
if (globalState.pageController != null) {
WidgetsBinding.instance.addPostFrameCallback((_) {
context.appController.toPage(currentIndex, hasAnimate: true);
globalState.appController.toPage(currentIndex, hasAnimate: true);
});
} else {
globalState.pageController = PageController(
@@ -67,7 +66,7 @@ class HomePage extends StatelessWidget {
},
builder: (context, state, __) {
return AdaptiveScaffold.standardNavigationRail(
onDestinationSelected: context.appController.toPage,
onDestinationSelected: globalState.appController.toPage,
destinations: navigationItems
.map(
(e) => NavigationRailDestination(
@@ -113,7 +112,7 @@ class HomePage extends StatelessWidget {
.toList();
return AdaptiveScaffold.standardBottomNavigationBar(
destinations: mobileDestinations,
onDestinationSelected: context.appController.toPage,
onDestinationSelected: globalState.appController.toPage,
currentIndex: state.currentIndex,
);
},
@@ -140,7 +139,6 @@ class HomePage extends StatelessWidget {
child: Selector<AppState, List<NavigationItem>>(
selector: (_, appState) => appState.navigationItems,
builder: (_, navigationItems, __) {
debugPrint("[Home] update===>");
final desktopNavigationItems = navigationItems
.where(
(element) =>

View File

@@ -1,5 +1,6 @@
import 'dart:async';
import 'dart:math';
import 'package:fl_clash/state.dart';
import 'package:flutter/material.dart';
import 'package:mobile_scanner/mobile_scanner.dart';
@@ -90,6 +91,12 @@ class _ScanPageState extends State<ScanPage> with WidgetsBindingObserver {
},
icon: const Icon(Icons.close),
),
actions: [
IconButton(
onPressed: globalState.appController.addProfileFormQrCode,
icon: const Icon(Icons.add_photo_alternate_outlined),
)
],
),
Container(
margin: const EdgeInsets.only(bottom: 32),
@@ -115,7 +122,7 @@ class _ScanPageState extends State<ScanPage> with WidgetsBindingObserver {
icon: icon,
style: ButtonStyle(
foregroundColor:
const MaterialStatePropertyAll(Colors.white),
const MaterialStatePropertyAll(Colors.white),
backgroundColor: MaterialStatePropertyAll(backgroundColor),
),
padding: const EdgeInsets.all(16),
@@ -197,4 +204,4 @@ class ScannerOverlay extends CustomPainter {
return scanWindow != oldDelegate.scanWindow ||
borderRadius != oldDelegate.borderRadius;
}
}
}

View File

@@ -5,21 +5,23 @@ import 'dart:io';
import 'package:animations/animations.dart';
import 'package:fl_clash/clash/clash.dart';
import 'package:fl_clash/enum/enum.dart';
import 'package:fl_clash/models/clash_config.dart';
import 'package:fl_clash/plugins/app.dart';
import 'package:fl_clash/widgets/scaffold.dart';
import 'package:flutter/material.dart';
import 'controller.dart';
import 'models/models.dart';
import 'common/common.dart';
class GlobalState {
Timer? timer;
Timer? currentDelayTimer;
Function? updateSortNumDebounce;
Timer? groupsUpdateTimer;
Function? updateCurrentDelayDebounce;
PageController? pageController;
final navigatorKey = GlobalKey<NavigatorState>();
final Map<int, String?> packageNameMap = {};
late AppController appController;
GlobalKey<CommonScaffoldState> homeScaffoldKey = GlobalKey();
List<Function> updateFunctionLists = [];
List<NavigationItem> currentNavigationItems = [];
@@ -39,7 +41,7 @@ class GlobalState {
timer?.cancel();
}
Future<bool> updateClashConfig({
Future<String> updateClashConfig({
required ClashConfig clashConfig,
required Config config,
bool isPatch = true,
@@ -50,6 +52,7 @@ class GlobalState {
profilePath: profilePath,
config: clashConfig,
isPatch: isPatch,
isCompatible: config.isCompatible,
));
}
@@ -75,17 +78,23 @@ class GlobalState {
stopListenUpdate();
}
void updateCurrentDelay(
String? proxyName,
) {
updateCurrentDelayDebounce ??= debounce<Function(String?)>((proxyName) {
if (proxyName != null) {
clashCore.delay(
proxyName,
);
}
});
updateCurrentDelayDebounce!([proxyName]);
applyProfile({
required AppState appState,
required Config config,
required ClashConfig clashConfig,
}) async {
final res = await updateClashConfig(
clashConfig: clashConfig,
config: config,
isPatch: false,
);
if (res.isNotEmpty) return Result.error(message: res);
await updateGroups(appState);
changeProxy(
appState: appState,
config: config,
clashConfig: clashConfig,
);
}
init({
@@ -101,18 +110,12 @@ class GlobalState {
);
}
if (!appState.isInit) return;
await updateClashConfig(
clashConfig: clashConfig,
config: config,
isPatch: false,
);
updateGroups(appState);
updateCoreVersionInfo(appState);
changeProxy(
await applyProfile(
appState: appState,
config: config,
clashConfig: clashConfig,
);
updateCoreVersionInfo(appState);
}
changeProxy({
@@ -120,29 +123,20 @@ class GlobalState {
required Config config,
required ClashConfig clashConfig,
}) {
final currentGroupName =
appState.getCurrentGroupName(config.currentGroupName, clashConfig.mode);
final currentProxyName =
appState.getCurrentProxyName(config.currentProxyName, clashConfig.mode);
if (config.profiles.isEmpty || currentProxyName == null) {
stopSystemProxy();
return;
}
if (currentGroupName == null) return;
final groupIndex = appState.groups.indexWhere(
(element) => element.name == currentGroupName,
);
if (groupIndex == -1) return;
final proxyIndex = appState.groups[groupIndex].all.indexWhere(
(element) => element.name == currentProxyName,
);
if (proxyIndex == -1) return;
clashCore.changeProxy(
ChangeProxyParams(
groupName: currentGroupName,
proxyName: currentProxyName,
),
);
WidgetsBinding.instance.addPostFrameCallback((_) {
if (config.profiles.isEmpty) {
stopSystemProxy();
return;
}
config.currentSelectedMap.forEach((key, value) {
clashCore.changeProxy(
ChangeProxyParams(
groupName: key,
proxyName: value,
),
);
});
});
}
updatePackages(AppState appState) async {
@@ -158,16 +152,16 @@ class GlobalState {
required Config config,
required ClashConfig clashConfig,
}) {
final hasGroups = appState.getCurrentGroups(clashConfig.mode).isNotEmpty;
final group = appState.currentGroups;
final hasProfile = config.profiles.isNotEmpty;
appState.navigationItems = navigation.getItems(
openLogs: config.openLogs,
hasProxies: hasGroups && hasProfile,
hasProxies: group.isNotEmpty && hasProfile,
);
}
Future<void> updateGroups(AppState appState) async {
appState.groups = await clashCore.getProxiesGroups();
appState.groups = await clashCore.getProxiesGroups();
}
showMessage({
@@ -246,6 +240,52 @@ class GlobalState {
);
}
}
showSnackBar(
BuildContext context, {
required String message,
SnackBarAction? action,
}) {
final width = context.width;
EdgeInsets margin;
if (width < 600) {
margin = const EdgeInsets.only(
bottom: 96,
right: 16,
left: 16,
);
} else {
margin = EdgeInsets.only(
bottom: 16,
left: 16,
right: width - 316,
);
}
ScaffoldMessenger.of(context).showSnackBar(
SnackBar(
action: action,
content: Text(message),
behavior: SnackBarBehavior.floating,
duration: const Duration(milliseconds: 1500),
margin: margin,
),
);
}
void updateCurrentDelay(
String? proxyName,
) {
updateCurrentDelayDebounce ??= debounce<Function(String?)>((proxyName) {
if (proxyName != null) {
debugPrint("[delay]=====> $proxyName");
clashCore.delay(
proxyName,
);
}
});
updateCurrentDelayDebounce!([proxyName]);
}
}
final globalState = GlobalState();

View File

@@ -1,4 +1,4 @@
import 'package:fl_clash/common/common.dart';
import 'package:fl_clash/state.dart';
import 'package:flutter/material.dart';
import 'package:flutter/services.dart';
@@ -27,7 +27,7 @@ class _AndroidContainerState extends State<AndroidContainer>
Future<void> didChangeAppLifecycleState(AppLifecycleState state) async {
final isPaused = state == AppLifecycleState.paused;
if (isPaused) {
await context.appController.savePreferences();
await globalState.appController.savePreferences();
}
}

View File

@@ -1,5 +1,6 @@
import 'package:fl_clash/common/common.dart';
import 'package:fl_clash/models/models.dart';
import 'package:fl_clash/state.dart';
import 'package:flutter/material.dart';
import 'package:provider/provider.dart';
@@ -15,7 +16,6 @@ class AppStateContainer extends StatelessWidget {
return Selector<Config, bool>(
selector: (_, config) => config.autoLaunch,
builder: (_, isAutoLaunch, child) {
debugPrint("[autoLaunchContainer] update===>");
autoLaunch?.updateStatus(isAutoLaunch);
return child!;
},
@@ -24,21 +24,19 @@ class AppStateContainer extends StatelessWidget {
}
_updateNavigationsContainer(Widget child) {
return Selector3<AppState, Config, ClashConfig, UpdateNavigationsSelector>(
selector: (_, appState, config, clashConfig) {
final hasGroups =
appState.getCurrentGroups(clashConfig.mode).isNotEmpty;
return Selector2<AppState, Config, UpdateNavigationsSelector>(
selector: (_, appState, config) {
final group = appState.currentGroups;
final hasProfile = config.profiles.isNotEmpty;
return UpdateNavigationsSelector(
openLogs: config.openLogs,
hasProxies: hasGroups && hasProfile,
hasProxies: group.isNotEmpty && hasProfile,
);
},
builder: (context, state, child) {
debugPrint("[NavigationsContainer] update===>");
WidgetsBinding.instance.addPostFrameCallback(
(_) {
context.appController.appState.navigationItems =
globalState.appController.appState.navigationItems =
navigation.getItems(
openLogs: state.openLogs,
hasProxies: state.hasProxies,

View File

@@ -38,14 +38,14 @@ class _ClashMessageContainerState extends State<ClashMessageContainer>
@override
void onDelay(Delay delay) {
context.appController.setDelay(delay);
final appController = globalState.appController;
appController.setDelay(delay);
super.onDelay(delay);
}
@override
void onLog(Log log) {
debugPrint("$log");
context.appController.appState.addLog(log);
globalState.appController.appState.addLog(log);
super.onLog(log);
}

View File

@@ -1,4 +1,4 @@
import 'package:fl_clash/common/common.dart';
import 'package:fl_clash/state.dart';
import 'package:flutter/material.dart';
import 'card.dart';
import 'grid.dart';
@@ -25,7 +25,7 @@ class ColorSchemeBox extends StatelessWidget {
);
} else {
return Theme.of(context).copyWith(
colorScheme: context.appController.appState.systemColorSchemes
colorScheme: globalState.appController.appState.systemColorSchemes
.getSystemColorSchemeForBrightness(Theme.of(context).brightness),
);
}

View File

@@ -16,28 +16,6 @@ showExtendPage(
key: globalKey,
child: body,
);
// Flexible(
// flex: 0,
// child: Row(
// children: [
// Expanded(
// child: Padding(
// padding: kTabLabelPadding,
// child: Text(
// title,
// style: Theme.of(context).textTheme.titleMedium,
// ),
// ),
// ),
// const SizedBox(
// height: kToolbarHeight,
// width: kToolbarHeight,
// child: CloseButton(),
// ),
// ],
// ),
// )
navigator.push(
ModalSideSheetRoute(
modalBarrierColor: Colors.black38,

View File

@@ -446,7 +446,6 @@ class _OpenContainerRoute<T> extends ModalRoute<T> {
return Selector<Config, ThemeMode>(
selector: (_, config) => config.themeMode,
builder: (_, __, ___) {
debugPrint("[OpenContainerTheme] update===>");
_colorTween = _getColorTween(
transitionType: transitionType,
closedColor: Theme.of(context).colorScheme.background,

View File

@@ -1,7 +1,7 @@
import 'dart:io';
import 'package:fl_clash/common/common.dart';
import 'package:fl_clash/state.dart';
import 'package:flutter/widgets.dart';
class PopContainer extends StatefulWidget {
@@ -24,7 +24,7 @@ class _PopContainerState extends State<PopContainer> {
if (canPop) {
Navigator.pop(context);
} else {
await context.appController.handleBackOrExit();
await globalState.appController.handleBackOrExit();
}
},
child: widget.child,

View File

@@ -1,3 +1,4 @@
import 'package:fl_clash/common/system.dart';
import 'package:flutter/material.dart';
import 'package:flutter/services.dart';
@@ -69,8 +70,10 @@ class CommonScaffoldState extends State<CommonScaffold> {
}
}
@override
Widget build(BuildContext context) {
_platformContainer({required Widget child}) {
if (system.isDesktop) {
return child;
}
return AnnotatedRegion(
value: SystemUiOverlayStyle(
statusBarColor: Colors.transparent,
@@ -80,6 +83,13 @@ class CommonScaffoldState extends State<CommonScaffold> {
systemNavigationBarColor: Colors.transparent,
systemNavigationBarDividerColor: Colors.transparent,
),
child: child,
);
}
@override
Widget build(BuildContext context) {
return _platformContainer(
child: Scaffold(
appBar: PreferredSize(
preferredSize: const Size.fromHeight(kToolbarHeight),
@@ -114,3 +124,23 @@ class CommonScaffoldState extends State<CommonScaffold> {
);
}
}
class AppIcon extends StatelessWidget {
const AppIcon({super.key});
@override
Widget build(BuildContext context) {
return Container(
margin: const EdgeInsets.symmetric(
horizontal: 16,
vertical: 16,
),
width: 30,
height: 30,
child: const CircleAvatar(
foregroundImage: AssetImage("assets/images/launch_icon.png"),
backgroundColor: Colors.transparent,
),
);
}
}

View File

@@ -1,6 +1,7 @@
import 'package:fl_clash/common/common.dart';
import 'package:flutter/material.dart';
import '../state.dart';
class TooltipText extends StatelessWidget {
final Text text;
@@ -14,7 +15,7 @@ class TooltipText extends StatelessWidget {
return LayoutBuilder(
builder: (context, container) {
final maxWidth = container.maxWidth;
final size = context.appController.measure.computeTextSize(
final size = globalState.appController.measure.computeTextSize(
text,
);
if (maxWidth < size.width) {

View File

@@ -1,5 +1,5 @@
import 'package:fl_clash/common/common.dart';
import 'package:fl_clash/plugins/tile.dart';
import 'package:fl_clash/state.dart';
import 'package:flutter/material.dart';
class TileContainer extends StatefulWidget {
@@ -24,13 +24,13 @@ class _TileContainerState extends State<TileContainer> with TileListener {
@override
void onStart() {
context.appController.updateSystemProxy(true);
globalState.appController.updateSystemProxy(true);
super.onStart();
}
@override
void onStop() {
context.appController.updateSystemProxy(false);
globalState.appController.updateSystemProxy(false);
super.onStop();
}

View File

@@ -3,6 +3,7 @@ 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:flutter/material.dart';
import 'package:intl/intl.dart';
import 'package:provider/provider.dart';
@@ -32,7 +33,7 @@ class _TrayContainerState extends State<TrayContainer> with TrayListener {
_updateOtherTray() async {
if (isTrayInit == false) {
await trayManager.setIcon(
Other.getTrayIconPath(),
other.getTrayIconPath(),
);
isTrayInit = true;
}
@@ -41,7 +42,7 @@ class _TrayContainerState extends State<TrayContainer> with TrayListener {
_updateLinuxTray() async {
await trayManager.destroy();
await trayManager.setIcon(
Other.getTrayIconPath(),
other.getTrayIconPath(),
);
}
@@ -68,11 +69,11 @@ class _TrayContainerState extends State<TrayContainer> with TrayListener {
// label: proxy.name,
// checked: isCurrentGroup && isCurrentProxy,
// onClick: (_) {
// final config = context.appController.config;
// final config = globalState.appController.config;
// config.currentProfile?.groupName = group.name;
// config.currentProfile?.proxyName = proxy.name;
// config.update();
// context.appController.changeProxy();
// globalState.appController.changeProxy();
// }),
// );
// }
@@ -93,7 +94,7 @@ class _TrayContainerState extends State<TrayContainer> with TrayListener {
MenuItem.checkbox(
label: Intl.message(mode.name),
onClick: (_) {
context.appController.clashConfig.mode = mode;
globalState.appController.clashConfig.mode = mode;
},
checked: mode == state.mode,
),
@@ -103,7 +104,7 @@ class _TrayContainerState extends State<TrayContainer> with TrayListener {
final proxyMenuItem = MenuItem.checkbox(
label: appLocalizations.systemProxy,
onClick: (_) async {
context.appController.updateSystemProxy(!state.isRun);
globalState.appController.updateSystemProxy(!state.isRun);
},
checked: state.isRun,
);
@@ -111,8 +112,8 @@ class _TrayContainerState extends State<TrayContainer> with TrayListener {
final autoStartMenuItem = MenuItem.checkbox(
label: appLocalizations.autoLaunch,
onClick: (_) async {
context.appController.config.autoLaunch =
!context.appController.config.autoLaunch;
globalState.appController.config.autoLaunch =
!globalState.appController.config.autoLaunch;
},
checked: state.autoLaunch,
);
@@ -121,7 +122,7 @@ class _TrayContainerState extends State<TrayContainer> with TrayListener {
final exitMenuItem = MenuItem(
label: appLocalizations.exit,
onClick: (_) async {
await context.appController.handleExit();
await globalState.appController.handleExit();
},
);
menuItems.add(exitMenuItem);
@@ -144,7 +145,6 @@ class _TrayContainerState extends State<TrayContainer> with TrayListener {
locale: config.locale,
),
builder: (_, state, child) {
debugPrint("[TrayContainer] update===>");
WidgetsBinding.instance.addPostFrameCallback((timeStamp) {
updateMenu(state);
});

View File

@@ -1,4 +1,4 @@
import 'package:fl_clash/common/common.dart';
import 'package:fl_clash/state.dart';
import 'package:flutter/material.dart';
import 'package:window_manager/window_manager.dart';
@@ -29,13 +29,13 @@ class _WindowContainerState extends State<WindowContainer>
@override
void onWindowClose() async {
await context.appController.handleBackOrExit();
await globalState.appController.handleBackOrExit();
super.onWindowClose();
}
@override
void onWindowMinimize() async {
await context.appController.savePreferences();
await globalState.appController.savePreferences();
super.onWindowMinimize();
}

View File

@@ -7,6 +7,7 @@
#include "generated_plugin_registrant.h"
#include <dynamic_color/dynamic_color_plugin.h>
#include <file_selector_linux/file_selector_plugin.h>
#include <gtk/gtk_plugin.h>
#include <screen_retriever/screen_retriever_plugin.h>
#include <tray_manager/tray_manager_plugin.h>
@@ -17,6 +18,9 @@ void fl_register_plugins(FlPluginRegistry* registry) {
g_autoptr(FlPluginRegistrar) dynamic_color_registrar =
fl_plugin_registry_get_registrar_for_plugin(registry, "DynamicColorPlugin");
dynamic_color_plugin_register_with_registrar(dynamic_color_registrar);
g_autoptr(FlPluginRegistrar) file_selector_linux_registrar =
fl_plugin_registry_get_registrar_for_plugin(registry, "FileSelectorPlugin");
file_selector_plugin_register_with_registrar(file_selector_linux_registrar);
g_autoptr(FlPluginRegistrar) gtk_registrar =
fl_plugin_registry_get_registrar_for_plugin(registry, "GtkPlugin");
gtk_plugin_register_with_registrar(gtk_registrar);

View File

@@ -4,6 +4,7 @@
list(APPEND FLUTTER_PLUGIN_LIST
dynamic_color
file_selector_linux
gtk
screen_retriever
tray_manager

View File

@@ -7,6 +7,7 @@ import Foundation
import app_links
import dynamic_color
import file_selector_macos
import mobile_scanner
import package_info_plus
import path_provider_foundation
@@ -19,6 +20,7 @@ import window_manager
func RegisterGeneratedPlugins(registry: FlutterPluginRegistry) {
AppLinksMacosPlugin.register(with: registry.registrar(forPlugin: "AppLinksMacosPlugin"))
DynamicColorPlugin.register(with: registry.registrar(forPlugin: "DynamicColorPlugin"))
FileSelectorPlugin.register(with: registry.registrar(forPlugin: "FileSelectorPlugin"))
MobileScannerPlugin.register(with: registry.registrar(forPlugin: "MobileScannerPlugin"))
FPPPackageInfoPlusPlugin.register(with: registry.registrar(forPlugin: "FPPPackageInfoPlusPlugin"))
PathProviderPlugin.register(with: registry.registrar(forPlugin: "PathProviderPlugin"))

View File

@@ -33,6 +33,14 @@ packages:
url: "https://pub.flutter-io.cn"
source: hosted
version: "3.5.1"
archive:
dependency: transitive
description:
name: archive
sha256: ecf4273855368121b1caed0d10d4513c7241dfc813f7d3c8933b36622ae9b265
url: "https://pub.flutter-io.cn"
source: hosted
version: "3.5.1"
args:
dependency: "direct dev"
description:
@@ -129,6 +137,14 @@ packages:
url: "https://pub.flutter-io.cn"
source: hosted
version: "1.3.0"
charcode:
dependency: transitive
description:
name: charcode
sha256: fb98c0f6d12c920a02ee2d998da788bca066ca5f148492b7085ee23372b12306
url: "https://pub.flutter-io.cn"
source: hosted
version: "1.3.1"
checked_yaml:
dependency: transitive
description:
@@ -177,6 +193,14 @@ packages:
url: "https://pub.flutter-io.cn"
source: hosted
version: "3.1.1"
cross_file:
dependency: transitive
description:
name: cross_file
sha256: "55d7b444feb71301ef6b8838dbc1ae02e63dd48c8773f3810ff53bb1e2945b32"
url: "https://pub.flutter-io.cn"
source: hosted
version: "0.3.4+1"
crypto:
dependency: transitive
description:
@@ -241,6 +265,38 @@ packages:
url: "https://pub.flutter-io.cn"
source: hosted
version: "6.2.1"
file_selector_linux:
dependency: transitive
description:
name: file_selector_linux
sha256: "045d372bf19b02aeb69cacf8b4009555fb5f6f0b7ad8016e5f46dd1387ddd492"
url: "https://pub.flutter-io.cn"
source: hosted
version: "0.9.2+1"
file_selector_macos:
dependency: transitive
description:
name: file_selector_macos
sha256: f42eacb83b318e183b1ae24eead1373ab1334084404c8c16e0354f9a3e55d385
url: "https://pub.flutter-io.cn"
source: hosted
version: "0.9.4"
file_selector_platform_interface:
dependency: transitive
description:
name: file_selector_platform_interface
sha256: a3994c26f10378a039faa11de174d7b78eb8f79e4dd0af2a451410c1a5c3f66b
url: "https://pub.flutter-io.cn"
source: hosted
version: "2.6.2"
file_selector_windows:
dependency: transitive
description:
name: file_selector_windows
sha256: d3547240c20cabf205c7c7f01a50ecdbc413755814d6677f3cb366f04abcead0
url: "https://pub.flutter-io.cn"
source: hosted
version: "0.9.3+1"
fixnum:
dependency: transitive
description:
@@ -365,6 +421,78 @@ packages:
url: "https://pub.flutter-io.cn"
source: hosted
version: "4.0.2"
image:
dependency: "direct main"
description:
name: image
sha256: "4c68bfd5ae83e700b5204c1e74451e7bf3cf750e6843c6e158289cf56bda018e"
url: "https://pub.flutter-io.cn"
source: hosted
version: "4.1.7"
image_picker:
dependency: "direct main"
description:
name: image_picker
sha256: "33974eca2e87e8b4e3727f1b94fa3abcb25afe80b6bc2c4d449a0e150aedf720"
url: "https://pub.flutter-io.cn"
source: hosted
version: "1.1.1"
image_picker_android:
dependency: transitive
description:
name: image_picker_android
sha256: "79455f6cff4cbef583b2b524bbf0d4ec424e5959f4d464e36ef5323715b98370"
url: "https://pub.flutter-io.cn"
source: hosted
version: "0.8.12"
image_picker_for_web:
dependency: transitive
description:
name: image_picker_for_web
sha256: "6a1704fdd75022272e7e7a897a9068e9c2ff3cd6a66820bf3ded810633eac954"
url: "https://pub.flutter-io.cn"
source: hosted
version: "3.0.3"
image_picker_ios:
dependency: transitive
description:
name: image_picker_ios
sha256: cb0db0ec0d3e2cd49674f2e6053be25ccdb959832607c1cbd215dd6cf10fb0dd
url: "https://pub.flutter-io.cn"
source: hosted
version: "0.8.11"
image_picker_linux:
dependency: transitive
description:
name: image_picker_linux
sha256: "4ed1d9bb36f7cd60aa6e6cd479779cc56a4cb4e4de8f49d487b1aaad831300fa"
url: "https://pub.flutter-io.cn"
source: hosted
version: "0.2.1+1"
image_picker_macos:
dependency: transitive
description:
name: image_picker_macos
sha256: "3f5ad1e8112a9a6111c46d0b57a7be2286a9a07fc6e1976fdf5be2bd31d4ff62"
url: "https://pub.flutter-io.cn"
source: hosted
version: "0.2.1+1"
image_picker_platform_interface:
dependency: transitive
description:
name: image_picker_platform_interface
sha256: "9ec26d410ff46f483c5519c29c02ef0e02e13a543f882b152d4bfd2f06802f80"
url: "https://pub.flutter-io.cn"
source: hosted
version: "2.10.0"
image_picker_windows:
dependency: transitive
description:
name: image_picker_windows
sha256: "6ad07afc4eb1bc25f3a01084d28520496c4a3bb0cb13685435838167c9dcedeb"
url: "https://pub.flutter-io.cn"
source: hosted
version: "0.2.1+1"
intl:
dependency: "direct main"
description:
@@ -589,6 +717,14 @@ packages:
url: "https://pub.flutter-io.cn"
source: hosted
version: "2.2.1"
petitparser:
dependency: transitive
description:
name: petitparser
sha256: c15605cd28af66339f8eb6fbe0e541bfe2d1b72d5825efc6598f3e0a31b9ad27
url: "https://pub.flutter-io.cn"
source: hosted
version: "6.0.2"
platform:
dependency: transitive
description:
@@ -672,10 +808,10 @@ packages:
dependency: transitive
description:
name: shared_preferences_android
sha256: "1ee8bf911094a1b592de7ab29add6f826a7331fb854273d55918693d5364a1f2"
sha256: "8568a389334b6e83415b6aae55378e158fbc2314e074983362d20c562780fb06"
url: "https://pub.flutter-io.cn"
source: hosted
version: "2.2.2"
version: "2.2.1"
shared_preferences_foundation:
dependency: transitive
description:
@@ -957,10 +1093,10 @@ packages:
dependency: "direct main"
description:
name: win32_registry
sha256: "10589e0d7f4e053f2c61023a31c9ce01146656a70b7b7f0828c0b46d7da2a9bb"
sha256: "41fd8a189940d8696b1b810efb9abcf60827b6cbfab90b0c43e8439e3a39d85a"
url: "https://pub.flutter-io.cn"
source: hosted
version: "1.1.3"
version: "1.1.2"
window_manager:
dependency: "direct main"
description:
@@ -985,6 +1121,14 @@ packages:
url: "https://pub.flutter-io.cn"
source: hosted
version: "1.0.4"
xml:
dependency: transitive
description:
name: xml
sha256: b015a8ad1c488f66851d762d3090a21c600e479dc75e68328c52774040cf9226
url: "https://pub.flutter-io.cn"
source: hosted
version: "6.5.0"
yaml:
dependency: transitive
description:
@@ -997,10 +1141,18 @@ packages:
dependency: transitive
description:
name: yaml_edit
sha256: c566f4f804215d84a7a2c377667f546c6033d5b34b4f9e60dfb09d17c4e97826
sha256: e9c1a3543d2da0db3e90270dbb1e4eebc985ee5e3ffe468d83224472b2194a5f
url: "https://pub.flutter-io.cn"
source: hosted
version: "2.2.0"
version: "2.2.1"
zxing2:
dependency: "direct main"
description:
name: zxing2
sha256: "6cf995abd3c86f01ba882968dedffa7bc130185e382f2300239d2e857fc7912c"
url: "https://pub.flutter-io.cn"
source: hosted
version: "0.2.3"
sdks:
dart: ">=3.3.0 <4.0.0"
flutter: ">=3.19.0"

View File

@@ -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.7.2
version: 0.8.1
environment:
sdk: '>=3.1.0 <4.0.0'
@@ -35,6 +35,9 @@ dependencies:
url_launcher: ^6.2.6
flutter_adaptive_scaffold: ^0.1.10+1
freezed_annotation: ^2.4.1
image_picker: ^1.1.1
zxing2: ^0.2.3
image: ^4.1.7
dev_dependencies:
flutter_test:
sdk: flutter

View File

@@ -8,6 +8,7 @@
#include <app_links/app_links_plugin_c_api.h>
#include <dynamic_color/dynamic_color_plugin_c_api.h>
#include <file_selector_windows/file_selector_windows.h>
#include <proxy/proxy_plugin_c_api.h>
#include <screen_retriever/screen_retriever_plugin.h>
#include <tray_manager/tray_manager_plugin.h>
@@ -20,6 +21,8 @@ void RegisterPlugins(flutter::PluginRegistry* registry) {
registry->GetRegistrarForPlugin("AppLinksPluginCApi"));
DynamicColorPluginCApiRegisterWithRegistrar(
registry->GetRegistrarForPlugin("DynamicColorPluginCApi"));
FileSelectorWindowsRegisterWithRegistrar(
registry->GetRegistrarForPlugin("FileSelectorWindows"));
ProxyPluginCApiRegisterWithRegistrar(
registry->GetRegistrarForPlugin("ProxyPluginCApi"));
ScreenRetrieverPluginRegisterWithRegistrar(

View File

@@ -5,6 +5,7 @@
list(APPEND FLUTTER_PLUGIN_LIST
app_links
dynamic_color
file_selector_windows
proxy
screen_retriever
tray_manager