opensource/localsend
1
0
Fork 0
mirror of https://github.com/localsend/localsend.git synced 2026-06-23 04:10:07 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

deps: bump flutter from 3.13.9 to 3.24.3

Browse Source
This commit is contained in:
Tien Do Nam
2024-09-26 02:07:02 +02:00
parent 414ae3ba76
commit 61f3ffdb8d
20 changed files with 493 additions and 307 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.fvmrc
+1 -1
View File
@@ -1,3 +1,3 @@
{
"flutter": "3.13.9"
"flutter": "3.24.3"
}
.github/workflows/ci.yml
+1 -1
View File
@@ -7,7 +7,7 @@ on:
branches: [main]
env:
FLUTTER_VERSION: "3.13.9"
FLUTTER_VERSION: "3.24.3"
jobs:
format:
app/lib/config/theme.dart
+2 -3
View File
@@ -49,7 +49,7 @@ ThemeData getTheme(ColorMode colorMode, Brightness brightness, DynamicColors? dy
useMaterial3: true,
navigationBarTheme: colorScheme.brightness == Brightness.dark
? NavigationBarThemeData(
iconTheme: MaterialStateProperty.all(const IconThemeData(color: Colors.white)),
iconTheme: WidgetStateProperty.all(const IconThemeData(color: Colors.white)),
)
: null,
inputDecorationTheme: InputDecorationTheme(
@@ -139,7 +139,6 @@ ColorScheme _determineColorScheme(ColorMode mode, Brightness brightness, Dynamic
ColorMode.system => brightness == Brightness.light ? dynamicColors?.light : dynamicColors?.dark,
ColorMode.localsend => null,
ColorMode.oled => (dynamicColors?.dark ?? defaultColorScheme).copyWith(
background: Colors.black,
surface: Colors.black,
),
ColorMode.yaru => throw 'Should reach here',
@@ -165,7 +164,7 @@ ThemeData _getYaruTheme(Brightness brightness) {
return baseTheme.copyWith(
navigationBarTheme: colorScheme.brightness == Brightness.dark
? NavigationBarThemeData(
iconTheme: MaterialStateProperty.all(const IconThemeData(color: Colors.white)),
iconTheme: WidgetStateProperty.all(const IconThemeData(color: Colors.white)),
)
: null,
inputDecorationTheme: InputDecorationTheme(
app/lib/pages/progress_page.dart
+4 -4
View File
@@ -209,13 +209,13 @@ class _ProgressPageState extends State<ProgressPage> with Refena {
final fileStatusMap = receiveSession?.files.map((k, f) => MapEntry(k, f.status)) ?? sendSession!.files.map((k, f) => MapEntry(k, f.status));
final finishedCount = fileStatusMap.values.where((s) => s == FileStatus.finished).length;
return WillPopScope(
onWillPop: () async {
return PopScope(
onPopInvokedWithResult: (_, __) async {
if (await _onWillPop() && mounted) {
return true;
context.pop();
}
return false;
},
canPop: false,
child: Scaffold(
appBar: widget.showAppBar
? AppBar(
app/lib/pages/receive_page.dart
+8 -6
View File
@@ -54,11 +54,13 @@ class _ReceivePageState extends State<ReceivePage> with Refena {
final senderFavoriteEntry = ref.watch(favoritesProvider.select((state) => state.findDevice(vm.sender)));
return WillPopScope(
onWillPop: () async {
vm.onDecline();
return true;
return PopScope(
onPopInvokedWithResult: (didPop, result) {
if (didPop) {
vm.onDecline();
}
},
canPop: true,
child: Scaffold(
body: SafeArea(
child: Center(
@@ -269,8 +271,8 @@ class _Actions extends StatelessWidget {
ElevatedButton.icon(
style: ElevatedButton.styleFrom(
elevation: colorMode == ColorMode.yaru ? 0 : null,
backgroundColor: colorMode == ColorMode.yaru ? Theme.of(context).colorScheme.background : Theme.of(context).colorScheme.error,
foregroundColor: colorMode == ColorMode.yaru ? Theme.of(context).colorScheme.onBackground : Theme.of(context).colorScheme.onError,
backgroundColor: colorMode == ColorMode.yaru ? Theme.of(context).colorScheme.surface : Theme.of(context).colorScheme.error,
foregroundColor: colorMode == ColorMode.yaru ? Theme.of(context).colorScheme.onSurface : Theme.of(context).colorScheme.onError,
),
onPressed: () {
vm.onDecline();
app/lib/pages/send_page.dart
+4 -4
View File
@@ -78,13 +78,13 @@ class _SendPageState extends State<SendPage> with Refena {
final targetFavoriteEntry = ref.watch(favoritesProvider.select((state) => state.findDevice(targetDevice)));
final waiting = sendState?.status == SessionStatus.waiting;
return WillPopScope(
onWillPop: () async {
if (widget.closeSessionOnClose) {
return PopScope(
onPopInvokedWithResult: (didPop, result) {
if (didPop && widget.closeSessionOnClose) {
_cancel();
}
return true;
},
canPop: true,
child: Scaffold(
appBar: widget.showAppBar ? AppBar() : null,
body: SafeArea(
app/lib/pages/web_send_page.dart
+8 -3
View File
@@ -14,6 +14,7 @@ import 'package:localsend_app/widget/dialogs/qr_dialog.dart';
import 'package:localsend_app/widget/dialogs/zoom_dialog.dart';
import 'package:localsend_app/widget/responsive_list_view.dart';
import 'package:refena_flutter/refena_flutter.dart';
import 'package:routerino/routerino.dart';
enum _ServerState { initializing, running, error, stopping }
@@ -79,16 +80,20 @@ class _WebSendPageState extends State<WebSendPage> with Refena {
@override
Widget build(BuildContext context) {
return WillPopScope(
onWillPop: () async {
return PopScope(
onPopInvokedWithResult: (_, __) async {
setState(() {
_stateEnum = _ServerState.stopping;
});
await sleepAsync(250);
await _revertServerState();
await sleepAsync(250);
return true;
if (context.mounted) {
context.pop();
}
},
canPop: false,
child: Scaffold(
appBar: AppBar(
title: Text(t.webSharePage.title),
app/lib/util/native/file_saver.dart
+1 -1
View File
@@ -10,7 +10,7 @@ import 'package:logging/logging.dart';
import 'package:mime/mime.dart';
import 'package:path/path.dart' as p;
import 'package:saf_stream/saf_stream.dart';
import 'package:saf_stream/saf_stream_method_channel.dart';
import 'package:saf_stream/saf_stream_platform_interface.dart';
final _logger = Logger('FileSaver');
app/lib/widget/dialogs/loading_dialog.dart
+3 -3
View File
@@ -5,9 +5,9 @@ class LoadingDialog extends StatelessWidget {
@override
Widget build(BuildContext context) {
return WillPopScope(
onWillPop: () async => false,
child: const Center(
return const PopScope(
canPop: false,
child: Center(
child: CircularProgressIndicator(),
),
);
app/linux/flutter/generated_plugin_registrant.cc
+4
View File
@@ -16,6 +16,7 @@
#include <uri_content/uri_content_plugin.h>
#include <url_launcher_linux/url_launcher_plugin.h>
#include <window_manager/window_manager_plugin.h>
#include <yaru_window_linux/yaru_window_linux_plugin.h>
void fl_register_plugins(FlPluginRegistry* registry) {
g_autoptr(FlPluginRegistrar) desktop_drop_registrar =
@@ -48,4 +49,7 @@ void fl_register_plugins(FlPluginRegistry* registry) {
g_autoptr(FlPluginRegistrar) window_manager_registrar =
fl_plugin_registry_get_registrar_for_plugin(registry, "WindowManagerPlugin");
window_manager_plugin_register_with_registrar(window_manager_registrar);
g_autoptr(FlPluginRegistrar) yaru_window_linux_registrar =
fl_plugin_registry_get_registrar_for_plugin(registry, "YaruWindowLinuxPlugin");
yaru_window_linux_plugin_register_with_registrar(yaru_window_linux_registrar);
}
app/linux/flutter/generated_plugins.cmake
+1
View File
@@ -13,6 +13,7 @@ list(APPEND FLUTTER_PLUGIN_LIST
uri_content
url_launcher_linux
window_manager
yaru_window_linux
)
list(APPEND FLUTTER_FFI_PLUGIN_LIST
app/macos/Flutter/GeneratedPluginRegistrant.swift
+1 -1
View File
@@ -27,7 +27,7 @@ import wakelock_plus
import window_manager
func RegisterGeneratedPlugins(registry: FlutterPluginRegistry) {
ConnectivityPlugin.register(with: registry.registrar(forPlugin: "ConnectivityPlugin"))
ConnectivityPlusPlugin.register(with: registry.registrar(forPlugin: "ConnectivityPlusPlugin"))
DesktopDropPlugin.register(with: registry.registrar(forPlugin: "DesktopDropPlugin"))
DeviceInfoPlusMacosPlugin.register(with: registry.registrar(forPlugin: "DeviceInfoPlusMacosPlugin"))
DynamicColorPlugin.register(with: registry.registrar(forPlugin: "DynamicColorPlugin"))
app/macos/Podfile.lock
+13 -16
View File
@@ -1,7 +1,7 @@
PODS:
- connectivity_plus (0.0.1):
- Flutter
- FlutterMacOS
- ReachabilitySwift
- Defaults (4.2.2)
- desktop_drop (0.0.1):
- FlutterMacOS
@@ -30,7 +30,6 @@ PODS:
- photo_manager (2.0.0):
- Flutter
- FlutterMacOS
- ReachabilitySwift (5.2.3)
- screen_retriever (0.0.1):
- FlutterMacOS
- shared_preferences_foundation (0.0.1):
@@ -51,7 +50,7 @@ PODS:
- FlutterMacOS
DEPENDENCIES:
- connectivity_plus (from `Flutter/ephemeral/.symlinks/plugins/connectivity_plus/macos`)
- connectivity_plus (from `Flutter/ephemeral/.symlinks/plugins/connectivity_plus/darwin`)
- Defaults (~> 4.2)
- desktop_drop (from `Flutter/ephemeral/.symlinks/plugins/desktop_drop/macos`)
- device_info_plus (from `Flutter/ephemeral/.symlinks/plugins/device_info_plus/macos`)
@@ -77,11 +76,10 @@ DEPENDENCIES:
SPEC REPOS:
trunk:
- Defaults
- ReachabilitySwift
EXTERNAL SOURCES:
connectivity_plus:
:path: Flutter/ephemeral/.symlinks/plugins/connectivity_plus/macos
:path: Flutter/ephemeral/.symlinks/plugins/connectivity_plus/darwin
desktop_drop:
:path: Flutter/ephemeral/.symlinks/plugins/desktop_drop/macos
device_info_plus:
@@ -124,27 +122,26 @@ EXTERNAL SOURCES:
:path: Flutter/ephemeral/.symlinks/plugins/window_manager/macos
SPEC CHECKSUMS:
connectivity_plus: 18d3c32514c886e046de60e9c13895109866c747
connectivity_plus: ddd7f30999e1faaef5967c23d5b6d503d10434db
Defaults: d785e56c0fb8890dc40351603f05c8e1df1bdd45
desktop_drop: 69eeff437544aa619c8db7f4481b3a65f7696898
device_info_plus: 5401765fde0b8d062a2f8eb65510fb17e77cf07f
device_info_plus: ce1b7762849d3ec103d0e0517299f2db7ad60720
dynamic_color: 2eaa27267de1ca20d879fbd6e01259773fb1670f
file_selector_macos: 54fdab7caa3ac3fc43c9fac4d7d8d231277f8cf2
file_selector_macos: cc3858c981fe6889f364731200d6232dac1d812d
FlutterMacOS: 8f6f14fa908a6fb3fba0cd85dbd81ec4b251fb24
gal: 61e868295d28fe67ffa297fae6dacebf56fd53e1
in_app_purchase_storekit: 9e9931234f0adcf71ae323f8c83785b96030edf1
in_app_purchase_storekit: 8c3b0b3eb1b0f04efbff401c3de6266d4258d433
network_info_plus: aeb9c4ed699cae128bc94b9d0f04f2389a414cbb
package_info_plus: 02d7a575e80f194102bef286361c6c326e4c29ce
package_info_plus: fa739dd842b393193c5ca93c26798dff6e3d0e0c
pasteboard: 9b69dba6fedbb04866be632205d532fe2f6b1d99
path_provider_foundation: 3784922295ac71e43754bd15e0653ccfd36a147c
photo_manager: 4f6810b7dfc4feb03b461ac1a70dacf91fba7604
ReachabilitySwift: 7f151ff156cea1481a8411701195ac6a984f4979
path_provider_foundation: 2b6b4c569c0fb62ec74538f866245ac84301af46
photo_manager: ff695c7a1dd5bc379974953a2b5c0a293f7c4c8a
screen_retriever: 59634572a57080243dd1bf715e55b6c54f241a38
shared_preferences_foundation: b4c3b4cddf1c21f02770737f147a3f5da9d39695
shared_preferences_foundation: fcdcbc04712aee1108ac7fda236f363274528f78
tray_manager: 9064e219c56d75c476e46b9a21182087930baf90
uri_content: bfedc2e58f0ee4de88a63e5bcb826398389b22cb
url_launcher_macos: 5f437abeda8c85500ceb03f5c1938a8c5a705399
video_player_avfoundation: e9e6f9cae7d7a6d9b43519b0aab382bca60fcfd1
url_launcher_macos: c82c93949963e55b228a30115bd219499a6fe404
video_player_avfoundation: 7c6c11d8470e1675df7397027218274b6d2360b3
wakelock_plus: 4783562c9a43d209c458cb9b30692134af456269
window_manager: 3a1844359a6295ab1e47659b1a777e36773cd6e8
app/macos/Runner.xcodeproj/project.pbxproj
+1 -1
View File
@@ -291,7 +291,7 @@
isa = PBXProject;
attributes = {
LastSwiftUpdateCheck = 1540;
LastUpgradeCheck = 1430;
LastUpgradeCheck = 1510;
ORGANIZATIONNAME = "";
TargetAttributes = {
053DADD92C8945EF00C3B4DE = {
app/macos/Runner.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved
+10 -1
View File
@@ -1,5 +1,5 @@
{
"originHash" : "3e0046e1b0518dc180bd8a7c98fa476d9af079586f505a34aa5b924f90460bda",
"originHash" : "72ae1b64a4d55b124e5d523ea3b7e7432749772550fc8b66a0f17a2caa5d4dc1",
"pins" : [
{
"identity" : "dockprogress",
@@ -9,6 +9,15 @@
"revision" : "d4f23b5a8f5ca0fac393eb7ba78c2fe3e32e52da",
"version" : "4.3.1"
}
},
{
"identity" : "launchatlogin-legacy",
"kind" : "remoteSourceControl",
"location" : "https://github.com/sindresorhus/LaunchAtLogin-Legacy",
"state" : {
"revision" : "9a894d799269cb591037f9f9cb0961510d4dca81",
"version" : "5.0.2"
}
}
],
"version" : 3
app/macos/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme
+1 -1
View File
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "1430"
LastUpgradeVersion = "1510"
version = "1.3">
<BuildAction
parallelizeBuildables = "YES"
app/pubspec.lock
+394 -221
View File
File diff suppressed because it is too large Load Diff
app/pubspec.yaml
+34 -38
View File
@@ -6,8 +6,8 @@ publish_to: "none"
version: 1.15.4+54
environment:
flutter: ">=3.13.0"
sdk: ">=3.1.0 <4.0.0"
flutter: ">=3.24.0"
sdk: ">=3.5.0 <4.0.0"
dependencies:
app_group_directory: 2.0.0
@@ -15,73 +15,73 @@ dependencies:
collection: ^1.17.2 # allow newer versions, so it can compile with newer Flutter versions
common:
path: ../common
connectivity_plus: 5.0.2
connectivity_plus: 6.0.5
dart_mappable: 4.2.2
desktop_drop: 0.4.4
desktop_drop: 0.5.0
device_apps: 2.2.0
device_info_plus: 9.1.2
dio: 5.4.3+1
device_info_plus: 10.1.2
dio: 5.7.0
dynamic_color: 1.7.0
file_picker: 8.0.2
file_picker: 8.1.2
file_selector: 1.0.3
flutter:
sdk: flutter
flutter_displaymode: 0.6.0
flutter_localizations:
sdk: flutter
flutter_markdown: 0.6.19
flutter_markdown: 0.7.3+1
gal: 2.3.0
image_picker: 1.0.8
in_app_purchase: 3.1.13 # [FOSS_REMOVE]
intl: ^0.18.0 # allow newer versions, so it can compile with newer Flutter versions
image_picker: 1.1.2
in_app_purchase: 3.2.0 # [FOSS_REMOVE]
intl: ^0.19.0 # allow newer versions, so it can compile with newer Flutter versions
legalize: ^1.2.2
logging: 1.2.0
# https://github.com/NightFeather0615/macos_dock_progress/issues/1
# macos_dock_progress: 1.1.0
mime: 1.0.4
mime: 1.0.6
nanoid2: 2.0.1
network_info_plus: 5.0.3
open_filex: 4.4.0
package_info_plus: 4.2.0
pasteboard: ^0.2.0
path: 1.8.3
path_provider: 2.1.2
permission_handler: 11.0.1
network_info_plus: 6.0.1
open_filex: 4.5.0
package_info_plus: 8.0.2
pasteboard: 0.3.0
path: 1.9.0
path_provider: 2.1.4
permission_handler: 11.3.1
pretty_qr_code: 3.3.0
refena_flutter: 2.1.1
refena_inspector_client: 2.0.0
routerino: 0.8.0
saf_stream: 0.4.0
saf_stream: 0.7.5
screen_retriever: 0.1.9
share_handler: 0.0.19
share_handler_ios: 0.0.12 # Keep iOS <14 support
shared_preferences: 2.2.3
shared_preferences: 2.3.2
shared_preferences_platform_interface: any
shared_storage: 0.8.1
slang: 3.31.1
slang: 3.31.2
slang_flutter: 3.31.0
system_settings: 2.1.0
tray_manager: 0.2.3
uri_content: 2.2.0
url_launcher: 6.2.4
uuid: 3.0.7
wakelock_plus: 1.1.4
wechat_assets_picker: 8.8.1+1
win32_registry: 1.1.2
window_manager: 0.3.9
url_launcher: 6.3.0
uuid: 4.5.0
wakelock_plus: 1.2.8
wechat_assets_picker: 9.3.0
win32_registry: 1.1.5
window_manager: 0.4.2
windows_taskbar: 1.1.2
yaru: 1.2.2
yaru: 5.2.1
dev_dependencies:
build_runner: 2.4.9
build_runner: 2.4.12
dart_mappable_builder: 4.2.3
flutter_gen_runner: 5.6.0
flutter_lints: 3.0.1
flutter_gen_runner: 5.7.0
flutter_lints: 4.0.0
mockito: 5.4.4
refena_inspector: 2.0.0
slang_build_runner: 3.31.0
slang_gpt: 0.10.2
test: ^1.24.3
slang_gpt: 0.10.3
test: ^1.24.7
dependency_overrides:
permission_handler_windows:
@@ -90,10 +90,6 @@ dependency_overrides:
git:
url: https://github.com/localsend/permission_handler_windows_noop.git
ref: 2dadd8afbf81e0e3e4791d7144e689555e58f649
# Force newer version than Flutter 3.13 allows so that file_picker >= 8.0.1 can be used.
# There is a critical bug in file_picker that needs to be fixed: https://github.com/miguelpruivo/flutter_file_picker/issues/1412
# Since LocalSend doesn't support web anyway, we can ignore compilation errors for web.
web: 0.5.1
flutter:
uses-material-design: true
common/pubspec.yaml
+1 -1
View File
@@ -9,7 +9,7 @@ environment:
dependencies:
collection: ^1.17.2 # allow newer versions, so it can compile with newer Flutter versions
dart_mappable: ^4.2.0
dio: 5.4.3+1
dio: 5.7.0
logging: ^1.2.0
meta: ^1.9.1
mime: ^1.0.4
submodules/flutter
+1 -1
Submodule submodules/flutter updated: d211f42860...2663184aa7