From e8eb67bf631eab1c7b886cc39f26e1fa332995f0 Mon Sep 17 00:00:00 2001 From: DatDang Date: Tue, 9 Jul 2024 11:32:42 +0700 Subject: [PATCH] Upgrade dependencies after upgrade Flutter 3.22.2 --- contact/pubspec.lock | 72 +++++++--- contact/pubspec.yaml | 2 +- core/lib/presentation/utils/theme_utils.dart | 4 +- ...firmation_dialog_action_sheet_builder.dart | 8 +- .../views/button/icon_button_web.dart | 24 ++-- .../dialog/edit_text_dialog_builder.dart | 16 +-- core/pubspec.lock | 68 +++++++--- core/pubspec.yaml | 4 +- email_recovery/pubspec.lock | 68 +++++++--- email_recovery/pubspec.yaml | 2 +- fcm/pubspec.lock | 68 +++++++--- fcm/pubspec.yaml | 2 +- forward/pubspec.lock | 68 +++++++--- forward/pubspec.yaml | 2 +- .../popup_context_menu_action_mixin.dart | 2 +- .../base/widget/drop_down_button_widget.dart | 6 +- .../presentation/composer_controller.dart | 12 +- .../from_composer_drop_down_widget_style.dart | 6 +- .../drop_down_menu_header_style_widget.dart | 4 +- .../widgets/recipient_composer_widget.dart | 8 +- .../web/attachment_drop_zone_widget.dart | 2 +- ...cupertino_action_sheet_action_builder.dart | 2 +- .../email_address_bottom_sheet_builder.dart | 20 +-- .../widgets/email_address_dialog_builder.dart | 20 +-- .../widgets/pdf_viewer/pdf_viewer.dart | 8 +- .../check_box_has_attachment_widget.dart | 4 +- .../date_selection_dropdown_button.dart | 4 +- .../text_input_field_suggestion_widget.dart | 2 +- .../text_input_field_widget.dart | 6 +- .../identity_drop_list_field_builder.dart | 4 +- ...lbox_bottom_sheet_action_tile_builder.dart | 2 +- .../widgets/mailbox_item_widget.dart | 2 +- ...vanced_search_filter_form_bottom_view.dart | 12 +- .../advanced_search_input_form.dart | 6 +- .../date_drop_down_button.dart | 4 +- .../sort_by_drop_down_button.dart | 4 +- ..._field_autocomplete_email_address_web.dart | 2 +- ...rule_bottom_sheet_action_tile_builder.dart | 2 +- .../notification/notification_controller.dart | 3 + .../identities_radio_list_builder.dart | 1 - ...tion_bottom_sheet_action_tile_builder.dart | 2 +- ...biner_bottomsheet_action_tile_builder.dart | 3 +- ...ator_bottom_sheet_action_tile_builder.dart | 2 +- ...ield_bottom_sheet_action_tile_builder.dart | 2 +- ...cupertino_action_sheet_action_builder.dart | 2 +- ...cupertino_action_sheet_action_builder.dart | 3 +- .../mailbox_searched_item_builder.dart | 4 +- .../presentation/thread_controller.dart | 6 +- .../thread/presentation/thread_view.dart | 2 +- .../app_action_sheet_action_builder.dart | 2 +- ...cupertino_action_sheet_action_builder.dart | 2 +- model/pubspec.lock | 68 +++++++--- model/pubspec.yaml | 2 +- pubspec.lock | 127 +++++++++++------- pubspec.yaml | 23 ++-- rule_filter/pubspec.lock | 68 +++++++--- rule_filter/pubspec.yaml | 2 +- server_settings/pubspec.yaml | 2 +- 58 files changed, 552 insertions(+), 326 deletions(-) diff --git a/contact/pubspec.lock b/contact/pubspec.lock index c2125f1a3..e16cc2237 100644 --- a/contact/pubspec.lock +++ b/contact/pubspec.lock @@ -523,10 +523,10 @@ packages: dependency: transitive description: name: get - sha256: "2ba20a47c8f1f233bed775ba2dd0d3ac97b4cf32fc17731b3dfc672b06b0e92a" + sha256: e4e7335ede17452b391ed3b2ede016545706c01a02292a6c97619705e7d2a85e url: "https://pub.dev" source: hosted - version: "4.6.5" + version: "4.6.6" glob: dependency: transitive description: @@ -595,10 +595,10 @@ packages: dependency: transitive description: name: intl - sha256: "3bc132a9dbce73a7e4a21a17d06e1878839ffbf975568bc875c60537824b0c4d" + sha256: d6f56758b7d3014a48af9701c085700aac781a92a87a62b1333b46d8879661cf url: "https://pub.dev" source: hosted - version: "0.18.1" + version: "0.19.0" io: dependency: transitive description: @@ -640,6 +640,30 @@ packages: url: "https://pub.dev" source: hosted version: "6.6.1" + leak_tracker: + dependency: transitive + description: + name: leak_tracker + sha256: "7f0df31977cb2c0b88585095d168e689669a2cc9b97c309665e3386f3e9d341a" + url: "https://pub.dev" + source: hosted + version: "10.0.4" + leak_tracker_flutter_testing: + dependency: transitive + description: + name: leak_tracker_flutter_testing + sha256: "06e98f569d004c1315b991ded39924b21af84cf14cc94791b8aea337d25b57f8" + url: "https://pub.dev" + source: hosted + version: "3.0.3" + leak_tracker_testing: + dependency: transitive + description: + name: leak_tracker_testing + sha256: "6ba465d5d76e67ddf503e1161d1f4a6bc42306f9d66ca1e8f079a47290fb06d3" + url: "https://pub.dev" + source: hosted + version: "3.0.1" linkify: dependency: transitive description: @@ -668,26 +692,26 @@ packages: dependency: transitive description: name: matcher - sha256: "1803e76e6653768d64ed8ff2e1e67bea3ad4b923eb5c56a295c3e634bad5960e" + sha256: d2323aa2060500f906aa31a895b4030b6da3ebdcc5619d14ce1aada65cd161cb url: "https://pub.dev" source: hosted - version: "0.12.16" + version: "0.12.16+1" material_color_utilities: dependency: transitive description: name: material_color_utilities - sha256: "9528f2f296073ff54cb9fee677df673ace1218163c3bc7628093e7eed5203d41" + sha256: "0e0a020085b65b6083975e499759762399b4475f766c21668c4ecca34ea74e5a" url: "https://pub.dev" source: hosted - version: "0.5.0" + version: "0.8.0" meta: dependency: transitive description: name: meta - sha256: a6e590c838b18133bb482a2745ad77c5bb7715fb0451209e1a7567d416678b8e + sha256: "7687075e408b093f36e6bbf6c91878cc0d4cd10f409506f7bc996f68220b9136" url: "https://pub.dev" source: hosted - version: "1.10.0" + version: "1.12.0" mime: dependency: transitive description: @@ -700,10 +724,10 @@ packages: dependency: "direct dev" description: name: mockito - sha256: "7d5b53bcd556c1bc7ffbe4e4d5a19c3e112b7e925e9e172dd7c6ad0630812616" + sha256: "6841eed20a7befac0ce07df8116c8b8233ed1f4486a7647c7fc5a02ae6163917" url: "https://pub.dev" source: hosted - version: "5.4.2" + version: "5.4.4" model: dependency: "direct main" description: @@ -739,10 +763,10 @@ packages: dependency: transitive description: name: path - sha256: "8829d8a55c13fc0e37127c29fedf290c102f4e40ae94ada574091fe0ff96c917" + sha256: "087ce49c3f0dc39180befefc60fdb4acd8f8620e5682fe2476afd0b3688bb4af" url: "https://pub.dev" source: hosted - version: "1.8.3" + version: "1.9.0" path_parsing: dependency: transitive description: @@ -811,10 +835,10 @@ packages: dependency: transitive description: name: pdf_widget_wrapper - sha256: e9d31fd7782ce28ae346b127ea7d1cd748d799bddee379f31191693610e23749 + sha256: c930860d987213a3d58c7ec3b7ecf8085c3897f773e8dc23da9cae60a5d6d0f5 url: "https://pub.dev" source: hosted - version: "1.0.1" + version: "1.0.4" petitparser: dependency: transitive description: @@ -1008,10 +1032,10 @@ packages: dependency: transitive description: name: test_api - sha256: "5c2f730018264d276c20e4f1503fd1308dfbbae39ec8ee63c5236311ac06954b" + sha256: "9955ae474176f7ac8ee4e989dadfb411a58c30415bcfb648fa04b2b8a03afa7f" url: "https://pub.dev" source: hosted - version: "0.6.1" + version: "0.7.0" timing: dependency: transitive description: @@ -1148,6 +1172,14 @@ packages: url: "https://pub.dev" source: hosted version: "2.1.4" + vm_service: + dependency: transitive + description: + name: vm_service + sha256: "3923c89304b715fb1eb6423f017651664a03bf5f4b29983627c4da791f74a4ec" + url: "https://pub.dev" + source: hosted + version: "14.2.1" watcher: dependency: transitive description: @@ -1205,5 +1237,5 @@ packages: source: hosted version: "3.1.2" sdks: - dart: ">=3.2.0 <4.0.0" - flutter: ">=3.16.0" + dart: ">=3.3.0 <4.0.0" + flutter: ">=3.20.0-7.0.pre.48" diff --git a/contact/pubspec.yaml b/contact/pubspec.yaml index 605e62ad5..d75114a24 100644 --- a/contact/pubspec.yaml +++ b/contact/pubspec.yaml @@ -41,7 +41,7 @@ dev_dependencies: json_serializable: 6.6.1 - mockito: 5.4.2 + mockito: 5.4.4 # For information on the generic Dart part of this file, see the # following page: https://dart.dev/tools/pub/pubspec diff --git a/core/lib/presentation/utils/theme_utils.dart b/core/lib/presentation/utils/theme_utils.dart index 2be885946..ab5bf3722 100644 --- a/core/lib/presentation/utils/theme_utils.dart +++ b/core/lib/presentation/utils/theme_utils.dart @@ -14,9 +14,9 @@ class ThemeUtils { dividerTheme: _dividerTheme, visualDensity: VisualDensity.adaptivePlatformDensity, scrollbarTheme: ScrollbarThemeData( - thickness: MaterialStateProperty.all(8.0), + thickness: WidgetStateProperty.all(8.0), radius: const Radius.circular(8.0), - thumbColor: MaterialStateProperty.all(AppColor.thumbScrollbarColor)), + thumbColor: WidgetStateProperty.all(AppColor.thumbScrollbarColor)), ); } diff --git a/core/lib/presentation/views/bottom_popup/confirmation_dialog_action_sheet_builder.dart b/core/lib/presentation/views/bottom_popup/confirmation_dialog_action_sheet_builder.dart index 1d657af3e..2698acb26 100644 --- a/core/lib/presentation/views/bottom_popup/confirmation_dialog_action_sheet_builder.dart +++ b/core/lib/presentation/views/bottom_popup/confirmation_dialog_action_sheet_builder.dart @@ -61,7 +61,7 @@ class ConfirmationDialogActionSheetBuilder { padding: const EdgeInsets.symmetric(vertical: 8, horizontal: 10), color: Colors.white, child: MouseRegion( - cursor: PlatformInfo.isWeb ? MaterialStateMouseCursor.clickable : MouseCursor.defer, + cursor: PlatformInfo.isWeb ? WidgetStateMouseCursor.clickable : MouseCursor.defer, child: CupertinoActionSheetAction( child: Text( _messageText ?? '', @@ -76,7 +76,7 @@ class ConfirmationDialogActionSheetBuilder { padding: const EdgeInsets.symmetric(vertical: 8, horizontal: 10), color: Colors.white, child: MouseRegion( - cursor: PlatformInfo.isWeb ? MaterialStateMouseCursor.clickable : MouseCursor.defer, + cursor: PlatformInfo.isWeb ? WidgetStateMouseCursor.clickable : MouseCursor.defer, child: CupertinoActionSheetAction( child: RichText(text: TextSpan( style: _styleMessage ?? const TextStyle(fontSize: 14, color: AppColor.colorMessageConfirmDialog), @@ -89,7 +89,7 @@ class ConfirmationDialogActionSheetBuilder { Container( color: Colors.white, child: MouseRegion( - cursor: PlatformInfo.isWeb ? MaterialStateMouseCursor.clickable : MouseCursor.defer, + cursor: PlatformInfo.isWeb ? WidgetStateMouseCursor.clickable : MouseCursor.defer, child: CupertinoActionSheetAction( child: Text( _confirmText ?? '', @@ -100,7 +100,7 @@ class ConfirmationDialogActionSheetBuilder { ), ], cancelButton: MouseRegion( - cursor: PlatformInfo.isWeb ? MaterialStateMouseCursor.clickable : MouseCursor.defer, + cursor: PlatformInfo.isWeb ? WidgetStateMouseCursor.clickable : MouseCursor.defer, child: CupertinoActionSheetAction( child: Text( _cancelText ?? '', diff --git a/core/lib/presentation/views/button/icon_button_web.dart b/core/lib/presentation/views/button/icon_button_web.dart index 474fb77ce..880cbe56c 100644 --- a/core/lib/presentation/views/button/icon_button_web.dart +++ b/core/lib/presentation/views/button/icon_button_web.dart @@ -91,11 +91,11 @@ Widget buildTextButton(String text, { child: ElevatedButton( focusNode: focusNode, style: ButtonStyle( - backgroundColor: MaterialStateProperty.resolveWith((states) => backgroundColor ?? AppColor.colorTextButton), - elevation: MaterialStateProperty.resolveWith((states) => 0), - padding: MaterialStateProperty.resolveWith( - (Set states) => padding ?? const EdgeInsets.symmetric(horizontal: 8)), - shape: MaterialStateProperty.all(RoundedRectangleBorder(borderRadius: BorderRadius.circular(radius ?? 0)))), + backgroundColor: WidgetStateProperty.resolveWith((states) => backgroundColor ?? AppColor.colorTextButton), + elevation: WidgetStateProperty.resolveWith((states) => 0), + padding: WidgetStateProperty.resolveWith( + (Set states) => padding ?? const EdgeInsets.symmetric(horizontal: 8)), + shape: WidgetStateProperty.all(RoundedRectangleBorder(borderRadius: BorderRadius.circular(radius ?? 0)))), child: Text( text, textAlign: TextAlign.center, @@ -127,17 +127,17 @@ Widget buildButtonWrapText(String name, { focusNode: focusNode, onPressed: () => onTap?.call(), style: ButtonStyle( - backgroundColor: MaterialStateProperty.resolveWith( - (Set states) => bgColor ?? AppColor.colorTextButton), - shape: MaterialStateProperty.all(RoundedRectangleBorder( + backgroundColor: WidgetStateProperty.resolveWith( + (Set states) => bgColor ?? AppColor.colorTextButton), + shape: WidgetStateProperty.all(RoundedRectangleBorder( borderRadius: BorderRadius.circular(radius ?? 8), side: BorderSide( width: borderColor != null ? 1 : 0, color: borderColor ?? bgColor ?? AppColor.colorTextButton))), - padding: MaterialStateProperty.resolveWith( - (Set states) => const EdgeInsets.symmetric(horizontal: 16)), - elevation: MaterialStateProperty.resolveWith( - (Set states) => 0)), + padding: WidgetStateProperty.resolveWith( + (Set states) => const EdgeInsets.symmetric(horizontal: 16)), + elevation: WidgetStateProperty.resolveWith( + (Set states) => 0)), child: Text(name, textAlign: TextAlign.center, style: textStyle ?? diff --git a/core/lib/presentation/views/dialog/edit_text_dialog_builder.dart b/core/lib/presentation/views/dialog/edit_text_dialog_builder.dart index 00536b195..c6caf3a53 100644 --- a/core/lib/presentation/views/dialog/edit_text_dialog_builder.dart +++ b/core/lib/presentation/views/dialog/edit_text_dialog_builder.dart @@ -155,17 +155,17 @@ class EditTextDialogBuilder { child: ElevatedButton( onPressed: () => action?.call(), style: ButtonStyle( - foregroundColor: MaterialStateProperty.resolveWith( - (Set states) => bgColor ?? AppColor.colorTextButton), - backgroundColor: MaterialStateProperty.resolveWith( - (Set states) => bgColor ?? AppColor.colorTextButton), - shape: MaterialStateProperty.all(RoundedRectangleBorder( + foregroundColor: WidgetStateProperty.resolveWith( + (Set states) => bgColor ?? AppColor.colorTextButton), + backgroundColor: WidgetStateProperty.resolveWith( + (Set states) => bgColor ?? AppColor.colorTextButton), + shape: WidgetStateProperty.all(RoundedRectangleBorder( borderRadius: BorderRadius.circular(8), side: BorderSide(width: 0, color: bgColor ?? AppColor.colorTextButton), )), - padding: MaterialStateProperty.resolveWith( - (Set states) => const EdgeInsets.symmetric(horizontal: 16)), - elevation: MaterialStateProperty.resolveWith((Set states) => 0)), + padding: WidgetStateProperty.resolveWith( + (Set states) => const EdgeInsets.symmetric(horizontal: 16)), + elevation: WidgetStateProperty.resolveWith((Set states) => 0)), child: Text(name ?? '', textAlign: TextAlign.center, style: TextStyle(fontSize: 17, fontWeight: FontWeight.w500, color: nameColor ?? Colors.white)), diff --git a/core/pubspec.lock b/core/pubspec.lock index 711b56246..4f8ae6a18 100644 --- a/core/pubspec.lock +++ b/core/pubspec.lock @@ -396,10 +396,10 @@ packages: dependency: "direct main" description: name: get - sha256: "2ba20a47c8f1f233bed775ba2dd0d3ac97b4cf32fc17731b3dfc672b06b0e92a" + sha256: e4e7335ede17452b391ed3b2ede016545706c01a02292a6c97619705e7d2a85e url: "https://pub.dev" source: hosted - version: "4.6.5" + version: "4.6.6" html: dependency: "direct main" description: @@ -436,10 +436,10 @@ packages: dependency: "direct main" description: name: intl - sha256: "3bc132a9dbce73a7e4a21a17d06e1878839ffbf975568bc875c60537824b0c4d" + sha256: d6f56758b7d3014a48af9701c085700aac781a92a87a62b1333b46d8879661cf url: "https://pub.dev" source: hosted - version: "0.18.1" + version: "0.19.0" js: dependency: transitive description: @@ -448,6 +448,30 @@ packages: url: "https://pub.dev" source: hosted version: "0.6.7" + leak_tracker: + dependency: transitive + description: + name: leak_tracker + sha256: "7f0df31977cb2c0b88585095d168e689669a2cc9b97c309665e3386f3e9d341a" + url: "https://pub.dev" + source: hosted + version: "10.0.4" + leak_tracker_flutter_testing: + dependency: transitive + description: + name: leak_tracker_flutter_testing + sha256: "06e98f569d004c1315b991ded39924b21af84cf14cc94791b8aea337d25b57f8" + url: "https://pub.dev" + source: hosted + version: "3.0.3" + leak_tracker_testing: + dependency: transitive + description: + name: leak_tracker_testing + sha256: "6ba465d5d76e67ddf503e1161d1f4a6bc42306f9d66ca1e8f079a47290fb06d3" + url: "https://pub.dev" + source: hosted + version: "3.0.1" linkify: dependency: "direct main" description: @@ -468,26 +492,26 @@ packages: dependency: transitive description: name: matcher - sha256: "1803e76e6653768d64ed8ff2e1e67bea3ad4b923eb5c56a295c3e634bad5960e" + sha256: d2323aa2060500f906aa31a895b4030b6da3ebdcc5619d14ce1aada65cd161cb url: "https://pub.dev" source: hosted - version: "0.12.16" + version: "0.12.16+1" material_color_utilities: dependency: transitive description: name: material_color_utilities - sha256: "9528f2f296073ff54cb9fee677df673ace1218163c3bc7628093e7eed5203d41" + sha256: "0e0a020085b65b6083975e499759762399b4475f766c21668c4ecca34ea74e5a" url: "https://pub.dev" source: hosted - version: "0.5.0" + version: "0.8.0" meta: dependency: transitive description: name: meta - sha256: a6e590c838b18133bb482a2745ad77c5bb7715fb0451209e1a7567d416678b8e + sha256: "7687075e408b093f36e6bbf6c91878cc0d4cd10f409506f7bc996f68220b9136" url: "https://pub.dev" source: hosted - version: "1.10.0" + version: "1.12.0" package_info_plus: dependency: "direct main" description: @@ -508,10 +532,10 @@ packages: dependency: transitive description: name: path - sha256: "8829d8a55c13fc0e37127c29fedf290c102f4e40ae94ada574091fe0ff96c917" + sha256: "087ce49c3f0dc39180befefc60fdb4acd8f8620e5682fe2476afd0b3688bb4af" url: "https://pub.dev" source: hosted - version: "1.8.3" + version: "1.9.0" path_parsing: dependency: transitive description: @@ -580,10 +604,10 @@ packages: dependency: transitive description: name: pdf_widget_wrapper - sha256: e9d31fd7782ce28ae346b127ea7d1cd748d799bddee379f31191693610e23749 + sha256: c930860d987213a3d58c7ec3b7ecf8085c3897f773e8dc23da9cae60a5d6d0f5 url: "https://pub.dev" source: hosted - version: "1.0.1" + version: "1.0.4" petitparser: dependency: transitive description: @@ -705,10 +729,10 @@ packages: dependency: transitive description: name: test_api - sha256: "5c2f730018264d276c20e4f1503fd1308dfbbae39ec8ee63c5236311ac06954b" + sha256: "9955ae474176f7ac8ee4e989dadfb411a58c30415bcfb648fa04b2b8a03afa7f" url: "https://pub.dev" source: hosted - version: "0.6.1" + version: "0.7.0" typed_data: dependency: transitive description: @@ -829,6 +853,14 @@ packages: url: "https://pub.dev" source: hosted version: "2.1.4" + vm_service: + dependency: transitive + description: + name: vm_service + sha256: "3923c89304b715fb1eb6423f017651664a03bf5f4b29983627c4da791f74a4ec" + url: "https://pub.dev" + source: hosted + version: "14.2.1" web: dependency: transitive description: @@ -862,5 +894,5 @@ packages: source: hosted version: "6.4.2" sdks: - dart: ">=3.2.0 <4.0.0" - flutter: ">=3.16.0" + dart: ">=3.3.0 <4.0.0" + flutter: ">=3.20.0-7.0.pre.48" diff --git a/core/pubspec.yaml b/core/pubspec.yaml index e7bb0ca33..619295679 100644 --- a/core/pubspec.yaml +++ b/core/pubspec.yaml @@ -41,7 +41,7 @@ dependencies: html: 0.15.3 - get: 4.6.5 + get: 4.6.6 device_info_plus: 8.1.0 @@ -67,7 +67,7 @@ dependencies: collection: 1.18.0 - intl: 0.18.1 + intl: 0.19.0 flutter_typeahead: 5.0.2 diff --git a/email_recovery/pubspec.lock b/email_recovery/pubspec.lock index 07abe5f64..758582ce5 100644 --- a/email_recovery/pubspec.lock +++ b/email_recovery/pubspec.lock @@ -324,6 +324,30 @@ packages: url: "https://pub.dev" source: hosted version: "6.6.1" + leak_tracker: + dependency: transitive + description: + name: leak_tracker + sha256: "7f0df31977cb2c0b88585095d168e689669a2cc9b97c309665e3386f3e9d341a" + url: "https://pub.dev" + source: hosted + version: "10.0.4" + leak_tracker_flutter_testing: + dependency: transitive + description: + name: leak_tracker_flutter_testing + sha256: "06e98f569d004c1315b991ded39924b21af84cf14cc94791b8aea337d25b57f8" + url: "https://pub.dev" + source: hosted + version: "3.0.3" + leak_tracker_testing: + dependency: transitive + description: + name: leak_tracker_testing + sha256: "6ba465d5d76e67ddf503e1161d1f4a6bc42306f9d66ca1e8f079a47290fb06d3" + url: "https://pub.dev" + source: hosted + version: "3.0.1" lints: dependency: transitive description: @@ -344,26 +368,26 @@ packages: dependency: transitive description: name: matcher - sha256: "1803e76e6653768d64ed8ff2e1e67bea3ad4b923eb5c56a295c3e634bad5960e" + sha256: d2323aa2060500f906aa31a895b4030b6da3ebdcc5619d14ce1aada65cd161cb url: "https://pub.dev" source: hosted - version: "0.12.16" + version: "0.12.16+1" material_color_utilities: dependency: transitive description: name: material_color_utilities - sha256: "9528f2f296073ff54cb9fee677df673ace1218163c3bc7628093e7eed5203d41" + sha256: "0e0a020085b65b6083975e499759762399b4475f766c21668c4ecca34ea74e5a" url: "https://pub.dev" source: hosted - version: "0.5.0" + version: "0.8.0" meta: dependency: transitive description: name: meta - sha256: a6e590c838b18133bb482a2745ad77c5bb7715fb0451209e1a7567d416678b8e + sha256: "7687075e408b093f36e6bbf6c91878cc0d4cd10f409506f7bc996f68220b9136" url: "https://pub.dev" source: hosted - version: "1.10.0" + version: "1.12.0" mime: dependency: transitive description: @@ -376,10 +400,10 @@ packages: dependency: "direct dev" description: name: mockito - sha256: "7d5b53bcd556c1bc7ffbe4e4d5a19c3e112b7e925e9e172dd7c6ad0630812616" + sha256: "6841eed20a7befac0ce07df8116c8b8233ed1f4486a7647c7fc5a02ae6163917" url: "https://pub.dev" source: hosted - version: "5.4.2" + version: "5.4.4" package_config: dependency: transitive description: @@ -392,10 +416,10 @@ packages: dependency: transitive description: name: path - sha256: "8829d8a55c13fc0e37127c29fedf290c102f4e40ae94ada574091fe0ff96c917" + sha256: "087ce49c3f0dc39180befefc60fdb4acd8f8620e5682fe2476afd0b3688bb4af" url: "https://pub.dev" source: hosted - version: "1.8.3" + version: "1.9.0" pool: dependency: transitive description: @@ -517,10 +541,10 @@ packages: dependency: transitive description: name: test_api - sha256: "5c2f730018264d276c20e4f1503fd1308dfbbae39ec8ee63c5236311ac06954b" + sha256: "9955ae474176f7ac8ee4e989dadfb411a58c30415bcfb648fa04b2b8a03afa7f" url: "https://pub.dev" source: hosted - version: "0.6.1" + version: "0.7.0" timing: dependency: transitive description: @@ -545,6 +569,14 @@ packages: url: "https://pub.dev" source: hosted version: "2.1.4" + vm_service: + dependency: transitive + description: + name: vm_service + sha256: "3923c89304b715fb1eb6423f017651664a03bf5f4b29983627c4da791f74a4ec" + url: "https://pub.dev" + source: hosted + version: "14.2.1" watcher: dependency: transitive description: @@ -553,14 +585,6 @@ packages: url: "https://pub.dev" source: hosted version: "1.1.0" - web: - dependency: transitive - description: - name: web - sha256: afe077240a270dcfd2aafe77602b4113645af95d0ad31128cc02bce5ac5d5152 - url: "https://pub.dev" - source: hosted - version: "0.3.0" web_socket_channel: dependency: transitive description: @@ -578,5 +602,5 @@ packages: source: hosted version: "3.1.2" sdks: - dart: ">=3.2.0-194.0.dev <4.0.0" - flutter: ">=3.0.0" + dart: ">=3.3.0 <4.0.0" + flutter: ">=3.18.0-18.0.pre.54" diff --git a/email_recovery/pubspec.yaml b/email_recovery/pubspec.yaml index 6c777aca2..c34995a5e 100644 --- a/email_recovery/pubspec.yaml +++ b/email_recovery/pubspec.yaml @@ -38,7 +38,7 @@ dev_dependencies: json_serializable: 6.6.1 - mockito: 5.4.2 + mockito: 5.4.4 # For information on the generic Dart part of this file, see the # following page: https://dart.dev/tools/pub/pubspec diff --git a/fcm/pubspec.lock b/fcm/pubspec.lock index 413859155..a3355d3a0 100644 --- a/fcm/pubspec.lock +++ b/fcm/pubspec.lock @@ -324,6 +324,30 @@ packages: url: "https://pub.dev" source: hosted version: "6.6.1" + leak_tracker: + dependency: transitive + description: + name: leak_tracker + sha256: "7f0df31977cb2c0b88585095d168e689669a2cc9b97c309665e3386f3e9d341a" + url: "https://pub.dev" + source: hosted + version: "10.0.4" + leak_tracker_flutter_testing: + dependency: transitive + description: + name: leak_tracker_flutter_testing + sha256: "06e98f569d004c1315b991ded39924b21af84cf14cc94791b8aea337d25b57f8" + url: "https://pub.dev" + source: hosted + version: "3.0.3" + leak_tracker_testing: + dependency: transitive + description: + name: leak_tracker_testing + sha256: "6ba465d5d76e67ddf503e1161d1f4a6bc42306f9d66ca1e8f079a47290fb06d3" + url: "https://pub.dev" + source: hosted + version: "3.0.1" lints: dependency: transitive description: @@ -344,26 +368,26 @@ packages: dependency: transitive description: name: matcher - sha256: "1803e76e6653768d64ed8ff2e1e67bea3ad4b923eb5c56a295c3e634bad5960e" + sha256: d2323aa2060500f906aa31a895b4030b6da3ebdcc5619d14ce1aada65cd161cb url: "https://pub.dev" source: hosted - version: "0.12.16" + version: "0.12.16+1" material_color_utilities: dependency: transitive description: name: material_color_utilities - sha256: "9528f2f296073ff54cb9fee677df673ace1218163c3bc7628093e7eed5203d41" + sha256: "0e0a020085b65b6083975e499759762399b4475f766c21668c4ecca34ea74e5a" url: "https://pub.dev" source: hosted - version: "0.5.0" + version: "0.8.0" meta: dependency: transitive description: name: meta - sha256: a6e590c838b18133bb482a2745ad77c5bb7715fb0451209e1a7567d416678b8e + sha256: "7687075e408b093f36e6bbf6c91878cc0d4cd10f409506f7bc996f68220b9136" url: "https://pub.dev" source: hosted - version: "1.10.0" + version: "1.12.0" mime: dependency: transitive description: @@ -376,10 +400,10 @@ packages: dependency: "direct dev" description: name: mockito - sha256: "7d5b53bcd556c1bc7ffbe4e4d5a19c3e112b7e925e9e172dd7c6ad0630812616" + sha256: "6841eed20a7befac0ce07df8116c8b8233ed1f4486a7647c7fc5a02ae6163917" url: "https://pub.dev" source: hosted - version: "5.4.2" + version: "5.4.4" package_config: dependency: transitive description: @@ -392,10 +416,10 @@ packages: dependency: transitive description: name: path - sha256: "8829d8a55c13fc0e37127c29fedf290c102f4e40ae94ada574091fe0ff96c917" + sha256: "087ce49c3f0dc39180befefc60fdb4acd8f8620e5682fe2476afd0b3688bb4af" url: "https://pub.dev" source: hosted - version: "1.8.3" + version: "1.9.0" pool: dependency: transitive description: @@ -517,10 +541,10 @@ packages: dependency: transitive description: name: test_api - sha256: "5c2f730018264d276c20e4f1503fd1308dfbbae39ec8ee63c5236311ac06954b" + sha256: "9955ae474176f7ac8ee4e989dadfb411a58c30415bcfb648fa04b2b8a03afa7f" url: "https://pub.dev" source: hosted - version: "0.6.1" + version: "0.7.0" timing: dependency: transitive description: @@ -545,6 +569,14 @@ packages: url: "https://pub.dev" source: hosted version: "2.1.4" + vm_service: + dependency: transitive + description: + name: vm_service + sha256: "3923c89304b715fb1eb6423f017651664a03bf5f4b29983627c4da791f74a4ec" + url: "https://pub.dev" + source: hosted + version: "14.2.1" watcher: dependency: transitive description: @@ -553,14 +585,6 @@ packages: url: "https://pub.dev" source: hosted version: "1.1.0" - web: - dependency: transitive - description: - name: web - sha256: afe077240a270dcfd2aafe77602b4113645af95d0ad31128cc02bce5ac5d5152 - url: "https://pub.dev" - source: hosted - version: "0.3.0" web_socket_channel: dependency: transitive description: @@ -578,5 +602,5 @@ packages: source: hosted version: "3.1.2" sdks: - dart: ">=3.2.0-194.0.dev <4.0.0" - flutter: ">=3.0.0" + dart: ">=3.3.0 <4.0.0" + flutter: ">=3.18.0-18.0.pre.54" diff --git a/fcm/pubspec.yaml b/fcm/pubspec.yaml index ee7b9b52d..3bcc6bd88 100644 --- a/fcm/pubspec.yaml +++ b/fcm/pubspec.yaml @@ -38,7 +38,7 @@ dev_dependencies: json_serializable: 6.6.1 - mockito: 5.4.2 + mockito: 5.4.4 flutter: diff --git a/forward/pubspec.lock b/forward/pubspec.lock index 413859155..a3355d3a0 100644 --- a/forward/pubspec.lock +++ b/forward/pubspec.lock @@ -324,6 +324,30 @@ packages: url: "https://pub.dev" source: hosted version: "6.6.1" + leak_tracker: + dependency: transitive + description: + name: leak_tracker + sha256: "7f0df31977cb2c0b88585095d168e689669a2cc9b97c309665e3386f3e9d341a" + url: "https://pub.dev" + source: hosted + version: "10.0.4" + leak_tracker_flutter_testing: + dependency: transitive + description: + name: leak_tracker_flutter_testing + sha256: "06e98f569d004c1315b991ded39924b21af84cf14cc94791b8aea337d25b57f8" + url: "https://pub.dev" + source: hosted + version: "3.0.3" + leak_tracker_testing: + dependency: transitive + description: + name: leak_tracker_testing + sha256: "6ba465d5d76e67ddf503e1161d1f4a6bc42306f9d66ca1e8f079a47290fb06d3" + url: "https://pub.dev" + source: hosted + version: "3.0.1" lints: dependency: transitive description: @@ -344,26 +368,26 @@ packages: dependency: transitive description: name: matcher - sha256: "1803e76e6653768d64ed8ff2e1e67bea3ad4b923eb5c56a295c3e634bad5960e" + sha256: d2323aa2060500f906aa31a895b4030b6da3ebdcc5619d14ce1aada65cd161cb url: "https://pub.dev" source: hosted - version: "0.12.16" + version: "0.12.16+1" material_color_utilities: dependency: transitive description: name: material_color_utilities - sha256: "9528f2f296073ff54cb9fee677df673ace1218163c3bc7628093e7eed5203d41" + sha256: "0e0a020085b65b6083975e499759762399b4475f766c21668c4ecca34ea74e5a" url: "https://pub.dev" source: hosted - version: "0.5.0" + version: "0.8.0" meta: dependency: transitive description: name: meta - sha256: a6e590c838b18133bb482a2745ad77c5bb7715fb0451209e1a7567d416678b8e + sha256: "7687075e408b093f36e6bbf6c91878cc0d4cd10f409506f7bc996f68220b9136" url: "https://pub.dev" source: hosted - version: "1.10.0" + version: "1.12.0" mime: dependency: transitive description: @@ -376,10 +400,10 @@ packages: dependency: "direct dev" description: name: mockito - sha256: "7d5b53bcd556c1bc7ffbe4e4d5a19c3e112b7e925e9e172dd7c6ad0630812616" + sha256: "6841eed20a7befac0ce07df8116c8b8233ed1f4486a7647c7fc5a02ae6163917" url: "https://pub.dev" source: hosted - version: "5.4.2" + version: "5.4.4" package_config: dependency: transitive description: @@ -392,10 +416,10 @@ packages: dependency: transitive description: name: path - sha256: "8829d8a55c13fc0e37127c29fedf290c102f4e40ae94ada574091fe0ff96c917" + sha256: "087ce49c3f0dc39180befefc60fdb4acd8f8620e5682fe2476afd0b3688bb4af" url: "https://pub.dev" source: hosted - version: "1.8.3" + version: "1.9.0" pool: dependency: transitive description: @@ -517,10 +541,10 @@ packages: dependency: transitive description: name: test_api - sha256: "5c2f730018264d276c20e4f1503fd1308dfbbae39ec8ee63c5236311ac06954b" + sha256: "9955ae474176f7ac8ee4e989dadfb411a58c30415bcfb648fa04b2b8a03afa7f" url: "https://pub.dev" source: hosted - version: "0.6.1" + version: "0.7.0" timing: dependency: transitive description: @@ -545,6 +569,14 @@ packages: url: "https://pub.dev" source: hosted version: "2.1.4" + vm_service: + dependency: transitive + description: + name: vm_service + sha256: "3923c89304b715fb1eb6423f017651664a03bf5f4b29983627c4da791f74a4ec" + url: "https://pub.dev" + source: hosted + version: "14.2.1" watcher: dependency: transitive description: @@ -553,14 +585,6 @@ packages: url: "https://pub.dev" source: hosted version: "1.1.0" - web: - dependency: transitive - description: - name: web - sha256: afe077240a270dcfd2aafe77602b4113645af95d0ad31128cc02bce5ac5d5152 - url: "https://pub.dev" - source: hosted - version: "0.3.0" web_socket_channel: dependency: transitive description: @@ -578,5 +602,5 @@ packages: source: hosted version: "3.1.2" sdks: - dart: ">=3.2.0-194.0.dev <4.0.0" - flutter: ">=3.0.0" + dart: ">=3.3.0 <4.0.0" + flutter: ">=3.18.0-18.0.pre.54" diff --git a/forward/pubspec.yaml b/forward/pubspec.yaml index 2abcd134e..d0c221e3a 100644 --- a/forward/pubspec.yaml +++ b/forward/pubspec.yaml @@ -38,7 +38,7 @@ dev_dependencies: json_serializable: 6.6.1 - mockito: 5.4.2 + mockito: 5.4.4 # For information on the generic Dart part of this file, see the # following page: https://dart.dev/tools/pub/pubspec diff --git a/lib/features/base/mixin/popup_context_menu_action_mixin.dart b/lib/features/base/mixin/popup_context_menu_action_mixin.dart index f34f58f12..9acdf7e97 100644 --- a/lib/features/base/mixin/popup_context_menu_action_mixin.dart +++ b/lib/features/base/mixin/popup_context_menu_action_mixin.dart @@ -39,7 +39,7 @@ mixin PopupContextMenuActionMixin { Widget buildCancelButton(BuildContext context) { return MouseRegion( - cursor: PlatformInfo.isWeb ? MaterialStateMouseCursor.clickable : MouseCursor.defer, + cursor: PlatformInfo.isWeb ? WidgetStateMouseCursor.clickable : MouseCursor.defer, child: CupertinoActionSheetAction( child: Text( AppLocalizations.of(context).cancel, diff --git a/lib/features/base/widget/drop_down_button_widget.dart b/lib/features/base/widget/drop_down_button_widget.dart index 5a98b2b90..57e9811c9 100644 --- a/lib/features/base/widget/drop_down_button_widget.dart +++ b/lib/features/base/widget/drop_down_button_widget.dart @@ -156,15 +156,15 @@ class DropDownButtonWidget extends StatelessWidget { offset: const Offset(0.0, -8.0), scrollbarTheme: ScrollbarThemeData( radius: const Radius.circular(40), - thickness: MaterialStateProperty.all(6), - thumbVisibility: MaterialStateProperty.all(true), + thickness: WidgetStateProperty.all(6), + thumbVisibility: WidgetStateProperty.all(true), ), ), iconStyleData: IconStyleData(icon: iconArrowDown ?? SvgPicture.asset(imagePaths.icDropDown)), menuItemStyleData: MenuItemStyleData( height: heightItem, padding: const EdgeInsets.symmetric(horizontal: 12), - overlayColor: MaterialStateProperty.resolveWith((Set states) => supportSelectionIcon ? Colors.white : Colors.black12) + overlayColor: WidgetStateProperty.resolveWith((Set states) => supportSelectionIcon ? Colors.white : Colors.black12) ), onMenuStateChange: onMenuStateChange, ), diff --git a/lib/features/composer/presentation/composer_controller.dart b/lib/features/composer/presentation/composer_controller.dart index f9f2d265f..31054f197 100644 --- a/lib/features/composer/presentation/composer_controller.dart +++ b/lib/features/composer/presentation/composer_controller.dart @@ -364,6 +364,12 @@ class ComposerController extends BaseController with DragDropFileMixin implement } }); }); + + if (richTextWebController != null) { + ever(richTextWebController!.formattingOptionsState, (_) { + richTextWebController!.editorController.setFocus(); + }); + } } void _listenBrowserTabRefresh() { @@ -462,7 +468,7 @@ class ComposerController extends BaseController with DragDropFileMixin implement bccAddressFocusNodeKeyboard = FocusNode(); subjectEmailInputFocusNode = FocusNode( - onKey: PlatformInfo.isWeb ? _subjectEmailInputOnKeyListener : null + onKeyEvent: PlatformInfo.isWeb ? _subjectEmailInputOnKeyListener : null, ); subjectEmailInputFocusNode?.addListener(_subjectEmailInputFocusListener); } @@ -479,8 +485,8 @@ class ComposerController extends BaseController with DragDropFileMixin implement } } - KeyEventResult _subjectEmailInputOnKeyListener(FocusNode node, RawKeyEvent event) { - if (event is RawKeyDownEvent && event.logicalKey == LogicalKeyboardKey.tab) { + KeyEventResult _subjectEmailInputOnKeyListener(FocusNode node, KeyEvent event) { + if (event is KeyDownEvent && event.logicalKey == LogicalKeyboardKey.tab) { richTextWebController?.editorController.setFocus(); return KeyEventResult.handled; } diff --git a/lib/features/composer/presentation/styles/web/from_composer_drop_down_widget_style.dart b/lib/features/composer/presentation/styles/web/from_composer_drop_down_widget_style.dart index 8f76bd34e..8c410abce 100644 --- a/lib/features/composer/presentation/styles/web/from_composer_drop_down_widget_style.dart +++ b/lib/features/composer/presentation/styles/web/from_composer_drop_down_widget_style.dart @@ -51,14 +51,14 @@ class FromComposerDropDownWidgetStyle { offset: const Offset(0.0, -8.0), scrollbarTheme: ScrollbarThemeData( radius: const Radius.circular(40.0), - thickness: MaterialStateProperty.all(6.0), - thumbVisibility: MaterialStateProperty.all(true), + thickness: WidgetStateProperty.all(6.0), + thumbVisibility: WidgetStateProperty.all(true), ) ); static MenuItemStyleData menuIemStyleData = MenuItemStyleData( padding: const EdgeInsets.symmetric(horizontal: 12), height: 72, - overlayColor: MaterialStateProperty.resolveWith((Set states) => Colors.white) + overlayColor: WidgetStateProperty.resolveWith((Set states) => Colors.white) ); static const TextStyle prefixTextStyle = TextStyle( diff --git a/lib/features/composer/presentation/widgets/drop_down_menu_header_style_widget.dart b/lib/features/composer/presentation/widgets/drop_down_menu_header_style_widget.dart index ae79b42c0..357dd4a81 100644 --- a/lib/features/composer/presentation/widgets/drop_down_menu_header_style_widget.dart +++ b/lib/features/composer/presentation/widgets/drop_down_menu_header_style_widget.dart @@ -58,8 +58,8 @@ class DropDownMenuHeaderStyleWidget extends StatelessWidget { offset: const Offset(0.0, -8.0), scrollbarTheme: ScrollbarThemeData( radius: const Radius.circular(40), - thickness: MaterialStateProperty.all(6), - thumbVisibility: MaterialStateProperty.all(true), + thickness: WidgetStateProperty.all(6), + thumbVisibility: WidgetStateProperty.all(true), ) ), menuItemStyleData: MenuItemStyleData( diff --git a/lib/features/composer/presentation/widgets/recipient_composer_widget.dart b/lib/features/composer/presentation/widgets/recipient_composer_widget.dart index 45a5ba332..283946f7a 100644 --- a/lib/features/composer/presentation/widgets/recipient_composer_widget.dart +++ b/lib/features/composer/presentation/widgets/recipient_composer_widget.dart @@ -149,7 +149,7 @@ class _RecipientComposerWidgetState extends State { child: FocusScope( child: Focus( onFocusChange: (focus) => widget.onFocusEmailAddressChangeAction?.call(widget.prefix, focus), - onKey: PlatformInfo.isWeb ? _recipientInputOnKeyListener : null, + onKeyEvent: PlatformInfo.isWeb ? _recipientInputOnKeyListener : null, child: StatefulBuilder( builder: (context, stateSetter) { if (PlatformInfo.isWeb || widget.isTestingForWeb) { @@ -230,7 +230,7 @@ class _RecipientComposerWidgetState extends State { }, ); }, - onAccept: (draggableEmailAddress) => _handleAcceptDraggableEmailAddressAction(draggableEmailAddress, stateSetter), + onAcceptWithDetails: (draggableEmailAddress) => _handleAcceptDraggableEmailAddressAction(draggableEmailAddress.data, stateSetter), onLeave: (draggableEmailAddress) { if (_isDragging) { stateSetter(() => _isDragging = false); @@ -382,8 +382,8 @@ class _RecipientComposerWidgetState extends State { ); } - KeyEventResult _recipientInputOnKeyListener(FocusNode node, RawKeyEvent event) { - if (event is RawKeyDownEvent && event.logicalKey == LogicalKeyboardKey.tab) { + KeyEventResult _recipientInputOnKeyListener(FocusNode node, KeyEvent event) { + if (event is KeyDownEvent && event.logicalKey == LogicalKeyboardKey.tab) { widget.nextFocusNode?.requestFocus(); widget.onFocusNextAddressAction?.call(); return KeyEventResult.handled; diff --git a/lib/features/composer/presentation/widgets/web/attachment_drop_zone_widget.dart b/lib/features/composer/presentation/widgets/web/attachment_drop_zone_widget.dart index 2faae585a..57b0a7e5a 100644 --- a/lib/features/composer/presentation/widgets/web/attachment_drop_zone_widget.dart +++ b/lib/features/composer/presentation/widgets/web/attachment_drop_zone_widget.dart @@ -65,7 +65,7 @@ class AttachmentDropZoneWidget extends StatelessWidget { ), ); }, - onAccept: onAttachmentDropZoneListener + onAcceptWithDetails: (details) => onAttachmentDropZoneListener?.call(details.data), ); } } diff --git a/lib/features/email/presentation/widgets/email_action_cupertino_action_sheet_action_builder.dart b/lib/features/email/presentation/widgets/email_action_cupertino_action_sheet_action_builder.dart index f35f1c2fe..e2ca63764 100644 --- a/lib/features/email/presentation/widgets/email_action_cupertino_action_sheet_action_builder.dart +++ b/lib/features/email/presentation/widgets/email_action_cupertino_action_sheet_action_builder.dart @@ -31,7 +31,7 @@ class EmailActionCupertinoActionSheetActionBuilder extends CupertinoActionSheetA return Container( color: bgColor ?? Colors.white, child: MouseRegion( - cursor: PlatformInfo.isWeb ? MaterialStateMouseCursor.clickable : MouseCursor.defer, + cursor: PlatformInfo.isWeb ? WidgetStateMouseCursor.clickable : MouseCursor.defer, child: CupertinoActionSheetAction( key: key, child: Row(mainAxisAlignment: MainAxisAlignment.center, children: [ diff --git a/lib/features/email/presentation/widgets/email_address_bottom_sheet_builder.dart b/lib/features/email/presentation/widgets/email_address_bottom_sheet_builder.dart index 458c7b1ea..90200464a 100644 --- a/lib/features/email/presentation/widgets/email_address_bottom_sheet_builder.dart +++ b/lib/features/email/presentation/widgets/email_address_bottom_sheet_builder.dart @@ -157,11 +157,11 @@ class EmailAddressBottomSheetBuilder { height: 44, child: TextButton( style: ButtonStyle( - foregroundColor: MaterialStateProperty.resolveWith( - (Set states) => AppColor.colorTextButton), - backgroundColor: MaterialStateProperty.resolveWith( - (Set states) => AppColor.colorItemEmailSelectedDesktop), - shape: MaterialStateProperty.all(RoundedRectangleBorder( + foregroundColor: WidgetStateProperty.resolveWith( + (Set states) => AppColor.colorTextButton), + backgroundColor: WidgetStateProperty.resolveWith( + (Set states) => AppColor.colorItemEmailSelectedDesktop), + shape: WidgetStateProperty.all(RoundedRectangleBorder( borderRadius: BorderRadius.circular(8), side: const BorderSide( width: 0, @@ -183,11 +183,11 @@ class EmailAddressBottomSheetBuilder { height: 44, child: TextButton( style: ButtonStyle( - foregroundColor: MaterialStateProperty.resolveWith( - (Set states) => Colors.white), - backgroundColor: MaterialStateProperty.resolveWith( - (Set states) => AppColor.colorTextButton), - shape: MaterialStateProperty.all(RoundedRectangleBorder( + foregroundColor: WidgetStateProperty.resolveWith( + (Set states) => Colors.white), + backgroundColor: WidgetStateProperty.resolveWith( + (Set states) => AppColor.colorTextButton), + shape: WidgetStateProperty.all(RoundedRectangleBorder( borderRadius: BorderRadius.circular(8), side: const BorderSide( width: 0, diff --git a/lib/features/email/presentation/widgets/email_address_dialog_builder.dart b/lib/features/email/presentation/widgets/email_address_dialog_builder.dart index 329d44019..7f146e625 100644 --- a/lib/features/email/presentation/widgets/email_address_dialog_builder.dart +++ b/lib/features/email/presentation/widgets/email_address_dialog_builder.dart @@ -135,11 +135,11 @@ class EmailAddressDialogBuilder extends StatelessWidget { height: 44, child: TextButton( style: ButtonStyle( - foregroundColor: MaterialStateProperty.resolveWith( - (Set states) => AppColor.colorTextButton), - backgroundColor: MaterialStateProperty.resolveWith( - (Set states) => AppColor.colorItemEmailSelectedDesktop), - shape: MaterialStateProperty.all(RoundedRectangleBorder( + foregroundColor: WidgetStateProperty.resolveWith( + (Set states) => AppColor.colorTextButton), + backgroundColor: WidgetStateProperty.resolveWith( + (Set states) => AppColor.colorItemEmailSelectedDesktop), + shape: WidgetStateProperty.all(RoundedRectangleBorder( borderRadius: BorderRadius.circular(8), side: const BorderSide( width: 0, @@ -161,11 +161,11 @@ class EmailAddressDialogBuilder extends StatelessWidget { height: 44, child: TextButton( style: ButtonStyle( - foregroundColor: MaterialStateProperty.resolveWith( - (Set states) => Colors.white), - backgroundColor: MaterialStateProperty.resolveWith( - (Set states) => AppColor.colorTextButton), - shape: MaterialStateProperty.all(RoundedRectangleBorder( + foregroundColor: WidgetStateProperty.resolveWith( + (Set states) => Colors.white), + backgroundColor: WidgetStateProperty.resolveWith( + (Set states) => AppColor.colorTextButton), + shape: WidgetStateProperty.all(RoundedRectangleBorder( borderRadius: BorderRadius.circular(8), side: const BorderSide( width: 0, diff --git a/lib/features/email/presentation/widgets/pdf_viewer/pdf_viewer.dart b/lib/features/email/presentation/widgets/pdf_viewer/pdf_viewer.dart index fa9be2089..6a80ea896 100644 --- a/lib/features/email/presentation/widgets/pdf_viewer/pdf_viewer.dart +++ b/lib/features/email/presentation/widgets/pdf_viewer/pdf_viewer.dart @@ -123,10 +123,10 @@ class _PDFViewerState extends State { @override Widget build(BuildContext context) { - return RawKeyboardListener( + return KeyboardListener( focusNode: _keyboardFocusNode, autofocus: true, - onKey: _handleKeyboardEventListener, + onKeyEvent: _handleKeyboardEventListener, child: Center( child: Stack( children: [ @@ -287,8 +287,8 @@ class _PDFViewerState extends State { Navigator.maybeOf(context)?.pop(); } - void _handleKeyboardEventListener(RawKeyEvent event) { - if (event is RawKeyDownEvent && event.logicalKey == LogicalKeyboardKey.escape) { + void _handleKeyboardEventListener(KeyEvent event) { + if (event is KeyDownEvent && event.logicalKey == LogicalKeyboardKey.escape) { _closeView(); } } diff --git a/lib/features/email_recovery/presentation/widgets/check_box_has_attachment_widget.dart b/lib/features/email_recovery/presentation/widgets/check_box_has_attachment_widget.dart index f704dd7d8..efbc919b1 100644 --- a/lib/features/email_recovery/presentation/widgets/check_box_has_attachment_widget.dart +++ b/lib/features/email_recovery/presentation/widgets/check_box_has_attachment_widget.dart @@ -22,9 +22,9 @@ class CheckBoxHasAttachmentWidget extends StatelessWidget { @override Widget build(BuildContext context) { - return RawKeyboardListener( + return KeyboardListener( focusNode: FocusNode(), - onKey: (event) { + onKeyEvent: (event) { if (event.logicalKey == LogicalKeyboardKey.tab) { nextFocusNode?.requestFocus(); } diff --git a/lib/features/email_recovery/presentation/widgets/date_selection_field/date_selection_dropdown_button.dart b/lib/features/email_recovery/presentation/widgets/date_selection_field/date_selection_dropdown_button.dart index 4d60c80f4..32cc96f31 100644 --- a/lib/features/email_recovery/presentation/widgets/date_selection_field/date_selection_dropdown_button.dart +++ b/lib/features/email_recovery/presentation/widgets/date_selection_field/date_selection_dropdown_button.dart @@ -89,8 +89,8 @@ class DateSelectionDropDownButton extends StatelessWidget { offset: DateSelectionDropdownButtonStyles.dropdownOffset, scrollbarTheme: ScrollbarThemeData( radius: DateSelectionDropdownButtonStyles.scrollbarRadius, - thickness: MaterialStateProperty.all(DateSelectionDropdownButtonStyles.scrollbarThickness), - thumbVisibility: MaterialStateProperty.all(true), + thickness: WidgetStateProperty.all(DateSelectionDropdownButtonStyles.scrollbarThickness), + thumbVisibility: WidgetStateProperty.all(true), ), ), iconStyleData: IconStyleData( diff --git a/lib/features/email_recovery/presentation/widgets/text_input_field/text_input_field_suggestion_widget.dart b/lib/features/email_recovery/presentation/widgets/text_input_field/text_input_field_suggestion_widget.dart index 6bc627054..1766aee4a 100644 --- a/lib/features/email_recovery/presentation/widgets/text_input_field/text_input_field_suggestion_widget.dart +++ b/lib/features/email_recovery/presentation/widgets/text_input_field/text_input_field_suggestion_widget.dart @@ -174,7 +174,7 @@ class _TextInputFieldSuggestionWidgetState extends State(6), - thumbVisibility: MaterialStateProperty.all(true), + thickness: WidgetStateProperty.all(6), + thumbVisibility: WidgetStateProperty.all(true), ), ), iconStyleData: IconStyleData( diff --git a/lib/features/mailbox/presentation/widgets/mailbox_bottom_sheet_action_tile_builder.dart b/lib/features/mailbox/presentation/widgets/mailbox_bottom_sheet_action_tile_builder.dart index b87b940a7..d730f32ed 100644 --- a/lib/features/mailbox/presentation/widgets/mailbox_bottom_sheet_action_tile_builder.dart +++ b/lib/features/mailbox/presentation/widgets/mailbox_bottom_sheet_action_tile_builder.dart @@ -41,7 +41,7 @@ class MailboxBottomSheetActionTileBuilder extends CupertinoActionSheetActionBuil child: Container( color: bgColor ?? Colors.white, child: MouseRegion( - cursor: PlatformInfo.isWeb ? MaterialStateMouseCursor.clickable : MouseCursor.defer, + cursor: PlatformInfo.isWeb ? WidgetStateMouseCursor.clickable : MouseCursor.defer, child: CupertinoActionSheetAction( key: key, child: Row(mainAxisAlignment: MainAxisAlignment.center, children: [ diff --git a/lib/features/mailbox/presentation/widgets/mailbox_item_widget.dart b/lib/features/mailbox/presentation/widgets/mailbox_item_widget.dart index 29613ed88..dba008eb3 100644 --- a/lib/features/mailbox/presentation/widgets/mailbox_item_widget.dart +++ b/lib/features/mailbox/presentation/widgets/mailbox_item_widget.dart @@ -103,7 +103,7 @@ class _MailboxItemWidgetState extends State { ), ); }, - onAccept: (emails) => widget.onDragItemAccepted?.call(emails, widget.mailboxNode.item), + onAcceptWithDetails: (emails) => widget.onDragItemAccepted?.call(emails.data, widget.mailboxNode.item), ); } else { if (widget.mailboxDisplayed == MailboxDisplayed.mailbox) { diff --git a/lib/features/mailbox_dashboard/presentation/widgets/advanced_search/advanced_search_filter_form_bottom_view.dart b/lib/features/mailbox_dashboard/presentation/widgets/advanced_search/advanced_search_filter_form_bottom_view.dart index ed2ec0262..954384911 100644 --- a/lib/features/mailbox_dashboard/presentation/widgets/advanced_search/advanced_search_filter_form_bottom_view.dart +++ b/lib/features/mailbox_dashboard/presentation/widgets/advanced_search/advanced_search_filter_form_bottom_view.dart @@ -114,10 +114,10 @@ class AdvancedSearchFilterFormBottomView extends GetWidget RawKeyboardListener( + () => KeyboardListener( focusNode: FocusNode(), - onKey: (event) { - if (event is RawKeyDownEvent && + onKeyEvent: (event) { + if (event is KeyDownEvent && event.logicalKey == LogicalKeyboardKey.tab) { nextFocusNode?.requestFocus(); } @@ -145,10 +145,10 @@ class AdvancedSearchFilterFormBottomView extends GetWidget FocusNode? currentFocusNode, FocusNode? nextFocusNode, }) { - return RawKeyboardListener( + return KeyboardListener( focusNode: currentFocusNode ?? FocusNode(), - onKey: (event) { - if (event is RawKeyDownEvent && + onKeyEvent: (event) { + if (event is KeyDownEvent && event.logicalKey == LogicalKeyboardKey.tab) { nextFocusNode?.requestFocus(); } diff --git a/lib/features/mailbox_dashboard/presentation/widgets/advanced_search/date_drop_down_button.dart b/lib/features/mailbox_dashboard/presentation/widgets/advanced_search/date_drop_down_button.dart index 1bf245193..e786dde2b 100644 --- a/lib/features/mailbox_dashboard/presentation/widgets/advanced_search/date_drop_down_button.dart +++ b/lib/features/mailbox_dashboard/presentation/widgets/advanced_search/date_drop_down_button.dart @@ -84,8 +84,8 @@ class DateDropDownButton extends StatelessWidget { offset: const Offset(0.0, -8.0), scrollbarTheme: ScrollbarThemeData( radius: const Radius.circular(40), - thickness: MaterialStateProperty.all(6), - thumbVisibility: MaterialStateProperty.all(true), + thickness: WidgetStateProperty.all(6), + thumbVisibility: WidgetStateProperty.all(true), ), ), iconStyleData: IconStyleData( diff --git a/lib/features/mailbox_dashboard/presentation/widgets/advanced_search/sort_by_drop_down_button.dart b/lib/features/mailbox_dashboard/presentation/widgets/advanced_search/sort_by_drop_down_button.dart index 20f094e05..ef591f99f 100644 --- a/lib/features/mailbox_dashboard/presentation/widgets/advanced_search/sort_by_drop_down_button.dart +++ b/lib/features/mailbox_dashboard/presentation/widgets/advanced_search/sort_by_drop_down_button.dart @@ -106,8 +106,8 @@ class SortByDropDownButton extends StatelessWidget { offset: SortByDropdownStyle.dropdownOffset, scrollbarTheme: ScrollbarThemeData( radius: SortByDropdownStyle.dropdownScrollbarRadius, - thickness: MaterialStateProperty.all(SortByDropdownStyle.scrollbarThickness), - thumbVisibility: MaterialStateProperty.all(true), + thickness: WidgetStateProperty.all(SortByDropdownStyle.scrollbarThickness), + thumbVisibility: WidgetStateProperty.all(true), ) ), iconStyleData: IconStyleData( diff --git a/lib/features/mailbox_dashboard/presentation/widgets/advanced_search/text_field_autocomplete_email_address_web.dart b/lib/features/mailbox_dashboard/presentation/widgets/advanced_search/text_field_autocomplete_email_address_web.dart index a063f309d..f6741643b 100644 --- a/lib/features/mailbox_dashboard/presentation/widgets/advanced_search/text_field_autocomplete_email_address_web.dart +++ b/lib/features/mailbox_dashboard/presentation/widgets/advanced_search/text_field_autocomplete_email_address_web.dart @@ -178,7 +178,7 @@ class _TextFieldAutocompleteEmailAddressWebState extends State onResumed() => _getNotificationSetting(); + + @override + void onHidden() {} } \ No newline at end of file diff --git a/lib/features/manage_account/presentation/profiles/identities/widgets/identities_radio_list_builder.dart b/lib/features/manage_account/presentation/profiles/identities/widgets/identities_radio_list_builder.dart index 7801b6a5b..88eea6986 100644 --- a/lib/features/manage_account/presentation/profiles/identities/widgets/identities_radio_list_builder.dart +++ b/lib/features/manage_account/presentation/profiles/identities/widgets/identities_radio_list_builder.dart @@ -93,7 +93,6 @@ class IdentitiesRadioListBuilder extends StatelessWidget { child: Obx(() => FadingEdgeScrollView.fromScrollView( gradientFractionOnStart: 0.3, gradientFractionOnEnd: 0.3, - shouldDisposeScrollController: true, child: ListView.builder( controller: ScrollController(), padding: const EdgeInsets.only(right: 12.0), diff --git a/lib/features/rules_filter_creator/presentation/widgets/rule_action_bottom_sheet_action_tile_builder.dart b/lib/features/rules_filter_creator/presentation/widgets/rule_action_bottom_sheet_action_tile_builder.dart index 2c6c6b25e..6ce0e2f7b 100644 --- a/lib/features/rules_filter_creator/presentation/widgets/rule_action_bottom_sheet_action_tile_builder.dart +++ b/lib/features/rules_filter_creator/presentation/widgets/rule_action_bottom_sheet_action_tile_builder.dart @@ -34,7 +34,7 @@ class RuleActionSheetActionTileBuilder color: bgColor ?? Colors.white, child: MouseRegion( cursor: PlatformInfo.isWeb - ? MaterialStateMouseCursor.clickable + ? WidgetStateMouseCursor.clickable : MouseCursor.defer, child: CupertinoActionSheetAction( key: key, diff --git a/lib/features/rules_filter_creator/presentation/widgets/rule_condition_combiner_bottomsheet_action_tile_builder.dart b/lib/features/rules_filter_creator/presentation/widgets/rule_condition_combiner_bottomsheet_action_tile_builder.dart index 74b1755db..9091bb76b 100644 --- a/lib/features/rules_filter_creator/presentation/widgets/rule_condition_combiner_bottomsheet_action_tile_builder.dart +++ b/lib/features/rules_filter_creator/presentation/widgets/rule_condition_combiner_bottomsheet_action_tile_builder.dart @@ -1,6 +1,5 @@ import 'package:core/core.dart'; import 'package:flutter/cupertino.dart'; -import 'package:flutter/material.dart'; import 'package:flutter_svg/svg.dart'; import 'package:rule_filter/rule_filter/rule_condition_group.dart'; import 'package:tmail_ui_user/features/rules_filter_creator/presentation/styles/rule_condition_combiner_bottom_sheet_styles.dart'; @@ -34,7 +33,7 @@ class RuleConditionCombinerSheetActionTileBuilder color: bgColor ?? RuleConditionCombinerBottomSheetStyles.defaultBgColor, child: MouseRegion( cursor: PlatformInfo.isWeb - ? MaterialStateMouseCursor.clickable + ? WidgetStateMouseCursor.clickable : MouseCursor.defer, child: CupertinoActionSheetAction( key: key, diff --git a/lib/features/rules_filter_creator/presentation/widgets/rule_condition_comparator_bottom_sheet_action_tile_builder.dart b/lib/features/rules_filter_creator/presentation/widgets/rule_condition_comparator_bottom_sheet_action_tile_builder.dart index c334c9b26..a470d8155 100644 --- a/lib/features/rules_filter_creator/presentation/widgets/rule_condition_comparator_bottom_sheet_action_tile_builder.dart +++ b/lib/features/rules_filter_creator/presentation/widgets/rule_condition_comparator_bottom_sheet_action_tile_builder.dart @@ -34,7 +34,7 @@ class RuleConditionComparatorSheetActionTileBuilder color: bgColor ?? Colors.white, child: MouseRegion( cursor: PlatformInfo.isWeb - ? MaterialStateMouseCursor.clickable + ? WidgetStateMouseCursor.clickable : MouseCursor.defer, child: CupertinoActionSheetAction( key: key, diff --git a/lib/features/rules_filter_creator/presentation/widgets/rule_condition_field_bottom_sheet_action_tile_builder.dart b/lib/features/rules_filter_creator/presentation/widgets/rule_condition_field_bottom_sheet_action_tile_builder.dart index 4136e3d36..b9ce916a3 100644 --- a/lib/features/rules_filter_creator/presentation/widgets/rule_condition_field_bottom_sheet_action_tile_builder.dart +++ b/lib/features/rules_filter_creator/presentation/widgets/rule_condition_field_bottom_sheet_action_tile_builder.dart @@ -34,7 +34,7 @@ class RuleConditionFieldSheetActionTileBuilder color: bgColor ?? Colors.white, child: MouseRegion( cursor: PlatformInfo.isWeb - ? MaterialStateMouseCursor.clickable + ? WidgetStateMouseCursor.clickable : MouseCursor.defer, child: CupertinoActionSheetAction( key: key, diff --git a/lib/features/search/email/presentation/widgets/email_receive_time_cupertino_action_sheet_action_builder.dart b/lib/features/search/email/presentation/widgets/email_receive_time_cupertino_action_sheet_action_builder.dart index 655bd363d..f9851dfc0 100644 --- a/lib/features/search/email/presentation/widgets/email_receive_time_cupertino_action_sheet_action_builder.dart +++ b/lib/features/search/email/presentation/widgets/email_receive_time_cupertino_action_sheet_action_builder.dart @@ -32,7 +32,7 @@ class EmailReceiveTimeCupertinoActionSheetActionBuilder return Container( color: bgColor ?? Colors.white, child: MouseRegion( - cursor: PlatformInfo.isWeb ? MaterialStateMouseCursor.clickable : MouseCursor.defer, + cursor: PlatformInfo.isWeb ? WidgetStateMouseCursor.clickable : MouseCursor.defer, child: CupertinoActionSheetAction( key: key, child: Row(mainAxisAlignment: MainAxisAlignment.center, children: [ diff --git a/lib/features/search/email/presentation/widgets/email_sort_by_cupertino_action_sheet_action_builder.dart b/lib/features/search/email/presentation/widgets/email_sort_by_cupertino_action_sheet_action_builder.dart index 50b2d7f85..42eb2fed7 100644 --- a/lib/features/search/email/presentation/widgets/email_sort_by_cupertino_action_sheet_action_builder.dart +++ b/lib/features/search/email/presentation/widgets/email_sort_by_cupertino_action_sheet_action_builder.dart @@ -1,7 +1,6 @@ import 'package:core/presentation/views/bottom_popup/cupertino_action_sheet_no_icon_builder.dart'; import 'package:core/utils/platform_info.dart'; import 'package:flutter/cupertino.dart'; -import 'package:flutter/material.dart'; import 'package:flutter_svg/flutter_svg.dart'; import 'package:tmail_ui_user/features/mailbox_dashboard/presentation/model/search/email_sort_order_type.dart'; import 'package:tmail_ui_user/features/search/email/presentation/styles/email_sort_by_cupertino_action_sheet_action_builder_style.dart'; @@ -32,7 +31,7 @@ class EmailSortByCupertinoActionSheetActionBuilder extends CupertinoActionSheetN return Container( color: bgColor ?? EmailSortByCupertinoActionSheetActionBuilderStyle.backgroundColor, child: MouseRegion( - cursor: PlatformInfo.isWeb ? MaterialStateMouseCursor.clickable : MouseCursor.defer, + cursor: PlatformInfo.isWeb ? WidgetStateMouseCursor.clickable : MouseCursor.defer, child: CupertinoActionSheetAction( key: key, child: Row( diff --git a/lib/features/search/mailbox/presentation/widgets/mailbox_searched_item_builder.dart b/lib/features/search/mailbox/presentation/widgets/mailbox_searched_item_builder.dart index 4b36dbcf6..b6bef1462 100644 --- a/lib/features/search/mailbox/presentation/widgets/mailbox_searched_item_builder.dart +++ b/lib/features/search/mailbox/presentation/widgets/mailbox_searched_item_builder.dart @@ -54,8 +54,8 @@ class _MailboxSearchedItemBuilderState extends State if (PlatformInfo.isWeb) { return DragTarget>( builder: (_, __, ___) => _buildMailboxItem(context), - onAccept: (emails) { - widget.onDragEmailToMailboxAccepted?.call(emails, widget._presentationMailbox); + onAcceptWithDetails: (emails) { + widget.onDragEmailToMailboxAccepted?.call(emails.data, widget._presentationMailbox); } ); } else { diff --git a/lib/features/thread/presentation/thread_controller.dart b/lib/features/thread/presentation/thread_controller.dart index a5861163e..9c02a2af4 100644 --- a/lib/features/thread/presentation/thread_controller.dart +++ b/lib/features/thread/presentation/thread_controller.dart @@ -1064,13 +1064,13 @@ class ThreadController extends BaseController with EmailActionController { } } - KeyEventResult handleKeyEvent(FocusNode node, RawKeyEvent event) { + KeyEventResult handleKeyEvent(FocusNode node, KeyEvent event) { final shiftEvent = event.logicalKey == LogicalKeyboardKey.shiftLeft || event.logicalKey == LogicalKeyboardKey.shiftRight; - if (event is RawKeyDownEvent && shiftEvent) { + if (event is KeyDownEvent && shiftEvent) { _rangeSelectionMode = true; } - if (event is RawKeyUpEvent && shiftEvent) { + if (event is KeyUpEvent && shiftEvent) { _rangeSelectionMode = false; } return shiftEvent diff --git a/lib/features/thread/presentation/thread_view.dart b/lib/features/thread/presentation/thread_view.dart index 3d03d3453..5de518f76 100644 --- a/lib/features/thread/presentation/thread_view.dart +++ b/lib/features/thread/presentation/thread_view.dart @@ -379,7 +379,7 @@ class ThreadView extends GetWidget : Focus( focusNode: controller.focusNodeKeyBoard, autofocus: true, - onKey: controller.handleKeyEvent, + onKeyEvent: controller.handleKeyEvent, child: ListView.separated( key: const PageStorageKey('list_presentation_email_in_threads'), controller: controller.listEmailController, diff --git a/lib/features/thread/presentation/widgets/app_action_sheet_action_builder.dart b/lib/features/thread/presentation/widgets/app_action_sheet_action_builder.dart index 543ccf566..ee2f8bbf5 100644 --- a/lib/features/thread/presentation/widgets/app_action_sheet_action_builder.dart +++ b/lib/features/thread/presentation/widgets/app_action_sheet_action_builder.dart @@ -24,7 +24,7 @@ class AppActionSheetActionBuilder extends CupertinoActionSheetActionBuilder { return Container( color: bgColor ?? Colors.white, child: MouseRegion( - cursor: PlatformInfo.isWeb ? MaterialStateMouseCursor.clickable : MouseCursor.defer, + cursor: PlatformInfo.isWeb ? WidgetStateMouseCursor.clickable : MouseCursor.defer, child: CupertinoActionSheetAction( key: key, child: Row(mainAxisAlignment: MainAxisAlignment.center, children: [ diff --git a/lib/features/thread/presentation/widgets/filter_message_cupertino_action_sheet_action_builder.dart b/lib/features/thread/presentation/widgets/filter_message_cupertino_action_sheet_action_builder.dart index 229663f87..50148ee6f 100644 --- a/lib/features/thread/presentation/widgets/filter_message_cupertino_action_sheet_action_builder.dart +++ b/lib/features/thread/presentation/widgets/filter_message_cupertino_action_sheet_action_builder.dart @@ -34,7 +34,7 @@ class FilterMessageCupertinoActionSheetActionBuilder return Container( color: bgColor ?? Colors.white, child: MouseRegion( - cursor: PlatformInfo.isWeb ? MaterialStateMouseCursor.clickable : MouseCursor.defer, + cursor: PlatformInfo.isWeb ? WidgetStateMouseCursor.clickable : MouseCursor.defer, child: CupertinoActionSheetAction( key: key, child: Row(mainAxisAlignment: MainAxisAlignment.center, children: [ diff --git a/model/pubspec.lock b/model/pubspec.lock index b67202f35..428bc03ba 100644 --- a/model/pubspec.lock +++ b/model/pubspec.lock @@ -523,10 +523,10 @@ packages: dependency: transitive description: name: get - sha256: "2ba20a47c8f1f233bed775ba2dd0d3ac97b4cf32fc17731b3dfc672b06b0e92a" + sha256: e4e7335ede17452b391ed3b2ede016545706c01a02292a6c97619705e7d2a85e url: "https://pub.dev" source: hosted - version: "4.6.5" + version: "4.6.6" glob: dependency: transitive description: @@ -587,10 +587,10 @@ packages: dependency: "direct main" description: name: intl - sha256: "3bc132a9dbce73a7e4a21a17d06e1878839ffbf975568bc875c60537824b0c4d" + sha256: d6f56758b7d3014a48af9701c085700aac781a92a87a62b1333b46d8879661cf url: "https://pub.dev" source: hosted - version: "0.18.1" + version: "0.19.0" io: dependency: transitive description: @@ -632,6 +632,30 @@ packages: url: "https://pub.dev" source: hosted version: "6.6.1" + leak_tracker: + dependency: transitive + description: + name: leak_tracker + sha256: "7f0df31977cb2c0b88585095d168e689669a2cc9b97c309665e3386f3e9d341a" + url: "https://pub.dev" + source: hosted + version: "10.0.4" + leak_tracker_flutter_testing: + dependency: transitive + description: + name: leak_tracker_flutter_testing + sha256: "06e98f569d004c1315b991ded39924b21af84cf14cc94791b8aea337d25b57f8" + url: "https://pub.dev" + source: hosted + version: "3.0.3" + leak_tracker_testing: + dependency: transitive + description: + name: leak_tracker_testing + sha256: "6ba465d5d76e67ddf503e1161d1f4a6bc42306f9d66ca1e8f079a47290fb06d3" + url: "https://pub.dev" + source: hosted + version: "3.0.1" linkify: dependency: transitive description: @@ -660,26 +684,26 @@ packages: dependency: transitive description: name: matcher - sha256: "1803e76e6653768d64ed8ff2e1e67bea3ad4b923eb5c56a295c3e634bad5960e" + sha256: d2323aa2060500f906aa31a895b4030b6da3ebdcc5619d14ce1aada65cd161cb url: "https://pub.dev" source: hosted - version: "0.12.16" + version: "0.12.16+1" material_color_utilities: dependency: transitive description: name: material_color_utilities - sha256: "9528f2f296073ff54cb9fee677df673ace1218163c3bc7628093e7eed5203d41" + sha256: "0e0a020085b65b6083975e499759762399b4475f766c21668c4ecca34ea74e5a" url: "https://pub.dev" source: hosted - version: "0.5.0" + version: "0.8.0" meta: dependency: transitive description: name: meta - sha256: a6e590c838b18133bb482a2745ad77c5bb7715fb0451209e1a7567d416678b8e + sha256: "7687075e408b093f36e6bbf6c91878cc0d4cd10f409506f7bc996f68220b9136" url: "https://pub.dev" source: hosted - version: "1.10.0" + version: "1.12.0" mime: dependency: "direct main" description: @@ -716,10 +740,10 @@ packages: dependency: transitive description: name: path - sha256: "8829d8a55c13fc0e37127c29fedf290c102f4e40ae94ada574091fe0ff96c917" + sha256: "087ce49c3f0dc39180befefc60fdb4acd8f8620e5682fe2476afd0b3688bb4af" url: "https://pub.dev" source: hosted - version: "1.8.3" + version: "1.9.0" path_parsing: dependency: transitive description: @@ -788,10 +812,10 @@ packages: dependency: transitive description: name: pdf_widget_wrapper - sha256: e9d31fd7782ce28ae346b127ea7d1cd748d799bddee379f31191693610e23749 + sha256: c930860d987213a3d58c7ec3b7ecf8085c3897f773e8dc23da9cae60a5d6d0f5 url: "https://pub.dev" source: hosted - version: "1.0.1" + version: "1.0.4" petitparser: dependency: transitive description: @@ -985,10 +1009,10 @@ packages: dependency: transitive description: name: test_api - sha256: "5c2f730018264d276c20e4f1503fd1308dfbbae39ec8ee63c5236311ac06954b" + sha256: "9955ae474176f7ac8ee4e989dadfb411a58c30415bcfb648fa04b2b8a03afa7f" url: "https://pub.dev" source: hosted - version: "0.6.1" + version: "0.7.0" timing: dependency: transitive description: @@ -1125,6 +1149,14 @@ packages: url: "https://pub.dev" source: hosted version: "2.1.4" + vm_service: + dependency: transitive + description: + name: vm_service + sha256: "3923c89304b715fb1eb6423f017651664a03bf5f4b29983627c4da791f74a4ec" + url: "https://pub.dev" + source: hosted + version: "14.2.1" watcher: dependency: transitive description: @@ -1182,5 +1214,5 @@ packages: source: hosted version: "3.1.2" sdks: - dart: ">=3.2.0 <4.0.0" - flutter: ">=3.16.0" + dart: ">=3.3.0 <4.0.0" + flutter: ">=3.20.0-7.0.pre.48" diff --git a/model/pubspec.yaml b/model/pubspec.yaml index b6d6e6f7e..19ec9737e 100644 --- a/model/pubspec.yaml +++ b/model/pubspec.yaml @@ -44,7 +44,7 @@ dependencies: quiver: 3.2.1 - intl: 0.18.1 + intl: 0.19.0 uri: 1.0.0 diff --git a/pubspec.lock b/pubspec.lock index ca33e9f0e..eebc18bf9 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -461,10 +461,10 @@ packages: dependency: "direct main" description: name: extended_text - sha256: "7096a1e9a029534257d70f7dafb2798f932d589079e67ef3f58fdf0805f2f627" + sha256: d6036da79bcfa85c268ab92fc2c610b3ff2f2e3ff416ad0c3513cbb130fb36b6 url: "https://pub.dev" source: hosted - version: "12.0.0" + version: "13.0.2" extended_text_library: dependency: transitive description: @@ -493,10 +493,10 @@ packages: dependency: "direct main" description: name: fading_edge_scrollview - sha256: c25c2231652ce774cc31824d0112f11f653881f43d7f5302c05af11942052031 + sha256: "1f84fe3ea8e251d00d5735e27502a6a250e4aa3d3b330d3fdcb475af741464ef" url: "https://pub.dev" source: hosted - version: "3.0.0" + version: "4.1.1" fake_async: dependency: transitive description: @@ -659,16 +659,16 @@ packages: dependency: transitive description: name: flutter_colorpicker - sha256: "458a6ed8ea480eb16ff892aedb4b7092b2804affd7e046591fb03127e8d8ef8b" + sha256: "969de5f6f9e2a570ac660fb7b501551451ea2a1ab9e2097e89475f60e07816ea" url: "https://pub.dev" source: hosted - version: "1.0.3" + version: "1.1.0" flutter_date_range_picker: dependency: "direct main" description: path: "." - ref: master - resolved-ref: f63af47b82b3087a6a7d28506ae4781b057b1d3a + ref: sprint_25_flutter_3_22_2 + resolved-ref: "8e1e6e0e18ef6e1baae719c42b1483237ba5c56b" url: "https://github.com/linagora/flutter-date-range-picker.git" source: git version: "1.0.2" @@ -969,10 +969,10 @@ packages: dependency: "direct main" description: name: flutter_slidable - sha256: cc4231579e3eae41ae166660df717f4bad1359c87f4a4322ad8ba1befeb3d2be + sha256: "673403d2eeef1f9e8483bd6d8d92aae73b1d8bd71f382bc3930f699c731bc27c" url: "https://pub.dev" source: hosted - version: "3.0.0" + version: "3.1.0" flutter_staggered_grid_view: dependency: "direct main" description: @@ -1058,10 +1058,10 @@ packages: dependency: "direct main" description: name: get - sha256: "2ba20a47c8f1f233bed775ba2dd0d3ac97b4cf32fc17731b3dfc672b06b0e92a" + sha256: e4e7335ede17452b391ed3b2ede016545706c01a02292a6c97619705e7d2a85e url: "https://pub.dev" source: hosted - version: "4.6.5" + version: "4.6.6" glob: dependency: transitive description: @@ -1106,8 +1106,8 @@ packages: dependency: "direct main" description: path: "." - ref: cnb_supported - resolved-ref: ddcfb76517161f63d63470526fe54bf74deac955 + ref: sprint_25_flutter_3_22_2 + resolved-ref: "76079012ae7c4b1193e6646aef8de5aa88f246b9" url: "https://github.com/linagora/html-editor-enhanced.git" source: git version: "2.5.1" @@ -1171,10 +1171,10 @@ packages: dependency: "direct main" description: name: intl - sha256: "3bc132a9dbce73a7e4a21a17d06e1878839ffbf975568bc875c60537824b0c4d" + sha256: d6f56758b7d3014a48af9701c085700aac781a92a87a62b1333b46d8879661cf url: "https://pub.dev" source: hosted - version: "0.18.1" + version: "0.19.0" intl_generator: dependency: "direct main" description: @@ -1224,6 +1224,30 @@ packages: url: "https://pub.dev" source: hosted version: "6.6.1" + leak_tracker: + dependency: transitive + description: + name: leak_tracker + sha256: "7f0df31977cb2c0b88585095d168e689669a2cc9b97c309665e3386f3e9d341a" + url: "https://pub.dev" + source: hosted + version: "10.0.4" + leak_tracker_flutter_testing: + dependency: transitive + description: + name: leak_tracker_flutter_testing + sha256: "06e98f569d004c1315b991ded39924b21af84cf14cc94791b8aea337d25b57f8" + url: "https://pub.dev" + source: hosted + version: "3.0.3" + leak_tracker_testing: + dependency: transitive + description: + name: leak_tracker_testing + sha256: "6ba465d5d76e67ddf503e1161d1f4a6bc42306f9d66ca1e8f079a47290fb06d3" + url: "https://pub.dev" + source: hosted + version: "3.0.1" linkify: dependency: transitive description: @@ -1252,26 +1276,26 @@ packages: dependency: transitive description: name: matcher - sha256: "1803e76e6653768d64ed8ff2e1e67bea3ad4b923eb5c56a295c3e634bad5960e" + sha256: d2323aa2060500f906aa31a895b4030b6da3ebdcc5619d14ce1aada65cd161cb url: "https://pub.dev" source: hosted - version: "0.12.16" + version: "0.12.16+1" material_color_utilities: dependency: transitive description: name: material_color_utilities - sha256: "9528f2f296073ff54cb9fee677df673ace1218163c3bc7628093e7eed5203d41" + sha256: "0e0a020085b65b6083975e499759762399b4475f766c21668c4ecca34ea74e5a" url: "https://pub.dev" source: hosted - version: "0.5.0" + version: "0.8.0" meta: dependency: transitive description: name: meta - sha256: a6e590c838b18133bb482a2745ad77c5bb7715fb0451209e1a7567d416678b8e + sha256: "7687075e408b093f36e6bbf6c91878cc0d4cd10f409506f7bc996f68220b9136" url: "https://pub.dev" source: hosted - version: "1.10.0" + version: "1.12.0" mime: dependency: "direct main" description: @@ -1284,10 +1308,10 @@ packages: dependency: "direct dev" description: name: mockito - sha256: "7d5b53bcd556c1bc7ffbe4e4d5a19c3e112b7e925e9e172dd7c6ad0630812616" + sha256: "6841eed20a7befac0ce07df8116c8b8233ed1f4486a7647c7fc5a02ae6163917" url: "https://pub.dev" source: hosted - version: "5.4.2" + version: "5.4.4" model: dependency: "direct main" description: @@ -1339,10 +1363,10 @@ packages: dependency: transitive description: name: path - sha256: "8829d8a55c13fc0e37127c29fedf290c102f4e40ae94ada574091fe0ff96c917" + sha256: "087ce49c3f0dc39180befefc60fdb4acd8f8620e5682fe2476afd0b3688bb4af" url: "https://pub.dev" source: hosted - version: "1.8.3" + version: "1.9.0" path_drawing: dependency: transitive description: @@ -1411,10 +1435,10 @@ packages: dependency: transitive description: name: pattern_formatter - sha256: "987d24df31179325897f58258132492e86de577c6ae50c8102b9a1342f607688" + sha256: e870e12352f4d5537b8822826a0b1e3912ba91c504d79450dcaed4db79c211d3 url: "https://pub.dev" source: hosted - version: "3.0.0" + version: "4.0.0" pdf: dependency: transitive description: @@ -1436,10 +1460,10 @@ packages: dependency: transitive description: name: pdf_widget_wrapper - sha256: e9d31fd7782ce28ae346b127ea7d1cd748d799bddee379f31191693610e23749 + sha256: c930860d987213a3d58c7ec3b7ecf8085c3897f773e8dc23da9cae60a5d6d0f5 url: "https://pub.dev" source: hosted - version: "1.0.1" + version: "1.0.4" percent_indicator: dependency: "direct main" description: @@ -1808,28 +1832,27 @@ packages: super_tag_editor: dependency: "direct main" description: - path: "." - ref: master - resolved-ref: "1954bb41a3a12899c426d17a7b1c9e561cccce06" - url: "https://github.com/dab246/super_tag_editor.git" - source: git - version: "0.2.0" + name: super_tag_editor + sha256: "8e6e978c546f665be421bfdf76db3e7f31aaf10a0cf7ff4f69b71d04124e16c6" + url: "https://pub.dev" + source: hosted + version: "0.3.0" syncfusion_flutter_core: dependency: transitive description: name: syncfusion_flutter_core - sha256: "6f3056c548f4e039a8994904836881753c4c7643cd2142d3c226fcb45ec200fe" + sha256: "87cbeee9b916e013eedbd43bf07f253c34dd5184c88325e5227434e0f8b89a68" url: "https://pub.dev" source: hosted - version: "23.1.44" + version: "26.1.40" syncfusion_flutter_datepicker: dependency: transitive description: name: syncfusion_flutter_datepicker - sha256: "38743cbf4e8438a4b3a0622f402a739f08749dc5cbb02945221d5bd9971efca6" + sha256: ebc10c86618a8c410f4707dc6ff354daccb13d5f8a65f5fffa69a07806e4e0dd url: "https://pub.dev" source: hosted - version: "23.1.44" + version: "26.1.40" term_glyph: dependency: transitive description: @@ -1842,10 +1865,10 @@ packages: dependency: transitive description: name: test_api - sha256: "5c2f730018264d276c20e4f1503fd1308dfbbae39ec8ee63c5236311ac06954b" + sha256: "9955ae474176f7ac8ee4e989dadfb411a58c30415bcfb648fa04b2b8a03afa7f" url: "https://pub.dev" source: hosted - version: "0.6.1" + version: "0.7.0" textfield_tags: dependency: "direct main" description: @@ -1858,10 +1881,10 @@ packages: dependency: "direct main" description: name: timeago - sha256: "4addcda362e51f23cf7ae2357fccd053f29d59b4ddd17fb07fc3e7febb47a456" + sha256: "054cedf68706bb142839ba0ae6b135f6b68039f0b8301cbe8784ae653d5ff8de" url: "https://pub.dev" source: hosted - version: "3.5.0" + version: "3.7.0" timezone: dependency: transitive description: @@ -2030,6 +2053,14 @@ packages: url: "https://pub.dev" source: hosted version: "0.3.3" + vm_service: + dependency: transitive + description: + name: vm_service + sha256: "3923c89304b715fb1eb6423f017651664a03bf5f4b29983627c4da791f74a4ec" + url: "https://pub.dev" + source: hosted + version: "14.2.1" watcher: dependency: transitive description: @@ -2042,10 +2073,10 @@ packages: dependency: transitive description: name: web - sha256: afe077240a270dcfd2aafe77602b4113645af95d0ad31128cc02bce5ac5d5152 + sha256: "4188706108906f002b3a293509234588823c8c979dc83304e229ff400c996b05" url: "https://pub.dev" source: hosted - version: "0.3.0" + version: "0.4.2" web_socket_channel: dependency: transitive description: @@ -2103,5 +2134,5 @@ packages: source: hosted version: "3.1.2" sdks: - dart: ">=3.2.0 <4.0.0" - flutter: ">=3.16.0" + dart: ">=3.3.0 <4.0.0" + flutter: ">=3.20.0-7.0.pre.48" diff --git a/pubspec.yaml b/pubspec.yaml index e4b03219e..5ebc8f6f8 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -60,7 +60,7 @@ dependencies: html_editor_enhanced: git: url: https://github.com/linagora/html-editor-enhanced.git - ref: cnb_supported + ref: sprint_25_flutter_3_22_2 # TODO: We will change it when the PR in upstream repository will be merged # https://github.com/linagora/jmap-dart-client/pull/87 @@ -87,12 +87,9 @@ dependencies: flutter_date_range_picker: git: url: https://github.com/linagora/flutter-date-range-picker.git - ref: master + ref: sprint_25_flutter_3_22_2 - super_tag_editor: - git: - url: https://github.com/dab246/super_tag_editor.git - ref: master + super_tag_editor: 0.3.0 # TODO: We will change it when the PR in upstream repository will be merged # https://github.com/dietfriends/dns_client/pull/9 @@ -112,7 +109,7 @@ dependencies: ### Dependencies from pub.dev ### cupertino_icons: 1.0.6 - get: 4.6.5 + get: 4.6.6 intl_generator: 0.4.1 @@ -166,7 +163,7 @@ dependencies: flutter_portal: 1.1.3 - timeago: 3.5.0 + timeago: 3.7.0 better_open_file: 3.6.4 @@ -194,7 +191,7 @@ dependencies: flutter_local_notifications: 16.2.0 - fading_edge_scrollview: 3.0.0 + fading_edge_scrollview: 4.1.1 focused_menu_custom: 1.2.0 @@ -206,7 +203,7 @@ dependencies: flutter_appauth_platform_interface: 6.0.0 - intl: 0.18.1 + intl: 0.19.0 external_app_launcher: 3.1.0 @@ -216,13 +213,13 @@ dependencies: flutter_keyboard_visibility: 6.0.0 - extended_text: 12.0.0 + extended_text: 13.0.2 date_format: 2.0.7 flutter_linkify: 6.0.0 - flutter_slidable: 3.0.0 + flutter_slidable: 3.1.0 url_strategy: 0.2.0 @@ -252,7 +249,7 @@ dev_dependencies: build_runner: 2.3.3 - mockito: 5.4.2 + mockito: 5.4.4 hive_generator: 2.0.0 diff --git a/rule_filter/pubspec.lock b/rule_filter/pubspec.lock index 413859155..a3355d3a0 100644 --- a/rule_filter/pubspec.lock +++ b/rule_filter/pubspec.lock @@ -324,6 +324,30 @@ packages: url: "https://pub.dev" source: hosted version: "6.6.1" + leak_tracker: + dependency: transitive + description: + name: leak_tracker + sha256: "7f0df31977cb2c0b88585095d168e689669a2cc9b97c309665e3386f3e9d341a" + url: "https://pub.dev" + source: hosted + version: "10.0.4" + leak_tracker_flutter_testing: + dependency: transitive + description: + name: leak_tracker_flutter_testing + sha256: "06e98f569d004c1315b991ded39924b21af84cf14cc94791b8aea337d25b57f8" + url: "https://pub.dev" + source: hosted + version: "3.0.3" + leak_tracker_testing: + dependency: transitive + description: + name: leak_tracker_testing + sha256: "6ba465d5d76e67ddf503e1161d1f4a6bc42306f9d66ca1e8f079a47290fb06d3" + url: "https://pub.dev" + source: hosted + version: "3.0.1" lints: dependency: transitive description: @@ -344,26 +368,26 @@ packages: dependency: transitive description: name: matcher - sha256: "1803e76e6653768d64ed8ff2e1e67bea3ad4b923eb5c56a295c3e634bad5960e" + sha256: d2323aa2060500f906aa31a895b4030b6da3ebdcc5619d14ce1aada65cd161cb url: "https://pub.dev" source: hosted - version: "0.12.16" + version: "0.12.16+1" material_color_utilities: dependency: transitive description: name: material_color_utilities - sha256: "9528f2f296073ff54cb9fee677df673ace1218163c3bc7628093e7eed5203d41" + sha256: "0e0a020085b65b6083975e499759762399b4475f766c21668c4ecca34ea74e5a" url: "https://pub.dev" source: hosted - version: "0.5.0" + version: "0.8.0" meta: dependency: transitive description: name: meta - sha256: a6e590c838b18133bb482a2745ad77c5bb7715fb0451209e1a7567d416678b8e + sha256: "7687075e408b093f36e6bbf6c91878cc0d4cd10f409506f7bc996f68220b9136" url: "https://pub.dev" source: hosted - version: "1.10.0" + version: "1.12.0" mime: dependency: transitive description: @@ -376,10 +400,10 @@ packages: dependency: "direct dev" description: name: mockito - sha256: "7d5b53bcd556c1bc7ffbe4e4d5a19c3e112b7e925e9e172dd7c6ad0630812616" + sha256: "6841eed20a7befac0ce07df8116c8b8233ed1f4486a7647c7fc5a02ae6163917" url: "https://pub.dev" source: hosted - version: "5.4.2" + version: "5.4.4" package_config: dependency: transitive description: @@ -392,10 +416,10 @@ packages: dependency: transitive description: name: path - sha256: "8829d8a55c13fc0e37127c29fedf290c102f4e40ae94ada574091fe0ff96c917" + sha256: "087ce49c3f0dc39180befefc60fdb4acd8f8620e5682fe2476afd0b3688bb4af" url: "https://pub.dev" source: hosted - version: "1.8.3" + version: "1.9.0" pool: dependency: transitive description: @@ -517,10 +541,10 @@ packages: dependency: transitive description: name: test_api - sha256: "5c2f730018264d276c20e4f1503fd1308dfbbae39ec8ee63c5236311ac06954b" + sha256: "9955ae474176f7ac8ee4e989dadfb411a58c30415bcfb648fa04b2b8a03afa7f" url: "https://pub.dev" source: hosted - version: "0.6.1" + version: "0.7.0" timing: dependency: transitive description: @@ -545,6 +569,14 @@ packages: url: "https://pub.dev" source: hosted version: "2.1.4" + vm_service: + dependency: transitive + description: + name: vm_service + sha256: "3923c89304b715fb1eb6423f017651664a03bf5f4b29983627c4da791f74a4ec" + url: "https://pub.dev" + source: hosted + version: "14.2.1" watcher: dependency: transitive description: @@ -553,14 +585,6 @@ packages: url: "https://pub.dev" source: hosted version: "1.1.0" - web: - dependency: transitive - description: - name: web - sha256: afe077240a270dcfd2aafe77602b4113645af95d0ad31128cc02bce5ac5d5152 - url: "https://pub.dev" - source: hosted - version: "0.3.0" web_socket_channel: dependency: transitive description: @@ -578,5 +602,5 @@ packages: source: hosted version: "3.1.2" sdks: - dart: ">=3.2.0-194.0.dev <4.0.0" - flutter: ">=3.0.0" + dart: ">=3.3.0 <4.0.0" + flutter: ">=3.18.0-18.0.pre.54" diff --git a/rule_filter/pubspec.yaml b/rule_filter/pubspec.yaml index 646b817e0..a06a32eae 100644 --- a/rule_filter/pubspec.yaml +++ b/rule_filter/pubspec.yaml @@ -38,7 +38,7 @@ dev_dependencies: json_serializable: 6.6.1 - mockito: 5.4.2 + mockito: 5.4.4 # For information on the generic Dart part of this file, see the # following page: https://dart.dev/tools/pub/pubspec diff --git a/server_settings/pubspec.yaml b/server_settings/pubspec.yaml index a27ca678c..b0ee4551a 100644 --- a/server_settings/pubspec.yaml +++ b/server_settings/pubspec.yaml @@ -35,7 +35,7 @@ dev_dependencies: json_serializable: 6.6.1 - mockito: 5.4.2 + mockito: 5.4.4 # For information on the generic Dart part of this file, see the # following page: https://dart.dev/tools/pub/pubspec