GitHub/proxypin
1
0
Fork 0
mirror of https://github.com/wanghongenpin/proxypin.git synced 2026-05-09 00:34:17 +08:00
Code Issues Packages Projects Releases 1 Wiki Activity

flutter-3.19.6

Browse Source
This commit is contained in:
wanghongenpin
2026-04-19 18:31:28 +08:00
parent 5ec836f5b6
commit 72b2ea4bc5
15 changed files with 65 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
.fvmrc Normal file
View File

@@ -0,0 +1,3 @@
{
"flutter": "3.19.6"
}

5
.gitignore vendored
View File

@@ -47,4 +47,7 @@ app.*.map.json
l10n_errors.txt
pubspec.lock
/dist/
/dist/
# FVM Version Cache
.fvm/

3
lib/ui/app_update/new_version_dialog.dart
View File

@@ -73,7 +73,8 @@ class NewVersionDialog extends StatelessWidget {
if (canIgnore)
TextButton(
onPressed: () async {
SharedPreferencesAsync().setString(Constants.ignoreReleaseVersionKey, newVersion.version);
final prefs = await SharedPreferences.getInstance();
await prefs.setString(Constants.ignoreReleaseVersionKey, newVersion.version);
logger.i("ignored release [${newVersion.version}]");
if (context.mounted) Navigator.pop(context);
},

68
lib/ui/component/qrcode/qr_scan_view.dart
View File

@@ -1,47 +1,37 @@
import 'package:file_picker/file_picker.dart';
import 'package:easy_permission/easy_permission.dart';
import 'package:flutter/material.dart';
import 'package:flutter_qr_reader/flutter_qr_reader.dart';
import 'package:image_pickers/image_pickers.dart';
import 'package:proxypin/l10n/app_localizations.dart';
import 'package:flutter_qr_reader_plus/flutter_qr_reader.dart';
import 'package:permission_handler/permission_handler.dart';
import 'package:proxypin/network/util/logger.dart';
///@Author: Hongen Wang
/// qr code scanner
class QrCodeScanner {
static Future<String?> scan(BuildContext context) async {
var status = await Permission.camera.status;
var status = await EasyPermission.getSinglePermissionStatus(PermissionType.CAMERA);
if (!status.isGranted) {
status = await Permission.camera.request();
if (status == PermissionStatus.DENY) {
EasyPermission.openSettings();
return Future.value(null);
} else if (status == PermissionStatus.ALLOW) {
status = await EasyPermission.requestSinglePermission(PermissionType.CAMERA);
}
if (!status.isGranted) {
if (status != PermissionStatus.ALLOW) {
if (!context.mounted) return Future.value(null);
AppLocalizations localizations = AppLocalizations.of(context)!;
bool isCN = localizations.localeName == 'zh';
await showDialog(
showDialog(
context: context,
builder: (context) => AlertDialog(
content: Text(isCN ? "请授予相机权限" : "Please grant camera permission"),
actions: <Widget>[
TextButton(
onPressed: () => Navigator.of(context).pop(),
child: Text(localizations.cancel),
),
TextButton(
onPressed: () async {
if (!context.mounted) return Future.value(null);
Navigator.of(context).pop();
final PermissionStatus newStatus = await Permission.camera.request();
// Flutter权限处理有bug url: https://github.com/Baseflow/flutter-permission-handler/issues/1206
if (newStatus.isRestricted || newStatus.isPermanentlyDenied) {
openAppSettings();
}
},
child: Text(localizations.confirm),
),
],
));
content: Text(isCN ? "请授予相机权限" : "Please grant camera permission"),
actions: <Widget>[
TextButton(
onPressed: () => Navigator.of(context).pop(),
child: Text(localizations.confirm),
),
],
));
return Future.value(null);
}
@@ -86,7 +76,6 @@ class _QrReaderViewState extends State<QeCodeScanView> with TickerProviderStateM
isScan = true;
_controller?.startCamera((data, _) async {
logger.d("scan qrCode data handle: $data");
await handle(data);
});
@@ -95,6 +84,7 @@ class _QrReaderViewState extends State<QeCodeScanView> with TickerProviderStateM
handle(String data) async {
if (!isScan) return;
_controller?.stopCamera();
stop();
if (mounted) await Navigator.of(context, rootNavigator: true).maybePop(data);
}
@@ -130,7 +120,6 @@ class _QrReaderViewState extends State<QeCodeScanView> with TickerProviderStateM
isScan = false;
_controller?.stopCamera();
_controller = null;
if (_animationController != null) {
_animationController?.stop();
_animationController?.dispose();
@@ -154,7 +143,7 @@ class _QrReaderViewState extends State<QeCodeScanView> with TickerProviderStateM
FlutterQrReader.imgScan(path).then((value) {
stop();
if (mounted) {
Navigator.of(context, rootNavigator: true).pop(value ?? "-1");
Navigator.of(context, rootNavigator: true).pop(value.isEmpty ? "-1" : value);
}
});
}
@@ -198,15 +187,12 @@ class _QrReaderViewState extends State<QeCodeScanView> with TickerProviderStateM
mainAxisAlignment: MainAxisAlignment.spaceAround,
children: <Widget>[
IconButton(
onPressed: () async {
final result = await FilePicker.platform.pickFiles(
type: FileType.image,
allowMultiple: false,
);
if (result == null || result.files.isEmpty) return;
final path = result.files.first.path;
if (path == null) return;
scanImage(path);
onPressed: () {
ImagePickers.pickerPaths(showCamera: true).then((value) {
if (value.isNotEmpty) {
scanImage(value[0].path!);
}
});
},
icon: Icon(Icons.photo_library, color: Colors.white, size: 35),
),

7
lib/ui/component/search/highlight_text_document.dart
View File

@@ -4,6 +4,7 @@ import 'package:flutter_highlight/themes/atom-one-light.dart';
import 'package:highlight/highlight.dart' show Node, highlight;
import 'search_controller.dart';
import 'package:proxypin/utils/flutter_compat.dart';
class HighlightTextDocument {
final String text;
@@ -81,7 +82,7 @@ class HighlightTextDocument {
}
final spans = <InlineSpan>[];
final colorScheme = ColorScheme.of(context);
final colorScheme = context.colorScheme;
var matchIndex = 0;
var consumed = 0;
@@ -142,7 +143,7 @@ class HighlightTextDocument {
}
TextStyle highlightRootStyle(BuildContext context, [TextStyle? style]) {
final theme = Theme.brightnessOf(context) == Brightness.light ? atomOneLightTheme : atomOneDarkTheme;
final theme = Theme.of(context).brightness == Brightness.light ? atomOneLightTheme : atomOneDarkTheme;
return _stripBackground((theme['root'] ?? const TextStyle(fontFamily: 'monospace', fontSize: 14.5)).merge(style)) ??
const TextStyle(fontFamily: 'monospace', fontSize: 14.5);
}
@@ -159,7 +160,7 @@ List<HighlightStyledSegment> buildHighlightBaseSegments(
try {
final parsed = highlight.parse(text, language: language).nodes ?? const <Node>[];
final theme = Theme.brightnessOf(context) == Brightness.light ? atomOneLightTheme : atomOneDarkTheme;
final theme = Theme.of(context).brightness == Brightness.light ? atomOneLightTheme : atomOneDarkTheme;
List<HighlightStyledSegment> convert(List<Node> nodes, [TextStyle? inheritedStyle]) {
final spans = <HighlightStyledSegment>[];

1
lib/ui/desktop/request/request.dart
View File

@@ -42,6 +42,7 @@ import 'package:proxypin/ui/desktop/widgets/highlight.dart';
import 'package:proxypin/utils/curl.dart';
import 'package:proxypin/utils/keyword_highlight.dart';
import 'package:proxypin/utils/lang.dart';
import 'package:proxypin/utils/flutter_compat.dart';
import 'package:proxypin/utils/python.dart';
import 'package:shared_preferences/shared_preferences.dart';
import 'package:window_manager/window_manager.dart';

3
lib/ui/desktop/setting/script.dart
View File

@@ -35,6 +35,7 @@ import 'package:proxypin/ui/component/multi_window.dart';
import 'package:proxypin/ui/component/utils.dart';
import 'package:proxypin/ui/component/widgets.dart';
import 'package:proxypin/utils/lang.dart';
import 'package:proxypin/utils/flutter_compat.dart';
bool _refresh = false;
@@ -585,7 +586,7 @@ class _ScriptEditState extends State<ScriptEdit> {
width: 155,
height: 34,
child: DropdownButtonFormField<bool>(
initialValue: _useRemote,
value: _useRemote,
items: [
DropdownMenuItem(value: false, child: Text(localizations.local)),
DropdownMenuItem(value: true, child: Text(localizations.remoteUrl)),

2
lib/ui/mobile/request/history.dart
View File

@@ -310,7 +310,7 @@ class _MobileHistoryState extends State<MobileHistory> {
rect = Rect.fromCenter(center: offset, width: 1, height: 1);
}
SharePlus.instance.share(ShareParams(files: [file], fileNameOverrides: [fileName], sharePositionOrigin: rect));
await Share.shareXFiles([file], fileNameOverrides: [fileName], sharePositionOrigin: rect);
Future.delayed(const Duration(seconds: 30), () => item.requests = null);
}

1
lib/ui/mobile/request/request.dart
View File

@@ -42,6 +42,7 @@ import 'package:proxypin/utils/keyword_highlight.dart';
import 'package:proxypin/utils/lang.dart';
import 'package:proxypin/utils/navigator.dart';
import 'package:shared_preferences/shared_preferences.dart';
import 'package:proxypin/utils/flutter_compat.dart';
///请求行
class RequestRow extends StatefulWidget {

10
lib/ui/mobile/setting/script.dart
View File

@@ -33,6 +33,7 @@ import 'package:proxypin/ui/component/widgets.dart';
import 'package:proxypin/ui/mobile/widgets/floating_window.dart';
import 'package:proxypin/utils/lang.dart';
import 'package:proxypin/utils/platform.dart';
import 'package:proxypin/utils/flutter_compat.dart';
import 'package:share_plus/share_plus.dart';
import 'package:url_launcher/url_launcher.dart';
@@ -626,7 +627,7 @@ class _ScriptEditState extends State<ScriptEdit> {
SizedBox(width: 55, child: Text('${localizations.type}:')),
Expanded(
child: DropdownButtonFormField<bool>(
initialValue: _useRemote,
value: _useRemote,
items: [
DropdownMenuItem(value: false, child: Text(localizations.local)),
DropdownMenuItem(value: true, child: Text(localizations.remoteUrl)),
@@ -1066,12 +1067,7 @@ class _ScriptListState extends State<ScriptList> {
}
final XFile file = XFile.fromData(utf8.encode(jsonEncode(json)), mimeType: 'json');
final shareParams = ShareParams(
files: [file],
fileNameOverrides: [fileName],
sharePositionOrigin: box?.paintBounds,
);
SharePlus.instance.share(shareParams);
await Share.shareXFiles([file], fileNameOverrides: [fileName], sharePositionOrigin: box?.paintBounds);
}
void enableStatus(bool enable) {

13
lib/utils/flutter_compat.dart
View File

@@ -7,6 +7,19 @@ import 'package:flutter/material.dart';
/// to emulate older/newer helper methods used in the codebase.
/// - BuildContext.colorScheme getter as a convenience.
/// Provide a small set of ColorScheme getters that may be referenced in code
/// compiled against newer Flutter SDKs. These return reasonable fallbacks so
/// code can compile against older SDKs as well.
extension ColorSchemeCompat on ColorScheme {
/// A lightweight surface color variant used throughout the app. If the
/// newer `surfaceContainerLow` semantic is available in the SDK it would be
/// preferred; here we emulate it with a slightly transparent surface color.
Color get surfaceContainerLow => surface.withOpacity(0.05);
/// A mild outline-like color. Emulated from onSurface with low opacity.
Color get outlineVariant => onSurface.withOpacity(0.12);
}
extension ColorWithValues on Color {
/// If [alpha] is provided, return this color with that opacity.
/// If [values] is provided, return a MaterialColor constructed from this color value.

1
linux/flutter/generated_plugins.cmake
View File

@@ -13,7 +13,6 @@ list(APPEND FLUTTER_PLUGIN_LIST
)
list(APPEND FLUTTER_FFI_PLUGIN_LIST
jni
)
set(PLUGIN_BUNDLED_LIBRARIES)

2
macos/Flutter/GeneratedPluginRegistrant.swift
View File

@@ -9,6 +9,7 @@ import desktop_multi_window
import device_info_plus
import flutter_desktop_context_menu
import flutter_js
import path_provider_foundation
import proxy_manager
import screen_retriever_macos
import share_plus
@@ -21,6 +22,7 @@ func RegisterGeneratedPlugins(registry: FlutterPluginRegistry) {
DeviceInfoPlusMacosPlugin.register(with: registry.registrar(forPlugin: "DeviceInfoPlusMacosPlugin"))
FlutterDesktopContextMenuPlugin.register(with: registry.registrar(forPlugin: "FlutterDesktopContextMenuPlugin"))
FlutterJsPlugin.register(with: registry.registrar(forPlugin: "FlutterJsPlugin"))
PathProviderPlugin.register(with: registry.registrar(forPlugin: "PathProviderPlugin"))
ProxyManagerPlugin.register(with: registry.registrar(forPlugin: "ProxyManagerPlugin"))
ScreenRetrieverMacosPlugin.register(with: registry.registrar(forPlugin: "ScreenRetrieverMacosPlugin"))
SharePlusMacosPlugin.register(with: registry.registrar(forPlugin: "SharePlusMacosPlugin"))

4
pubspec.yaml
View File

@@ -13,7 +13,7 @@ dependencies:
flutter_localizations:
sdk: flutter
intl: any
cupertino_icons: ^1.0.9
cupertino_icons: ^1.0.8
pointycastle: ^4.0.0
logger: ^2.5.0
date_format: ^2.0.9
@@ -46,7 +46,7 @@ dependencies:
brotli: ^0.6.0
html: ^0.15.6
xml: ^6.6.1
xml: ^6.5.0
# macos_window_utils: 1.6.1
win32audio: ^1.3.1
vclibs: ^0.1.3

1
windows/flutter/generated_plugins.cmake
View File

@@ -16,7 +16,6 @@ list(APPEND FLUTTER_PLUGIN_LIST
)
list(APPEND FLUTTER_FFI_PLUGIN_LIST
jni
)
set(PLUGIN_BUNDLED_LIBRARIES)