Compare commits

...

6 Commits

Author SHA1 Message Date
chen08209
3ba86dc9c2 optimize checkUpdate 2024-05-31 10:07:51 +08:00
chen08209
fd3040283c Fix submit error 2024-05-30 17:22:23 +08:00
chen08209
91d30c0f0e add WebDAV
add Auto check updates

Optimize more details
2024-05-30 17:11:15 +08:00
chen08209
c4b470ffaf optimize delayTest 2024-05-17 19:54:57 +08:00
chen08209
9a07c785f2 upgrade flutter version 2024-05-15 20:34:59 +08:00
chen08209
a134c32493 Update kernel
Add import profile via QR code image
2024-05-15 20:21:02 +08:00
87 changed files with 3870 additions and 1897 deletions

View File

@@ -23,6 +23,7 @@
<application <application
android:name="${applicationName}" android:name="${applicationName}"
android:icon="@mipmap/ic_launcher" android:icon="@mipmap/ic_launcher"
android:networkSecurityConfig="@xml/network_security_config"
android:label="FlClash"> android:label="FlClash">
<activity <activity
android:name="com.follow.clash.MainActivity" android:name="com.follow.clash.MainActivity"

View File

@@ -52,6 +52,7 @@ class AppPlugin : FlutterPlugin, MethodChannel.MethodCallHandler, ActivityAware
override fun onDetachedFromEngine(binding: FlutterPlugin.FlutterPluginBinding) { override fun onDetachedFromEngine(binding: FlutterPlugin.FlutterPluginBinding) {
channel.setMethodCallHandler(null) channel.setMethodCallHandler(null)
} }
private fun tip(message: String?) { private fun tip(message: String?) {
if (toast != null) { if (toast != null) {
toast!!.cancel() toast!!.cancel()
@@ -146,9 +147,9 @@ class AppPlugin : FlutterPlugin, MethodChannel.MethodCallHandler, ActivityAware
val packageManager = context?.packageManager val packageManager = context?.packageManager
val packages: List<Package>? = val packages: List<Package>? =
packageManager?.getInstalledPackages(PackageManager.GET_META_DATA)?.filter { packageManager?.getInstalledPackages(PackageManager.GET_META_DATA)?.filter {
it.packageName == context?.packageName it.packageName != context?.packageName
|| it.requestedPermissions?.contains(Manifest.permission.INTERNET) == false || it.requestedPermissions?.contains(Manifest.permission.INTERNET) == true
|| it.packageName != "android" || it.packageName == "android"
}?.map { }?.map {
Package( Package(

View File

@@ -0,0 +1,10 @@
<?xml version="1.0" encoding="utf-8"?>
<network-security-config xmlns:tools="http://schemas.android.com/tools"
tools:ignore="AcceptsUserCertificates">
<base-config>
<trust-anchors>
<certificates src="system" />
<certificates src="user" />
</trust-anchors>
</base-config>
</network-security-config>

View File

@@ -51,9 +51,17 @@ class Application extends StatefulWidget {
} }
class ApplicationState extends State<Application> { class ApplicationState extends State<Application> {
late AppController appController;
late SystemColorSchemes systemColorSchemes; late SystemColorSchemes systemColorSchemes;
final _pageTransitionsTheme = const PageTransitionsTheme(
builders: <TargetPlatform, PageTransitionsBuilder>{
TargetPlatform.android: CupertinoPageTransitionsBuilder(),
TargetPlatform.windows: CupertinoPageTransitionsBuilder(),
TargetPlatform.linux: CupertinoPageTransitionsBuilder(),
TargetPlatform.macOS: CupertinoPageTransitionsBuilder(),
},
);
ColorScheme _getAppColorScheme({ ColorScheme _getAppColorScheme({
required Brightness brightness, required Brightness brightness,
int? primaryColor, int? primaryColor,
@@ -72,10 +80,11 @@ class ApplicationState extends State<Application> {
@override @override
void initState() { void initState() {
super.initState(); super.initState();
appController = AppController(context); globalState.appController = AppController(context);
WidgetsBinding.instance.addPostFrameCallback((timeStamp) async { WidgetsBinding.instance.addPostFrameCallback((timeStamp) async {
appController.afterInit(); globalState.appController.updateViewWidth();
appController.initLink(); globalState.appController.afterInit();
globalState.appController.initLink();
_updateGroups(); _updateGroups();
}); });
} }
@@ -105,7 +114,7 @@ class ApplicationState extends State<Application> {
); );
WidgetsBinding.instance.addPostFrameCallback((_) { WidgetsBinding.instance.addPostFrameCallback((_) {
appController.updateSystemColorSchemes(systemColorSchemes); globalState.appController.updateSystemColorSchemes(systemColorSchemes);
}); });
} }
@@ -114,11 +123,13 @@ class ApplicationState extends State<Application> {
globalState.groupsUpdateTimer?.cancel(); globalState.groupsUpdateTimer?.cancel();
globalState.groupsUpdateTimer = null; globalState.groupsUpdateTimer = null;
} }
globalState.groupsUpdateTimer ??= globalState.groupsUpdateTimer ??= Timer.periodic(
Timer.periodic(appConstant.httpTimeoutDuration, (timer) async { httpTimeoutDuration,
await appController.updateGroups(); (timer) async {
appController.appState.sortNum++; await globalState.appController.updateGroups();
}); globalState.appController.appState.sortNum++;
},
);
} }
@override @override
@@ -144,12 +155,13 @@ class ApplicationState extends State<Application> {
GlobalCupertinoLocalizations.delegate, GlobalCupertinoLocalizations.delegate,
GlobalWidgetsLocalizations.delegate GlobalWidgetsLocalizations.delegate
], ],
title: appConstant.name, title: appName,
locale: Other.getLocaleForString(state.locale), locale: other.getLocaleForString(state.locale),
supportedLocales: supportedLocales:
AppLocalizations.delegate.supportedLocales, AppLocalizations.delegate.supportedLocales,
themeMode: state.themeMode, themeMode: state.themeMode,
theme: ThemeData( theme: ThemeData(
pageTransitionsTheme: _pageTransitionsTheme,
useMaterial3: true, useMaterial3: true,
colorScheme: _getAppColorScheme( colorScheme: _getAppColorScheme(
brightness: Brightness.light, brightness: Brightness.light,
@@ -159,6 +171,7 @@ class ApplicationState extends State<Application> {
), ),
darkTheme: ThemeData( darkTheme: ThemeData(
useMaterial3: true, useMaterial3: true,
pageTransitionsTheme: _pageTransitionsTheme,
colorScheme: _getAppColorScheme( colorScheme: _getAppColorScheme(
brightness: Brightness.dark, brightness: Brightness.dark,
systemColorSchemes: systemColorSchemes, systemColorSchemes: systemColorSchemes,
@@ -180,7 +193,7 @@ class ApplicationState extends State<Application> {
@override @override
Future<void> dispose() async { Future<void> dispose() async {
linkManager.destroy(); linkManager.destroy();
await appController.savePreferences(); await globalState.appController.savePreferences();
super.dispose(); super.dispose();
} }
} }

View File

@@ -140,7 +140,7 @@ class ClashCore {
bool delay(String proxyName) { bool delay(String proxyName) {
final delayParams = { final delayParams = {
"proxy-name": proxyName, "proxy-name": proxyName,
"timeout": appConstant.httpTimeoutDuration.inMilliseconds, "timeout": httpTimeoutDuration.inMilliseconds,
}; };
clashFFI.asyncTestDelay(json.encode(delayParams).toNativeUtf8().cast()); clashFFI.asyncTestDelay(json.encode(delayParams).toNativeUtf8().cast());
return true; return true;

View File

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

View File

@@ -2,27 +2,26 @@ import 'dart:ui';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
class AppConstant { const appName = "FlClash";
final packageName = "com.follow.clash"; const coreName = "clash.meta";
final name = "FlClash"; const packageName = "FlClash";
final httpTimeoutDuration = const Duration(milliseconds: 5000); const httpTimeoutDuration = Duration(milliseconds: 5000);
final moreDuration = const Duration(milliseconds: 100); const moreDuration = Duration(milliseconds: 100);
final defaultUpdateDuration = const Duration(days: 1); const defaultUpdateDuration = Duration(days: 1);
final mmdbFileName = "geoip.metadb"; const mmdbFileName = "geoip.metadb";
final profilesDirectoryName = "profiles"; const profilesDirectoryName = "profiles";
final configFileName = "config.yaml"; const localhost = "127.0.0.1";
final localhost = "127.0.0.1"; const clashConfigKey = "clash_config";
final clashKey = "clash"; const configKey = "config";
final configKey = "config"; const listItemPadding = EdgeInsets.symmetric(horizontal: 16);
final listItemPadding = const EdgeInsets.symmetric(horizontal: 16); const double dialogCommonWidth = 300;
final dialogCommonWidth = 300; const repository = "chen08209/FlClash";
final repository = "chen08209/FlClash"; const maxMobileWidth = 600;
final filter = ImageFilter.blur( const maxLaptopWidth = 840;
sigmaX: 5, final filter = ImageFilter.blur(
sigmaY: 5, sigmaX: 5,
tileMode: TileMode.mirror, sigmaY: 5,
); tileMode: TileMode.mirror,
final defaultPrimaryColor = Colors.brown; );
}
final appConstant = AppConstant(); const defaultPrimaryColor = Colors.brown;

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:fl_clash/widgets/scaffold.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
extension BuildContextExtension on BuildContext { extension BuildContextExtension on BuildContext {
AppController get appController {
final appController =
findAncestorStateOfType<ApplicationState>()?.appController;
assert(appController != null, "only use application environment");
return appController!;
}
CommonScaffoldState? get commonScaffoldState { CommonScaffoldState? get commonScaffoldState {
return findAncestorStateOfType<CommonScaffoldState>(); return findAncestorStateOfType<CommonScaffoldState>();
@@ -19,8 +11,6 @@ extension BuildContextExtension on BuildContext {
return MediaQuery.of(this).size.width; return MediaQuery.of(this).size.width;
} }
bool get isMobile => width < 600;
ColorScheme get colorScheme => Theme.of(this).colorScheme; ColorScheme get colorScheme => Theme.of(this).colorScheme;
TextTheme get textTheme => Theme.of(this).textTheme; TextTheme get textTheme => Theme.of(this).textTheme;

107
lib/common/dav_client.dart Normal file
View File

@@ -0,0 +1,107 @@
import 'dart:async';
import 'dart:convert';
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:path/path.dart';
import 'package:webdav_client/webdav_client.dart';
class DAVClient {
late Client client;
Completer<bool> pingCompleter = Completer();
DAVClient(DAV dav) {
client = newClient(
dav.uri,
user: dav.user,
password: dav.password,
);
client.setHeaders(
{
'accept-charset': 'utf-8',
'Content-Type': 'text/xml',
},
);
client.setConnectTimeout(8000);
client.setSendTimeout(8000);
client.setReceiveTimeout(8000);
pingCompleter.complete(_ping());
}
Future<bool> _ping() async {
try {
await client.ping();
await client.mkdir("/$appName");
await client.mkdir("/$appName/$profilesDirectoryName");
return true;
} catch (_) {
return false;
}
}
get root => "/$appName";
get remoteConfig => "$root/$configKey.json";
get remoteClashConfig => "$root/$clashConfigKey.json";
get remoteProfiles => "$root/$profilesDirectoryName";
backup() async {
final appController = globalState.appController;
final config = appController.config;
final clashConfig = appController.clashConfig;
await client.mkdir("$root");
client.write(
remoteConfig,
utf8.encode(
json.encode(config.toJson()),
),
);
client.write(
remoteClashConfig,
utf8.encode(
json.encode(clashConfig.toJson()),
),
);
await client.remove(remoteProfiles);
for (final profile in config.profiles) {
final path = await appPath.getProfilePath(profile.id);
if (path == null) continue;
await client.writeFromFile(
path,
"$remoteProfiles/${basename(path)}",
);
}
return true;
}
recovery({required RecoveryOption recoveryOption}) async {
final profiles = await client.readDir(remoteProfiles);
final profilesPath = await appPath.getProfilesPath();
for (final file in profiles) {
await client.read2File(
"$remoteProfiles/${file.name}",
join(
profilesPath,
file.name,
),
);
}
final configRaw = utf8.decode((await client.read(remoteConfig)));
final clashConfigRaw = utf8.decode(await client.read(remoteClashConfig));
final config = Config.fromJson(json.decode(configRaw));
final clashConfig = ClashConfig.fromJson(json.decode(clashConfigRaw));
if(recoveryOption == RecoveryOption.onlyProfiles){
globalState.appController.config.update(config, RecoveryOption.onlyProfiles);
}else{
globalState.appController.config.update(config, RecoveryOption.all);
globalState.appController.clashConfig.update(clashConfig);
}
await globalState.appController.applyProfile();
globalState.appController.savePreferences();
return true;
}
}

View File

@@ -1,29 +0,0 @@
import 'dart:io';
import 'package:file_picker/file_picker.dart';
import 'package:fl_clash/common/app_localizations.dart';
import 'package:fl_clash/models/models.dart';
class FileUtil {
static Future<Result<PlatformFile>> pickerConfig() async {
FilePickerResult? filePickerResult;
if (Platform.isAndroid) {
filePickerResult = await FilePicker.platform.pickFiles(
withData: true,
type: FileType.custom,
allowedExtensions: ['txt', 'conf'],
);
} else {
filePickerResult = await FilePicker.platform.pickFiles(
withData: true,
type: FileType.custom,
allowedExtensions: ['yaml', 'txt', 'conf'],
);
}
final file = filePickerResult?.files.first;
if (file == null) {
return Result.error(message: appLocalizations.pleaseUploadFile);
}
return Result.success(data: file);
}
}

View File

@@ -10,7 +10,7 @@ class AutoLaunch {
AutoLaunch._internal() { AutoLaunch._internal() {
launchAtStartup.setup( launchAtStartup.setup(
appName: appConstant.name, appName: appName,
appPath: Platform.resolvedExecutable, appPath: Platform.resolvedExecutable,
); );
} }

View File

@@ -1,23 +1,27 @@
import 'dart:io'; import 'dart:io';
import 'dart:isolate';
import 'dart:typed_data';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:zxing2/qrcode.dart';
import 'package:image/image.dart' as img;
class Other { class Other {
static Color? getDelayColor(int? delay) { Color? getDelayColor(int? delay) {
if (delay == null) return null; if (delay == null) return null;
if (delay < 0) return Colors.red; if (delay < 0) return Colors.red;
if (delay < 600) return Colors.green; if (delay < 600) return Colors.green;
return const Color(0xFFC57F0A); return const Color(0xFFC57F0A);
} }
static String getDateStringLast2(int value) { String getDateStringLast2(int value) {
var valueRaw = "0$value"; var valueRaw = "0$value";
return valueRaw.substring( return valueRaw.substring(
valueRaw.length - 2, valueRaw.length - 2,
); );
} }
static String getTimeDifference(DateTime dateTime) { String getTimeDifference(DateTime dateTime) {
var currentDateTime = DateTime.now(); var currentDateTime = DateTime.now();
var difference = currentDateTime.difference(dateTime); var difference = currentDateTime.difference(dateTime);
var inHours = difference.inHours; var inHours = difference.inHours;
@@ -27,7 +31,7 @@ class Other {
return "${getDateStringLast2(inHours)}:${getDateStringLast2(inMinutes)}:${getDateStringLast2(inSeconds)}"; return "${getDateStringLast2(inHours)}:${getDateStringLast2(inMinutes)}:${getDateStringLast2(inSeconds)}";
} }
static String getTimeText(int? timeStamp) { String getTimeText(int? timeStamp) {
if (timeStamp == null) { if (timeStamp == null) {
return '00:00:00'; return '00:00:00';
} }
@@ -39,7 +43,7 @@ class Other {
return "${getDateStringLast2(inHours)}:${getDateStringLast2(inMinutes)}:${getDateStringLast2(inSeconds)}"; return "${getDateStringLast2(inHours)}:${getDateStringLast2(inMinutes)}:${getDateStringLast2(inSeconds)}";
} }
static Locale? getLocaleForString(String? localString) { Locale? getLocaleForString(String? localString) {
if (localString == null) return null; if (localString == null) return null;
var localSplit = localString.split("_"); var localSplit = localString.split("_");
if (localSplit.length == 1) { if (localSplit.length == 1) {
@@ -57,7 +61,7 @@ class Other {
return null; return null;
} }
static int sortByChar(String a, String b) { int sortByChar(String a, String b) {
if (a.isEmpty && b.isEmpty) { if (a.isEmpty && b.isEmpty) {
return 0; return 0;
} }
@@ -77,7 +81,7 @@ class Other {
} }
} }
static String getOverwriteLabel(String label) { String getOverwriteLabel(String label) {
final reg = RegExp(r'\((\d+)\)$'); final reg = RegExp(r'\((\d+)\)$');
final matches = reg.allMatches(label); final matches = reg.allMatches(label);
if (matches.isNotEmpty) { if (matches.isNotEmpty) {
@@ -89,21 +93,7 @@ class Other {
} }
} }
// static FutureOr<void> Function(T p) debounce<T>(void Function(T? p) func, String getTrayIconPath() {
// {Duration? duration}) {
// Timer? timer;
// return ([T? p]) {
// if (timer != null) {
// timer?.cancel();
// }
// timer = Timer(duration ?? const Duration(milliseconds: 300), () {
// func(p);
// });
// };
// }
static String getTrayIconPath() {
if (Platform.isWindows) { if (Platform.isWindows) {
return "assets/images/app_icon.ico"; return "assets/images/app_icon.ico";
} else { } 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> v1 = version1.split('+')[0].split('.');
List<String> v2 = version2.split('+')[0].split('.'); List<String> v2 = version2.split('+')[0].split('.');
int major1 = int.parse(v1[0]); int major1 = int.parse(v1[0]);
@@ -133,4 +123,61 @@ class Other {
int build2 = version2.contains('+') ? int.parse(version2.split('+')[1]) : 0; int build2 = version2.contains('+') ? int.parse(version2.split('+')[1]) : 0;
return build1.compareTo(build2); 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;
}
});
}
String? getFileNameForDisposition(String? disposition) {
if (disposition == null) return null;
final parseValue = HeaderValue.parse(disposition);
final parameters = parseValue.parameters;
final key = parameters.keys
.firstWhere((key) => key.startsWith("filename"), orElse: () => '');
if (key.isEmpty) return null;
if (key == "filename*") {
return Uri.decodeComponent((parameters[key] ?? "").split("'").last);
} else {
return parameters[key];
}
}
double getViewWidth() {
final view = WidgetsBinding.instance.platformDispatcher.views.first;
final size = view.physicalSize / view.devicePixelRatio;
return size.width;
}
List<String> parseReleaseBody(String? body) {
if(body == null) return [];
const pattern = r'- (.+?)\. \[.+?\]';
final regex = RegExp(pattern);
return regex
.allMatches(body)
.map((match) => match.group(1) ?? '')
.where((item) => item.isNotEmpty)
.toList();
}
} }
final other = Other();

View File

@@ -26,14 +26,9 @@ class AppPath {
return directory.path; return directory.path;
} }
Future<String> getConfigPath() async {
final directory = await applicationSupportDirectoryCompleter.future;
return join(directory.path, appConstant.configFileName);
}
Future<String> getProfilesPath() async { Future<String> getProfilesPath() async {
final directory = await applicationSupportDirectoryCompleter.future; final directory = await applicationSupportDirectoryCompleter.future;
return join(directory.path, appConstant.profilesDirectoryName); return join(directory.path, profilesDirectoryName);
} }
Future<String?> getProfilePath(String? id) async { Future<String?> getProfilePath(String? id) async {
@@ -44,7 +39,7 @@ class AppPath {
Future<String> getMMDBPath() async { Future<String> getMMDBPath() async {
var directory = await applicationSupportDirectoryCompleter.future; var directory = await applicationSupportDirectoryCompleter.future;
return join(directory.path, appConstant.mmdbFileName); return join(directory.path, mmdbFileName);
} }
} }

43
lib/common/picker.dart Normal file
View File

@@ -0,0 +1,43 @@
import 'dart:io';
import 'package:file_picker/file_picker.dart';
import 'package:fl_clash/common/common.dart';
import 'package:image_picker/image_picker.dart';
import 'package:fl_clash/models/models.dart';
class Picker {
Future<Result<PlatformFile>> pickerConfigFile() async {
FilePickerResult? filePickerResult;
if (Platform.isAndroid) {
filePickerResult = await FilePicker.platform.pickFiles(
withData: true,
type: FileType.custom,
allowedExtensions: ['txt', 'conf'],
);
} else {
filePickerResult = await FilePicker.platform.pickFiles(
withData: true,
type: FileType.custom,
allowedExtensions: ['yaml', 'txt', 'conf'],
);
}
final file = filePickerResult?.files.first;
if (file == null) {
return Result.error(appLocalizations.pleaseUploadFile);
}
return Result.success(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(appLocalizations.pleaseUploadValidQrcode);
}
return Result.success(result);
}
}
final picker = Picker();

View File

@@ -1,7 +1,6 @@
import 'dart:async'; import 'dart:async';
import 'dart:convert'; import 'dart:convert';
import 'package:flutter/cupertino.dart';
import 'package:shared_preferences/shared_preferences.dart'; import 'package:shared_preferences/shared_preferences.dart';
import '../models/models.dart'; import '../models/models.dart';
@@ -23,42 +22,40 @@ class Preferences {
Future<ClashConfig?> getClashConfig() async { Future<ClashConfig?> getClashConfig() async {
final preferences = await sharedPreferencesCompleter.future; final preferences = await sharedPreferencesCompleter.future;
final clashConfigString = preferences.getString(appConstant.clashKey); final clashConfigString = preferences.getString(clashConfigKey);
if (clashConfigString == null) return null; if (clashConfigString == null) return null;
final clashConfigMap = json.decode(clashConfigString); final clashConfigMap = json.decode(clashConfigString);
try { try {
return ClashConfig.fromJson(clashConfigMap); return ClashConfig.fromJson(clashConfigMap);
} catch (e) { } catch (e) {
debugPrint(e.toString()); throw e.toString();
return null;
} }
} }
Future<bool> saveClashConfig(ClashConfig clashConfig) async { Future<bool> saveClashConfig(ClashConfig clashConfig) async {
final preferences = await sharedPreferencesCompleter.future; final preferences = await sharedPreferencesCompleter.future;
return preferences.setString( return preferences.setString(
appConstant.clashKey, clashConfigKey,
json.encode(clashConfig), json.encode(clashConfig),
); );
} }
Future<Config?> getConfig() async { Future<Config?> getConfig() async {
final preferences = await sharedPreferencesCompleter.future; final preferences = await sharedPreferencesCompleter.future;
final configString = preferences.getString(appConstant.configKey); final configString = preferences.getString(configKey);
if (configString == null) return null; if (configString == null) return null;
final configMap = json.decode(configString); final configMap = json.decode(configString);
try { try {
return Config.fromJson(configMap); return Config.fromJson(configMap);
} catch (e) { } catch (e) {
debugPrint(e.toString()); throw e.toString();
return null;
} }
} }
Future<bool> saveConfig(Config config) async { Future<bool> saveConfig(Config config) async {
final preferences = await sharedPreferencesCompleter.future; final preferences = await sharedPreferencesCompleter.future;
return preferences.setString( return preferences.setString(
appConstant.configKey, configKey,
json.encode(config), json.encode(config),
); );
} }

View File

@@ -6,31 +6,31 @@ import '../models/models.dart';
class Request { class Request {
static Future<Result<Response>> getFileResponseForUrl(String url) async { static Future<Result<Response>> getFileResponseForUrl(String url) async {
final headers = {'User-Agent': appConstant.name}; final headers = {'User-Agent': coreName};
try { try {
final response = await get(Uri.parse(url), headers: headers).timeout( final response = await get(Uri.parse(url), headers: headers).timeout(
appConstant.httpTimeoutDuration, httpTimeoutDuration,
); );
return Result.success(data: response); return Result.success(response);
} catch (err) { } catch (err) {
return Result.error(message: err.toString()); return Result.error(err.toString());
} }
} }
static Future<Result<String>> checkForUpdate() async { static Future<Result<Map<String,dynamic>>> checkForUpdate() async {
final response = await get( final response = await get(
Uri.parse( Uri.parse(
"https://api.github.com/repos/${appConstant.repository}/releases/latest", "https://api.github.com/repos/$repository/releases/latest",
), ),
); );
if (response.statusCode != 200) return Result.error(); if (response.statusCode != 200) return Result.error();
final body = json.decode(response.body); final body = json.decode(response.body) as Map<String,dynamic>;
final remoteVersion = body['tag_name']; final remoteVersion = body['tag_name'];
final packageInfo = await appPackage.packageInfoCompleter.future; final packageInfo = await appPackage.packageInfoCompleter.future;
final version = packageInfo.version; final version = packageInfo.version;
final hasUpdate = final hasUpdate =
Other.compareVersions(remoteVersion.replaceAll('v', ''), version) > 0; other.compareVersions(remoteVersion.replaceAll('v', ''), version) > 0;
if (!hasUpdate) return Result.error(); if (!hasUpdate) return Result.error();
return Result.success(data: body['body']); return Result.success(body);
} }
} }

View File

@@ -3,6 +3,7 @@ import 'dart:async';
import 'package:fl_clash/state.dart'; import 'package:fl_clash/state.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:provider/provider.dart'; import 'package:provider/provider.dart';
import 'package:url_launcher/url_launcher.dart';
import 'clash/core.dart'; import 'clash/core.dart';
import 'enum/enum.dart'; import 'enum/enum.dart';
@@ -39,6 +40,8 @@ class AppController {
updateRunTime, updateRunTime,
updateTraffic, updateTraffic,
]; ];
clearShowProxyDelay();
testShowProxyDelay();
} else { } else {
await globalState.stopSystemProxy(); await globalState.stopSystemProxy();
appState.traffics = []; appState.traffics = [];
@@ -114,7 +117,7 @@ class AppController {
); );
} }
applyProfile() async { Future applyProfile() async {
await globalState.applyProfile( await globalState.applyProfile(
appState: appState, appState: appState,
config: config, config: config,
@@ -206,6 +209,55 @@ class AppController {
} }
} }
autoCheckUpdate() async {
if (!config.autoCheckUpdate) return;
final res = await Request.checkForUpdate();
checkUpdateResultHandle(result: res);
}
checkUpdateResultHandle({
Result<Map<String, dynamic>>? result,
bool handleError = false
}) async {
if (result == null) return;
if (result.type == ResultType.success) {
final tagName = result.data?['tag_name'];
final body = result.data?['body'];
final submits = other.parseReleaseBody(body);
globalState.showMessage(
title: appLocalizations.discoverNewVersion,
message: TextSpan(
text: "$tagName \n",
style: context.textTheme.headlineSmall,
children: [
TextSpan(
text: "\n",
style: context.textTheme.bodyMedium,
),
for (final submit in submits)
TextSpan(
text: "- $submit \n",
style: context.textTheme.bodyMedium,
),
],
),
onTab: () {
launchUrl(
Uri.parse("https://github.com/$repository/releases/latest"),
);
},
confirmText: appLocalizations.goDownload,
);
} else if(handleError){
globalState.showMessage(
title: appLocalizations.checkUpdate,
message: TextSpan(
text: appLocalizations.checkUpdateError,
),
);
}
}
afterInit() async { afterInit() async {
if (config.autoRun) { if (config.autoRun) {
await updateSystemProxy(true); await updateSystemProxy(true);
@@ -218,9 +270,11 @@ class AppController {
if (!config.silentLaunch) { if (!config.silentLaunch) {
window?.show(); window?.show();
} }
autoCheckUpdate();
} }
healthcheck() { healthcheck() {
if (globalState.healthcheckLock) return;
for (final delay in appState.delayMap.entries) { for (final delay in appState.delayMap.entries) {
setDelay( setDelay(
Delay( Delay(
@@ -241,8 +295,7 @@ class AppController {
} }
toPage(int index, {bool hasAnimate = false}) { toPage(int index, {bool hasAnimate = false}) {
final nextLabel = globalState.currentNavigationItems[index].label; appState.currentLabel = appState.currentNavigationItems[index].label;
appState.currentLabel = nextLabel;
if ((config.isAnimateToPage || hasAnimate)) { if ((config.isAnimateToPage || hasAnimate)) {
globalState.pageController?.animateToPage( globalState.pageController?.animateToPage(
index, index,
@@ -254,12 +307,8 @@ class AppController {
} }
} }
updatePackages() async {
await globalState.updatePackages(appState);
}
toProfiles() { toProfiles() {
final index = globalState.currentNavigationItems.indexWhere( final index = appState.currentNavigationItems.indexWhere(
(element) => element.label == "profiles", (element) => element.label == "profiles",
); );
if (index != -1) { if (index != -1) {
@@ -267,31 +316,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() { initLink() {
linkManager.initAppLinksListen( linkManager.initAppLinksListen(
(url) { (url) {
@@ -321,8 +345,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 { addProfileFormFile() async {
final result = await FileUtil.pickerConfig(); final result = await picker.pickerConfigFile();
if (result.type == ResultType.error) return; if (result.type == ResultType.error) return;
if (!context.mounted) return; if (!context.mounted) return;
globalState.navigatorKey.currentState?.popUntil((route) => route.isFirst); globalState.navigatorKey.currentState?.popUntil((route) => route.isFirst);
@@ -351,6 +400,22 @@ 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() { clearShowProxyDelay() {
final showProxyDelay = appState.getRealProxyName(appState.showProxyName); final showProxyDelay = appState.getRealProxyName(appState.showProxyName);
if (showProxyDelay != null) { if (showProxyDelay != null) {
@@ -359,4 +424,20 @@ class AppController {
); );
} }
} }
testShowProxyDelay() {
final showProxyDelay = appState.getRealProxyName(appState.showProxyName);
if (showProxyDelay != null) {
globalState.updateCurrentDelay(showProxyDelay);
}
}
updateViewWidth() {
appState.viewWidth = context.width;
if (appState.viewWidth == 0) {
Future.delayed(moreDuration, () {
updateViewWidth();
});
}
}
} }

View File

@@ -34,6 +34,8 @@ extension UsedProxyExtension on UsedProxy {
enum Mode { rule, global, direct } enum Mode { rule, global, direct }
enum ViewMode { mobile, laptop, desktop }
enum LogLevel { debug, info, warning, error, silent } enum LogLevel { debug, info, warning, error, silent }
enum TransportProtocol { udp, tcp } enum TransportProtocol { udp, tcp }
@@ -55,3 +57,8 @@ enum ProfileType { file, url }
enum ResultType { success, error } enum ResultType { success, error }
enum MessageType { log, tun, delay, process, now } enum MessageType { log, tun, delay, process, now }
enum RecoveryOption {
all,
onlyProfiles,
}

View File

@@ -1,4 +1,6 @@
import 'package:fl_clash/common/common.dart'; import 'package:fl_clash/common/common.dart';
import 'package:fl_clash/enum/enum.dart';
import 'package:fl_clash/models/common.dart';
import 'package:fl_clash/state.dart'; import 'package:fl_clash/state.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:package_info_plus/package_info_plus.dart'; import 'package:package_info_plus/package_info_plus.dart';
@@ -7,6 +9,20 @@ import 'package:url_launcher/url_launcher.dart';
class AboutFragment extends StatelessWidget { class AboutFragment extends StatelessWidget {
const AboutFragment({super.key}); const AboutFragment({super.key});
_checkUpdate(BuildContext context) async {
final commonScaffoldState = context.commonScaffoldState;
if (commonScaffoldState?.mounted != true) return;
final res =
await commonScaffoldState?.loadingRun<Result<Map<String, dynamic>>>(
Request.checkForUpdate,
title: appLocalizations.checkUpdate,
);
globalState.appController.checkUpdateResultHandle(
result: res,
handleError: true,
);
}
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
return ListView( return ListView(
@@ -32,7 +48,7 @@ class AboutFragment extends StatelessWidget {
crossAxisAlignment: CrossAxisAlignment.start, crossAxisAlignment: CrossAxisAlignment.start,
children: [ children: [
Text( Text(
appConstant.name, appName,
style: Theme.of(context).textTheme.headlineSmall, style: Theme.of(context).textTheme.headlineSmall,
), ),
FutureBuilder<PackageInfo>( FutureBuilder<PackageInfo>(
@@ -66,18 +82,7 @@ class AboutFragment extends StatelessWidget {
ListTile( ListTile(
title: Text(appLocalizations.checkUpdate), title: Text(appLocalizations.checkUpdate),
onTap: () { onTap: () {
final commonScaffoldState = context.commonScaffoldState; _checkUpdate(context);
if (commonScaffoldState?.mounted != true) return;
commonScaffoldState?.loadingRun(() async {
await globalState.checkUpdate(
() {
launchUrl(
Uri.parse(
"https://github.com/${appConstant.repository}/releases/latest"),
);
},
);
});
}, },
), ),
ListTile( ListTile(
@@ -93,7 +98,7 @@ class AboutFragment extends StatelessWidget {
title: Text(appLocalizations.project), title: Text(appLocalizations.project),
onTap: () { onTap: () {
launchUrl( launchUrl(
Uri.parse("https://github.com/${appConstant.repository}"), Uri.parse("https://github.com/$repository"),
); );
}, },
trailing: const Icon(Icons.launch), trailing: const Icon(Icons.launch),

View File

@@ -6,57 +6,22 @@ import 'package:fl_clash/widgets/widgets.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:provider/provider.dart'; import 'package:provider/provider.dart';
class AccessFragment extends StatelessWidget { class AccessFragment extends StatefulWidget {
const AccessFragment({super.key}); const AccessFragment({super.key});
Widget _buildPackageItem({ @override
required Package package, State<AccessFragment> createState() => _AccessFragmentState();
required bool value, }
required bool isActive,
required void Function(bool?) onChanged, class _AccessFragmentState extends State<AccessFragment> {
}) { final packagesListenable = ValueNotifier<List<Package>>([]);
return AbsorbPointer(
absorbing: !isActive, @override
child: ListItem.checkbox( void initState() {
leading: SizedBox( super.initState();
width: 48, WidgetsBinding.instance.addPostFrameCallback((_) async {
height: 48, packagesListenable.value = await app?.getPackages() ?? [];
child: FutureBuilder<ImageProvider?>( });
future: app?.getPackageIcon(package.packageName),
builder: (_, snapshot) {
if (!snapshot.hasData && snapshot.data == null) {
return Container();
} else {
return Image(
image: snapshot.data!,
gaplessPlayback: true,
width: 48,
height: 48,
);
}
},
),
),
title: Text(
package.label,
style: const TextStyle(
overflow: TextOverflow.ellipsis,
),
maxLines: 1,
),
subtitle: Text(
package.packageName,
style: const TextStyle(
overflow: TextOverflow.ellipsis,
),
maxLines: 1,
),
delegate: CheckboxDelegate(
value: value,
onChanged: onChanged,
),
),
);
} }
Widget _buildAppProxyModePopup() { Widget _buildAppProxyModePopup() {
@@ -143,148 +108,165 @@ class AccessFragment extends StatelessWidget {
); );
} }
Widget _buildPackageList(bool isAccessControl) { Widget _actionHeader({
return Selector2<AppState, Config, PackageListSelectorState>( required bool isAccessControl,
selector: (_, appState, config) => PackageListSelectorState( required List<String> valueList,
accessControl: config.accessControl, required String describe,
packages: appState.packages, required List<String> packageNameList,
), }) {
builder: (context, state, __) { return AbsorbPointer(
final accessControl = state.accessControl; absorbing: !isAccessControl,
final isFilterSystemApp = accessControl.isFilterSystemApp; child: Padding(
final packages = isFilterSystemApp padding: const EdgeInsets.only(
? state.packages top: 4,
.where((element) => element.isSystem == false) bottom: 4,
.toList() left: 16,
: state.packages; right: 8,
final packageNameList = packages.map((e) => e.packageName).toList(); ),
final accessControlMode = accessControl.mode; child: Row(
final valueList = mainAxisAlignment: MainAxisAlignment.spaceBetween,
accessControl.currentList.intersection(packageNameList); mainAxisSize: MainAxisSize.max,
final describe = accessControlMode == AccessControlMode.acceptSelected children: [
? appLocalizations.accessControlAllowDesc Expanded(
: appLocalizations.accessControlNotAllowDesc; child: IntrinsicHeight(
child: Column(
final listView = ListView.builder( mainAxisSize: MainAxisSize.max,
itemCount: packages.length, crossAxisAlignment: CrossAxisAlignment.start,
itemBuilder: (_, index) { children: [
final package = packages[index]; Expanded(
return _buildPackageItem( child: Row(
package: package,
value: valueList.contains(package.packageName),
isActive: isAccessControl,
onChanged: (value) {
if (value == true) {
valueList.add(package.packageName);
} else {
valueList.remove(package.packageName);
}
final config = context.read<Config>();
config.accessControl.currentList = valueList;
config.accessControl = config.accessControl.copyWith();
},
);
},
);
return DisabledMask(
status: !isAccessControl,
child: Column(
children: [
AbsorbPointer(
absorbing: !isAccessControl,
child: Padding(
padding: const EdgeInsets.only(
top: 4,
bottom: 4,
left: 16,
right: 8,
),
child: Row(
mainAxisAlignment: MainAxisAlignment.spaceBetween,
mainAxisSize: MainAxisSize.max,
children: [
Expanded(
child: IntrinsicHeight(
child: Column(
mainAxisSize: MainAxisSize.max,
crossAxisAlignment: CrossAxisAlignment.start,
children: [
Expanded(
child: Row(
children: [
Flexible(
child: Text(
appLocalizations.selected,
style: Theme.of(context)
.textTheme
.labelLarge
?.copyWith(
color: Theme.of(context)
.colorScheme
.primary,
),
),
),
const Flexible(
child: SizedBox(
width: 8,
),
),
Flexible(
child: Text(
"${valueList.length}",
style: Theme.of(context)
.textTheme
.labelLarge
?.copyWith(
color: Theme.of(context)
.colorScheme
.primary,
),
),
),
],
),
),
Flexible(
child: Text(describe),
)
],
),
),
),
Row(
mainAxisSize: MainAxisSize.min,
mainAxisAlignment: MainAxisAlignment.end,
children: [ children: [
Flexible( Flexible(
child: _buildSelectedAllButton( child: Text(
isSelectedAll: appLocalizations.selected,
valueList.length == packageNameList.length, style: Theme.of(context)
allValueList: packageNameList, .textTheme
.labelLarge
?.copyWith(
color:
Theme.of(context).colorScheme.primary,
),
),
),
const Flexible(
child: SizedBox(
width: 8,
),
),
Flexible(
child: Text(
"${valueList.length}",
style: Theme.of(context)
.textTheme
.labelLarge
?.copyWith(
color:
Theme.of(context).colorScheme.primary,
),
), ),
), ),
Flexible(child: _buildFilterSystemAppButton()),
Flexible(child: _buildAppProxyModePopup()),
], ],
), ),
], ),
Flexible(
child: Text(describe),
)
],
),
),
),
Row(
mainAxisSize: MainAxisSize.min,
mainAxisAlignment: MainAxisAlignment.end,
children: [
Flexible(
child: _buildSelectedAllButton(
isSelectedAll: valueList.length == packageNameList.length,
allValueList: packageNameList,
), ),
), ),
Flexible(child: _buildFilterSystemAppButton()),
Flexible(child: _buildAppProxyModePopup()),
],
),
],
),
),
);
}
Widget _buildPackageList(bool isAccessControl) {
return ValueListenableBuilder(
valueListenable: packagesListenable,
builder: (_, packages, ___) {
return Selector<Config, AccessControl>(
selector: (_, config) => config.accessControl,
builder: (context, accessControl, __) {
final isFilterSystemApp = accessControl.isFilterSystemApp;
final currentPackages = isFilterSystemApp
? packages
.where((element) => element.isSystem == false)
.toList()
: packages;
final packageNameList =
currentPackages.map((e) => e.packageName).toList();
final accessControlMode = accessControl.mode;
final valueList =
accessControl.currentList.intersection(packageNameList);
final describe =
accessControlMode == AccessControlMode.acceptSelected
? appLocalizations.accessControlAllowDesc
: appLocalizations.accessControlNotAllowDesc;
return DisabledMask(
status: !isAccessControl,
child: Column(
children: [
_actionHeader(
isAccessControl: isAccessControl,
valueList: valueList,
describe: describe,
packageNameList: packageNameList,
),
Expanded(
flex: 1,
child: FadeBox(
key: const Key("fade_box"),
child: currentPackages.isEmpty
? const Center(
child: CircularProgressIndicator(),
)
: ListView.builder(
itemCount: currentPackages.length,
itemBuilder: (_, index) {
final package = currentPackages[index];
return PackageListItem(
key: Key(package.label),
package: package,
value:
valueList.contains(package.packageName),
isActive: isAccessControl,
onChanged: (value) {
if (value == true) {
valueList.add(package.packageName);
} else {
valueList.remove(package.packageName);
}
final config = context.read<Config>();
config.accessControl.currentList =
valueList;
config.accessControl =
config.accessControl.copyWith();
},
);
},
),
),
),
],
), ),
Flexible( );
flex: 1, },
child: FadeBox(
child: packages.isEmpty
? const Center(
child: CircularProgressIndicator(),
)
: listView,
),
),
],
),
); );
}, },
); );
@@ -292,11 +274,6 @@ class AccessFragment extends StatelessWidget {
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
if (context.appController.appState.packages.isEmpty) {
WidgetsBinding.instance.addPostFrameCallback((_) {
context.appController.updatePackages();
});
}
return Selector<Config, bool>( return Selector<Config, bool>(
selector: (_, config) => config.isAccessControl, selector: (_, config) => config.isAccessControl,
builder: (_, isAccessControl, __) { builder: (_, isAccessControl, __) {
@@ -331,3 +308,64 @@ class AccessFragment extends StatelessWidget {
); );
} }
} }
class PackageListItem extends StatelessWidget {
final Package package;
final bool value;
final bool isActive;
final void Function(bool?) onChanged;
const PackageListItem({
super.key,
required this.package,
required this.value,
required this.isActive,
required this.onChanged,
});
@override
Widget build(BuildContext context) {
return AbsorbPointer(
absorbing: !isActive,
child: ListItem.checkbox(
leading: SizedBox(
width: 48,
height: 48,
child: FutureBuilder<ImageProvider?>(
future: app?.getPackageIcon(package.packageName),
builder: (_, snapshot) {
if (!snapshot.hasData && snapshot.data == null) {
return Container();
} else {
return Image(
image: snapshot.data!,
gaplessPlayback: true,
width: 48,
height: 48,
);
}
},
),
),
title: Text(
package.label,
style: const TextStyle(
overflow: TextOverflow.ellipsis,
),
maxLines: 1,
),
subtitle: Text(
package.packageName,
style: const TextStyle(
overflow: TextOverflow.ellipsis,
),
maxLines: 1,
),
delegate: CheckboxDelegate(
value: value,
onChanged: onChanged,
),
),
);
}
}

View File

@@ -2,6 +2,7 @@ import 'dart:io';
import 'package:fl_clash/common/common.dart'; import 'package:fl_clash/common/common.dart';
import 'package:fl_clash/models/models.dart'; import 'package:fl_clash/models/models.dart';
import 'package:fl_clash/state.dart';
import 'package:fl_clash/widgets/widgets.dart'; import 'package:fl_clash/widgets/widgets.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:intl/intl.dart'; import 'package:intl/intl.dart';
@@ -35,26 +36,6 @@ class ApplicationSettingFragment extends StatelessWidget {
); );
}, },
), ),
Selector<Config, bool>(
selector: (_, config) => config.isCompatible,
builder: (_, isCompatible, __) {
return ListItem.switchItem(
leading: const Icon(Icons.device_hub),
title: const Text("兼容模式"),
subtitle: const Text("开启将失去部分应用能力获得全量的Clash的支持"),
delegate: SwitchDelegate(
value: isCompatible,
onChanged: (bool value) async {
final appController = context.appController;
appController.config.isCompatible = value;
await appController.updateClashConfig(isPatch: false);
await appController.updateGroups();
appController.changeProxy();
},
),
);
},
),
if (system.isDesktop) if (system.isDesktop)
Selector<Config, bool>( Selector<Config, bool>(
selector: (_, config) => config.autoLaunch, selector: (_, config) => config.autoLaunch,
@@ -108,24 +89,6 @@ class ApplicationSettingFragment extends StatelessWidget {
); );
}, },
), ),
Selector<Config, bool>(
selector: (_, config) => config.openLogs,
builder: (_, openLogs, child) {
return ListItem.switchItem(
leading: const Icon(Icons.bug_report),
title: Text(appLocalizations.logcat),
subtitle: Text(appLocalizations.logcatDesc),
delegate: SwitchDelegate(
value: openLogs,
onChanged: (bool value) {
final config = context.read<Config>();
config.openLogs = value;
context.appController.updateLogStatus();
},
),
);
},
),
if (Platform.isAndroid) if (Platform.isAndroid)
Selector<Config, bool>( Selector<Config, bool>(
selector: (_, config) => config.isAnimateToPage, selector: (_, config) => config.isAnimateToPage,
@@ -144,6 +107,41 @@ class ApplicationSettingFragment extends StatelessWidget {
); );
}, },
), ),
Selector<Config, bool>(
selector: (_, config) => config.openLogs,
builder: (_, openLogs, child) {
return ListItem.switchItem(
leading: const Icon(Icons.bug_report),
title: Text(appLocalizations.logcat),
subtitle: Text(appLocalizations.logcatDesc),
delegate: SwitchDelegate(
value: openLogs,
onChanged: (bool value) {
final config = context.read<Config>();
config.openLogs = value;
globalState.appController.updateLogStatus();
},
),
);
},
),
Selector<Config, bool>(
selector: (_, config) => config.autoCheckUpdate,
builder: (_, autoCheckUpdate, child) {
return ListItem.switchItem(
leading: const Icon(Icons.system_update),
title: Text(appLocalizations.autoCheckUpdate),
subtitle: Text(appLocalizations.autoCheckUpdateDesc),
delegate: SwitchDelegate(
value: autoCheckUpdate,
onChanged: (bool value) {
final config = context.read<Config>();
config.autoCheckUpdate = value;
},
),
);
},
),
]; ];
return ListView.separated( return ListView.separated(
itemBuilder: (_, index) { itemBuilder: (_, index) {

View File

@@ -0,0 +1,362 @@
import 'package:fl_clash/common/common.dart';
import 'package:fl_clash/common/dav_client.dart';
import 'package:fl_clash/enum/enum.dart';
import 'package:fl_clash/models/config.dart';
import 'package:fl_clash/models/dav.dart';
import 'package:fl_clash/state.dart';
import 'package:fl_clash/widgets/fade_box.dart';
import 'package:fl_clash/widgets/list.dart';
import 'package:fl_clash/widgets/section.dart';
import 'package:fl_clash/widgets/text.dart';
import 'package:flutter/material.dart';
import 'package:provider/provider.dart';
class BackupAndRecovery extends StatefulWidget {
const BackupAndRecovery({super.key});
@override
State<BackupAndRecovery> createState() => _BackupAndRecoveryState();
}
class _BackupAndRecoveryState extends State<BackupAndRecovery> {
DAVClient? _client;
_showAddWebDAV(DAV? dav) async {
await globalState.showCommonDialog<String>(
child: WebDAVFormDialog(
dav: dav?.copyWith(),
),
);
}
_backup() async {
final commonScaffoldState = context.commonScaffoldState;
final res = await commonScaffoldState?.loadingRun<bool>(() async {
return await _client?.backup();
});
if(res != true) return;
globalState.showMessage(
title: appLocalizations.recovery,
message: TextSpan(text: appLocalizations.backupSuccess),
);
}
_recovery(RecoveryOption recoveryOption) async {
final commonScaffoldState = context.commonScaffoldState;
final res = await commonScaffoldState?.loadingRun<bool>(() async {
return await _client?.recovery(recoveryOption: recoveryOption);
});
if(res != true) return;
globalState.showMessage(
title: appLocalizations.recovery,
message: TextSpan(text: appLocalizations.recoverySuccess),
);
}
_handleRecovery() async {
final recoveryOption = await globalState.showCommonDialog<RecoveryOption>(
child: const RecoveryOptionsDialog(),
);
if (recoveryOption == null) return;
_recovery(recoveryOption);
}
@override
Widget build(BuildContext context) {
return Selector<Config, DAV?>(
selector: (_, config) => config.dav,
builder: (_, dav, __) {
if (dav == null) {
return ListView(
children: [
Section(
title: appLocalizations.account,
child: Builder(
builder: (_) {
return ListItem(
leading: const Icon(Icons.account_box),
title: Text(appLocalizations.noInfo),
subtitle: Text(appLocalizations.pleaseBindWebDAV),
trailing: FilledButton.tonal(
onPressed: () {
_showAddWebDAV(dav);
},
child: Text(
appLocalizations.bind,
),
),
);
},
),
)
],
);
}
_client = DAVClient(dav);
final pingFuture = _client!.pingCompleter.future;
return ListView(
children: [
Section(
title: appLocalizations.account,
child: ListItem(
leading: const Icon(Icons.account_box),
title: TooltipText(
text: Text(
dav.user,
maxLines: 1,
overflow: TextOverflow.ellipsis,
),
),
subtitle: Padding(
padding: const EdgeInsets.symmetric(vertical: 4),
child: Row(
crossAxisAlignment: CrossAxisAlignment.center,
children: [
Text(appLocalizations.connectivity),
FutureBuilder<bool>(
future: pingFuture,
builder: (_, snapshot) {
return Center(
child: FadeBox(
key: const Key("fade_box_1"),
child: snapshot.connectionState ==
ConnectionState.waiting
? const SizedBox(
width: 12,
height: 12,
child: CircularProgressIndicator(
strokeWidth: 1,
),
)
: Container(
decoration: BoxDecoration(
shape: BoxShape.circle,
color: snapshot.data == true
? Colors.green
: Colors.red,
),
width: 12,
height: 12,
),
),
);
},
),
],
),
),
trailing: FilledButton.tonal(
onPressed: () {
_showAddWebDAV(dav);
},
child: Text(
appLocalizations.edit,
),
),
),
),
FutureBuilder<bool>(
future: pingFuture,
builder: (_, snapshot) {
return FadeBox(
key: const Key("fade_box_2"),
child: snapshot.data == true
? Section(
title: appLocalizations.backupAndRecovery,
child: Column(
children: [
ListItem(
onTab: _backup,
title: Text(appLocalizations.backup),
subtitle: Text(appLocalizations.backupDesc),
),
ListItem(
onTab: _handleRecovery,
title: Text(appLocalizations.recovery),
subtitle: Text(appLocalizations.recoveryDesc),
),
],
),
)
: Container(),
);
},
),
],
);
},
);
}
}
class WebDAVFormDialog extends StatefulWidget {
final DAV? dav;
const WebDAVFormDialog({super.key, this.dav});
@override
State<WebDAVFormDialog> createState() => _WebDAVFormDialogState();
}
class _WebDAVFormDialogState extends State<WebDAVFormDialog> {
late TextEditingController uriController;
late TextEditingController userController;
late TextEditingController passwordController;
final _obscureController = ValueNotifier<bool>(true);
final GlobalKey<FormState> _formKey = GlobalKey<FormState>();
@override
void initState() {
super.initState();
uriController = TextEditingController(text: widget.dav?.uri);
userController = TextEditingController(text: widget.dav?.user);
passwordController = TextEditingController(text: widget.dav?.password);
}
_submit() {
if (!_formKey.currentState!.validate()) return;
globalState.appController.config.dav = DAV(
uri: uriController.text,
user: userController.text,
password: passwordController.text,
);
Navigator.pop(context);
}
_delete() {
globalState.appController.config.dav = null;
Navigator.pop(context);
}
@override
Widget build(BuildContext context) {
return AlertDialog(
title: Text(appLocalizations.webDAVConfiguration),
content: Form(
key: _formKey,
child: SizedBox(
width: dialogCommonWidth,
child: Wrap(
runSpacing: 16,
children: [
TextFormField(
controller: uriController,
maxLines: 2,
minLines: 1,
decoration: InputDecoration(
prefixIcon: const Icon(Icons.link),
border: const OutlineInputBorder(),
labelText: appLocalizations.address,
helperText: appLocalizations.addressHelp,
),
validator: (String? value) {
if (value == null || value.isEmpty || !value.isUrl) {
return appLocalizations.addressTip;
}
return null;
},
),
TextFormField(
controller: userController,
decoration: InputDecoration(
prefixIcon: const Icon(Icons.account_circle),
border: const OutlineInputBorder(),
labelText: appLocalizations.account,
),
validator: (String? value) {
if (value == null || value.isEmpty) {
return appLocalizations.accountTip;
}
return null;
},
),
ValueListenableBuilder(
valueListenable: _obscureController,
builder: (_, obscure, __) {
return TextFormField(
controller: passwordController,
obscureText: obscure,
decoration: InputDecoration(
prefixIcon: const Icon(Icons.password),
border: const OutlineInputBorder(),
suffixIcon: IconButton(
icon: Icon(
obscure ? Icons.visibility : Icons.visibility_off,
),
onPressed: () {
_obscureController.value = !obscure;
},
),
labelText: appLocalizations.password,
),
validator: (String? value) {
if (value == null || value.isEmpty) {
return appLocalizations.passwordTip;
}
return null;
},
);
},
),
],
),
),
),
actions: [
if (widget.dav != null)
TextButton(
onPressed: _delete,
child: Text(appLocalizations.delete),
),
TextButton(
onPressed: _submit,
child: Text(appLocalizations.save),
)
],
);
}
}
class RecoveryOptionsDialog extends StatefulWidget {
const RecoveryOptionsDialog({super.key});
@override
State<RecoveryOptionsDialog> createState() => _RecoveryOptionsDialogState();
}
class _RecoveryOptionsDialogState extends State<RecoveryOptionsDialog> {
_handleOnTab(RecoveryOption? value) {
if (value == null) return;
Navigator.of(context).pop(value);
}
@override
Widget build(BuildContext context) {
return AlertDialog(
title: Text(appLocalizations.recovery),
contentPadding: const EdgeInsets.symmetric(
horizontal: 8,
vertical: 16,
),
content: SizedBox(
width: 250,
child: Wrap(
children: [
ListItem(
onTab: () {
_handleOnTab(RecoveryOption.onlyProfiles);
},
title: Text(appLocalizations.recoveryProfiles),
),
ListItem(
onTab: () {
_handleOnTab(RecoveryOption.all);
},
title: Text(appLocalizations.recoveryAll),
)
],
),
),
);
}
}

View File

@@ -24,8 +24,8 @@ class _ConfigFragmentState extends State<ConfigFragment> {
try { try {
final mixedPort = int.parse(port); final mixedPort = int.parse(port);
if (mixedPort < 1024 || mixedPort > 49151) throw "Invalid port"; if (mixedPort < 1024 || mixedPort > 49151) throw "Invalid port";
context.appController.clashConfig.mixedPort = mixedPort; globalState.appController.clashConfig.mixedPort = mixedPort;
context.appController.updateClashConfigDebounce(); globalState.appController.updateClashConfigDebounce();
} catch (e) { } catch (e) {
globalState.showMessage( globalState.showMessage(
title: appLocalizations.proxyPort, title: appLocalizations.proxyPort,
@@ -39,32 +39,14 @@ class _ConfigFragmentState extends State<ConfigFragment> {
_updateLoglevel(LogLevel? logLevel) { _updateLoglevel(LogLevel? logLevel) {
if (logLevel == null || if (logLevel == null ||
logLevel == context.appController.clashConfig.logLevel) return; logLevel == globalState.appController.clashConfig.logLevel) return;
context.appController.clashConfig.logLevel = logLevel; globalState.appController.clashConfig.logLevel = logLevel;
context.appController.updateClashConfigDebounce(); globalState.appController.updateClashConfigDebounce();
} }
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
List<Widget> items = [ List<Widget> items = [
Selector<ClashConfig, bool>(
selector: (_, clashConfig) => clashConfig.allowLan,
builder: (_, allowLan, __) {
return ListItem.switchItem(
leading: const Icon(Icons.device_hub),
title: Text(appLocalizations.allowLan),
subtitle: Text(appLocalizations.allowLanDesc),
delegate: SwitchDelegate(
value: allowLan,
onChanged: (bool value) async {
final clashConfig = context.read<ClashConfig>();
clashConfig.allowLan = value;
context.appController.updateClashConfigDebounce();
},
),
);
},
),
Selector<ClashConfig, int>( Selector<ClashConfig, int>(
selector: (_, clashConfig) => clashConfig.mixedPort, selector: (_, clashConfig) => clashConfig.mixedPort,
builder: (_, mixedPort, __) { builder: (_, mixedPort, __) {
@@ -72,6 +54,7 @@ class _ConfigFragmentState extends State<ConfigFragment> {
onTab: () { onTab: () {
_modifyMixedPort(mixedPort); _modifyMixedPort(mixedPort);
}, },
padding: const EdgeInsets.symmetric(horizontal: 16,vertical: 4),
leading: const Icon(Icons.adjust), leading: const Icon(Icons.adjust),
title: Text(appLocalizations.proxyPort), title: Text(appLocalizations.proxyPort),
trailing: FilledButton.tonal( trailing: FilledButton.tonal(
@@ -85,42 +68,101 @@ class _ConfigFragmentState extends State<ConfigFragment> {
); );
}, },
), ),
Selector<ClashConfig, LogLevel>( Selector<ClashConfig, bool>(
selector: (_, clashConfig) => clashConfig.logLevel, selector: (_, clashConfig) => clashConfig.allowLan,
builder: (_, value, __) { builder: (_, allowLan, __) {
return ListItem( return ListItem.switchItem(
leading: const Icon(Icons.feedback), leading: const Icon(Icons.device_hub),
title: Text(appLocalizations.logLevel), title: Text(appLocalizations.allowLan),
trailing: SizedBox( subtitle: Text(appLocalizations.allowLanDesc),
height: 48, delegate: SwitchDelegate(
child: DropdownMenu<LogLevel>( value: allowLan,
width: 124, onChanged: (bool value) async {
inputDecorationTheme: const InputDecorationTheme( final clashConfig = context.read<ClashConfig>();
filled: true, clashConfig.allowLan = value;
contentPadding: EdgeInsets.symmetric( globalState.appController.updateClashConfigDebounce();
vertical: 5, },
horizontal: 16,
),
),
initialSelection: value,
dropdownMenuEntries: [
for (final logLevel in LogLevel.values)
DropdownMenuEntry<LogLevel>(
value: logLevel,
label: logLevel.name,
)
],
onSelected: _updateLoglevel,
),
), ),
); );
}, },
), ),
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<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();
},
),
);
},
),
Padding(
padding: kMaterialListPadding,
child: Selector<ClashConfig, LogLevel>(
selector: (_, clashConfig) => clashConfig.logLevel,
builder: (_, value, __) {
return ListItem(
leading: const Icon(Icons.feedback),
title: Text(appLocalizations.logLevel),
trailing: SizedBox(
height: 48,
child: DropdownMenu<LogLevel>(
width: 124,
inputDecorationTheme: const InputDecorationTheme(
filled: true,
contentPadding: EdgeInsets.symmetric(
vertical: 5,
horizontal: 16,
),
),
initialSelection: value,
dropdownMenuEntries: [
for (final logLevel in LogLevel.values)
DropdownMenuEntry<LogLevel>(
value: logLevel,
label: logLevel.name,
)
],
onSelected: _updateLoglevel,
),
),
);
},
),
),
]; ];
return ListView.separated( return ListView.separated(
itemBuilder: (_, index) { itemBuilder: (_, index) {
return Container( return Container(
padding: kMaterialListPadding,
alignment: Alignment.center, alignment: Alignment.center,
child: items[index], child: items[index],
); );

View File

@@ -1,6 +1,8 @@
import 'package:fl_clash/enum/enum.dart';
import 'package:fl_clash/models/models.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:flutter_adaptive_scaffold/flutter_adaptive_scaffold.dart';
import 'package:fl_clash/widgets/widgets.dart'; import 'package:fl_clash/widgets/widgets.dart';
import 'package:provider/provider.dart';
import 'network_detection.dart'; import 'network_detection.dart';
import 'core_info.dart'; import 'core_info.dart';
@@ -17,63 +19,51 @@ class DashboardFragment extends StatefulWidget {
} }
class _DashboardFragmentState extends State<DashboardFragment> { class _DashboardFragmentState extends State<DashboardFragment> {
_buildGrid(bool isDesktop) {
return SingleChildScrollView(
padding: const EdgeInsets.all(16),
child: Grid(
crossAxisCount: 12,
crossAxisSpacing: 16,
mainAxisSpacing: 16,
children: [
GridItem(
crossAxisCellCount: isDesktop ? 8 : 12,
child: const NetworkSpeed(),
),
GridItem(
crossAxisCellCount: isDesktop ? 4 : 6,
child: const OutboundMode(),
),
GridItem(
crossAxisCellCount: isDesktop ? 4 : 6,
child: const NetworkDetection(),
),
GridItem(
crossAxisCellCount: isDesktop ? 4 : 6,
child: const TrafficUsage(),
),
GridItem(
crossAxisCellCount: isDesktop ? 4 : 6,
child: const CoreInfo(),
),
],
),
);
}
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
return LayoutBuilder(builder: (_, container) { return FloatLayout(
if (container.maxWidth < 200) return Container(); floatingWidget: const FloatWrapper(
return FloatLayout( child: StartButton(),
floatingWidget: const FloatWrapper( ),
child: StartButton(), child: Align(
), alignment: Alignment.topCenter,
child: Align( child: SingleChildScrollView(
alignment: Alignment.topCenter, padding: const EdgeInsets.all(16),
child: SlotLayout( child: Selector<AppState, ViewMode>(
config: { selector: (_, appState) => appState.viewMode,
Breakpoints.small: SlotLayout.from( builder: (_, viewMode, ___) {
key: const Key('dashboard_small'), final isDesktop = viewMode == ViewMode.desktop;
builder: (_) => _buildGrid(false), return Grid(
), crossAxisCount: 12,
Breakpoints.mediumAndUp: SlotLayout.from( crossAxisSpacing: 16,
key: const Key('dashboard_mediumAndUp'), mainAxisSpacing: 16,
builder: (_) => _buildGrid(true), children: [
), GridItem(
crossAxisCellCount: isDesktop ? 8 : 12,
child: const NetworkSpeed(),
),
GridItem(
crossAxisCellCount: isDesktop ? 4 : 6,
child: const OutboundMode(),
),
GridItem(
crossAxisCellCount: isDesktop ? 4 : 6,
child: const NetworkDetection(),
),
GridItem(
crossAxisCellCount: isDesktop ? 4 : 6,
child: const TrafficUsage(),
),
GridItem(
crossAxisCellCount: isDesktop ? 4 : 6,
child: const CoreInfo(),
),
],
);
}, },
), ),
), ),
); ),
}); );
} }
} }

View File

@@ -73,52 +73,6 @@ class _NetworkDetectionState extends State<NetworkDetection> {
); );
} }
_updateCurrentDelay(
String? currentProxyName,
int? delay,
bool isCurrent,
bool isInit,
) {
if (!isCurrent || currentProxyName == null || !isInit) return;
WidgetsBinding.instance.addPostFrameCallback((timeStamp) {
if (delay == null) {
context.appController.setDelay(
Delay(
name: currentProxyName,
value: 0,
),
);
globalState.updateCurrentDelay(
currentProxyName,
);
}
});
}
_updateCurrentDelayContainer(Widget child) {
return Selector2<AppState, Config, UpdateCurrentDelaySelectorState>(
selector: (_, appState, config) {
return UpdateCurrentDelaySelectorState(
isInit: appState.isInit,
currentProxyName: appState.getRealProxyName(appState.showProxyName),
delay: appState
.delayMap[appState.getRealProxyName(appState.showProxyName)],
isCurrent: appState.currentLabel == 'dashboard',
);
},
builder: (_, state, __) {
_updateCurrentDelay(
state.currentProxyName,
state.delay,
state.isCurrent,
state.isInit,
);
return child;
},
child: child,
);
}
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
return CommonCard( return CommonCard(
@@ -126,57 +80,55 @@ class _NetworkDetectionState extends State<NetworkDetection> {
iconData: Icons.network_check, iconData: Icons.network_check,
label: appLocalizations.networkDetection, label: appLocalizations.networkDetection,
), ),
child: _updateCurrentDelayContainer( child: Selector<AppState, NetworkDetectionSelectorState>(
Selector<AppState, NetworkDetectionSelectorState>( selector: (_, appState) {
selector: (_, appState) { return NetworkDetectionSelectorState(
return NetworkDetectionSelectorState( currentProxyName: appState.showProxyName,
currentProxyName: appState.showProxyName, delay: appState.getDelay(
delay: appState.getDelay( appState.showProxyName,
appState.showProxyName, ),
), );
); },
}, builder: (_, state, __) {
builder: (_, state, __) { return Container(
return Container( padding: const EdgeInsets.all(16).copyWith(top: 0),
padding: const EdgeInsets.all(16).copyWith(top: 0), child: Column(
child: Column( mainAxisSize: MainAxisSize.min,
mainAxisSize: MainAxisSize.min, crossAxisAlignment: CrossAxisAlignment.start,
crossAxisAlignment: CrossAxisAlignment.start, children: [
children: [ Flexible(
Flexible( flex: 0,
flex: 0, child: TooltipText(
child: TooltipText( text: Text(
text: Text( state.currentProxyName ?? appLocalizations.noProxy,
state.currentProxyName ?? appLocalizations.noProxy, overflow: TextOverflow.ellipsis,
overflow: TextOverflow.ellipsis, maxLines: 1,
maxLines: 1, style: Theme.of(context)
style: Theme.of(context) .textTheme
.textTheme .titleMedium
.titleMedium ?.toSoftBold(),
?.toSoftBold(), ),
),
),
const SizedBox(
height: 8,
),
Flexible(
child: Container(
height: globalState.appController.measure.titleLargeHeight,
alignment: Alignment.centerLeft,
child: FadeBox(
child: _buildDescription(
state.currentProxyName,
state.delay,
), ),
), ),
), ),
const SizedBox( ),
height: 8, ],
), ),
Flexible( );
child: Container( },
height: context.appController.measure.titleLargeHeight,
alignment: Alignment.centerLeft,
child: FadeBox(
child: _buildDescription(
state.currentProxyName,
state.delay,
),
),
),
),
],
),
);
},
),
), ),
); );
} }

View File

@@ -1,5 +1,6 @@
import 'package:fl_clash/common/common.dart'; import 'package:fl_clash/common/common.dart';
import 'package:fl_clash/models/models.dart'; import 'package:fl_clash/models/models.dart';
import 'package:fl_clash/state.dart';
import 'package:fl_clash/widgets/widgets.dart'; import 'package:fl_clash/widgets/widgets.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:provider/provider.dart'; import 'package:provider/provider.dart';
@@ -68,7 +69,7 @@ class _NetworkSpeedState extends State<NetworkSpeed> {
style: bodyMedium, style: bodyMedium,
maxLines: 1, maxLines: 1,
); );
final size = context.appController.measure.computeTextSize(valueText); final size = globalState.appController.measure.computeTextSize(valueText);
return Column( return Column(
crossAxisAlignment: CrossAxisAlignment.center, crossAxisAlignment: CrossAxisAlignment.center,

View File

@@ -1,6 +1,7 @@
import 'package:fl_clash/common/common.dart'; import 'package:fl_clash/common/common.dart';
import 'package:fl_clash/enum/enum.dart'; import 'package:fl_clash/enum/enum.dart';
import 'package:fl_clash/models/models.dart'; import 'package:fl_clash/models/models.dart';
import 'package:fl_clash/state.dart';
import 'package:fl_clash/widgets/widgets.dart'; import 'package:fl_clash/widgets/widgets.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:intl/intl.dart'; import 'package:intl/intl.dart';
@@ -10,7 +11,7 @@ class OutboundMode extends StatelessWidget {
const OutboundMode({super.key}); const OutboundMode({super.key});
_changeMode(BuildContext context, Mode? value) async { _changeMode(BuildContext context, Mode? value) async {
final appController = context.appController; final appController = globalState.appController;
final clashConfig = appController.clashConfig; final clashConfig = appController.clashConfig;
final config = appController.config; final config = appController.config;
if (value == null || clashConfig.mode == value) return; if (value == null || clashConfig.mode == value) return;

View File

@@ -1,5 +1,6 @@
import 'package:fl_clash/common/common.dart'; import 'package:fl_clash/common/common.dart';
import 'package:fl_clash/models/models.dart'; import 'package:fl_clash/models/models.dart';
import 'package:fl_clash/state.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:provider/provider.dart'; import 'package:provider/provider.dart';
@@ -48,11 +49,8 @@ class _StartButtonState extends State<StartButton>
} }
updateSystemProxy() async { updateSystemProxy() async {
final appController = context.appController; final appController = globalState.appController;
await appController.updateSystemProxy(isStart); await appController.updateSystemProxy(isStart);
if (isStart && mounted) {
appController.clearShowProxyDelay();
}
} }
@override @override
@@ -66,10 +64,10 @@ class _StartButtonState extends State<StartButton>
if (!state.isInit || !state.hasProfile) { if (!state.isInit || !state.hasProfile) {
return Container(); return Container();
} }
final textWidth = context.appController.measure final textWidth = globalState.appController.measure
.computeTextSize( .computeTextSize(
Text( Text(
Other.getTimeDifference( other.getTimeDifference(
DateTime.now(), DateTime.now(),
), ),
style: style:
@@ -133,7 +131,7 @@ class _StartButtonState extends State<StartButton>
child: Selector<AppState, int?>( child: Selector<AppState, int?>(
selector: (_, appState) => appState.runTime, selector: (_, appState) => appState.runTime,
builder: (_, int? value, __) { builder: (_, int? value, __) {
final text = Other.getTimeText(value); final text = other.getTimeText(value);
return Text( return Text(
text, text,
style: Theme.of(context).textTheme.titleMedium?.toSoftBold(), style: Theme.of(context).textTheme.titleMedium?.toSoftBold(),

View File

@@ -7,4 +7,5 @@ export 'connections.dart';
export 'access.dart'; export 'access.dart';
export 'config.dart'; export 'config.dart';
export 'application_setting.dart'; export 'application_setting.dart';
export 'about.dart'; export 'about.dart';
export 'backup_and_recovery.dart';

View File

@@ -1,47 +1,16 @@
import 'dart:async'; import 'package:collection/collection.dart';
import 'package:fl_clash/common/common.dart'; import 'package:fl_clash/common/common.dart';
import 'package:fl_clash/enum/enum.dart';
import 'package:fl_clash/state.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:provider/provider.dart'; import 'package:provider/provider.dart';
import '../models/models.dart'; import '../models/models.dart';
import '../widgets/widgets.dart'; import '../widgets/widgets.dart';
class LogsFragment extends StatefulWidget { class LogsFragment extends StatelessWidget {
const LogsFragment({super.key}); const LogsFragment({super.key});
@override _initActions(BuildContext context) {
State<LogsFragment> createState() => _LogsFragmentState();
}
class _LogsFragmentState extends State<LogsFragment> {
final logsNotifier = ValueNotifier<List<Log>>([]);
Timer? timer;
@override
void initState() {
super.initState();
WidgetsBinding.instance.addPostFrameCallback((timeStamp) {
logsNotifier.value = context.read<AppState>().logs;
if (timer != null) {
timer?.cancel();
timer = null;
}
timer = Timer.periodic(const Duration(seconds: 3), (timer) {
if (mounted) {
logsNotifier.value = context.read<AppState>().logs;
}
});
});
}
@override
void dispose() {
super.dispose();
timer?.cancel();
timer = null;
}
_initActions() {
WidgetsBinding.instance.addPostFrameCallback((timeStamp) { WidgetsBinding.instance.addPostFrameCallback((timeStamp) {
final commonScaffoldState = final commonScaffoldState =
context.findAncestorStateOfType<CommonScaffoldState>(); context.findAncestorStateOfType<CommonScaffoldState>();
@@ -51,7 +20,7 @@ class _LogsFragmentState extends State<LogsFragment> {
showSearch( showSearch(
context: context, context: context,
delegate: LogsSearchDelegate( delegate: LogsSearchDelegate(
logs: logsNotifier.value.reversed.toList(), logs: globalState.appController.appState.logs.reversed.toList(),
), ),
); );
}, },
@@ -62,8 +31,10 @@ class _LogsFragmentState extends State<LogsFragment> {
} }
_buildList() { _buildList() {
return ValueListenableBuilder<List<Log>>( return Selector<AppState, List<Log>>(
valueListenable: logsNotifier, selector: (_, appState) => appState.logs,
shouldRebuild: (prev, next) =>
!const ListEquality<Log>().equals(prev, next),
builder: (_, List<Log> logs, __) { builder: (_, List<Log> logs, __) {
if (logs.isEmpty) { if (logs.isEmpty) {
return NullStatus( return NullStatus(
@@ -77,6 +48,7 @@ class _LogsFragmentState extends State<LogsFragment> {
itemBuilder: (BuildContext context, int index) { itemBuilder: (BuildContext context, int index) {
final log = logs[index]; final log = logs[index];
return LogItem( return LogItem(
key: ValueKey(log.dateTime),
log: log, log: log,
); );
}, },
@@ -93,12 +65,14 @@ class _LogsFragmentState extends State<LogsFragment> {
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
return Selector<AppState, bool?>( return Selector<AppState, bool?>(
selector: (_, appState) => selector: (_, appState) {
appState.currentLabel == 'logs' || return appState.currentLabel == 'logs' ||
context.isMobile && appState.currentLabel == "tools", appState.viewMode == ViewMode.mobile &&
appState.currentLabel == "tools";
},
builder: (_, isCurrent, child) { builder: (_, isCurrent, child) {
if (isCurrent == null || isCurrent) { if (isCurrent == null || isCurrent) {
_initActions(); _initActions(context);
} }
return child!; return child!;
}, },
@@ -114,13 +88,16 @@ class LogsSearchDelegate extends SearchDelegate {
required this.logs, required this.logs,
}); });
List<Log> get _results => logs List<Log> get _results {
.where( final lowQuery = query.toLowerCase();
(log) => return logs
(log.payload?.contains(query) ?? false) || .where(
log.logLevel.name.contains(query), (log) =>
) (log.payload?.toLowerCase().contains(lowQuery) ?? false) ||
.toList(); log.logLevel.name.contains(lowQuery),
)
.toList();
}
@override @override
List<Widget>? buildActions(BuildContext context) { List<Widget>? buildActions(BuildContext context) {
@@ -161,6 +138,7 @@ class LogsSearchDelegate extends SearchDelegate {
itemBuilder: (BuildContext context, int index) { itemBuilder: (BuildContext context, int index) {
final log = _results[index]; final log = _results[index];
return LogItem( return LogItem(
key: ValueKey(log.dateTime),
log: log, log: log,
); );
}, },

View File

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

View File

@@ -1,5 +1,6 @@
import 'package:fl_clash/common/common.dart'; import 'package:fl_clash/common/common.dart';
import 'package:fl_clash/models/models.dart'; import 'package:fl_clash/models/models.dart';
import 'package:fl_clash/state.dart';
import 'package:fl_clash/widgets/widgets.dart'; import 'package:fl_clash/widgets/widgets.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:provider/provider.dart'; import 'package:provider/provider.dart';
@@ -38,7 +39,7 @@ class _EditProfileState extends State<EditProfile> {
_handleConfirm() { _handleConfirm() {
if (!_formKey.currentState!.validate()) return; if (!_formKey.currentState!.validate()) return;
final config = context.read<Config>(); final config = widget.context.read<Config>();
final hasUpdate = widget.profile.url != urlController.text; final hasUpdate = widget.profile.url != urlController.text;
widget.profile.url = urlController.text; widget.profile.url = urlController.text;
widget.profile.label = labelController.text; widget.profile.label = labelController.text;
@@ -48,7 +49,7 @@ class _EditProfileState extends State<EditProfile> {
config.setProfile(widget.profile); config.setProfile(widget.profile);
if (hasUpdate) { if (hasUpdate) {
widget.context.findAncestorStateOfType<CommonScaffoldState>()?.loadingRun( widget.context.findAncestorStateOfType<CommonScaffoldState>()?.loadingRun(
() => context.appController.updateProfile( () => globalState.appController.updateProfile(
widget.profile.id, widget.profile.id,
), ),
); );
@@ -85,6 +86,7 @@ class _EditProfileState extends State<EditProfile> {
ListItem( ListItem(
title: TextFormField( title: TextFormField(
controller: urlController, controller: urlController,
minLines: 1,
maxLines: 2, maxLines: 2,
decoration: InputDecoration( decoration: InputDecoration(
border: const OutlineInputBorder(), border: const OutlineInputBorder(),

View File

@@ -1,9 +1,10 @@
import 'package:fl_clash/enum/enum.dart';
import 'package:fl_clash/fragments/profiles/edit_profile.dart'; import 'package:fl_clash/fragments/profiles/edit_profile.dart';
import 'package:fl_clash/models/models.dart'; import 'package:fl_clash/models/models.dart';
import 'package:fl_clash/common/common.dart'; import 'package:fl_clash/common/common.dart';
import 'package:fl_clash/state.dart';
import 'package:fl_clash/widgets/widgets.dart'; import 'package:fl_clash/widgets/widgets.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:flutter_adaptive_scaffold/flutter_adaptive_scaffold.dart';
import 'package:provider/provider.dart'; import 'package:provider/provider.dart';
import 'add_profile.dart'; import 'add_profile.dart';
@@ -25,6 +26,156 @@ class ProfilesFragment extends StatefulWidget {
class _ProfilesFragmentState extends State<ProfilesFragment> { class _ProfilesFragmentState extends State<ProfilesFragment> {
_handleDeleteProfile(String id) async {
globalState.appController.deleteProfile(id);
}
_handleUpdateProfile(String id) async {
context.findAncestorStateOfType<CommonScaffoldState>()?.loadingRun(
() => globalState.appController.updateProfile(id),
);
}
_handleShowAddExtendPage() {
showExtendPage(
globalState.navigatorKey.currentState!.context,
body: AddProfile(
context: globalState.navigatorKey.currentState!.context,
),
title: "${appLocalizations.add}${appLocalizations.profile}",
);
}
_handleShowEditExtendPage(Profile profile) {
showExtendPage(
context,
body: EditProfile(
profile: profile.copyWith(),
context: context,
),
title: "${appLocalizations.edit}${appLocalizations.profile}",
);
}
_buildGrid({
required ProfilesSelectorState state,
int crossAxisCount = 1,
}) {
return SingleChildScrollView(
padding: crossAxisCount > 1
? const EdgeInsets.symmetric(horizontal: 16)
: EdgeInsets.zero,
child: Grid.baseGap(
crossAxisCount: crossAxisCount,
children: [
for (final profile in state.profiles)
GridItem(
child: ProfileItem(
profile: profile,
commonPopupMenu: CommonPopupMenu<ProfileActions>(
items: [
CommonPopupMenuItem(
action: ProfileActions.edit,
label: appLocalizations.edit,
iconData: Icons.edit,
),
if (profile.url != null)
CommonPopupMenuItem(
action: ProfileActions.update,
label: appLocalizations.update,
iconData: Icons.sync,
),
CommonPopupMenuItem(
action: ProfileActions.delete,
label: appLocalizations.delete,
iconData: Icons.delete,
),
],
onSelected: (ProfileActions? action) async {
switch (action) {
case ProfileActions.edit:
_handleShowEditExtendPage(profile);
break;
case ProfileActions.delete:
_handleDeleteProfile(profile.id);
break;
case ProfileActions.update:
_handleUpdateProfile(profile.id);
break;
case null:
break;
}
},
),
groupValue: state.currentProfileId,
onChanged: globalState.appController.changeProfile,
),
),
],
),
);
}
_getColumns(ViewMode viewMode) {
switch (viewMode) {
case ViewMode.mobile:
return 1;
case ViewMode.laptop:
return 1;
case ViewMode.desktop:
return 2;
}
}
@override
Widget build(BuildContext context) {
return FloatLayout(
floatingWidget: Container(
margin: const EdgeInsets.all(kFloatingActionButtonMargin),
child: FloatingActionButton(
heroTag: null,
onPressed: _handleShowAddExtendPage,
child: const Icon(Icons.add),
),
),
child: Selector2<AppState, Config, ProfilesSelectorState>(
selector: (_, appState, config) => ProfilesSelectorState(
profiles: config.profiles,
currentProfileId: config.currentProfileId,
viewMode: appState.viewMode),
builder: (context, state, child) {
if (state.profiles.isEmpty) {
return NullStatus(
label: appLocalizations.nullProfileDesc,
);
}
return Align(
alignment: Alignment.topCenter,
child: _buildGrid(
state: state,
crossAxisCount: _getColumns(state.viewMode),
),
);
},
),
);
}
}
class ProfileItem extends StatelessWidget {
final Profile profile;
final String? groupValue;
final CommonPopupMenu commonPopupMenu;
final void Function(String? value) onChanged;
const ProfileItem({
super.key,
required this.profile,
required this.commonPopupMenu,
required this.groupValue,
required this.onChanged,
});
String _getLastUpdateTimeDifference(DateTime lastDateTime) { String _getLastUpdateTimeDifference(DateTime lastDateTime) {
final currentDateTime = DateTime.now(); final currentDateTime = DateTime.now();
final difference = currentDateTime.difference(lastDateTime); final difference = currentDateTime.difference(lastDateTime);
@@ -49,21 +200,8 @@ class _ProfilesFragmentState extends State<ProfilesFragment> {
return appLocalizations.just; return appLocalizations.just;
} }
_handleDeleteProfile(String id) async { @override
context.appController.deleteProfile(id); Widget build(BuildContext context) {
}
_handleUpdateProfile(String id) async {
context.findAncestorStateOfType<CommonScaffoldState>()?.loadingRun(
() => context.appController.updateProfile(id),
);
}
Widget _profileItem({
required Profile profile,
required String? groupValue,
required void Function(String? value) onChanged,
}) {
String useShow; String useShow;
String totalShow; String totalShow;
double progress; double progress;
@@ -87,41 +225,7 @@ class _ProfilesFragmentState extends State<ProfilesFragment> {
onChanged: onChanged, onChanged: onChanged,
), ),
padding: const EdgeInsets.symmetric(horizontal: 16), padding: const EdgeInsets.symmetric(horizontal: 16),
trailing: CommonPopupMenu<ProfileActions>( trailing: commonPopupMenu,
items: [
CommonPopupMenuItem(
action: ProfileActions.edit,
label: appLocalizations.edit,
iconData: Icons.edit,
),
if (profile.url != null)
CommonPopupMenuItem(
action: ProfileActions.update,
label: appLocalizations.update,
iconData: Icons.sync,
),
CommonPopupMenuItem(
action: ProfileActions.delete,
label: appLocalizations.delete,
iconData: Icons.delete,
),
],
onSelected: (ProfileActions? action) async {
switch (action) {
case ProfileActions.edit:
_handleShowEditExtendPage(profile);
break;
case ProfileActions.delete:
_handleDeleteProfile(profile.id);
break;
case ProfileActions.update:
_handleUpdateProfile(profile.id);
break;
case null:
break;
}
},
),
title: Column( title: Column(
mainAxisSize: MainAxisSize.min, mainAxisSize: MainAxisSize.min,
crossAxisAlignment: CrossAxisAlignment.start, crossAxisAlignment: CrossAxisAlignment.start,
@@ -172,104 +276,4 @@ class _ProfilesFragmentState extends State<ProfilesFragment> {
), ),
); );
} }
_handleShowAddExtendPage() {
showExtendPage(
context,
body: AddProfile(
context: context,
),
title: "${appLocalizations.add}${appLocalizations.profile}",
);
}
_handleShowEditExtendPage(Profile profile) {
showExtendPage(
context,
body: EditProfile(
profile: profile.copyWith(),
context: context,
),
title: "${appLocalizations.edit}${appLocalizations.profile}",
);
}
_buildGrid({
required ProfilesSelectorState state,
int crossAxisCount = 1,
}) {
return SingleChildScrollView(
padding: crossAxisCount > 1
? const EdgeInsets.symmetric(horizontal: 16)
: EdgeInsets.zero,
child: Grid.baseGap(
crossAxisCount: crossAxisCount,
children: [
for (final profile in state.profiles)
GridItem(
child: _profileItem(
profile: profile,
groupValue: state.currentProfileId,
onChanged: context.appController.changeProfileDebounce,
),
),
],
),
);
}
@override
Widget build(BuildContext context) {
return FloatLayout(
floatingWidget: Container(
margin: const EdgeInsets.all(kFloatingActionButtonMargin),
child: FloatingActionButton(
heroTag: null,
onPressed: _handleShowAddExtendPage,
child: const Icon(Icons.add),
),
),
child: Selector<Config, ProfilesSelectorState>(
selector: (_, config) => ProfilesSelectorState(
profiles: config.profiles,
currentProfileId: config.currentProfileId,
),
builder: (context, state, child) {
if (state.profiles.isEmpty) {
return NullStatus(
label: appLocalizations.nullProfileDesc,
);
}
return Align(
alignment: Alignment.topCenter,
child: SlotLayout(
config: {
Breakpoints.small: SlotLayout.from(
key: const Key('profiles_grid_small'),
builder: (_) => _buildGrid(
state: state,
crossAxisCount: 1,
),
),
Breakpoints.medium: SlotLayout.from(
key: const Key('profiles_grid_medium'),
builder: (_) => _buildGrid(
state: state,
crossAxisCount: 1,
),
),
Breakpoints.large: SlotLayout.from(
key: const Key('profiles_grid_large'),
builder: (_) => _buildGrid(
state: state,
crossAxisCount: 2,
),
),
},
),
);
},
),
);
}
} }

View File

@@ -1,6 +1,5 @@
import 'package:fl_clash/state.dart'; import 'package:fl_clash/state.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:flutter_adaptive_scaffold/flutter_adaptive_scaffold.dart';
import 'package:provider/provider.dart'; import 'package:provider/provider.dart';
import '../enum/enum.dart'; import '../enum/enum.dart';
@@ -98,7 +97,7 @@ class _ProxiesFragmentState extends State<ProxiesFragment>
isScrollable: true, isScrollable: true,
tabAlignment: TabAlignment.start, tabAlignment: TabAlignment.start,
overlayColor: overlayColor:
const MaterialStatePropertyAll(Colors.transparent), const WidgetStatePropertyAll(Colors.transparent),
tabs: [ tabs: [
for (final groupName in state.groupNames) for (final groupName in state.groupNames)
Tab( Tab(
@@ -140,7 +139,7 @@ class ProxiesTabView extends StatelessWidget {
List<Proxy> _sortOfName(List<Proxy> proxies) { List<Proxy> _sortOfName(List<Proxy> proxies) {
return List.of(proxies) return List.of(proxies)
..sort( ..sort(
(a, b) => Other.sortByChar(a.name, b.name), (a, b) => other.sortByChar(a.name, b.name),
); );
} }
@@ -149,8 +148,8 @@ class ProxiesTabView extends StatelessWidget {
return proxies = List.of(proxies) return proxies = List.of(proxies)
..sort( ..sort(
(a, b) { (a, b) {
final aDelay = appState.delayMap[a.name]; final aDelay = appState.getDelay(a.name);
final bDelay = appState.delayMap[b.name]; final bDelay = appState.getDelay(b.name);
if (aDelay == null && bDelay == null) { if (aDelay == null && bDelay == null) {
return 0; return 0;
} }
@@ -178,7 +177,7 @@ class ProxiesTabView extends StatelessWidget {
} }
double _getItemHeight(BuildContext context) { double _getItemHeight(BuildContext context) {
final measure = context.appController.measure; final measure = globalState.appController.measure;
return 12 * 2 + return 12 * 2 +
measure.bodyMediumHeight * 2 + measure.bodyMediumHeight * 2 +
measure.bodySmallHeight + measure.bodySmallHeight +
@@ -186,167 +185,15 @@ class ProxiesTabView extends StatelessWidget {
8 * 2; 8 * 2;
} }
_card( int _getColumns(ViewMode viewMode) {
BuildContext context, { switch (viewMode) {
required void Function() onPressed, case ViewMode.mobile:
required bool isSelected, return 2;
required Proxy proxy, case ViewMode.laptop:
}) { return 3;
final measure = context.appController.measure; case ViewMode.desktop:
return CommonCard( return 4;
isSelected: isSelected, }
onPressed: onPressed,
selectWidget: Container(
alignment: Alignment.topRight,
margin: const EdgeInsets.all(8),
child: Container(
padding: const EdgeInsets.all(4),
decoration: BoxDecoration(
shape: BoxShape.circle,
color: Theme.of(context).colorScheme.secondaryContainer,
),
child: const SelectIcon(),
),
),
child: Padding(
padding: const EdgeInsets.all(12),
child: Column(
mainAxisSize: MainAxisSize.min,
crossAxisAlignment: CrossAxisAlignment.start,
children: [
SizedBox(
height: measure.bodyMediumHeight * 2,
child: Text(
proxy.name,
maxLines: 2,
style: context.textTheme.bodyMedium?.copyWith(
overflow: TextOverflow.ellipsis,
),
),
),
const SizedBox(
height: 8,
),
SizedBox(
height: measure.bodySmallHeight,
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(
height: 8,
),
SizedBox(
height: measure.labelSmallHeight,
child: Selector<AppState, int?>(
selector: (context, appState) => appState.getDelay(
proxy.name,
),
builder: (_, delay, __) {
return FadeBox(
child: Builder(
builder: (_) {
if (delay == null) {
return Container();
}
if (delay == 0) {
return SizedBox(
height: measure.labelSmallHeight,
width: measure.labelSmallHeight,
child: const CircularProgressIndicator(
strokeWidth: 2,
),
);
}
return Text(
delay > 0 ? '$delay ms' : "Timeout",
style: context.textTheme.labelSmall?.copyWith(
overflow: TextOverflow.ellipsis,
color: Other.getDelayColor(
delay,
),
),
);
},
),
);
},
),
),
],
),
),
);
}
Widget _buildGrid(
BuildContext context, {
required List<Proxy> proxies,
required int columns,
}) {
return GridView.builder(
padding: const EdgeInsets.all(16),
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 = context.appController;
final group =
appController.appState.getGroupWithName(groupName)!;
if (group.type != GroupType.Selector) {
globalState.showSnackBar(
context,
message: "当前代理组无法选择",
);
return;
}
context.appController.config.updateCurrentSelectedMap(
groupName,
proxy.name,
);
context.appController.changeProxy();
},
proxy: proxy,
);
},
);
},
);
} }
@override @override
@@ -357,6 +204,7 @@ class ProxiesTabView extends StatelessWidget {
proxiesSortType: config.proxiesSortType, proxiesSortType: config.proxiesSortType,
sortNum: appState.sortNum, sortNum: appState.sortNum,
group: appState.getGroupWithName(groupName)!, group: appState.getGroupWithName(groupName)!,
viewMode: appState.viewMode,
); );
}, },
builder: (_, state, __) { builder: (_, state, __) {
@@ -367,32 +215,22 @@ class ProxiesTabView extends StatelessWidget {
); );
return Align( return Align(
alignment: Alignment.topCenter, alignment: Alignment.topCenter,
child: SlotLayout( child: GridView.builder(
config: { padding: const EdgeInsets.all(16),
Breakpoints.small: SlotLayout.from( gridDelegate: SliverGridDelegateWithFixedCrossAxisCount(
key: const Key('proxies_grid_small'), crossAxisCount: _getColumns(state.viewMode),
builder: (_) => _buildGrid( mainAxisSpacing: 8,
context, crossAxisSpacing: 8,
proxies: proxies, mainAxisExtent: _getItemHeight(context),
columns: 2, ),
), itemCount: proxies.length,
), itemBuilder: (_, index) {
Breakpoints.medium: SlotLayout.from( final proxy = proxies[index];
key: const Key('proxies_grid_medium'), return ProxyCard(
builder: (_) => _buildGrid( key: ValueKey('$groupName.${proxy.name}'),
context, proxy: proxy,
proxies: proxies, groupName: groupName,
columns: 3, );
),
),
Breakpoints.large: SlotLayout.from(
key: const Key('proxies_grid_large'),
builder: (_) => _buildGrid(
context,
proxies: proxies,
columns: 4,
),
),
}, },
), ),
); );
@@ -401,6 +239,149 @@ class ProxiesTabView extends StatelessWidget {
} }
} }
class ProxyCard extends StatelessWidget {
final String groupName;
final Proxy proxy;
const ProxyCard({
super.key,
required this.groupName,
required this.proxy,
});
@override
Widget build(BuildContext context) {
final measure = globalState.appController.measure;
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 CommonCard(
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();
},
selectWidget: Container(
alignment: Alignment.topRight,
margin: const EdgeInsets.all(8),
child: Container(
padding: const EdgeInsets.all(4),
decoration: BoxDecoration(
shape: BoxShape.circle,
color: Theme.of(context).colorScheme.secondaryContainer,
),
child: const SelectIcon(),
),
),
child: Padding(
padding: const EdgeInsets.all(12),
child: Column(
mainAxisSize: MainAxisSize.min,
crossAxisAlignment: CrossAxisAlignment.start,
children: [
SizedBox(
height: measure.bodyMediumHeight * 2,
child: Text(
proxy.name,
maxLines: 2,
style: context.textTheme.bodyMedium?.copyWith(
overflow: TextOverflow.ellipsis,
),
),
),
const SizedBox(
height: 8,
),
SizedBox(
height: measure.bodySmallHeight,
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(
height: 8,
),
SizedBox(
height: measure.labelSmallHeight,
child: Selector<AppState, int?>(
selector: (context, appState) => appState.getDelay(
proxy.name,
),
builder: (_, delay, __) {
return FadeBox(
child: Builder(
builder: (_) {
if (delay == null) {
return Container();
}
if (delay == 0) {
return SizedBox(
height: measure.labelSmallHeight,
width: measure.labelSmallHeight,
child: const CircularProgressIndicator(
strokeWidth: 2,
),
);
}
return Text(
delay > 0 ? '$delay ms' : "Timeout",
style: context.textTheme.labelSmall?.copyWith(
overflow: TextOverflow.ellipsis,
color: other.getDelayColor(
delay,
),
),
);
},
),
);
},
),
),
],
),
),
);
},
);
}
}
class DelayTestButtonContainer extends StatefulWidget { class DelayTestButtonContainer extends StatefulWidget {
final Widget child; final Widget child;
@@ -421,12 +402,12 @@ class _DelayTestButtonContainerState extends State<DelayTestButtonContainer>
late Animation<double> _opacity; late Animation<double> _opacity;
_healthcheck() async { _healthcheck() async {
if (globalState.healthcheckLock) return;
_controller.forward(); _controller.forward();
context.appController.healthcheck(); globalState.appController.healthcheck();
await Future.delayed( Future.delayed(httpTimeoutDuration + moreDuration, () {
appConstant.httpTimeoutDuration + appConstant.moreDuration, _controller.reverse();
); });
_controller.reverse();
} }
@override @override
@@ -447,7 +428,7 @@ class _DelayTestButtonContainerState extends State<DelayTestButtonContainer>
curve: const Interval( curve: const Interval(
0, 0,
1, 1,
curve: Curves.easeIn, curve: Curves.elasticInOut,
), ),
), ),
); );

View File

@@ -1,5 +1,6 @@
import 'package:fl_clash/common/common.dart'; import 'package:fl_clash/common/common.dart';
import 'package:fl_clash/models/models.dart'; import 'package:fl_clash/models/models.dart';
import 'package:fl_clash/state.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:provider/provider.dart'; import 'package:provider/provider.dart';
@@ -28,7 +29,7 @@ class ThemeFragment extends StatelessWidget {
return CommonCard( return CommonCard(
isSelected: isSelected, isSelected: isSelected,
onPressed: () { onPressed: () {
context.appController.config.themeMode = themeModeItem.themeMode; globalState.appController.config.themeMode = themeModeItem.themeMode;
}, },
child: Padding( child: Padding(
padding: const EdgeInsets.symmetric(horizontal:16), padding: const EdgeInsets.symmetric(horizontal:16),
@@ -62,7 +63,7 @@ class ThemeFragment extends StatelessWidget {
isSelected: isSelected, isSelected: isSelected,
primaryColor: color, primaryColor: color,
onPressed: () { onPressed: () {
context.appController.config.primaryColor = color?.value; globalState.appController.config.primaryColor = color?.value;
}, },
); );
} }
@@ -108,7 +109,7 @@ class ThemeFragment extends StatelessWidget {
]; ];
List<Color?> primaryColors = [ List<Color?> primaryColors = [
null, null,
appConstant.defaultPrimaryColor, defaultPrimaryColor,
Colors.pinkAccent, Colors.pinkAccent,
Colors.greenAccent, Colors.greenAccent,
Colors.yellowAccent, Colors.yellowAccent,

View File

@@ -12,6 +12,7 @@ import 'package:flutter/material.dart';
import 'package:intl/intl.dart'; import 'package:intl/intl.dart';
import 'package:provider/provider.dart'; import 'package:provider/provider.dart';
import '../widgets/widgets.dart'; import '../widgets/widgets.dart';
import 'backup_and_recovery.dart';
import 'theme.dart'; import 'theme.dart';
class ToolsFragment extends StatefulWidget { class ToolsFragment extends StatefulWidget {
@@ -51,33 +52,6 @@ class _ToolboxFragmentState extends State<ToolsFragment> {
); );
} }
Widget _buildSection({
required String title,
required Widget content,
}) {
return Column(
mainAxisSize: MainAxisSize.min,
crossAxisAlignment: CrossAxisAlignment.start,
children: [
Flexible(
child: Padding(
padding: const EdgeInsets.symmetric(horizontal: 16, vertical: 12),
child: Text(
title,
style: Theme.of(context).textTheme.labelLarge?.copyWith(
color: Theme.of(context).colorScheme.primary,
),
),
),
),
Expanded(
flex: 0,
child: content,
)
],
);
}
String _getLocaleString(Locale? locale) { String _getLocaleString(Locale? locale) {
if (locale == null) return appLocalizations.defaultText; if (locale == null) return appLocalizations.defaultText;
return Intl.message(locale.toString()); return Intl.message(locale.toString());
@@ -114,7 +88,7 @@ class _ToolboxFragmentState extends State<ToolsFragment> {
selector: (_, config) => config.locale, selector: (_, config) => config.locale,
builder: (_, localeString, __) { builder: (_, localeString, __) {
final subTitle = localeString ?? appLocalizations.defaultText; final subTitle = localeString ?? appLocalizations.defaultText;
final currentLocale = Other.getLocaleForString(localeString); final currentLocale = other.getLocaleForString(localeString);
return ListTile( return ListTile(
leading: const Icon(Icons.language_outlined), leading: const Icon(Icons.language_outlined),
title: Text(appLocalizations.language), title: Text(appLocalizations.language),
@@ -161,9 +135,19 @@ class _ToolboxFragmentState extends State<ToolsFragment> {
title: Text(appLocalizations.theme), title: Text(appLocalizations.theme),
subtitle: Text(appLocalizations.themeDesc), subtitle: Text(appLocalizations.themeDesc),
delegate: OpenDelegate( delegate: OpenDelegate(
title: appLocalizations.theme, title: appLocalizations.theme,
widget: const ThemeFragment(), widget: const ThemeFragment(),
extendPageWidth: 360), extendPageWidth: 360,
),
),
ListItem.open(
leading: const Icon(Icons.cloud_sync),
title: Text(appLocalizations.backupAndRecovery),
subtitle: Text(appLocalizations.backupAndRecoveryDesc),
delegate: OpenDelegate(
title: appLocalizations.backupAndRecovery,
widget: const BackupAndRecovery(),
),
), ),
if (Platform.isAndroid) if (Platform.isAndroid)
ListItem.open( ListItem.open(
@@ -210,44 +194,47 @@ class _ToolboxFragmentState extends State<ToolsFragment> {
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
final items = [ return Selector<Config, String?>(
LayoutBuilder(builder: (context, container) { selector: (_, config) => config.locale,
final isMobile = context.isMobile; builder: (_, __, ___) {
if (!isMobile) { final items = [
return Container( Selector<AppState, MoreToolsSelectorState>(
margin: const EdgeInsets.only(top: 18), selector: (_, appState) {
); return MoreToolsSelectorState(
} navigationItems: appState.viewMode == ViewMode.mobile
return Selector<AppState, List<NavigationItem>>( ? appState.navigationItems.where(
selector: (_, appState) => appState.navigationItems, (element) {
builder: (_, navigationItems, __) { return element.modes
final moreNavigationItems = navigationItems .contains(NavigationItemMode.more);
.where( },
(element) => element.modes.contains(NavigationItemMode.more), ).toList()
) : [],
.toList(); );
if (moreNavigationItems.isEmpty) { },
return Container(); builder: (_, state, __) {
} if (state.navigationItems.isEmpty) {
return _buildSection( return Container();
title: appLocalizations.more, }
content: _buildNavigationMenu(moreNavigationItems), return Section(
); title: appLocalizations.more,
}, child: _buildNavigationMenu(state.navigationItems),
);
},
),
Section(
title: appLocalizations.settings,
child: _getSettingList(),
),
Section(
title: appLocalizations.other,
child: _getOtherList(),
),
];
return ListView.builder(
itemCount: items.length,
itemBuilder: (_, index) => items[index],
); );
}), },
_buildSection(
title: appLocalizations.settings,
content: _getSettingList(),
),
_buildSection(
title: appLocalizations.other,
content: _getOtherList(),
),
];
return ListView.builder(
itemCount: items.length,
itemBuilder: (_, index) => items[index],
); );
} }
} }

View File

@@ -35,7 +35,7 @@
"overrideDesc": "Override Proxy related config", "overrideDesc": "Override Proxy related config",
"allowLan": "AllowLan", "allowLan": "AllowLan",
"allowLanDesc": "Allow access proxy through the LAN", "allowLanDesc": "Allow access proxy through the LAN",
"tun": "Tun", "tun": "Tun mode",
"tunDesc": "only effective in administrator mode", "tunDesc": "only effective in administrator mode",
"minimizeOnExit": "Minimize on exit", "minimizeOnExit": "Minimize on exit",
"minimizeOnExitDesc": "Modify the default system exit event", "minimizeOnExitDesc": "Modify the default system exit event",
@@ -47,6 +47,8 @@
"autoRunDesc": "Auto run when the application is opened", "autoRunDesc": "Auto run when the application is opened",
"logcat": "Logcat", "logcat": "Logcat",
"logcatDesc": "Disabling will hide the log entry", "logcatDesc": "Disabling will hide the log entry",
"autoCheckUpdate": "Auto check updates",
"autoCheckUpdateDesc": "Auto check for updates when the app starts",
"accessControl": "AccessControl", "accessControl": "AccessControl",
"accessControlDesc": "Configure application access proxy", "accessControlDesc": "Configure application access proxy",
"application": "Application", "application": "Application",
@@ -92,6 +94,7 @@
"delaySort": "Sort by delay", "delaySort": "Sort by delay",
"nameSort": "Sort by name", "nameSort": "Sort by name",
"pleaseUploadFile": "Please upload file", "pleaseUploadFile": "Please upload file",
"pleaseUploadValidQrcode": "Please upload a valid QR code",
"blacklistMode": "Blacklist mode", "blacklistMode": "Blacklist mode",
"whitelistMode": "Whitelist mode", "whitelistMode": "Whitelist mode",
"filterSystemApp": "Filter system app", "filterSystemApp": "Filter system app",
@@ -113,11 +116,40 @@
"systemProxy": "SystemProxy", "systemProxy": "SystemProxy",
"project": "Project", "project": "Project",
"core": "Core", "core": "Core",
"checkUpdate": "Check update",
"tabAnimation": "Tab animation", "tabAnimation": "Tab animation",
"tabAnimationDesc": "When enabled, the home tab will add a toggle animation", "tabAnimationDesc": "When enabled, the home tab will add a toggle animation",
"desc": "A multi-platform proxy client based on ClashMeta, simple and easy to use, open-source and ad-free.", "desc": "A multi-platform proxy client based on ClashMeta, simple and easy to use, open-source and ad-free.",
"startVpn": "Staring VPN...", "startVpn": "Staring VPN...",
"stopVpn": "Stopping 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",
"backupAndRecovery": "Backup and Recovery",
"backupAndRecoveryDesc": "Sync data by WebDAV",
"account": "Account",
"backup": "Backup",
"backupDesc": "Backup local data to WebDAV",
"recovery": "Recovery",
"recoveryDesc": "Recovery data from WebDAV",
"recoveryProfiles": "Only recovery profiles",
"recoveryAll": "Recovery all data",
"recoverySuccess": "Recovery success",
"backupSuccess": "Backup success",
"noInfo": "No info",
"pleaseBindWebDAV": "Please bind WebDAV",
"bind": "Bind",
"connectivity": "Connectivity",
"webDAVConfiguration": "WebDAV configuration",
"address": "Address",
"addressHelp": "WebDAV server address",
"addressTip": "Please enter a valid WebDAV address",
"password": "Password",
"passwordTip": "Password cannot be empty",
"accountTip": "Account cannot be empty",
"checkUpdate": "Check for updates",
"discoverNewVersion": "Discover the new version",
"checkUpdateError": "The current application is already the latest version",
"goDownload": "Go to download"
} }

View File

@@ -35,7 +35,7 @@
"overrideDesc": "覆写代理相关配置", "overrideDesc": "覆写代理相关配置",
"allowLan": "局域网代理", "allowLan": "局域网代理",
"allowLanDesc": "允许通过局域网访问代理", "allowLanDesc": "允许通过局域网访问代理",
"tun": "虚拟网络设备", "tun": "Tun模式",
"tunDesc": "仅在管理员模式生效", "tunDesc": "仅在管理员模式生效",
"minimizeOnExit": "退出时最小化", "minimizeOnExit": "退出时最小化",
"minimizeOnExitDesc": "修改系统默认退出事件", "minimizeOnExitDesc": "修改系统默认退出事件",
@@ -47,6 +47,8 @@
"autoRunDesc": "应用打开时自动运行", "autoRunDesc": "应用打开时自动运行",
"logcat": "日志捕获", "logcat": "日志捕获",
"logcatDesc": "禁用将会隐藏日志入口", "logcatDesc": "禁用将会隐藏日志入口",
"autoCheckUpdate": "自动检查更新",
"autoCheckUpdateDesc": "应用启动时自动检查更新",
"accessControl": "访问控制", "accessControl": "访问控制",
"accessControlDesc": "配置应用访问代理", "accessControlDesc": "配置应用访问代理",
"application": "应用程序", "application": "应用程序",
@@ -92,6 +94,7 @@
"delaySort": "按延迟排序", "delaySort": "按延迟排序",
"nameSort": "按名称排序", "nameSort": "按名称排序",
"pleaseUploadFile": "请上传文件", "pleaseUploadFile": "请上传文件",
"pleaseUploadValidQrcode": "请上传有效的二维码",
"blacklistMode": "黑名单模式", "blacklistMode": "黑名单模式",
"whitelistMode": "白名单模式", "whitelistMode": "白名单模式",
"filterSystemApp": "过滤系统应用", "filterSystemApp": "过滤系统应用",
@@ -113,11 +116,40 @@
"systemProxy": "系统代理", "systemProxy": "系统代理",
"project": "项目", "project": "项目",
"core": "内核", "core": "内核",
"checkUpdate": "检查更新",
"tabAnimation": "选项卡动画", "tabAnimation": "选项卡动画",
"tabAnimationDesc": "开启后,主页选项卡将添加切换动画", "tabAnimationDesc": "开启后,主页选项卡将添加切换动画",
"desc": "基于ClashMeta的多平台代理客户端简单易用开源无广告。", "desc": "基于ClashMeta的多平台代理客户端简单易用开源无广告。",
"startVpn": "正在启动VPN...", "startVpn": "正在启动VPN...",
"stopVpn": "正在停止VPN...", "stopVpn": "正在停止VPN...",
"discovery": "发现新版本" "discovery": "发现新版本",
"compatible": "兼容模式",
"compatibleDesc": "开启将失去部分应用能力获得全量的Clash的支持",
"notSelectedTip": "当前代理组无法选中",
"tip": "提示",
"backupAndRecovery": "备份与恢复",
"backupAndRecoveryDesc": "通过WebDAV同步数据",
"account": "账号",
"backup": "备份",
"backupDesc": "备份数据到WebDAV",
"recovery": "恢复",
"recoveryDesc": "从WebDAV恢复数据",
"recoveryProfiles": "仅恢复配置文件",
"recoveryAll": "恢复所有数据",
"recoverySuccess": "恢复成功",
"backupSuccess": "备份成功",
"noInfo": "暂无信息",
"pleaseBindWebDAV": "请绑定WebDAV",
"bind": "绑定",
"connectivity": "连通性:",
"webDAVConfiguration": "WebDAV配置",
"address": "地址",
"addressHelp": "WebDAV服务器地址",
"addressTip": "请输入有效的WebDAV地址",
"password": "密码",
"passwordTip": "密码不能为空",
"accountTip": "账号不能为空",
"checkUpdate": "检查更新",
"discoverNewVersion": "发现新版本",
"checkUpdateError": "当前应用已经是最新版了",
"goDownload": "前往下载"
} }

View File

@@ -30,7 +30,15 @@ class MessageLookup extends MessageLookupByLibrary {
"Configure application access proxy"), "Configure application access proxy"),
"accessControlNotAllowDesc": MessageLookupByLibrary.simpleMessage( "accessControlNotAllowDesc": MessageLookupByLibrary.simpleMessage(
"The selected application will be excluded from VPN"), "The selected application will be excluded from VPN"),
"account": MessageLookupByLibrary.simpleMessage("Account"),
"accountTip":
MessageLookupByLibrary.simpleMessage("Account cannot be empty"),
"add": MessageLookupByLibrary.simpleMessage("Add"), "add": MessageLookupByLibrary.simpleMessage("Add"),
"address": MessageLookupByLibrary.simpleMessage("Address"),
"addressHelp":
MessageLookupByLibrary.simpleMessage("WebDAV server address"),
"addressTip": MessageLookupByLibrary.simpleMessage(
"Please enter a valid WebDAV address"),
"ago": MessageLookupByLibrary.simpleMessage(" Ago"), "ago": MessageLookupByLibrary.simpleMessage(" Ago"),
"allowLan": MessageLookupByLibrary.simpleMessage("AllowLan"), "allowLan": MessageLookupByLibrary.simpleMessage("AllowLan"),
"allowLanDesc": MessageLookupByLibrary.simpleMessage( "allowLanDesc": MessageLookupByLibrary.simpleMessage(
@@ -41,6 +49,10 @@ class MessageLookup extends MessageLookupByLibrary {
"applicationDesc": MessageLookupByLibrary.simpleMessage( "applicationDesc": MessageLookupByLibrary.simpleMessage(
"Modify application related settings"), "Modify application related settings"),
"auto": MessageLookupByLibrary.simpleMessage("Auto"), "auto": MessageLookupByLibrary.simpleMessage("Auto"),
"autoCheckUpdate":
MessageLookupByLibrary.simpleMessage("Auto check updates"),
"autoCheckUpdateDesc": MessageLookupByLibrary.simpleMessage(
"Auto check for updates when the app starts"),
"autoLaunch": MessageLookupByLibrary.simpleMessage("AutoLaunch"), "autoLaunch": MessageLookupByLibrary.simpleMessage("AutoLaunch"),
"autoLaunchDesc": MessageLookupByLibrary.simpleMessage( "autoLaunchDesc": MessageLookupByLibrary.simpleMessage(
"Follow the system self startup"), "Follow the system self startup"),
@@ -50,13 +62,30 @@ class MessageLookup extends MessageLookupByLibrary {
"autoUpdate": MessageLookupByLibrary.simpleMessage("Auto update"), "autoUpdate": MessageLookupByLibrary.simpleMessage("Auto update"),
"autoUpdateInterval": MessageLookupByLibrary.simpleMessage( "autoUpdateInterval": MessageLookupByLibrary.simpleMessage(
"Auto update interval (minutes)"), "Auto update interval (minutes)"),
"backup": MessageLookupByLibrary.simpleMessage("Backup"),
"backupAndRecovery":
MessageLookupByLibrary.simpleMessage("Backup and Recovery"),
"backupAndRecoveryDesc":
MessageLookupByLibrary.simpleMessage("Sync data by WebDAV"),
"backupDesc":
MessageLookupByLibrary.simpleMessage("Backup local data to WebDAV"),
"backupSuccess": MessageLookupByLibrary.simpleMessage("Backup success"),
"bind": MessageLookupByLibrary.simpleMessage("Bind"),
"blacklistMode": MessageLookupByLibrary.simpleMessage("Blacklist mode"), "blacklistMode": MessageLookupByLibrary.simpleMessage("Blacklist mode"),
"cancelFilterSystemApp": "cancelFilterSystemApp":
MessageLookupByLibrary.simpleMessage("Cancel filter system app"), MessageLookupByLibrary.simpleMessage("Cancel filter system app"),
"cancelSelectAll": "cancelSelectAll":
MessageLookupByLibrary.simpleMessage("Cancel select all"), MessageLookupByLibrary.simpleMessage("Cancel select all"),
"checkUpdate": MessageLookupByLibrary.simpleMessage("Check update"), "checkUpdate":
MessageLookupByLibrary.simpleMessage("Check for updates"),
"checkUpdateError": MessageLookupByLibrary.simpleMessage(
"The current application is already the latest version"),
"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"), "confirm": MessageLookupByLibrary.simpleMessage("Confirm"),
"connectivity": MessageLookupByLibrary.simpleMessage("Connectivity"),
"core": MessageLookupByLibrary.simpleMessage("Core"), "core": MessageLookupByLibrary.simpleMessage("Core"),
"coreInfo": MessageLookupByLibrary.simpleMessage("Core info"), "coreInfo": MessageLookupByLibrary.simpleMessage("Core info"),
"create": MessageLookupByLibrary.simpleMessage("Create"), "create": MessageLookupByLibrary.simpleMessage("Create"),
@@ -70,6 +99,8 @@ class MessageLookup extends MessageLookupByLibrary {
"desc": MessageLookupByLibrary.simpleMessage( "desc": MessageLookupByLibrary.simpleMessage(
"A multi-platform proxy client based on ClashMeta, simple and easy to use, open-source and ad-free."), "A multi-platform proxy client based on ClashMeta, simple and easy to use, open-source and ad-free."),
"direct": MessageLookupByLibrary.simpleMessage("Direct"), "direct": MessageLookupByLibrary.simpleMessage("Direct"),
"discoverNewVersion":
MessageLookupByLibrary.simpleMessage("Discover the new version"),
"discovery": "discovery":
MessageLookupByLibrary.simpleMessage("Discovery a new version"), MessageLookupByLibrary.simpleMessage("Discovery a new version"),
"doYouWantToPass": "doYouWantToPass":
@@ -84,6 +115,7 @@ class MessageLookup extends MessageLookupByLibrary {
"filterSystemApp": "filterSystemApp":
MessageLookupByLibrary.simpleMessage("Filter system app"), MessageLookupByLibrary.simpleMessage("Filter system app"),
"global": MessageLookupByLibrary.simpleMessage("Global"), "global": MessageLookupByLibrary.simpleMessage("Global"),
"goDownload": MessageLookupByLibrary.simpleMessage("Go to download"),
"hours": MessageLookupByLibrary.simpleMessage("Hours"), "hours": MessageLookupByLibrary.simpleMessage("Hours"),
"importFromURL": "importFromURL":
MessageLookupByLibrary.simpleMessage("Import from URL"), MessageLookupByLibrary.simpleMessage("Import from URL"),
@@ -108,10 +140,13 @@ class MessageLookup extends MessageLookupByLibrary {
"networkDetection": "networkDetection":
MessageLookupByLibrary.simpleMessage("Network detection"), MessageLookupByLibrary.simpleMessage("Network detection"),
"networkSpeed": MessageLookupByLibrary.simpleMessage("Network speed"), "networkSpeed": MessageLookupByLibrary.simpleMessage("Network speed"),
"noInfo": MessageLookupByLibrary.simpleMessage("No info"),
"noMoreInfoDesc": MessageLookupByLibrary.simpleMessage("No more info"), "noMoreInfoDesc": MessageLookupByLibrary.simpleMessage("No more info"),
"noProxy": MessageLookupByLibrary.simpleMessage("No proxy"), "noProxy": MessageLookupByLibrary.simpleMessage("No proxy"),
"noProxyDesc": MessageLookupByLibrary.simpleMessage( "noProxyDesc": MessageLookupByLibrary.simpleMessage(
"Please create a profile or add a valid profile"), "Please create a profile or add a valid profile"),
"notSelectedTip": MessageLookupByLibrary.simpleMessage(
"The current proxy group cannot be selected."),
"nullCoreInfoDesc": "nullCoreInfoDesc":
MessageLookupByLibrary.simpleMessage("Unable to obtain core info"), MessageLookupByLibrary.simpleMessage("Unable to obtain core info"),
"nullLogsDesc": MessageLookupByLibrary.simpleMessage("No logs"), "nullLogsDesc": MessageLookupByLibrary.simpleMessage("No logs"),
@@ -122,8 +157,15 @@ class MessageLookup extends MessageLookupByLibrary {
"override": MessageLookupByLibrary.simpleMessage("Override"), "override": MessageLookupByLibrary.simpleMessage("Override"),
"overrideDesc": MessageLookupByLibrary.simpleMessage( "overrideDesc": MessageLookupByLibrary.simpleMessage(
"Override Proxy related config"), "Override Proxy related config"),
"password": MessageLookupByLibrary.simpleMessage("Password"),
"passwordTip":
MessageLookupByLibrary.simpleMessage("Password cannot be empty"),
"pleaseBindWebDAV":
MessageLookupByLibrary.simpleMessage("Please bind WebDAV"),
"pleaseUploadFile": "pleaseUploadFile":
MessageLookupByLibrary.simpleMessage("Please upload file"), MessageLookupByLibrary.simpleMessage("Please upload file"),
"pleaseUploadValidQrcode": MessageLookupByLibrary.simpleMessage(
"Please upload a valid QR code"),
"port": MessageLookupByLibrary.simpleMessage("Port"), "port": MessageLookupByLibrary.simpleMessage("Port"),
"preview": MessageLookupByLibrary.simpleMessage("Preview"), "preview": MessageLookupByLibrary.simpleMessage("Preview"),
"profile": MessageLookupByLibrary.simpleMessage("Profile"), "profile": MessageLookupByLibrary.simpleMessage("Profile"),
@@ -148,6 +190,15 @@ class MessageLookup extends MessageLookupByLibrary {
"qrcode": MessageLookupByLibrary.simpleMessage("QR code"), "qrcode": MessageLookupByLibrary.simpleMessage("QR code"),
"qrcodeDesc": MessageLookupByLibrary.simpleMessage( "qrcodeDesc": MessageLookupByLibrary.simpleMessage(
"Scan QR code to obtain profile"), "Scan QR code to obtain profile"),
"recovery": MessageLookupByLibrary.simpleMessage("Recovery"),
"recoveryAll":
MessageLookupByLibrary.simpleMessage("Recovery all data"),
"recoveryDesc":
MessageLookupByLibrary.simpleMessage("Recovery data from WebDAV"),
"recoveryProfiles":
MessageLookupByLibrary.simpleMessage("Only recovery profiles"),
"recoverySuccess":
MessageLookupByLibrary.simpleMessage("Recovery success"),
"rule": MessageLookupByLibrary.simpleMessage("Rule"), "rule": MessageLookupByLibrary.simpleMessage("Rule"),
"save": MessageLookupByLibrary.simpleMessage("Save"), "save": MessageLookupByLibrary.simpleMessage("Save"),
"selectAll": MessageLookupByLibrary.simpleMessage("Select all"), "selectAll": MessageLookupByLibrary.simpleMessage("Select all"),
@@ -169,9 +220,10 @@ class MessageLookup extends MessageLookupByLibrary {
"themeDesc": MessageLookupByLibrary.simpleMessage( "themeDesc": MessageLookupByLibrary.simpleMessage(
"Set dark mode,adjust the color"), "Set dark mode,adjust the color"),
"themeMode": MessageLookupByLibrary.simpleMessage("Theme mode"), "themeMode": MessageLookupByLibrary.simpleMessage("Theme mode"),
"tip": MessageLookupByLibrary.simpleMessage("tip"),
"tools": MessageLookupByLibrary.simpleMessage("Tools"), "tools": MessageLookupByLibrary.simpleMessage("Tools"),
"trafficUsage": MessageLookupByLibrary.simpleMessage("Traffic usage"), "trafficUsage": MessageLookupByLibrary.simpleMessage("Traffic usage"),
"tun": MessageLookupByLibrary.simpleMessage("Tun"), "tun": MessageLookupByLibrary.simpleMessage("Tun mode"),
"tunDesc": MessageLookupByLibrary.simpleMessage( "tunDesc": MessageLookupByLibrary.simpleMessage(
"only effective in administrator mode"), "only effective in administrator mode"),
"unableToUpdateCurrentProfileDesc": "unableToUpdateCurrentProfileDesc":
@@ -182,6 +234,8 @@ class MessageLookup extends MessageLookupByLibrary {
"url": MessageLookupByLibrary.simpleMessage("URL"), "url": MessageLookupByLibrary.simpleMessage("URL"),
"urlDesc": "urlDesc":
MessageLookupByLibrary.simpleMessage("Obtain profile through URL"), MessageLookupByLibrary.simpleMessage("Obtain profile through URL"),
"webDAVConfiguration":
MessageLookupByLibrary.simpleMessage("WebDAV configuration"),
"whitelistMode": MessageLookupByLibrary.simpleMessage("Whitelist mode"), "whitelistMode": MessageLookupByLibrary.simpleMessage("Whitelist mode"),
"years": MessageLookupByLibrary.simpleMessage("Years"), "years": MessageLookupByLibrary.simpleMessage("Years"),
"zh_CN": MessageLookupByLibrary.simpleMessage("Simplified Chinese") "zh_CN": MessageLookupByLibrary.simpleMessage("Simplified Chinese")

View File

@@ -29,7 +29,12 @@ class MessageLookup extends MessageLookupByLibrary {
"accessControlDesc": MessageLookupByLibrary.simpleMessage("配置应用访问代理"), "accessControlDesc": MessageLookupByLibrary.simpleMessage("配置应用访问代理"),
"accessControlNotAllowDesc": "accessControlNotAllowDesc":
MessageLookupByLibrary.simpleMessage("选中应用将会被排除在VPN之外"), MessageLookupByLibrary.simpleMessage("选中应用将会被排除在VPN之外"),
"account": MessageLookupByLibrary.simpleMessage("账号"),
"accountTip": MessageLookupByLibrary.simpleMessage("账号不能为空"),
"add": MessageLookupByLibrary.simpleMessage("添加"), "add": MessageLookupByLibrary.simpleMessage("添加"),
"address": MessageLookupByLibrary.simpleMessage("地址"),
"addressHelp": MessageLookupByLibrary.simpleMessage("WebDAV服务器地址"),
"addressTip": MessageLookupByLibrary.simpleMessage("请输入有效的WebDAV地址"),
"ago": MessageLookupByLibrary.simpleMessage(""), "ago": MessageLookupByLibrary.simpleMessage(""),
"allowLan": MessageLookupByLibrary.simpleMessage("局域网代理"), "allowLan": MessageLookupByLibrary.simpleMessage("局域网代理"),
"allowLanDesc": MessageLookupByLibrary.simpleMessage("允许通过局域网访问代理"), "allowLanDesc": MessageLookupByLibrary.simpleMessage("允许通过局域网访问代理"),
@@ -37,6 +42,9 @@ class MessageLookup extends MessageLookupByLibrary {
"application": MessageLookupByLibrary.simpleMessage("应用程序"), "application": MessageLookupByLibrary.simpleMessage("应用程序"),
"applicationDesc": MessageLookupByLibrary.simpleMessage("修改应用程序相关设置"), "applicationDesc": MessageLookupByLibrary.simpleMessage("修改应用程序相关设置"),
"auto": MessageLookupByLibrary.simpleMessage("自动"), "auto": MessageLookupByLibrary.simpleMessage("自动"),
"autoCheckUpdate": MessageLookupByLibrary.simpleMessage("自动检查更新"),
"autoCheckUpdateDesc":
MessageLookupByLibrary.simpleMessage("应用启动时自动检查更新"),
"autoLaunch": MessageLookupByLibrary.simpleMessage("自启动"), "autoLaunch": MessageLookupByLibrary.simpleMessage("自启动"),
"autoLaunchDesc": MessageLookupByLibrary.simpleMessage("跟随系统自启动"), "autoLaunchDesc": MessageLookupByLibrary.simpleMessage("跟随系统自启动"),
"autoRun": MessageLookupByLibrary.simpleMessage("自动运行"), "autoRun": MessageLookupByLibrary.simpleMessage("自动运行"),
@@ -44,12 +52,24 @@ class MessageLookup extends MessageLookupByLibrary {
"autoUpdate": MessageLookupByLibrary.simpleMessage("自动更新"), "autoUpdate": MessageLookupByLibrary.simpleMessage("自动更新"),
"autoUpdateInterval": "autoUpdateInterval":
MessageLookupByLibrary.simpleMessage("自动更新间隔(分钟)"), MessageLookupByLibrary.simpleMessage("自动更新间隔(分钟)"),
"backup": MessageLookupByLibrary.simpleMessage("备份"),
"backupAndRecovery": MessageLookupByLibrary.simpleMessage("备份与恢复"),
"backupAndRecoveryDesc":
MessageLookupByLibrary.simpleMessage("通过WebDAV同步数据"),
"backupDesc": MessageLookupByLibrary.simpleMessage("备份数据到WebDAV"),
"backupSuccess": MessageLookupByLibrary.simpleMessage("备份成功"),
"bind": MessageLookupByLibrary.simpleMessage("绑定"),
"blacklistMode": MessageLookupByLibrary.simpleMessage("黑名单模式"), "blacklistMode": MessageLookupByLibrary.simpleMessage("黑名单模式"),
"cancelFilterSystemApp": "cancelFilterSystemApp":
MessageLookupByLibrary.simpleMessage("取消过滤系统应用"), MessageLookupByLibrary.simpleMessage("取消过滤系统应用"),
"cancelSelectAll": MessageLookupByLibrary.simpleMessage("取消全选"), "cancelSelectAll": MessageLookupByLibrary.simpleMessage("取消全选"),
"checkUpdate": MessageLookupByLibrary.simpleMessage("检查更新"), "checkUpdate": MessageLookupByLibrary.simpleMessage("检查更新"),
"checkUpdateError": MessageLookupByLibrary.simpleMessage("当前应用已经是最新版了"),
"compatible": MessageLookupByLibrary.simpleMessage("兼容模式"),
"compatibleDesc":
MessageLookupByLibrary.simpleMessage("开启将失去部分应用能力获得全量的Clash的支持"),
"confirm": MessageLookupByLibrary.simpleMessage("确定"), "confirm": MessageLookupByLibrary.simpleMessage("确定"),
"connectivity": MessageLookupByLibrary.simpleMessage("连通性:"),
"core": MessageLookupByLibrary.simpleMessage("内核"), "core": MessageLookupByLibrary.simpleMessage("内核"),
"coreInfo": MessageLookupByLibrary.simpleMessage("内核信息"), "coreInfo": MessageLookupByLibrary.simpleMessage("内核信息"),
"create": MessageLookupByLibrary.simpleMessage("创建"), "create": MessageLookupByLibrary.simpleMessage("创建"),
@@ -63,6 +83,7 @@ class MessageLookup extends MessageLookupByLibrary {
"desc": MessageLookupByLibrary.simpleMessage( "desc": MessageLookupByLibrary.simpleMessage(
"基于ClashMeta的多平台代理客户端简单易用开源无广告。"), "基于ClashMeta的多平台代理客户端简单易用开源无广告。"),
"direct": MessageLookupByLibrary.simpleMessage("直连"), "direct": MessageLookupByLibrary.simpleMessage("直连"),
"discoverNewVersion": MessageLookupByLibrary.simpleMessage("发现新版本"),
"discovery": MessageLookupByLibrary.simpleMessage("发现新版本"), "discovery": MessageLookupByLibrary.simpleMessage("发现新版本"),
"doYouWantToPass": MessageLookupByLibrary.simpleMessage("是否要通过"), "doYouWantToPass": MessageLookupByLibrary.simpleMessage("是否要通过"),
"download": MessageLookupByLibrary.simpleMessage("下载"), "download": MessageLookupByLibrary.simpleMessage("下载"),
@@ -73,6 +94,7 @@ class MessageLookup extends MessageLookupByLibrary {
"fileDesc": MessageLookupByLibrary.simpleMessage("直接上传配置文件"), "fileDesc": MessageLookupByLibrary.simpleMessage("直接上传配置文件"),
"filterSystemApp": MessageLookupByLibrary.simpleMessage("过滤系统应用"), "filterSystemApp": MessageLookupByLibrary.simpleMessage("过滤系统应用"),
"global": MessageLookupByLibrary.simpleMessage("全局"), "global": MessageLookupByLibrary.simpleMessage("全局"),
"goDownload": MessageLookupByLibrary.simpleMessage("前往下载"),
"hours": MessageLookupByLibrary.simpleMessage("小时"), "hours": MessageLookupByLibrary.simpleMessage("小时"),
"importFromURL": MessageLookupByLibrary.simpleMessage("从URL导入"), "importFromURL": MessageLookupByLibrary.simpleMessage("从URL导入"),
"just": MessageLookupByLibrary.simpleMessage("刚刚"), "just": MessageLookupByLibrary.simpleMessage("刚刚"),
@@ -93,10 +115,12 @@ class MessageLookup extends MessageLookupByLibrary {
"nameSort": MessageLookupByLibrary.simpleMessage("按名称排序"), "nameSort": MessageLookupByLibrary.simpleMessage("按名称排序"),
"networkDetection": MessageLookupByLibrary.simpleMessage("网络检测"), "networkDetection": MessageLookupByLibrary.simpleMessage("网络检测"),
"networkSpeed": MessageLookupByLibrary.simpleMessage("网络速度"), "networkSpeed": MessageLookupByLibrary.simpleMessage("网络速度"),
"noInfo": MessageLookupByLibrary.simpleMessage("暂无信息"),
"noMoreInfoDesc": MessageLookupByLibrary.simpleMessage("暂无更多信息"), "noMoreInfoDesc": MessageLookupByLibrary.simpleMessage("暂无更多信息"),
"noProxy": MessageLookupByLibrary.simpleMessage("暂无代理"), "noProxy": MessageLookupByLibrary.simpleMessage("暂无代理"),
"noProxyDesc": "noProxyDesc":
MessageLookupByLibrary.simpleMessage("请创建配置文件或者添加有效配置文件"), MessageLookupByLibrary.simpleMessage("请创建配置文件或者添加有效配置文件"),
"notSelectedTip": MessageLookupByLibrary.simpleMessage("当前代理组无法选中"),
"nullCoreInfoDesc": MessageLookupByLibrary.simpleMessage("无法获取内核信息"), "nullCoreInfoDesc": MessageLookupByLibrary.simpleMessage("无法获取内核信息"),
"nullLogsDesc": MessageLookupByLibrary.simpleMessage("暂无日志"), "nullLogsDesc": MessageLookupByLibrary.simpleMessage("暂无日志"),
"nullProfileDesc": "nullProfileDesc":
@@ -105,7 +129,12 @@ class MessageLookup extends MessageLookupByLibrary {
"outboundMode": MessageLookupByLibrary.simpleMessage("出站模式"), "outboundMode": MessageLookupByLibrary.simpleMessage("出站模式"),
"override": MessageLookupByLibrary.simpleMessage("覆写"), "override": MessageLookupByLibrary.simpleMessage("覆写"),
"overrideDesc": MessageLookupByLibrary.simpleMessage("覆写代理相关配置"), "overrideDesc": MessageLookupByLibrary.simpleMessage("覆写代理相关配置"),
"password": MessageLookupByLibrary.simpleMessage("密码"),
"passwordTip": MessageLookupByLibrary.simpleMessage("密码不能为空"),
"pleaseBindWebDAV": MessageLookupByLibrary.simpleMessage("请绑定WebDAV"),
"pleaseUploadFile": MessageLookupByLibrary.simpleMessage("请上传文件"), "pleaseUploadFile": MessageLookupByLibrary.simpleMessage("请上传文件"),
"pleaseUploadValidQrcode":
MessageLookupByLibrary.simpleMessage("请上传有效的二维码"),
"port": MessageLookupByLibrary.simpleMessage("端口"), "port": MessageLookupByLibrary.simpleMessage("端口"),
"preview": MessageLookupByLibrary.simpleMessage("预览"), "preview": MessageLookupByLibrary.simpleMessage("预览"),
"profile": MessageLookupByLibrary.simpleMessage("配置"), "profile": MessageLookupByLibrary.simpleMessage("配置"),
@@ -127,6 +156,11 @@ class MessageLookup extends MessageLookupByLibrary {
"proxyPort": MessageLookupByLibrary.simpleMessage("代理端口"), "proxyPort": MessageLookupByLibrary.simpleMessage("代理端口"),
"qrcode": MessageLookupByLibrary.simpleMessage("二维码"), "qrcode": MessageLookupByLibrary.simpleMessage("二维码"),
"qrcodeDesc": MessageLookupByLibrary.simpleMessage("扫描二维码获取配置文件"), "qrcodeDesc": MessageLookupByLibrary.simpleMessage("扫描二维码获取配置文件"),
"recovery": MessageLookupByLibrary.simpleMessage("恢复"),
"recoveryAll": MessageLookupByLibrary.simpleMessage("恢复所有数据"),
"recoveryDesc": MessageLookupByLibrary.simpleMessage("从WebDAV恢复数据"),
"recoveryProfiles": MessageLookupByLibrary.simpleMessage("仅恢复配置文件"),
"recoverySuccess": MessageLookupByLibrary.simpleMessage("恢复成功"),
"rule": MessageLookupByLibrary.simpleMessage("规则"), "rule": MessageLookupByLibrary.simpleMessage("规则"),
"save": MessageLookupByLibrary.simpleMessage("保存"), "save": MessageLookupByLibrary.simpleMessage("保存"),
"selectAll": MessageLookupByLibrary.simpleMessage("全选"), "selectAll": MessageLookupByLibrary.simpleMessage("全选"),
@@ -146,9 +180,10 @@ class MessageLookup extends MessageLookupByLibrary {
"themeColor": MessageLookupByLibrary.simpleMessage("主题色彩"), "themeColor": MessageLookupByLibrary.simpleMessage("主题色彩"),
"themeDesc": MessageLookupByLibrary.simpleMessage("设置深色模式,调整色彩"), "themeDesc": MessageLookupByLibrary.simpleMessage("设置深色模式,调整色彩"),
"themeMode": MessageLookupByLibrary.simpleMessage("主题模式"), "themeMode": MessageLookupByLibrary.simpleMessage("主题模式"),
"tip": MessageLookupByLibrary.simpleMessage("提示"),
"tools": MessageLookupByLibrary.simpleMessage("工具"), "tools": MessageLookupByLibrary.simpleMessage("工具"),
"trafficUsage": MessageLookupByLibrary.simpleMessage("流量统计"), "trafficUsage": MessageLookupByLibrary.simpleMessage("流量统计"),
"tun": MessageLookupByLibrary.simpleMessage("虚拟网络设备"), "tun": MessageLookupByLibrary.simpleMessage("Tun模式"),
"tunDesc": MessageLookupByLibrary.simpleMessage("仅在管理员模式生效"), "tunDesc": MessageLookupByLibrary.simpleMessage("仅在管理员模式生效"),
"unableToUpdateCurrentProfileDesc": "unableToUpdateCurrentProfileDesc":
MessageLookupByLibrary.simpleMessage("无法更新当前配置文件"), MessageLookupByLibrary.simpleMessage("无法更新当前配置文件"),
@@ -156,6 +191,7 @@ class MessageLookup extends MessageLookupByLibrary {
"upload": MessageLookupByLibrary.simpleMessage("上传"), "upload": MessageLookupByLibrary.simpleMessage("上传"),
"url": MessageLookupByLibrary.simpleMessage("URL"), "url": MessageLookupByLibrary.simpleMessage("URL"),
"urlDesc": MessageLookupByLibrary.simpleMessage("直接上传配置文件"), "urlDesc": MessageLookupByLibrary.simpleMessage("直接上传配置文件"),
"webDAVConfiguration": MessageLookupByLibrary.simpleMessage("WebDAV配置"),
"whitelistMode": MessageLookupByLibrary.simpleMessage("白名单模式"), "whitelistMode": MessageLookupByLibrary.simpleMessage("白名单模式"),
"years": MessageLookupByLibrary.simpleMessage(""), "years": MessageLookupByLibrary.simpleMessage(""),
"zh_CN": MessageLookupByLibrary.simpleMessage("中文简体") "zh_CN": MessageLookupByLibrary.simpleMessage("中文简体")

View File

@@ -410,10 +410,10 @@ class AppLocalizations {
); );
} }
/// `Tun` /// `Tun mode`
String get tun { String get tun {
return Intl.message( return Intl.message(
'Tun', 'Tun mode',
name: 'tun', name: 'tun',
desc: '', desc: '',
args: [], args: [],
@@ -530,6 +530,26 @@ class AppLocalizations {
); );
} }
/// `Auto check updates`
String get autoCheckUpdate {
return Intl.message(
'Auto check updates',
name: 'autoCheckUpdate',
desc: '',
args: [],
);
}
/// `Auto check for updates when the app starts`
String get autoCheckUpdateDesc {
return Intl.message(
'Auto check for updates when the app starts',
name: 'autoCheckUpdateDesc',
desc: '',
args: [],
);
}
/// `AccessControl` /// `AccessControl`
String get accessControl { String get accessControl {
return Intl.message( return Intl.message(
@@ -980,6 +1000,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` /// `Blacklist mode`
String get blacklistMode { String get blacklistMode {
return Intl.message( return Intl.message(
@@ -1190,16 +1220,6 @@ class AppLocalizations {
); );
} }
/// `Check update`
String get checkUpdate {
return Intl.message(
'Check update',
name: 'checkUpdate',
desc: '',
args: [],
);
}
/// `Tab animation` /// `Tab animation`
String get tabAnimation { String get tabAnimation {
return Intl.message( return Intl.message(
@@ -1259,6 +1279,306 @@ class AppLocalizations {
args: [], 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: [],
);
}
/// `Backup and Recovery`
String get backupAndRecovery {
return Intl.message(
'Backup and Recovery',
name: 'backupAndRecovery',
desc: '',
args: [],
);
}
/// `Sync data by WebDAV`
String get backupAndRecoveryDesc {
return Intl.message(
'Sync data by WebDAV',
name: 'backupAndRecoveryDesc',
desc: '',
args: [],
);
}
/// `Account`
String get account {
return Intl.message(
'Account',
name: 'account',
desc: '',
args: [],
);
}
/// `Backup`
String get backup {
return Intl.message(
'Backup',
name: 'backup',
desc: '',
args: [],
);
}
/// `Backup local data to WebDAV`
String get backupDesc {
return Intl.message(
'Backup local data to WebDAV',
name: 'backupDesc',
desc: '',
args: [],
);
}
/// `Recovery`
String get recovery {
return Intl.message(
'Recovery',
name: 'recovery',
desc: '',
args: [],
);
}
/// `Recovery data from WebDAV`
String get recoveryDesc {
return Intl.message(
'Recovery data from WebDAV',
name: 'recoveryDesc',
desc: '',
args: [],
);
}
/// `Only recovery profiles`
String get recoveryProfiles {
return Intl.message(
'Only recovery profiles',
name: 'recoveryProfiles',
desc: '',
args: [],
);
}
/// `Recovery all data`
String get recoveryAll {
return Intl.message(
'Recovery all data',
name: 'recoveryAll',
desc: '',
args: [],
);
}
/// `Recovery success`
String get recoverySuccess {
return Intl.message(
'Recovery success',
name: 'recoverySuccess',
desc: '',
args: [],
);
}
/// `Backup success`
String get backupSuccess {
return Intl.message(
'Backup success',
name: 'backupSuccess',
desc: '',
args: [],
);
}
/// `No info`
String get noInfo {
return Intl.message(
'No info',
name: 'noInfo',
desc: '',
args: [],
);
}
/// `Please bind WebDAV`
String get pleaseBindWebDAV {
return Intl.message(
'Please bind WebDAV',
name: 'pleaseBindWebDAV',
desc: '',
args: [],
);
}
/// `Bind`
String get bind {
return Intl.message(
'Bind',
name: 'bind',
desc: '',
args: [],
);
}
/// `Connectivity`
String get connectivity {
return Intl.message(
'Connectivity',
name: 'connectivity',
desc: '',
args: [],
);
}
/// `WebDAV configuration`
String get webDAVConfiguration {
return Intl.message(
'WebDAV configuration',
name: 'webDAVConfiguration',
desc: '',
args: [],
);
}
/// `Address`
String get address {
return Intl.message(
'Address',
name: 'address',
desc: '',
args: [],
);
}
/// `WebDAV server address`
String get addressHelp {
return Intl.message(
'WebDAV server address',
name: 'addressHelp',
desc: '',
args: [],
);
}
/// `Please enter a valid WebDAV address`
String get addressTip {
return Intl.message(
'Please enter a valid WebDAV address',
name: 'addressTip',
desc: '',
args: [],
);
}
/// `Password`
String get password {
return Intl.message(
'Password',
name: 'password',
desc: '',
args: [],
);
}
/// `Password cannot be empty`
String get passwordTip {
return Intl.message(
'Password cannot be empty',
name: 'passwordTip',
desc: '',
args: [],
);
}
/// `Account cannot be empty`
String get accountTip {
return Intl.message(
'Account cannot be empty',
name: 'accountTip',
desc: '',
args: [],
);
}
/// `Check for updates`
String get checkUpdate {
return Intl.message(
'Check for updates',
name: 'checkUpdate',
desc: '',
args: [],
);
}
/// `Discover the new version`
String get discoverNewVersion {
return Intl.message(
'Discover the new version',
name: 'discoverNewVersion',
desc: '',
args: [],
);
}
/// `The current application is already the latest version`
String get checkUpdateError {
return Intl.message(
'The current application is already the latest version',
name: 'checkUpdateError',
desc: '',
args: [],
);
}
/// `Go to download`
String get goDownload {
return Intl.message(
'Go to download',
name: 'goDownload',
desc: '',
args: [],
);
}
} }
class AppLocalizationDelegate extends LocalizationsDelegate<AppLocalizations> { class AppLocalizationDelegate extends LocalizationsDelegate<AppLocalizations> {

View File

@@ -21,6 +21,7 @@ Future<void> main() async {
mode: clashConfig.mode, mode: clashConfig.mode,
isCompatible: config.isCompatible, isCompatible: config.isCompatible,
selectedMap: config.currentSelectedMap, selectedMap: config.currentSelectedMap,
viewWidth: other.getViewWidth(),
); );
await globalState.init( await globalState.init(
appState: appState, appState: appState,
@@ -62,7 +63,7 @@ Future<void> vpnService() async {
); );
final appLocalizations = await AppLocalizations.load( final appLocalizations = await AppLocalizations.load(
Other.getLocaleForString(config.locale) ?? other.getLocaleForString(config.locale) ??
WidgetsBinding.instance.platformDispatcher.locale, WidgetsBinding.instance.platformDispatcher.locale,
); );

View File

@@ -1,10 +1,10 @@
import 'package:collection/collection.dart'; import 'package:collection/collection.dart';
import 'package:fl_clash/common/common.dart';
import 'package:fl_clash/enum/enum.dart'; import 'package:fl_clash/enum/enum.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'ffi.dart'; import 'ffi.dart';
import 'log.dart'; import 'log.dart';
import 'navigation.dart'; import 'navigation.dart';
import 'package.dart';
import 'profile.dart'; import 'profile.dart';
import 'proxy.dart'; import 'proxy.dart';
import 'system_color_scheme.dart'; import 'system_color_scheme.dart';
@@ -20,7 +20,6 @@ class AppState with ChangeNotifier {
VersionInfo? _versionInfo; VersionInfo? _versionInfo;
List<Traffic> _traffics; List<Traffic> _traffics;
List<Log> _logs; List<Log> _logs;
List<Package> _packages;
String _currentLabel; String _currentLabel;
SystemColorSchemes _systemColorSchemes; SystemColorSchemes _systemColorSchemes;
num _sortNum; num _sortNum;
@@ -29,9 +28,11 @@ class AppState with ChangeNotifier {
SelectedMap _selectedMap; SelectedMap _selectedMap;
bool _isCompatible; bool _isCompatible;
List<Group> _groups; List<Group> _groups;
double _viewWidth;
AppState({ AppState({
required Mode mode, required Mode mode,
double? viewWidth,
required bool isCompatible, required bool isCompatible,
required SelectedMap selectedMap, required SelectedMap selectedMap,
}) : _navigationItems = [], }) : _navigationItems = [],
@@ -39,8 +40,8 @@ class AppState with ChangeNotifier {
_currentLabel = "dashboard", _currentLabel = "dashboard",
_traffics = [], _traffics = [],
_logs = [], _logs = [],
_viewWidth = viewWidth ?? 0,
_selectedMap = selectedMap, _selectedMap = selectedMap,
_packages = [],
_sortNum = 0, _sortNum = 0,
_mode = mode, _mode = mode,
_delayMap = {}, _delayMap = {},
@@ -66,6 +67,20 @@ class AppState with ChangeNotifier {
} }
} }
List<NavigationItem> get currentNavigationItems {
NavigationItemMode navigationItemMode;
if (_viewWidth <= maxMobileWidth) {
navigationItemMode = NavigationItemMode.mobile;
} else {
navigationItemMode = NavigationItemMode.desktop;
}
return navigationItems
.where(
(element) => element.modes.contains(navigationItemMode),
)
.toList();
}
bool get isInit => _isInit; bool get isInit => _isInit;
set isInit(bool value) { set isInit(bool value) {
@@ -164,14 +179,6 @@ class AppState with ChangeNotifier {
} }
} }
List<Package> get packages => _packages;
set packages(List<Package> value) {
if (_packages != value) {
_packages = value;
notifyListeners();
}
}
List<Group> get groups => _groups; List<Group> get groups => _groups;
@@ -200,19 +207,6 @@ class AppState with ChangeNotifier {
} }
} }
// 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 { bool get isCompatible {
return _isCompatible; return _isCompatible;
} }
@@ -250,6 +244,21 @@ class AppState with ChangeNotifier {
} }
} }
double get viewWidth => _viewWidth;
set viewWidth(double value) {
if (_viewWidth != value) {
_viewWidth = value;
notifyListeners();
}
}
ViewMode get viewMode {
if (_viewWidth <= maxMobileWidth) return ViewMode.mobile;
if (_viewWidth <= maxLaptopWidth) return ViewMode.laptop;
return ViewMode.desktop;
}
DelayMap get delayMap { DelayMap get delayMap {
return _delayMap; return _delayMap;
} }

View File

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

View File

@@ -11,14 +11,10 @@ class Result<T> {
this.data, this.data,
}); });
Result.success({ Result.success([this.data]) : type = ResultType.success,
this.data,
}) : type = ResultType.success,
message = null; message = null;
Result.error({ Result.error([this.message]) : type = ResultType.error,
this.message,
}) : type = ResultType.error,
data = null; data = null;
@override @override

View File

@@ -56,6 +56,23 @@ class AccessControl {
factory AccessControl.fromJson(Map<String, dynamic> json) { factory AccessControl.fromJson(Map<String, dynamic> json) {
return _$AccessControlFromJson(json); return _$AccessControlFromJson(json);
} }
@override
bool operator ==(Object other) =>
identical(this, other) ||
other is AccessControl &&
runtimeType == other.runtimeType &&
mode == other.mode &&
acceptList == other.acceptList &&
rejectList == other.rejectList &&
isFilterSystemApp == other.isFilterSystemApp;
@override
int get hashCode =>
mode.hashCode ^
acceptList.hashCode ^
rejectList.hashCode ^
isFilterSystemApp.hashCode;
} }
@JsonSerializable() @JsonSerializable()
@@ -75,6 +92,8 @@ class Config extends ChangeNotifier {
bool _isAccessControl; bool _isAccessControl;
AccessControl _accessControl; AccessControl _accessControl;
bool _isAnimateToPage; bool _isAnimateToPage;
bool _autoCheckUpdate;
DAV? _dav;
Config() Config()
: _profiles = [], : _profiles = [],
@@ -84,10 +103,11 @@ class Config extends ChangeNotifier {
_themeMode = ThemeMode.system, _themeMode = ThemeMode.system,
_openLog = false, _openLog = false,
_isCompatible = false, _isCompatible = false,
_primaryColor = appConstant.defaultPrimaryColor.value, _primaryColor = defaultPrimaryColor.value,
_proxiesSortType = ProxiesSortType.none, _proxiesSortType = ProxiesSortType.none,
_isMinimizeOnExit = true, _isMinimizeOnExit = true,
_isAccessControl = false, _isAccessControl = false,
_autoCheckUpdate = true,
_accessControl = AccessControl(), _accessControl = AccessControl(),
_isAnimateToPage = true; _isAnimateToPage = true;
@@ -108,17 +128,18 @@ class Config extends ChangeNotifier {
} }
String? _getLabel(String? label, String id) { String? _getLabel(String? label, String id) {
final realLabel = label ?? id;
final hasDup = _profiles.indexWhere( final hasDup = _profiles.indexWhere(
(element) => element.label == label && element.id != id) != (element) => element.label == realLabel && element.id != id) !=
-1; -1;
if (hasDup) { if (hasDup) {
return _getLabel(Other.getOverwriteLabel(label!), id); return _getLabel(other.getOverwriteLabel(realLabel), id);
} else { } else {
return label; return label;
} }
} }
setProfile(Profile profile) { _setProfile(Profile profile) {
final List<Profile> profilesTemp = List.from(_profiles); final List<Profile> profilesTemp = List.from(_profiles);
final index = final index =
profilesTemp.indexWhere((element) => element.id == profile.id); profilesTemp.indexWhere((element) => element.id == profile.id);
@@ -131,6 +152,10 @@ class Config extends ChangeNotifier {
profilesTemp[index] = updateProfile; profilesTemp[index] = updateProfile;
} }
_profiles = profilesTemp; _profiles = profilesTemp;
}
setProfile(Profile profile) {
_setProfile(profile);
notifyListeners(); notifyListeners();
} }
@@ -161,7 +186,6 @@ class Config extends ChangeNotifier {
} }
} }
SelectedMap get currentSelectedMap { SelectedMap get currentSelectedMap {
return currentProfile?.selectedMap ?? {}; return currentProfile?.selectedMap ?? {};
} }
@@ -280,9 +304,18 @@ class Config extends ChangeNotifier {
AccessControl get accessControl => _accessControl; AccessControl get accessControl => _accessControl;
set accessControl(AccessControl? value) { set accessControl(AccessControl value) {
if (_accessControl != value) { if (_accessControl != value) {
_accessControl = value ?? AccessControl(); _accessControl = value;
notifyListeners();
}
}
DAV? get dav => _dav;
set dav(DAV? value) {
if (_dav != value) {
_dav = value;
notifyListeners(); notifyListeners();
} }
} }
@@ -312,7 +345,46 @@ class Config extends ChangeNotifier {
} }
} }
update() { @JsonKey(defaultValue: true)
bool get autoCheckUpdate {
return _autoCheckUpdate;
}
set autoCheckUpdate(bool value) {
if (_autoCheckUpdate != value) {
_autoCheckUpdate = value;
notifyListeners();
}
}
update([Config? config, RecoveryOption recoveryOptions = RecoveryOption.all]) {
if (config != null) {
_profiles = config._profiles;
for (final profile in config._profiles) {
_setProfile(profile);
}
final onlyProfiles = recoveryOptions == RecoveryOption.onlyProfiles;
if(_currentProfileId == null && onlyProfiles && profiles.isNotEmpty){
_currentProfileId = _profiles.first.id;
}
if(onlyProfiles) return;
_currentProfileId = config._currentProfileId;
_isCompatible = config._isCompatible;
_autoLaunch = config._autoLaunch;
_silentLaunch = config._silentLaunch;
_autoRun = config._autoRun;
_openLog = config._openLog;
_themeMode = config._themeMode;
_locale = config._locale;
_primaryColor = config._primaryColor;
_proxiesSortType = config._proxiesSortType;
_isMinimizeOnExit = config._isMinimizeOnExit;
_isAccessControl = config._isAccessControl;
_accessControl = config._accessControl;
_isAnimateToPage = config._isAnimateToPage;
_autoCheckUpdate = config._autoCheckUpdate;
_dav = config._dav;
}
notifyListeners(); notifyListeners();
} }
@@ -323,4 +395,9 @@ class Config extends ChangeNotifier {
factory Config.fromJson(Map<String, dynamic> json) { factory Config.fromJson(Map<String, dynamic> json) {
return _$ConfigFromJson(json); return _$ConfigFromJson(json);
} }
@override
String toString() {
return 'Config{_profiles: $_profiles, _isCompatible: $_isCompatible, _currentProfileId: $_currentProfileId, _autoLaunch: $_autoLaunch, _silentLaunch: $_silentLaunch, _autoRun: $_autoRun, _openLog: $_openLog, _themeMode: $_themeMode, _locale: $_locale, _primaryColor: $_primaryColor, _proxiesSortType: $_proxiesSortType, _isMinimizeOnExit: $_isMinimizeOnExit, _isAccessControl: $_isAccessControl, _accessControl: $_accessControl, _isAnimateToPage: $_isAnimateToPage, _dav: $_dav}';
}
} }

17
lib/models/dav.dart Normal file
View File

@@ -0,0 +1,17 @@
import 'package:freezed_annotation/freezed_annotation.dart';
part 'generated/dav.g.dart';
part 'generated/dav.freezed.dart';
@freezed
class DAV with _$DAV{
const factory DAV({
required String uri,
required String user,
required String password,
}) = _DAV;
factory DAV.fromJson(Map<String, Object?> json) =>
_$DAVFromJson(json);
}

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 // 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() Dns _$DnsFromJson(Map<String, dynamic> json) => Dns()
..enable = json['enable'] as bool ..enable = json['enable'] as bool
..ipv6 = json['ipv6'] as bool ..ipv6 = json['ipv6'] as bool
@@ -94,3 +74,27 @@ const _$LogLevelEnumMap = {
LogLevel.error: 'error', LogLevel.error: 'error',
LogLevel.silent: 'silent', 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,8 +55,12 @@ Config _$ConfigFromJson(Map<String, dynamic> json) => Config()
..isAccessControl = json['isAccessControl'] as bool? ?? false ..isAccessControl = json['isAccessControl'] as bool? ?? false
..accessControl = ..accessControl =
AccessControl.fromJson(json['accessControl'] as Map<String, dynamic>) AccessControl.fromJson(json['accessControl'] as Map<String, dynamic>)
..dav = json['dav'] == null
? null
: DAV.fromJson(json['dav'] as Map<String, dynamic>)
..isAnimateToPage = json['isAnimateToPage'] as bool? ?? true ..isAnimateToPage = json['isAnimateToPage'] as bool? ?? true
..isCompatible = json['isCompatible'] as bool? ?? false; ..isCompatible = json['isCompatible'] as bool? ?? false
..autoCheckUpdate = json['autoCheckUpdate'] as bool? ?? true;
Map<String, dynamic> _$ConfigToJson(Config instance) => <String, dynamic>{ Map<String, dynamic> _$ConfigToJson(Config instance) => <String, dynamic>{
'profiles': instance.profiles, 'profiles': instance.profiles,
@@ -72,8 +76,10 @@ Map<String, dynamic> _$ConfigToJson(Config instance) => <String, dynamic>{
'isMinimizeOnExit': instance.isMinimizeOnExit, 'isMinimizeOnExit': instance.isMinimizeOnExit,
'isAccessControl': instance.isAccessControl, 'isAccessControl': instance.isAccessControl,
'accessControl': instance.accessControl, 'accessControl': instance.accessControl,
'dav': instance.dav,
'isAnimateToPage': instance.isAnimateToPage, 'isAnimateToPage': instance.isAnimateToPage,
'isCompatible': instance.isCompatible, 'isCompatible': instance.isCompatible,
'autoCheckUpdate': instance.autoCheckUpdate,
}; };
const _$ThemeModeEnumMap = { const _$ThemeModeEnumMap = {

View File

@@ -0,0 +1,180 @@
// 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 '../dav.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');
DAV _$DAVFromJson(Map<String, dynamic> json) {
return _DAV.fromJson(json);
}
/// @nodoc
mixin _$DAV {
String get uri => throw _privateConstructorUsedError;
String get user => throw _privateConstructorUsedError;
String get password => throw _privateConstructorUsedError;
Map<String, dynamic> toJson() => throw _privateConstructorUsedError;
@JsonKey(ignore: true)
$DAVCopyWith<DAV> get copyWith => throw _privateConstructorUsedError;
}
/// @nodoc
abstract class $DAVCopyWith<$Res> {
factory $DAVCopyWith(DAV value, $Res Function(DAV) then) =
_$DAVCopyWithImpl<$Res, DAV>;
@useResult
$Res call({String uri, String user, String password});
}
/// @nodoc
class _$DAVCopyWithImpl<$Res, $Val extends DAV> implements $DAVCopyWith<$Res> {
_$DAVCopyWithImpl(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? uri = null,
Object? user = null,
Object? password = null,
}) {
return _then(_value.copyWith(
uri: null == uri
? _value.uri
: uri // ignore: cast_nullable_to_non_nullable
as String,
user: null == user
? _value.user
: user // ignore: cast_nullable_to_non_nullable
as String,
password: null == password
? _value.password
: password // ignore: cast_nullable_to_non_nullable
as String,
) as $Val);
}
}
/// @nodoc
abstract class _$$DAVImplCopyWith<$Res> implements $DAVCopyWith<$Res> {
factory _$$DAVImplCopyWith(_$DAVImpl value, $Res Function(_$DAVImpl) then) =
__$$DAVImplCopyWithImpl<$Res>;
@override
@useResult
$Res call({String uri, String user, String password});
}
/// @nodoc
class __$$DAVImplCopyWithImpl<$Res> extends _$DAVCopyWithImpl<$Res, _$DAVImpl>
implements _$$DAVImplCopyWith<$Res> {
__$$DAVImplCopyWithImpl(_$DAVImpl _value, $Res Function(_$DAVImpl) _then)
: super(_value, _then);
@pragma('vm:prefer-inline')
@override
$Res call({
Object? uri = null,
Object? user = null,
Object? password = null,
}) {
return _then(_$DAVImpl(
uri: null == uri
? _value.uri
: uri // ignore: cast_nullable_to_non_nullable
as String,
user: null == user
? _value.user
: user // ignore: cast_nullable_to_non_nullable
as String,
password: null == password
? _value.password
: password // ignore: cast_nullable_to_non_nullable
as String,
));
}
}
/// @nodoc
@JsonSerializable()
class _$DAVImpl implements _DAV {
const _$DAVImpl(
{required this.uri, required this.user, required this.password});
factory _$DAVImpl.fromJson(Map<String, dynamic> json) =>
_$$DAVImplFromJson(json);
@override
final String uri;
@override
final String user;
@override
final String password;
@override
String toString() {
return 'DAV(uri: $uri, user: $user, password: $password)';
}
@override
bool operator ==(Object other) {
return identical(this, other) ||
(other.runtimeType == runtimeType &&
other is _$DAVImpl &&
(identical(other.uri, uri) || other.uri == uri) &&
(identical(other.user, user) || other.user == user) &&
(identical(other.password, password) ||
other.password == password));
}
@JsonKey(ignore: true)
@override
int get hashCode => Object.hash(runtimeType, uri, user, password);
@JsonKey(ignore: true)
@override
@pragma('vm:prefer-inline')
_$$DAVImplCopyWith<_$DAVImpl> get copyWith =>
__$$DAVImplCopyWithImpl<_$DAVImpl>(this, _$identity);
@override
Map<String, dynamic> toJson() {
return _$$DAVImplToJson(
this,
);
}
}
abstract class _DAV implements DAV {
const factory _DAV(
{required final String uri,
required final String user,
required final String password}) = _$DAVImpl;
factory _DAV.fromJson(Map<String, dynamic> json) = _$DAVImpl.fromJson;
@override
String get uri;
@override
String get user;
@override
String get password;
@override
@JsonKey(ignore: true)
_$$DAVImplCopyWith<_$DAVImpl> get copyWith =>
throw _privateConstructorUsedError;
}

View File

@@ -0,0 +1,19 @@
// GENERATED CODE - DO NOT MODIFY BY HAND
part of '../dav.dart';
// **************************************************************************
// JsonSerializableGenerator
// **************************************************************************
_$DAVImpl _$$DAVImplFromJson(Map<String, dynamic> json) => _$DAVImpl(
uri: json['uri'] as String,
user: json['user'] as String,
password: json['password'] as String,
);
Map<String, dynamic> _$$DAVImplToJson(_$DAVImpl instance) => <String, dynamic>{
'uri': instance.uri,
'user': instance.user,
'password': instance.password,
};

View File

@@ -497,6 +497,7 @@ abstract class _NetworkDetectionSelectorState
mixin _$ProfilesSelectorState { mixin _$ProfilesSelectorState {
List<Profile> get profiles => throw _privateConstructorUsedError; List<Profile> get profiles => throw _privateConstructorUsedError;
String? get currentProfileId => throw _privateConstructorUsedError; String? get currentProfileId => throw _privateConstructorUsedError;
ViewMode get viewMode => throw _privateConstructorUsedError;
@JsonKey(ignore: true) @JsonKey(ignore: true)
$ProfilesSelectorStateCopyWith<ProfilesSelectorState> get copyWith => $ProfilesSelectorStateCopyWith<ProfilesSelectorState> get copyWith =>
@@ -509,7 +510,8 @@ abstract class $ProfilesSelectorStateCopyWith<$Res> {
$Res Function(ProfilesSelectorState) then) = $Res Function(ProfilesSelectorState) then) =
_$ProfilesSelectorStateCopyWithImpl<$Res, ProfilesSelectorState>; _$ProfilesSelectorStateCopyWithImpl<$Res, ProfilesSelectorState>;
@useResult @useResult
$Res call({List<Profile> profiles, String? currentProfileId}); $Res call(
{List<Profile> profiles, String? currentProfileId, ViewMode viewMode});
} }
/// @nodoc /// @nodoc
@@ -528,6 +530,7 @@ class _$ProfilesSelectorStateCopyWithImpl<$Res,
$Res call({ $Res call({
Object? profiles = null, Object? profiles = null,
Object? currentProfileId = freezed, Object? currentProfileId = freezed,
Object? viewMode = null,
}) { }) {
return _then(_value.copyWith( return _then(_value.copyWith(
profiles: null == profiles profiles: null == profiles
@@ -538,6 +541,10 @@ class _$ProfilesSelectorStateCopyWithImpl<$Res,
? _value.currentProfileId ? _value.currentProfileId
: currentProfileId // ignore: cast_nullable_to_non_nullable : currentProfileId // ignore: cast_nullable_to_non_nullable
as String?, as String?,
viewMode: null == viewMode
? _value.viewMode
: viewMode // ignore: cast_nullable_to_non_nullable
as ViewMode,
) as $Val); ) as $Val);
} }
} }
@@ -551,7 +558,8 @@ abstract class _$$ProfilesSelectorStateImplCopyWith<$Res>
__$$ProfilesSelectorStateImplCopyWithImpl<$Res>; __$$ProfilesSelectorStateImplCopyWithImpl<$Res>;
@override @override
@useResult @useResult
$Res call({List<Profile> profiles, String? currentProfileId}); $Res call(
{List<Profile> profiles, String? currentProfileId, ViewMode viewMode});
} }
/// @nodoc /// @nodoc
@@ -568,6 +576,7 @@ class __$$ProfilesSelectorStateImplCopyWithImpl<$Res>
$Res call({ $Res call({
Object? profiles = null, Object? profiles = null,
Object? currentProfileId = freezed, Object? currentProfileId = freezed,
Object? viewMode = null,
}) { }) {
return _then(_$ProfilesSelectorStateImpl( return _then(_$ProfilesSelectorStateImpl(
profiles: null == profiles profiles: null == profiles
@@ -578,6 +587,10 @@ class __$$ProfilesSelectorStateImplCopyWithImpl<$Res>
? _value.currentProfileId ? _value.currentProfileId
: currentProfileId // ignore: cast_nullable_to_non_nullable : currentProfileId // ignore: cast_nullable_to_non_nullable
as String?, as String?,
viewMode: null == viewMode
? _value.viewMode
: viewMode // ignore: cast_nullable_to_non_nullable
as ViewMode,
)); ));
} }
} }
@@ -586,7 +599,9 @@ class __$$ProfilesSelectorStateImplCopyWithImpl<$Res>
class _$ProfilesSelectorStateImpl implements _ProfilesSelectorState { class _$ProfilesSelectorStateImpl implements _ProfilesSelectorState {
const _$ProfilesSelectorStateImpl( const _$ProfilesSelectorStateImpl(
{required final List<Profile> profiles, required this.currentProfileId}) {required final List<Profile> profiles,
required this.currentProfileId,
required this.viewMode})
: _profiles = profiles; : _profiles = profiles;
final List<Profile> _profiles; final List<Profile> _profiles;
@@ -599,10 +614,12 @@ class _$ProfilesSelectorStateImpl implements _ProfilesSelectorState {
@override @override
final String? currentProfileId; final String? currentProfileId;
@override
final ViewMode viewMode;
@override @override
String toString() { String toString() {
return 'ProfilesSelectorState(profiles: $profiles, currentProfileId: $currentProfileId)'; return 'ProfilesSelectorState(profiles: $profiles, currentProfileId: $currentProfileId, viewMode: $viewMode)';
} }
@override @override
@@ -612,12 +629,17 @@ class _$ProfilesSelectorStateImpl implements _ProfilesSelectorState {
other is _$ProfilesSelectorStateImpl && other is _$ProfilesSelectorStateImpl &&
const DeepCollectionEquality().equals(other._profiles, _profiles) && const DeepCollectionEquality().equals(other._profiles, _profiles) &&
(identical(other.currentProfileId, currentProfileId) || (identical(other.currentProfileId, currentProfileId) ||
other.currentProfileId == currentProfileId)); other.currentProfileId == currentProfileId) &&
(identical(other.viewMode, viewMode) ||
other.viewMode == viewMode));
} }
@override @override
int get hashCode => Object.hash(runtimeType, int get hashCode => Object.hash(
const DeepCollectionEquality().hash(_profiles), currentProfileId); runtimeType,
const DeepCollectionEquality().hash(_profiles),
currentProfileId,
viewMode);
@JsonKey(ignore: true) @JsonKey(ignore: true)
@override @override
@@ -630,13 +652,16 @@ class _$ProfilesSelectorStateImpl implements _ProfilesSelectorState {
abstract class _ProfilesSelectorState implements ProfilesSelectorState { abstract class _ProfilesSelectorState implements ProfilesSelectorState {
const factory _ProfilesSelectorState( const factory _ProfilesSelectorState(
{required final List<Profile> profiles, {required final List<Profile> profiles,
required final String? currentProfileId}) = _$ProfilesSelectorStateImpl; required final String? currentProfileId,
required final ViewMode viewMode}) = _$ProfilesSelectorStateImpl;
@override @override
List<Profile> get profiles; List<Profile> get profiles;
@override @override
String? get currentProfileId; String? get currentProfileId;
@override @override
ViewMode get viewMode;
@override
@JsonKey(ignore: true) @JsonKey(ignore: true)
_$$ProfilesSelectorStateImplCopyWith<_$ProfilesSelectorStateImpl> _$$ProfilesSelectorStateImplCopyWith<_$ProfilesSelectorStateImpl>
get copyWith => throw _privateConstructorUsedError; get copyWith => throw _privateConstructorUsedError;
@@ -951,159 +976,6 @@ abstract class _ApplicationSelectorState implements ApplicationSelectorState {
get copyWith => throw _privateConstructorUsedError; get copyWith => throw _privateConstructorUsedError;
} }
/// @nodoc
mixin _$HomeLayoutSelectorState {
List<NavigationItem> get navigationItems =>
throw _privateConstructorUsedError;
int get currentIndex => throw _privateConstructorUsedError;
@JsonKey(ignore: true)
$HomeLayoutSelectorStateCopyWith<HomeLayoutSelectorState> get copyWith =>
throw _privateConstructorUsedError;
}
/// @nodoc
abstract class $HomeLayoutSelectorStateCopyWith<$Res> {
factory $HomeLayoutSelectorStateCopyWith(HomeLayoutSelectorState value,
$Res Function(HomeLayoutSelectorState) then) =
_$HomeLayoutSelectorStateCopyWithImpl<$Res, HomeLayoutSelectorState>;
@useResult
$Res call({List<NavigationItem> navigationItems, int currentIndex});
}
/// @nodoc
class _$HomeLayoutSelectorStateCopyWithImpl<$Res,
$Val extends HomeLayoutSelectorState>
implements $HomeLayoutSelectorStateCopyWith<$Res> {
_$HomeLayoutSelectorStateCopyWithImpl(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? navigationItems = null,
Object? currentIndex = null,
}) {
return _then(_value.copyWith(
navigationItems: null == navigationItems
? _value.navigationItems
: navigationItems // ignore: cast_nullable_to_non_nullable
as List<NavigationItem>,
currentIndex: null == currentIndex
? _value.currentIndex
: currentIndex // ignore: cast_nullable_to_non_nullable
as int,
) as $Val);
}
}
/// @nodoc
abstract class _$$HomeLayoutSelectorStateImplCopyWith<$Res>
implements $HomeLayoutSelectorStateCopyWith<$Res> {
factory _$$HomeLayoutSelectorStateImplCopyWith(
_$HomeLayoutSelectorStateImpl value,
$Res Function(_$HomeLayoutSelectorStateImpl) then) =
__$$HomeLayoutSelectorStateImplCopyWithImpl<$Res>;
@override
@useResult
$Res call({List<NavigationItem> navigationItems, int currentIndex});
}
/// @nodoc
class __$$HomeLayoutSelectorStateImplCopyWithImpl<$Res>
extends _$HomeLayoutSelectorStateCopyWithImpl<$Res,
_$HomeLayoutSelectorStateImpl>
implements _$$HomeLayoutSelectorStateImplCopyWith<$Res> {
__$$HomeLayoutSelectorStateImplCopyWithImpl(
_$HomeLayoutSelectorStateImpl _value,
$Res Function(_$HomeLayoutSelectorStateImpl) _then)
: super(_value, _then);
@pragma('vm:prefer-inline')
@override
$Res call({
Object? navigationItems = null,
Object? currentIndex = null,
}) {
return _then(_$HomeLayoutSelectorStateImpl(
navigationItems: null == navigationItems
? _value._navigationItems
: navigationItems // ignore: cast_nullable_to_non_nullable
as List<NavigationItem>,
currentIndex: null == currentIndex
? _value.currentIndex
: currentIndex // ignore: cast_nullable_to_non_nullable
as int,
));
}
}
/// @nodoc
class _$HomeLayoutSelectorStateImpl implements _HomeLayoutSelectorState {
const _$HomeLayoutSelectorStateImpl(
{required final List<NavigationItem> navigationItems,
required this.currentIndex})
: _navigationItems = navigationItems;
final List<NavigationItem> _navigationItems;
@override
List<NavigationItem> get navigationItems {
if (_navigationItems is EqualUnmodifiableListView) return _navigationItems;
// ignore: implicit_dynamic_type
return EqualUnmodifiableListView(_navigationItems);
}
@override
final int currentIndex;
@override
String toString() {
return 'HomeLayoutSelectorState(navigationItems: $navigationItems, currentIndex: $currentIndex)';
}
@override
bool operator ==(Object other) {
return identical(this, other) ||
(other.runtimeType == runtimeType &&
other is _$HomeLayoutSelectorStateImpl &&
const DeepCollectionEquality()
.equals(other._navigationItems, _navigationItems) &&
(identical(other.currentIndex, currentIndex) ||
other.currentIndex == currentIndex));
}
@override
int get hashCode => Object.hash(runtimeType,
const DeepCollectionEquality().hash(_navigationItems), currentIndex);
@JsonKey(ignore: true)
@override
@pragma('vm:prefer-inline')
_$$HomeLayoutSelectorStateImplCopyWith<_$HomeLayoutSelectorStateImpl>
get copyWith => __$$HomeLayoutSelectorStateImplCopyWithImpl<
_$HomeLayoutSelectorStateImpl>(this, _$identity);
}
abstract class _HomeLayoutSelectorState implements HomeLayoutSelectorState {
const factory _HomeLayoutSelectorState(
{required final List<NavigationItem> navigationItems,
required final int currentIndex}) = _$HomeLayoutSelectorStateImpl;
@override
List<NavigationItem> get navigationItems;
@override
int get currentIndex;
@override
@JsonKey(ignore: true)
_$$HomeLayoutSelectorStateImplCopyWith<_$HomeLayoutSelectorStateImpl>
get copyWith => throw _privateConstructorUsedError;
}
/// @nodoc /// @nodoc
mixin _$TrayContainerSelectorState { mixin _$TrayContainerSelectorState {
Mode get mode => throw _privateConstructorUsedError; Mode get mode => throw _privateConstructorUsedError;
@@ -1429,31 +1301,35 @@ abstract class _UpdateNavigationsSelector implements UpdateNavigationsSelector {
} }
/// @nodoc /// @nodoc
mixin _$HomeCommonScaffoldSelectorState { mixin _$HomeSelectorState {
String get currentLabel => throw _privateConstructorUsedError; String get currentLabel => throw _privateConstructorUsedError;
List<NavigationItem> get navigationItems =>
throw _privateConstructorUsedError;
ViewMode get viewMode => throw _privateConstructorUsedError;
String? get locale => throw _privateConstructorUsedError; String? get locale => throw _privateConstructorUsedError;
@JsonKey(ignore: true) @JsonKey(ignore: true)
$HomeCommonScaffoldSelectorStateCopyWith<HomeCommonScaffoldSelectorState> $HomeSelectorStateCopyWith<HomeSelectorState> get copyWith =>
get copyWith => throw _privateConstructorUsedError; throw _privateConstructorUsedError;
} }
/// @nodoc /// @nodoc
abstract class $HomeCommonScaffoldSelectorStateCopyWith<$Res> { abstract class $HomeSelectorStateCopyWith<$Res> {
factory $HomeCommonScaffoldSelectorStateCopyWith( factory $HomeSelectorStateCopyWith(
HomeCommonScaffoldSelectorState value, HomeSelectorState value, $Res Function(HomeSelectorState) then) =
$Res Function(HomeCommonScaffoldSelectorState) then) = _$HomeSelectorStateCopyWithImpl<$Res, HomeSelectorState>;
_$HomeCommonScaffoldSelectorStateCopyWithImpl<$Res,
HomeCommonScaffoldSelectorState>;
@useResult @useResult
$Res call({String currentLabel, String? locale}); $Res call(
{String currentLabel,
List<NavigationItem> navigationItems,
ViewMode viewMode,
String? locale});
} }
/// @nodoc /// @nodoc
class _$HomeCommonScaffoldSelectorStateCopyWithImpl<$Res, class _$HomeSelectorStateCopyWithImpl<$Res, $Val extends HomeSelectorState>
$Val extends HomeCommonScaffoldSelectorState> implements $HomeSelectorStateCopyWith<$Res> {
implements $HomeCommonScaffoldSelectorStateCopyWith<$Res> { _$HomeSelectorStateCopyWithImpl(this._value, this._then);
_$HomeCommonScaffoldSelectorStateCopyWithImpl(this._value, this._then);
// ignore: unused_field // ignore: unused_field
final $Val _value; final $Val _value;
@@ -1464,6 +1340,8 @@ class _$HomeCommonScaffoldSelectorStateCopyWithImpl<$Res,
@override @override
$Res call({ $Res call({
Object? currentLabel = null, Object? currentLabel = null,
Object? navigationItems = null,
Object? viewMode = null,
Object? locale = freezed, Object? locale = freezed,
}) { }) {
return _then(_value.copyWith( return _then(_value.copyWith(
@@ -1471,6 +1349,14 @@ class _$HomeCommonScaffoldSelectorStateCopyWithImpl<$Res,
? _value.currentLabel ? _value.currentLabel
: currentLabel // ignore: cast_nullable_to_non_nullable : currentLabel // ignore: cast_nullable_to_non_nullable
as String, as String,
navigationItems: null == navigationItems
? _value.navigationItems
: navigationItems // ignore: cast_nullable_to_non_nullable
as List<NavigationItem>,
viewMode: null == viewMode
? _value.viewMode
: viewMode // ignore: cast_nullable_to_non_nullable
as ViewMode,
locale: freezed == locale locale: freezed == locale
? _value.locale ? _value.locale
: locale // ignore: cast_nullable_to_non_nullable : locale // ignore: cast_nullable_to_non_nullable
@@ -1480,38 +1366,49 @@ class _$HomeCommonScaffoldSelectorStateCopyWithImpl<$Res,
} }
/// @nodoc /// @nodoc
abstract class _$$HomeCommonScaffoldSelectorStateImplCopyWith<$Res> abstract class _$$HomeSelectorStateImplCopyWith<$Res>
implements $HomeCommonScaffoldSelectorStateCopyWith<$Res> { implements $HomeSelectorStateCopyWith<$Res> {
factory _$$HomeCommonScaffoldSelectorStateImplCopyWith( factory _$$HomeSelectorStateImplCopyWith(_$HomeSelectorStateImpl value,
_$HomeCommonScaffoldSelectorStateImpl value, $Res Function(_$HomeSelectorStateImpl) then) =
$Res Function(_$HomeCommonScaffoldSelectorStateImpl) then) = __$$HomeSelectorStateImplCopyWithImpl<$Res>;
__$$HomeCommonScaffoldSelectorStateImplCopyWithImpl<$Res>;
@override @override
@useResult @useResult
$Res call({String currentLabel, String? locale}); $Res call(
{String currentLabel,
List<NavigationItem> navigationItems,
ViewMode viewMode,
String? locale});
} }
/// @nodoc /// @nodoc
class __$$HomeCommonScaffoldSelectorStateImplCopyWithImpl<$Res> class __$$HomeSelectorStateImplCopyWithImpl<$Res>
extends _$HomeCommonScaffoldSelectorStateCopyWithImpl<$Res, extends _$HomeSelectorStateCopyWithImpl<$Res, _$HomeSelectorStateImpl>
_$HomeCommonScaffoldSelectorStateImpl> implements _$$HomeSelectorStateImplCopyWith<$Res> {
implements _$$HomeCommonScaffoldSelectorStateImplCopyWith<$Res> { __$$HomeSelectorStateImplCopyWithImpl(_$HomeSelectorStateImpl _value,
__$$HomeCommonScaffoldSelectorStateImplCopyWithImpl( $Res Function(_$HomeSelectorStateImpl) _then)
_$HomeCommonScaffoldSelectorStateImpl _value,
$Res Function(_$HomeCommonScaffoldSelectorStateImpl) _then)
: super(_value, _then); : super(_value, _then);
@pragma('vm:prefer-inline') @pragma('vm:prefer-inline')
@override @override
$Res call({ $Res call({
Object? currentLabel = null, Object? currentLabel = null,
Object? navigationItems = null,
Object? viewMode = null,
Object? locale = freezed, Object? locale = freezed,
}) { }) {
return _then(_$HomeCommonScaffoldSelectorStateImpl( return _then(_$HomeSelectorStateImpl(
currentLabel: null == currentLabel currentLabel: null == currentLabel
? _value.currentLabel ? _value.currentLabel
: currentLabel // ignore: cast_nullable_to_non_nullable : currentLabel // ignore: cast_nullable_to_non_nullable
as String, as String,
navigationItems: null == navigationItems
? _value._navigationItems
: navigationItems // ignore: cast_nullable_to_non_nullable
as List<NavigationItem>,
viewMode: null == viewMode
? _value.viewMode
: viewMode // ignore: cast_nullable_to_non_nullable
as ViewMode,
locale: freezed == locale locale: freezed == locale
? _value.locale ? _value.locale
: locale // ignore: cast_nullable_to_non_nullable : locale // ignore: cast_nullable_to_non_nullable
@@ -1522,86 +1419,105 @@ class __$$HomeCommonScaffoldSelectorStateImplCopyWithImpl<$Res>
/// @nodoc /// @nodoc
class _$HomeCommonScaffoldSelectorStateImpl class _$HomeSelectorStateImpl implements _HomeSelectorState {
implements _HomeCommonScaffoldSelectorState { const _$HomeSelectorStateImpl(
const _$HomeCommonScaffoldSelectorStateImpl( {required this.currentLabel,
{required this.currentLabel, required this.locale}); required final List<NavigationItem> navigationItems,
required this.viewMode,
required this.locale})
: _navigationItems = navigationItems;
@override @override
final String currentLabel; final String currentLabel;
final List<NavigationItem> _navigationItems;
@override
List<NavigationItem> get navigationItems {
if (_navigationItems is EqualUnmodifiableListView) return _navigationItems;
// ignore: implicit_dynamic_type
return EqualUnmodifiableListView(_navigationItems);
}
@override
final ViewMode viewMode;
@override @override
final String? locale; final String? locale;
@override @override
String toString() { String toString() {
return 'HomeCommonScaffoldSelectorState(currentLabel: $currentLabel, locale: $locale)'; return 'HomeSelectorState(currentLabel: $currentLabel, navigationItems: $navigationItems, viewMode: $viewMode, locale: $locale)';
} }
@override @override
bool operator ==(Object other) { bool operator ==(Object other) {
return identical(this, other) || return identical(this, other) ||
(other.runtimeType == runtimeType && (other.runtimeType == runtimeType &&
other is _$HomeCommonScaffoldSelectorStateImpl && other is _$HomeSelectorStateImpl &&
(identical(other.currentLabel, currentLabel) || (identical(other.currentLabel, currentLabel) ||
other.currentLabel == currentLabel) && other.currentLabel == currentLabel) &&
const DeepCollectionEquality()
.equals(other._navigationItems, _navigationItems) &&
(identical(other.viewMode, viewMode) ||
other.viewMode == viewMode) &&
(identical(other.locale, locale) || other.locale == locale)); (identical(other.locale, locale) || other.locale == locale));
} }
@override @override
int get hashCode => Object.hash(runtimeType, currentLabel, locale); int get hashCode => Object.hash(runtimeType, currentLabel,
const DeepCollectionEquality().hash(_navigationItems), viewMode, locale);
@JsonKey(ignore: true) @JsonKey(ignore: true)
@override @override
@pragma('vm:prefer-inline') @pragma('vm:prefer-inline')
_$$HomeCommonScaffoldSelectorStateImplCopyWith< _$$HomeSelectorStateImplCopyWith<_$HomeSelectorStateImpl> get copyWith =>
_$HomeCommonScaffoldSelectorStateImpl> __$$HomeSelectorStateImplCopyWithImpl<_$HomeSelectorStateImpl>(
get copyWith => __$$HomeCommonScaffoldSelectorStateImplCopyWithImpl< this, _$identity);
_$HomeCommonScaffoldSelectorStateImpl>(this, _$identity);
} }
abstract class _HomeCommonScaffoldSelectorState abstract class _HomeSelectorState implements HomeSelectorState {
implements HomeCommonScaffoldSelectorState { const factory _HomeSelectorState(
const factory _HomeCommonScaffoldSelectorState(
{required final String currentLabel, {required final String currentLabel,
required final String? locale}) = _$HomeCommonScaffoldSelectorStateImpl; required final List<NavigationItem> navigationItems,
required final ViewMode viewMode,
required final String? locale}) = _$HomeSelectorStateImpl;
@override @override
String get currentLabel; String get currentLabel;
@override @override
List<NavigationItem> get navigationItems;
@override
ViewMode get viewMode;
@override
String? get locale; String? get locale;
@override @override
@JsonKey(ignore: true) @JsonKey(ignore: true)
_$$HomeCommonScaffoldSelectorStateImplCopyWith< _$$HomeSelectorStateImplCopyWith<_$HomeSelectorStateImpl> get copyWith =>
_$HomeCommonScaffoldSelectorStateImpl> throw _privateConstructorUsedError;
get copyWith => throw _privateConstructorUsedError;
} }
/// @nodoc /// @nodoc
mixin _$HomeNavigationSelectorState { mixin _$HomeBodySelectorState {
int get currentIndex => throw _privateConstructorUsedError; List<NavigationItem> get navigationItems =>
String? get locale => throw _privateConstructorUsedError; throw _privateConstructorUsedError;
@JsonKey(ignore: true) @JsonKey(ignore: true)
$HomeNavigationSelectorStateCopyWith<HomeNavigationSelectorState> $HomeBodySelectorStateCopyWith<HomeBodySelectorState> get copyWith =>
get copyWith => throw _privateConstructorUsedError; throw _privateConstructorUsedError;
} }
/// @nodoc /// @nodoc
abstract class $HomeNavigationSelectorStateCopyWith<$Res> { abstract class $HomeBodySelectorStateCopyWith<$Res> {
factory $HomeNavigationSelectorStateCopyWith( factory $HomeBodySelectorStateCopyWith(HomeBodySelectorState value,
HomeNavigationSelectorState value, $Res Function(HomeBodySelectorState) then) =
$Res Function(HomeNavigationSelectorState) then) = _$HomeBodySelectorStateCopyWithImpl<$Res, HomeBodySelectorState>;
_$HomeNavigationSelectorStateCopyWithImpl<$Res,
HomeNavigationSelectorState>;
@useResult @useResult
$Res call({int currentIndex, String? locale}); $Res call({List<NavigationItem> navigationItems});
} }
/// @nodoc /// @nodoc
class _$HomeNavigationSelectorStateCopyWithImpl<$Res, class _$HomeBodySelectorStateCopyWithImpl<$Res,
$Val extends HomeNavigationSelectorState> $Val extends HomeBodySelectorState>
implements $HomeNavigationSelectorStateCopyWith<$Res> { implements $HomeBodySelectorStateCopyWith<$Res> {
_$HomeNavigationSelectorStateCopyWithImpl(this._value, this._then); _$HomeBodySelectorStateCopyWithImpl(this._value, this._then);
// ignore: unused_field // ignore: unused_field
final $Val _value; final $Val _value;
@@ -1611,114 +1527,103 @@ class _$HomeNavigationSelectorStateCopyWithImpl<$Res,
@pragma('vm:prefer-inline') @pragma('vm:prefer-inline')
@override @override
$Res call({ $Res call({
Object? currentIndex = null, Object? navigationItems = null,
Object? locale = freezed,
}) { }) {
return _then(_value.copyWith( return _then(_value.copyWith(
currentIndex: null == currentIndex navigationItems: null == navigationItems
? _value.currentIndex ? _value.navigationItems
: currentIndex // ignore: cast_nullable_to_non_nullable : navigationItems // ignore: cast_nullable_to_non_nullable
as int, as List<NavigationItem>,
locale: freezed == locale
? _value.locale
: locale // ignore: cast_nullable_to_non_nullable
as String?,
) as $Val); ) as $Val);
} }
} }
/// @nodoc /// @nodoc
abstract class _$$HomeNavigationSelectorStateImplCopyWith<$Res> abstract class _$$HomeBodySelectorStateImplCopyWith<$Res>
implements $HomeNavigationSelectorStateCopyWith<$Res> { implements $HomeBodySelectorStateCopyWith<$Res> {
factory _$$HomeNavigationSelectorStateImplCopyWith( factory _$$HomeBodySelectorStateImplCopyWith(
_$HomeNavigationSelectorStateImpl value, _$HomeBodySelectorStateImpl value,
$Res Function(_$HomeNavigationSelectorStateImpl) then) = $Res Function(_$HomeBodySelectorStateImpl) then) =
__$$HomeNavigationSelectorStateImplCopyWithImpl<$Res>; __$$HomeBodySelectorStateImplCopyWithImpl<$Res>;
@override @override
@useResult @useResult
$Res call({int currentIndex, String? locale}); $Res call({List<NavigationItem> navigationItems});
} }
/// @nodoc /// @nodoc
class __$$HomeNavigationSelectorStateImplCopyWithImpl<$Res> class __$$HomeBodySelectorStateImplCopyWithImpl<$Res>
extends _$HomeNavigationSelectorStateCopyWithImpl<$Res, extends _$HomeBodySelectorStateCopyWithImpl<$Res,
_$HomeNavigationSelectorStateImpl> _$HomeBodySelectorStateImpl>
implements _$$HomeNavigationSelectorStateImplCopyWith<$Res> { implements _$$HomeBodySelectorStateImplCopyWith<$Res> {
__$$HomeNavigationSelectorStateImplCopyWithImpl( __$$HomeBodySelectorStateImplCopyWithImpl(_$HomeBodySelectorStateImpl _value,
_$HomeNavigationSelectorStateImpl _value, $Res Function(_$HomeBodySelectorStateImpl) _then)
$Res Function(_$HomeNavigationSelectorStateImpl) _then)
: super(_value, _then); : super(_value, _then);
@pragma('vm:prefer-inline') @pragma('vm:prefer-inline')
@override @override
$Res call({ $Res call({
Object? currentIndex = null, Object? navigationItems = null,
Object? locale = freezed,
}) { }) {
return _then(_$HomeNavigationSelectorStateImpl( return _then(_$HomeBodySelectorStateImpl(
currentIndex: null == currentIndex navigationItems: null == navigationItems
? _value.currentIndex ? _value._navigationItems
: currentIndex // ignore: cast_nullable_to_non_nullable : navigationItems // ignore: cast_nullable_to_non_nullable
as int, as List<NavigationItem>,
locale: freezed == locale
? _value.locale
: locale // ignore: cast_nullable_to_non_nullable
as String?,
)); ));
} }
} }
/// @nodoc /// @nodoc
class _$HomeNavigationSelectorStateImpl class _$HomeBodySelectorStateImpl implements _HomeBodySelectorState {
implements _HomeNavigationSelectorState { const _$HomeBodySelectorStateImpl(
const _$HomeNavigationSelectorStateImpl( {required final List<NavigationItem> navigationItems})
{required this.currentIndex, required this.locale}); : _navigationItems = navigationItems;
final List<NavigationItem> _navigationItems;
@override @override
final int currentIndex; List<NavigationItem> get navigationItems {
@override if (_navigationItems is EqualUnmodifiableListView) return _navigationItems;
final String? locale; // ignore: implicit_dynamic_type
return EqualUnmodifiableListView(_navigationItems);
}
@override @override
String toString() { String toString() {
return 'HomeNavigationSelectorState(currentIndex: $currentIndex, locale: $locale)'; return 'HomeBodySelectorState(navigationItems: $navigationItems)';
} }
@override @override
bool operator ==(Object other) { bool operator ==(Object other) {
return identical(this, other) || return identical(this, other) ||
(other.runtimeType == runtimeType && (other.runtimeType == runtimeType &&
other is _$HomeNavigationSelectorStateImpl && other is _$HomeBodySelectorStateImpl &&
(identical(other.currentIndex, currentIndex) || const DeepCollectionEquality()
other.currentIndex == currentIndex) && .equals(other._navigationItems, _navigationItems));
(identical(other.locale, locale) || other.locale == locale));
} }
@override @override
int get hashCode => Object.hash(runtimeType, currentIndex, locale); int get hashCode => Object.hash(
runtimeType, const DeepCollectionEquality().hash(_navigationItems));
@JsonKey(ignore: true) @JsonKey(ignore: true)
@override @override
@pragma('vm:prefer-inline') @pragma('vm:prefer-inline')
_$$HomeNavigationSelectorStateImplCopyWith<_$HomeNavigationSelectorStateImpl> _$$HomeBodySelectorStateImplCopyWith<_$HomeBodySelectorStateImpl>
get copyWith => __$$HomeNavigationSelectorStateImplCopyWithImpl< get copyWith => __$$HomeBodySelectorStateImplCopyWithImpl<
_$HomeNavigationSelectorStateImpl>(this, _$identity); _$HomeBodySelectorStateImpl>(this, _$identity);
} }
abstract class _HomeNavigationSelectorState abstract class _HomeBodySelectorState implements HomeBodySelectorState {
implements HomeNavigationSelectorState { const factory _HomeBodySelectorState(
const factory _HomeNavigationSelectorState( {required final List<NavigationItem> navigationItems}) =
{required final int currentIndex, _$HomeBodySelectorStateImpl;
required final String? locale}) = _$HomeNavigationSelectorStateImpl;
@override @override
int get currentIndex; List<NavigationItem> get navigationItems;
@override
String? get locale;
@override @override
@JsonKey(ignore: true) @JsonKey(ignore: true)
_$$HomeNavigationSelectorStateImplCopyWith<_$HomeNavigationSelectorStateImpl> _$$HomeBodySelectorStateImplCopyWith<_$HomeBodySelectorStateImpl>
get copyWith => throw _privateConstructorUsedError; get copyWith => throw _privateConstructorUsedError;
} }
@@ -1980,6 +1885,7 @@ mixin _$ProxiesTabViewSelectorState {
ProxiesSortType get proxiesSortType => throw _privateConstructorUsedError; ProxiesSortType get proxiesSortType => throw _privateConstructorUsedError;
num get sortNum => throw _privateConstructorUsedError; num get sortNum => throw _privateConstructorUsedError;
Group get group => throw _privateConstructorUsedError; Group get group => throw _privateConstructorUsedError;
ViewMode get viewMode => throw _privateConstructorUsedError;
@JsonKey(ignore: true) @JsonKey(ignore: true)
$ProxiesTabViewSelectorStateCopyWith<ProxiesTabViewSelectorState> $ProxiesTabViewSelectorStateCopyWith<ProxiesTabViewSelectorState>
@@ -1994,7 +1900,11 @@ abstract class $ProxiesTabViewSelectorStateCopyWith<$Res> {
_$ProxiesTabViewSelectorStateCopyWithImpl<$Res, _$ProxiesTabViewSelectorStateCopyWithImpl<$Res,
ProxiesTabViewSelectorState>; ProxiesTabViewSelectorState>;
@useResult @useResult
$Res call({ProxiesSortType proxiesSortType, num sortNum, Group group}); $Res call(
{ProxiesSortType proxiesSortType,
num sortNum,
Group group,
ViewMode viewMode});
$GroupCopyWith<$Res> get group; $GroupCopyWith<$Res> get group;
} }
@@ -2016,6 +1926,7 @@ class _$ProxiesTabViewSelectorStateCopyWithImpl<$Res,
Object? proxiesSortType = null, Object? proxiesSortType = null,
Object? sortNum = null, Object? sortNum = null,
Object? group = null, Object? group = null,
Object? viewMode = null,
}) { }) {
return _then(_value.copyWith( return _then(_value.copyWith(
proxiesSortType: null == proxiesSortType proxiesSortType: null == proxiesSortType
@@ -2030,6 +1941,10 @@ class _$ProxiesTabViewSelectorStateCopyWithImpl<$Res,
? _value.group ? _value.group
: group // ignore: cast_nullable_to_non_nullable : group // ignore: cast_nullable_to_non_nullable
as Group, as Group,
viewMode: null == viewMode
? _value.viewMode
: viewMode // ignore: cast_nullable_to_non_nullable
as ViewMode,
) as $Val); ) as $Val);
} }
@@ -2051,7 +1966,11 @@ abstract class _$$ProxiesTabViewSelectorStateImplCopyWith<$Res>
__$$ProxiesTabViewSelectorStateImplCopyWithImpl<$Res>; __$$ProxiesTabViewSelectorStateImplCopyWithImpl<$Res>;
@override @override
@useResult @useResult
$Res call({ProxiesSortType proxiesSortType, num sortNum, Group group}); $Res call(
{ProxiesSortType proxiesSortType,
num sortNum,
Group group,
ViewMode viewMode});
@override @override
$GroupCopyWith<$Res> get group; $GroupCopyWith<$Res> get group;
@@ -2073,6 +1992,7 @@ class __$$ProxiesTabViewSelectorStateImplCopyWithImpl<$Res>
Object? proxiesSortType = null, Object? proxiesSortType = null,
Object? sortNum = null, Object? sortNum = null,
Object? group = null, Object? group = null,
Object? viewMode = null,
}) { }) {
return _then(_$ProxiesTabViewSelectorStateImpl( return _then(_$ProxiesTabViewSelectorStateImpl(
proxiesSortType: null == proxiesSortType proxiesSortType: null == proxiesSortType
@@ -2087,6 +2007,10 @@ class __$$ProxiesTabViewSelectorStateImplCopyWithImpl<$Res>
? _value.group ? _value.group
: group // ignore: cast_nullable_to_non_nullable : group // ignore: cast_nullable_to_non_nullable
as Group, as Group,
viewMode: null == viewMode
? _value.viewMode
: viewMode // ignore: cast_nullable_to_non_nullable
as ViewMode,
)); ));
} }
} }
@@ -2098,7 +2022,8 @@ class _$ProxiesTabViewSelectorStateImpl
const _$ProxiesTabViewSelectorStateImpl( const _$ProxiesTabViewSelectorStateImpl(
{required this.proxiesSortType, {required this.proxiesSortType,
required this.sortNum, required this.sortNum,
required this.group}); required this.group,
required this.viewMode});
@override @override
final ProxiesSortType proxiesSortType; final ProxiesSortType proxiesSortType;
@@ -2106,10 +2031,12 @@ class _$ProxiesTabViewSelectorStateImpl
final num sortNum; final num sortNum;
@override @override
final Group group; final Group group;
@override
final ViewMode viewMode;
@override @override
String toString() { String toString() {
return 'ProxiesTabViewSelectorState(proxiesSortType: $proxiesSortType, sortNum: $sortNum, group: $group)'; return 'ProxiesTabViewSelectorState(proxiesSortType: $proxiesSortType, sortNum: $sortNum, group: $group, viewMode: $viewMode)';
} }
@override @override
@@ -2120,11 +2047,14 @@ class _$ProxiesTabViewSelectorStateImpl
(identical(other.proxiesSortType, proxiesSortType) || (identical(other.proxiesSortType, proxiesSortType) ||
other.proxiesSortType == proxiesSortType) && other.proxiesSortType == proxiesSortType) &&
(identical(other.sortNum, sortNum) || other.sortNum == sortNum) && (identical(other.sortNum, sortNum) || other.sortNum == sortNum) &&
(identical(other.group, group) || other.group == group)); (identical(other.group, group) || other.group == group) &&
(identical(other.viewMode, viewMode) ||
other.viewMode == viewMode));
} }
@override @override
int get hashCode => Object.hash(runtimeType, proxiesSortType, sortNum, group); int get hashCode =>
Object.hash(runtimeType, proxiesSortType, sortNum, group, viewMode);
@JsonKey(ignore: true) @JsonKey(ignore: true)
@override @override
@@ -2139,7 +2069,8 @@ abstract class _ProxiesTabViewSelectorState
const factory _ProxiesTabViewSelectorState( const factory _ProxiesTabViewSelectorState(
{required final ProxiesSortType proxiesSortType, {required final ProxiesSortType proxiesSortType,
required final num sortNum, required final num sortNum,
required final Group group}) = _$ProxiesTabViewSelectorStateImpl; required final Group group,
required final ViewMode viewMode}) = _$ProxiesTabViewSelectorStateImpl;
@override @override
ProxiesSortType get proxiesSortType; ProxiesSortType get proxiesSortType;
@@ -2148,7 +2079,143 @@ abstract class _ProxiesTabViewSelectorState
@override @override
Group get group; Group get group;
@override @override
ViewMode get viewMode;
@override
@JsonKey(ignore: true) @JsonKey(ignore: true)
_$$ProxiesTabViewSelectorStateImplCopyWith<_$ProxiesTabViewSelectorStateImpl> _$$ProxiesTabViewSelectorStateImplCopyWith<_$ProxiesTabViewSelectorStateImpl>
get copyWith => throw _privateConstructorUsedError; get copyWith => throw _privateConstructorUsedError;
} }
/// @nodoc
mixin _$MoreToolsSelectorState {
List<NavigationItem> get navigationItems =>
throw _privateConstructorUsedError;
@JsonKey(ignore: true)
$MoreToolsSelectorStateCopyWith<MoreToolsSelectorState> get copyWith =>
throw _privateConstructorUsedError;
}
/// @nodoc
abstract class $MoreToolsSelectorStateCopyWith<$Res> {
factory $MoreToolsSelectorStateCopyWith(MoreToolsSelectorState value,
$Res Function(MoreToolsSelectorState) then) =
_$MoreToolsSelectorStateCopyWithImpl<$Res, MoreToolsSelectorState>;
@useResult
$Res call({List<NavigationItem> navigationItems});
}
/// @nodoc
class _$MoreToolsSelectorStateCopyWithImpl<$Res,
$Val extends MoreToolsSelectorState>
implements $MoreToolsSelectorStateCopyWith<$Res> {
_$MoreToolsSelectorStateCopyWithImpl(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? navigationItems = null,
}) {
return _then(_value.copyWith(
navigationItems: null == navigationItems
? _value.navigationItems
: navigationItems // ignore: cast_nullable_to_non_nullable
as List<NavigationItem>,
) as $Val);
}
}
/// @nodoc
abstract class _$$MoreToolsSelectorStateImplCopyWith<$Res>
implements $MoreToolsSelectorStateCopyWith<$Res> {
factory _$$MoreToolsSelectorStateImplCopyWith(
_$MoreToolsSelectorStateImpl value,
$Res Function(_$MoreToolsSelectorStateImpl) then) =
__$$MoreToolsSelectorStateImplCopyWithImpl<$Res>;
@override
@useResult
$Res call({List<NavigationItem> navigationItems});
}
/// @nodoc
class __$$MoreToolsSelectorStateImplCopyWithImpl<$Res>
extends _$MoreToolsSelectorStateCopyWithImpl<$Res,
_$MoreToolsSelectorStateImpl>
implements _$$MoreToolsSelectorStateImplCopyWith<$Res> {
__$$MoreToolsSelectorStateImplCopyWithImpl(
_$MoreToolsSelectorStateImpl _value,
$Res Function(_$MoreToolsSelectorStateImpl) _then)
: super(_value, _then);
@pragma('vm:prefer-inline')
@override
$Res call({
Object? navigationItems = null,
}) {
return _then(_$MoreToolsSelectorStateImpl(
navigationItems: null == navigationItems
? _value._navigationItems
: navigationItems // ignore: cast_nullable_to_non_nullable
as List<NavigationItem>,
));
}
}
/// @nodoc
class _$MoreToolsSelectorStateImpl implements _MoreToolsSelectorState {
const _$MoreToolsSelectorStateImpl(
{required final List<NavigationItem> navigationItems})
: _navigationItems = navigationItems;
final List<NavigationItem> _navigationItems;
@override
List<NavigationItem> get navigationItems {
if (_navigationItems is EqualUnmodifiableListView) return _navigationItems;
// ignore: implicit_dynamic_type
return EqualUnmodifiableListView(_navigationItems);
}
@override
String toString() {
return 'MoreToolsSelectorState(navigationItems: $navigationItems)';
}
@override
bool operator ==(Object other) {
return identical(this, other) ||
(other.runtimeType == runtimeType &&
other is _$MoreToolsSelectorStateImpl &&
const DeepCollectionEquality()
.equals(other._navigationItems, _navigationItems));
}
@override
int get hashCode => Object.hash(
runtimeType, const DeepCollectionEquality().hash(_navigationItems));
@JsonKey(ignore: true)
@override
@pragma('vm:prefer-inline')
_$$MoreToolsSelectorStateImplCopyWith<_$MoreToolsSelectorStateImpl>
get copyWith => __$$MoreToolsSelectorStateImplCopyWithImpl<
_$MoreToolsSelectorStateImpl>(this, _$identity);
}
abstract class _MoreToolsSelectorState implements MoreToolsSelectorState {
const factory _MoreToolsSelectorState(
{required final List<NavigationItem> navigationItems}) =
_$MoreToolsSelectorStateImpl;
@override
List<NavigationItem> get navigationItems;
@override
@JsonKey(ignore: true)
_$$MoreToolsSelectorStateImplCopyWith<_$MoreToolsSelectorStateImpl>
get copyWith => throw _privateConstructorUsedError;
}

View File

@@ -12,4 +12,5 @@ export 'package.dart';
export 'common.dart'; export 'common.dart';
export 'ffi.dart'; export 'ffi.dart';
export 'selector.dart'; export 'selector.dart';
export 'navigation.dart'; export 'navigation.dart';
export 'dav.dart';

View File

@@ -84,42 +84,40 @@ class Profile {
this.autoUpdate = true, this.autoUpdate = true,
}) : id = id ?? DateTime.now().millisecondsSinceEpoch.toString(), }) : id = id ?? DateTime.now().millisecondsSinceEpoch.toString(),
autoUpdateDuration = autoUpdateDuration =
autoUpdateDuration ?? appConstant.defaultUpdateDuration, autoUpdateDuration ?? defaultUpdateDuration,
selectedMap = selectedMap ?? {}; selectedMap = selectedMap ?? {};
ProfileType get type => url == null ? ProfileType.file : ProfileType.url; ProfileType get type => url == null ? ProfileType.file : ProfileType.url;
Future<Result<bool>> checkAndUpdate() async {
final isExists = await check();
if(!isExists){
if(url != null){
return await update();
}
return Result.error();
}
return Result.success();
}
Future<Result<bool>> update() async { Future<Result<bool>> update() async {
if (url == null) { if (url == null) {
return Result.error( return Result.error(
message: appLocalizations.unableToUpdateCurrentProfileDesc, appLocalizations.unableToUpdateCurrentProfileDesc,
); );
} }
final responseResult = await Request.getFileResponseForUrl(url!); final responseResult = await Request.getFileResponseForUrl(url!);
final response = responseResult.data; final response = responseResult.data;
if (responseResult.type != ResultType.success || response == null) { if (responseResult.type != ResultType.success || response == null) {
return Result.error(message: responseResult.message); return Result.error(responseResult.message);
} }
final disposition = response.headers['content-disposition']; final disposition = response.headers['content-disposition'];
if (disposition != null && label == null) { label ??= other.getFileNameForDisposition(disposition) ?? id;
final parseValue = HeaderValue.parse(disposition);
parseValue.parameters.forEach(
(key, value) {
if (key.startsWith("filename")) {
if (key == "filename*") {
label = Uri.decodeComponent((value ?? "").split("'").last);
} else {
label = value ?? id;
}
}
},
);
}
final userinfo = response.headers['subscription-userinfo']; final userinfo = response.headers['subscription-userinfo'];
userInfo = UserInfo.formHString(userinfo); userInfo = UserInfo.formHString(userinfo);
final saveResult = await saveFile(response.bodyBytes); final saveResult = await saveFile(response.bodyBytes);
if (saveResult.type == ResultType.error) { if (saveResult.type == ResultType.error) {
return Result.error(message: saveResult.message); return Result.error(saveResult.message);
} }
lastUpdateDate = DateTime.now(); lastUpdateDate = DateTime.now();
return Result.success(); return Result.success();
@@ -133,7 +131,7 @@ class Profile {
Future<Result<void>> saveFile(Uint8List bytes) async { Future<Result<void>> saveFile(Uint8List bytes) async {
final isValidate = clashCore.validateConfig(utf8.decode(bytes)); final isValidate = clashCore.validateConfig(utf8.decode(bytes));
if (!isValidate) { if (!isValidate) {
return Result.error(message: appLocalizations.profileParseErrorDesc); return Result.error(appLocalizations.profileParseErrorDesc);
} }
final path = await appPath.getProfilePath(id); final path = await appPath.getProfilePath(id);
final file = File(path!); final file = File(path!);

View File

@@ -40,6 +40,7 @@ class ProfilesSelectorState with _$ProfilesSelectorState {
const factory ProfilesSelectorState({ const factory ProfilesSelectorState({
required List<Profile> profiles, required List<Profile> profiles,
required String? currentProfileId, required String? currentProfileId,
required ViewMode viewMode,
}) = _ProfilesSelectorState; }) = _ProfilesSelectorState;
} }
@@ -60,14 +61,6 @@ class ApplicationSelectorState with _$ApplicationSelectorState {
}) = _ApplicationSelectorState; }) = _ApplicationSelectorState;
} }
@freezed
class HomeLayoutSelectorState with _$HomeLayoutSelectorState{
const factory HomeLayoutSelectorState({
required List<NavigationItem> navigationItems,
required int currentIndex,
})=_HomeLayoutSelectorState;
}
@freezed @freezed
class TrayContainerSelectorState with _$TrayContainerSelectorState{ class TrayContainerSelectorState with _$TrayContainerSelectorState{
const factory TrayContainerSelectorState({ const factory TrayContainerSelectorState({
@@ -86,20 +79,22 @@ class UpdateNavigationsSelector with _$UpdateNavigationsSelector{
}) = _UpdateNavigationsSelector; }) = _UpdateNavigationsSelector;
} }
@freezed @freezed
class HomeCommonScaffoldSelectorState with _$HomeCommonScaffoldSelectorState { class HomeSelectorState with _$HomeSelectorState {
const factory HomeCommonScaffoldSelectorState({ const factory HomeSelectorState({
required String currentLabel, required String currentLabel,
required List<NavigationItem> navigationItems,
required ViewMode viewMode,
required String? locale, required String? locale,
}) = _HomeCommonScaffoldSelectorState; }) = _HomeSelectorState;
} }
@freezed @freezed
class HomeNavigationSelectorState with _$HomeNavigationSelectorState{ class HomeBodySelectorState with _$HomeBodySelectorState {
const factory HomeNavigationSelectorState({ const factory HomeBodySelectorState({
required int currentIndex, required List<NavigationItem> navigationItems,
required String? locale, }) = _HomeBodySelectorState;
}) = _HomeNavigationSelectorState;
} }
@freezed @freezed
@@ -122,5 +117,13 @@ class ProxiesTabViewSelectorState with _$ProxiesTabViewSelectorState{
required ProxiesSortType proxiesSortType, required ProxiesSortType proxiesSortType,
required num sortNum, required num sortNum,
required Group group, required Group group,
required ViewMode viewMode,
}) = _ProxiesTabViewSelectorState; }) = _ProxiesTabViewSelectorState;
} }
@freezed
class MoreToolsSelectorState with _$MoreToolsSelectorState {
const factory MoreToolsSelectorState({
required List<NavigationItem> navigationItems,
}) = _MoreToolsSelectorState;
}

View File

@@ -6,10 +6,10 @@ class SystemColorSchemes {
ColorScheme? lightColorScheme, ColorScheme? lightColorScheme,
ColorScheme? darkColorScheme, ColorScheme? darkColorScheme,
}) : lightColorScheme = lightColorScheme ?? }) : lightColorScheme = lightColorScheme ??
ColorScheme.fromSeed(seedColor: appConstant.defaultPrimaryColor), ColorScheme.fromSeed(seedColor: defaultPrimaryColor),
darkColorScheme = darkColorScheme ?? darkColorScheme = darkColorScheme ??
ColorScheme.fromSeed( ColorScheme.fromSeed(
seedColor: appConstant.defaultPrimaryColor, seedColor: defaultPrimaryColor,
brightness: Brightness.dark, brightness: Brightness.dark,
); );
ColorScheme lightColorScheme; ColorScheme lightColorScheme;

View File

@@ -1,8 +1,6 @@
import 'package:fl_clash/common/common.dart';
import 'package:fl_clash/models/models.dart'; import 'package:fl_clash/models/models.dart';
import 'package:fl_clash/state.dart'; import 'package:fl_clash/state.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:flutter_adaptive_scaffold/flutter_adaptive_scaffold.dart';
import 'package:intl/intl.dart'; import 'package:intl/intl.dart';
import 'package:provider/provider.dart'; import 'package:provider/provider.dart';
@@ -14,28 +12,133 @@ typedef OnSelected = void Function(int index);
class HomePage extends StatelessWidget { class HomePage extends StatelessWidget {
const HomePage({super.key}); const HomePage({super.key});
Widget _buildBody({ _getNavigationBar({
required ViewMode viewMode,
required List<NavigationItem> navigationItems, required List<NavigationItem> navigationItems,
required int currentIndex,
}) { }) {
globalState.currentNavigationItems = navigationItems; if (viewMode == ViewMode.mobile) {
return Selector<AppState, int>( return NavigationBar(
selector: (_, appState) { destinations: navigationItems
final index = navigationItems.lastIndexWhere( .map(
(element) => element.label == appState.currentLabel, (e) => NavigationDestination(
); icon: e.icon,
return index == -1 ? 0 : index; label: Intl.message(e.label),
}, ),
builder: (context, currentIndex, __) { )
if (globalState.pageController != null) { .toList(),
WidgetsBinding.instance.addPostFrameCallback((_) { onDestinationSelected: globalState.appController.toPage,
context.appController.toPage(currentIndex, hasAnimate: true); selectedIndex: currentIndex,
}); );
} else { }
globalState.pageController = PageController( final extended = viewMode == ViewMode.desktop;
initialPage: currentIndex, return NavigationRail(
keepPage: true, destinations: navigationItems
.map(
(e) => NavigationRailDestination(
icon: e.icon,
label: Text(
Intl.message(e.label),
),
),
)
.toList(),
onDestinationSelected: globalState.appController.toPage,
extended: extended,
minExtendedWidth: 172,
selectedIndex: currentIndex,
labelType: extended
? NavigationRailLabelType.none
: NavigationRailLabelType.selected,
);
}
@override
Widget build(BuildContext context) {
return PopContainer(
child: Selector2<AppState, Config, HomeSelectorState>(
selector: (_, appState, config) => HomeSelectorState(
currentLabel: appState.currentLabel,
navigationItems: appState.currentNavigationItems,
viewMode: appState.viewMode,
locale: config.locale,
),
builder: (_, state, child) {
final viewMode = state.viewMode;
final navigationItems = state.navigationItems;
final currentLabel = state.currentLabel;
final index = navigationItems.lastIndexWhere(
(element) => element.label == currentLabel,
); );
} final currentIndex = index == -1 ? 0 : index;
final navigationBar = _getNavigationBar(
viewMode: viewMode,
navigationItems: navigationItems,
currentIndex: currentIndex,
);
final bottomNavigationBar =
viewMode == ViewMode.mobile ? navigationBar : null;
Widget body;
if (viewMode != ViewMode.mobile) {
body = Row(
children: [
navigationBar,
Expanded(
flex: 1,
child: child!,
)
],
);
} else {
body = child!;
}
return CommonScaffold(
key: globalState.homeScaffoldKey,
title: Intl.message(
currentLabel,
),
body: body,
bottomNavigationBar: bottomNavigationBar,
);
},
child: const HomeBody(
key: Key("home_boy"),
),
),
);
}
}
class HomeBody extends StatelessWidget {
const HomeBody({super.key});
_updatePageIndex(List<NavigationItem> navigationItems) {
final currentLabel = globalState.appController.appState.currentLabel;
final index = navigationItems.lastIndexWhere(
(element) => element.label == currentLabel,
);
final currentIndex = index == -1 ? 0 : index;
if (globalState.pageController != null) {
WidgetsBinding.instance.addPostFrameCallback((_) {
globalState.appController.toPage(currentIndex);
});
} else {
globalState.pageController = PageController(
initialPage: currentIndex,
keepPage: true,
);
}
}
@override
Widget build(BuildContext context) {
return Selector<AppState, HomeBodySelectorState>(
selector: (_, appState) => HomeBodySelectorState(
navigationItems: appState.currentNavigationItems,
),
builder: (_, state, __) {
final navigationItems = state.navigationItems;
_updatePageIndex(navigationItems);
return PageView.builder( return PageView.builder(
controller: globalState.pageController, controller: globalState.pageController,
physics: const NeverScrollableScrollPhysics(), physics: const NeverScrollableScrollPhysics(),
@@ -43,6 +146,7 @@ class HomePage extends StatelessWidget {
itemBuilder: (_, index) { itemBuilder: (_, index) {
final navigationItem = navigationItems[index]; final navigationItem = navigationItems[index];
return KeepContainer( return KeepContainer(
key: Key(navigationItem.label),
child: navigationItem.fragment, child: navigationItem.fragment,
); );
}, },
@@ -50,157 +154,4 @@ class HomePage extends StatelessWidget {
}, },
); );
} }
_buildNavigationRail({
required List<NavigationItem> navigationItems,
bool extended = false,
}) {
return Selector2<AppState, Config, HomeNavigationSelectorState>(
selector: (_, appState, config) {
final index = navigationItems.lastIndexWhere(
(element) => element.label == appState.currentLabel,
);
return HomeNavigationSelectorState(
currentIndex: index == -1 ? 0 : index,
locale: config.locale,
);
},
builder: (context, state, __) {
return AdaptiveScaffold.standardNavigationRail(
onDestinationSelected: context.appController.toPage,
destinations: navigationItems
.map(
(e) => NavigationRailDestination(
icon: e.icon,
label: Text(
Intl.message(e.label),
),
),
)
.toList(),
extended: extended,
width: extended ? 160 : 80,
selectedIndex: state.currentIndex,
labelType: extended
? NavigationRailLabelType.none
: NavigationRailLabelType.selected,
);
},
);
}
_buildBottomNavigationBar({
required List<NavigationItem> navigationItems,
}) {
return Selector2<AppState, Config, HomeNavigationSelectorState>(
selector: (_, appState, config) {
final index = navigationItems.lastIndexWhere(
(element) => element.label == appState.currentLabel,
);
return HomeNavigationSelectorState(
currentIndex: index == -1 ? 0 : index,
locale: config.locale,
);
},
builder: (context, state, __) {
final mobileDestinations = navigationItems
.map(
(e) => NavigationDestination(
icon: e.icon,
label: Intl.message(e.label),
),
)
.toList();
return AdaptiveScaffold.standardBottomNavigationBar(
destinations: mobileDestinations,
onDestinationSelected: context.appController.toPage,
currentIndex: state.currentIndex,
);
},
);
}
@override
Widget build(BuildContext context) {
return PopContainer(
child: Selector2<AppState, Config, HomeCommonScaffoldSelectorState>(
selector: (_, appState, config) => HomeCommonScaffoldSelectorState(
currentLabel: appState.currentLabel,
locale: config.locale,
),
builder: (_, state, child) {
return CommonScaffold(
key: globalState.homeScaffoldKey,
title: Text(
Intl.message(state.currentLabel),
),
body: child!,
);
},
child: Selector<AppState, List<NavigationItem>>(
selector: (_, appState) => appState.navigationItems,
builder: (_, navigationItems, __) {
final desktopNavigationItems = navigationItems
.where(
(element) =>
element.modes.contains(NavigationItemMode.desktop),
)
.toList();
final mobileNavigationItems = navigationItems
.where(
(element) =>
element.modes.contains(NavigationItemMode.mobile),
)
.toList();
return AdaptiveLayout(
transitionDuration: kThemeAnimationDuration,
primaryNavigation: SlotLayout(
config: {
Breakpoints.medium: SlotLayout.from(
key: const Key('primary_navigation_medium'),
builder: (_) => _buildNavigationRail(
navigationItems: desktopNavigationItems,
),
),
Breakpoints.large: SlotLayout.from(
key: const Key('primary_navigation_large'),
builder: (_) => _buildNavigationRail(
navigationItems: desktopNavigationItems,
extended: true,
),
),
},
),
body: SlotLayout(
config: {
Breakpoints.mediumAndUp: SlotLayout.from(
key: const Key('body_mediumAndUp'),
builder: (_) => _buildBody(
navigationItems: desktopNavigationItems,
),
),
Breakpoints.small: SlotLayout.from(
key: const Key('body_small'),
builder: (_) => _buildBody(
navigationItems: mobileNavigationItems,
),
)
},
),
bottomNavigation: SlotLayout(
config: <Breakpoint, SlotLayoutConfig>{
Breakpoints.small: SlotLayout.from(
key: const Key('bottom_navigation_small'),
builder: (_) => _buildBottomNavigationBar(
navigationItems: mobileNavigationItems,
),
)
},
),
);
},
),
),
);
}
} }

View File

@@ -1,5 +1,6 @@
import 'dart:async'; import 'dart:async';
import 'dart:math'; import 'dart:math';
import 'package:fl_clash/state.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:mobile_scanner/mobile_scanner.dart'; import 'package:mobile_scanner/mobile_scanner.dart';
@@ -82,47 +83,63 @@ class _ScanPageState extends State<ScanPage> with WidgetsBindingObserver {
automaticallyImplyLeading: false, automaticallyImplyLeading: false,
leading: IconButton( leading: IconButton(
style: const ButtonStyle( style: const ButtonStyle(
iconSize: MaterialStatePropertyAll(32), iconSize: WidgetStatePropertyAll(32),
foregroundColor: MaterialStatePropertyAll(Colors.white), foregroundColor: WidgetStatePropertyAll(Colors.white),
), ),
onPressed: () { onPressed: () {
Navigator.of(context).pop(); Navigator.of(context).pop();
}, },
icon: const Icon(Icons.close), icon: const Icon(Icons.close),
), ),
actions: [
ValueListenableBuilder<MobileScannerState>(
valueListenable: controller,
builder: (context, state, _) {
var icon = const Icon(Icons.flash_off);
var backgroundColor = Colors.black12;
switch (state.torchState) {
case TorchState.off:
icon = const Icon(Icons.flash_off);
backgroundColor = Colors.black12;
case TorchState.on:
icon = const Icon(Icons.flash_on);
backgroundColor = Colors.orange;
case TorchState.unavailable:
icon = const Icon(Icons.flash_off);
backgroundColor = Colors.transparent;
}
return Container(
margin: const EdgeInsets.symmetric(horizontal: 8),
child: AbsorbPointer(
absorbing: state.torchState == TorchState.unavailable,
child: IconButton(
color: Colors.white,
icon: icon,
style: ButtonStyle(
foregroundColor: const WidgetStatePropertyAll(Colors.white),
backgroundColor: WidgetStatePropertyAll(backgroundColor),
),
onPressed: () => controller.toggleTorch(),
),
),
);
},
)
],
), ),
Container( Container(
margin: const EdgeInsets.only(bottom: 32), margin: const EdgeInsets.only(bottom: 32),
alignment: Alignment.bottomCenter, alignment: Alignment.bottomCenter,
child: ValueListenableBuilder<MobileScannerState>( child: IconButton(
valueListenable: controller, color: Colors.white,
builder: (context, state, _) { style: const ButtonStyle(
var icon = const Icon(Icons.flash_off); foregroundColor: WidgetStatePropertyAll(Colors.white),
var backgroundColor = Colors.black12; backgroundColor: WidgetStatePropertyAll(Colors.grey),
switch (state.torchState) { ),
case TorchState.off: padding: const EdgeInsets.all(16),
icon = const Icon(Icons.flash_off); iconSize: 32.0,
backgroundColor = Colors.black12; onPressed: globalState.appController.addProfileFormQrCode,
case TorchState.on: icon: const Icon(Icons.photo_camera_back),
icon = const Icon(Icons.flash_on);
backgroundColor = Colors.orange;
case TorchState.unavailable:
icon = const Icon(Icons.no_flash);
backgroundColor = Colors.grey;
}
return IconButton(
color: Colors.white,
icon: icon,
style: ButtonStyle(
foregroundColor:
const MaterialStatePropertyAll(Colors.white),
backgroundColor: MaterialStatePropertyAll(backgroundColor),
),
padding: const EdgeInsets.all(16),
iconSize: 32.0,
onPressed: () => controller.toggleTorch(),
);
},
), ),
), ),
], ],
@@ -197,4 +214,4 @@ class ScannerOverlay extends CustomPainter {
return scanWindow != oldDelegate.scanWindow || return scanWindow != oldDelegate.scanWindow ||
borderRadius != oldDelegate.borderRadius; borderRadius != oldDelegate.borderRadius;
} }
} }

View File

@@ -1,6 +1,7 @@
import 'dart:async'; import 'dart:async';
import 'dart:convert'; import 'dart:convert';
import 'dart:io'; import 'dart:io';
import 'dart:isolate';
import 'package:fl_clash/models/models.dart'; import 'package:fl_clash/models/models.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
@@ -44,9 +45,11 @@ class App {
Future<List<Package>> getPackages() async { Future<List<Package>> getPackages() async {
final packagesString = final packagesString =
await methodChannel?.invokeMethod<String>("getPackages"); await methodChannel?.invokeMethod<String>("getPackages");
final List<dynamic> packagesRaw = return Isolate.run<List<Package>>(() {
packagesString != null ? json.decode(packagesString) : []; final List<dynamic> packagesRaw =
return packagesRaw.map((e) => Package.fromJson(e)).toList(); packagesString != null ? json.decode(packagesString) : [];
return packagesRaw.map((e) => Package.fromJson(e)).toList();
});
} }
Future<ImageProvider?> getPackageIcon(String packageName) async { Future<ImageProvider?> getPackageIcon(String packageName) async {

View File

@@ -4,26 +4,25 @@ import 'dart:io';
import 'package:animations/animations.dart'; import 'package:animations/animations.dart';
import 'package:fl_clash/clash/clash.dart'; import 'package:fl_clash/clash/clash.dart';
import 'package:fl_clash/enum/enum.dart';
import 'package:fl_clash/plugins/app.dart';
import 'package:fl_clash/widgets/scaffold.dart'; import 'package:fl_clash/widgets/scaffold.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'controller.dart';
import 'models/models.dart'; import 'models/models.dart';
import 'common/common.dart'; import 'common/common.dart';
class GlobalState { class GlobalState {
Timer? timer; Timer? timer;
Function? updateSortNumDebounce; Function? healthcheckLockDebounce;
Timer? groupsUpdateTimer; Timer? groupsUpdateTimer;
Function? updateCurrentDelayDebounce; Function? updateCurrentDelayDebounce;
PageController? pageController; PageController? pageController;
final navigatorKey = GlobalKey<NavigatorState>(); final navigatorKey = GlobalKey<NavigatorState>();
final Map<int, String?> packageNameMap = {}; final Map<int, String?> packageNameMap = {};
late AppController appController;
GlobalKey<CommonScaffoldState> homeScaffoldKey = GlobalKey(); GlobalKey<CommonScaffoldState> homeScaffoldKey = GlobalKey();
List<Function> updateFunctionLists = []; List<Function> updateFunctionLists = [];
List<NavigationItem> currentNavigationItems = []; bool healthcheckLock = false;
bool updatePackagesLock = false;
startListenUpdate() { startListenUpdate() {
if (timer != null && timer!.isActive == true) return; if (timer != null && timer!.isActive == true) return;
@@ -45,6 +44,7 @@ class GlobalState {
bool isPatch = true, bool isPatch = true,
}) async { }) async {
final profilePath = await appPath.getProfilePath(config.currentProfileId); final profilePath = await appPath.getProfilePath(config.currentProfileId);
await config.currentProfile?.checkAndUpdate();
debugPrint("update config"); debugPrint("update config");
return clashCore.updateConfig(UpdateConfigParams( return clashCore.updateConfig(UpdateConfigParams(
profilePath: profilePath, profilePath: profilePath,
@@ -86,7 +86,7 @@ class GlobalState {
config: config, config: config,
isPatch: false, isPatch: false,
); );
if (res.isNotEmpty) return Result.error(message: res); if (res.isNotEmpty) return Result.error(res);
await updateGroups(appState); await updateGroups(appState);
changeProxy( changeProxy(
appState: appState, appState: appState,
@@ -137,14 +137,6 @@ class GlobalState {
}); });
} }
updatePackages(AppState appState) async {
if (appState.packages.isEmpty && updatePackagesLock == false) {
updatePackagesLock = true;
appState.packages = await app?.getPackages() ?? [];
updatePackagesLock = false;
}
}
updateNavigationItems({ updateNavigationItems({
required AppState appState, required AppState appState,
required Config config, required Config config,
@@ -166,18 +158,26 @@ class GlobalState {
required String title, required String title,
required InlineSpan message, required InlineSpan message,
Function()? onTab, Function()? onTab,
String? confirmText,
}) { }) {
showCommonDialog( showCommonDialog(
child: Builder( child: Builder(
builder: (context) { builder: (context) {
return AlertDialog( return AlertDialog(
title: Text(title), title: Text(title),
content: SizedBox( content: Container(
width: 300, width: 300,
child: RichText( constraints: const BoxConstraints(
text: TextSpan( maxHeight: 200
),
child: SingleChildScrollView(
child: RichText(
overflow: TextOverflow.visible,
text: TextSpan(
style: Theme.of(context).textTheme.labelLarge, style: Theme.of(context).textTheme.labelLarge,
children: [message]), children: [message],
),
),
), ),
), ),
actions: [ actions: [
@@ -186,7 +186,7 @@ class GlobalState {
() { () {
Navigator.of(context).pop(); Navigator.of(context).pop();
}, },
child: Text(appLocalizations.confirm), child: Text(confirmText ?? appLocalizations.confirm),
) )
], ],
); );
@@ -195,7 +195,7 @@ class GlobalState {
); );
} }
showCommonDialog<T>({ Future<T?> showCommonDialog<T>({
required Widget child, required Widget child,
}) async { }) async {
return await showModal<T>( return await showModal<T>(
@@ -204,23 +204,10 @@ class GlobalState {
barrierColor: Colors.black38, barrierColor: Colors.black38,
), ),
builder: (_) => child, builder: (_) => child,
filter: appConstant.filter, filter: filter,
); );
} }
checkUpdate(Function()? onTab) async {
final result = await Request.checkForUpdate();
if (result.type == ResultType.success) {
showMessage(
title: appLocalizations.discovery,
message: TextSpan(
text: result.data,
),
onTab: onTab,
);
}
}
updateTraffic({ updateTraffic({
AppState? appState, AppState? appState,
required Config config, required Config config,
@@ -271,8 +258,8 @@ class GlobalState {
} }
void updateCurrentDelay( void updateCurrentDelay(
String? proxyName, String? proxyName,
) { ) {
updateCurrentDelayDebounce ??= debounce<Function(String?)>((proxyName) { updateCurrentDelayDebounce ??= debounce<Function(String?)>((proxyName) {
if (proxyName != null) { if (proxyName != null) {
debugPrint("[delay]=====> $proxyName"); debugPrint("[delay]=====> $proxyName");
@@ -283,7 +270,6 @@ class GlobalState {
}); });
updateCurrentDelayDebounce!([proxyName]); updateCurrentDelayDebounce!([proxyName]);
} }
} }
final globalState = GlobalState(); 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/material.dart';
import 'package:flutter/services.dart'; import 'package:flutter/services.dart';
@@ -16,6 +16,7 @@ class AndroidContainer extends StatefulWidget {
class _AndroidContainerState extends State<AndroidContainer> class _AndroidContainerState extends State<AndroidContainer>
with WidgetsBindingObserver { with WidgetsBindingObserver {
@override @override
void initState() { void initState() {
super.initState(); super.initState();
@@ -27,7 +28,7 @@ class _AndroidContainerState extends State<AndroidContainer>
Future<void> didChangeAppLifecycleState(AppLifecycleState state) async { Future<void> didChangeAppLifecycleState(AppLifecycleState state) async {
final isPaused = state == AppLifecycleState.paused; final isPaused = state == AppLifecycleState.paused;
if (isPaused) { 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/common/common.dart';
import 'package:fl_clash/models/models.dart'; import 'package:fl_clash/models/models.dart';
import 'package:fl_clash/state.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:provider/provider.dart'; import 'package:provider/provider.dart';
@@ -35,7 +36,7 @@ class AppStateContainer extends StatelessWidget {
builder: (context, state, child) { builder: (context, state, child) {
WidgetsBinding.instance.addPostFrameCallback( WidgetsBinding.instance.addPostFrameCallback(
(_) { (_) {
context.appController.appState.navigationItems = globalState.appController.appState.navigationItems =
navigation.getItems( navigation.getItems(
openLogs: state.openLogs, openLogs: state.openLogs,
hasProxies: state.hasProxies, hasProxies: state.hasProxies,

View File

@@ -66,25 +66,25 @@ class CommonCard extends StatelessWidget {
final Widget child; final Widget child;
final Info? info; final Info? info;
BorderSide getBorderSide(BuildContext context, Set<MaterialState> states) { BorderSide getBorderSide(BuildContext context, Set<WidgetState> states) {
final colorScheme = Theme.of(context).colorScheme; final colorScheme = Theme.of(context).colorScheme;
var hoverColor = isSelected var hoverColor = isSelected
? colorScheme.primary.toLight() ? colorScheme.primary.toLight()
: colorScheme.primary.toLighter(); : colorScheme.primary.toLighter();
if (states.contains(MaterialState.hovered) || if (states.contains(WidgetState.hovered) ||
states.contains(MaterialState.focused) || states.contains(WidgetState.focused) ||
states.contains(MaterialState.pressed)) { states.contains(WidgetState.pressed)) {
return BorderSide( return BorderSide(
color: hoverColor, color: hoverColor,
); );
} }
return BorderSide( return BorderSide(
color: color:
isSelected ? colorScheme.primary : colorScheme.onBackground.toSoft(), isSelected ? colorScheme.primary : colorScheme.onSurface.toSoft(),
); );
} }
Color? getBackgroundColor(BuildContext context, Set<MaterialState> states) { Color? getBackgroundColor(BuildContext context, Set<WidgetState> states) {
final colorScheme = Theme.of(context).colorScheme; final colorScheme = Theme.of(context).colorScheme;
if (isSelected) { if (isSelected) {
return colorScheme.secondaryContainer; return colorScheme.secondaryContainer;
@@ -123,16 +123,16 @@ class CommonCard extends StatelessWidget {
return OutlinedButton( return OutlinedButton(
clipBehavior: Clip.antiAlias, clipBehavior: Clip.antiAlias,
style: ButtonStyle( style: ButtonStyle(
padding: const MaterialStatePropertyAll(EdgeInsets.zero), padding: const WidgetStatePropertyAll(EdgeInsets.zero),
shape: MaterialStatePropertyAll( shape: WidgetStatePropertyAll(
RoundedRectangleBorder( RoundedRectangleBorder(
borderRadius: BorderRadius.circular(12), borderRadius: BorderRadius.circular(12),
), ),
), ),
backgroundColor: MaterialStateProperty.resolveWith( backgroundColor: WidgetStateProperty.resolveWith(
(states) => getBackgroundColor(context, states), (states) => getBackgroundColor(context, states),
), ),
side: MaterialStateProperty.resolveWith( side: WidgetStateProperty.resolveWith(
(states) => getBorderSide(context, states), (states) => getBorderSide(context, states),
), ),
), ),

View File

@@ -38,14 +38,22 @@ class _ClashMessageContainerState extends State<ClashMessageContainer>
@override @override
void onDelay(Delay delay) { void onDelay(Delay delay) {
final appController = context.appController; globalState.healthcheckLock = true;
final appController = globalState.appController;
appController.setDelay(delay); appController.setDelay(delay);
globalState.healthcheckLockDebounce ??= debounce<Function()>(
() async {
globalState.healthcheckLock = false;
},
milliseconds: 5000,
);
globalState.healthcheckLockDebounce!();
super.onDelay(delay); super.onDelay(delay);
} }
@override @override
void onLog(Log log) { void onLog(Log log) {
context.appController.appState.addLog(log); globalState.appController.appState.addLog(log);
super.onLog(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 'package:flutter/material.dart';
import 'card.dart'; import 'card.dart';
import 'grid.dart'; import 'grid.dart';
@@ -25,7 +25,7 @@ class ColorSchemeBox extends StatelessWidget {
); );
} else { } else {
return Theme.of(context).copyWith( return Theme.of(context).copyWith(
colorScheme: context.appController.appState.systemColorSchemes colorScheme: globalState.appController.appState.systemColorSchemes
.getSystemColorSchemeForBrightness(Theme.of(context).brightness), .getSystemColorSchemeForBrightness(Theme.of(context).brightness),
); );
} }

View File

@@ -1,6 +1,10 @@
import 'package:fl_clash/common/common.dart'; import 'package:fl_clash/common/common.dart';
import 'package:fl_clash/enum/enum.dart';
import 'package:fl_clash/models/models.dart';
import 'package:fl_clash/state.dart';
import 'package:fl_clash/widgets/scaffold.dart'; import 'package:fl_clash/widgets/scaffold.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:provider/provider.dart';
import 'side_sheet.dart'; import 'side_sheet.dart';
showExtendPage( showExtendPage(
@@ -16,34 +20,14 @@ showExtendPage(
key: globalKey, key: globalKey,
child: body, 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( navigator.push(
ModalSideSheetRoute( ModalSideSheetRoute(
modalBarrierColor: Colors.black38, modalBarrierColor: Colors.black38,
builder: (context) => LayoutBuilder( builder: (context) => Selector<AppState, double>(
builder: (_, __) { selector: (_, appState) => appState.viewWidth,
final isMobile = context.isMobile; builder: (_, viewWidth, __) {
final isMobile =
globalState.appController.appState.viewMode == ViewMode.mobile;
final commonScaffold = CommonScaffold( final commonScaffold = CommonScaffold(
automaticallyImplyLeading: isMobile ? true : false, automaticallyImplyLeading: isMobile ? true : false,
actions: isMobile actions: isMobile
@@ -55,18 +39,18 @@ showExtendPage(
child: CloseButton(), child: CloseButton(),
), ),
], ],
title: Text(title), title: title,
body: uniqueBody, body: uniqueBody,
); );
return AnimatedContainer( return AnimatedContainer(
duration: kThemeAnimationDuration, duration: kThemeAnimationDuration,
width: isMobile ? context.width : extendPageWidth ?? 300, width: isMobile ? viewWidth : extendPageWidth ?? 300,
child: commonScaffold, child: commonScaffold,
); );
}, },
), ),
constraints: const BoxConstraints(), constraints: const BoxConstraints(),
filter: appConstant.filter, filter: filter,
), ),
); );
} }

View File

@@ -1,4 +1,5 @@
import 'package:fl_clash/common/common.dart'; import 'package:fl_clash/enum/enum.dart';
import 'package:fl_clash/state.dart';
import 'package:fl_clash/widgets/open_container.dart'; import 'package:fl_clash/widgets/open_container.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
@@ -56,10 +57,12 @@ class OpenDelegate extends Delegate {
class NextDelegate extends Delegate { class NextDelegate extends Delegate {
final Widget widget; final Widget widget;
final String title; final String title;
final double? extendPageWidth;
const NextDelegate({ const NextDelegate({
required this.title, required this.title,
required this.widget, required this.widget,
this.extendPageWidth,
}); });
} }
@@ -203,7 +206,7 @@ class ListItem<T> extends StatelessWidget {
return OpenContainer( return OpenContainer(
closedBuilder: (_, action) { closedBuilder: (_, action) {
openAction() { openAction() {
final isMobile = context.isMobile; final isMobile = globalState.appController.appState.viewMode == ViewMode.mobile;
if (!isMobile) { if (!isMobile) {
showExtendPage( showExtendPage(
context, context,
@@ -220,8 +223,9 @@ class ListItem<T> extends StatelessWidget {
}, },
openBuilder: (_, action) { openBuilder: (_, action) {
return CommonScaffold.open( return CommonScaffold.open(
key: Key(openDelegate.title),
onBack: action, onBack: action,
title: Text(openDelegate.title), title: openDelegate.title,
body: openDelegate.widget, body: openDelegate.widget,
); );
}, },
@@ -231,11 +235,22 @@ class ListItem<T> extends StatelessWidget {
final nextDelegate = delegate as NextDelegate; final nextDelegate = delegate as NextDelegate;
return _buildListTile( return _buildListTile(
onTab: () { onTab: () {
final isMobile = globalState.appController.appState.viewMode == ViewMode.mobile;
if (!isMobile) {
showExtendPage(
context,
body: nextDelegate.widget,
title: nextDelegate.title,
extendPageWidth: nextDelegate.extendPageWidth,
);
return;
}
Navigator.of(context).push( Navigator.of(context).push(
MaterialPageRoute( MaterialPageRoute(
builder: (context) => CommonScaffold( builder: (context) => CommonScaffold(
key: Key(nextDelegate.title),
body: nextDelegate.widget, body: nextDelegate.widget,
title: Text(nextDelegate.title), title: nextDelegate.title,
), ),
), ),
); );

View File

@@ -448,8 +448,8 @@ class _OpenContainerRoute<T> extends ModalRoute<T> {
builder: (_, __, ___) { builder: (_, __, ___) {
_colorTween = _getColorTween( _colorTween = _getColorTween(
transitionType: transitionType, transitionType: transitionType,
closedColor: Theme.of(context).colorScheme.background, closedColor: Theme.of(context).colorScheme.surface,
openColor: Theme.of(context).colorScheme.background, openColor: Theme.of(context).colorScheme.surface,
middleColor: middleColor, middleColor: middleColor,
); );
return Align( return Align(

View File

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

View File

@@ -1,10 +1,13 @@
import 'package:fl_clash/common/app_localizations.dart';
import 'package:fl_clash/common/system.dart';
import 'package:fl_clash/state.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:flutter/services.dart'; import 'package:flutter/services.dart';
class CommonScaffold extends StatefulWidget { class CommonScaffold extends StatefulWidget {
final Widget body; final Widget body;
final Widget? bottomNavigationBar; final Widget? bottomNavigationBar;
final Widget? title; final String title;
final Widget? leading; final Widget? leading;
final List<Widget>? actions; final List<Widget>? actions;
final bool automaticallyImplyLeading; final bool automaticallyImplyLeading;
@@ -14,7 +17,7 @@ class CommonScaffold extends StatefulWidget {
required this.body, required this.body,
this.bottomNavigationBar, this.bottomNavigationBar,
this.leading, this.leading,
this.title, required this.title,
this.actions, this.actions,
this.automaticallyImplyLeading = true, this.automaticallyImplyLeading = true,
}); });
@@ -22,7 +25,7 @@ class CommonScaffold extends StatefulWidget {
CommonScaffold.open({ CommonScaffold.open({
Key? key, Key? key,
required Widget body, required Widget body,
Widget? title, required String title,
required Function onBack, required Function onBack,
}) : this( }) : this(
key: key, key: key,
@@ -55,10 +58,26 @@ class CommonScaffoldState extends State<CommonScaffold> {
} }
} }
loadingRun(Future<void> Function() futureFunction) async { Future<T?> loadingRun<T>(
Future<T> Function() futureFunction, {
String? title,
}) async {
if (_loading.value == true) return null;
_loading.value = true; _loading.value = true;
await futureFunction(); try {
_loading.value = false; final res = await futureFunction();
_loading.value = false;
return res;
} catch (e) {
globalState.showMessage(
title: title ?? appLocalizations.tip,
message: TextSpan(
text: e.toString(),
),
);
_loading.value = false;
return null;
}
} }
@override @override
@@ -69,8 +88,10 @@ class CommonScaffoldState extends State<CommonScaffold> {
} }
} }
@override _platformContainer({required Widget child}) {
Widget build(BuildContext context) { if (system.isDesktop) {
return child;
}
return AnnotatedRegion( return AnnotatedRegion(
value: SystemUiOverlayStyle( value: SystemUiOverlayStyle(
statusBarColor: Colors.transparent, statusBarColor: Colors.transparent,
@@ -80,6 +101,13 @@ class CommonScaffoldState extends State<CommonScaffold> {
systemNavigationBarColor: Colors.transparent, systemNavigationBarColor: Colors.transparent,
systemNavigationBarDividerColor: Colors.transparent, systemNavigationBarDividerColor: Colors.transparent,
), ),
child: child,
);
}
@override
Widget build(BuildContext context) {
return _platformContainer(
child: Scaffold( child: Scaffold(
appBar: PreferredSize( appBar: PreferredSize(
preferredSize: const Size.fromHeight(kToolbarHeight), preferredSize: const Size.fromHeight(kToolbarHeight),
@@ -92,7 +120,7 @@ class CommonScaffoldState extends State<CommonScaffold> {
return AppBar( return AppBar(
automaticallyImplyLeading: widget.automaticallyImplyLeading, automaticallyImplyLeading: widget.automaticallyImplyLeading,
leading: widget.leading, leading: widget.leading,
title: widget.title, title: Text(widget.title),
actions: actions.isNotEmpty ? actions : widget.actions, actions: actions.isNotEmpty ? actions : widget.actions,
); );
}, },
@@ -114,3 +142,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,
),
);
}
}

37
lib/widgets/section.dart Normal file
View File

@@ -0,0 +1,37 @@
import 'package:flutter/material.dart';
class Section extends StatelessWidget {
final String title;
final Widget child;
const Section({
super.key,
required this.title,
required this.child,
});
@override
Widget build(BuildContext context) {
return Column(
mainAxisSize: MainAxisSize.min,
crossAxisAlignment: CrossAxisAlignment.start,
children: [
Flexible(
child: Padding(
padding: const EdgeInsets.symmetric(horizontal: 16, vertical: 12),
child: Text(
title,
style: Theme.of(context).textTheme.labelLarge?.copyWith(
color: Theme.of(context).colorScheme.primary,
),
),
),
),
Expanded(
flex: 0,
child: child,
)
],
);
}
}

View File

@@ -3,7 +3,7 @@ import 'package:flutter/rendering.dart';
const Duration _bottomSheetEnterDuration = Duration(milliseconds: 300); const Duration _bottomSheetEnterDuration = Duration(milliseconds: 300);
const Duration _bottomSheetExitDuration = Duration(milliseconds: 200); const Duration _bottomSheetExitDuration = Duration(milliseconds: 200);
const Curve _modalBottomSheetCurve = decelerateEasing; const Curve _modalBottomSheetCurve = Easing.standardDecelerate;
const double _defaultScrollControlDisabledMaxHeightRatio = 9.0 / 16.0; const double _defaultScrollControlDisabledMaxHeightRatio = 9.0 / 16.0;
class SideSheet extends StatefulWidget { class SideSheet extends StatefulWidget {

View File

@@ -1,6 +1,7 @@
import 'package:fl_clash/common/common.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import '../state.dart';
class TooltipText extends StatelessWidget { class TooltipText extends StatelessWidget {
final Text text; final Text text;
@@ -14,7 +15,7 @@ class TooltipText extends StatelessWidget {
return LayoutBuilder( return LayoutBuilder(
builder: (context, container) { builder: (context, container) {
final maxWidth = container.maxWidth; final maxWidth = container.maxWidth;
final size = context.appController.measure.computeTextSize( final size = globalState.appController.measure.computeTextSize(
text, text,
); );
if (maxWidth < size.width) { 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/plugins/tile.dart';
import 'package:fl_clash/state.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
class TileContainer extends StatefulWidget { class TileContainer extends StatefulWidget {
@@ -24,13 +24,13 @@ class _TileContainerState extends State<TileContainer> with TileListener {
@override @override
void onStart() { void onStart() {
context.appController.updateSystemProxy(true); globalState.appController.updateSystemProxy(true);
super.onStart(); super.onStart();
} }
@override @override
void onStop() { void onStop() {
context.appController.updateSystemProxy(false); globalState.appController.updateSystemProxy(false);
super.onStop(); super.onStop();
} }

View File

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

View File

@@ -22,4 +22,5 @@ export 'tile_container.dart';
export 'chip.dart'; export 'chip.dart';
export 'fade_box.dart'; export 'fade_box.dart';
export 'app_state_container.dart'; export 'app_state_container.dart';
export 'text.dart'; export 'text.dart';
export 'section.dart';

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/material.dart';
import 'package:window_manager/window_manager.dart'; import 'package:window_manager/window_manager.dart';
@@ -28,14 +28,20 @@ class _WindowContainerState extends State<WindowContainer>
} }
@override @override
void onWindowClose() async { void onWindowResize() {
await context.appController.handleBackOrExit(); globalState.appController.updateViewWidth();
super.onWindowClose();
} }
@override
void onWindowClose() async {
await globalState.appController.handleBackOrExit();
super.onWindowClose();
}
@override @override
void onWindowMinimize() async { void onWindowMinimize() async {
await context.appController.savePreferences(); await globalState.appController.savePreferences();
super.onWindowMinimize(); super.onWindowMinimize();
} }

View File

@@ -7,6 +7,7 @@
#include "generated_plugin_registrant.h" #include "generated_plugin_registrant.h"
#include <dynamic_color/dynamic_color_plugin.h> #include <dynamic_color/dynamic_color_plugin.h>
#include <file_selector_linux/file_selector_plugin.h>
#include <gtk/gtk_plugin.h> #include <gtk/gtk_plugin.h>
#include <screen_retriever/screen_retriever_plugin.h> #include <screen_retriever/screen_retriever_plugin.h>
#include <tray_manager/tray_manager_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 = g_autoptr(FlPluginRegistrar) dynamic_color_registrar =
fl_plugin_registry_get_registrar_for_plugin(registry, "DynamicColorPlugin"); fl_plugin_registry_get_registrar_for_plugin(registry, "DynamicColorPlugin");
dynamic_color_plugin_register_with_registrar(dynamic_color_registrar); 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 = g_autoptr(FlPluginRegistrar) gtk_registrar =
fl_plugin_registry_get_registrar_for_plugin(registry, "GtkPlugin"); fl_plugin_registry_get_registrar_for_plugin(registry, "GtkPlugin");
gtk_plugin_register_with_registrar(gtk_registrar); gtk_plugin_register_with_registrar(gtk_registrar);

View File

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

View File

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

View File

@@ -33,6 +33,14 @@ packages:
url: "https://pub.flutter-io.cn" url: "https://pub.flutter-io.cn"
source: hosted source: hosted
version: "3.5.1" 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: args:
dependency: "direct dev" dependency: "direct dev"
description: description:
@@ -129,6 +137,14 @@ packages:
url: "https://pub.flutter-io.cn" url: "https://pub.flutter-io.cn"
source: hosted source: hosted
version: "1.3.0" 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: checked_yaml:
dependency: transitive dependency: transitive
description: description:
@@ -177,6 +193,14 @@ packages:
url: "https://pub.flutter-io.cn" url: "https://pub.flutter-io.cn"
source: hosted source: hosted
version: "3.1.1" 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: crypto:
dependency: transitive dependency: transitive
description: description:
@@ -193,6 +217,14 @@ packages:
url: "https://pub.flutter-io.cn" url: "https://pub.flutter-io.cn"
source: hosted source: hosted
version: "2.3.6" version: "2.3.6"
dio:
dependency: transitive
description:
name: dio
sha256: "11e40df547d418cc0c4900a9318b26304e665da6fa4755399a9ff9efd09034b5"
url: "https://pub.flutter-io.cn"
source: hosted
version: "5.4.3+1"
dynamic_color: dynamic_color:
dependency: "direct main" dependency: "direct main"
description: description:
@@ -241,6 +273,38 @@ packages:
url: "https://pub.flutter-io.cn" url: "https://pub.flutter-io.cn"
source: hosted source: hosted
version: "6.2.1" 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: fixnum:
dependency: transitive dependency: transitive
description: description:
@@ -254,14 +318,6 @@ packages:
description: flutter description: flutter
source: sdk source: sdk
version: "0.0.0" version: "0.0.0"
flutter_adaptive_scaffold:
dependency: "direct main"
description:
name: flutter_adaptive_scaffold
sha256: "9a1d5e9f728815e27b7b612883db19107ba8a35a46a97c757ea00896cb027451"
url: "https://pub.flutter-io.cn"
source: hosted
version: "0.1.10+2"
flutter_lints: flutter_lints:
dependency: "direct dev" dependency: "direct dev"
description: description:
@@ -279,10 +335,10 @@ packages:
dependency: transitive dependency: transitive
description: description:
name: flutter_plugin_android_lifecycle name: flutter_plugin_android_lifecycle
sha256: "8cf40eebf5dec866a6d1956ad7b4f7016e6c0cc69847ab946833b7d43743809f" sha256: "592dc01a18961a51c24ae5d963b724b2b7fa4a95c100fe8eb6ca8a5a4732cadf"
url: "https://pub.flutter-io.cn" url: "https://pub.flutter-io.cn"
source: hosted source: hosted
version: "2.0.19" version: "2.0.18"
flutter_test: flutter_test:
dependency: "direct dev" dependency: "direct dev"
description: flutter description: flutter
@@ -365,14 +421,86 @@ packages:
url: "https://pub.flutter-io.cn" url: "https://pub.flutter-io.cn"
source: hosted source: hosted
version: "4.0.2" 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: intl:
dependency: "direct main" dependency: "direct main"
description: description:
name: intl name: intl
sha256: "3bc132a9dbce73a7e4a21a17d06e1878839ffbf975568bc875c60537824b0c4d" sha256: d6f56758b7d3014a48af9701c085700aac781a92a87a62b1333b46d8879661cf
url: "https://pub.flutter-io.cn" url: "https://pub.flutter-io.cn"
source: hosted source: hosted
version: "0.18.1" version: "0.19.0"
io: io:
dependency: transitive dependency: transitive
description: description:
@@ -417,26 +545,26 @@ packages:
dependency: transitive dependency: transitive
description: description:
name: leak_tracker name: leak_tracker
sha256: "78eb209deea09858f5269f5a5b02be4049535f568c07b275096836f01ea323fa" sha256: "7f0df31977cb2c0b88585095d168e689669a2cc9b97c309665e3386f3e9d341a"
url: "https://pub.flutter-io.cn" url: "https://pub.flutter-io.cn"
source: hosted source: hosted
version: "10.0.0" version: "10.0.4"
leak_tracker_flutter_testing: leak_tracker_flutter_testing:
dependency: transitive dependency: transitive
description: description:
name: leak_tracker_flutter_testing name: leak_tracker_flutter_testing
sha256: b46c5e37c19120a8a01918cfaf293547f47269f7cb4b0058f21531c2465d6ef0 sha256: "06e98f569d004c1315b991ded39924b21af84cf14cc94791b8aea337d25b57f8"
url: "https://pub.flutter-io.cn" url: "https://pub.flutter-io.cn"
source: hosted source: hosted
version: "2.0.1" version: "3.0.3"
leak_tracker_testing: leak_tracker_testing:
dependency: transitive dependency: transitive
description: description:
name: leak_tracker_testing name: leak_tracker_testing
sha256: a597f72a664dbd293f3bfc51f9ba69816f84dcd403cdac7066cb3f6003f3ab47 sha256: "6ba465d5d76e67ddf503e1161d1f4a6bc42306f9d66ca1e8f079a47290fb06d3"
url: "https://pub.flutter-io.cn" url: "https://pub.flutter-io.cn"
source: hosted source: hosted
version: "2.0.1" version: "3.0.1"
lints: lints:
dependency: transitive dependency: transitive
description: description:
@@ -481,10 +609,10 @@ packages:
dependency: transitive dependency: transitive
description: description:
name: meta name: meta
sha256: d584fa6707a52763a52446f02cc621b077888fb63b93bbcb1143a7be5a0c0c04 sha256: "7687075e408b093f36e6bbf6c91878cc0d4cd10f409506f7bc996f68220b9136"
url: "https://pub.flutter-io.cn" url: "https://pub.flutter-io.cn"
source: hosted source: hosted
version: "1.11.0" version: "1.12.0"
mime: mime:
dependency: transitive dependency: transitive
description: description:
@@ -589,6 +717,14 @@ packages:
url: "https://pub.flutter-io.cn" url: "https://pub.flutter-io.cn"
source: hosted source: hosted
version: "2.2.1" 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: platform:
dependency: transitive dependency: transitive
description: description:
@@ -672,10 +808,10 @@ packages:
dependency: transitive dependency: transitive
description: description:
name: shared_preferences_android name: shared_preferences_android
sha256: "1ee8bf911094a1b592de7ab29add6f826a7331fb854273d55918693d5364a1f2" sha256: "8568a389334b6e83415b6aae55378e158fbc2314e074983362d20c562780fb06"
url: "https://pub.flutter-io.cn" url: "https://pub.flutter-io.cn"
source: hosted source: hosted
version: "2.2.2" version: "2.2.1"
shared_preferences_foundation: shared_preferences_foundation:
dependency: transitive dependency: transitive
description: description:
@@ -813,10 +949,10 @@ packages:
dependency: transitive dependency: transitive
description: description:
name: test_api name: test_api
sha256: "5c2f730018264d276c20e4f1503fd1308dfbbae39ec8ee63c5236311ac06954b" sha256: "9955ae474176f7ac8ee4e989dadfb411a58c30415bcfb648fa04b2b8a03afa7f"
url: "https://pub.flutter-io.cn" url: "https://pub.flutter-io.cn"
source: hosted source: hosted
version: "0.6.1" version: "0.7.0"
timing: timing:
dependency: transitive dependency: transitive
description: description:
@@ -917,10 +1053,10 @@ packages:
dependency: transitive dependency: transitive
description: description:
name: vm_service name: vm_service
sha256: b3d56ff4341b8f182b96aceb2fa20e3dcb336b9f867bc0eafc0de10f1048e957 sha256: "3923c89304b715fb1eb6423f017651664a03bf5f4b29983627c4da791f74a4ec"
url: "https://pub.flutter-io.cn" url: "https://pub.flutter-io.cn"
source: hosted source: hosted
version: "13.0.0" version: "14.2.1"
watcher: watcher:
dependency: transitive dependency: transitive
description: description:
@@ -945,6 +1081,14 @@ packages:
url: "https://pub.flutter-io.cn" url: "https://pub.flutter-io.cn"
source: hosted source: hosted
version: "2.4.5" version: "2.4.5"
webdav_client:
dependency: "direct main"
description:
name: webdav_client
sha256: "682fffc50b61dc0e8f46717171db03bf9caaa17347be41c0c91e297553bf86b2"
url: "https://pub.flutter-io.cn"
source: hosted
version: "1.2.2"
win32: win32:
dependency: transitive dependency: transitive
description: description:
@@ -985,6 +1129,14 @@ packages:
url: "https://pub.flutter-io.cn" url: "https://pub.flutter-io.cn"
source: hosted source: hosted
version: "1.0.4" 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: yaml:
dependency: transitive dependency: transitive
description: description:
@@ -1001,6 +1153,14 @@ packages:
url: "https://pub.flutter-io.cn" url: "https://pub.flutter-io.cn"
source: hosted source: hosted
version: "2.2.1" 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: sdks:
dart: ">=3.3.0 <4.0.0" dart: ">=3.3.0 <4.0.0"
flutter: ">=3.19.0" flutter: ">=3.19.0"

View File

@@ -1,7 +1,7 @@
name: fl_clash name: fl_clash
description: A multi-platform proxy client based on ClashMeta, simple and easy to use, open-source and ad-free. description: A multi-platform proxy client based on ClashMeta, simple and easy to use, open-source and ad-free.
publish_to: 'none' publish_to: 'none'
version: 0.8.0 version: 0.8.6
environment: environment:
sdk: '>=3.1.0 <4.0.0' sdk: '>=3.1.0 <4.0.0'
@@ -10,7 +10,7 @@ dependencies:
sdk: flutter sdk: flutter
flutter_localizations: flutter_localizations:
sdk: flutter sdk: flutter
intl: ^0.18.1 intl: ^0.19.0
path_provider: ^2.1.0 path_provider: ^2.1.0
path: ^1.8.3 path: ^1.8.3
shared_preferences: ^2.2.0 shared_preferences: ^2.2.0
@@ -33,8 +33,11 @@ dependencies:
animations: ^2.0.11 animations: ^2.0.11
package_info_plus: ^7.0.0 package_info_plus: ^7.0.0
url_launcher: ^6.2.6 url_launcher: ^6.2.6
flutter_adaptive_scaffold: ^0.1.10+1
freezed_annotation: ^2.4.1 freezed_annotation: ^2.4.1
image_picker: ^1.1.1
zxing2: ^0.2.3
image: ^4.1.7
webdav_client: ^1.2.2
dev_dependencies: dev_dependencies:
flutter_test: flutter_test:
sdk: flutter sdk: flutter

View File

@@ -1,18 +1,71 @@
// ignore_for_file: avoid_print // ignore_for_file: avoid_print
import 'package:http/io_client.dart';
import 'dart:io'; import 'dart:io';
main() async { void main() async {
final result = await Process.run( String input = """
'netstat',
["-ano","|","findstr",":7890","|","findstr","LISTENING"], <details markdown=1><summary>All changes from v0.8.5 to the latest commit:</summary>
runInShell: true,
);
final output = result.stdout as String; (unreleased)
final line = output.split('\n').first; ------------
final pid = line.split(' ').firstWhere( - Fix submit error. [chen08209]
(value) => value.trim().contains(RegExp(r'^\d+$')), - Add WebDAV. [chen08209]
orElse: () => '',
); add Auto check updates
print(pid);
Optimize more details
- Optimize delayTest. [chen08209]
- Upgrade flutter version. [chen08209]
- Update kernel Add import profile via QR code image. [chen08209]
- Add compatibility mode and adapt clash scheme. [chen08209]
- Update Version. [chen08209]
- Reconstruction application proxy logic. [chen08209]
- Fix Tab destroy error. [chen08209]
- Optimize repeat healthcheck. [chen08209]
- Optimize Direct mode ui. [chen08209]
- Optimize Healthcheck. [chen08209]
- Remove proxies position animation, improve performance Add Telegram
Link. [chen08209]
- Update healthcheck policy. [chen08209]
- New Check URLTest. [chen08209]
- Fix the problem of invalid auto-selection. [chen08209]
- New Async UpdateConfig. [chen08209]
- Add changeProfileDebounce. [chen08209]
- Update Workflow. [chen08209]
- Fix ChangeProfile block. [chen08209]
- Fix Release Message Error. [chen08209]
- Update Selector 2. [chen08209]
- Update Version. [chen08209]
- Fix Proxies Select Error. [chen08209]
- Fix the problem that the proxy group is empty in global mode.
[chen08209]
- Fix the problem that the proxy group is empty in global mode.
[chen08209]
- Add ProxyProvider2. [chen08209]
- Add ProxyProvider. [chen08209]
- Update Version. [chen08209]
- Update ProxyGroup Sort. [chen08209]
- Fix Android quickStart VpnService some problems. [chen08209]
- Update version. [chen08209]
- Set Android notification low importance. [chen08209]
- Fix the issue that VpnService can't be closed correctly in special
cases. [chen08209]
- Fix the problem that TileService is not destroyed correctly in some
cases. [chen08209]
Adjust tab animation defaults
- Add Telegram in README_zh_CN.md. [chen08209]
- Add Telegram. [chen08209]
""";
const pattern = r'- (.+?)\. \[.+?\]';
final regex = RegExp(pattern);
for (final match in regex.allMatches(input)) {
final change = match.group(1);
print(change);
}
} }

View File

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

View File

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