From 1cb0e1ce7bd1cc6eb362a1c7920f94c31f57acd5 Mon Sep 17 00:00:00 2001 From: rustdesk Date: Fri, 21 Jun 2024 12:33:05 +0800 Subject: [PATCH] try out 3.22.2 --- flutter/lib/desktop/pages/port_forward_page.dart | 7 ++++--- flutter/lib/desktop/widgets/material_mod_popup_menu.dart | 4 ++-- flutter/lib/desktop/widgets/popup_menu.dart | 2 +- flutter/lib/mobile/pages/remote_page.dart | 2 +- flutter/macos/Podfile.lock | 8 ++++---- flutter/pubspec.yaml | 3 +++ 6 files changed, 15 insertions(+), 11 deletions(-) diff --git a/flutter/lib/desktop/pages/port_forward_page.dart b/flutter/lib/desktop/pages/port_forward_page.dart index efeeb4cf8..b9a3248fa 100644 --- a/flutter/lib/desktop/pages/port_forward_page.dart +++ b/flutter/lib/desktop/pages/port_forward_page.dart @@ -141,8 +141,9 @@ class _PortForwardPageState extends State child: Text(translate(label)).marginOnly(left: _kTextLeftMargin)); return Theme( - data: Theme.of(context) - .copyWith(backgroundColor: Theme.of(context).colorScheme.background), + data: Theme.of(context).copyWith( + colorScheme: Theme.of(context).colorScheme, + ), child: Obx(() => ListView.builder( controller: ScrollController(), itemCount: pfs.length + 2, @@ -289,7 +290,7 @@ class _PortForwardPageState extends State ).marginOnly(left: _kTextLeftMargin)); return Theme( data: Theme.of(context) - .copyWith(backgroundColor: Theme.of(context).colorScheme.background), + .copyWith(colorScheme: Theme.of(context).colorScheme), child: ListView.builder( controller: ScrollController(), itemCount: 2, diff --git a/flutter/lib/desktop/widgets/material_mod_popup_menu.dart b/flutter/lib/desktop/widgets/material_mod_popup_menu.dart index 69ee882e8..0e085a14e 100644 --- a/flutter/lib/desktop/widgets/material_mod_popup_menu.dart +++ b/flutter/lib/desktop/widgets/material_mod_popup_menu.dart @@ -271,7 +271,7 @@ class PopupMenuItem extends PopupMenuEntry { /// The text style of the popup menu item. /// /// If this property is null, then [PopupMenuThemeData.textStyle] is used. - /// If [PopupMenuThemeData.textStyle] is also null, then [TextTheme.subtitle1] + /// If [PopupMenuThemeData.textStyle] is also null, then [TextTheme.titleMedium] /// of [ThemeData.textTheme] is used. final TextStyle? textStyle; @@ -352,7 +352,7 @@ class PopupMenuItemState> extends State { final PopupMenuThemeData popupMenuTheme = PopupMenuTheme.of(context); TextStyle style = widget.textStyle ?? popupMenuTheme.textStyle ?? - theme.textTheme.subtitle1!; + theme.textTheme.titleMedium!; if (!widget.enabled) style = style.copyWith(color: theme.disabledColor); diff --git a/flutter/lib/desktop/widgets/popup_menu.dart b/flutter/lib/desktop/widgets/popup_menu.dart index da1a82835..7d8f7c78c 100644 --- a/flutter/lib/desktop/widgets/popup_menu.dart +++ b/flutter/lib/desktop/widgets/popup_menu.dart @@ -65,7 +65,7 @@ class MyPopupMenuItemState> final PopupMenuThemeData popupMenuTheme = PopupMenuTheme.of(context); TextStyle style = widget.textStyle ?? popupMenuTheme.textStyle ?? - theme.textTheme.subtitle1!; + theme.textTheme.titleMedium!; return Obx(() => mod_menu.PopupMenuButton( enabled: enabled.value, position: widget.position, diff --git a/flutter/lib/mobile/pages/remote_page.dart b/flutter/lib/mobile/pages/remote_page.dart index a6b51b99e..3d89cd85f 100644 --- a/flutter/lib/mobile/pages/remote_page.dart +++ b/flutter/lib/mobile/pages/remote_page.dart @@ -930,7 +930,7 @@ void showOptions( border: Border.all(color: Theme.of(context).hintColor), borderRadius: BorderRadius.circular(2), color: i == cur - ? Theme.of(context).toggleableActiveColor.withOpacity(0.6) + ? Theme.of(context).primaryColor.withOpacity(0.6) : null), child: Center( child: Text((i + 1).toString(), diff --git a/flutter/macos/Podfile.lock b/flutter/macos/Podfile.lock index a9f3c7388..a29674fec 100644 --- a/flutter/macos/Podfile.lock +++ b/flutter/macos/Podfile.lock @@ -95,17 +95,17 @@ SPEC CHECKSUMS: desktop_drop: 69eeff437544aa619c8db7f4481b3a65f7696898 desktop_multi_window: 566489c048b501134f9d7fb6a2354c60a9126486 device_info_plus: 5401765fde0b8d062a2f8eb65510fb17e77cf07f - file_selector_macos: 468fb6b81fac7c0e88d71317f3eec34c3b008ff9 + file_selector_macos: 54fdab7caa3ac3fc43c9fac4d7d8d231277f8cf2 flutter_custom_cursor: 629957115075c672287bd0fa979d863ccf6024f7 FlutterMacOS: 8f6f14fa908a6fb3fba0cd85dbd81ec4b251fb24 package_info_plus: 02d7a575e80f194102bef286361c6c326e4c29ce - path_provider_foundation: 3784922295ac71e43754bd15e0653ccfd36a147c + path_provider_foundation: 2b6b4c569c0fb62ec74538f866245ac84301af46 screen_retriever: 59634572a57080243dd1bf715e55b6c54f241a38 sqflite: 673a0e54cc04b7d6dba8d24fb8095b31c3a99eec texture_rgba_renderer: cbed959a3c127122194a364e14b8577bd62dc8f2 uni_links_desktop: 45900fb319df48fcdea2df0756e9c2626696b026 - url_launcher_macos: d2691c7dd33ed713bf3544850a623080ec693d95 - video_player_avfoundation: 02011213dab73ae3687df27ce441fbbcc82b5579 + url_launcher_macos: 5f437abeda8c85500ceb03f5c1938a8c5a705399 + video_player_avfoundation: 7c6c11d8470e1675df7397027218274b6d2360b3 wakelock_plus: 4783562c9a43d209c458cb9b30692134af456269 window_manager: 3a1844359a6295ab1e47659b1a777e36773cd6e8 window_size: 339dafa0b27a95a62a843042038fa6c3c48de195 diff --git a/flutter/pubspec.yaml b/flutter/pubspec.yaml index 20ef15d3f..d43f0843f 100644 --- a/flutter/pubspec.yaml +++ b/flutter/pubspec.yaml @@ -114,6 +114,9 @@ dev_dependencies: flutter_lints: ^2.0.2 ffigen: ^8.0.2 +dependency_overrides: + intl: ^0.19.0 + # rerun: flutter pub run flutter_launcher_icons flutter_icons: image_path: "../res/icon.png"