From 274e7e94f0128abb3c8ce2a6b3c0ad1135cbdebd Mon Sep 17 00:00:00 2001 From: MinhDV Date: Wed, 18 Oct 2023 11:49:41 +0700 Subject: [PATCH] feat: flutter 3.13.7 --- .github/workflows/build.yaml | 2 +- .github/workflows/gh-pages.yaml | 2 +- .github/workflows/release.yaml | 2 +- .github/workflows/tests.yaml | 2 +- .gitlab-ci.yml | 2 +- Dockerfile | 2 +- ios/Runner.xcodeproj/project.pbxproj | 2 +- .../xcshareddata/xcschemes/Runner.xcscheme | 2 +- lib/di/global/network_di.dart | 2 +- .../supported_preview_file_types.dart | 10 ++--- lib/pages/archive/archive_view.dart | 2 +- lib/pages/bootstrap/bootstrap_dialog.dart | 2 +- lib/pages/chat/add_widget_tile_view.dart | 2 +- lib/pages/chat/chat.dart | 2 +- lib/pages/chat/chat_input_row_mobile.dart | 2 +- lib/pages/chat/chat_view.dart | 2 +- lib/pages/chat/events/audio_player.dart | 2 +- lib/pages/chat/events/cute_events.dart | 2 +- lib/pages/chat/events/encrypted_mixin.dart | 2 +- lib/pages/chat/events/message/message.dart | 8 ++-- lib/pages/chat/events/message_content.dart | 2 +- lib/pages/chat/events/message_reactions.dart | 2 +- .../events/sending_image_info_widget.dart | 4 +- .../chat/events/sending_video_widget.dart | 2 +- .../events/verification_request_content.dart | 2 +- lib/pages/chat/group_chat_empty_view.dart | 2 +- lib/pages/chat/input_bar/input_bar.dart | 3 ++ .../chat/input_bar/input_bar_shortcut.dart | 2 +- .../chat/others_group_chat_empty_view.dart | 4 +- lib/pages/chat/reactions_picker.dart | 2 +- lib/pages/chat_details/chat_details.dart | 8 ++-- .../chat_details_page_view.dart | 2 +- .../links/chat_details_links_item.dart | 2 +- .../same_type_events_list_builder_view.dart | 2 +- lib/pages/chat_details/chat_details_view.dart | 2 +- lib/pages/chat_draft/draft_chat_view.dart | 8 ++-- lib/pages/chat_list/chat_list_header.dart | 2 +- lib/pages/chat_list/chat_list_item.dart | 2 +- lib/pages/chat_list/chat_list_item_title.dart | 2 +- lib/pages/chat_list/chat_list_view.dart | 2 +- .../chat_list/client_chooser_button.dart | 6 +-- lib/pages/chat_list/space_view.dart | 2 +- .../chat_permissions_settings_view.dart | 4 +- lib/pages/contacts_tab/contacts_appbar.dart | 2 +- .../device_settings/device_settings.dart | 2 +- lib/pages/dialer/dialer.dart | 6 +-- lib/pages/forward/recent_chat_list.dart | 2 +- .../key_verification_dialog.dart | 2 +- .../new_group/contacts_selection_view.dart | 2 +- lib/pages/new_group/new_group.dart | 2 +- .../widget/expansion_contact_list_tile.dart | 6 +-- .../widget/expansion_list.dart | 12 +++--- .../widget/no_contacts_found.dart | 4 +- lib/pages/search/recent_item_widget.dart | 2 +- .../search_contacts_and_chats_controller.dart | 2 +- lib/pages/search/search_view.dart | 4 +- .../settings_3pid/settings_3pid_view.dart | 2 +- .../settings_notifications.dart | 2 +- .../settings_notifications_view.dart | 2 +- .../settings_profile/settings_profile.dart | 2 +- .../settings_profile_view_web.dart | 2 +- .../settings_security/settings_security.dart | 4 +- .../extensions/send_file_extension.dart | 2 +- .../extensions/send_file_web_extension.dart | 6 +-- .../mixins/chat_list_item_mixin.dart | 2 +- .../mixins/media_picker_mixin.dart | 6 +-- .../mixins/paste_image_mixin.dart | 2 +- lib/utils/background_push.dart | 8 ++-- lib/utils/client_manager.dart | 2 +- lib/utils/custom_scroll_behaviour.dart | 2 +- lib/utils/dialog/twake_loading_dialog.dart | 2 +- .../filtered_timeline_extension.dart | 2 +- lib/utils/permission_dialog.dart | 2 +- lib/utils/uia_request_manager.dart | 2 +- lib/widgets/app_bars/searchable_app_bar.dart | 8 ++-- lib/widgets/chat_settings_popup_menu.dart | 4 +- lib/widgets/clean_rich_text.dart | 2 +- .../adaptive_scaffold_appbar.dart | 2 +- ...tive_scaffold_primary_navigation_view.dart | 2 +- .../adaptive_scaffold_route.dart | 4 +- .../adaptive_scaffold_view.dart | 4 +- lib/widgets/matrix.dart | 6 +-- lib/widgets/permission_slider_dialog.dart | 2 +- lib/widgets/swipeable.dart | 2 +- .../twake_preview_link/twake_link_view.dart | 2 +- .../twake_smart_refresher.dart | 2 +- lib/widgets/video_viewer_desktop_theme.dart | 2 +- lib/widgets/video_viewer_mobile_theme.dart | 2 +- pubspec.lock | 42 +++++++++++-------- pubspec.yaml | 4 +- .../home_summary_extensions_test.dart | 6 +-- .../model/discovery_information_test.dart | 20 ++++----- test/utils/test_client.dart | 2 +- 93 files changed, 176 insertions(+), 165 deletions(-) diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index 55b096a41b..2f8c140e40 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -6,7 +6,7 @@ on: name: Build env: - FLUTTER_VERSION: 3.10.6 + FLUTTER_VERSION: 3.13.7 jobs: build_debug_mobile: diff --git a/.github/workflows/gh-pages.yaml b/.github/workflows/gh-pages.yaml index c49ade49c7..443c460db3 100644 --- a/.github/workflows/gh-pages.yaml +++ b/.github/workflows/gh-pages.yaml @@ -2,7 +2,7 @@ on: pull_request: env: - FLUTTER_VERSION: 3.10.6 + FLUTTER_VERSION: 3.13.7 LIBOLM_VERSION: 3.2.15 name: Deploying on GitHub Pages diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml index 4c9a2d845e..67839d8b34 100644 --- a/.github/workflows/release.yaml +++ b/.github/workflows/release.yaml @@ -4,7 +4,7 @@ on: - "v*.*.*" env: - FLUTTER_VERSION: 3.10.6 + FLUTTER_VERSION: 3.13.7 name: Release app diff --git a/.github/workflows/tests.yaml b/.github/workflows/tests.yaml index 8b4b346f74..8ff94317ed 100644 --- a/.github/workflows/tests.yaml +++ b/.github/workflows/tests.yaml @@ -4,7 +4,7 @@ on: name: Tests env: - FLUTTER_VERSION: 3.10.6 + FLUTTER_VERSION: 3.13.7 jobs: code_analyze: diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index d3b7059fb0..6e14c706df 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,5 +1,5 @@ variables: - FLUTTER_VERSION: 3.10.6 + FLUTTER_VERSION: 3.13.7 image: name: cirrusci/flutter:${FLUTTER_VERSION} diff --git a/Dockerfile b/Dockerfile index bdda6a545f..b977274bd6 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,5 +1,5 @@ # Specify versions -ARG FLUTTER_VERSION=3.10.6 +ARG FLUTTER_VERSION=3.13.7 ARG OLM_VERSION=3.2.15 # Building libolm diff --git a/ios/Runner.xcodeproj/project.pbxproj b/ios/Runner.xcodeproj/project.pbxproj index 3aaf38515f..754fc328c9 100644 --- a/ios/Runner.xcodeproj/project.pbxproj +++ b/ios/Runner.xcodeproj/project.pbxproj @@ -315,7 +315,7 @@ isa = PBXProject; attributes = { LastSwiftUpdateCheck = 1240; - LastUpgradeCheck = 1300; + LastUpgradeCheck = 1430; ORGANIZATIONNAME = ""; TargetAttributes = { 97C146ED1CF9000F007C117D = { diff --git a/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme b/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme index 3db53b6e1f..b52b2e698b 100644 --- a/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme +++ b/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme @@ -1,6 +1,6 @@ ( diff --git a/lib/domain/model/preview_file/supported_preview_file_types.dart b/lib/domain/model/preview_file/supported_preview_file_types.dart index 18d280c924..754d560b7b 100644 --- a/lib/domain/model/preview_file/supported_preview_file_types.dart +++ b/lib/domain/model/preview_file/supported_preview_file_types.dart @@ -24,7 +24,7 @@ class SupportedPreviewFileTypes { 'application/vnd.oasis.opendocument.text-master', 'application/msword', 'application/vnd.ms-works', - 'docx' + 'docx', ]; static const pdfMimeTypes = ['application/pdf', 'application/rtf']; @@ -35,14 +35,14 @@ class SupportedPreviewFileTypes { 'application/vnd.oasis.opendocument.spreadsheet-template', 'application/vnd.oasis.opendocument.chart', 'application/vnd.oasis.opendocument.formula', - 'application/vnd.ms-excel' + 'application/vnd.ms-excel', ]; static const pptMimeTypes = [ 'application/vnd.openxmlformats-officedocument.presentationml.presentation', 'application/vnd.oasis.opendocument.presentation', 'application/vnd.oasis.opendocument.presentation-template', - 'application/vnd.ms-powerpoint' + 'application/vnd.ms-powerpoint', ]; static const zipMimeTypes = [ @@ -52,7 +52,7 @@ class SupportedPreviewFileTypes { 'application/x-compressed', 'application/x-zip-compressed', 'application/java-archive', - 'application/zip' + 'application/zip', ]; static const iOSSupportedTypes = { @@ -142,7 +142,7 @@ class SupportedPreviewFileTypes { 'docm', 'dot', 'dotx', - 'dotm' + 'dotm', ]; static const pdfFileTypes = ['pdf']; diff --git a/lib/pages/archive/archive_view.dart b/lib/pages/archive/archive_view.dart index 89a2ffc11f..05758424b9 100644 --- a/lib/pages/archive/archive_view.dart +++ b/lib/pages/archive/archive_view.dart @@ -33,7 +33,7 @@ class ArchiveView extends StatelessWidget { label: Text(L10n.of(context)!.clearArchive), icon: const Icon(Icons.cleaning_services_outlined), ), - ) + ), ], ), body: Builder( diff --git a/lib/pages/bootstrap/bootstrap_dialog.dart b/lib/pages/bootstrap/bootstrap_dialog.dart index d5b8772d83..311df54fb6 100644 --- a/lib/pages/bootstrap/bootstrap_dialog.dart +++ b/lib/pages/bootstrap/bootstrap_dialog.dart @@ -387,7 +387,7 @@ class BootstrapDialogState extends State { ); } }, - ) + ), ], ), ), diff --git a/lib/pages/chat/add_widget_tile_view.dart b/lib/pages/chat/add_widget_tile_view.dart index 23118e72c5..7ce441e84a 100644 --- a/lib/pages/chat/add_widget_tile_view.dart +++ b/lib/pages/chat/add_widget_tile_view.dart @@ -67,7 +67,7 @@ class AddWidgetTileView extends StatelessWidget { child: Text(L10n.of(context)!.addWidget), ), ], - ) + ), ], ); } diff --git a/lib/pages/chat/chat.dart b/lib/pages/chat/chat.dart index 35ac70ba0b..5e7d478878 100644 --- a/lib/pages/chat/chat.dart +++ b/lib/pages/chat/chat.dart @@ -653,7 +653,7 @@ class ChatController extends State MatrixVideoFile( bytes: bytes, name: file.path, - ) + ), ], room: room!, ), diff --git a/lib/pages/chat/chat_input_row_mobile.dart b/lib/pages/chat/chat_input_row_mobile.dart index 40d3166f26..61c491b8c9 100644 --- a/lib/pages/chat/chat_input_row_mobile.dart +++ b/lib/pages/chat/chat_input_row_mobile.dart @@ -47,7 +47,7 @@ class ChatInputRowMobile extends StatelessWidget { KeyBoardShortcuts( keysToPress: { LogicalKeyboardKey.altLeft, - LogicalKeyboardKey.keyE + LogicalKeyboardKey.keyE, }, onKeysPressed: onEmojiAction, helpLabel: L10n.of(context)!.emojis, diff --git a/lib/pages/chat/chat_view.dart b/lib/pages/chat/chat_view.dart index 0ef3a694a0..d1fc88f25d 100644 --- a/lib/pages/chat/chat_view.dart +++ b/lib/pages/chat/chat_view.dart @@ -446,7 +446,7 @@ class _SearchMenuItem extends StatelessWidget { ), ], ), - ) + ), ], onSelected: (item) { switch (item) { diff --git a/lib/pages/chat/events/audio_player.dart b/lib/pages/chat/events/audio_player.dart index cf40452b77..26893069d0 100644 --- a/lib/pages/chat/events/audio_player.dart +++ b/lib/pages/chat/events/audio_player.dart @@ -251,7 +251,7 @@ class AudioPlayerState extends State { ), ), ), - ) + ), ], ), ), diff --git a/lib/pages/chat/events/cute_events.dart b/lib/pages/chat/events/cute_events.dart index 9563e0ec42..d296c1befa 100644 --- a/lib/pages/chat/events/cute_events.dart +++ b/lib/pages/chat/events/cute_events.dart @@ -46,7 +46,7 @@ class _CuteContentState extends State { widget.event.text, style: const TextStyle(fontSize: 150), ), - if (label != null) Text(label) + if (label != null) Text(label), ], ), ), diff --git a/lib/pages/chat/events/encrypted_mixin.dart b/lib/pages/chat/events/encrypted_mixin.dart index 23eb1cada9..6f5d0333b1 100644 --- a/lib/pages/chat/events/encrypted_mixin.dart +++ b/lib/pages/chat/events/encrypted_mixin.dart @@ -65,7 +65,7 @@ mixin EncryptedMixin { event.calcLocalizedBodyFallback( MatrixLocals(l10n), ), - ) + ), ], ), ), diff --git a/lib/pages/chat/events/message/message.dart b/lib/pages/chat/events/message/message.dart index a674954f96..eca8fa2992 100644 --- a/lib/pages/chat/events/message/message.dart +++ b/lib/pages/chat/events/message/message.dart @@ -79,7 +79,7 @@ class Message extends StatelessWidget { EventTypes.Message, EventTypes.Sticker, EventTypes.Encrypted, - EventTypes.CallInvite + EventTypes.CallInvite, }.contains(event.type)) { if (event.type.startsWith('m.call.')) { return Container(); @@ -288,7 +288,7 @@ class Message extends StatelessWidget { 'msgtype': 'm.text', 'body': - '...' + '...', }, senderId: event.senderId, @@ -485,7 +485,7 @@ class Message extends StatelessWidget { timeline, RelationshipTypes.reaction, )) - const SizedBox(height: 24) + const SizedBox(height: 24), ], ), if (event.hasAggregatedEvents( @@ -747,7 +747,7 @@ class ReplyIconWidget extends StatelessWidget { if (!isOwnMessage) const SizedBox( width: 12.0, - ) + ), ], ), ); diff --git a/lib/pages/chat/events/message_content.dart b/lib/pages/chat/events/message_content.dart index be324278d3..0287cdea11 100644 --- a/lib/pages/chat/events/message_content.dart +++ b/lib/pages/chat/events/message_content.dart @@ -119,7 +119,7 @@ class MessageContent extends StatelessWidget with PlayVideoActionMixin { Padding( padding: const EdgeInsets.symmetric(vertical: 4), child: endOfBubbleWidget, - ) + ), ], ); diff --git a/lib/pages/chat/events/message_reactions.dart b/lib/pages/chat/events/message_reactions.dart index 50753d5fdd..3d89ff5e6f 100644 --- a/lib/pages/chat/events/message_reactions.dart +++ b/lib/pages/chat/events/message_reactions.dart @@ -272,7 +272,7 @@ class _AdaptableReactorsDialog extends StatelessWidget { runSpacing: 4.0, alignment: WrapAlignment.center, children: [ - for (var reactor in reactionEntry!.reactors!) + for (final reactor in reactionEntry!.reactors!) Chip( avatar: Avatar( mxContent: reactor.avatarUrl, diff --git a/lib/pages/chat/events/sending_image_info_widget.dart b/lib/pages/chat/events/sending_image_info_widget.dart index 80034854e8..b28b15f045 100644 --- a/lib/pages/chat/events/sending_image_info_widget.dart +++ b/lib/pages/chat/events/sending_image_info_widget.dart @@ -73,7 +73,7 @@ class SendingImageInfoWidget extends StatelessWidget { Icons.close, color: LinagoraRefColors.material().primary[100], ), - ] + ], ], ); }, @@ -106,7 +106,7 @@ class SendingImageInfoWidget extends StatelessWidget { cacheWidth: displayImageInfo.size.width.toInt(), fit: BoxFit.cover, filterQuality: FilterQuality.medium, - ) + ), ], ), ), diff --git a/lib/pages/chat/events/sending_video_widget.dart b/lib/pages/chat/events/sending_video_widget.dart index fe8001d24e..9d012dd8f9 100644 --- a/lib/pages/chat/events/sending_video_widget.dart +++ b/lib/pages/chat/events/sending_video_widget.dart @@ -65,7 +65,7 @@ class SendingVideoWidget extends StatelessWidget with PlayVideoActionMixin { InkWell( onTap: () => _onPlayVideo(context), child: const _PlayVideoButton(), - ) + ), ] else if (value == SendingVideoStatus.error) ...[ const SizedBox( width: MessageContentStyle.videoCenterButtonSize, diff --git a/lib/pages/chat/events/verification_request_content.dart b/lib/pages/chat/events/verification_request_content.dart index 257b9f3191..a7271125cb 100644 --- a/lib/pages/chat/events/verification_request_content.dart +++ b/lib/pages/chat/events/verification_request_content.dart @@ -60,7 +60,7 @@ class VerificationRequestContent extends StatelessWidget { : (started ? L10n.of(context)!.loadingPleaseWait : L10n.of(context)!.newVerificationRequest)), - ) + ), ], ), ), diff --git a/lib/pages/chat/group_chat_empty_view.dart b/lib/pages/chat/group_chat_empty_view.dart index adda4ee194..bc42d3af8d 100644 --- a/lib/pages/chat/group_chat_empty_view.dart +++ b/lib/pages/chat/group_chat_empty_view.dart @@ -60,7 +60,7 @@ class GroupChatEmptyView extends StatelessWidget { color: LinagoraRefColors.material().neutral[40], ), ), - const Spacer() + const Spacer(), ], ), const SizedBox(height: 8), diff --git a/lib/pages/chat/input_bar/input_bar.dart b/lib/pages/chat/input_bar/input_bar.dart index afd418bd97..f51abd0c1c 100644 --- a/lib/pages/chat/input_bar/input_bar.dart +++ b/lib/pages/chat/input_bar/input_bar.dart @@ -377,6 +377,9 @@ class InputBar extends StatelessWidget with PasteImageMixin { editableTextState .selectAll(SelectionChangedCause.toolbar); }, + onLiveTextInput: () { + // FIXME: Need to hadle live text input + }, ); } : null, diff --git a/lib/pages/chat/input_bar/input_bar_shortcut.dart b/lib/pages/chat/input_bar/input_bar_shortcut.dart index 25ef2fe959..07e5fa3eee 100644 --- a/lib/pages/chat/input_bar/input_bar_shortcut.dart +++ b/lib/pages/chat/input_bar/input_bar_shortcut.dart @@ -56,7 +56,7 @@ class InputBarShortcuts extends StatelessWidget { flutter.LogicalKeyboardKey.enter, ): () { onSubmitted?.call(controller?.text ?? ''); - } + }, }, child: child, ); diff --git a/lib/pages/chat/others_group_chat_empty_view.dart b/lib/pages/chat/others_group_chat_empty_view.dart index f5c300b3ed..ab2da9a301 100644 --- a/lib/pages/chat/others_group_chat_empty_view.dart +++ b/lib/pages/chat/others_group_chat_empty_view.dart @@ -56,10 +56,10 @@ class OthersGroupChatEmptyView extends StatelessWidget { fontSize: 14, color: LinagoraRefColors.material().neutral[60], ), - ) + ), ], ), - ) + ), ], ), ); diff --git a/lib/pages/chat/reactions_picker.dart b/lib/pages/chat/reactions_picker.dart index b6e0387743..8de97527cf 100644 --- a/lib/pages/chat/reactions_picker.dart +++ b/lib/pages/chat/reactions_picker.dart @@ -103,7 +103,7 @@ class ReactionsPicker extends StatelessWidget { ), onTap: () => controller.pickEmojiReactionAction(allReactionEvents), - ) + ), ], ); }, diff --git a/lib/pages/chat_details/chat_details.dart b/lib/pages/chat_details/chat_details.dart index da9a93a552..58c32cb960 100644 --- a/lib/pages/chat_details/chat_details.dart +++ b/lib/pages/chat_details/chat_details.dart @@ -114,7 +114,7 @@ class ChatDetailsController extends State L10n.of(context)!, ), ), - ) + ), ], ); if (input == null) return; @@ -247,7 +247,7 @@ class ChatDetailsController extends State suffixText: domain, hintText: L10n.of(context)!.alias, initialText: room.canonicalAlias.localpart, - ) + ), ], ); if (input == null) return; @@ -272,7 +272,7 @@ class ChatDetailsController extends State initialText: room.topic, minLines: 1, maxLines: 4, - ) + ), ], ); if (input == null) return; @@ -439,7 +439,7 @@ class ChatDetailsController extends State builder: (_) => InvitationSelection( roomId: roomId!, ), - ) + ), }, ); }, diff --git a/lib/pages/chat_details/chat_details_page_view/chat_details_page_view.dart b/lib/pages/chat_details/chat_details_page_view/chat_details_page_view.dart index 5031c4763d..26fe0f5d88 100644 --- a/lib/pages/chat_details/chat_details_page_view/chat_details_page_view.dart +++ b/lib/pages/chat_details/chat_details_page_view/chat_details_page_view.dart @@ -32,7 +32,7 @@ class ChatDetailsPageViewBuilder extends StatelessWidget { physics: const NeverScrollableScrollPhysics(), children: pages.map((page) => page.child).toList(), ), - ) + ), ], ); } diff --git a/lib/pages/chat_details/chat_details_page_view/links/chat_details_links_item.dart b/lib/pages/chat_details/chat_details_page_view/links/chat_details_links_item.dart index 9ca40bd3a2..811974bdd1 100644 --- a/lib/pages/chat_details/chat_details_page_view/links/chat_details_links_item.dart +++ b/lib/pages/chat_details/chat_details_page_view/links/chat_details_links_item.dart @@ -97,7 +97,7 @@ class _ChatDetailsLinkItemState extends State ), ], ), - ) + ), ], ), ), diff --git a/lib/pages/chat_details/chat_details_page_view/same_type_events_list_builder_view.dart b/lib/pages/chat_details/chat_details_page_view/same_type_events_list_builder_view.dart index 9e92cbdef7..431948f51d 100644 --- a/lib/pages/chat_details/chat_details_page_view/same_type_events_list_builder_view.dart +++ b/lib/pages/chat_details/chat_details_page_view/same_type_events_list_builder_view.dart @@ -37,7 +37,7 @@ class SameTypeEventsListBuilderView extends StatelessWidget { ? const CenterLoadingIndicator() : const SizedBox(), ), - ) + ), ], ), ); diff --git a/lib/pages/chat_details/chat_details_view.dart b/lib/pages/chat_details/chat_details_view.dart index 1248abd84f..a8b06e4786 100644 --- a/lib/pages/chat_details/chat_details_view.dart +++ b/lib/pages/chat_details/chat_details_view.dart @@ -74,7 +74,7 @@ class ChatDetailsView extends StatelessWidget { ), ), ), - const SizedBox(width: 56) + const SizedBox(width: 56), ], ), ), diff --git a/lib/pages/chat_draft/draft_chat_view.dart b/lib/pages/chat_draft/draft_chat_view.dart index fd8cd8f5de..5d01489f8c 100644 --- a/lib/pages/chat_draft/draft_chat_view.dart +++ b/lib/pages/chat_draft/draft_chat_view.dart @@ -62,7 +62,7 @@ class DraftChatView extends StatelessWidget { receiverId: controller.presentationContact!.matrixId!, displayName: controller.presentationContact!.displayName, ), - ) + ), ], ), bottom: PreferredSize( @@ -136,7 +136,7 @@ class DraftChatView extends StatelessWidget { KeyBoardShortcuts( keysToPress: { LogicalKeyboardKey.altLeft, - LogicalKeyboardKey.keyE + LogicalKeyboardKey.keyE, }, onKeysPressed: controller.emojiPickerAction, @@ -218,7 +218,7 @@ class DraftChatView extends StatelessWidget { ); }, ), - ) + ), ], ), ), @@ -255,7 +255,7 @@ class DraftChatView extends StatelessWidget { ), ), ], - ) + ), ], ), ), diff --git a/lib/pages/chat_list/chat_list_header.dart b/lib/pages/chat_list/chat_list_header.dart index 75f5e27aae..1de15eab08 100644 --- a/lib/pages/chat_list/chat_list_header.dart +++ b/lib/pages/chat_list/chat_list_header.dart @@ -37,7 +37,7 @@ class ChatListHeader extends StatelessWidget { height: ChatListHeaderStyle.searchBarContainerHeight, padding: ChatListHeaderStyle.searchInputPadding, child: _normalModeWidgets(context), - ) + ), ], ); } diff --git a/lib/pages/chat_list/chat_list_item.dart b/lib/pages/chat_list/chat_list_item.dart index 6c75cba2a0..730eacb139 100644 --- a/lib/pages/chat_list/chat_list_item.dart +++ b/lib/pages/chat_list/chat_list_item.dart @@ -147,7 +147,7 @@ class ChatListItem extends StatelessWidget with ChatListItemMixin { child: Column( children: [ ChatListItemTitle(room: room), - ChatListItemSubtitle(room: room) + ChatListItemSubtitle(room: room), ], ), ), diff --git a/lib/pages/chat_list/chat_list_item_title.dart b/lib/pages/chat_list/chat_list_item_title.dart index 04576a31bc..704d9ba056 100644 --- a/lib/pages/chat_list/chat_list_item_title.dart +++ b/lib/pages/chat_list/chat_list_item_title.dart @@ -86,7 +86,7 @@ class ChatListItemTitle extends StatelessWidget with ChatListItemMixin { ), ], ), - ) + ), ], ); } diff --git a/lib/pages/chat_list/chat_list_view.dart b/lib/pages/chat_list/chat_list_view.dart index 43ef2e08c4..985213cc92 100644 --- a/lib/pages/chat_list/chat_list_view.dart +++ b/lib/pages/chat_list/chat_list_view.dart @@ -71,7 +71,7 @@ class ChatListView extends StatelessWidget { return KeyBoardShortcuts( keysToPress: { LogicalKeyboardKey.controlLeft, - LogicalKeyboardKey.keyN + LogicalKeyboardKey.keyN, }, onKeysPressed: () => context.go('/rooms/newprivatechat'), helpLabel: L10n.of(context)!.newChat, diff --git a/lib/pages/chat_list/client_chooser_button.dart b/lib/pages/chat_list/client_chooser_button.dart index 018f7355ab..33eade999d 100644 --- a/lib/pages/chat_list/client_chooser_button.dart +++ b/lib/pages/chat_list/client_chooser_button.dart @@ -148,7 +148,7 @@ class ClientChooserButton extends StatelessWidget { KeyBoardShortcuts( keysToPress: { LogicalKeyboardKey.controlLeft, - LogicalKeyboardKey.tab + LogicalKeyboardKey.tab, }, helpLabel: L10n.of(context)!.nextAccount, onKeysPressed: () => _nextAccount(matrix, context), @@ -158,7 +158,7 @@ class ClientChooserButton extends StatelessWidget { keysToPress: { LogicalKeyboardKey.controlLeft, LogicalKeyboardKey.shiftLeft, - LogicalKeyboardKey.tab + LogicalKeyboardKey.tab, }, helpLabel: L10n.of(context)!.previousAccount, onKeysPressed: () => _previousAccount(matrix, context), @@ -196,7 +196,7 @@ class ClientChooserButton extends StatelessWidget { if (index > 0 && index < 10) { return { LogicalKeyboardKey.altLeft, - LogicalKeyboardKey(0x00000000030 + index) + LogicalKeyboardKey(0x00000000030 + index), }; } else { return null; diff --git a/lib/pages/chat_list/space_view.dart b/lib/pages/chat_list/space_view.dart index 7c425cfcf1..28db6065be 100644 --- a/lib/pages/chat_list/space_view.dart +++ b/lib/pages/chat_list/space_view.dart @@ -202,7 +202,7 @@ class _SpaceViewState extends State { IconButton( onPressed: _refresh, icon: const Icon(Icons.refresh_outlined), - ) + ), ], ); } diff --git a/lib/pages/chat_permissions_settings/chat_permissions_settings_view.dart b/lib/pages/chat_permissions_settings/chat_permissions_settings_view.dart index 53435c4ad2..f0bb64fb02 100644 --- a/lib/pages/chat_permissions_settings/chat_permissions_settings_view.dart +++ b/lib/pages/chat_permissions_settings/chat_permissions_settings_view.dart @@ -51,7 +51,7 @@ class ChatPermissionsSettingsView extends StatelessWidget { Column( mainAxisSize: MainAxisSize.min, children: [ - for (var entry in powerLevels.entries) + for (final entry in powerLevels.entries) PermissionsListTile( permissionKey: entry.key, permission: entry.value, @@ -101,7 +101,7 @@ class ChatPermissionsSettingsView extends StatelessWidget { ), ), ), - for (var entry in eventsPowerLevels.entries) + for (final entry in eventsPowerLevels.entries) PermissionsListTile( permissionKey: entry.key, category: 'events', diff --git a/lib/pages/contacts_tab/contacts_appbar.dart b/lib/pages/contacts_tab/contacts_appbar.dart index ae7707b69c..eaf8aa323e 100644 --- a/lib/pages/contacts_tab/contacts_appbar.dart +++ b/lib/pages/contacts_tab/contacts_appbar.dart @@ -92,7 +92,7 @@ class ContactsAppBar extends StatelessWidget { ); }, ), - ) + ), ], ), ), diff --git a/lib/pages/device_settings/device_settings.dart b/lib/pages/device_settings/device_settings.dart index 294e2ed338..7f499bdba8 100644 --- a/lib/pages/device_settings/device_settings.dart +++ b/lib/pages/device_settings/device_settings.dart @@ -76,7 +76,7 @@ class DevicesSettingsController extends State { textFields: [ DialogTextField( hintText: device.displayName, - ) + ), ], ); if (displayName == null) return; diff --git a/lib/pages/dialer/dialer.dart b/lib/pages/dialer/dialer.dart index 455ae2dde1..ec11d2570b 100644 --- a/lib/pages/dialer/dialer.dart +++ b/lib/pages/dialer/dialer.dart @@ -108,7 +108,7 @@ class _StreamView extends StatelessWidget { color: Colors.white, size: 18.0, ), - ) + ), ], ), ); @@ -502,7 +502,7 @@ class MyCallingPage extends State { color: Colors.white, fontSize: 24.0, ), - ) + ), ], ), ), @@ -638,7 +638,7 @@ class MyCallingPage extends State { PIPView.of(context)?.setFloating(true); }, ), - ) + ), ], ), ); diff --git a/lib/pages/forward/recent_chat_list.dart b/lib/pages/forward/recent_chat_list.dart index 4a48e47a8d..9317866a26 100644 --- a/lib/pages/forward/recent_chat_list.dart +++ b/lib/pages/forward/recent_chat_list.dart @@ -76,7 +76,7 @@ class RecentChatList extends StatelessWidget { ], ), ), - ) + ), ], ), ), diff --git a/lib/pages/key_verification/key_verification_dialog.dart b/lib/pages/key_verification/key_verification_dialog.dart index 1878c9f86c..fab6436d6c 100644 --- a/lib/pages/key_verification/key_verification_dialog.dart +++ b/lib/pages/key_verification/key_verification_dialog.dart @@ -180,7 +180,7 @@ class KeyVerificationPageState extends State { const SizedBox(height: 16), Text( L10n.of(context)!.askVerificationRequest(displayName), - ) + ), ], ); buttons.add( diff --git a/lib/pages/new_group/contacts_selection_view.dart b/lib/pages/new_group/contacts_selection_view.dart index 6e9103eefb..44147f66aa 100644 --- a/lib/pages/new_group/contacts_selection_view.dart +++ b/lib/pages/new_group/contacts_selection_view.dart @@ -66,7 +66,7 @@ class ContactsSelectionView extends StatelessWidget { controller.selectedContactsMapNotifier, onSelectedContact: controller.onSelectedContact, disabledContactIds: controller.disabledContactIds, - ) + ), ], ), ), diff --git a/lib/pages/new_group/new_group.dart b/lib/pages/new_group/new_group.dart index 4ccb8d3a06..def1574093 100644 --- a/lib/pages/new_group/new_group.dart +++ b/lib/pages/new_group/new_group.dart @@ -103,7 +103,7 @@ class NewGroupController extends ContactsSelectionController displayName: isCustomDisplayName ? L10n.of(context)!.you : profile.displayName, matrixId: Matrix.of(context).client.userID, - ) + ), }; newContactsList.addAll(getSelectedValidContacts(contactsList)); return newContactsList; diff --git a/lib/pages/new_private_chat/widget/expansion_contact_list_tile.dart b/lib/pages/new_private_chat/widget/expansion_contact_list_tile.dart index 6b0e6202e1..f735b6a4ff 100644 --- a/lib/pages/new_private_chat/widget/expansion_contact_list_tile.dart +++ b/lib/pages/new_private_chat/widget/expansion_contact_list_tile.dart @@ -82,7 +82,7 @@ class ExpansionContactListTile extends StatelessWidget { TwakeChip( text: L10n.of(context)!.owner, textColor: Theme.of(context).colorScheme.primary, - ) + ), ], const SizedBox(width: 8.0), if (contact.status != null) @@ -107,10 +107,10 @@ class ExpansionContactListTile extends StatelessWidget { style: Theme.of(context).textTheme.bodyMedium?.copyWith( color: LinagoraRefColors.material().neutral[60], ), - ) + ), ], ), - ) + ), ], ); }, diff --git a/lib/pages/new_private_chat/widget/expansion_list.dart b/lib/pages/new_private_chat/widget/expansion_list.dart index e17c3415f9..0c289f0a86 100644 --- a/lib/pages/new_private_chat/widget/expansion_list.dart +++ b/lib/pages/new_private_chat/widget/expansion_list.dart @@ -87,7 +87,7 @@ class ExpansionList extends StatelessWidget { onPressed: goToNewGroupChat, ), const LoadingContactWidget(), - _GetHelpButton() + _GetHelpButton(), ], ); } @@ -175,15 +175,15 @@ class ExpansionList extends StatelessWidget { onPressed: goToNewGroupChat, ), for (final child in expansionList) ...[child], - _GetHelpButton() + _GetHelpButton(), ] else ...[ for (final child in expansionList) ...[child], _MoreListTile(), _NewGroupButton( onPressed: goToNewGroupChat, ), - _GetHelpButton() - ] + _GetHelpButton(), + ], ], ); }, @@ -228,7 +228,7 @@ class ExpansionList extends StatelessWidget { ), ], ), - ) + ), ], ), ); @@ -274,7 +274,7 @@ class _IconTextTileButton extends StatelessWidget { color: Theme.of(context).colorScheme.primary, letterSpacing: -0.15, ), - ) + ), ], ), ), diff --git a/lib/pages/new_private_chat/widget/no_contacts_found.dart b/lib/pages/new_private_chat/widget/no_contacts_found.dart index 3c3913db53..a3419d1256 100644 --- a/lib/pages/new_private_chat/widget/no_contacts_found.dart +++ b/lib/pages/new_private_chat/widget/no_contacts_found.dart @@ -35,12 +35,12 @@ class NoContactsFound extends StatelessWidget { style: Theme.of(context).textTheme.bodyMedium?.copyWith( color: Theme.of(context).colorScheme.primary, ), - ) + ), ], ), ], ), - ) + ), ], ), ); diff --git a/lib/pages/search/recent_item_widget.dart b/lib/pages/search/recent_item_widget.dart index b7aea1ba9a..2b8ce50228 100644 --- a/lib/pages/search/recent_item_widget.dart +++ b/lib/pages/search/recent_item_widget.dart @@ -121,7 +121,7 @@ class _GroupChatInformation extends StatelessWidget { color: LinagoraRefColors.material().tertiary[30], ), ), - ) + ), ], ), ), diff --git a/lib/pages/search/search_contacts_and_chats_controller.dart b/lib/pages/search/search_contacts_and_chats_controller.dart index 4bec6d0076..5408c996c1 100644 --- a/lib/pages/search/search_contacts_and_chats_controller.dart +++ b/lib/pages/search/search_contacts_and_chats_controller.dart @@ -145,7 +145,7 @@ class SearchContactsAndChatsController { .listen( (event) => { _isLoadingMore = false, - mapPreSearchChatToPresentation(event, isLoadMore: true) + mapPreSearchChatToPresentation(event, isLoadMore: true), }, ); }); diff --git a/lib/pages/search/search_view.dart b/lib/pages/search/search_view.dart index d5cfba8cf7..73baaef92e 100644 --- a/lib/pages/search/search_view.dart +++ b/lib/pages/search/search_view.dart @@ -89,7 +89,7 @@ class SearchView extends StatelessWidget { ); }, initialItemCount: 1, - ) + ), ], ), ), @@ -203,7 +203,7 @@ class SearchView extends StatelessWidget { ); }, ), - ) + ), ], ), ); diff --git a/lib/pages/settings_dashboard/settings_3pid/settings_3pid_view.dart b/lib/pages/settings_dashboard/settings_3pid/settings_3pid_view.dart index b00c7541dc..452dda4b71 100644 --- a/lib/pages/settings_dashboard/settings_3pid/settings_3pid_view.dart +++ b/lib/pages/settings_dashboard/settings_3pid/settings_3pid_view.dart @@ -24,7 +24,7 @@ class Settings3PidView extends StatelessWidget { icon: const Icon(Icons.add_outlined), onPressed: controller.add3PidAction, tooltip: L10n.of(context)!.addEmail, - ) + ), ], ), body: MaxWidthBody( diff --git a/lib/pages/settings_dashboard/settings_notifications/settings_notifications.dart b/lib/pages/settings_dashboard/settings_notifications/settings_notifications.dart index 731d55c303..89f8bd057b 100644 --- a/lib/pages/settings_dashboard/settings_notifications/settings_notifications.dart +++ b/lib/pages/settings_dashboard/settings_notifications/settings_notifications.dart @@ -106,7 +106,7 @@ class SettingsNotificationsController extends State { label: L10n.of(context)!.delete, isDestructiveAction: true, key: true, - ) + ), ], ); if (delete != true) return; diff --git a/lib/pages/settings_dashboard/settings_notifications/settings_notifications_view.dart b/lib/pages/settings_dashboard/settings_notifications/settings_notifications_view.dart index db7fba4a11..1771734194 100644 --- a/lib/pages/settings_dashboard/settings_notifications/settings_notifications_view.dart +++ b/lib/pages/settings_dashboard/settings_notifications/settings_notifications_view.dart @@ -58,7 +58,7 @@ class SettingsNotificationsView extends StatelessWidget { ), ), ), - for (var item in NotificationSettingsItem.items) + for (final item in NotificationSettingsItem.items) SwitchListTile.adaptive( value: controller.getNotificationSetting(item) ?? true, title: Text(item.title(context)), diff --git a/lib/pages/settings_dashboard/settings_profile/settings_profile.dart b/lib/pages/settings_dashboard/settings_profile/settings_profile.dart index 60ff74ec2b..55f71121f0 100644 --- a/lib/pages/settings_dashboard/settings_profile/settings_profile.dart +++ b/lib/pages/settings_dashboard/settings_profile/settings_profile.dart @@ -94,7 +94,7 @@ class SettingsProfileController extends State ]; final List getListProfileWorkIdentitiesInfo = [ - SettingsProfileEnum.matrixId + SettingsProfileEnum.matrixId, ]; List> actions() => [ diff --git a/lib/pages/settings_dashboard/settings_profile/settings_profile_view_web.dart b/lib/pages/settings_dashboard/settings_profile/settings_profile_view_web.dart index 9fb2cc2e74..f6ae005167 100644 --- a/lib/pages/settings_dashboard/settings_profile/settings_profile_view_web.dart +++ b/lib/pages/settings_dashboard/settings_profile/settings_profile_view_web.dart @@ -251,7 +251,7 @@ class SettingsProfileViewWeb extends StatelessWidget { padding: SettingsProfileViewWebStyle .paddingWorkIdentitiesInfoWidget, child: workIdentitiesInfoWidget, - ) + ), ], ), ), diff --git a/lib/pages/settings_dashboard/settings_security/settings_security.dart b/lib/pages/settings_dashboard/settings_security/settings_security.dart index abf885f119..45ac6a7036 100644 --- a/lib/pages/settings_dashboard/settings_security/settings_security.dart +++ b/lib/pages/settings_dashboard/settings_security/settings_security.dart @@ -85,7 +85,7 @@ class SettingsSecurityController extends State { obscureText: true, maxLines: 1, minLines: 1, - ) + ), ], ); if (newLock != null) { @@ -141,7 +141,7 @@ class SettingsSecurityController extends State { hintText: '******', minLines: 1, maxLines: 1, - ) + ), ], ); if (input == null) return; diff --git a/lib/presentation/extensions/send_file_extension.dart b/lib/presentation/extensions/send_file_extension.dart index 4ea0ecf162..59c0dae432 100644 --- a/lib/presentation/extensions/send_file_extension.dart +++ b/lib/presentation/extensions/send_file_extension.dart @@ -230,7 +230,7 @@ extension SendFileExtension on Room { await Future.wait([ tempEncryptedFile.delete(), tempThumbnailFile.delete(), - tempEncryptedThumbnailFile.delete() + tempEncryptedThumbnailFile.delete(), ]); return eventId; } diff --git a/lib/presentation/extensions/send_file_web_extension.dart b/lib/presentation/extensions/send_file_web_extension.dart index 9ea2859021..6334471228 100644 --- a/lib/presentation/extensions/send_file_web_extension.dart +++ b/lib/presentation/extensions/send_file_web_extension.dart @@ -157,10 +157,10 @@ extension SendFileWebExtension on Room { 'ext': true, 'k': encryptedFile.k, 'key_ops': ['encrypt', 'decrypt'], - 'kty': 'oct' + 'kty': 'oct', }, 'iv': encryptedFile.iv, - 'hashes': {'sha256': encryptedFile.sha256} + 'hashes': {'sha256': encryptedFile.sha256}, }, 'info': { ...thumbnail?.info ?? {}, @@ -177,7 +177,7 @@ extension SendFileWebExtension on Room { 'ext': true, 'k': encryptedThumbnail.k, 'key_ops': ['encrypt', 'decrypt'], - 'kty': 'oct' + 'kty': 'oct', }, 'iv': encryptedThumbnail.iv, 'hashes': {'sha256': encryptedThumbnail.sha256}, diff --git a/lib/presentation/mixins/chat_list_item_mixin.dart b/lib/presentation/mixins/chat_list_item_mixin.dart index d25c525a7a..f0e5c73b49 100644 --- a/lib/presentation/mixins/chat_list_item_mixin.dart +++ b/lib/presentation/mixins/chat_list_item_mixin.dart @@ -85,7 +85,7 @@ mixin ChatListItemMixin { }, ), ), - const Spacer() + const Spacer(), ], ) : const SizedBox.shrink(); diff --git a/lib/presentation/mixins/media_picker_mixin.dart b/lib/presentation/mixins/media_picker_mixin.dart index f31db7a5f5..3eef661215 100644 --- a/lib/presentation/mixins/media_picker_mixin.dart +++ b/lib/presentation/mixins/media_picker_mixin.dart @@ -24,7 +24,7 @@ mixin MediaPickerMixin on CommonMediaPickerMixin { PickerType.gallery, PickerType.documents, PickerType.location, - PickerType.contact + PickerType.contact, ]; void showMediaPickerBottomSheetAction({ @@ -200,7 +200,7 @@ mixin MediaPickerMixin on CommonMediaPickerMixin { ), ), ], - ) + ), ], ), ), @@ -235,7 +235,7 @@ mixin MediaPickerMixin on CommonMediaPickerMixin { }, ), ), - ) + ), ], ), const SizedBox(height: 8.0), diff --git a/lib/presentation/mixins/paste_image_mixin.dart b/lib/presentation/mixins/paste_image_mixin.dart index 99ad7f1056..9514e04260 100644 --- a/lib/presentation/mixins/paste_image_mixin.dart +++ b/lib/presentation/mixins/paste_image_mixin.dart @@ -48,7 +48,7 @@ mixin PasteImageMixin { MatrixImageFile( name: imageClipboard?.fileName ?? 'copied', bytes: imageData, - ) + ), ], ); }, diff --git a/lib/utils/background_push.dart b/lib/utils/background_push.dart index a0f1c7f0c4..1ea3cfbbea 100644 --- a/lib/utils/background_push.dart +++ b/lib/utils/background_push.dart @@ -202,10 +202,10 @@ class BackgroundPush { "sound": "default", "alert": { "loc-key": "newMessageInTwake", - "loc-args": [] - } - } - } + "loc-args": [], + }, + }, + }, } : {}, ), diff --git a/lib/utils/client_manager.dart b/lib/utils/client_manager.dart index 43be8c6a9e..12d97fb7ec 100644 --- a/lib/utils/client_manager.dart +++ b/lib/utils/client_manager.dart @@ -115,7 +115,7 @@ abstract class ClientManager { if (PlatformInfos.isMobile || PlatformInfos.isWeb || PlatformInfos.isMacOS) - AuthenticationTypes.sso + AuthenticationTypes.sso, }, nativeImplementations: nativeImplementations, customImageResizer: PlatformInfos.isMobile ? customImageResizer : null, diff --git a/lib/utils/custom_scroll_behaviour.dart b/lib/utils/custom_scroll_behaviour.dart index c9610c1cce..719b75473f 100644 --- a/lib/utils/custom_scroll_behaviour.dart +++ b/lib/utils/custom_scroll_behaviour.dart @@ -6,6 +6,6 @@ class CustomScrollBehavior extends MaterialScrollBehavior { Set get dragDevices => { PointerDeviceKind.touch, PointerDeviceKind.mouse, - PointerDeviceKind.trackpad + PointerDeviceKind.trackpad, }; } diff --git a/lib/utils/dialog/twake_loading_dialog.dart b/lib/utils/dialog/twake_loading_dialog.dart index 6e1acbe63e..6e06321109 100644 --- a/lib/utils/dialog/twake_loading_dialog.dart +++ b/lib/utils/dialog/twake_loading_dialog.dart @@ -49,7 +49,7 @@ class ProgressDialog extends StatelessWidget { 'Loading... Please Wait!', overflow: TextOverflow.ellipsis, ), - ) + ), ], ), ); diff --git a/lib/utils/matrix_sdk_extensions/filtered_timeline_extension.dart b/lib/utils/matrix_sdk_extensions/filtered_timeline_extension.dart index 2e20e5d224..6f8c183936 100644 --- a/lib/utils/matrix_sdk_extensions/filtered_timeline_extension.dart +++ b/lib/utils/matrix_sdk_extensions/filtered_timeline_extension.dart @@ -49,7 +49,7 @@ extension IsStateExtension on Event { bool get isState => !{ EventTypes.Message, EventTypes.Sticker, - EventTypes.Encrypted + EventTypes.Encrypted, }.contains(type); bool isSomeoneChangeDisplayName() { diff --git a/lib/utils/permission_dialog.dart b/lib/utils/permission_dialog.dart index fbdd9663cd..d383bf3876 100644 --- a/lib/utils/permission_dialog.dart +++ b/lib/utils/permission_dialog.dart @@ -95,7 +95,7 @@ class _PermissionDialogState extends State await widget.permission.request(); } }, - ) + ), ], ), ), diff --git a/lib/utils/uia_request_manager.dart b/lib/utils/uia_request_manager.dart index 1693009d75..f312ad719f 100644 --- a/lib/utils/uia_request_manager.dart +++ b/lib/utils/uia_request_manager.dart @@ -32,7 +32,7 @@ extension UiaRequestManager on MatrixState { maxLines: 1, obscureText: true, hintText: '******', - ) + ), ], )) ?.single; diff --git a/lib/widgets/app_bars/searchable_app_bar.dart b/lib/widgets/app_bars/searchable_app_bar.dart index 2ee696b852..443beb9973 100644 --- a/lib/widgets/app_bars/searchable_app_bar.dart +++ b/lib/widgets/app_bars/searchable_app_bar.dart @@ -91,7 +91,7 @@ class SearchableAppBar extends StatelessWidget { margin: const EdgeInsets.symmetric(horizontal: 8.0), ), ] else ...[ - const SizedBox(width: 56.0) + const SizedBox(width: 56.0), ], Expanded( child: ValueListenableBuilder( @@ -137,7 +137,7 @@ class SearchableAppBar extends StatelessWidget { margin: const EdgeInsets.symmetric(vertical: 10.0), ); }, - ) + ), ] else ...[ TwakeIconButton( onTap: () => context.pop(), @@ -149,14 +149,14 @@ class SearchableAppBar extends StatelessWidget { horizontal: 6.0, ), ), - ] + ], ], ), if (!isFullScreen) Padding( padding: SearchableAppBarStyle.textFieldWebPadding, child: _textFieldBuilder(context), - ) + ), ], ), ), diff --git a/lib/widgets/chat_settings_popup_menu.dart b/lib/widgets/chat_settings_popup_menu.dart index 7e6313af78..8fc030b820 100644 --- a/lib/widgets/chat_settings_popup_menu.dart +++ b/lib/widgets/chat_settings_popup_menu.dart @@ -109,7 +109,7 @@ class ChatSettingsPopupMenuState extends State { KeyBoardShortcuts( keysToPress: { LogicalKeyboardKey.controlLeft, - LogicalKeyboardKey.keyI + LogicalKeyboardKey.keyI, }, helpLabel: L10n.of(context)!.chatDetails, onKeysPressed: _showChatDetails, @@ -118,7 +118,7 @@ class ChatSettingsPopupMenuState extends State { KeyBoardShortcuts( keysToPress: { LogicalKeyboardKey.controlLeft, - LogicalKeyboardKey.keyW + LogicalKeyboardKey.keyW, }, helpLabel: L10n.of(context)!.matrixWidgets, onKeysPressed: _showWidgets, diff --git a/lib/widgets/clean_rich_text.dart b/lib/widgets/clean_rich_text.dart index 4ccb9f5dd9..c6e8e89072 100644 --- a/lib/widgets/clean_rich_text.dart +++ b/lib/widgets/clean_rich_text.dart @@ -37,7 +37,7 @@ class TwakeCleanRichText extends StatelessWidget { textSpanBuilder: textSpanBuilder, ), const WidgetSpan(child: SizedBox(width: 4)), - WidgetSpan(child: childWidget) + WidgetSpan(child: childWidget), ], ), textAlign: textAlign, diff --git a/lib/widgets/layouts/adaptive_layout/adaptive_scaffold_appbar.dart b/lib/widgets/layouts/adaptive_layout/adaptive_scaffold_appbar.dart index 3abe6786fa..6448b6cead 100644 --- a/lib/widgets/layouts/adaptive_layout/adaptive_scaffold_appbar.dart +++ b/lib/widgets/layouts/adaptive_layout/adaptive_scaffold_appbar.dart @@ -34,7 +34,7 @@ class AdaptiveScaffoldAppBar extends StatelessWidget ), ); }, - ) + ), }, ); } diff --git a/lib/widgets/layouts/adaptive_layout/adaptive_scaffold_primary_navigation_view.dart b/lib/widgets/layouts/adaptive_layout/adaptive_scaffold_primary_navigation_view.dart index fe8d06a9b7..dd18f4a9b1 100644 --- a/lib/widgets/layouts/adaptive_layout/adaptive_scaffold_primary_navigation_view.dart +++ b/lib/widgets/layouts/adaptive_layout/adaptive_scaffold_primary_navigation_view.dart @@ -75,7 +75,7 @@ class AdaptiveScaffoldPrimaryNavigationView extends StatelessWidget { }, ), ], - ) + ), ], ), ), diff --git a/lib/widgets/layouts/adaptive_layout/adaptive_scaffold_route.dart b/lib/widgets/layouts/adaptive_layout/adaptive_scaffold_route.dart index 52d3d6ebdd..0f8cdc00c6 100644 --- a/lib/widgets/layouts/adaptive_layout/adaptive_scaffold_route.dart +++ b/lib/widgets/layouts/adaptive_layout/adaptive_scaffold_route.dart @@ -47,7 +47,7 @@ class AdaptiveScaffoldRoute extends StatelessWidget { ): SlotLayout.from( key: breakpointWebAndDesktopKey, builder: (_) => _bodyWidget(context), - ) + ), }, ), bodyRatio: ResponsiveUtils.bodyRadioWidth / context.width, @@ -65,7 +65,7 @@ class AdaptiveScaffoldRoute extends StatelessWidget { builder: secondaryBody != null ? (_) => _secondaryBodyWidget(context) : AdaptiveScaffold.emptyBuilder, - ) + ), }, ), ), diff --git a/lib/widgets/layouts/adaptive_layout/adaptive_scaffold_view.dart b/lib/widgets/layouts/adaptive_layout/adaptive_scaffold_view.dart index eb692b033d..a108a3d1cc 100644 --- a/lib/widgets/layouts/adaptive_layout/adaptive_scaffold_view.dart +++ b/lib/widgets/layouts/adaptive_layout/adaptive_scaffold_view.dart @@ -72,7 +72,7 @@ class AppScaffoldView extends StatelessWidget { }, ); }, - ) + ), }, ), ], @@ -166,7 +166,7 @@ class AppScaffoldView extends StatelessWidget { ), ); }, - ) + ), }, ); } diff --git a/lib/widgets/matrix.dart b/lib/widgets/matrix.dart index 875cea54fc..39bd7784a0 100644 --- a/lib/widgets/matrix.dart +++ b/lib/widgets/matrix.dart @@ -259,9 +259,9 @@ class MatrixState extends State bool webHasFocus = true; String? get activeRoomId { - final route = TwakeApp.router.routeInformationProvider.value.location; - if (route == null || !route.startsWith('/rooms/')) return null; - return route.split('/')[2]; + final path = TwakeApp.router.routeInformationProvider.value.uri.path; + if (!path.startsWith('/rooms/')) return null; + return path.split('/')[2]; } final linuxNotifications = diff --git a/lib/widgets/permission_slider_dialog.dart b/lib/widgets/permission_slider_dialog.dart index 9aca4ff250..8f89589824 100644 --- a/lib/widgets/permission_slider_dialog.dart +++ b/lib/widgets/permission_slider_dialog.dart @@ -61,7 +61,7 @@ Future showPermissionChooser( initialText: currentLevel.toString(), keyboardType: TextInputType.number, autocorrect: false, - ) + ), ], ); if (customLevel == null) return null; diff --git a/lib/widgets/swipeable.dart b/lib/widgets/swipeable.dart index eab96eae97..17b01d2235 100644 --- a/lib/widgets/swipeable.dart +++ b/lib/widgets/swipeable.dart @@ -64,7 +64,7 @@ class Swipeable extends StatefulWidget { this.allowedPointerKinds = const { PointerDeviceKind.invertedStylus, PointerDeviceKind.stylus, - PointerDeviceKind.touch + PointerDeviceKind.touch, }, this.onOverScrollTheMaxOffset, }) : assert(secondaryBackground == null || background != null), diff --git a/lib/widgets/twake_components/twake_preview_link/twake_link_view.dart b/lib/widgets/twake_components/twake_preview_link/twake_link_view.dart index 6ca6ff2d61..c7232837e9 100644 --- a/lib/widgets/twake_components/twake_preview_link/twake_link_view.dart +++ b/lib/widgets/twake_components/twake_preview_link/twake_link_view.dart @@ -45,7 +45,7 @@ class TwakeLinkView extends StatelessWidget { children: [ previewItemWidget, const SizedBox(height: 2), - _buildCleanRichText(context) + _buildCleanRichText(context), ], ); } diff --git a/lib/widgets/twake_components/twake_smart_refresher.dart b/lib/widgets/twake_components/twake_smart_refresher.dart index 89d49bad94..96a3d5fabc 100644 --- a/lib/widgets/twake_components/twake_smart_refresher.dart +++ b/lib/widgets/twake_components/twake_smart_refresher.dart @@ -115,7 +115,7 @@ class _TwakeSmartRefresherView extends StatelessWidget { child: loading ? const CenterLoadingIndicator() : const SizedBox(), ), - ) + ), ], ), ); diff --git a/lib/widgets/video_viewer_desktop_theme.dart b/lib/widgets/video_viewer_desktop_theme.dart index 8c22820195..9d1f81ecb9 100644 --- a/lib/widgets/video_viewer_desktop_theme.dart +++ b/lib/widgets/video_viewer_desktop_theme.dart @@ -24,7 +24,7 @@ class VideoViewerDesktopTheme extends StatelessWidget { icon: Icons.close, onTap: () => context.pop(), iconColor: Theme.of(context).colorScheme.surface, - ) + ), ], seekBarColor: Theme.of(context).colorScheme.onSurfaceVariant, seekBarPositionColor: Theme.of(context).colorScheme.primary, diff --git a/lib/widgets/video_viewer_mobile_theme.dart b/lib/widgets/video_viewer_mobile_theme.dart index 5cec765e57..0d81705355 100644 --- a/lib/widgets/video_viewer_mobile_theme.dart +++ b/lib/widgets/video_viewer_mobile_theme.dart @@ -28,7 +28,7 @@ class VideoViewerMobileTheme extends StatelessWidget { icon: Icons.close, onTap: () => context.pop(), iconColor: Theme.of(context).colorScheme.surface, - ) + ), ], bottomButtonBar: const [ MaterialPositionIndicator(), diff --git a/pubspec.lock b/pubspec.lock index 060e6c41aa..1deb02f8e1 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -317,10 +317,10 @@ packages: dependency: "direct main" description: name: collection - sha256: "4a07be6cb69c84d677a6c3096fcf960cc3285a8330b4603e0d463d15d9bd934c" + sha256: f092b211a4319e98e5ff58223576de6c2803db36221657b46c82574721240687 url: "https://pub.dev" source: hosted - version: "1.17.1" + version: "1.17.2" connectivity_plus: dependency: "direct main" description: @@ -1356,10 +1356,10 @@ packages: dependency: "direct main" description: name: intl - sha256: a3715e3bc90294e971cb7dc063fbf3cd9ee0ebf8604ffeafabd9e6f16abbdbe6 + sha256: "3bc132a9dbce73a7e4a21a17d06e1878839ffbf975568bc875c60537824b0c4d" url: "https://pub.dev" source: hosted - version: "0.18.0" + version: "0.18.1" io: dependency: transitive description: @@ -1534,18 +1534,18 @@ packages: dependency: transitive description: name: matcher - sha256: "6501fbd55da300384b768785b83e5ce66991266cec21af89ab9ae7f5ce1c4cbb" + sha256: "1803e76e6653768d64ed8ff2e1e67bea3ad4b923eb5c56a295c3e634bad5960e" url: "https://pub.dev" source: hosted - version: "0.12.15" + version: "0.12.16" material_color_utilities: dependency: transitive description: name: material_color_utilities - sha256: d92141dc6fe1dad30722f9aa826c7fbc896d021d792f80678280601aff8cf724 + sha256: "9528f2f296073ff54cb9fee677df673ace1218163c3bc7628093e7eed5203d41" url: "https://pub.dev" source: hosted - version: "0.2.0" + version: "0.5.0" matrix: dependency: "direct main" description: @@ -2398,10 +2398,10 @@ packages: dependency: transitive description: name: source_span - sha256: dd904f795d4b4f3b870833847c461801f6750a9fa8e61ea5ac53f9422b31f250 + sha256: "53e943d4206a5e30df338fd4c6e7a077e02254531b138a15aec3bd143c1a8b3c" url: "https://pub.dev" source: hosted - version: "1.9.1" + version: "1.10.0" sqflite: dependency: transitive description: @@ -2494,10 +2494,10 @@ packages: dependency: transitive description: name: test_api - sha256: eb6ac1540b26de412b3403a163d919ba86f6a973fe6cc50ae3541b80092fdcfb + sha256: "75760ffd7786fffdfb9597c35c5b27eaeec82be8edfb6d71d32651128ed7aab8" url: "https://pub.dev" source: hosted - version: "0.5.1" + version: "0.6.0" timezone: dependency: transitive description: @@ -2858,10 +2858,10 @@ packages: dependency: transitive description: name: vm_service - sha256: f6deed8ed625c52864792459709183da231ebf66ff0cf09e69b573227c377efe + sha256: c620a6f783fa22436da68e42db7ebbf18b8c44b9a46ab911f666ff09ffd9153f url: "https://pub.dev" source: hosted - version: "11.3.0" + version: "11.7.1" volume_controller: dependency: transitive description: @@ -2935,6 +2935,14 @@ packages: url: "https://pub.dev" source: hosted version: "1.1.0" + web: + dependency: transitive + description: + name: web + sha256: dc8ccd225a2005c1be616fe02951e2e342092edf968cf0844220383757ef8f10 + url: "https://pub.dev" + source: hosted + version: "0.1.4-beta" web_socket_channel: dependency: transitive description: @@ -2963,10 +2971,10 @@ packages: dependency: "direct main" description: name: wechat_camera_picker - sha256: d8108ea33b1ed25933770199d08d64c210a2854bc6a326fd058a2f34dca8bf46 + sha256: "24dc4d4d76961318aab98e6fbb3e2fa30e4bf3e5bd81b404afa01b36c5253102" url: "https://pub.dev" source: hosted - version: "3.8.0" + version: "4.0.2" win32: dependency: transitive description: @@ -3016,5 +3024,5 @@ packages: source: hosted version: "3.1.2" sdks: - dart: ">=3.0.0 <4.0.0" + dart: ">=3.1.3 <4.0.0" flutter: ">=3.10.0" diff --git a/pubspec.yaml b/pubspec.yaml index 743b328d62..126bd9d606 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -4,7 +4,7 @@ publish_to: none version: 2.3.3+2330 environment: - sdk: '>=3.0.0 <4.0.0' + sdk: '>=3.1.3 <4.0.0' dependencies: adaptive_dialog: ^1.8.0+1 @@ -132,7 +132,7 @@ dependencies: flutter_inappwebview: ^5.8.0 tuple: ^2.0.2 lottie: ^2.3.2 - wechat_camera_picker: ^3.8.0 + wechat_camera_picker: ^4.0.2 open_file: ^3.3.2 mime: ^1.0.4 async: ^2.11.0 diff --git a/test/domain/extensions/home_summary_extensions_test.dart b/test/domain/extensions/home_summary_extensions_test.dart index 435d2c6043..760bfdbc6d 100644 --- a/test/domain/extensions/home_summary_extensions_test.dart +++ b/test/domain/extensions/home_summary_extensions_test.dart @@ -28,7 +28,7 @@ void main() { loginFlows: [ LoginFlow(type: 'm.login.sso'), LoginFlow(type: 'm.login.token'), - LoginFlow(type: 'm.login.application_service') + LoginFlow(type: 'm.login.application_service'), ], ); @@ -63,7 +63,7 @@ void main() { loginFlows: [ LoginFlow(type: 'm.login.sso'), LoginFlow(type: 'm.login.token'), - LoginFlow(type: 'm.login.application_service') + LoginFlow(type: 'm.login.application_service'), ], ); @@ -87,7 +87,7 @@ void main() { loginFlows: [ LoginFlow(type: 'm.login.sso'), LoginFlow(type: 'm.login.token'), - LoginFlow(type: 'm.login.application_service') + LoginFlow(type: 'm.login.application_service'), ], ); diff --git a/test/domain/model/discovery_information_test.dart b/test/domain/model/discovery_information_test.dart index 725e175c26..152b29df19 100644 --- a/test/domain/model/discovery_information_test.dart +++ b/test/domain/model/discovery_information_test.dart @@ -12,10 +12,10 @@ void main() { "jitsi": { "preferredDomain": "jitsi.linagora.com", "baseUrl": "https://jitsi.linagora.com", - "useJwt": false - } + "useJwt": false, + }, }, - "t.domain": {"url": "tom-dev.xyz"} + "t.domain": {"url": "tom-dev.xyz"}, }; final actual = DiscoveryInformation.fromJson(multipleCustomizationFields); @@ -31,15 +31,15 @@ void main() { "m.identity_server": {"base_url": "https://tom.tom-dev.xyz/"}, "t.server": { "base_url": "https://tom.tom-dev.xyz/", - "server_name": "tom-dev.xyz" + "server_name": "tom-dev.xyz", }, "m.integrations": { "jitsi": { "preferredDomain": "jitsi.linagora.com", "baseUrl": "https://jitsi.linagora.com", - "useJwt": false - } - } + "useJwt": false, + }, + }, }; final actual = DiscoveryInformation.fromJson(multipleCustomizationFields); @@ -58,10 +58,10 @@ void main() { "jitsi": { "preferredDomain": "jitsi.linagora.com", "baseUrl": "https://jitsi.linagora.com", - "useJwt": false - } + "useJwt": false, + }, }, - "t.domain": "tom-dev.xyz" + "t.domain": "tom-dev.xyz", }; expect( () => DiscoveryInformation.fromJson(multipleCustomizationFields), diff --git a/test/utils/test_client.dart b/test/utils/test_client.dart index c2e1314cff..55fccd03f0 100644 --- a/test/utils/test_client.dart +++ b/test/utils/test_client.dart @@ -25,7 +25,7 @@ Future prepareTestClient({ databaseBuilder: FlutterHiveCollectionsDatabase.databaseBuilder, supportedLoginTypes: { AuthenticationTypes.password, - AuthenticationTypes.sso + AuthenticationTypes.sso, }, ); await client.checkHomeserver(homeserver);