diff --git a/lib/config/app_config.dart b/lib/config/app_config.dart index 14efb4cb1..6b10cd43f 100644 --- a/lib/config/app_config.dart +++ b/lib/config/app_config.dart @@ -1,8 +1,12 @@ +// Dart imports: import 'dart:ui'; -import 'package:fluffychat/pangea/config/environment.dart'; +// Package imports: import 'package:matrix/matrix.dart'; +// Project imports: +import 'package:fluffychat/pangea/config/environment.dart'; + abstract class AppConfig { // #Pangea // static String _applicationName = 'FluffyChat'; diff --git a/lib/config/firebase_options.dart b/lib/config/firebase_options.dart index 93398d2af..c028dbd46 100644 --- a/lib/config/firebase_options.dart +++ b/lib/config/firebase_options.dart @@ -1,6 +1,9 @@ // File generated by FlutterFire CLI. // ignore_for_file: lines_longer_than_80_chars, avoid_classes_with_only_static_members + +// Package imports: import 'package:firebase_core/firebase_core.dart' show FirebaseOptions; + import 'package:flutter/foundation.dart' show defaultTargetPlatform, kIsWeb, TargetPlatform; diff --git a/lib/config/routes.dart b/lib/config/routes.dart index be82c09b2..8a58e82c8 100644 --- a/lib/config/routes.dart +++ b/lib/config/routes.dart @@ -1,5 +1,13 @@ +// Dart imports: import 'dart:async'; +// Flutter imports: +import 'package:flutter/cupertino.dart'; + +// Package imports: +import 'package:go_router/go_router.dart'; + +// Project imports: import 'package:fluffychat/config/themes.dart'; import 'package:fluffychat/pages/archive/archive.dart'; import 'package:fluffychat/pages/chat/chat.dart'; @@ -38,9 +46,6 @@ import 'package:fluffychat/widgets/layouts/empty_page.dart'; import 'package:fluffychat/widgets/layouts/two_column_layout.dart'; import 'package:fluffychat/widgets/log_view.dart'; import 'package:fluffychat/widgets/matrix.dart'; -import 'package:flutter/cupertino.dart'; -import 'package:go_router/go_router.dart'; - import '../pangea/pages/analytics/class_analytics/class_analytics.dart'; import '../pangea/pages/analytics/class_list/class_list.dart'; diff --git a/lib/config/themes.dart b/lib/config/themes.dart index 3df0be18c..fd10c678a 100644 --- a/lib/config/themes.dart +++ b/lib/config/themes.dart @@ -1,8 +1,10 @@ -import 'package:fluffychat/utils/platform_infos.dart'; +// Flutter imports: import 'package:flutter/cupertino.dart'; import 'package:flutter/material.dart'; import 'package:flutter/services.dart'; +// Project imports: +import 'package:fluffychat/utils/platform_infos.dart'; import 'app_config.dart'; abstract class FluffyThemes { diff --git a/lib/main.dart b/lib/main.dart index 88576b23d..b7ab0ed8c 100644 --- a/lib/main.dart +++ b/lib/main.dart @@ -1,4 +1,15 @@ +// Flutter imports: +import 'package:flutter/material.dart'; + +// Package imports: import 'package:collection/collection.dart'; +import 'package:flutter_dotenv/flutter_dotenv.dart'; +import 'package:flutter_secure_storage/flutter_secure_storage.dart'; +import 'package:get_storage/get_storage.dart'; +import 'package:matrix/matrix.dart'; +import 'package:shared_preferences/shared_preferences.dart'; + +// Project imports: import 'package:fluffychat/config/app_config.dart'; import 'package:fluffychat/pangea/config/environment.dart'; import 'package:fluffychat/pangea/controllers/language_list_controller.dart'; @@ -7,13 +18,6 @@ import 'package:fluffychat/pangea/utils/firebase_analytics.dart'; import 'package:fluffychat/utils/client_manager.dart'; import 'package:fluffychat/utils/platform_infos.dart'; import 'package:fluffychat/widgets/error_widget.dart'; -import 'package:flutter/material.dart'; -import 'package:flutter_dotenv/flutter_dotenv.dart'; -import 'package:flutter_secure_storage/flutter_secure_storage.dart'; -import 'package:get_storage/get_storage.dart'; -import 'package:matrix/matrix.dart'; -import 'package:shared_preferences/shared_preferences.dart'; - import 'config/setting_keys.dart'; import 'utils/background_push.dart'; import 'widgets/fluffy_chat_app.dart'; diff --git a/lib/pages/add_story/add_story.dart b/lib/pages/add_story/add_story.dart index a27193593..b6bb42d08 100644 --- a/lib/pages/add_story/add_story.dart +++ b/lib/pages/add_story/add_story.dart @@ -1,8 +1,20 @@ +// Dart imports: import 'dart:io'; import 'dart:math'; +// Flutter imports: +import 'package:flutter/material.dart'; + +// Package imports: import 'package:collection/collection.dart'; import 'package:file_picker/file_picker.dart'; +import 'package:future_loading_dialog/future_loading_dialog.dart'; +import 'package:go_router/go_router.dart'; +import 'package:image_picker/image_picker.dart'; +import 'package:matrix/matrix.dart'; +import 'package:video_player/video_player.dart'; + +// Project imports: import 'package:fluffychat/pages/add_story/add_story_view.dart'; import 'package:fluffychat/pages/add_story/invite_story_page.dart'; import 'package:fluffychat/utils/matrix_sdk_extensions/matrix_file_extension.dart'; @@ -11,13 +23,6 @@ import 'package:fluffychat/utils/story_theme_data.dart'; import 'package:fluffychat/utils/string_color.dart'; import 'package:fluffychat/widgets/app_lock.dart'; import 'package:fluffychat/widgets/matrix.dart'; -import 'package:flutter/material.dart'; -import 'package:future_loading_dialog/future_loading_dialog.dart'; -import 'package:go_router/go_router.dart'; -import 'package:image_picker/image_picker.dart'; -import 'package:matrix/matrix.dart'; -import 'package:video_player/video_player.dart'; - import '../../utils/matrix_sdk_extensions/client_stories_extension.dart'; class AddStoryPage extends StatefulWidget { diff --git a/lib/pages/add_story/add_story_view.dart b/lib/pages/add_story/add_story_view.dart index ea828aadf..6ab778409 100644 --- a/lib/pages/add_story/add_story_view.dart +++ b/lib/pages/add_story/add_story_view.dart @@ -1,9 +1,12 @@ +// Flutter imports: import 'package:flutter/material.dart'; import 'package:flutter/services.dart'; +// Package imports: import 'package:flutter_gen/gen_l10n/l10n.dart'; import 'package:video_player/video_player.dart'; +// Project imports: import 'add_story.dart'; class AddStoryView extends StatelessWidget { diff --git a/lib/pages/add_story/invite_story_page.dart b/lib/pages/add_story/invite_story_page.dart index c62a0b815..c90d55889 100644 --- a/lib/pages/add_story/invite_story_page.dart +++ b/lib/pages/add_story/invite_story_page.dart @@ -1,10 +1,13 @@ +// Flutter imports: import 'package:flutter/material.dart'; +// Package imports: import 'package:adaptive_dialog/adaptive_dialog.dart'; import 'package:flutter_gen/gen_l10n/l10n.dart'; import 'package:future_loading_dialog/future_loading_dialog.dart'; import 'package:matrix/matrix.dart'; +// Project imports: import 'package:fluffychat/utils/localized_exception_extension.dart'; import 'package:fluffychat/utils/matrix_sdk_extensions/client_stories_extension.dart'; import 'package:fluffychat/widgets/avatar.dart'; diff --git a/lib/pages/archive/archive.dart b/lib/pages/archive/archive.dart index a3c35c347..0b2d8a540 100644 --- a/lib/pages/archive/archive.dart +++ b/lib/pages/archive/archive.dart @@ -1,10 +1,13 @@ +// Flutter imports: import 'package:flutter/material.dart'; +// Package imports: import 'package:adaptive_dialog/adaptive_dialog.dart'; import 'package:flutter_gen/gen_l10n/l10n.dart'; import 'package:future_loading_dialog/future_loading_dialog.dart'; import 'package:matrix/matrix.dart'; +// Project imports: import 'package:fluffychat/pages/archive/archive_view.dart'; import 'package:fluffychat/widgets/matrix.dart'; diff --git a/lib/pages/archive/archive_view.dart b/lib/pages/archive/archive_view.dart index a60eb9ad7..b56660b29 100644 --- a/lib/pages/archive/archive_view.dart +++ b/lib/pages/archive/archive_view.dart @@ -1,9 +1,14 @@ +// Flutter imports: +import 'package:flutter/material.dart'; + +// Package imports: +import 'package:flutter_gen/gen_l10n/l10n.dart'; +import 'package:matrix/matrix.dart'; + +// Project imports: import 'package:fluffychat/pages/archive/archive.dart'; import 'package:fluffychat/pages/chat_list/chat_list_item.dart'; import 'package:fluffychat/widgets/layouts/max_width_body.dart'; -import 'package:flutter/material.dart'; -import 'package:flutter_gen/gen_l10n/l10n.dart'; -import 'package:matrix/matrix.dart'; class ArchiveView extends StatelessWidget { final ArchiveController controller; diff --git a/lib/pages/bootstrap/bootstrap_dialog.dart b/lib/pages/bootstrap/bootstrap_dialog.dart index b9b944835..add5dd3e9 100644 --- a/lib/pages/bootstrap/bootstrap_dialog.dart +++ b/lib/pages/bootstrap/bootstrap_dialog.dart @@ -1,8 +1,8 @@ -import 'package:adaptive_dialog/adaptive_dialog.dart'; -import 'package:fluffychat/config/themes.dart'; -import 'package:fluffychat/utils/fluffy_share.dart'; -import 'package:fluffychat/utils/platform_infos.dart'; +// Flutter imports: import 'package:flutter/material.dart'; + +// Package imports: +import 'package:adaptive_dialog/adaptive_dialog.dart'; import 'package:flutter_gen/gen_l10n/l10n.dart'; import 'package:flutter_secure_storage/flutter_secure_storage.dart'; import 'package:future_loading_dialog/future_loading_dialog.dart'; @@ -10,6 +10,10 @@ import 'package:matrix/encryption.dart'; import 'package:matrix/encryption/utils/bootstrap.dart'; import 'package:matrix/matrix.dart'; +// Project imports: +import 'package:fluffychat/config/themes.dart'; +import 'package:fluffychat/utils/fluffy_share.dart'; +import 'package:fluffychat/utils/platform_infos.dart'; import '../../utils/adaptive_bottom_sheet.dart'; import '../key_verification/key_verification_dialog.dart'; diff --git a/lib/pages/chat/add_widget_tile.dart b/lib/pages/chat/add_widget_tile.dart index 11e3cce5d..417108343 100644 --- a/lib/pages/chat/add_widget_tile.dart +++ b/lib/pages/chat/add_widget_tile.dart @@ -1,8 +1,11 @@ +// Flutter imports: import 'package:flutter/material.dart'; +// Package imports: import 'package:flutter_gen/gen_l10n/l10n.dart'; import 'package:matrix/matrix.dart'; +// Project imports: import 'package:fluffychat/pages/chat/add_widget_tile_view.dart'; class AddWidgetTile extends StatefulWidget { diff --git a/lib/pages/chat/add_widget_tile_view.dart b/lib/pages/chat/add_widget_tile_view.dart index 973e2a1d1..bfb818a21 100644 --- a/lib/pages/chat/add_widget_tile_view.dart +++ b/lib/pages/chat/add_widget_tile_view.dart @@ -1,8 +1,13 @@ -import 'package:fluffychat/pages/chat/add_widget_tile.dart'; +// Flutter imports: import 'package:flutter/cupertino.dart'; import 'package:flutter/material.dart'; + +// Package imports: import 'package:flutter_gen/gen_l10n/l10n.dart'; +// Project imports: +import 'package:fluffychat/pages/chat/add_widget_tile.dart'; + class AddWidgetTileView extends StatelessWidget { final AddWidgetTileState controller; diff --git a/lib/pages/chat/chat.dart b/lib/pages/chat/chat.dart index 6e01a693e..4fe9c69a4 100644 --- a/lib/pages/chat/chat.dart +++ b/lib/pages/chat/chat.dart @@ -1,12 +1,30 @@ +// Dart imports: import 'dart:async'; import 'dart:developer'; import 'dart:io'; +// Flutter imports: +import 'package:flutter/foundation.dart'; +import 'package:flutter/material.dart'; +import 'package:flutter/scheduler.dart'; +import 'package:flutter/services.dart'; + +// Package imports: import 'package:adaptive_dialog/adaptive_dialog.dart'; import 'package:desktop_drop/desktop_drop.dart'; import 'package:device_info_plus/device_info_plus.dart'; import 'package:emoji_picker_flutter/emoji_picker_flutter.dart'; import 'package:file_picker/file_picker.dart'; +import 'package:flutter_gen/gen_l10n/l10n.dart'; +import 'package:future_loading_dialog/future_loading_dialog.dart'; +import 'package:go_router/go_router.dart'; +import 'package:image_picker/image_picker.dart'; +import 'package:matrix/matrix.dart'; +import 'package:record/record.dart'; +import 'package:scroll_to_index/scroll_to_index.dart'; +import 'package:shared_preferences/shared_preferences.dart'; + +// Project imports: import 'package:fluffychat/config/app_config.dart'; import 'package:fluffychat/config/themes.dart'; import 'package:fluffychat/pages/chat/chat_view.dart'; @@ -33,19 +51,6 @@ import 'package:fluffychat/utils/matrix_sdk_extensions/matrix_locals.dart'; import 'package:fluffychat/utils/platform_infos.dart'; import 'package:fluffychat/widgets/app_lock.dart'; import 'package:fluffychat/widgets/matrix.dart'; -import 'package:flutter/foundation.dart'; -import 'package:flutter/material.dart'; -import 'package:flutter/scheduler.dart'; -import 'package:flutter/services.dart'; -import 'package:flutter_gen/gen_l10n/l10n.dart'; -import 'package:future_loading_dialog/future_loading_dialog.dart'; -import 'package:go_router/go_router.dart'; -import 'package:image_picker/image_picker.dart'; -import 'package:matrix/matrix.dart'; -import 'package:record/record.dart'; -import 'package:scroll_to_index/scroll_to_index.dart'; -import 'package:shared_preferences/shared_preferences.dart'; - import '../../utils/account_bundles.dart'; import '../../utils/localized_exception_extension.dart'; import '../../utils/matrix_sdk_extensions/matrix_file_extension.dart'; diff --git a/lib/pages/chat/chat_app_bar_title.dart b/lib/pages/chat/chat_app_bar_title.dart index 330fedc47..bebaa0f4d 100644 --- a/lib/pages/chat/chat_app_bar_title.dart +++ b/lib/pages/chat/chat_app_bar_title.dart @@ -1,12 +1,17 @@ +// Flutter imports: +import 'package:flutter/material.dart'; + +// Package imports: +import 'package:flutter_gen/gen_l10n/l10n.dart'; +import 'package:go_router/go_router.dart'; + +// Project imports: import 'package:fluffychat/config/themes.dart'; import 'package:fluffychat/pages/chat/chat.dart'; import 'package:fluffychat/utils/date_time_extension.dart'; import 'package:fluffychat/utils/matrix_sdk_extensions/matrix_locals.dart'; import 'package:fluffychat/widgets/avatar.dart'; import 'package:fluffychat/widgets/presence_builder.dart'; -import 'package:flutter/material.dart'; -import 'package:flutter_gen/gen_l10n/l10n.dart'; -import 'package:go_router/go_router.dart'; class ChatAppBarTitle extends StatelessWidget { final ChatController controller; diff --git a/lib/pages/chat/chat_emoji_picker.dart b/lib/pages/chat/chat_emoji_picker.dart index 86bf94682..af766347d 100644 --- a/lib/pages/chat/chat_emoji_picker.dart +++ b/lib/pages/chat/chat_emoji_picker.dart @@ -1,8 +1,12 @@ -import 'package:emoji_picker_flutter/emoji_picker_flutter.dart'; -import 'package:fluffychat/config/themes.dart'; +// Flutter imports: import 'package:flutter/material.dart'; + +// Package imports: +import 'package:emoji_picker_flutter/emoji_picker_flutter.dart'; import 'package:flutter_gen/gen_l10n/l10n.dart'; +// Project imports: +import 'package:fluffychat/config/themes.dart'; import 'chat.dart'; class ChatEmojiPicker extends StatelessWidget { diff --git a/lib/pages/chat/chat_event_list.dart b/lib/pages/chat/chat_event_list.dart index fe5e84499..cb6ef94e0 100644 --- a/lib/pages/chat/chat_event_list.dart +++ b/lib/pages/chat/chat_event_list.dart @@ -1,3 +1,11 @@ +// Flutter imports: +import 'package:flutter/material.dart'; + +// Package imports: +import 'package:matrix/matrix.dart'; +import 'package:scroll_to_index/scroll_to_index.dart'; + +// Project imports: import 'package:fluffychat/config/themes.dart'; import 'package:fluffychat/pages/chat/chat.dart'; import 'package:fluffychat/pages/chat/events/message.dart'; @@ -9,9 +17,6 @@ import 'package:fluffychat/pangea/widgets/chat/locked_chat_message.dart'; import 'package:fluffychat/utils/adaptive_bottom_sheet.dart'; import 'package:fluffychat/utils/matrix_sdk_extensions/filtered_timeline_extension.dart'; import 'package:fluffychat/utils/platform_infos.dart'; -import 'package:flutter/material.dart'; -import 'package:matrix/matrix.dart'; -import 'package:scroll_to_index/scroll_to_index.dart'; class ChatEventList extends StatelessWidget { final ChatController controller; diff --git a/lib/pages/chat/chat_input_row.dart b/lib/pages/chat/chat_input_row.dart index 6840f60f4..4cabd84c2 100644 --- a/lib/pages/chat/chat_input_row.dart +++ b/lib/pages/chat/chat_input_row.dart @@ -1,16 +1,20 @@ +// Flutter imports: +import 'package:flutter/material.dart'; +import 'package:flutter/services.dart'; + +// Package imports: import 'package:animations/animations.dart'; +import 'package:flutter_gen/gen_l10n/l10n.dart'; +import 'package:keyboard_shortcuts/keyboard_shortcuts.dart'; +import 'package:matrix/matrix.dart'; + +// Project imports: import 'package:fluffychat/config/app_config.dart'; import 'package:fluffychat/pangea/choreographer/widgets/it_bar.dart'; import 'package:fluffychat/pangea/choreographer/widgets/send_button.dart'; import 'package:fluffychat/utils/platform_infos.dart'; import 'package:fluffychat/widgets/avatar.dart'; import 'package:fluffychat/widgets/matrix.dart'; -import 'package:flutter/material.dart'; -import 'package:flutter/services.dart'; -import 'package:flutter_gen/gen_l10n/l10n.dart'; -import 'package:keyboard_shortcuts/keyboard_shortcuts.dart'; -import 'package:matrix/matrix.dart'; - import '../../config/themes.dart'; import 'chat.dart'; import 'input_bar.dart'; diff --git a/lib/pages/chat/chat_view.dart b/lib/pages/chat/chat_view.dart index bf565e303..c3766a9ec 100644 --- a/lib/pages/chat/chat_view.dart +++ b/lib/pages/chat/chat_view.dart @@ -1,5 +1,14 @@ +// Flutter imports: +import 'package:flutter/material.dart'; + +// Package imports: import 'package:badges/badges.dart'; import 'package:desktop_drop/desktop_drop.dart'; +import 'package:flutter_gen/gen_l10n/l10n.dart'; +import 'package:future_loading_dialog/future_loading_dialog.dart'; +import 'package:matrix/matrix.dart'; + +// Project imports: import 'package:fluffychat/config/app_config.dart'; import 'package:fluffychat/config/themes.dart'; import 'package:fluffychat/pages/chat/chat.dart'; @@ -18,11 +27,6 @@ import 'package:fluffychat/widgets/chat_settings_popup_menu.dart'; import 'package:fluffychat/widgets/connection_status_header.dart'; import 'package:fluffychat/widgets/matrix.dart'; import 'package:fluffychat/widgets/unread_rooms_badge.dart'; -import 'package:flutter/material.dart'; -import 'package:flutter_gen/gen_l10n/l10n.dart'; -import 'package:future_loading_dialog/future_loading_dialog.dart'; -import 'package:matrix/matrix.dart'; - import '../../utils/stream_extension.dart'; import 'chat_emoji_picker.dart'; import 'chat_input_row.dart'; diff --git a/lib/pages/chat/command_hints.dart b/lib/pages/chat/command_hints.dart index 5ab493604..167d34e38 100644 --- a/lib/pages/chat/command_hints.dart +++ b/lib/pages/chat/command_hints.dart @@ -1,5 +1,6 @@ // This file is auto-generated using scripts/generate_command_hints_glue.sh. +// Package imports: import 'package:flutter_gen/gen_l10n/l10n.dart'; String commandHint(L10n l10n, String command) { diff --git a/lib/pages/chat/cupertino_widgets_bottom_sheet.dart b/lib/pages/chat/cupertino_widgets_bottom_sheet.dart index 0bc7ac346..1b74ae1e8 100644 --- a/lib/pages/chat/cupertino_widgets_bottom_sheet.dart +++ b/lib/pages/chat/cupertino_widgets_bottom_sheet.dart @@ -1,9 +1,12 @@ +// Flutter imports: import 'package:flutter/cupertino.dart'; +// Package imports: import 'package:flutter_gen/gen_l10n/l10n.dart'; import 'package:matrix/matrix.dart'; import 'package:url_launcher/link.dart'; +// Project imports: import 'edit_widgets_dialog.dart'; class CupertinoWidgetsBottomSheet extends StatelessWidget { diff --git a/lib/pages/chat/edit_widgets_dialog.dart b/lib/pages/chat/edit_widgets_dialog.dart index 2ba163feb..1362aced8 100644 --- a/lib/pages/chat/edit_widgets_dialog.dart +++ b/lib/pages/chat/edit_widgets_dialog.dart @@ -1,8 +1,11 @@ +// Flutter imports: import 'package:flutter/material.dart'; +// Package imports: import 'package:flutter_gen/gen_l10n/l10n.dart'; import 'package:matrix/matrix.dart'; +// Project imports: import 'add_widget_tile.dart'; class EditWidgetsDialog extends StatelessWidget { diff --git a/lib/pages/chat/encryption_button.dart b/lib/pages/chat/encryption_button.dart index 91fb262aa..38dc1a681 100644 --- a/lib/pages/chat/encryption_button.dart +++ b/lib/pages/chat/encryption_button.dart @@ -1,8 +1,12 @@ +// Flutter imports: import 'package:flutter/material.dart'; + +// Package imports: import 'package:flutter_gen/gen_l10n/l10n.dart'; import 'package:go_router/go_router.dart'; import 'package:matrix/matrix.dart'; +// Project imports: import '../../widgets/matrix.dart'; class EncryptionButton extends StatelessWidget { diff --git a/lib/pages/chat/event_info_dialog.dart b/lib/pages/chat/event_info_dialog.dart index e8ff6dad9..f230cf477 100644 --- a/lib/pages/chat/event_info_dialog.dart +++ b/lib/pages/chat/event_info_dialog.dart @@ -1,10 +1,14 @@ +// Dart imports: import 'dart:convert'; +// Flutter imports: import 'package:flutter/material.dart'; +// Package imports: import 'package:flutter_gen/gen_l10n/l10n.dart'; import 'package:matrix/matrix.dart'; +// Project imports: import 'package:fluffychat/config/app_config.dart'; import 'package:fluffychat/utils/adaptive_bottom_sheet.dart'; import 'package:fluffychat/utils/date_time_extension.dart'; diff --git a/lib/pages/chat/events/audio_player.dart b/lib/pages/chat/events/audio_player.dart index bbd0b4844..9769ef90f 100644 --- a/lib/pages/chat/events/audio_player.dart +++ b/lib/pages/chat/events/audio_player.dart @@ -1,14 +1,19 @@ +// Dart imports: import 'dart:async'; import 'dart:io'; -import 'package:fluffychat/utils/error_reporter.dart'; -import 'package:fluffychat/utils/localized_exception_extension.dart'; +// Flutter imports: import 'package:flutter/foundation.dart'; import 'package:flutter/material.dart'; + +// Package imports: import 'package:just_audio/just_audio.dart'; import 'package:matrix/matrix.dart'; import 'package:path_provider/path_provider.dart'; +// Project imports: +import 'package:fluffychat/utils/error_reporter.dart'; +import 'package:fluffychat/utils/localized_exception_extension.dart'; import '../../../utils/matrix_sdk_extensions/event_extension.dart'; class AudioPlayerWidget extends StatefulWidget { diff --git a/lib/pages/chat/events/cute_events.dart b/lib/pages/chat/events/cute_events.dart index 4369e5254..8450789b0 100644 --- a/lib/pages/chat/events/cute_events.dart +++ b/lib/pages/chat/events/cute_events.dart @@ -1,10 +1,16 @@ +// Dart imports: import 'dart:math'; -import 'package:fluffychat/config/app_config.dart'; +// Flutter imports: import 'package:flutter/material.dart'; + +// Package imports: import 'package:flutter_gen/gen_l10n/l10n.dart'; import 'package:matrix/matrix.dart'; +// Project imports: +import 'package:fluffychat/config/app_config.dart'; + class CuteContent extends StatefulWidget { final Event event; diff --git a/lib/pages/chat/events/html_message.dart b/lib/pages/chat/events/html_message.dart index bafd50e5d..7b8d40098 100644 --- a/lib/pages/chat/events/html_message.dart +++ b/lib/pages/chat/events/html_message.dart @@ -1,8 +1,8 @@ -import 'package:collection/collection.dart'; -import 'package:fluffychat/config/app_config.dart'; -import 'package:fluffychat/widgets/avatar.dart'; -import 'package:fluffychat/widgets/mxc_image.dart'; +// Flutter imports: import 'package:flutter/material.dart'; + +// Package imports: +import 'package:collection/collection.dart'; import 'package:flutter_highlighter/flutter_highlighter.dart'; import 'package:flutter_highlighter/themes/shades-of-purple.dart'; import 'package:flutter_html/flutter_html.dart'; @@ -11,6 +11,10 @@ import 'package:flutter_math_fork/flutter_math.dart'; import 'package:linkify/linkify.dart'; import 'package:matrix/matrix.dart'; +// Project imports: +import 'package:fluffychat/config/app_config.dart'; +import 'package:fluffychat/widgets/avatar.dart'; +import 'package:fluffychat/widgets/mxc_image.dart'; import '../../../utils/url_launcher.dart'; class HtmlMessage extends StatelessWidget { diff --git a/lib/pages/chat/events/image_bubble.dart b/lib/pages/chat/events/image_bubble.dart index 0fd067cbd..a9f40277c 100644 --- a/lib/pages/chat/events/image_bubble.dart +++ b/lib/pages/chat/events/image_bubble.dart @@ -1,9 +1,14 @@ +// Flutter imports: +import 'package:flutter/material.dart'; + +// Package imports: +import 'package:flutter_blurhash/flutter_blurhash.dart'; +import 'package:matrix/matrix.dart'; + +// Project imports: import 'package:fluffychat/config/app_config.dart'; import 'package:fluffychat/pages/image_viewer/image_viewer.dart'; import 'package:fluffychat/widgets/mxc_image.dart'; -import 'package:flutter/material.dart'; -import 'package:flutter_blurhash/flutter_blurhash.dart'; -import 'package:matrix/matrix.dart'; class ImageBubble extends StatelessWidget { final Event event; diff --git a/lib/pages/chat/events/map_bubble.dart b/lib/pages/chat/events/map_bubble.dart index c441c7d64..89c9a4336 100644 --- a/lib/pages/chat/events/map_bubble.dart +++ b/lib/pages/chat/events/map_bubble.dart @@ -1,5 +1,7 @@ +// Flutter imports: import 'package:flutter/material.dart'; +// Package imports: import 'package:flutter_map/flutter_map.dart'; import 'package:latlong2/latlong.dart'; diff --git a/lib/pages/chat/events/message.dart b/lib/pages/chat/events/message.dart index 2ff8a6605..8e71bdf5a 100644 --- a/lib/pages/chat/events/message.dart +++ b/lib/pages/chat/events/message.dart @@ -1,3 +1,12 @@ +// Flutter imports: +import 'package:flutter/material.dart'; + +// Package imports: +import 'package:flutter_gen/gen_l10n/l10n.dart'; +import 'package:matrix/matrix.dart'; +import 'package:swipe_to_action/swipe_to_action.dart'; + +// Project imports: import 'package:fluffychat/config/themes.dart'; import 'package:fluffychat/pangea/enum/use_type.dart'; import 'package:fluffychat/pangea/models/language_model.dart'; @@ -6,11 +15,6 @@ import 'package:fluffychat/utils/date_time_extension.dart'; import 'package:fluffychat/utils/string_color.dart'; import 'package:fluffychat/widgets/avatar.dart'; import 'package:fluffychat/widgets/matrix.dart'; -import 'package:flutter/material.dart'; -import 'package:flutter_gen/gen_l10n/l10n.dart'; -import 'package:matrix/matrix.dart'; -import 'package:swipe_to_action/swipe_to_action.dart'; - import '../../../config/app_config.dart'; import 'message_content.dart'; import 'message_reactions.dart'; diff --git a/lib/pages/chat/events/message_content.dart b/lib/pages/chat/events/message_content.dart index 69cc94860..3d4707233 100644 --- a/lib/pages/chat/events/message_content.dart +++ b/lib/pages/chat/events/message_content.dart @@ -1,3 +1,12 @@ +// Flutter imports: +import 'package:flutter/material.dart'; + +// Package imports: +import 'package:flutter_gen/gen_l10n/l10n.dart'; +import 'package:flutter_linkify/flutter_linkify.dart'; +import 'package:matrix/matrix.dart'; + +// Project imports: import 'package:fluffychat/pages/chat/events/video_player.dart'; import 'package:fluffychat/pangea/models/language_model.dart'; import 'package:fluffychat/pangea/models/pangea_message_event.dart'; @@ -6,11 +15,6 @@ import 'package:fluffychat/utils/adaptive_bottom_sheet.dart'; import 'package:fluffychat/utils/date_time_extension.dart'; import 'package:fluffychat/utils/matrix_sdk_extensions/matrix_locals.dart'; import 'package:fluffychat/widgets/avatar.dart'; -import 'package:flutter/material.dart'; -import 'package:flutter_gen/gen_l10n/l10n.dart'; -import 'package:flutter_linkify/flutter_linkify.dart'; -import 'package:matrix/matrix.dart'; - import '../../../config/app_config.dart'; import '../../../utils/platform_infos.dart'; import '../../../utils/url_launcher.dart'; diff --git a/lib/pages/chat/events/message_download_content.dart b/lib/pages/chat/events/message_download_content.dart index f19888a0b..3f1d42b4f 100644 --- a/lib/pages/chat/events/message_download_content.dart +++ b/lib/pages/chat/events/message_download_content.dart @@ -1,7 +1,12 @@ -import 'package:fluffychat/utils/matrix_sdk_extensions/event_extension.dart'; +// Flutter imports: import 'package:flutter/material.dart'; + +// Package imports: import 'package:matrix/matrix.dart'; +// Project imports: +import 'package:fluffychat/utils/matrix_sdk_extensions/event_extension.dart'; + class MessageDownloadContent extends StatelessWidget { final Event event; final Color textColor; diff --git a/lib/pages/chat/events/message_reactions.dart b/lib/pages/chat/events/message_reactions.dart index 788dfec71..364b78c6e 100644 --- a/lib/pages/chat/events/message_reactions.dart +++ b/lib/pages/chat/events/message_reactions.dart @@ -1,11 +1,16 @@ +// Flutter imports: +import 'package:flutter/material.dart'; + +// Package imports: import 'package:collection/collection.dart' show IterableExtension; +import 'package:future_loading_dialog/future_loading_dialog.dart'; +import 'package:matrix/matrix.dart'; + +// Project imports: import 'package:fluffychat/config/app_config.dart'; import 'package:fluffychat/widgets/avatar.dart'; import 'package:fluffychat/widgets/matrix.dart'; import 'package:fluffychat/widgets/mxc_image.dart'; -import 'package:flutter/material.dart'; -import 'package:future_loading_dialog/future_loading_dialog.dart'; -import 'package:matrix/matrix.dart'; class MessageReactions extends StatelessWidget { final Event event; diff --git a/lib/pages/chat/events/reply_content.dart b/lib/pages/chat/events/reply_content.dart index 4c70ae004..2ad05a288 100644 --- a/lib/pages/chat/events/reply_content.dart +++ b/lib/pages/chat/events/reply_content.dart @@ -1,8 +1,11 @@ +// Flutter imports: import 'package:flutter/material.dart'; +// Package imports: import 'package:flutter_gen/gen_l10n/l10n.dart'; import 'package:matrix/matrix.dart'; +// Project imports: import 'package:fluffychat/utils/matrix_sdk_extensions/matrix_locals.dart'; import '../../../config/app_config.dart'; diff --git a/lib/pages/chat/events/state_message.dart b/lib/pages/chat/events/state_message.dart index b5e54eba3..9790134f6 100644 --- a/lib/pages/chat/events/state_message.dart +++ b/lib/pages/chat/events/state_message.dart @@ -1,8 +1,11 @@ +// Flutter imports: import 'package:flutter/material.dart'; +// Package imports: import 'package:flutter_gen/gen_l10n/l10n.dart'; import 'package:matrix/matrix.dart'; +// Project imports: import 'package:fluffychat/utils/matrix_sdk_extensions/matrix_locals.dart'; import '../../../config/app_config.dart'; diff --git a/lib/pages/chat/events/sticker.dart b/lib/pages/chat/events/sticker.dart index 8e52bfe39..64af7b55e 100644 --- a/lib/pages/chat/events/sticker.dart +++ b/lib/pages/chat/events/sticker.dart @@ -1,9 +1,12 @@ +// Flutter imports: import 'package:flutter/material.dart'; +// Package imports: import 'package:adaptive_dialog/adaptive_dialog.dart'; import 'package:flutter_gen/gen_l10n/l10n.dart'; import 'package:matrix/matrix.dart'; +// Project imports: import '../../../config/app_config.dart'; import 'image_bubble.dart'; diff --git a/lib/pages/chat/events/verification_request_content.dart b/lib/pages/chat/events/verification_request_content.dart index eacd3e259..eb65b7107 100644 --- a/lib/pages/chat/events/verification_request_content.dart +++ b/lib/pages/chat/events/verification_request_content.dart @@ -1,7 +1,11 @@ +// Flutter imports: import 'package:flutter/material.dart'; + +// Package imports: import 'package:flutter_gen/gen_l10n/l10n.dart'; import 'package:matrix/matrix.dart'; +// Project imports: import '../../../config/app_config.dart'; class VerificationRequestContent extends StatelessWidget { diff --git a/lib/pages/chat/events/video_player.dart b/lib/pages/chat/events/video_player.dart index 28a06267b..8d24e6c6b 100644 --- a/lib/pages/chat/events/video_player.dart +++ b/lib/pages/chat/events/video_player.dart @@ -1,11 +1,12 @@ +// Dart imports: import 'dart:io'; -import 'package:chewie/chewie.dart'; -import 'package:fluffychat/pages/chat/events/image_bubble.dart'; -import 'package:fluffychat/utils/localized_exception_extension.dart'; -import 'package:fluffychat/utils/matrix_sdk_extensions/event_extension.dart'; +// Flutter imports: import 'package:flutter/foundation.dart'; import 'package:flutter/material.dart'; + +// Package imports: +import 'package:chewie/chewie.dart'; import 'package:flutter_blurhash/flutter_blurhash.dart'; import 'package:flutter_gen/gen_l10n/l10n.dart'; import 'package:matrix/matrix.dart'; @@ -13,6 +14,10 @@ import 'package:path_provider/path_provider.dart'; import 'package:universal_html/html.dart' as html; import 'package:video_player/video_player.dart'; +// Project imports: +import 'package:fluffychat/pages/chat/events/image_bubble.dart'; +import 'package:fluffychat/utils/localized_exception_extension.dart'; +import 'package:fluffychat/utils/matrix_sdk_extensions/event_extension.dart'; import '../../../utils/error_reporter.dart'; class EventVideoPlayer extends StatefulWidget { diff --git a/lib/pages/chat/input_bar.dart b/lib/pages/chat/input_bar.dart index 5c45734da..bd126da8b 100644 --- a/lib/pages/chat/input_bar.dart +++ b/lib/pages/chat/input_bar.dart @@ -1,14 +1,18 @@ -import 'package:emojis/emoji.dart'; -import 'package:fluffychat/config/app_config.dart'; -import 'package:fluffychat/pangea/widgets/igc/pangea_text_controller.dart'; -import 'package:fluffychat/utils/platform_infos.dart'; +// Flutter imports: import 'package:flutter/material.dart'; import 'package:flutter/services.dart'; + +// Package imports: +import 'package:emojis/emoji.dart'; import 'package:flutter_typeahead/flutter_typeahead.dart'; import 'package:matrix/matrix.dart'; import 'package:pasteboard/pasteboard.dart'; import 'package:slugify/slugify.dart'; +// Project imports: +import 'package:fluffychat/config/app_config.dart'; +import 'package:fluffychat/pangea/widgets/igc/pangea_text_controller.dart'; +import 'package:fluffychat/utils/platform_infos.dart'; import '../../widgets/matrix.dart'; class InputBar extends StatelessWidget { diff --git a/lib/pages/chat/pinned_events.dart b/lib/pages/chat/pinned_events.dart index e5fd60b75..8a4da2857 100644 --- a/lib/pages/chat/pinned_events.dart +++ b/lib/pages/chat/pinned_events.dart @@ -1,14 +1,20 @@ +// Dart imports: import 'dart:async'; +// Flutter imports: +import 'package:flutter/material.dart'; + +// Package imports: import 'package:adaptive_dialog/adaptive_dialog.dart'; +import 'package:flutter_gen/gen_l10n/l10n.dart'; +import 'package:flutter_linkify/flutter_linkify.dart'; +import 'package:matrix/matrix.dart'; + +// Project imports: import 'package:fluffychat/config/app_config.dart'; import 'package:fluffychat/pages/chat/chat.dart'; import 'package:fluffychat/utils/matrix_sdk_extensions/matrix_locals.dart'; import 'package:fluffychat/utils/url_launcher.dart'; -import 'package:flutter/material.dart'; -import 'package:flutter_gen/gen_l10n/l10n.dart'; -import 'package:flutter_linkify/flutter_linkify.dart'; -import 'package:matrix/matrix.dart'; class PinnedEvents extends StatelessWidget { final ChatController controller; diff --git a/lib/pages/chat/reactions_picker.dart b/lib/pages/chat/reactions_picker.dart index ad8b63ef8..f60920ef9 100644 --- a/lib/pages/chat/reactions_picker.dart +++ b/lib/pages/chat/reactions_picker.dart @@ -1,10 +1,14 @@ +// Flutter imports: +import 'package:flutter/material.dart'; + +// Package imports: import 'package:emoji_proposal/emoji_proposal.dart'; +import 'package:matrix/matrix.dart'; + +// Project imports: import 'package:fluffychat/config/app_config.dart'; import 'package:fluffychat/config/app_emojis.dart'; import 'package:fluffychat/pages/chat/chat.dart'; -import 'package:flutter/material.dart'; -import 'package:matrix/matrix.dart'; - import '../../config/themes.dart'; class ReactionsPicker extends StatelessWidget { diff --git a/lib/pages/chat/recording_dialog.dart b/lib/pages/chat/recording_dialog.dart index 267f82c62..800c3da34 100644 --- a/lib/pages/chat/recording_dialog.dart +++ b/lib/pages/chat/recording_dialog.dart @@ -1,14 +1,19 @@ +// Dart imports: import 'dart:async'; -import 'package:fluffychat/config/app_config.dart'; -import 'package:fluffychat/utils/platform_infos.dart'; +// Flutter imports: import 'package:flutter/cupertino.dart'; import 'package:flutter/material.dart'; + +// Package imports: import 'package:flutter_gen/gen_l10n/l10n.dart'; import 'package:path_provider/path_provider.dart'; import 'package:record/record.dart'; import 'package:wakelock_plus/wakelock_plus.dart'; +// Project imports: +import 'package:fluffychat/config/app_config.dart'; +import 'package:fluffychat/utils/platform_infos.dart'; import 'events/audio_player.dart'; class RecordingDialog extends StatefulWidget { diff --git a/lib/pages/chat/reply_display.dart b/lib/pages/chat/reply_display.dart index 32bec7c25..62391811f 100644 --- a/lib/pages/chat/reply_display.dart +++ b/lib/pages/chat/reply_display.dart @@ -1,8 +1,11 @@ +// Flutter imports: import 'package:flutter/material.dart'; +// Package imports: import 'package:flutter_gen/gen_l10n/l10n.dart'; import 'package:matrix/matrix.dart'; +// Project imports: import 'package:fluffychat/utils/matrix_sdk_extensions/matrix_locals.dart'; import '../../config/themes.dart'; import 'chat.dart'; diff --git a/lib/pages/chat/seen_by_row.dart b/lib/pages/chat/seen_by_row.dart index faac0db4d..9475550e2 100644 --- a/lib/pages/chat/seen_by_row.dart +++ b/lib/pages/chat/seen_by_row.dart @@ -1,5 +1,7 @@ +// Flutter imports: import 'package:flutter/material.dart'; +// Project imports: import 'package:fluffychat/config/themes.dart'; import 'package:fluffychat/pages/chat/chat.dart'; import 'package:fluffychat/utils/room_status_extension.dart'; diff --git a/lib/pages/chat/send_file_dialog.dart b/lib/pages/chat/send_file_dialog.dart index 958f430c7..f4fe65efd 100644 --- a/lib/pages/chat/send_file_dialog.dart +++ b/lib/pages/chat/send_file_dialog.dart @@ -1,12 +1,16 @@ -import 'package:fluffychat/config/app_config.dart'; -import 'package:fluffychat/utils/localized_exception_extension.dart'; -import 'package:fluffychat/utils/size_string.dart'; +// Flutter imports: import 'package:flutter/cupertino.dart'; import 'package:flutter/material.dart'; + +// Package imports: import 'package:flutter_gen/gen_l10n/l10n.dart'; import 'package:future_loading_dialog/future_loading_dialog.dart'; import 'package:matrix/matrix.dart'; +// Project imports: +import 'package:fluffychat/config/app_config.dart'; +import 'package:fluffychat/utils/localized_exception_extension.dart'; +import 'package:fluffychat/utils/size_string.dart'; import '../../utils/resize_image.dart'; class SendFileDialog extends StatefulWidget { diff --git a/lib/pages/chat/send_location_dialog.dart b/lib/pages/chat/send_location_dialog.dart index b2a99004e..91886e5d1 100644 --- a/lib/pages/chat/send_location_dialog.dart +++ b/lib/pages/chat/send_location_dialog.dart @@ -1,13 +1,17 @@ +// Dart imports: import 'dart:async'; +// Flutter imports: import 'package:flutter/cupertino.dart'; import 'package:flutter/material.dart'; +// Package imports: import 'package:flutter_gen/gen_l10n/l10n.dart'; import 'package:future_loading_dialog/future_loading_dialog.dart'; import 'package:geolocator/geolocator.dart'; import 'package:matrix/matrix.dart'; +// Project imports: import 'package:fluffychat/pages/chat/events/map_bubble.dart'; class SendLocationDialog extends StatefulWidget { diff --git a/lib/pages/chat/sticker_picker_dialog.dart b/lib/pages/chat/sticker_picker_dialog.dart index 16065c916..ae28b547d 100644 --- a/lib/pages/chat/sticker_picker_dialog.dart +++ b/lib/pages/chat/sticker_picker_dialog.dart @@ -1,8 +1,11 @@ +// Flutter imports: import 'package:flutter/material.dart'; +// Package imports: import 'package:flutter_gen/gen_l10n/l10n.dart'; import 'package:matrix/matrix.dart'; +// Project imports: import '../../widgets/avatar.dart'; import 'events/image_bubble.dart'; diff --git a/lib/pages/chat/tombstone_display.dart b/lib/pages/chat/tombstone_display.dart index e080a0009..10ad5fc6f 100644 --- a/lib/pages/chat/tombstone_display.dart +++ b/lib/pages/chat/tombstone_display.dart @@ -1,8 +1,11 @@ +// Flutter imports: import 'package:flutter/material.dart'; +// Package imports: import 'package:flutter_gen/gen_l10n/l10n.dart'; import 'package:matrix/matrix.dart'; +// Project imports: import 'chat.dart'; class TombstoneDisplay extends StatelessWidget { diff --git a/lib/pages/chat/typing_indicators.dart b/lib/pages/chat/typing_indicators.dart index 8101fd76f..1fe38e882 100644 --- a/lib/pages/chat/typing_indicators.dart +++ b/lib/pages/chat/typing_indicators.dart @@ -1,5 +1,7 @@ +// Flutter imports: import 'package:flutter/material.dart'; +// Project imports: import 'package:fluffychat/config/app_config.dart'; import 'package:fluffychat/config/themes.dart'; import 'package:fluffychat/pages/chat/chat.dart'; diff --git a/lib/pages/chat/widgets_bottom_sheet.dart b/lib/pages/chat/widgets_bottom_sheet.dart index 7a52929ce..a91ed345f 100644 --- a/lib/pages/chat/widgets_bottom_sheet.dart +++ b/lib/pages/chat/widgets_bottom_sheet.dart @@ -1,9 +1,12 @@ +// Flutter imports: import 'package:flutter/material.dart'; +// Package imports: import 'package:flutter_gen/gen_l10n/l10n.dart'; import 'package:matrix/matrix.dart'; import 'package:url_launcher/link.dart'; +// Project imports: import 'edit_widgets_dialog.dart'; class WidgetsBottomSheet extends StatelessWidget { diff --git a/lib/pages/chat_details/chat_details.dart b/lib/pages/chat_details/chat_details.dart index cbdca647a..d359168b9 100644 --- a/lib/pages/chat_details/chat_details.dart +++ b/lib/pages/chat_details/chat_details.dart @@ -1,6 +1,19 @@ +// Flutter imports: +import 'package:flutter/material.dart'; +import 'package:flutter/services.dart'; + +// Package imports: import 'package:adaptive_dialog/adaptive_dialog.dart'; import 'package:collection/collection.dart'; import 'package:file_picker/file_picker.dart'; +import 'package:flutter_gen/gen_l10n/l10n.dart'; +import 'package:future_loading_dialog/future_loading_dialog.dart'; +import 'package:go_router/go_router.dart'; +import 'package:image_picker/image_picker.dart'; +import 'package:matrix/matrix.dart' as matrix; +import 'package:matrix/matrix.dart'; + +// Project imports: import 'package:fluffychat/pages/chat_details/chat_details_view.dart'; import 'package:fluffychat/pages/settings/settings.dart'; import 'package:fluffychat/pangea/utils/set_class_name.dart'; @@ -10,14 +23,6 @@ import 'package:fluffychat/utils/matrix_sdk_extensions/matrix_locals.dart'; import 'package:fluffychat/utils/platform_infos.dart'; import 'package:fluffychat/widgets/app_lock.dart'; import 'package:fluffychat/widgets/matrix.dart'; -import 'package:flutter/material.dart'; -import 'package:flutter/services.dart'; -import 'package:flutter_gen/gen_l10n/l10n.dart'; -import 'package:future_loading_dialog/future_loading_dialog.dart'; -import 'package:go_router/go_router.dart'; -import 'package:image_picker/image_picker.dart'; -import 'package:matrix/matrix.dart' as matrix; -import 'package:matrix/matrix.dart'; enum AliasActions { copy, delete, setCanonical } diff --git a/lib/pages/chat_details/chat_details_view.dart b/lib/pages/chat_details/chat_details_view.dart index 1667a8702..8cede0a82 100644 --- a/lib/pages/chat_details/chat_details_view.dart +++ b/lib/pages/chat_details/chat_details_view.dart @@ -1,3 +1,13 @@ +// Flutter imports: +import 'package:flutter/material.dart'; + +// Package imports: +import 'package:flutter_gen/gen_l10n/l10n.dart'; +import 'package:future_loading_dialog/future_loading_dialog.dart'; +import 'package:go_router/go_router.dart'; +import 'package:matrix/matrix.dart'; + +// Project imports: import 'package:fluffychat/config/app_config.dart'; import 'package:fluffychat/pages/chat_details/chat_details.dart'; import 'package:fluffychat/pages/chat_details/participant_list_item.dart'; @@ -19,11 +29,6 @@ import 'package:fluffychat/widgets/avatar.dart'; import 'package:fluffychat/widgets/chat_settings_popup_menu.dart'; import 'package:fluffychat/widgets/layouts/max_width_body.dart'; import 'package:fluffychat/widgets/matrix.dart'; -import 'package:flutter/material.dart'; -import 'package:flutter_gen/gen_l10n/l10n.dart'; -import 'package:future_loading_dialog/future_loading_dialog.dart'; -import 'package:go_router/go_router.dart'; -import 'package:matrix/matrix.dart'; class ChatDetailsView extends StatelessWidget { final ChatDetailsController controller; diff --git a/lib/pages/chat_details/participant_list_item.dart b/lib/pages/chat_details/participant_list_item.dart index 89b8d034d..7fdfe1aad 100644 --- a/lib/pages/chat_details/participant_list_item.dart +++ b/lib/pages/chat_details/participant_list_item.dart @@ -1,9 +1,13 @@ -import 'package:fluffychat/pangea/utils/bot_name.dart'; -import 'package:fluffychat/utils/adaptive_bottom_sheet.dart'; +// Flutter imports: import 'package:flutter/material.dart'; + +// Package imports: import 'package:flutter_gen/gen_l10n/l10n.dart'; import 'package:matrix/matrix.dart'; +// Project imports: +import 'package:fluffychat/pangea/utils/bot_name.dart'; +import 'package:fluffychat/utils/adaptive_bottom_sheet.dart'; import '../../widgets/avatar.dart'; import '../user_bottom_sheet/user_bottom_sheet.dart'; diff --git a/lib/pages/chat_encryption_settings/chat_encryption_settings.dart b/lib/pages/chat_encryption_settings/chat_encryption_settings.dart index c0c4a4cb4..54afb66a7 100644 --- a/lib/pages/chat_encryption_settings/chat_encryption_settings.dart +++ b/lib/pages/chat_encryption_settings/chat_encryption_settings.dart @@ -1,13 +1,17 @@ -import 'package:adaptive_dialog/adaptive_dialog.dart'; -import 'package:fluffychat/pages/chat_encryption_settings/chat_encryption_settings_view.dart'; -import 'package:fluffychat/widgets/matrix.dart'; +// Flutter imports: import 'package:flutter/material.dart'; + +// Package imports: +import 'package:adaptive_dialog/adaptive_dialog.dart'; import 'package:flutter_gen/gen_l10n/l10n.dart'; import 'package:future_loading_dialog/future_loading_dialog.dart'; import 'package:go_router/go_router.dart'; import 'package:matrix/encryption.dart'; import 'package:matrix/matrix.dart'; +// Project imports: +import 'package:fluffychat/pages/chat_encryption_settings/chat_encryption_settings_view.dart'; +import 'package:fluffychat/widgets/matrix.dart'; import '../key_verification/key_verification_dialog.dart'; class ChatEncryptionSettings extends StatefulWidget { diff --git a/lib/pages/chat_encryption_settings/chat_encryption_settings_view.dart b/lib/pages/chat_encryption_settings/chat_encryption_settings_view.dart index 83788f3f1..1af9a2c7d 100644 --- a/lib/pages/chat_encryption_settings/chat_encryption_settings_view.dart +++ b/lib/pages/chat_encryption_settings/chat_encryption_settings_view.dart @@ -1,13 +1,18 @@ -import 'package:fluffychat/config/app_config.dart'; -import 'package:fluffychat/pages/chat_encryption_settings/chat_encryption_settings.dart'; -import 'package:fluffychat/utils/beautify_string_extension.dart'; -import 'package:fluffychat/widgets/layouts/max_width_body.dart'; +// Flutter imports: import 'package:flutter/material.dart'; + +// Package imports: import 'package:flutter_gen/gen_l10n/l10n.dart'; import 'package:go_router/go_router.dart'; import 'package:matrix/matrix.dart'; import 'package:url_launcher/url_launcher_string.dart'; +// Project imports: +import 'package:fluffychat/config/app_config.dart'; +import 'package:fluffychat/pages/chat_encryption_settings/chat_encryption_settings.dart'; +import 'package:fluffychat/utils/beautify_string_extension.dart'; +import 'package:fluffychat/widgets/layouts/max_width_body.dart'; + class ChatEncryptionSettingsView extends StatelessWidget { final ChatEncryptionSettingsController controller; diff --git a/lib/pages/chat_list/chat_list.dart b/lib/pages/chat_list/chat_list.dart index 3bb0b0bb1..0fec5645b 100644 --- a/lib/pages/chat_list/chat_list.dart +++ b/lib/pages/chat_list/chat_list.dart @@ -1,8 +1,23 @@ +// Dart imports: import 'dart:async'; import 'dart:io'; +// Flutter imports: +import 'package:flutter/foundation.dart'; +import 'package:flutter/material.dart'; +import 'package:flutter/services.dart'; + +// Package imports: import 'package:adaptive_dialog/adaptive_dialog.dart'; import 'package:collection/collection.dart'; +import 'package:flutter_gen/gen_l10n/l10n.dart'; +import 'package:future_loading_dialog/future_loading_dialog.dart'; +import 'package:go_router/go_router.dart'; +import 'package:matrix/matrix.dart'; +import 'package:receive_sharing_intent/receive_sharing_intent.dart'; +import 'package:uni_links/uni_links.dart'; + +// Project imports: import 'package:fluffychat/config/app_config.dart'; import 'package:fluffychat/config/themes.dart'; import 'package:fluffychat/pages/chat_list/chat_list_view.dart'; @@ -17,18 +32,6 @@ import 'package:fluffychat/utils/localized_exception_extension.dart'; import 'package:fluffychat/utils/matrix_sdk_extensions/client_stories_extension.dart'; import 'package:fluffychat/utils/matrix_sdk_extensions/matrix_locals.dart'; import 'package:fluffychat/utils/platform_infos.dart'; -import 'package:fluffychat/utils/tor_stub.dart' - if (dart.library.html) 'package:tor_detector_web/tor_detector_web.dart'; -import 'package:flutter/foundation.dart'; -import 'package:flutter/material.dart'; -import 'package:flutter/services.dart'; -import 'package:flutter_gen/gen_l10n/l10n.dart'; -import 'package:future_loading_dialog/future_loading_dialog.dart'; -import 'package:go_router/go_router.dart'; -import 'package:matrix/matrix.dart'; -import 'package:receive_sharing_intent/receive_sharing_intent.dart'; -import 'package:uni_links/uni_links.dart'; - import '../../../utils/account_bundles.dart'; import '../../utils/matrix_sdk_extensions/matrix_file_extension.dart'; import '../../utils/url_launcher.dart'; @@ -36,6 +39,10 @@ import '../../utils/voip/callkeep_manager.dart'; import '../../widgets/fluffy_chat_app.dart'; import '../../widgets/matrix.dart'; +import 'package:fluffychat/utils/tor_stub.dart' + if (dart.library.html) 'package:tor_detector_web/tor_detector_web.dart'; + + enum SelectMode { normal, share, diff --git a/lib/pages/chat_list/chat_list_body.dart b/lib/pages/chat_list/chat_list_body.dart index d10ff0545..536214f31 100644 --- a/lib/pages/chat_list/chat_list_body.dart +++ b/lib/pages/chat_list/chat_list_body.dart @@ -1,4 +1,12 @@ +// Flutter imports: +import 'package:flutter/material.dart'; + +// Package imports: import 'package:animations/animations.dart'; +import 'package:flutter_gen/gen_l10n/l10n.dart'; +import 'package:matrix/matrix.dart'; + +// Project imports: import 'package:fluffychat/pages/chat_list/chat_list.dart'; import 'package:fluffychat/pages/chat_list/chat_list_item.dart'; import 'package:fluffychat/pages/chat_list/search_title.dart'; @@ -10,10 +18,6 @@ import 'package:fluffychat/utils/matrix_sdk_extensions/matrix_locals.dart'; import 'package:fluffychat/utils/stream_extension.dart'; import 'package:fluffychat/widgets/avatar.dart'; import 'package:fluffychat/widgets/public_room_bottom_sheet.dart'; -import 'package:flutter/material.dart'; -import 'package:flutter_gen/gen_l10n/l10n.dart'; -import 'package:matrix/matrix.dart'; - import '../../config/themes.dart'; import '../../widgets/connection_status_header.dart'; import '../../widgets/matrix.dart'; diff --git a/lib/pages/chat_list/chat_list_header.dart b/lib/pages/chat_list/chat_list_header.dart index e8c71c55a..caa844a95 100644 --- a/lib/pages/chat_list/chat_list_header.dart +++ b/lib/pages/chat_list/chat_list_header.dart @@ -1,8 +1,13 @@ +// Flutter imports: +import 'package:flutter/material.dart'; + +// Package imports: +import 'package:flutter_gen/gen_l10n/l10n.dart'; + +// Project imports: import 'package:fluffychat/config/themes.dart'; import 'package:fluffychat/pages/chat_list/chat_list.dart'; import 'package:fluffychat/pages/chat_list/client_chooser_button.dart'; -import 'package:flutter/material.dart'; -import 'package:flutter_gen/gen_l10n/l10n.dart'; class ChatListHeader extends StatelessWidget implements PreferredSizeWidget { final ChatListController controller; diff --git a/lib/pages/chat_list/chat_list_item.dart b/lib/pages/chat_list/chat_list_item.dart index d48ee688b..c245b64bc 100644 --- a/lib/pages/chat_list/chat_list_item.dart +++ b/lib/pages/chat_list/chat_list_item.dart @@ -1,15 +1,19 @@ -import 'package:adaptive_dialog/adaptive_dialog.dart'; -import 'package:fluffychat/config/app_config.dart'; -import 'package:fluffychat/pangea/extensions/pangea_room_extension.dart'; -import 'package:fluffychat/pangea/utils/get_chat_list_item_subtitle.dart'; -import 'package:fluffychat/utils/matrix_sdk_extensions/matrix_locals.dart'; -import 'package:fluffychat/utils/room_status_extension.dart'; +// Flutter imports: import 'package:flutter/material.dart'; + +// Package imports: +import 'package:adaptive_dialog/adaptive_dialog.dart'; import 'package:flutter_gen/gen_l10n/l10n.dart'; import 'package:future_loading_dialog/future_loading_dialog.dart'; import 'package:go_router/go_router.dart'; import 'package:matrix/matrix.dart'; +// Project imports: +import 'package:fluffychat/config/app_config.dart'; +import 'package:fluffychat/pangea/extensions/pangea_room_extension.dart'; +import 'package:fluffychat/pangea/utils/get_chat_list_item_subtitle.dart'; +import 'package:fluffychat/utils/matrix_sdk_extensions/matrix_locals.dart'; +import 'package:fluffychat/utils/room_status_extension.dart'; import '../../config/themes.dart'; import '../../utils/date_time_extension.dart'; import '../../widgets/avatar.dart'; diff --git a/lib/pages/chat_list/chat_list_view.dart b/lib/pages/chat_list/chat_list_view.dart index f23d16b1d..48378bdf8 100644 --- a/lib/pages/chat_list/chat_list_view.dart +++ b/lib/pages/chat_list/chat_list_view.dart @@ -1,4 +1,12 @@ +// Flutter imports: +import 'package:flutter/material.dart'; + +// Package imports: import 'package:badges/badges.dart'; +import 'package:flutter_gen/gen_l10n/l10n.dart'; +import 'package:matrix/matrix.dart'; + +// Project imports: import 'package:fluffychat/config/app_config.dart'; import 'package:fluffychat/config/themes.dart'; import 'package:fluffychat/pages/chat_list/chat_list.dart'; @@ -8,10 +16,6 @@ import 'package:fluffychat/pangea/utils/chat_list_handle_space_tap.dart'; import 'package:fluffychat/utils/matrix_sdk_extensions/matrix_locals.dart'; import 'package:fluffychat/widgets/avatar.dart'; import 'package:fluffychat/widgets/unread_rooms_badge.dart'; -import 'package:flutter/material.dart'; -import 'package:flutter_gen/gen_l10n/l10n.dart'; -import 'package:matrix/matrix.dart'; - import '../../widgets/matrix.dart'; import 'chat_list_body.dart'; import 'start_chat_fab.dart'; diff --git a/lib/pages/chat_list/client_chooser_button.dart b/lib/pages/chat_list/client_chooser_button.dart index 6253b74cd..c40c09968 100644 --- a/lib/pages/chat_list/client_chooser_button.dart +++ b/lib/pages/chat_list/client_chooser_button.dart @@ -1,18 +1,23 @@ +// Dart imports: import 'dart:developer'; -import 'package:fluffychat/pangea/extensions/client_extension.dart'; -import 'package:fluffychat/pangea/utils/class_code.dart'; -import 'package:fluffychat/pangea/utils/find_conversation_partner_dialog.dart'; -import 'package:fluffychat/pangea/utils/logout.dart'; -import 'package:fluffychat/widgets/matrix.dart'; +// Flutter imports: import 'package:flutter/foundation.dart'; import 'package:flutter/material.dart'; import 'package:flutter/services.dart'; + +// Package imports: import 'package:flutter_gen/gen_l10n/l10n.dart'; import 'package:go_router/go_router.dart'; import 'package:keyboard_shortcuts/keyboard_shortcuts.dart'; import 'package:matrix/matrix.dart'; +// Project imports: +import 'package:fluffychat/pangea/extensions/client_extension.dart'; +import 'package:fluffychat/pangea/utils/class_code.dart'; +import 'package:fluffychat/pangea/utils/find_conversation_partner_dialog.dart'; +import 'package:fluffychat/pangea/utils/logout.dart'; +import 'package:fluffychat/widgets/matrix.dart'; import '../../utils/fluffy_share.dart'; import 'chat_list.dart'; diff --git a/lib/pages/chat_list/navi_rail_item.dart b/lib/pages/chat_list/navi_rail_item.dart index 52bc5d214..98df834fa 100644 --- a/lib/pages/chat_list/navi_rail_item.dart +++ b/lib/pages/chat_list/navi_rail_item.dart @@ -1,6 +1,8 @@ -import 'package:fluffychat/config/app_config.dart'; +// Flutter imports: import 'package:flutter/material.dart'; +// Project imports: +import 'package:fluffychat/config/app_config.dart'; import '../../config/themes.dart'; class NaviRailItem extends StatefulWidget { diff --git a/lib/pages/chat_list/search_title.dart b/lib/pages/chat_list/search_title.dart index 62bcfb684..5523d4912 100644 --- a/lib/pages/chat_list/search_title.dart +++ b/lib/pages/chat_list/search_title.dart @@ -1,3 +1,4 @@ +// Flutter imports: import 'package:flutter/material.dart'; class SearchTitle extends StatelessWidget { diff --git a/lib/pages/chat_list/space_view.dart b/lib/pages/chat_list/space_view.dart index e066eb50f..abe7ee2c0 100644 --- a/lib/pages/chat_list/space_view.dart +++ b/lib/pages/chat_list/space_view.dart @@ -1,7 +1,18 @@ +// Dart imports: import 'dart:async'; +// Flutter imports: +import 'package:flutter/material.dart'; + +// Package imports: import 'package:adaptive_dialog/adaptive_dialog.dart'; import 'package:collection/collection.dart'; +import 'package:flutter_gen/gen_l10n/l10n.dart'; +import 'package:future_loading_dialog/future_loading_dialog.dart'; +import 'package:go_router/go_router.dart'; +import 'package:matrix/matrix.dart'; + +// Project imports: import 'package:fluffychat/pages/chat_list/chat_list.dart'; import 'package:fluffychat/pages/chat_list/chat_list_item.dart'; import 'package:fluffychat/pages/chat_list/search_title.dart'; @@ -11,12 +22,6 @@ import 'package:fluffychat/pangea/utils/archive_space.dart'; import 'package:fluffychat/pangea/utils/chat_list_handle_space_tap.dart'; import 'package:fluffychat/utils/matrix_sdk_extensions/matrix_locals.dart'; import 'package:fluffychat/widgets/avatar.dart'; -import 'package:flutter/material.dart'; -import 'package:flutter_gen/gen_l10n/l10n.dart'; -import 'package:future_loading_dialog/future_loading_dialog.dart'; -import 'package:go_router/go_router.dart'; -import 'package:matrix/matrix.dart'; - import '../../utils/localized_exception_extension.dart'; import '../../widgets/matrix.dart'; import 'chat_list_header.dart'; diff --git a/lib/pages/chat_list/start_chat_fab.dart b/lib/pages/chat_list/start_chat_fab.dart index 059181e09..a7f8e57e5 100644 --- a/lib/pages/chat_list/start_chat_fab.dart +++ b/lib/pages/chat_list/start_chat_fab.dart @@ -1,11 +1,17 @@ +// Dart imports: import 'dart:core'; -import 'package:fluffychat/config/themes.dart'; -import 'package:fluffychat/pages/chat_list/chat_list.dart'; +// Flutter imports: import 'package:flutter/material.dart'; + +// Package imports: import 'package:flutter_gen/gen_l10n/l10n.dart'; import 'package:go_router/go_router.dart'; +// Project imports: +import 'package:fluffychat/config/themes.dart'; +import 'package:fluffychat/pages/chat_list/chat_list.dart'; + class StartChatFloatingActionButton extends StatelessWidget { final ActiveFilter activeFilter; final ValueNotifier scrolledToTop; diff --git a/lib/pages/chat_list/stories_header.dart b/lib/pages/chat_list/stories_header.dart index c655cf2e1..8c150c922 100644 --- a/lib/pages/chat_list/stories_header.dart +++ b/lib/pages/chat_list/stories_header.dart @@ -1,16 +1,20 @@ +// Flutter imports: +import 'package:flutter/material.dart'; + +// Package imports: import 'package:adaptive_dialog/adaptive_dialog.dart'; import 'package:collection/collection.dart'; -import 'package:fluffychat/config/app_config.dart'; -import 'package:fluffychat/utils/matrix_sdk_extensions/client_stories_extension.dart'; -import 'package:fluffychat/utils/matrix_sdk_extensions/matrix_locals.dart'; -import 'package:fluffychat/widgets/avatar.dart'; -import 'package:fluffychat/widgets/matrix.dart'; -import 'package:flutter/material.dart'; import 'package:flutter_gen/gen_l10n/l10n.dart'; import 'package:future_loading_dialog/future_loading_dialog.dart'; import 'package:go_router/go_router.dart'; import 'package:matrix/matrix.dart'; +// Project imports: +import 'package:fluffychat/config/app_config.dart'; +import 'package:fluffychat/utils/matrix_sdk_extensions/client_stories_extension.dart'; +import 'package:fluffychat/utils/matrix_sdk_extensions/matrix_locals.dart'; +import 'package:fluffychat/widgets/avatar.dart'; +import 'package:fluffychat/widgets/matrix.dart'; import '../../config/themes.dart'; enum ContextualRoomAction { diff --git a/lib/pages/chat_members/chat_members.dart b/lib/pages/chat_members/chat_members.dart index c777d286e..ba20d011d 100644 --- a/lib/pages/chat_members/chat_members.dart +++ b/lib/pages/chat_members/chat_members.dart @@ -1,7 +1,10 @@ +// Flutter imports: import 'package:flutter/material.dart'; +// Package imports: import 'package:matrix/matrix.dart'; +// Project imports: import '../../widgets/matrix.dart'; import 'chat_members_view.dart'; diff --git a/lib/pages/chat_members/chat_members_view.dart b/lib/pages/chat_members/chat_members_view.dart index f5250f30a..e9b282b00 100644 --- a/lib/pages/chat_members/chat_members_view.dart +++ b/lib/pages/chat_members/chat_members_view.dart @@ -1,8 +1,11 @@ +// Flutter imports: import 'package:flutter/material.dart'; +// Package imports: import 'package:flutter_gen/gen_l10n/l10n.dart'; import 'package:go_router/go_router.dart'; +// Project imports: import 'package:fluffychat/utils/localized_exception_extension.dart'; import '../../widgets/layouts/max_width_body.dart'; import '../../widgets/matrix.dart'; diff --git a/lib/pages/chat_permissions_settings/chat_permissions_settings.dart b/lib/pages/chat_permissions_settings/chat_permissions_settings.dart index 1186efe53..e8560b1f5 100644 --- a/lib/pages/chat_permissions_settings/chat_permissions_settings.dart +++ b/lib/pages/chat_permissions_settings/chat_permissions_settings.dart @@ -1,15 +1,21 @@ +// Dart imports: import 'dart:developer'; -import 'package:adaptive_dialog/adaptive_dialog.dart'; -import 'package:fluffychat/pages/chat_permissions_settings/chat_permissions_settings_view.dart'; -import 'package:fluffychat/widgets/matrix.dart'; -import 'package:fluffychat/widgets/permission_slider_dialog.dart'; +// Flutter imports: import 'package:flutter/material.dart'; + +// Package imports: +import 'package:adaptive_dialog/adaptive_dialog.dart'; import 'package:flutter_gen/gen_l10n/l10n.dart'; import 'package:future_loading_dialog/future_loading_dialog.dart'; import 'package:go_router/go_router.dart'; import 'package:matrix/matrix.dart'; +// Project imports: +import 'package:fluffychat/pages/chat_permissions_settings/chat_permissions_settings_view.dart'; +import 'package:fluffychat/widgets/matrix.dart'; +import 'package:fluffychat/widgets/permission_slider_dialog.dart'; + class ChatPermissionsSettings extends StatefulWidget { const ChatPermissionsSettings({super.key}); 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 c3ef20f6d..23d65e005 100644 --- a/lib/pages/chat_permissions_settings/chat_permissions_settings_view.dart +++ b/lib/pages/chat_permissions_settings/chat_permissions_settings_view.dart @@ -1,10 +1,15 @@ +// Flutter imports: +import 'package:flutter/material.dart'; + +// Package imports: +import 'package:flutter_gen/gen_l10n/l10n.dart'; +import 'package:matrix/matrix.dart'; + +// Project imports: import 'package:fluffychat/pages/chat_permissions_settings/chat_permissions_settings.dart'; import 'package:fluffychat/pages/chat_permissions_settings/permission_list_tile.dart'; import 'package:fluffychat/widgets/layouts/max_width_body.dart'; import 'package:fluffychat/widgets/matrix.dart'; -import 'package:flutter/material.dart'; -import 'package:flutter_gen/gen_l10n/l10n.dart'; -import 'package:matrix/matrix.dart'; class ChatPermissionsSettingsView extends StatelessWidget { final ChatPermissionsSettingsController controller; diff --git a/lib/pages/chat_permissions_settings/permission_list_tile.dart b/lib/pages/chat_permissions_settings/permission_list_tile.dart index cf8d795ab..d6a418817 100644 --- a/lib/pages/chat_permissions_settings/permission_list_tile.dart +++ b/lib/pages/chat_permissions_settings/permission_list_tile.dart @@ -1,4 +1,7 @@ +// Flutter imports: import 'package:flutter/material.dart'; + +// Package imports: import 'package:flutter_gen/gen_l10n/l10n.dart'; import 'package:matrix/matrix.dart'; diff --git a/lib/pages/device_settings/device_settings.dart b/lib/pages/device_settings/device_settings.dart index c0b8526d8..41f447124 100644 --- a/lib/pages/device_settings/device_settings.dart +++ b/lib/pages/device_settings/device_settings.dart @@ -1,14 +1,18 @@ +// Flutter imports: +import 'package:flutter/material.dart'; + +// Package imports: import 'package:adaptive_dialog/adaptive_dialog.dart'; import 'package:collection/collection.dart' show IterableExtension; -import 'package:fluffychat/pages/device_settings/device_settings_view.dart'; -import 'package:fluffychat/pages/key_verification/key_verification_dialog.dart'; -import 'package:fluffychat/utils/localized_exception_extension.dart'; -import 'package:flutter/material.dart'; import 'package:flutter_gen/gen_l10n/l10n.dart'; import 'package:future_loading_dialog/future_loading_dialog.dart'; import 'package:matrix/encryption/utils/key_verification.dart'; import 'package:matrix/matrix.dart'; +// Project imports: +import 'package:fluffychat/pages/device_settings/device_settings_view.dart'; +import 'package:fluffychat/pages/key_verification/key_verification_dialog.dart'; +import 'package:fluffychat/utils/localized_exception_extension.dart'; import '../../widgets/matrix.dart'; class DevicesSettings extends StatefulWidget { diff --git a/lib/pages/device_settings/device_settings_view.dart b/lib/pages/device_settings/device_settings_view.dart index d644089dd..ebf21d5fd 100644 --- a/lib/pages/device_settings/device_settings_view.dart +++ b/lib/pages/device_settings/device_settings_view.dart @@ -1,8 +1,12 @@ -import 'package:fluffychat/pages/device_settings/device_settings.dart'; -import 'package:fluffychat/widgets/layouts/max_width_body.dart'; +// Flutter imports: import 'package:flutter/material.dart'; + +// Package imports: import 'package:flutter_gen/gen_l10n/l10n.dart'; +// Project imports: +import 'package:fluffychat/pages/device_settings/device_settings.dart'; +import 'package:fluffychat/widgets/layouts/max_width_body.dart'; import 'user_device_list_item.dart'; class DevicesSettingsView extends StatelessWidget { diff --git a/lib/pages/device_settings/user_device_list_item.dart b/lib/pages/device_settings/user_device_list_item.dart index db793ac35..3eb34912e 100644 --- a/lib/pages/device_settings/user_device_list_item.dart +++ b/lib/pages/device_settings/user_device_list_item.dart @@ -1,9 +1,12 @@ +// Flutter imports: import 'package:flutter/material.dart'; +// Package imports: import 'package:adaptive_dialog/adaptive_dialog.dart'; import 'package:flutter_gen/gen_l10n/l10n.dart'; import 'package:matrix/matrix.dart'; +// Project imports: import '../../utils/date_time_extension.dart'; import '../../utils/matrix_sdk_extensions/device_extension.dart'; import '../../widgets/matrix.dart'; diff --git a/lib/pages/dialer/dialer.dart b/lib/pages/dialer/dialer.dart index ab2462b3a..1ebbb565e 100644 --- a/lib/pages/dialer/dialer.dart +++ b/lib/pages/dialer/dialer.dart @@ -16,14 +16,15 @@ * along with this program. If not, see . */ +// Dart imports: import 'dart:async'; import 'dart:math'; -import 'package:fluffychat/utils/matrix_sdk_extensions/matrix_locals.dart'; -import 'package:fluffychat/utils/platform_infos.dart'; -import 'package:fluffychat/widgets/avatar.dart'; +// Flutter imports: import 'package:flutter/foundation.dart'; import 'package:flutter/material.dart'; + +// Package imports: import 'package:flutter_foreground_task/flutter_foreground_task.dart'; import 'package:flutter_gen/gen_l10n/l10n.dart'; import 'package:flutter_webrtc/flutter_webrtc.dart'; @@ -32,6 +33,10 @@ import 'package:matrix/matrix.dart'; import 'package:vibration/vibration.dart'; import 'package:wakelock_plus/wakelock_plus.dart'; +// Project imports: +import 'package:fluffychat/utils/matrix_sdk_extensions/matrix_locals.dart'; +import 'package:fluffychat/utils/platform_infos.dart'; +import 'package:fluffychat/widgets/avatar.dart'; import 'pip/pip_view.dart'; class _StreamView extends StatelessWidget { diff --git a/lib/pages/dialer/pip/dismiss_keyboard.dart b/lib/pages/dialer/pip/dismiss_keyboard.dart index c9ca3180f..ab100cfc9 100644 --- a/lib/pages/dialer/pip/dismiss_keyboard.dart +++ b/lib/pages/dialer/pip/dismiss_keyboard.dart @@ -1,3 +1,4 @@ +// Flutter imports: import 'package:flutter/material.dart'; void dismissKeyboard(BuildContext context) { diff --git a/lib/pages/dialer/pip/pip_view.dart b/lib/pages/dialer/pip/pip_view.dart index 5396c9136..b12d10e67 100644 --- a/lib/pages/dialer/pip/pip_view.dart +++ b/lib/pages/dialer/pip/pip_view.dart @@ -1,5 +1,7 @@ +// Flutter imports: import 'package:flutter/material.dart'; +// Project imports: import 'package:fluffychat/config/themes.dart'; import 'dismiss_keyboard.dart'; diff --git a/lib/pages/homeserver_picker/homeserver_app_bar.dart b/lib/pages/homeserver_picker/homeserver_app_bar.dart index ca3d874b1..5f4132648 100644 --- a/lib/pages/homeserver_picker/homeserver_app_bar.dart +++ b/lib/pages/homeserver_picker/homeserver_app_bar.dart @@ -1,9 +1,13 @@ -import 'package:fluffychat/config/app_config.dart'; +// Flutter imports: import 'package:flutter/material.dart'; + +// Package imports: import 'package:flutter_gen/gen_l10n/l10n.dart'; import 'package:flutter_typeahead/flutter_typeahead.dart'; import 'package:matrix_homeserver_recommendations/matrix_homeserver_recommendations.dart'; +// Project imports: +import 'package:fluffychat/config/app_config.dart'; import 'homeserver_bottom_sheet.dart'; import 'homeserver_picker.dart'; diff --git a/lib/pages/homeserver_picker/homeserver_bottom_sheet.dart b/lib/pages/homeserver_picker/homeserver_bottom_sheet.dart index 0fc6d0112..e91ec07af 100644 --- a/lib/pages/homeserver_picker/homeserver_bottom_sheet.dart +++ b/lib/pages/homeserver_picker/homeserver_bottom_sheet.dart @@ -1,5 +1,7 @@ +// Flutter imports: import 'package:flutter/material.dart'; +// Package imports: import 'package:matrix_homeserver_recommendations/matrix_homeserver_recommendations.dart'; import 'package:url_launcher/url_launcher_string.dart'; diff --git a/lib/pages/homeserver_picker/homeserver_picker.dart b/lib/pages/homeserver_picker/homeserver_picker.dart index 9eb945f17..681c1343f 100644 --- a/lib/pages/homeserver_picker/homeserver_picker.dart +++ b/lib/pages/homeserver_picker/homeserver_picker.dart @@ -1,19 +1,14 @@ +// Dart imports: import 'dart:async'; +// Flutter imports: +import 'package:flutter/foundation.dart'; +import 'package:flutter/material.dart'; + +// Package imports: import 'package:adaptive_dialog/adaptive_dialog.dart'; import 'package:collection/collection.dart'; import 'package:file_picker/file_picker.dart'; -import 'package:fluffychat/config/app_config.dart'; -import 'package:fluffychat/pages/homeserver_picker/homeserver_picker_view.dart'; -import 'package:fluffychat/pangea/utils/error_handler.dart'; -import 'package:fluffychat/pangea/utils/firebase_analytics.dart'; -import 'package:fluffychat/utils/platform_infos.dart'; -import 'package:fluffychat/utils/tor_stub.dart' - if (dart.library.html) 'package:tor_detector_web/tor_detector_web.dart'; -import 'package:fluffychat/widgets/app_lock.dart'; -import 'package:fluffychat/widgets/matrix.dart'; -import 'package:flutter/foundation.dart'; -import 'package:flutter/material.dart'; import 'package:flutter_gen/gen_l10n/l10n.dart'; import 'package:flutter_web_auth_2/flutter_web_auth_2.dart'; import 'package:future_loading_dialog/future_loading_dialog.dart'; @@ -22,8 +17,20 @@ import 'package:hive_flutter/hive_flutter.dart'; import 'package:matrix/matrix.dart'; import 'package:universal_html/html.dart' as html; +// Project imports: +import 'package:fluffychat/config/app_config.dart'; +import 'package:fluffychat/pages/homeserver_picker/homeserver_picker_view.dart'; +import 'package:fluffychat/pangea/utils/error_handler.dart'; +import 'package:fluffychat/pangea/utils/firebase_analytics.dart'; +import 'package:fluffychat/utils/platform_infos.dart'; +import 'package:fluffychat/widgets/app_lock.dart'; +import 'package:fluffychat/widgets/matrix.dart'; import '../../utils/localized_exception_extension.dart'; +import 'package:fluffychat/utils/tor_stub.dart' + if (dart.library.html) 'package:tor_detector_web/tor_detector_web.dart'; + + class HomeserverPicker extends StatefulWidget { const HomeserverPicker({super.key}); diff --git a/lib/pages/homeserver_picker/homeserver_picker_view.dart b/lib/pages/homeserver_picker/homeserver_picker_view.dart index 94cce0698..59ac6746b 100644 --- a/lib/pages/homeserver_picker/homeserver_picker_view.dart +++ b/lib/pages/homeserver_picker/homeserver_picker_view.dart @@ -1,11 +1,15 @@ +// Flutter imports: +import 'package:flutter/material.dart'; + +// Package imports: +import 'package:flutter_gen/gen_l10n/l10n.dart'; + +// Project imports: import 'package:fluffychat/config/app_config.dart'; import 'package:fluffychat/pangea/pages/connect/p_sso_button.dart'; import 'package:fluffychat/pangea/widgets/common/pangea_logo_svg.dart'; import 'package:fluffychat/pangea/widgets/signup/signup_buttons.dart'; import 'package:fluffychat/widgets/layouts/login_scaffold.dart'; -import 'package:flutter/material.dart'; -import 'package:flutter_gen/gen_l10n/l10n.dart'; - import 'homeserver_picker.dart'; class HomeserverPickerView extends StatelessWidget { diff --git a/lib/pages/image_viewer/image_viewer.dart b/lib/pages/image_viewer/image_viewer.dart index f7d3ea544..ad4d63efb 100644 --- a/lib/pages/image_viewer/image_viewer.dart +++ b/lib/pages/image_viewer/image_viewer.dart @@ -1,10 +1,14 @@ -import 'package:fluffychat/pages/image_viewer/image_viewer_view.dart'; -import 'package:fluffychat/utils/platform_infos.dart'; -import 'package:fluffychat/widgets/matrix.dart'; +// Flutter imports: import 'package:flutter/material.dart'; + +// Package imports: import 'package:go_router/go_router.dart'; import 'package:matrix/matrix.dart'; +// Project imports: +import 'package:fluffychat/pages/image_viewer/image_viewer_view.dart'; +import 'package:fluffychat/utils/platform_infos.dart'; +import 'package:fluffychat/widgets/matrix.dart'; import '../../utils/matrix_sdk_extensions/event_extension.dart'; class ImageViewer extends StatefulWidget { diff --git a/lib/pages/image_viewer/image_viewer_view.dart b/lib/pages/image_viewer/image_viewer_view.dart index c53c2b57a..248654cac 100644 --- a/lib/pages/image_viewer/image_viewer_view.dart +++ b/lib/pages/image_viewer/image_viewer_view.dart @@ -1,8 +1,12 @@ -import 'package:fluffychat/utils/platform_infos.dart'; -import 'package:fluffychat/widgets/mxc_image.dart'; +// Flutter imports: import 'package:flutter/material.dart'; + +// Package imports: import 'package:flutter_gen/gen_l10n/l10n.dart'; +// Project imports: +import 'package:fluffychat/utils/platform_infos.dart'; +import 'package:fluffychat/widgets/mxc_image.dart'; import 'image_viewer.dart'; class ImageViewerView extends StatelessWidget { diff --git a/lib/pages/invitation_selection/invitation_selection.dart b/lib/pages/invitation_selection/invitation_selection.dart index 5ac12f9a8..29b68c0c7 100644 --- a/lib/pages/invitation_selection/invitation_selection.dart +++ b/lib/pages/invitation_selection/invitation_selection.dart @@ -1,6 +1,16 @@ +// Dart imports: import 'dart:async'; +// Flutter imports: +import 'package:flutter/material.dart'; + +// Package imports: import 'package:adaptive_dialog/adaptive_dialog.dart'; +import 'package:flutter_gen/gen_l10n/l10n.dart'; +import 'package:future_loading_dialog/future_loading_dialog.dart'; +import 'package:matrix/matrix.dart'; + +// Project imports: import 'package:fluffychat/pages/invitation_selection/invitation_selection_view.dart'; import 'package:fluffychat/pangea/constants/class_default_values.dart'; import 'package:fluffychat/pangea/extensions/pangea_room_extension.dart'; @@ -8,11 +18,6 @@ import 'package:fluffychat/pangea/utils/bot_name.dart'; import 'package:fluffychat/pangea/utils/error_handler.dart'; import 'package:fluffychat/utils/matrix_sdk_extensions/matrix_locals.dart'; import 'package:fluffychat/widgets/matrix.dart'; -import 'package:flutter/material.dart'; -import 'package:flutter_gen/gen_l10n/l10n.dart'; -import 'package:future_loading_dialog/future_loading_dialog.dart'; -import 'package:matrix/matrix.dart'; - import '../../utils/localized_exception_extension.dart'; //#Pangea diff --git a/lib/pages/invitation_selection/invitation_selection_view.dart b/lib/pages/invitation_selection/invitation_selection_view.dart index aa055ddf6..690975332 100644 --- a/lib/pages/invitation_selection/invitation_selection_view.dart +++ b/lib/pages/invitation_selection/invitation_selection_view.dart @@ -1,10 +1,15 @@ +// Flutter imports: +import 'package:flutter/material.dart'; + +// Package imports: +import 'package:flutter_gen/gen_l10n/l10n.dart'; +import 'package:matrix/matrix.dart'; + +// Project imports: import 'package:fluffychat/pages/invitation_selection/invitation_selection.dart'; import 'package:fluffychat/widgets/avatar.dart'; import 'package:fluffychat/widgets/layouts/max_width_body.dart'; import 'package:fluffychat/widgets/matrix.dart'; -import 'package:flutter/material.dart'; -import 'package:flutter_gen/gen_l10n/l10n.dart'; -import 'package:matrix/matrix.dart'; class InvitationSelectionView extends StatelessWidget { final InvitationSelectionController controller; diff --git a/lib/pages/key_verification/key_verification_dialog.dart b/lib/pages/key_verification/key_verification_dialog.dart index d86ff3e00..914f2e43b 100644 --- a/lib/pages/key_verification/key_verification_dialog.dart +++ b/lib/pages/key_verification/key_verification_dialog.dart @@ -1,15 +1,21 @@ +// Dart imports: import 'dart:convert'; import 'dart:ui'; -import 'package:adaptive_dialog/adaptive_dialog.dart'; -import 'package:fluffychat/widgets/avatar.dart'; +// Flutter imports: import 'package:flutter/material.dart'; import 'package:flutter/services.dart'; + +// Package imports: +import 'package:adaptive_dialog/adaptive_dialog.dart'; import 'package:flutter_gen/gen_l10n/l10n.dart'; import 'package:future_loading_dialog/future_loading_dialog.dart'; import 'package:matrix/encryption.dart'; import 'package:matrix/matrix.dart'; +// Project imports: +import 'package:fluffychat/widgets/avatar.dart'; + class KeyVerificationDialog extends StatefulWidget { Future show(BuildContext context) => showAdaptiveDialog( context: context, diff --git a/lib/pages/login/login.dart b/lib/pages/login/login.dart index 23edaff28..45268150a 100644 --- a/lib/pages/login/login.dart +++ b/lib/pages/login/login.dart @@ -1,15 +1,20 @@ +// Dart imports: import 'dart:async'; -import 'package:adaptive_dialog/adaptive_dialog.dart'; -import 'package:fluffychat/pangea/controllers/pangea_controller.dart'; -import 'package:fluffychat/pangea/utils/firebase_analytics.dart'; -import 'package:fluffychat/utils/localized_exception_extension.dart'; -import 'package:fluffychat/widgets/matrix.dart'; +// Flutter imports: import 'package:flutter/material.dart'; + +// Package imports: +import 'package:adaptive_dialog/adaptive_dialog.dart'; import 'package:flutter_gen/gen_l10n/l10n.dart'; import 'package:future_loading_dialog/future_loading_dialog.dart'; import 'package:matrix/matrix.dart'; +// Project imports: +import 'package:fluffychat/pangea/controllers/pangea_controller.dart'; +import 'package:fluffychat/pangea/utils/firebase_analytics.dart'; +import 'package:fluffychat/utils/localized_exception_extension.dart'; +import 'package:fluffychat/widgets/matrix.dart'; import '../../utils/platform_infos.dart'; import 'login_view.dart'; diff --git a/lib/pages/login/login_view.dart b/lib/pages/login/login_view.dart index 9ce89a4fc..e69b30d2a 100644 --- a/lib/pages/login/login_view.dart +++ b/lib/pages/login/login_view.dart @@ -1,8 +1,12 @@ -import 'package:fluffychat/pangea/utils/password_forgotten.dart'; -import 'package:fluffychat/widgets/layouts/login_scaffold.dart'; +// Flutter imports: import 'package:flutter/material.dart'; + +// Package imports: import 'package:flutter_gen/gen_l10n/l10n.dart'; +// Project imports: +import 'package:fluffychat/pangea/utils/password_forgotten.dart'; +import 'package:fluffychat/widgets/layouts/login_scaffold.dart'; import 'login.dart'; class LoginView extends StatelessWidget { diff --git a/lib/pages/new_group/new_group.dart b/lib/pages/new_group/new_group.dart index 28d325d9f..987353cce 100644 --- a/lib/pages/new_group/new_group.dart +++ b/lib/pages/new_group/new_group.dart @@ -1,6 +1,16 @@ +// Dart imports: import 'dart:typed_data'; +// Flutter imports: +import 'package:flutter/material.dart'; + +// Package imports: import 'package:file_picker/file_picker.dart'; +import 'package:flutter_gen/gen_l10n/l10n.dart'; +import 'package:go_router/go_router.dart'; +import 'package:matrix/matrix.dart' as sdk; + +// Project imports: import 'package:fluffychat/pages/new_group/new_group_view.dart'; import 'package:fluffychat/pangea/controllers/pangea_controller.dart'; import 'package:fluffychat/pangea/models/chat_topic_model.dart'; @@ -9,10 +19,6 @@ import 'package:fluffychat/pangea/utils/class_chat_power_levels.dart'; import 'package:fluffychat/pangea/utils/firebase_analytics.dart'; import 'package:fluffychat/pangea/widgets/class/add_space_toggles.dart'; import 'package:fluffychat/widgets/matrix.dart'; -import 'package:flutter/material.dart'; -import 'package:flutter_gen/gen_l10n/l10n.dart'; -import 'package:go_router/go_router.dart'; -import 'package:matrix/matrix.dart' as sdk; class NewGroup extends StatefulWidget { const NewGroup({super.key}); diff --git a/lib/pages/new_group/new_group_view.dart b/lib/pages/new_group/new_group_view.dart index 62addb0dc..77e096f11 100644 --- a/lib/pages/new_group/new_group_view.dart +++ b/lib/pages/new_group/new_group_view.dart @@ -1,3 +1,10 @@ +// Flutter imports: +import 'package:flutter/material.dart'; + +// Package imports: +import 'package:flutter_gen/gen_l10n/l10n.dart'; + +// Project imports: import 'package:fluffychat/config/themes.dart'; import 'package:fluffychat/pages/new_group/new_group.dart'; import 'package:fluffychat/pangea/widgets/class/add_class_and_invite.dart'; @@ -5,8 +12,6 @@ import 'package:fluffychat/pangea/widgets/class/add_space_toggles.dart'; import 'package:fluffychat/utils/localized_exception_extension.dart'; import 'package:fluffychat/widgets/avatar.dart'; import 'package:fluffychat/widgets/layouts/max_width_body.dart'; -import 'package:flutter/material.dart'; -import 'package:flutter_gen/gen_l10n/l10n.dart'; class NewGroupView extends StatelessWidget { final NewGroupController controller; diff --git a/lib/pages/new_private_chat/new_private_chat.dart b/lib/pages/new_private_chat/new_private_chat.dart index 09b401988..7454dd5a9 100644 --- a/lib/pages/new_private_chat/new_private_chat.dart +++ b/lib/pages/new_private_chat/new_private_chat.dart @@ -1,6 +1,16 @@ +// Dart imports: import 'dart:async'; +// Flutter imports: +import 'package:flutter/material.dart'; +import 'package:flutter/services.dart'; + +// Package imports: import 'package:device_info_plus/device_info_plus.dart'; +import 'package:flutter_gen/gen_l10n/l10n.dart'; +import 'package:matrix/matrix.dart'; + +// Project imports: import 'package:fluffychat/pages/new_private_chat/new_private_chat_view.dart'; import 'package:fluffychat/pages/new_private_chat/qr_scanner_modal.dart'; import 'package:fluffychat/pages/user_bottom_sheet/user_bottom_sheet.dart'; @@ -9,10 +19,6 @@ import 'package:fluffychat/utils/fluffy_share.dart'; import 'package:fluffychat/utils/platform_infos.dart'; import 'package:fluffychat/utils/url_launcher.dart'; import 'package:fluffychat/widgets/matrix.dart'; -import 'package:flutter/material.dart'; -import 'package:flutter/services.dart'; -import 'package:flutter_gen/gen_l10n/l10n.dart'; -import 'package:matrix/matrix.dart'; class NewPrivateChat extends StatefulWidget { const NewPrivateChat({super.key}); diff --git a/lib/pages/new_private_chat/new_private_chat_view.dart b/lib/pages/new_private_chat/new_private_chat_view.dart index ef2f4a761..2bd61984d 100644 --- a/lib/pages/new_private_chat/new_private_chat_view.dart +++ b/lib/pages/new_private_chat/new_private_chat_view.dart @@ -1,5 +1,15 @@ +// Dart imports: import 'dart:math'; +// Flutter imports: +import 'package:flutter/material.dart'; + +// Package imports: +import 'package:flutter_gen/gen_l10n/l10n.dart'; +import 'package:go_router/go_router.dart'; +import 'package:matrix/matrix.dart'; + +// Project imports: import 'package:fluffychat/config/app_config.dart'; import 'package:fluffychat/config/themes.dart'; import 'package:fluffychat/pages/new_private_chat/new_private_chat.dart'; @@ -9,10 +19,6 @@ import 'package:fluffychat/utils/url_launcher.dart'; import 'package:fluffychat/widgets/avatar.dart'; import 'package:fluffychat/widgets/layouts/max_width_body.dart'; import 'package:fluffychat/widgets/matrix.dart'; -import 'package:flutter/material.dart'; -import 'package:flutter_gen/gen_l10n/l10n.dart'; -import 'package:go_router/go_router.dart'; -import 'package:matrix/matrix.dart'; class NewPrivateChatView extends StatelessWidget { final NewPrivateChatController controller; diff --git a/lib/pages/new_private_chat/qr_scanner_modal.dart b/lib/pages/new_private_chat/qr_scanner_modal.dart index b509941e5..a4bce8eeb 100644 --- a/lib/pages/new_private_chat/qr_scanner_modal.dart +++ b/lib/pages/new_private_chat/qr_scanner_modal.dart @@ -1,8 +1,11 @@ +// Dart imports: import 'dart:async'; import 'dart:io'; +// Flutter imports: import 'package:flutter/material.dart'; +// Package imports: import 'package:flutter_gen/gen_l10n/l10n.dart'; import 'package:qr_code_scanner/qr_code_scanner.dart'; diff --git a/lib/pages/new_space/new_space.dart b/lib/pages/new_space/new_space.dart index 7f1c34021..b97d2509b 100644 --- a/lib/pages/new_space/new_space.dart +++ b/lib/pages/new_space/new_space.dart @@ -1,5 +1,18 @@ +// Dart imports: import 'dart:developer'; +// Flutter imports: +import 'package:flutter/foundation.dart'; +import 'package:flutter/material.dart'; + +// Package imports: +import 'package:flutter_gen/gen_l10n/l10n.dart'; +import 'package:future_loading_dialog/future_loading_dialog.dart'; +import 'package:go_router/go_router.dart'; +import 'package:matrix/matrix.dart' as sdk; +import 'package:matrix/matrix.dart'; + +// Project imports: import 'package:fluffychat/pages/new_space/new_space_view.dart'; import 'package:fluffychat/pangea/constants/class_default_values.dart'; import 'package:fluffychat/pangea/constants/pangea_event_types.dart'; @@ -13,13 +26,6 @@ import 'package:fluffychat/pangea/utils/firebase_analytics.dart'; import 'package:fluffychat/pangea/widgets/class/add_space_toggles.dart'; import 'package:fluffychat/pangea/widgets/space/class_settings.dart'; import 'package:fluffychat/widgets/matrix.dart'; -import 'package:flutter/foundation.dart'; -import 'package:flutter/material.dart'; -import 'package:flutter_gen/gen_l10n/l10n.dart'; -import 'package:future_loading_dialog/future_loading_dialog.dart'; -import 'package:go_router/go_router.dart'; -import 'package:matrix/matrix.dart' as sdk; -import 'package:matrix/matrix.dart'; class NewSpace extends StatefulWidget { const NewSpace({super.key}); diff --git a/lib/pages/new_space/new_space_view.dart b/lib/pages/new_space/new_space_view.dart index e16a6d76a..dc40e74ac 100644 --- a/lib/pages/new_space/new_space_view.dart +++ b/lib/pages/new_space/new_space_view.dart @@ -1,3 +1,11 @@ +// Flutter imports: +import 'package:flutter/material.dart'; +import 'package:flutter/services.dart'; + +// Package imports: +import 'package:flutter_gen/gen_l10n/l10n.dart'; + +// Project imports: import 'package:fluffychat/config/app_config.dart'; import 'package:fluffychat/pangea/constants/class_default_values.dart'; import 'package:fluffychat/pangea/pages/class_settings/p_class_widgets/room_rules_editor.dart'; @@ -5,10 +13,6 @@ import 'package:fluffychat/pangea/widgets/class/add_class_and_invite.dart'; import 'package:fluffychat/pangea/widgets/class/add_space_toggles.dart'; import 'package:fluffychat/pangea/widgets/space/class_settings.dart'; import 'package:fluffychat/widgets/layouts/max_width_body.dart'; -import 'package:flutter/material.dart'; -import 'package:flutter/services.dart'; -import 'package:flutter_gen/gen_l10n/l10n.dart'; - import 'new_space.dart'; class NewSpaceView extends StatelessWidget { diff --git a/lib/pages/settings/settings.dart b/lib/pages/settings/settings.dart index a23dd0655..e6ba63dea 100644 --- a/lib/pages/settings/settings.dart +++ b/lib/pages/settings/settings.dart @@ -1,17 +1,22 @@ +// Dart imports: import 'dart:async'; +// Flutter imports: +import 'package:flutter/material.dart'; + +// Package imports: import 'package:adaptive_dialog/adaptive_dialog.dart'; import 'package:collection/collection.dart'; import 'package:file_picker/file_picker.dart'; -import 'package:fluffychat/pangea/utils/logout.dart'; -import 'package:fluffychat/utils/platform_infos.dart'; -import 'package:fluffychat/widgets/app_lock.dart'; -import 'package:flutter/material.dart'; import 'package:flutter_gen/gen_l10n/l10n.dart'; import 'package:future_loading_dialog/future_loading_dialog.dart'; import 'package:image_picker/image_picker.dart'; import 'package:matrix/matrix.dart'; +// Project imports: +import 'package:fluffychat/pangea/utils/logout.dart'; +import 'package:fluffychat/utils/platform_infos.dart'; +import 'package:fluffychat/widgets/app_lock.dart'; import '../../widgets/matrix.dart'; import 'settings_view.dart'; diff --git a/lib/pages/settings/settings_view.dart b/lib/pages/settings/settings_view.dart index e7714c863..aaa7de7fd 100644 --- a/lib/pages/settings/settings_view.dart +++ b/lib/pages/settings/settings_view.dart @@ -1,14 +1,18 @@ -import 'package:fluffychat/config/app_config.dart'; -import 'package:fluffychat/pangea/config/environment.dart'; -import 'package:fluffychat/utils/fluffy_share.dart'; -import 'package:fluffychat/widgets/avatar.dart'; -import 'package:fluffychat/widgets/matrix.dart'; +// Flutter imports: import 'package:flutter/material.dart'; + +// Package imports: import 'package:flutter_gen/gen_l10n/l10n.dart'; import 'package:go_router/go_router.dart'; import 'package:matrix/matrix.dart'; import 'package:url_launcher/url_launcher_string.dart'; +// Project imports: +import 'package:fluffychat/config/app_config.dart'; +import 'package:fluffychat/pangea/config/environment.dart'; +import 'package:fluffychat/utils/fluffy_share.dart'; +import 'package:fluffychat/widgets/avatar.dart'; +import 'package:fluffychat/widgets/matrix.dart'; import 'settings.dart'; class SettingsView extends StatelessWidget { diff --git a/lib/pages/settings_3pid/settings_3pid.dart b/lib/pages/settings_3pid/settings_3pid.dart index d46cac2a9..d96d44b20 100644 --- a/lib/pages/settings_3pid/settings_3pid.dart +++ b/lib/pages/settings_3pid/settings_3pid.dart @@ -1,10 +1,13 @@ +// Flutter imports: import 'package:flutter/material.dart'; +// Package imports: import 'package:adaptive_dialog/adaptive_dialog.dart'; import 'package:flutter_gen/gen_l10n/l10n.dart'; import 'package:future_loading_dialog/future_loading_dialog.dart'; import 'package:matrix/matrix.dart'; +// Project imports: import 'package:fluffychat/widgets/matrix.dart'; import 'settings_3pid_view.dart'; diff --git a/lib/pages/settings_3pid/settings_3pid_view.dart b/lib/pages/settings_3pid/settings_3pid_view.dart index d868a623a..863f0761c 100644 --- a/lib/pages/settings_3pid/settings_3pid_view.dart +++ b/lib/pages/settings_3pid/settings_3pid_view.dart @@ -1,9 +1,14 @@ -import 'package:fluffychat/pages/settings_3pid/settings_3pid.dart'; -import 'package:fluffychat/widgets/matrix.dart'; +// Flutter imports: import 'package:flutter/material.dart'; + +// Package imports: import 'package:flutter_gen/gen_l10n/l10n.dart'; import 'package:matrix/matrix.dart'; +// Project imports: +import 'package:fluffychat/pages/settings_3pid/settings_3pid.dart'; +import 'package:fluffychat/widgets/matrix.dart'; + class Settings3PidView extends StatelessWidget { final Settings3PidController controller; diff --git a/lib/pages/settings_chat/settings_chat.dart b/lib/pages/settings_chat/settings_chat.dart index 1c1035559..c07c9a6b8 100644 --- a/lib/pages/settings_chat/settings_chat.dart +++ b/lib/pages/settings_chat/settings_chat.dart @@ -1,5 +1,7 @@ +// Flutter imports: import 'package:flutter/material.dart'; +// Project imports: import 'settings_chat_view.dart'; class SettingsChat extends StatefulWidget { diff --git a/lib/pages/settings_chat/settings_chat_view.dart b/lib/pages/settings_chat/settings_chat_view.dart index 4034ea49c..67a8f5e6e 100644 --- a/lib/pages/settings_chat/settings_chat_view.dart +++ b/lib/pages/settings_chat/settings_chat_view.dart @@ -1,12 +1,16 @@ +// Flutter imports: +import 'package:flutter/material.dart'; + +// Package imports: +import 'package:flutter_gen/gen_l10n/l10n.dart'; + +// Project imports: import 'package:fluffychat/config/app_config.dart'; import 'package:fluffychat/config/setting_keys.dart'; import 'package:fluffychat/utils/platform_infos.dart'; import 'package:fluffychat/utils/voip/callkeep_manager.dart'; import 'package:fluffychat/widgets/layouts/max_width_body.dart'; import 'package:fluffychat/widgets/settings_switch_list_tile.dart'; -import 'package:flutter/material.dart'; -import 'package:flutter_gen/gen_l10n/l10n.dart'; - import 'settings_chat.dart'; class SettingsChatView extends StatelessWidget { diff --git a/lib/pages/settings_emotes/import_archive_dialog.dart b/lib/pages/settings_emotes/import_archive_dialog.dart index 0ed5bb21f..176f0cde1 100644 --- a/lib/pages/settings_emotes/import_archive_dialog.dart +++ b/lib/pages/settings_emotes/import_archive_dialog.dart @@ -1,14 +1,18 @@ +// Dart imports: import 'dart:async'; +// Flutter imports: import 'package:flutter/material.dart'; import 'package:flutter/services.dart'; +// Package imports: import 'package:adaptive_dialog/adaptive_dialog.dart'; import 'package:archive/archive.dart'; import 'package:collection/collection.dart'; import 'package:flutter_gen/gen_l10n/l10n.dart'; import 'package:matrix/matrix.dart'; +// Project imports: import 'package:fluffychat/pages/settings_emotes/settings_emotes.dart'; import 'package:fluffychat/utils/client_manager.dart'; import 'package:fluffychat/widgets/matrix.dart'; diff --git a/lib/pages/settings_emotes/settings_emotes.dart b/lib/pages/settings_emotes/settings_emotes.dart index 0ad77e68d..948801019 100644 --- a/lib/pages/settings_emotes/settings_emotes.dart +++ b/lib/pages/settings_emotes/settings_emotes.dart @@ -1,25 +1,32 @@ +// Dart imports: import 'dart:async'; -import 'package:adaptive_dialog/adaptive_dialog.dart'; -import 'package:archive/archive.dart' - if (dart.library.io) 'package:archive/archive_io.dart'; -import 'package:collection/collection.dart'; -import 'package:file_picker/file_picker.dart'; -import 'package:fluffychat/utils/client_manager.dart'; -import 'package:fluffychat/utils/matrix_sdk_extensions/matrix_file_extension.dart'; -import 'package:fluffychat/widgets/app_lock.dart'; +// Flutter imports: import 'package:flutter/foundation.dart'; import 'package:flutter/material.dart'; + +// Package imports: +import 'package:adaptive_dialog/adaptive_dialog.dart'; +import 'package:collection/collection.dart'; +import 'package:file_picker/file_picker.dart'; import 'package:flutter_gen/gen_l10n/l10n.dart'; import 'package:future_loading_dialog/future_loading_dialog.dart'; import 'package:go_router/go_router.dart'; import 'package:http/http.dart' hide Client; import 'package:matrix/matrix.dart'; +// Project imports: +import 'package:fluffychat/utils/client_manager.dart'; +import 'package:fluffychat/utils/matrix_sdk_extensions/matrix_file_extension.dart'; +import 'package:fluffychat/widgets/app_lock.dart'; import '../../widgets/matrix.dart'; import 'import_archive_dialog.dart'; import 'settings_emotes_view.dart'; +import 'package:archive/archive.dart' + if (dart.library.io) 'package:archive/archive_io.dart'; + + class EmotesSettings extends StatefulWidget { const EmotesSettings({super.key}); diff --git a/lib/pages/settings_emotes/settings_emotes_view.dart b/lib/pages/settings_emotes/settings_emotes_view.dart index 8557d453b..71fdf3aae 100644 --- a/lib/pages/settings_emotes/settings_emotes_view.dart +++ b/lib/pages/settings_emotes/settings_emotes_view.dart @@ -1,11 +1,15 @@ -import 'package:fluffychat/utils/platform_infos.dart'; -import 'package:fluffychat/widgets/layouts/max_width_body.dart'; -import 'package:fluffychat/widgets/mxc_image.dart'; +// Flutter imports: import 'package:flutter/material.dart'; import 'package:flutter/services.dart'; + +// Package imports: import 'package:flutter_gen/gen_l10n/l10n.dart'; import 'package:matrix/matrix.dart'; +// Project imports: +import 'package:fluffychat/utils/platform_infos.dart'; +import 'package:fluffychat/widgets/layouts/max_width_body.dart'; +import 'package:fluffychat/widgets/mxc_image.dart'; import '../../widgets/matrix.dart'; import 'settings_emotes.dart'; diff --git a/lib/pages/settings_ignore_list/settings_ignore_list.dart b/lib/pages/settings_ignore_list/settings_ignore_list.dart index 0b27cee3b..24b00faba 100644 --- a/lib/pages/settings_ignore_list/settings_ignore_list.dart +++ b/lib/pages/settings_ignore_list/settings_ignore_list.dart @@ -1,7 +1,10 @@ +// Flutter imports: import 'package:flutter/material.dart'; +// Package imports: import 'package:future_loading_dialog/future_loading_dialog.dart'; +// Project imports: import '../../widgets/matrix.dart'; import 'settings_ignore_list_view.dart'; diff --git a/lib/pages/settings_ignore_list/settings_ignore_list_view.dart b/lib/pages/settings_ignore_list/settings_ignore_list_view.dart index e1620ecb3..20e4dabce 100644 --- a/lib/pages/settings_ignore_list/settings_ignore_list_view.dart +++ b/lib/pages/settings_ignore_list/settings_ignore_list_view.dart @@ -1,9 +1,13 @@ -import 'package:fluffychat/widgets/avatar.dart'; +// Flutter imports: import 'package:flutter/material.dart'; + +// Package imports: import 'package:flutter_gen/gen_l10n/l10n.dart'; import 'package:future_loading_dialog/future_loading_dialog.dart'; import 'package:matrix/matrix.dart'; +// Project imports: +import 'package:fluffychat/widgets/avatar.dart'; import '../../widgets/matrix.dart'; import 'settings_ignore_list.dart'; diff --git a/lib/pages/settings_multiple_emotes/settings_multiple_emotes.dart b/lib/pages/settings_multiple_emotes/settings_multiple_emotes.dart index 4d2e983ed..9bd4224dd 100644 --- a/lib/pages/settings_multiple_emotes/settings_multiple_emotes.dart +++ b/lib/pages/settings_multiple_emotes/settings_multiple_emotes.dart @@ -1,6 +1,10 @@ +// Flutter imports: import 'package:flutter/material.dart'; + +// Package imports: import 'package:go_router/go_router.dart'; +// Project imports: import 'settings_multiple_emotes_view.dart'; class MultipleEmotesSettings extends StatefulWidget { diff --git a/lib/pages/settings_multiple_emotes/settings_multiple_emotes_view.dart b/lib/pages/settings_multiple_emotes/settings_multiple_emotes_view.dart index e6eedeffe..264c521c5 100644 --- a/lib/pages/settings_multiple_emotes/settings_multiple_emotes_view.dart +++ b/lib/pages/settings_multiple_emotes/settings_multiple_emotes_view.dart @@ -1,10 +1,15 @@ -import 'package:fluffychat/pages/settings_multiple_emotes/settings_multiple_emotes.dart'; -import 'package:fluffychat/widgets/matrix.dart'; +// Flutter imports: import 'package:flutter/material.dart'; + +// Package imports: import 'package:flutter_gen/gen_l10n/l10n.dart'; import 'package:go_router/go_router.dart'; import 'package:matrix/matrix.dart'; +// Project imports: +import 'package:fluffychat/pages/settings_multiple_emotes/settings_multiple_emotes.dart'; +import 'package:fluffychat/widgets/matrix.dart'; + class MultipleEmotesSettingsView extends StatelessWidget { final MultipleEmotesSettingsController controller; diff --git a/lib/pages/settings_notifications/settings_notifications.dart b/lib/pages/settings_notifications/settings_notifications.dart index 5721386db..514a973da 100644 --- a/lib/pages/settings_notifications/settings_notifications.dart +++ b/lib/pages/settings_notifications/settings_notifications.dart @@ -1,10 +1,14 @@ +// Flutter imports: +import 'package:flutter/material.dart'; + +// Package imports: import 'package:adaptive_dialog/adaptive_dialog.dart'; import 'package:collection/collection.dart' show IterableExtension; -import 'package:flutter/material.dart'; import 'package:flutter_gen/gen_l10n/l10n.dart'; import 'package:future_loading_dialog/future_loading_dialog.dart'; import 'package:matrix/matrix.dart'; +// Project imports: import '../../widgets/matrix.dart'; import 'settings_notifications_view.dart'; diff --git a/lib/pages/settings_notifications/settings_notifications_view.dart b/lib/pages/settings_notifications/settings_notifications_view.dart index 37846d8bb..77f1465d7 100644 --- a/lib/pages/settings_notifications/settings_notifications_view.dart +++ b/lib/pages/settings_notifications/settings_notifications_view.dart @@ -1,9 +1,13 @@ -import 'package:fluffychat/widgets/layouts/max_width_body.dart'; +// Flutter imports: import 'package:flutter/material.dart'; + +// Package imports: import 'package:flutter_gen/gen_l10n/l10n.dart'; import 'package:future_loading_dialog/future_loading_dialog.dart'; import 'package:matrix/matrix.dart'; +// Project imports: +import 'package:fluffychat/widgets/layouts/max_width_body.dart'; import '../../utils/localized_exception_extension.dart'; import '../../widgets/matrix.dart'; import 'settings_notifications.dart'; diff --git a/lib/pages/settings_security/settings_security.dart b/lib/pages/settings_security/settings_security.dart index fe927fc5b..115bafe12 100644 --- a/lib/pages/settings_security/settings_security.dart +++ b/lib/pages/settings_security/settings_security.dart @@ -1,16 +1,21 @@ +// Dart imports: import 'dart:convert'; import 'dart:typed_data'; -import 'package:adaptive_dialog/adaptive_dialog.dart'; -import 'package:fluffychat/utils/matrix_sdk_extensions/matrix_file_extension.dart'; -import 'package:fluffychat/widgets/app_lock.dart'; -import 'package:fluffychat/widgets/matrix.dart'; +// Flutter imports: import 'package:flutter/material.dart'; + +// Package imports: +import 'package:adaptive_dialog/adaptive_dialog.dart'; import 'package:flutter_gen/gen_l10n/l10n.dart'; import 'package:future_loading_dialog/future_loading_dialog.dart'; import 'package:intl/intl.dart'; import 'package:matrix/matrix.dart'; +// Project imports: +import 'package:fluffychat/utils/matrix_sdk_extensions/matrix_file_extension.dart'; +import 'package:fluffychat/widgets/app_lock.dart'; +import 'package:fluffychat/widgets/matrix.dart'; import '../bootstrap/bootstrap_dialog.dart'; import 'settings_security_view.dart'; diff --git a/lib/pages/settings_security/settings_security_view.dart b/lib/pages/settings_security/settings_security_view.dart index 9119fe277..39368b103 100644 --- a/lib/pages/settings_security/settings_security_view.dart +++ b/lib/pages/settings_security/settings_security_view.dart @@ -1,11 +1,15 @@ +// Flutter imports: +import 'package:flutter/material.dart'; + +// Package imports: +import 'package:flutter_gen/gen_l10n/l10n.dart'; +import 'package:go_router/go_router.dart'; + +// Project imports: import 'package:fluffychat/utils/beautify_string_extension.dart'; import 'package:fluffychat/utils/platform_infos.dart'; import 'package:fluffychat/widgets/layouts/max_width_body.dart'; import 'package:fluffychat/widgets/matrix.dart'; -import 'package:flutter/material.dart'; -import 'package:flutter_gen/gen_l10n/l10n.dart'; -import 'package:go_router/go_router.dart'; - import 'settings_security.dart'; class SettingsSecurityView extends StatelessWidget { diff --git a/lib/pages/settings_stories/settings_stories.dart b/lib/pages/settings_stories/settings_stories.dart index 16e9208bb..94fcacab1 100644 --- a/lib/pages/settings_stories/settings_stories.dart +++ b/lib/pages/settings_stories/settings_stories.dart @@ -1,8 +1,11 @@ +// Flutter imports: import 'package:flutter/material.dart'; +// Package imports: import 'package:future_loading_dialog/future_loading_dialog.dart'; import 'package:matrix/matrix.dart'; +// Project imports: import 'package:fluffychat/pages/settings_stories/settings_stories_view.dart'; import 'package:fluffychat/widgets/matrix.dart'; import '../../utils/matrix_sdk_extensions/client_stories_extension.dart'; diff --git a/lib/pages/settings_stories/settings_stories_view.dart b/lib/pages/settings_stories/settings_stories_view.dart index f5d71fab3..010c17dd3 100644 --- a/lib/pages/settings_stories/settings_stories_view.dart +++ b/lib/pages/settings_stories/settings_stories_view.dart @@ -1,7 +1,10 @@ +// Flutter imports: import 'package:flutter/material.dart'; +// Package imports: import 'package:flutter_gen/gen_l10n/l10n.dart'; +// Project imports: import 'package:fluffychat/pages/settings_stories/settings_stories.dart'; import 'package:fluffychat/utils/localized_exception_extension.dart'; import 'package:fluffychat/widgets/avatar.dart'; diff --git a/lib/pages/settings_style/settings_style.dart b/lib/pages/settings_style/settings_style.dart index 67c6d9738..94acc35c5 100644 --- a/lib/pages/settings_style/settings_style.dart +++ b/lib/pages/settings_style/settings_style.dart @@ -1,8 +1,11 @@ +// Flutter imports: import 'package:flutter/material.dart'; +// Package imports: import 'package:collection/collection.dart'; import 'package:file_picker/file_picker.dart'; +// Project imports: import 'package:fluffychat/config/app_config.dart'; import 'package:fluffychat/config/setting_keys.dart'; import 'package:fluffychat/widgets/app_lock.dart'; diff --git a/lib/pages/settings_style/settings_style_view.dart b/lib/pages/settings_style/settings_style_view.dart index 7e08df92a..c05837dab 100644 --- a/lib/pages/settings_style/settings_style_view.dart +++ b/lib/pages/settings_style/settings_style_view.dart @@ -1,8 +1,12 @@ -import 'package:fluffychat/config/themes.dart'; -import 'package:fluffychat/widgets/layouts/max_width_body.dart'; +// Flutter imports: import 'package:flutter/material.dart'; + +// Package imports: import 'package:flutter_gen/gen_l10n/l10n.dart'; +// Project imports: +import 'package:fluffychat/config/themes.dart'; +import 'package:fluffychat/widgets/layouts/max_width_body.dart'; import '../../config/app_config.dart'; import '../../widgets/matrix.dart'; import 'settings_style.dart'; diff --git a/lib/pages/story/story_page.dart b/lib/pages/story/story_page.dart index d92f7a53b..e2f49d44a 100644 --- a/lib/pages/story/story_page.dart +++ b/lib/pages/story/story_page.dart @@ -1,8 +1,21 @@ +// Dart imports: import 'dart:async'; import 'dart:io'; +// Flutter imports: +import 'package:flutter/material.dart'; + +// Package imports: import 'package:adaptive_dialog/adaptive_dialog.dart'; import 'package:emoji_picker_flutter/emoji_picker_flutter.dart'; +import 'package:flutter_gen/gen_l10n/l10n.dart'; +import 'package:future_loading_dialog/future_loading_dialog.dart'; +import 'package:go_router/go_router.dart'; +import 'package:matrix/matrix.dart'; +import 'package:path_provider/path_provider.dart'; +import 'package:video_player/video_player.dart'; + +// Project imports: import 'package:fluffychat/pages/story/story_view.dart'; import 'package:fluffychat/utils/adaptive_bottom_sheet.dart'; import 'package:fluffychat/utils/date_time_extension.dart'; @@ -13,13 +26,6 @@ import 'package:fluffychat/utils/room_status_extension.dart'; import 'package:fluffychat/utils/story_theme_data.dart'; import 'package:fluffychat/widgets/avatar.dart'; import 'package:fluffychat/widgets/matrix.dart'; -import 'package:flutter/material.dart'; -import 'package:flutter_gen/gen_l10n/l10n.dart'; -import 'package:future_loading_dialog/future_loading_dialog.dart'; -import 'package:go_router/go_router.dart'; -import 'package:matrix/matrix.dart'; -import 'package:path_provider/path_provider.dart'; -import 'package:video_player/video_player.dart'; class StoryPage extends StatefulWidget { const StoryPage({super.key}); diff --git a/lib/pages/story/story_view.dart b/lib/pages/story/story_view.dart index 58c433bb2..c980e3e21 100644 --- a/lib/pages/story/story_view.dart +++ b/lib/pages/story/story_view.dart @@ -1,3 +1,15 @@ +// Flutter imports: +import 'package:flutter/material.dart'; +import 'package:flutter/services.dart'; + +// Package imports: +import 'package:flutter_blurhash/flutter_blurhash.dart'; +import 'package:flutter_gen/gen_l10n/l10n.dart'; +import 'package:flutter_linkify/flutter_linkify.dart'; +import 'package:matrix/matrix.dart'; +import 'package:video_player/video_player.dart'; + +// Project imports: import 'package:fluffychat/config/app_config.dart'; import 'package:fluffychat/pages/story/story_page.dart'; import 'package:fluffychat/utils/date_time_extension.dart'; @@ -6,14 +18,6 @@ import 'package:fluffychat/utils/platform_infos.dart'; import 'package:fluffychat/utils/string_color.dart'; import 'package:fluffychat/utils/url_launcher.dart'; import 'package:fluffychat/widgets/avatar.dart'; -import 'package:flutter/material.dart'; -import 'package:flutter/services.dart'; -import 'package:flutter_blurhash/flutter_blurhash.dart'; -import 'package:flutter_gen/gen_l10n/l10n.dart'; -import 'package:flutter_linkify/flutter_linkify.dart'; -import 'package:matrix/matrix.dart'; -import 'package:video_player/video_player.dart'; - import '../../config/themes.dart'; class StoryView extends StatelessWidget { diff --git a/lib/pages/tasks/model/matrix_todo_list.dart b/lib/pages/tasks/model/matrix_todo_list.dart index fdcb88970..428822338 100644 --- a/lib/pages/tasks/model/matrix_todo_list.dart +++ b/lib/pages/tasks/model/matrix_todo_list.dart @@ -1,3 +1,4 @@ +// Package imports: import 'package:matrix/matrix.dart'; extension MatrixTodoExtension on Room { diff --git a/lib/pages/tasks/tasks.dart b/lib/pages/tasks/tasks.dart index 7743b99e5..7c77bb2eb 100644 --- a/lib/pages/tasks/tasks.dart +++ b/lib/pages/tasks/tasks.dart @@ -1,9 +1,12 @@ +// Flutter imports: import 'package:flutter/material.dart'; +// Package imports: import 'package:adaptive_dialog/adaptive_dialog.dart'; import 'package:flutter_gen/gen_l10n/l10n.dart'; import 'package:matrix/matrix.dart'; +// Project imports: import 'package:fluffychat/pages/tasks/tasks_view.dart'; import 'package:fluffychat/utils/localized_exception_extension.dart'; import 'model/matrix_todo_list.dart'; diff --git a/lib/pages/tasks/tasks_view.dart b/lib/pages/tasks/tasks_view.dart index 8046b44d1..dcff18c24 100644 --- a/lib/pages/tasks/tasks_view.dart +++ b/lib/pages/tasks/tasks_view.dart @@ -1,8 +1,11 @@ +// Flutter imports: import 'package:flutter/material.dart'; +// Package imports: import 'package:flutter_gen/gen_l10n/l10n.dart'; import 'package:intl/intl.dart'; +// Project imports: import 'package:fluffychat/config/themes.dart'; import 'package:fluffychat/pages/tasks/tasks.dart'; diff --git a/lib/pages/user_bottom_sheet/user_bottom_sheet.dart b/lib/pages/user_bottom_sheet/user_bottom_sheet.dart index 1d190acdf..3dd8deea3 100644 --- a/lib/pages/user_bottom_sheet/user_bottom_sheet.dart +++ b/lib/pages/user_bottom_sheet/user_bottom_sheet.dart @@ -1,11 +1,15 @@ -import 'package:adaptive_dialog/adaptive_dialog.dart'; -import 'package:fluffychat/widgets/permission_slider_dialog.dart'; +// Flutter imports: import 'package:flutter/material.dart'; + +// Package imports: +import 'package:adaptive_dialog/adaptive_dialog.dart'; import 'package:flutter_gen/gen_l10n/l10n.dart'; import 'package:future_loading_dialog/future_loading_dialog.dart'; import 'package:go_router/go_router.dart'; import 'package:matrix/matrix.dart'; +// Project imports: +import 'package:fluffychat/widgets/permission_slider_dialog.dart'; import '../../widgets/matrix.dart'; import 'user_bottom_sheet_view.dart'; diff --git a/lib/pages/user_bottom_sheet/user_bottom_sheet_view.dart b/lib/pages/user_bottom_sheet/user_bottom_sheet_view.dart index 7f3d51497..93677a643 100644 --- a/lib/pages/user_bottom_sheet/user_bottom_sheet_view.dart +++ b/lib/pages/user_bottom_sheet/user_bottom_sheet_view.dart @@ -1,11 +1,15 @@ +// Flutter imports: +import 'package:flutter/material.dart'; + +// Package imports: +import 'package:flutter_gen/gen_l10n/l10n.dart'; +import 'package:matrix/matrix.dart'; + +// Project imports: import 'package:fluffychat/utils/date_time_extension.dart'; import 'package:fluffychat/utils/fluffy_share.dart'; import 'package:fluffychat/widgets/avatar.dart'; import 'package:fluffychat/widgets/presence_builder.dart'; -import 'package:flutter/material.dart'; -import 'package:flutter_gen/gen_l10n/l10n.dart'; -import 'package:matrix/matrix.dart'; - import '../../widgets/matrix.dart'; import 'user_bottom_sheet.dart'; diff --git a/lib/pangea/choreographer/controllers/alternative_translator.dart b/lib/pangea/choreographer/controllers/alternative_translator.dart index 5771d7f90..ada4fb890 100644 --- a/lib/pangea/choreographer/controllers/alternative_translator.dart +++ b/lib/pangea/choreographer/controllers/alternative_translator.dart @@ -1,14 +1,19 @@ +// Dart imports: import 'dart:developer'; +// Flutter imports: +import 'package:flutter/foundation.dart'; +import 'package:flutter/material.dart'; + +// Package imports: +import 'package:flutter_gen/gen_l10n/l10n.dart'; +import 'package:http/http.dart' as http; + +// Project imports: import 'package:fluffychat/pangea/choreographer/controllers/choreographer.dart'; import 'package:fluffychat/pangea/choreographer/controllers/error_service.dart'; import 'package:fluffychat/pangea/repo/full_text_translation_repo.dart'; import 'package:fluffychat/pangea/utils/error_handler.dart'; -import 'package:flutter/foundation.dart'; -import 'package:flutter/material.dart'; -import 'package:flutter_gen/gen_l10n/l10n.dart'; -import 'package:http/http.dart' as http; - import '../../repo/similarity_repo.dart'; class AlternativeTranslator { diff --git a/lib/pangea/choreographer/controllers/analytics_sender.dart b/lib/pangea/choreographer/controllers/analytics_sender.dart index fe4575f38..1dd75e7c9 100644 --- a/lib/pangea/choreographer/controllers/analytics_sender.dart +++ b/lib/pangea/choreographer/controllers/analytics_sender.dart @@ -1,3 +1,4 @@ +// Project imports: import 'package:fluffychat/pangea/choreographer/controllers/it_controller.dart'; class MlController { diff --git a/lib/pangea/choreographer/controllers/choreographer.dart b/lib/pangea/choreographer/controllers/choreographer.dart index 419305fb6..14ff95eb2 100644 --- a/lib/pangea/choreographer/controllers/choreographer.dart +++ b/lib/pangea/choreographer/controllers/choreographer.dart @@ -1,6 +1,15 @@ +// Dart imports: import 'dart:async'; import 'dart:developer'; +// Flutter imports: +import 'package:flutter/foundation.dart'; +import 'package:flutter/material.dart'; + +// Package imports: +import 'package:sentry_flutter/sentry_flutter.dart'; + +// Project imports: import 'package:fluffychat/pages/chat/chat.dart'; import 'package:fluffychat/pangea/choreographer/controllers/alternative_translator.dart'; import 'package:fluffychat/pangea/choreographer/controllers/igc_controller.dart'; @@ -16,10 +25,6 @@ import 'package:fluffychat/pangea/models/message_data_models.dart'; import 'package:fluffychat/pangea/models/widget_measurement.dart'; import 'package:fluffychat/pangea/utils/any_state_holder.dart'; import 'package:fluffychat/pangea/utils/error_handler.dart'; -import 'package:flutter/foundation.dart'; -import 'package:flutter/material.dart'; -import 'package:sentry_flutter/sentry_flutter.dart'; - import '../../../widgets/matrix.dart'; import '../../enum/use_type.dart'; import '../../models/choreo_record.dart'; diff --git a/lib/pangea/choreographer/controllers/error_service.dart b/lib/pangea/choreographer/controllers/error_service.dart index c03ec8df8..a2548ff3c 100644 --- a/lib/pangea/choreographer/controllers/error_service.dart +++ b/lib/pangea/choreographer/controllers/error_service.dart @@ -1,6 +1,8 @@ -import 'package:fluffychat/pangea/choreographer/controllers/choreographer.dart'; +// Flutter imports: import 'package:flutter/material.dart'; +// Project imports: +import 'package:fluffychat/pangea/choreographer/controllers/choreographer.dart'; import '../../utils/error_handler.dart'; enum ChoreoErrorType { diff --git a/lib/pangea/choreographer/controllers/igc_controller.dart b/lib/pangea/choreographer/controllers/igc_controller.dart index 38d9870a0..fdd9362fe 100644 --- a/lib/pangea/choreographer/controllers/igc_controller.dart +++ b/lib/pangea/choreographer/controllers/igc_controller.dart @@ -1,6 +1,15 @@ +// Dart imports: import 'dart:async'; import 'dart:developer'; +// Flutter imports: +import 'package:flutter/foundation.dart'; +import 'package:flutter/material.dart'; + +// Package imports: +import 'package:sentry_flutter/sentry_flutter.dart'; + +// Project imports: import 'package:fluffychat/pangea/choreographer/controllers/choreographer.dart'; import 'package:fluffychat/pangea/choreographer/controllers/error_service.dart'; import 'package:fluffychat/pangea/models/igc_text_data_model.dart'; @@ -8,10 +17,6 @@ import 'package:fluffychat/pangea/models/pangea_match_model.dart'; import 'package:fluffychat/pangea/models/span_data.dart'; import 'package:fluffychat/pangea/repo/igc_repo.dart'; import 'package:fluffychat/pangea/widgets/igc/span_card.dart'; -import 'package:flutter/foundation.dart'; -import 'package:flutter/material.dart'; -import 'package:sentry_flutter/sentry_flutter.dart'; - import '../../../widgets/matrix.dart'; import '../../models/language_detection_model.dart'; import '../../models/span_card_model.dart'; diff --git a/lib/pangea/choreographer/controllers/it_controller.dart b/lib/pangea/choreographer/controllers/it_controller.dart index f58faffae..12c823452 100644 --- a/lib/pangea/choreographer/controllers/it_controller.dart +++ b/lib/pangea/choreographer/controllers/it_controller.dart @@ -1,15 +1,20 @@ +// Dart imports: import 'dart:async'; import 'dart:developer'; +// Flutter imports: +import 'package:flutter/foundation.dart'; +import 'package:flutter/material.dart'; + +// Package imports: +import 'package:http/http.dart' as http; +import 'package:sentry_flutter/sentry_flutter.dart'; + +// Project imports: import 'package:fluffychat/pangea/choreographer/controllers/error_service.dart'; import 'package:fluffychat/pangea/constants/choreo_constants.dart'; import 'package:fluffychat/pangea/repo/full_text_translation_repo.dart'; import 'package:fluffychat/pangea/utils/error_handler.dart'; -import 'package:flutter/foundation.dart'; -import 'package:flutter/material.dart'; -import 'package:http/http.dart' as http; -import 'package:sentry_flutter/sentry_flutter.dart'; - import '../../models/custom_input_translation_model.dart'; import '../../models/it_response_model.dart'; import '../../models/it_step.dart'; diff --git a/lib/pangea/choreographer/controllers/message_options.dart b/lib/pangea/choreographer/controllers/message_options.dart index 8a01674b9..f3a69e154 100644 --- a/lib/pangea/choreographer/controllers/message_options.dart +++ b/lib/pangea/choreographer/controllers/message_options.dart @@ -1,8 +1,11 @@ +// Flutter imports: +import 'package:flutter/cupertino.dart'; + +// Project imports: import 'package:fluffychat/pangea/choreographer/controllers/choreographer.dart'; import 'package:fluffychat/pangea/constants/language_keys.dart'; import 'package:fluffychat/pangea/models/language_model.dart'; import 'package:fluffychat/pangea/utils/firebase_analytics.dart'; -import 'package:flutter/cupertino.dart'; class MessageOptions { Choreographer choreographer; diff --git a/lib/pangea/choreographer/widgets/choice_array.dart b/lib/pangea/choreographer/widgets/choice_array.dart index acc56aa33..f309a7039 100644 --- a/lib/pangea/choreographer/widgets/choice_array.dart +++ b/lib/pangea/choreographer/widgets/choice_array.dart @@ -1,9 +1,14 @@ +// Dart imports: import 'dart:developer'; +// Flutter imports: import 'package:flutter/foundation.dart'; import 'package:flutter/material.dart'; + +// Package imports: import 'package:flutter_gen/gen_l10n/l10n.dart'; +// Project imports: import '../../utils/bot_style.dart'; import 'it_shimmer.dart'; diff --git a/lib/pangea/choreographer/widgets/counters.dart b/lib/pangea/choreographer/widgets/counters.dart index 3b5c5cf6f..d87f6a60b 100644 --- a/lib/pangea/choreographer/widgets/counters.dart +++ b/lib/pangea/choreographer/widgets/counters.dart @@ -1,7 +1,11 @@ -import 'package:fluffychat/pangea/constants/choreo_constants.dart'; +// Flutter imports: import 'package:flutter/material.dart'; + +// Package imports: import 'package:flutter_gen/gen_l10n/l10n.dart'; +// Project imports: +import 'package:fluffychat/pangea/constants/choreo_constants.dart'; import '../../../config/app_config.dart'; class Counter extends StatelessWidget { diff --git a/lib/pangea/choreographer/widgets/has_error_button.dart b/lib/pangea/choreographer/widgets/has_error_button.dart index 8c04bad77..b30026da1 100644 --- a/lib/pangea/choreographer/widgets/has_error_button.dart +++ b/lib/pangea/choreographer/widgets/has_error_button.dart @@ -1,5 +1,7 @@ +// Flutter imports: import 'package:flutter/material.dart'; +// Project imports: import '../../controllers/pangea_controller.dart'; import '../controllers/error_service.dart'; diff --git a/lib/pangea/choreographer/widgets/it_bar.dart b/lib/pangea/choreographer/widgets/it_bar.dart index 8f1e8b050..108c7dc36 100644 --- a/lib/pangea/choreographer/widgets/it_bar.dart +++ b/lib/pangea/choreographer/widgets/it_bar.dart @@ -1,5 +1,11 @@ +// Dart imports: import 'dart:developer'; +// Flutter imports: +import 'package:flutter/foundation.dart'; +import 'package:flutter/material.dart'; + +// Project imports: import 'package:fluffychat/pangea/choreographer/controllers/choreographer.dart'; import 'package:fluffychat/pangea/choreographer/controllers/it_controller.dart'; import 'package:fluffychat/pangea/choreographer/widgets/it_bar_buttons.dart'; @@ -7,9 +13,6 @@ import 'package:fluffychat/pangea/choreographer/widgets/translation_finished_flo import 'package:fluffychat/pangea/constants/choreo_constants.dart'; import 'package:fluffychat/pangea/utils/error_handler.dart'; import 'package:fluffychat/pangea/widgets/igc/word_data_card.dart'; -import 'package:flutter/foundation.dart'; -import 'package:flutter/material.dart'; - import '../../../config/app_config.dart'; import '../../models/it_response_model.dart'; import '../../utils/overlay.dart'; diff --git a/lib/pangea/choreographer/widgets/it_bar_buttons.dart b/lib/pangea/choreographer/widgets/it_bar_buttons.dart index 27fbb3762..b74c0e8bc 100644 --- a/lib/pangea/choreographer/widgets/it_bar_buttons.dart +++ b/lib/pangea/choreographer/widgets/it_bar_buttons.dart @@ -1,8 +1,10 @@ +// Flutter imports: +import 'package:flutter/material.dart'; + +// Project imports: import 'package:fluffychat/pangea/controllers/pangea_controller.dart'; import 'package:fluffychat/pangea/utils/instructions.dart'; import 'package:fluffychat/widgets/matrix.dart'; -import 'package:flutter/material.dart'; - import '../../widgets/common/bot_face_svg.dart'; import '../controllers/choreographer.dart'; import '../controllers/it_controller.dart'; diff --git a/lib/pangea/choreographer/widgets/it_shimmer.dart b/lib/pangea/choreographer/widgets/it_shimmer.dart index adbe265b0..1ae0173d1 100644 --- a/lib/pangea/choreographer/widgets/it_shimmer.dart +++ b/lib/pangea/choreographer/widgets/it_shimmer.dart @@ -1,8 +1,12 @@ +// Dart imports: import 'dart:ui'; -import 'package:fluffychat/config/app_config.dart'; +// Flutter imports: import 'package:flutter/material.dart'; +// Project imports: +import 'package:fluffychat/config/app_config.dart'; + class ItShimmer extends StatelessWidget { const ItShimmer({Key? key, required this.originalSpan}) : super(key: key); diff --git a/lib/pangea/choreographer/widgets/language_display_toggle.dart b/lib/pangea/choreographer/widgets/language_display_toggle.dart index ce32fbd02..085435049 100644 --- a/lib/pangea/choreographer/widgets/language_display_toggle.dart +++ b/lib/pangea/choreographer/widgets/language_display_toggle.dart @@ -1,6 +1,10 @@ +// Flutter imports: import 'package:flutter/material.dart'; + +// Package imports: import 'package:flutter_gen/gen_l10n/l10n.dart'; +// Project imports: import '../../../config/app_config.dart'; import '../../../pages/chat/chat.dart'; diff --git a/lib/pangea/choreographer/widgets/language_permissions_warning_buttons.dart b/lib/pangea/choreographer/widgets/language_permissions_warning_buttons.dart index 8204bde7c..21096782e 100644 --- a/lib/pangea/choreographer/widgets/language_permissions_warning_buttons.dart +++ b/lib/pangea/choreographer/widgets/language_permissions_warning_buttons.dart @@ -1,16 +1,21 @@ +// Dart imports: import 'dart:developer'; -import 'package:fluffychat/config/app_config.dart'; -import 'package:fluffychat/pangea/choreographer/controllers/choreographer.dart'; -import 'package:fluffychat/pangea/models/class_model.dart'; -import 'package:fluffychat/pangea/utils/error_handler.dart'; +// Flutter imports: import 'package:flutter/foundation.dart'; import 'package:flutter/gestures.dart'; import 'package:flutter/material.dart'; + +// Package imports: import 'package:flutter_gen/gen_l10n/l10n.dart'; import 'package:go_router/go_router.dart'; import 'package:matrix/matrix.dart'; +// Project imports: +import 'package:fluffychat/config/app_config.dart'; +import 'package:fluffychat/pangea/choreographer/controllers/choreographer.dart'; +import 'package:fluffychat/pangea/models/class_model.dart'; +import 'package:fluffychat/pangea/utils/error_handler.dart'; import '../../../widgets/matrix.dart'; class _ErrorCopy { diff --git a/lib/pangea/choreographer/widgets/send_button.dart b/lib/pangea/choreographer/widgets/send_button.dart index 73c39ebf2..6a541eff0 100644 --- a/lib/pangea/choreographer/widgets/send_button.dart +++ b/lib/pangea/choreographer/widgets/send_button.dart @@ -1,7 +1,11 @@ -import 'package:fluffychat/pangea/constants/colors.dart'; +// Flutter imports: import 'package:flutter/material.dart'; + +// Package imports: import 'package:flutter_gen/gen_l10n/l10n.dart'; +// Project imports: +import 'package:fluffychat/pangea/constants/colors.dart'; import '../../../pages/chat/chat.dart'; class ChoreographerSendButton extends StatelessWidget { diff --git a/lib/pangea/choreographer/widgets/translation_finished_flow.dart b/lib/pangea/choreographer/widgets/translation_finished_flow.dart index b63424565..f88139307 100644 --- a/lib/pangea/choreographer/widgets/translation_finished_flow.dart +++ b/lib/pangea/choreographer/widgets/translation_finished_flow.dart @@ -1,5 +1,7 @@ +// Flutter imports: import 'package:flutter/material.dart'; +// Project imports: import '../../utils/bot_style.dart'; import '../../utils/error_handler.dart'; import '../controllers/it_controller.dart'; diff --git a/lib/pangea/config/colors.dart b/lib/pangea/config/colors.dart index 43a3f2e23..988f66d9a 100644 --- a/lib/pangea/config/colors.dart +++ b/lib/pangea/config/colors.dart @@ -1,3 +1,4 @@ +// Flutter imports: import 'package:flutter/material.dart'; class ChoreoColor { diff --git a/lib/pangea/config/environment.dart b/lib/pangea/config/environment.dart index 878c591fe..8cbf15334 100644 --- a/lib/pangea/config/environment.dart +++ b/lib/pangea/config/environment.dart @@ -1,6 +1,10 @@ +// Flutter imports: import 'package:flutter/foundation.dart'; + +// Package imports: import 'package:flutter_dotenv/flutter_dotenv.dart'; +// Project imports: import '../../utils/platform_infos.dart'; class Environment { diff --git a/lib/pangea/constants/choreo_constants.dart b/lib/pangea/constants/choreo_constants.dart index cbdfdf7d0..8d937ec2e 100644 --- a/lib/pangea/constants/choreo_constants.dart +++ b/lib/pangea/constants/choreo_constants.dart @@ -1,3 +1,4 @@ +// Flutter imports: import 'package:flutter/material.dart'; class ChoreoConstants { diff --git a/lib/pangea/constants/class_default_values.dart b/lib/pangea/constants/class_default_values.dart index 97522ca4b..5a5ce14cc 100644 --- a/lib/pangea/constants/class_default_values.dart +++ b/lib/pangea/constants/class_default_values.dart @@ -1,3 +1,4 @@ +// Project imports: import '../enum/time_span.dart'; class ClassDefaultValues { diff --git a/lib/pangea/constants/colors.dart b/lib/pangea/constants/colors.dart index 16fc7f907..ef19ca184 100644 --- a/lib/pangea/constants/colors.dart +++ b/lib/pangea/constants/colors.dart @@ -1,3 +1,4 @@ +// Flutter imports: import 'package:flutter/material.dart'; class PangeaColors { diff --git a/lib/pangea/controllers/base_controller.dart b/lib/pangea/controllers/base_controller.dart index ce41353e8..b3822c46f 100644 --- a/lib/pangea/controllers/base_controller.dart +++ b/lib/pangea/controllers/base_controller.dart @@ -1,3 +1,4 @@ +// Dart imports: import 'dart:async'; class BaseController { diff --git a/lib/pangea/controllers/class_controller.dart b/lib/pangea/controllers/class_controller.dart index 00c083e34..edd435c5c 100644 --- a/lib/pangea/controllers/class_controller.dart +++ b/lib/pangea/controllers/class_controller.dart @@ -1,19 +1,24 @@ +// Dart imports: import 'dart:async'; import 'dart:developer'; +// Flutter imports: +import 'package:flutter/foundation.dart'; +import 'package:flutter/material.dart'; + +// Package imports: import 'package:collection/collection.dart'; +import 'package:flutter_gen/gen_l10n/l10n.dart'; +import 'package:go_router/go_router.dart'; +import 'package:matrix/matrix.dart'; + +// Project imports: import 'package:fluffychat/pangea/constants/local.key.dart'; import 'package:fluffychat/pangea/controllers/pangea_controller.dart'; import 'package:fluffychat/pangea/extensions/client_extension.dart'; import 'package:fluffychat/pangea/extensions/pangea_room_extension.dart'; import 'package:fluffychat/pangea/utils/class_code.dart'; import 'package:fluffychat/pangea/utils/error_handler.dart'; -import 'package:flutter/foundation.dart'; -import 'package:flutter/material.dart'; -import 'package:flutter_gen/gen_l10n/l10n.dart'; -import 'package:go_router/go_router.dart'; -import 'package:matrix/matrix.dart'; - import '../../widgets/matrix.dart'; import '../utils/bot_name.dart'; import '../utils/firebase_analytics.dart'; diff --git a/lib/pangea/controllers/contextual_definition_controller.dart b/lib/pangea/controllers/contextual_definition_controller.dart index fabca513a..332b61c9a 100644 --- a/lib/pangea/controllers/contextual_definition_controller.dart +++ b/lib/pangea/controllers/contextual_definition_controller.dart @@ -1,11 +1,16 @@ +// Dart imports: import 'dart:convert'; -import 'package:collection/collection.dart'; -import 'package:fluffychat/pangea/config/environment.dart'; -import 'package:fluffychat/pangea/utils/error_handler.dart'; +// Flutter imports: import 'package:flutter/foundation.dart'; + +// Package imports: +import 'package:collection/collection.dart'; import 'package:http/http.dart'; +// Project imports: +import 'package:fluffychat/pangea/config/environment.dart'; +import 'package:fluffychat/pangea/utils/error_handler.dart'; import '../constants/model_keys.dart'; import '../network/requests.dart'; import '../network/urls.dart'; diff --git a/lib/pangea/controllers/language_controller.dart b/lib/pangea/controllers/language_controller.dart index 16d1fc6fb..4482b55e0 100644 --- a/lib/pangea/controllers/language_controller.dart +++ b/lib/pangea/controllers/language_controller.dart @@ -1,16 +1,21 @@ +// Dart imports: import 'dart:developer'; +// Flutter imports: +import 'package:flutter/foundation.dart'; +import 'package:flutter/material.dart'; + +// Package imports: +import 'package:matrix/matrix.dart'; +import 'package:sentry_flutter/sentry_flutter.dart'; + +// Project imports: import 'package:fluffychat/pangea/constants/language_keys.dart'; import 'package:fluffychat/pangea/controllers/language_list_controller.dart'; import 'package:fluffychat/pangea/controllers/pangea_controller.dart'; import 'package:fluffychat/pangea/extensions/pangea_room_extension.dart'; import 'package:fluffychat/pangea/models/class_model.dart'; import 'package:fluffychat/pangea/models/language_model.dart'; -import 'package:flutter/foundation.dart'; -import 'package:flutter/material.dart'; -import 'package:matrix/matrix.dart'; -import 'package:sentry_flutter/sentry_flutter.dart'; - import '../widgets/user_settings/p_language_dialog.dart'; class LanguageController { diff --git a/lib/pangea/controllers/language_list_controller.dart b/lib/pangea/controllers/language_list_controller.dart index 368c7b813..940e06faf 100644 --- a/lib/pangea/controllers/language_list_controller.dart +++ b/lib/pangea/controllers/language_list_controller.dart @@ -1,12 +1,15 @@ +// Dart imports: import 'dart:async'; import 'dart:developer'; +// Flutter imports: +import 'package:flutter/foundation.dart'; + +// Project imports: import 'package:fluffychat/pangea/constants/language_keys.dart'; import 'package:fluffychat/pangea/models/language_model.dart'; import 'package:fluffychat/pangea/repo/language_repo.dart'; import 'package:fluffychat/pangea/utils/error_handler.dart'; -import 'package:flutter/foundation.dart'; - import '../constants/language_list_keys.dart'; import '../utils/shared_prefs.dart'; diff --git a/lib/pangea/controllers/local_settings.dart b/lib/pangea/controllers/local_settings.dart index 5984a7bf5..494b96c95 100644 --- a/lib/pangea/controllers/local_settings.dart +++ b/lib/pangea/controllers/local_settings.dart @@ -1,3 +1,4 @@ +// Project imports: import 'package:fluffychat/pangea/controllers/pangea_controller.dart'; import 'package:fluffychat/pangea/models/class_model.dart'; diff --git a/lib/pangea/controllers/message_analytics_controller.dart b/lib/pangea/controllers/message_analytics_controller.dart index 24472f5c6..32139a578 100644 --- a/lib/pangea/controllers/message_analytics_controller.dart +++ b/lib/pangea/controllers/message_analytics_controller.dart @@ -1,14 +1,19 @@ +// Dart imports: import 'dart:developer'; +// Flutter imports: +import 'package:flutter/foundation.dart'; + +// Package imports: +import 'package:matrix/matrix.dart'; + +// Project imports: import 'package:fluffychat/pangea/enum/construct_type_enum.dart'; import 'package:fluffychat/pangea/enum/time_span.dart'; import 'package:fluffychat/pangea/models/headwords.dart'; import 'package:fluffychat/pangea/models/student_analytics_summary_model.dart'; import 'package:fluffychat/pangea/pages/analytics/base_analytics_page.dart'; import 'package:fluffychat/pangea/utils/error_handler.dart'; -import 'package:flutter/foundation.dart'; -import 'package:matrix/matrix.dart'; - import '../constants/class_default_values.dart'; import '../extensions/client_extension.dart'; import '../extensions/pangea_room_extension.dart'; diff --git a/lib/pangea/controllers/message_data_controller.dart b/lib/pangea/controllers/message_data_controller.dart index 7e273e551..1bb3d10f2 100644 --- a/lib/pangea/controllers/message_data_controller.dart +++ b/lib/pangea/controllers/message_data_controller.dart @@ -1,16 +1,21 @@ +// Dart imports: import 'dart:developer'; +// Flutter imports: +import 'package:flutter/foundation.dart'; +import 'package:flutter/material.dart'; + +// Package imports: import 'package:collection/collection.dart'; +import 'package:matrix/matrix.dart'; +import 'package:sentry_flutter/sentry_flutter.dart'; + +// Project imports: import 'package:fluffychat/pangea/controllers/base_controller.dart'; import 'package:fluffychat/pangea/controllers/pangea_controller.dart'; import 'package:fluffychat/pangea/extensions/pangea_room_extension.dart'; import 'package:fluffychat/pangea/models/message_data_models.dart'; import 'package:fluffychat/pangea/repo/tokens_repo.dart'; -import 'package:flutter/foundation.dart'; -import 'package:flutter/material.dart'; -import 'package:matrix/matrix.dart'; -import 'package:sentry_flutter/sentry_flutter.dart'; - import '../constants/pangea_event_types.dart'; import '../enum/use_type.dart'; import '../models/choreo_record.dart'; diff --git a/lib/pangea/controllers/my_analytics_controller.dart b/lib/pangea/controllers/my_analytics_controller.dart index 8a5c5783f..1f687b1d3 100644 --- a/lib/pangea/controllers/my_analytics_controller.dart +++ b/lib/pangea/controllers/my_analytics_controller.dart @@ -1,12 +1,17 @@ +// Dart imports: import 'dart:async'; import 'dart:developer'; +// Flutter imports: +import 'package:flutter/foundation.dart'; + +// Package imports: +import 'package:matrix/matrix.dart'; + +// Project imports: import 'package:fluffychat/pangea/controllers/pangea_controller.dart'; import 'package:fluffychat/pangea/models/student_analytics_summary_model.dart'; import 'package:fluffychat/pangea/utils/error_handler.dart'; -import 'package:flutter/foundation.dart'; -import 'package:matrix/matrix.dart'; - import '../extensions/client_extension.dart'; import '../extensions/pangea_room_extension.dart'; import '../models/constructs_analytics_model.dart'; diff --git a/lib/pangea/controllers/pangea_controller.dart b/lib/pangea/controllers/pangea_controller.dart index 5e92b79f4..e65056981 100644 --- a/lib/pangea/controllers/pangea_controller.dart +++ b/lib/pangea/controllers/pangea_controller.dart @@ -1,6 +1,16 @@ +// Dart imports: import 'dart:developer'; import 'dart:math'; +// Flutter imports: +import 'package:flutter/cupertino.dart'; +import 'package:flutter/foundation.dart'; + +// Package imports: +import 'package:matrix/matrix.dart'; +import 'package:sentry_flutter/sentry_flutter.dart'; + +// Project imports: import 'package:fluffychat/pangea/constants/class_default_values.dart'; import 'package:fluffychat/pangea/controllers/class_controller.dart'; import 'package:fluffychat/pangea/controllers/contextual_definition_controller.dart'; @@ -18,11 +28,6 @@ import 'package:fluffychat/pangea/utils/bot_name.dart'; import 'package:fluffychat/pangea/utils/error_handler.dart'; import 'package:fluffychat/pangea/utils/instructions.dart'; import 'package:fluffychat/widgets/matrix.dart'; -import 'package:flutter/cupertino.dart'; -import 'package:flutter/foundation.dart'; -import 'package:matrix/matrix.dart'; -import 'package:sentry_flutter/sentry_flutter.dart'; - import '../../config/app_config.dart'; import '../utils/firebase_analytics.dart'; import '../utils/p_store.dart'; diff --git a/lib/pangea/controllers/permissions_controller.dart b/lib/pangea/controllers/permissions_controller.dart index 479f53ff6..44c0b79fe 100644 --- a/lib/pangea/controllers/permissions_controller.dart +++ b/lib/pangea/controllers/permissions_controller.dart @@ -1,3 +1,7 @@ +// Package imports: +import 'package:matrix/matrix.dart'; + +// Project imports: import 'package:fluffychat/pangea/constants/age_limits.dart'; import 'package:fluffychat/pangea/constants/pangea_event_types.dart'; import 'package:fluffychat/pangea/controllers/base_controller.dart'; @@ -5,7 +9,6 @@ import 'package:fluffychat/pangea/controllers/pangea_controller.dart'; import 'package:fluffychat/pangea/extensions/pangea_room_extension.dart'; import 'package:fluffychat/pangea/models/class_model.dart'; import 'package:fluffychat/pangea/utils/p_extension.dart'; -import 'package:matrix/matrix.dart'; class PermissionsController extends BaseController { late PangeaController _pangeaController; diff --git a/lib/pangea/controllers/space_rules_edit_controller.dart b/lib/pangea/controllers/space_rules_edit_controller.dart index d47de0156..3e11b1055 100644 --- a/lib/pangea/controllers/space_rules_edit_controller.dart +++ b/lib/pangea/controllers/space_rules_edit_controller.dart @@ -1,6 +1,8 @@ -import 'package:fluffychat/pangea/constants/pangea_event_types.dart'; +// Package imports: import 'package:matrix/matrix.dart'; +// Project imports: +import 'package:fluffychat/pangea/constants/pangea_event_types.dart'; import '../extensions/pangea_room_extension.dart'; import '../models/class_model.dart'; diff --git a/lib/pangea/controllers/subscription_controller.dart b/lib/pangea/controllers/subscription_controller.dart index 98a73c68e..1ade5895a 100644 --- a/lib/pangea/controllers/subscription_controller.dart +++ b/lib/pangea/controllers/subscription_controller.dart @@ -1,7 +1,19 @@ +// Dart imports: import 'dart:async'; import 'dart:convert'; +// Flutter imports: +import 'package:flutter/foundation.dart'; +import 'package:flutter/material.dart'; + +// Package imports: import 'package:adaptive_dialog/adaptive_dialog.dart'; +import 'package:flutter_gen/gen_l10n/l10n.dart'; +import 'package:http/http.dart'; +import 'package:purchases_flutter/purchases_flutter.dart'; +import 'package:url_launcher/url_launcher_string.dart'; + +// Project imports: import 'package:fluffychat/config/app_config.dart'; import 'package:fluffychat/pangea/controllers/base_controller.dart'; import 'package:fluffychat/pangea/controllers/pangea_controller.dart'; @@ -14,12 +26,6 @@ import 'package:fluffychat/pangea/utils/error_handler.dart'; import 'package:fluffychat/pangea/utils/firebase_analytics.dart'; import 'package:fluffychat/pangea/widgets/subscription/subscription_paywall.dart'; import 'package:fluffychat/utils/platform_infos.dart'; -import 'package:flutter/foundation.dart'; -import 'package:flutter/material.dart'; -import 'package:flutter_gen/gen_l10n/l10n.dart'; -import 'package:http/http.dart'; -import 'package:purchases_flutter/purchases_flutter.dart'; -import 'package:url_launcher/url_launcher_string.dart'; class SubscriptionController extends BaseController { late PangeaController _pangeaController; diff --git a/lib/pangea/controllers/user_controller.dart b/lib/pangea/controllers/user_controller.dart index 3dbe462b1..33ac91b16 100644 --- a/lib/pangea/controllers/user_controller.dart +++ b/lib/pangea/controllers/user_controller.dart @@ -1,14 +1,17 @@ +// Dart imports: import 'dart:async'; import 'dart:developer'; +// Package imports: import 'package:collection/collection.dart'; +import 'package:jwt_decode/jwt_decode.dart'; +import 'package:matrix/matrix.dart' as matrix; + +// Project imports: import 'package:fluffychat/pangea/constants/model_keys.dart'; import 'package:fluffychat/pangea/controllers/base_controller.dart'; import 'package:fluffychat/pangea/controllers/pangea_controller.dart'; import 'package:fluffychat/widgets/fluffy_chat_app.dart'; -import 'package:jwt_decode/jwt_decode.dart'; -import 'package:matrix/matrix.dart' as matrix; - import '../constants/local.key.dart'; import '../models/user_model.dart'; import '../repo/user_repo.dart'; diff --git a/lib/pangea/controllers/word_net_controller.dart b/lib/pangea/controllers/word_net_controller.dart index 394fd020f..04fe5e878 100644 --- a/lib/pangea/controllers/word_net_controller.dart +++ b/lib/pangea/controllers/word_net_controller.dart @@ -1,8 +1,10 @@ +// Package imports: import 'package:collection/collection.dart'; -import 'package:fluffychat/pangea/constants/language_keys.dart'; -import 'package:fluffychat/pangea/repo/word_repo.dart'; import 'package:http/http.dart' as http; +// Project imports: +import 'package:fluffychat/pangea/constants/language_keys.dart'; +import 'package:fluffychat/pangea/repo/word_repo.dart'; import '../models/word_data_model.dart'; import 'base_controller.dart'; import 'pangea_controller.dart'; diff --git a/lib/pangea/enum/bar_chart_view_enum.dart b/lib/pangea/enum/bar_chart_view_enum.dart index aba0652af..bdc21707d 100644 --- a/lib/pangea/enum/bar_chart_view_enum.dart +++ b/lib/pangea/enum/bar_chart_view_enum.dart @@ -1,4 +1,7 @@ +// Flutter imports: import 'package:flutter/material.dart'; + +// Package imports: import 'package:flutter_gen/gen_l10n/l10n.dart'; enum BarChartViewSelection { diff --git a/lib/pangea/enum/span_choice_type.dart b/lib/pangea/enum/span_choice_type.dart index f7fac6b9e..03a0adcaa 100644 --- a/lib/pangea/enum/span_choice_type.dart +++ b/lib/pangea/enum/span_choice_type.dart @@ -1,4 +1,7 @@ +// Flutter imports: import 'package:flutter/material.dart'; + +// Package imports: import 'package:flutter_gen/gen_l10n/l10n.dart'; enum SpanChoiceType { diff --git a/lib/pangea/enum/span_data_type.dart b/lib/pangea/enum/span_data_type.dart index 380facead..d5e714330 100644 --- a/lib/pangea/enum/span_data_type.dart +++ b/lib/pangea/enum/span_data_type.dart @@ -1,4 +1,7 @@ +// Flutter imports: import 'package:flutter/material.dart'; + +// Package imports: import 'package:flutter_gen/gen_l10n/l10n.dart'; enum SpanDataTypeEnum { diff --git a/lib/pangea/enum/time_span.dart b/lib/pangea/enum/time_span.dart index 8e8254730..12457aac6 100644 --- a/lib/pangea/enum/time_span.dart +++ b/lib/pangea/enum/time_span.dart @@ -1,6 +1,10 @@ +// Flutter imports: import 'package:flutter/material.dart'; + +// Package imports: import 'package:flutter_gen/gen_l10n/l10n.dart'; +// Project imports: import '../models/chart_analytics_model.dart'; enum TimeSpan { day, week, month, sixmonths, year } diff --git a/lib/pangea/enum/use_type.dart b/lib/pangea/enum/use_type.dart index d5fecf5dc..c657fa961 100644 --- a/lib/pangea/enum/use_type.dart +++ b/lib/pangea/enum/use_type.dart @@ -1,6 +1,10 @@ +// Flutter imports: import 'package:flutter/material.dart'; + +// Package imports: import 'package:flutter_gen/gen_l10n/l10n.dart'; +// Project imports: import '../models/choreo_record.dart'; import '../utils/bot_style.dart'; diff --git a/lib/pangea/enum/vocab_proficiency_enum.dart b/lib/pangea/enum/vocab_proficiency_enum.dart index 85a3345ed..0b1749387 100644 --- a/lib/pangea/enum/vocab_proficiency_enum.dart +++ b/lib/pangea/enum/vocab_proficiency_enum.dart @@ -1,4 +1,7 @@ +// Flutter imports: import 'package:flutter/material.dart'; + +// Package imports: import 'package:flutter_gen/gen_l10n/l10n.dart'; enum VocabProficiencyEnum { low, medium, high, unk } diff --git a/lib/pangea/extensions/client_extension.dart b/lib/pangea/extensions/client_extension.dart index 00673150a..753266010 100644 --- a/lib/pangea/extensions/client_extension.dart +++ b/lib/pangea/extensions/client_extension.dart @@ -1,15 +1,20 @@ +// Dart imports: import 'dart:developer'; +// Flutter imports: +import 'package:flutter/foundation.dart'; + +// Package imports: import 'package:collection/collection.dart'; +import 'package:matrix/matrix.dart'; + +// Project imports: import 'package:fluffychat/pangea/constants/class_default_values.dart'; import 'package:fluffychat/pangea/constants/model_keys.dart'; import 'package:fluffychat/pangea/constants/pangea_room_types.dart'; import 'package:fluffychat/pangea/extensions/pangea_room_extension.dart'; import 'package:fluffychat/pangea/utils/bot_name.dart'; import 'package:fluffychat/pangea/utils/error_handler.dart'; -import 'package:flutter/foundation.dart'; -import 'package:matrix/matrix.dart'; - import '../utils/p_store.dart'; extension PangeaClient on Client { diff --git a/lib/pangea/extensions/pangea_event_extension.dart b/lib/pangea/extensions/pangea_event_extension.dart index d2ce87227..17b566db7 100644 --- a/lib/pangea/extensions/pangea_event_extension.dart +++ b/lib/pangea/extensions/pangea_event_extension.dart @@ -1,10 +1,16 @@ +// Dart imports: import 'dart:developer'; +// Flutter imports: +import 'package:flutter/foundation.dart'; + +// Package imports: +import 'package:matrix/matrix.dart'; + +// Project imports: import 'package:fluffychat/pangea/constants/pangea_event_types.dart'; import 'package:fluffychat/pangea/models/choreo_record.dart'; import 'package:fluffychat/pangea/models/message_data_models.dart'; -import 'package:flutter/foundation.dart'; -import 'package:matrix/matrix.dart'; extension PangeaEvent on Event { V getPangeaContent() { diff --git a/lib/pangea/extensions/pangea_room_extension.dart b/lib/pangea/extensions/pangea_room_extension.dart index 085eb42d8..994614513 100644 --- a/lib/pangea/extensions/pangea_room_extension.dart +++ b/lib/pangea/extensions/pangea_room_extension.dart @@ -1,6 +1,17 @@ +// Dart imports: import 'dart:async'; import 'dart:developer'; +// Flutter imports: +import 'package:flutter/foundation.dart'; +import 'package:flutter/material.dart'; + +// Package imports: +import 'package:matrix/matrix.dart'; +import 'package:matrix/src/utils/space_child.dart'; +import 'package:sentry_flutter/sentry_flutter.dart'; + +// Project imports: import 'package:fluffychat/pangea/constants/class_default_values.dart'; import 'package:fluffychat/pangea/constants/model_keys.dart'; import 'package:fluffychat/pangea/constants/pangea_room_types.dart'; @@ -8,12 +19,6 @@ import 'package:fluffychat/pangea/models/class_model.dart'; import 'package:fluffychat/pangea/models/pangea_message_event.dart'; import 'package:fluffychat/pangea/utils/bot_name.dart'; import 'package:fluffychat/pangea/utils/error_handler.dart'; -import 'package:flutter/foundation.dart'; -import 'package:flutter/material.dart'; -import 'package:matrix/matrix.dart'; -import 'package:matrix/src/utils/space_child.dart'; -import 'package:sentry_flutter/sentry_flutter.dart'; - import '../../config/app_config.dart'; import '../constants/pangea_event_types.dart'; import '../enum/construct_type_enum.dart'; diff --git a/lib/pangea/guard/p_vguard.dart b/lib/pangea/guard/p_vguard.dart index 098ddc75b..48719c8d7 100644 --- a/lib/pangea/guard/p_vguard.dart +++ b/lib/pangea/guard/p_vguard.dart @@ -1,9 +1,14 @@ +// Dart imports: import 'dart:async'; -import 'package:fluffychat/widgets/matrix.dart'; +// Flutter imports: import 'package:flutter/material.dart'; + +// Package imports: import 'package:go_router/go_router.dart'; +// Project imports: +import 'package:fluffychat/widgets/matrix.dart'; import '../controllers/pangea_controller.dart'; class PAuthGaurd { diff --git a/lib/pangea/models/base_subscription_info.dart b/lib/pangea/models/base_subscription_info.dart index 604abf6e9..82540cecc 100644 --- a/lib/pangea/models/base_subscription_info.dart +++ b/lib/pangea/models/base_subscription_info.dart @@ -1,3 +1,4 @@ +// Project imports: import 'package:fluffychat/pangea/controllers/pangea_controller.dart'; import 'package:fluffychat/pangea/controllers/subscription_controller.dart'; import 'package:fluffychat/pangea/repo/subscription_repo.dart'; diff --git a/lib/pangea/models/chart_analytics_model.dart b/lib/pangea/models/chart_analytics_model.dart index 6c71329d5..46c1bc818 100644 --- a/lib/pangea/models/chart_analytics_model.dart +++ b/lib/pangea/models/chart_analytics_model.dart @@ -1,9 +1,12 @@ +// Dart imports: import 'dart:developer'; -import 'package:fluffychat/pangea/enum/time_span.dart'; -import 'package:fluffychat/pangea/models/student_analytics_summary_model.dart'; +// Flutter imports: import 'package:flutter/foundation.dart'; +// Project imports: +import 'package:fluffychat/pangea/enum/time_span.dart'; +import 'package:fluffychat/pangea/models/student_analytics_summary_model.dart'; import '../enum/use_type.dart'; class TimeSeriesTotals { diff --git a/lib/pangea/models/chat_topic_model.dart b/lib/pangea/models/chat_topic_model.dart index c83e3f7c6..cba79e4ae 100644 --- a/lib/pangea/models/chat_topic_model.dart +++ b/lib/pangea/models/chat_topic_model.dart @@ -1,3 +1,4 @@ +// Project imports: import 'lemma.dart'; class ChatTopic { diff --git a/lib/pangea/models/choreo_record.dart b/lib/pangea/models/choreo_record.dart index 048c42f96..232db0df3 100644 --- a/lib/pangea/models/choreo_record.dart +++ b/lib/pangea/models/choreo_record.dart @@ -1,8 +1,9 @@ +// Dart imports: import 'dart:convert'; +// Project imports: import 'package:fluffychat/pangea/models/pangea_match_model.dart'; import 'package:fluffychat/pangea/models/pangea_token_model.dart'; - import '../constants/choreo_constants.dart'; import '../enum/construct_type_enum.dart'; import 'constructs_analytics_model.dart'; diff --git a/lib/pangea/models/class_analytics_model.dart b/lib/pangea/models/class_analytics_model.dart index 8c55be5aa..b908a983f 100644 --- a/lib/pangea/models/class_analytics_model.dart +++ b/lib/pangea/models/class_analytics_model.dart @@ -1,3 +1,4 @@ +// Package imports: import 'package:intl/intl.dart'; class ClassAnalyticsModel { diff --git a/lib/pangea/models/class_model.dart b/lib/pangea/models/class_model.dart index 37018a2d3..bd4c6d73e 100644 --- a/lib/pangea/models/class_model.dart +++ b/lib/pangea/models/class_model.dart @@ -1,12 +1,17 @@ +// Dart imports: import 'dart:developer'; -import 'package:fluffychat/pangea/constants/model_keys.dart'; -import 'package:fluffychat/pangea/utils/error_handler.dart'; +// Flutter imports: import 'package:flutter/foundation.dart'; import 'package:flutter/material.dart'; + +// Package imports: import 'package:flutter_gen/gen_l10n/l10n.dart'; import 'package:matrix/matrix.dart'; +// Project imports: +import 'package:fluffychat/pangea/constants/model_keys.dart'; +import 'package:fluffychat/pangea/utils/error_handler.dart'; import '../constants/class_default_values.dart'; import '../constants/language_keys.dart'; import '../constants/pangea_event_types.dart'; diff --git a/lib/pangea/models/construct_analytics_event.dart b/lib/pangea/models/construct_analytics_event.dart index 5b24cccfe..e9cec2676 100644 --- a/lib/pangea/models/construct_analytics_event.dart +++ b/lib/pangea/models/construct_analytics_event.dart @@ -1,6 +1,8 @@ -import 'package:fluffychat/pangea/models/constructs_analytics_model.dart'; +// Package imports: import 'package:matrix/matrix.dart'; +// Project imports: +import 'package:fluffychat/pangea/models/constructs_analytics_model.dart'; import '../constants/pangea_event_types.dart'; class ConstructEvent { diff --git a/lib/pangea/models/constructs_analytics_model.dart b/lib/pangea/models/constructs_analytics_model.dart index 510326361..e72288543 100644 --- a/lib/pangea/models/constructs_analytics_model.dart +++ b/lib/pangea/models/constructs_analytics_model.dart @@ -1,9 +1,12 @@ +// Dart imports: import 'dart:developer'; -import 'package:fluffychat/pangea/constants/model_keys.dart'; +// Flutter imports: import 'package:flutter/foundation.dart'; import 'package:flutter/material.dart'; +// Project imports: +import 'package:fluffychat/pangea/constants/model_keys.dart'; import '../enum/construct_type_enum.dart'; class ConstructUses { diff --git a/lib/pangea/models/custom_input_translation_model.dart b/lib/pangea/models/custom_input_translation_model.dart index 6a45911c9..9b96db343 100644 --- a/lib/pangea/models/custom_input_translation_model.dart +++ b/lib/pangea/models/custom_input_translation_model.dart @@ -1,3 +1,4 @@ +// Project imports: import 'package:fluffychat/pangea/constants/model_keys.dart'; class CustomInputRequestModel { diff --git a/lib/pangea/models/exchange_model.dart b/lib/pangea/models/exchange_model.dart index 41c54d763..d311193db 100644 --- a/lib/pangea/models/exchange_model.dart +++ b/lib/pangea/models/exchange_model.dart @@ -1,9 +1,12 @@ +// Dart imports: import 'dart:developer'; -import 'package:fluffychat/pangea/constants/model_keys.dart'; -import 'package:fluffychat/pangea/utils/error_handler.dart'; +// Flutter imports: import 'package:flutter/foundation.dart'; +// Project imports: +import 'package:fluffychat/pangea/constants/model_keys.dart'; +import 'package:fluffychat/pangea/utils/error_handler.dart'; import 'class_model.dart'; class ExchangeModel { diff --git a/lib/pangea/models/headwords.dart b/lib/pangea/models/headwords.dart index e27d9a215..00917d31f 100644 --- a/lib/pangea/models/headwords.dart +++ b/lib/pangea/models/headwords.dart @@ -1,10 +1,13 @@ +// Dart imports: import 'dart:convert'; import 'dart:developer'; -import 'package:fluffychat/pangea/models/constructs_analytics_model.dart'; +// Flutter imports: import 'package:flutter/foundation.dart'; import 'package:flutter/services.dart'; +// Project imports: +import 'package:fluffychat/pangea/models/constructs_analytics_model.dart'; import '../enum/vocab_proficiency_enum.dart'; class VocabHeadwords { diff --git a/lib/pangea/models/igc_text_data_model.dart b/lib/pangea/models/igc_text_data_model.dart index a65cbefc7..708221df2 100644 --- a/lib/pangea/models/igc_text_data_model.dart +++ b/lib/pangea/models/igc_text_data_model.dart @@ -1,22 +1,29 @@ +// Dart imports: import 'dart:developer'; +// Flutter imports: +import 'package:flutter/foundation.dart'; +import 'package:flutter/gestures.dart'; +import 'package:flutter/material.dart'; + +// Package imports: +import 'package:matrix/matrix.dart'; +import 'package:sentry_flutter/sentry_flutter.dart'; + +// Project imports: import 'package:fluffychat/pangea/models/pangea_match_model.dart'; import 'package:fluffychat/pangea/models/pangea_token_model.dart'; import 'package:fluffychat/pangea/models/span_card_model.dart'; import 'package:fluffychat/pangea/utils/error_handler.dart'; -import 'package:flutter/foundation.dart'; -import 'package:flutter/gestures.dart'; -import 'package:flutter/material.dart'; -import 'package:matrix/matrix.dart'; -// import 'package:language_tool/language_tool.dart'; -import 'package:sentry_flutter/sentry_flutter.dart'; - import '../constants/model_keys.dart'; import '../utils/overlay.dart'; import '../widgets/igc/span_card.dart'; import '../widgets/igc/word_data_card.dart'; import 'language_detection_model.dart'; +// import 'package:language_tool/language_tool.dart'; + + class IGCTextData { List detections; String originalInput; diff --git a/lib/pangea/models/it_response_model.dart b/lib/pangea/models/it_response_model.dart index 13344c8db..83c3092cd 100644 --- a/lib/pangea/models/it_response_model.dart +++ b/lib/pangea/models/it_response_model.dart @@ -1,10 +1,14 @@ +// Flutter imports: +import 'package:flutter/material.dart'; + +// Package imports: import 'package:collection/collection.dart'; +import 'package:flutter_gen/gen_l10n/l10n.dart'; + +// Project imports: import 'package:fluffychat/pangea/constants/choreo_constants.dart'; import 'package:fluffychat/pangea/constants/model_keys.dart'; import 'package:fluffychat/pangea/extensions/my_list_extionsion.dart'; -import 'package:flutter/material.dart'; -import 'package:flutter_gen/gen_l10n/l10n.dart'; - import 'lemma.dart'; class ITResponseModel { diff --git a/lib/pangea/models/it_step.dart b/lib/pangea/models/it_step.dart index f06bd7401..158a85226 100644 --- a/lib/pangea/models/it_step.dart +++ b/lib/pangea/models/it_step.dart @@ -1,5 +1,7 @@ +// Flutter imports: import 'package:flutter/material.dart'; +// Project imports: import '../constants/choreo_constants.dart'; import 'it_response_model.dart'; diff --git a/lib/pangea/models/language_model.dart b/lib/pangea/models/language_model.dart index a0764bd98..79ecd14c9 100644 --- a/lib/pangea/models/language_model.dart +++ b/lib/pangea/models/language_model.dart @@ -1,10 +1,15 @@ +// Dart imports: import 'dart:developer'; -import 'package:fluffychat/pangea/constants/language_keys.dart'; +// Flutter imports: import 'package:flutter/foundation.dart'; import 'package:flutter/material.dart'; + +// Package imports: import 'package:flutter_gen/gen_l10n/l10n.dart'; +// Project imports: +import 'package:fluffychat/pangea/constants/language_keys.dart'; import '../utils/error_handler.dart'; class LanguageModel { diff --git a/lib/pangea/models/message_data_models.dart b/lib/pangea/models/message_data_models.dart index 014c27c81..8518b8b9e 100644 --- a/lib/pangea/models/message_data_models.dart +++ b/lib/pangea/models/message_data_models.dart @@ -1,8 +1,12 @@ +// Dart imports: import 'dart:convert'; -import 'package:fluffychat/pangea/models/pangea_token_model.dart'; +// Package imports: import 'package:matrix/matrix.dart'; +// Project imports: +import 'package:fluffychat/pangea/models/pangea_token_model.dart'; + /// this class is contained within a [RepresentationEvent] /// this event is the child of a [EventTypes.Message] /// the event has two potential children events - diff --git a/lib/pangea/models/mobile_subscriptions.dart b/lib/pangea/models/mobile_subscriptions.dart index 8ae224a4b..7988fee18 100644 --- a/lib/pangea/models/mobile_subscriptions.dart +++ b/lib/pangea/models/mobile_subscriptions.dart @@ -1,13 +1,19 @@ +// Dart imports: import 'dart:io'; +// Flutter imports: +import 'package:flutter/material.dart'; + +// Package imports: import 'package:collection/collection.dart'; +import 'package:purchases_flutter/purchases_flutter.dart'; +import 'package:sentry_flutter/sentry_flutter.dart'; + +// Project imports: import 'package:fluffychat/pangea/config/environment.dart'; import 'package:fluffychat/pangea/controllers/subscription_controller.dart'; import 'package:fluffychat/pangea/models/base_subscription_info.dart'; import 'package:fluffychat/pangea/utils/error_handler.dart'; -import 'package:flutter/material.dart'; -import 'package:purchases_flutter/purchases_flutter.dart'; -import 'package:sentry_flutter/sentry_flutter.dart'; class MobileSubscriptionInfo extends SubscriptionInfo { MobileSubscriptionInfo({required super.pangeaController}) : super(); diff --git a/lib/pangea/models/pangea_choreo_event.dart b/lib/pangea/models/pangea_choreo_event.dart index a56c798e9..21d70923a 100644 --- a/lib/pangea/models/pangea_choreo_event.dart +++ b/lib/pangea/models/pangea_choreo_event.dart @@ -1,8 +1,12 @@ -import 'package:fluffychat/pangea/extensions/pangea_event_extension.dart'; -import 'package:fluffychat/pangea/utils/error_handler.dart'; +// Flutter imports: import 'package:flutter/foundation.dart'; + +// Package imports: import 'package:matrix/matrix.dart'; +// Project imports: +import 'package:fluffychat/pangea/extensions/pangea_event_extension.dart'; +import 'package:fluffychat/pangea/utils/error_handler.dart'; import '../constants/pangea_event_types.dart'; import 'choreo_record.dart'; diff --git a/lib/pangea/models/pangea_match_model.dart b/lib/pangea/models/pangea_match_model.dart index 6f7db12b9..55145c401 100644 --- a/lib/pangea/models/pangea_match_model.dart +++ b/lib/pangea/models/pangea_match_model.dart @@ -1,10 +1,13 @@ +// Dart imports: import 'dart:developer'; -import 'package:fluffychat/pangea/enum/span_data_type.dart'; -import 'package:fluffychat/pangea/utils/error_handler.dart'; +// Flutter imports: import 'package:flutter/foundation.dart'; import 'package:flutter/material.dart'; +// Project imports: +import 'package:fluffychat/pangea/enum/span_data_type.dart'; +import 'package:fluffychat/pangea/utils/error_handler.dart'; import '../constants/match_rule_ids.dart'; import 'igc_text_data_model.dart'; import 'span_data.dart'; diff --git a/lib/pangea/models/pangea_message_event.dart b/lib/pangea/models/pangea_message_event.dart index bb177d830..276b21c3a 100644 --- a/lib/pangea/models/pangea_message_event.dart +++ b/lib/pangea/models/pangea_message_event.dart @@ -1,13 +1,17 @@ +// Flutter imports: +import 'package:flutter/material.dart'; + +// Package imports: import 'package:collection/collection.dart'; +import 'package:matrix/matrix.dart'; + +// Project imports: import 'package:fluffychat/pangea/constants/pangea_message_types.dart'; import 'package:fluffychat/pangea/extensions/pangea_room_extension.dart'; import 'package:fluffychat/pangea/models/choreo_record.dart'; import 'package:fluffychat/pangea/models/message_data_models.dart'; import 'package:fluffychat/pangea/models/pangea_representation_event.dart'; import 'package:fluffychat/pangea/utils/bot_name.dart'; -import 'package:flutter/material.dart'; -import 'package:matrix/matrix.dart'; - import '../../widgets/matrix.dart'; import '../constants/language_keys.dart'; import '../constants/model_keys.dart'; diff --git a/lib/pangea/models/pangea_representation_event.dart b/lib/pangea/models/pangea_representation_event.dart index 31fce7252..8bc4112de 100644 --- a/lib/pangea/models/pangea_representation_event.dart +++ b/lib/pangea/models/pangea_representation_event.dart @@ -1,14 +1,19 @@ +// Dart imports: import 'dart:developer'; +// Flutter imports: +import 'package:flutter/foundation.dart'; +import 'package:flutter/material.dart'; + +// Package imports: +import 'package:matrix/matrix.dart'; +import 'package:sentry_flutter/sentry_flutter.dart'; + +// Project imports: import 'package:fluffychat/pangea/extensions/pangea_event_extension.dart'; import 'package:fluffychat/pangea/models/pangea_choreo_event.dart'; import 'package:fluffychat/pangea/models/pangea_token_model.dart'; import 'package:fluffychat/pangea/repo/tokens_repo.dart'; -import 'package:flutter/foundation.dart'; -import 'package:flutter/material.dart'; -import 'package:matrix/matrix.dart'; -import 'package:sentry_flutter/sentry_flutter.dart'; - import '../../widgets/matrix.dart'; import '../constants/language_keys.dart'; import '../constants/pangea_event_types.dart'; diff --git a/lib/pangea/models/pangea_token_model.dart b/lib/pangea/models/pangea_token_model.dart index 637808d30..5f828fae3 100644 --- a/lib/pangea/models/pangea_token_model.dart +++ b/lib/pangea/models/pangea_token_model.dart @@ -1,8 +1,13 @@ +// Dart imports: import 'dart:developer'; +// Flutter imports: import 'package:flutter/foundation.dart'; + +// Package imports: import 'package:sentry_flutter/sentry_flutter.dart'; +// Project imports: import '../constants/model_keys.dart'; import '../utils/error_handler.dart'; import 'lemma.dart'; diff --git a/lib/pangea/models/pangea_tokens_event.dart b/lib/pangea/models/pangea_tokens_event.dart index 8d38e9950..bb747b8cc 100644 --- a/lib/pangea/models/pangea_tokens_event.dart +++ b/lib/pangea/models/pangea_tokens_event.dart @@ -1,7 +1,9 @@ -import 'package:fluffychat/pangea/extensions/pangea_event_extension.dart'; -import 'package:fluffychat/pangea/utils/error_handler.dart'; +// Package imports: import 'package:matrix/matrix.dart'; +// Project imports: +import 'package:fluffychat/pangea/extensions/pangea_event_extension.dart'; +import 'package:fluffychat/pangea/utils/error_handler.dart'; import '../constants/pangea_event_types.dart'; import 'message_data_models.dart'; diff --git a/lib/pangea/models/removed_translation.dart b/lib/pangea/models/removed_translation.dart index 6887476fe..5605e44c6 100644 --- a/lib/pangea/models/removed_translation.dart +++ b/lib/pangea/models/removed_translation.dart @@ -1,3 +1,4 @@ +// Project imports: import 'it_response_model.dart'; class RemovedTranslation { diff --git a/lib/pangea/models/span_card_model.dart b/lib/pangea/models/span_card_model.dart index 8a252e67b..17cd44156 100644 --- a/lib/pangea/models/span_card_model.dart +++ b/lib/pangea/models/span_card_model.dart @@ -1,3 +1,4 @@ +// Project imports: import 'package:fluffychat/pangea/choreographer/controllers/choreographer.dart'; import 'package:fluffychat/pangea/models/pangea_match_model.dart'; diff --git a/lib/pangea/models/span_data.dart b/lib/pangea/models/span_data.dart index 9c68ef071..70af44d39 100644 --- a/lib/pangea/models/span_data.dart +++ b/lib/pangea/models/span_data.dart @@ -4,9 +4,13 @@ // SpanChoice of text in message from options // Call to server for additional/followup info -import 'package:collection/collection.dart'; +// Flutter imports: import 'package:flutter/material.dart'; +// Package imports: +import 'package:collection/collection.dart'; + +// Project imports: import '../enum/span_choice_type.dart'; import '../enum/span_data_type.dart'; diff --git a/lib/pangea/models/student_analytics_event.dart b/lib/pangea/models/student_analytics_event.dart index f98412a92..cb6cefafa 100644 --- a/lib/pangea/models/student_analytics_event.dart +++ b/lib/pangea/models/student_analytics_event.dart @@ -1,11 +1,16 @@ +// Dart imports: import 'dart:developer'; +// Flutter imports: +import 'package:flutter/foundation.dart'; + +// Package imports: +import 'package:matrix/matrix.dart'; + +// Project imports: import 'package:fluffychat/pangea/constants/class_default_values.dart'; import 'package:fluffychat/pangea/models/student_analytics_summary_model.dart'; import 'package:fluffychat/pangea/utils/error_handler.dart'; -import 'package:flutter/foundation.dart'; -import 'package:matrix/matrix.dart'; - import '../constants/pangea_event_types.dart'; import 'chart_analytics_model.dart'; diff --git a/lib/pangea/models/student_analytics_summary_model.dart b/lib/pangea/models/student_analytics_summary_model.dart index f0fa2642f..9cc4a0a17 100644 --- a/lib/pangea/models/student_analytics_summary_model.dart +++ b/lib/pangea/models/student_analytics_summary_model.dart @@ -1,8 +1,11 @@ +// Dart imports: import 'dart:convert'; -import 'package:fluffychat/pangea/utils/error_handler.dart'; +// Flutter imports: import 'package:flutter/foundation.dart'; +// Project imports: +import 'package:fluffychat/pangea/utils/error_handler.dart'; import '../enum/use_type.dart'; class RecentMessageRecord { diff --git a/lib/pangea/models/system_choice_translation_model.dart b/lib/pangea/models/system_choice_translation_model.dart index 6914044d3..e6dcf1794 100644 --- a/lib/pangea/models/system_choice_translation_model.dart +++ b/lib/pangea/models/system_choice_translation_model.dart @@ -1,3 +1,4 @@ +// Project imports: import '../constants/model_keys.dart'; class SystemChoiceRequestModel { diff --git a/lib/pangea/models/textChangeModel.dart b/lib/pangea/models/textChangeModel.dart index 38a988df8..333604fae 100644 --- a/lib/pangea/models/textChangeModel.dart +++ b/lib/pangea/models/textChangeModel.dart @@ -1,3 +1,4 @@ +// Project imports: import '../enum/direction.dart'; import '../enum/edit_type.dart'; diff --git a/lib/pangea/models/user_model.dart b/lib/pangea/models/user_model.dart index 7394cbc09..a7ffe5851 100644 --- a/lib/pangea/models/user_model.dart +++ b/lib/pangea/models/user_model.dart @@ -1,10 +1,15 @@ +// Dart imports: import 'dart:convert'; -import 'package:country_picker/country_picker.dart'; -import 'package:fluffychat/pangea/constants/model_keys.dart'; +// Flutter imports: import 'package:flutter/material.dart'; + +// Package imports: +import 'package:country_picker/country_picker.dart'; import 'package:flutter_gen/gen_l10n/l10n.dart'; +// Project imports: +import 'package:fluffychat/pangea/constants/model_keys.dart'; import '../constants/language_keys.dart'; import 'language_model.dart'; diff --git a/lib/pangea/models/user_profile_search_model.dart b/lib/pangea/models/user_profile_search_model.dart index 97a7e91c1..4235bdaaa 100644 --- a/lib/pangea/models/user_profile_search_model.dart +++ b/lib/pangea/models/user_profile_search_model.dart @@ -1,6 +1,8 @@ +// Dart imports: import 'dart:convert'; import 'dart:developer'; +// Project imports: import 'user_model.dart'; class UserProfileSearchResponse { diff --git a/lib/pangea/models/web_subscriptions.dart b/lib/pangea/models/web_subscriptions.dart index 0b23cd5ae..d8f001ea0 100644 --- a/lib/pangea/models/web_subscriptions.dart +++ b/lib/pangea/models/web_subscriptions.dart @@ -1,7 +1,10 @@ +// Package imports: +import 'package:sentry_flutter/sentry_flutter.dart'; + +// Project imports: import 'package:fluffychat/pangea/controllers/subscription_controller.dart'; import 'package:fluffychat/pangea/models/base_subscription_info.dart'; import 'package:fluffychat/pangea/repo/subscription_repo.dart'; -import 'package:sentry_flutter/sentry_flutter.dart'; class WebSubscriptionInfo extends SubscriptionInfo { WebSubscriptionInfo({required super.pangeaController}) : super(); diff --git a/lib/pangea/models/widget_measurement.dart b/lib/pangea/models/widget_measurement.dart index 851abec62..d9bf48bb9 100644 --- a/lib/pangea/models/widget_measurement.dart +++ b/lib/pangea/models/widget_measurement.dart @@ -1,3 +1,4 @@ +// Flutter imports: import 'package:flutter/material.dart'; class WidgetMeasurements { diff --git a/lib/pangea/models/word_data_model.dart b/lib/pangea/models/word_data_model.dart index d2e03bc69..07e04150f 100644 --- a/lib/pangea/models/word_data_model.dart +++ b/lib/pangea/models/word_data_model.dart @@ -1,8 +1,12 @@ +// Dart imports: import 'dart:developer'; +// Flutter imports: +import 'package:flutter/foundation.dart'; + +// Project imports: import 'package:fluffychat/pangea/constants/model_keys.dart'; import 'package:fluffychat/pangea/widgets/igc/word_data_card.dart'; -import 'package:flutter/foundation.dart'; class WordData { final String word; diff --git a/lib/pangea/network/p_api_exception.dart b/lib/pangea/network/p_api_exception.dart index 536e5d97b..26562f53f 100644 --- a/lib/pangea/network/p_api_exception.dart +++ b/lib/pangea/network/p_api_exception.dart @@ -1,7 +1,10 @@ +// Dart imports: import 'dart:convert'; +// Flutter imports: import 'package:flutter/foundation.dart'; +// Project imports: import '../utils/p_toast.dart'; class ApiException { diff --git a/lib/pangea/network/requests.dart b/lib/pangea/network/requests.dart index 549474bb5..e58c2e8fc 100644 --- a/lib/pangea/network/requests.dart +++ b/lib/pangea/network/requests.dart @@ -1,6 +1,10 @@ +// Dart imports: import 'dart:convert'; +// Flutter imports: import 'package:flutter/material.dart'; + +// Package imports: import 'package:http/http.dart' as http; import 'package:sentry_flutter/sentry_flutter.dart'; diff --git a/lib/pangea/network/urls.dart b/lib/pangea/network/urls.dart index 0cd4c2e9c..602dde257 100644 --- a/lib/pangea/network/urls.dart +++ b/lib/pangea/network/urls.dart @@ -1,5 +1,6 @@ //TODO move baseAPI addition to request function +// Project imports: import 'package:fluffychat/pangea/config/environment.dart'; /// autodocs diff --git a/lib/pangea/pages/analytics/analytics_list_tile.dart b/lib/pangea/pages/analytics/analytics_list_tile.dart index 8a08e2625..e1b8db63e 100644 --- a/lib/pangea/pages/analytics/analytics_list_tile.dart +++ b/lib/pangea/pages/analytics/analytics_list_tile.dart @@ -1,9 +1,13 @@ -import 'package:fluffychat/pangea/extensions/pangea_room_extension.dart'; +// Flutter imports: import 'package:flutter/material.dart'; + +// Package imports: import 'package:flutter_gen/gen_l10n/l10n.dart'; import 'package:go_router/go_router.dart'; import 'package:matrix/matrix.dart'; +// Project imports: +import 'package:fluffychat/pangea/extensions/pangea_room_extension.dart'; import '../../../../utils/date_time_extension.dart'; import '../../../widgets/avatar.dart'; import '../../../widgets/matrix.dart'; diff --git a/lib/pangea/pages/analytics/bar_chart_card.dart b/lib/pangea/pages/analytics/bar_chart_card.dart index cf01ab35a..4199d8ff7 100644 --- a/lib/pangea/pages/analytics/bar_chart_card.dart +++ b/lib/pangea/pages/analytics/bar_chart_card.dart @@ -1,6 +1,9 @@ -import 'package:fl_chart/fl_chart.dart'; +// Flutter imports: import 'package:flutter/material.dart'; +// Package imports: +import 'package:fl_chart/fl_chart.dart'; + class BarChartCard extends StatelessWidget { const BarChartCard({ Key? key, diff --git a/lib/pangea/pages/analytics/bar_chart_placeholder_data.dart b/lib/pangea/pages/analytics/bar_chart_placeholder_data.dart index 31c5f5d52..46f710fed 100644 --- a/lib/pangea/pages/analytics/bar_chart_placeholder_data.dart +++ b/lib/pangea/pages/analytics/bar_chart_placeholder_data.dart @@ -1,6 +1,10 @@ -import 'package:fl_chart/fl_chart.dart'; +// Flutter imports: import 'package:flutter/material.dart'; +// Package imports: +import 'package:fl_chart/fl_chart.dart'; + +// Project imports: import '../../enum/use_type.dart'; class BarChartPlaceHolderData { diff --git a/lib/pangea/pages/analytics/base_analytics_page.dart b/lib/pangea/pages/analytics/base_analytics_page.dart index d59723e7d..3c4924199 100644 --- a/lib/pangea/pages/analytics/base_analytics_page.dart +++ b/lib/pangea/pages/analytics/base_analytics_page.dart @@ -1,10 +1,15 @@ +// Dart imports: import 'dart:math'; -import 'package:fluffychat/config/app_config.dart'; -import 'package:fluffychat/pangea/enum/construct_type_enum.dart'; +// Flutter imports: import 'package:flutter/material.dart'; + +// Package imports: import 'package:flutter_gen/gen_l10n/l10n.dart'; +// Project imports: +import 'package:fluffychat/config/app_config.dart'; +import 'package:fluffychat/pangea/enum/construct_type_enum.dart'; import '../../../widgets/layouts/max_width_body.dart'; import '../../../widgets/matrix.dart'; import '../../controllers/pangea_controller.dart'; diff --git a/lib/pangea/pages/analytics/chart_view_picker_button.dart b/lib/pangea/pages/analytics/chart_view_picker_button.dart index ad2e289d5..64ec3c97c 100644 --- a/lib/pangea/pages/analytics/chart_view_picker_button.dart +++ b/lib/pangea/pages/analytics/chart_view_picker_button.dart @@ -1,6 +1,10 @@ +// Flutter imports: import 'package:flutter/material.dart'; + +// Package imports: import 'package:flutter_gen/gen_l10n/l10n.dart'; +// Project imports: import '../../enum/bar_chart_view_enum.dart'; class ChartViewPickerButton extends StatelessWidget { diff --git a/lib/pangea/pages/analytics/class_analytics/class_analytics.dart b/lib/pangea/pages/analytics/class_analytics/class_analytics.dart index 1b286a222..365542f0b 100644 --- a/lib/pangea/pages/analytics/class_analytics/class_analytics.dart +++ b/lib/pangea/pages/analytics/class_analytics/class_analytics.dart @@ -1,17 +1,22 @@ +// Dart imports: import 'dart:async'; import 'dart:developer'; +// Flutter imports: +import 'package:flutter/foundation.dart'; +import 'package:flutter/material.dart'; + +// Package imports: +import 'package:go_router/go_router.dart'; +import 'package:matrix/matrix.dart'; + +// Project imports: import 'package:fluffychat/pangea/constants/pangea_event_types.dart'; import 'package:fluffychat/pangea/extensions/pangea_room_extension.dart'; import 'package:fluffychat/pangea/models/chart_analytics_model.dart'; import 'package:fluffychat/pangea/utils/error_handler.dart'; import 'package:fluffychat/pangea/widgets/common/list_placeholder.dart'; import 'package:fluffychat/pangea/widgets/common/p_circular_loader.dart'; -import 'package:flutter/foundation.dart'; -import 'package:flutter/material.dart'; -import 'package:go_router/go_router.dart'; -import 'package:matrix/matrix.dart'; - import '../../../../widgets/matrix.dart'; import '../../../controllers/pangea_controller.dart'; import '../../../utils/sync_status_util_v2.dart'; diff --git a/lib/pangea/pages/analytics/class_analytics/class_analytics_view.dart b/lib/pangea/pages/analytics/class_analytics/class_analytics_view.dart index e5b5f2dd9..e010044e0 100644 --- a/lib/pangea/pages/analytics/class_analytics/class_analytics_view.dart +++ b/lib/pangea/pages/analytics/class_analytics/class_analytics_view.dart @@ -1,6 +1,10 @@ +// Flutter imports: import 'package:flutter/material.dart'; + +// Package imports: import 'package:flutter_gen/gen_l10n/l10n.dart'; +// Project imports: import '../../../../utils/matrix_sdk_extensions/matrix_locals.dart'; import '../base_analytics_page.dart'; import 'class_analytics.dart'; diff --git a/lib/pangea/pages/analytics/class_list/class_list.dart b/lib/pangea/pages/analytics/class_list/class_list.dart index 85abf48cb..e2a0ee2af 100644 --- a/lib/pangea/pages/analytics/class_list/class_list.dart +++ b/lib/pangea/pages/analytics/class_list/class_list.dart @@ -1,10 +1,15 @@ +// Dart imports: import 'dart:async'; -import 'package:fluffychat/pangea/enum/time_span.dart'; -import 'package:fluffychat/pangea/pages/analytics/class_list/class_list_view.dart'; +// Flutter imports: import 'package:flutter/material.dart'; + +// Package imports: import 'package:matrix/matrix.dart'; +// Project imports: +import 'package:fluffychat/pangea/enum/time_span.dart'; +import 'package:fluffychat/pangea/pages/analytics/class_list/class_list_view.dart'; import '../../../../widgets/matrix.dart'; import '../../../constants/pangea_event_types.dart'; import '../../../controllers/pangea_controller.dart'; diff --git a/lib/pangea/pages/analytics/class_list/class_list_view.dart b/lib/pangea/pages/analytics/class_list/class_list_view.dart index 552eaff6b..3f166ded2 100644 --- a/lib/pangea/pages/analytics/class_list/class_list_view.dart +++ b/lib/pangea/pages/analytics/class_list/class_list_view.dart @@ -1,11 +1,15 @@ -import 'package:fluffychat/pangea/extensions/client_extension.dart'; -import 'package:fluffychat/pangea/pages/analytics/analytics_list_tile.dart'; -import 'package:fluffychat/pangea/pages/analytics/time_span_menu_button.dart'; +// Flutter imports: import 'package:flutter/material.dart'; + +// Package imports: import 'package:flutter_gen/gen_l10n/l10n.dart'; import 'package:go_router/go_router.dart'; import 'package:matrix/matrix.dart'; +// Project imports: +import 'package:fluffychat/pangea/extensions/client_extension.dart'; +import 'package:fluffychat/pangea/pages/analytics/analytics_list_tile.dart'; +import 'package:fluffychat/pangea/pages/analytics/time_span_menu_button.dart'; import '../../../../widgets/matrix.dart'; import '../../../enum/time_span.dart'; import '../base_analytics_page.dart'; diff --git a/lib/pangea/pages/analytics/construct_cloud.dart b/lib/pangea/pages/analytics/construct_cloud.dart index 56fb956ce..962901201 100644 --- a/lib/pangea/pages/analytics/construct_cloud.dart +++ b/lib/pangea/pages/analytics/construct_cloud.dart @@ -1,6 +1,8 @@ -import 'package:fluffychat/pangea/pages/analytics/base_analytics_page.dart'; +// Flutter imports: import 'package:flutter/material.dart'; +// Project imports: +import 'package:fluffychat/pangea/pages/analytics/base_analytics_page.dart'; import '../../word_cloud/word_cloud_data.dart'; import '../../word_cloud/word_cloud_shape.dart'; import '../../word_cloud/word_cloud_tap.dart'; diff --git a/lib/pangea/pages/analytics/construct_list.dart b/lib/pangea/pages/analytics/construct_list.dart index 0c607d815..b4862d89d 100644 --- a/lib/pangea/pages/analytics/construct_list.dart +++ b/lib/pangea/pages/analytics/construct_list.dart @@ -1,13 +1,18 @@ +// Dart imports: import 'dart:async'; +// Flutter imports: +import 'package:flutter/material.dart'; + +// Package imports: +import 'package:flutter_gen/gen_l10n/l10n.dart'; +import 'package:matrix/matrix.dart'; + +// Project imports: import 'package:fluffychat/pangea/constants/match_rule_ids.dart'; import 'package:fluffychat/pangea/enum/construct_type_enum.dart'; import 'package:fluffychat/pangea/pages/analytics/base_analytics_page.dart'; import 'package:fluffychat/widgets/matrix.dart'; -import 'package:flutter/material.dart'; -import 'package:flutter_gen/gen_l10n/l10n.dart'; -import 'package:matrix/matrix.dart'; - import '../../constants/pangea_event_types.dart'; import '../../models/construct_analytics_event.dart'; import '../../utils/error_handler.dart'; diff --git a/lib/pangea/pages/analytics/list_summary_analytics.dart b/lib/pangea/pages/analytics/list_summary_analytics.dart index 6a322c189..a35ae4449 100644 --- a/lib/pangea/pages/analytics/list_summary_analytics.dart +++ b/lib/pangea/pages/analytics/list_summary_analytics.dart @@ -1,9 +1,14 @@ +// Dart imports: import 'dart:math'; -import 'package:fluffychat/pangea/models/chart_analytics_model.dart'; +// Flutter imports: import 'package:flutter/material.dart'; + +// Package imports: import 'package:flutter_gen/gen_l10n/l10n.dart'; +// Project imports: +import 'package:fluffychat/pangea/models/chart_analytics_model.dart'; import '../../enum/use_type.dart'; class ListSummaryAnalytics extends StatelessWidget { diff --git a/lib/pangea/pages/analytics/messages_bar_chart.dart b/lib/pangea/pages/analytics/messages_bar_chart.dart index 077bc3b33..52ebc979f 100644 --- a/lib/pangea/pages/analytics/messages_bar_chart.dart +++ b/lib/pangea/pages/analytics/messages_bar_chart.dart @@ -1,12 +1,17 @@ +// Dart imports: import 'dart:developer'; -import 'package:fl_chart/fl_chart.dart'; -import 'package:fluffychat/pangea/pages/analytics/bar_chart_placeholder_data.dart'; -import 'package:fluffychat/pangea/utils/error_handler.dart'; +// Flutter imports: import 'package:flutter/foundation.dart'; import 'package:flutter/material.dart'; + +// Package imports: +import 'package:fl_chart/fl_chart.dart'; import 'package:intl/intl.dart'; +// Project imports: +import 'package:fluffychat/pangea/pages/analytics/bar_chart_placeholder_data.dart'; +import 'package:fluffychat/pangea/utils/error_handler.dart'; import '../../enum/time_span.dart'; import '../../enum/use_type.dart'; import '../../models/chart_analytics_model.dart'; diff --git a/lib/pangea/pages/analytics/messages_legend_widget.dart b/lib/pangea/pages/analytics/messages_legend_widget.dart index 7b9cd5b58..130490430 100644 --- a/lib/pangea/pages/analytics/messages_legend_widget.dart +++ b/lib/pangea/pages/analytics/messages_legend_widget.dart @@ -1,6 +1,9 @@ -import 'package:fluffychat/pangea/enum/use_type.dart'; +// Flutter imports: import 'package:flutter/material.dart'; +// Project imports: +import 'package:fluffychat/pangea/enum/use_type.dart'; + class MessagesLegendsListWidget extends StatelessWidget { const MessagesLegendsListWidget({ Key? key, diff --git a/lib/pangea/pages/analytics/student_analytics/student_analytics.dart b/lib/pangea/pages/analytics/student_analytics/student_analytics.dart index e59f79bdd..f3de8e2b5 100644 --- a/lib/pangea/pages/analytics/student_analytics/student_analytics.dart +++ b/lib/pangea/pages/analytics/student_analytics/student_analytics.dart @@ -1,12 +1,17 @@ +// Dart imports: import 'dart:developer'; +// Flutter imports: +import 'package:flutter/foundation.dart'; +import 'package:flutter/material.dart'; + +// Package imports: +import 'package:matrix/matrix.dart'; + +// Project imports: import 'package:fluffychat/pangea/extensions/pangea_room_extension.dart'; import 'package:fluffychat/pangea/models/chart_analytics_model.dart'; import 'package:fluffychat/pangea/widgets/common/list_placeholder.dart'; -import 'package:flutter/foundation.dart'; -import 'package:flutter/material.dart'; -import 'package:matrix/matrix.dart'; - import '../../../../widgets/matrix.dart'; import '../../../controllers/pangea_controller.dart'; import '../../../extensions/client_extension.dart'; diff --git a/lib/pangea/pages/analytics/student_analytics/student_analytics_view.dart b/lib/pangea/pages/analytics/student_analytics/student_analytics_view.dart index 0ea479d22..1f065b6b5 100644 --- a/lib/pangea/pages/analytics/student_analytics/student_analytics_view.dart +++ b/lib/pangea/pages/analytics/student_analytics/student_analytics_view.dart @@ -1,7 +1,11 @@ +// Flutter imports: import 'package:flutter/material.dart'; + +// Package imports: import 'package:flutter_gen/gen_l10n/l10n.dart'; import 'package:matrix/matrix.dart'; +// Project imports: import '../../../../utils/matrix_sdk_extensions/matrix_locals.dart'; import '../base_analytics_page.dart'; import 'student_analytics.dart'; diff --git a/lib/pangea/pages/analytics/time_span_menu_button.dart b/lib/pangea/pages/analytics/time_span_menu_button.dart index ec002bc5e..1f363cfad 100644 --- a/lib/pangea/pages/analytics/time_span_menu_button.dart +++ b/lib/pangea/pages/analytics/time_span_menu_button.dart @@ -1,6 +1,10 @@ +// Flutter imports: import 'package:flutter/material.dart'; + +// Package imports: import 'package:flutter_gen/gen_l10n/l10n.dart'; +// Project imports: import '../../enum/time_span.dart'; class TimeSpanMenuButton extends StatelessWidget { diff --git a/lib/pangea/pages/analytics/vocab_bar_chart.dart b/lib/pangea/pages/analytics/vocab_bar_chart.dart index 922ba9592..1c5f83079 100644 --- a/lib/pangea/pages/analytics/vocab_bar_chart.dart +++ b/lib/pangea/pages/analytics/vocab_bar_chart.dart @@ -1,10 +1,14 @@ +// Flutter imports: +import 'package:flutter/material.dart'; + +// Package imports: import 'package:fl_chart/fl_chart.dart'; + +// Project imports: import 'package:fluffychat/pangea/controllers/pangea_controller.dart'; import 'package:fluffychat/pangea/models/headwords.dart'; import 'package:fluffychat/pangea/pages/analytics/base_analytics_page.dart'; import 'package:fluffychat/widgets/matrix.dart'; -import 'package:flutter/material.dart'; - import 'bar_chart_card.dart'; import 'messages_legend_widget.dart'; diff --git a/lib/pangea/pages/analytics/vocab_legend_widget.dart b/lib/pangea/pages/analytics/vocab_legend_widget.dart index 07f752685..f35c45998 100644 --- a/lib/pangea/pages/analytics/vocab_legend_widget.dart +++ b/lib/pangea/pages/analytics/vocab_legend_widget.dart @@ -1,6 +1,9 @@ -import 'package:fluffychat/pangea/enum/use_type.dart'; +// Flutter imports: import 'package:flutter/material.dart'; +// Project imports: +import 'package:fluffychat/pangea/enum/use_type.dart'; + class VocabLegendsListWidget extends StatelessWidget { const VocabLegendsListWidget({ Key? key, diff --git a/lib/pangea/pages/class_analytics/measure_able.dart b/lib/pangea/pages/class_analytics/measure_able.dart index 8e689b628..3d5e4a732 100644 --- a/lib/pangea/pages/class_analytics/measure_able.dart +++ b/lib/pangea/pages/class_analytics/measure_able.dart @@ -1,3 +1,4 @@ +// Flutter imports: import 'package:flutter/material.dart'; import 'package:flutter/scheduler.dart'; diff --git a/lib/pangea/pages/class_invitation_selection/class_invitation_selection.dart b/lib/pangea/pages/class_invitation_selection/class_invitation_selection.dart index 128b97131..66f6e84cd 100644 --- a/lib/pangea/pages/class_invitation_selection/class_invitation_selection.dart +++ b/lib/pangea/pages/class_invitation_selection/class_invitation_selection.dart @@ -1,14 +1,20 @@ +// Dart imports: import 'dart:async'; +// Flutter imports: +import 'package:flutter/material.dart'; + +// Package imports: import 'package:adaptive_dialog/adaptive_dialog.dart'; import 'package:collection/collection.dart'; -import 'package:fluffychat/widgets/matrix.dart'; -import 'package:flutter/material.dart'; import 'package:flutter_gen/gen_l10n/l10n.dart'; import 'package:future_loading_dialog/future_loading_dialog.dart'; import 'package:go_router/go_router.dart'; import 'package:matrix/matrix.dart'; +// Project imports: +import 'package:fluffychat/widgets/matrix.dart'; + class ClassInvitationSelection extends StatefulWidget { const ClassInvitationSelection({Key? key}) : super(key: key); diff --git a/lib/pangea/pages/class_settings/class_name_header.dart b/lib/pangea/pages/class_settings/class_name_header.dart index 29d0aa77f..adc9d8163 100644 --- a/lib/pangea/pages/class_settings/class_name_header.dart +++ b/lib/pangea/pages/class_settings/class_name_header.dart @@ -1,9 +1,14 @@ -import 'package:fluffychat/pages/chat_details/chat_details.dart'; -import 'package:fluffychat/pangea/extensions/pangea_room_extension.dart'; +// Flutter imports: import 'package:flutter/material.dart'; import 'package:flutter/src/widgets/visibility.dart' as visible; + +// Package imports: import 'package:matrix/matrix.dart'; +// Project imports: +import 'package:fluffychat/pages/chat_details/chat_details.dart'; +import 'package:fluffychat/pangea/extensions/pangea_room_extension.dart'; + class ClassNameHeader extends StatelessWidget { final Room room; final ChatDetailsController controller; diff --git a/lib/pangea/pages/class_settings/class_settings_page.dart b/lib/pangea/pages/class_settings/class_settings_page.dart index 94e890151..5f4477534 100644 --- a/lib/pangea/pages/class_settings/class_settings_page.dart +++ b/lib/pangea/pages/class_settings/class_settings_page.dart @@ -1,14 +1,19 @@ +// Dart imports: import 'dart:async'; import 'dart:developer'; -import 'package:fluffychat/pangea/controllers/pangea_controller.dart'; -import 'package:fluffychat/widgets/layouts/empty_page.dart'; +// Flutter imports: import 'package:flutter/foundation.dart'; import 'package:flutter/material.dart'; + +// Package imports: import 'package:flutter_gen/gen_l10n/l10n.dart'; import 'package:go_router/go_router.dart'; import 'package:matrix/matrix.dart'; +// Project imports: +import 'package:fluffychat/pangea/controllers/pangea_controller.dart'; +import 'package:fluffychat/widgets/layouts/empty_page.dart'; import '../../../widgets/matrix.dart'; import '../../utils/error_handler.dart'; import '../../utils/set_class_name.dart'; diff --git a/lib/pangea/pages/class_settings/class_settings_view.dart b/lib/pangea/pages/class_settings/class_settings_view.dart index 9d5e575ed..df5254fa2 100644 --- a/lib/pangea/pages/class_settings/class_settings_view.dart +++ b/lib/pangea/pages/class_settings/class_settings_view.dart @@ -1,11 +1,15 @@ -import 'package:fluffychat/pangea/pages/class_settings/class_settings_page.dart'; -import 'package:fluffychat/pangea/pages/class_settings/p_class_widgets/room_rules_editor.dart'; -import 'package:fluffychat/pangea/widgets/space/class_settings.dart'; +// Flutter imports: import 'package:flutter/material.dart'; + +// Package imports: import 'package:flutter_gen/gen_l10n/l10n.dart'; import 'package:future_loading_dialog/future_loading_dialog.dart'; import 'package:go_router/go_router.dart'; +// Project imports: +import 'package:fluffychat/pangea/pages/class_settings/class_settings_page.dart'; +import 'package:fluffychat/pangea/pages/class_settings/p_class_widgets/room_rules_editor.dart'; +import 'package:fluffychat/pangea/widgets/space/class_settings.dart'; import '../../../widgets/layouts/max_width_body.dart'; class ClassSettingsPageView extends StatelessWidget { diff --git a/lib/pangea/pages/class_settings/p_class_widgets/class_analytics_button.dart b/lib/pangea/pages/class_settings/p_class_widgets/class_analytics_button.dart index dad1a9d91..0bc4c288f 100644 --- a/lib/pangea/pages/class_settings/p_class_widgets/class_analytics_button.dart +++ b/lib/pangea/pages/class_settings/p_class_widgets/class_analytics_button.dart @@ -1,4 +1,7 @@ +// Flutter imports: import 'package:flutter/material.dart'; + +// Package imports: import 'package:flutter_gen/gen_l10n/l10n.dart'; import 'package:go_router/go_router.dart'; diff --git a/lib/pangea/pages/class_settings/p_class_widgets/class_description_button.dart b/lib/pangea/pages/class_settings/p_class_widgets/class_description_button.dart index e7b786381..05df04a89 100644 --- a/lib/pangea/pages/class_settings/p_class_widgets/class_description_button.dart +++ b/lib/pangea/pages/class_settings/p_class_widgets/class_description_button.dart @@ -1,8 +1,13 @@ -import 'package:fluffychat/pages/chat_details/chat_details.dart'; +// Flutter imports: import 'package:flutter/material.dart'; + +// Package imports: import 'package:flutter_gen/gen_l10n/l10n.dart'; import 'package:matrix/matrix.dart'; +// Project imports: +import 'package:fluffychat/pages/chat_details/chat_details.dart'; + class ClassDescriptionButton extends StatelessWidget { final Room room; final ChatDetailsController controller; diff --git a/lib/pangea/pages/class_settings/p_class_widgets/class_details_toggle_add_students_tile.dart b/lib/pangea/pages/class_settings/p_class_widgets/class_details_toggle_add_students_tile.dart index c03177494..156e53383 100644 --- a/lib/pangea/pages/class_settings/p_class_widgets/class_details_toggle_add_students_tile.dart +++ b/lib/pangea/pages/class_settings/p_class_widgets/class_details_toggle_add_students_tile.dart @@ -1,6 +1,10 @@ +// Flutter imports: import 'package:flutter/material.dart'; + +// Package imports: import 'package:flutter_gen/gen_l10n/l10n.dart'; +// Project imports: import '../../../../pages/chat_details/chat_details.dart'; class SpaceDetailsToggleAddStudentsTile extends StatelessWidget { diff --git a/lib/pangea/pages/class_settings/p_class_widgets/class_invitation_buttons.dart b/lib/pangea/pages/class_settings/p_class_widgets/class_invitation_buttons.dart index 5638828e8..e9e907d10 100644 --- a/lib/pangea/pages/class_settings/p_class_widgets/class_invitation_buttons.dart +++ b/lib/pangea/pages/class_settings/p_class_widgets/class_invitation_buttons.dart @@ -1,15 +1,19 @@ -import 'package:fluffychat/pangea/config/environment.dart'; -import 'package:fluffychat/pangea/constants/url_query_parameter_keys.dart'; -import 'package:fluffychat/pangea/extensions/pangea_room_extension.dart'; -import 'package:fluffychat/widgets/matrix.dart'; +// Flutter imports: import 'package:flutter/foundation.dart'; import 'package:flutter/material.dart'; import 'package:flutter/services.dart'; + +// Package imports: import 'package:flutter_gen/gen_l10n/l10n.dart'; import 'package:go_router/go_router.dart'; import 'package:matrix/matrix.dart'; import 'package:universal_html/html.dart' as html; +// Project imports: +import 'package:fluffychat/pangea/config/environment.dart'; +import 'package:fluffychat/pangea/constants/url_query_parameter_keys.dart'; +import 'package:fluffychat/pangea/extensions/pangea_room_extension.dart'; +import 'package:fluffychat/widgets/matrix.dart'; import '../../../../utils/fluffy_share.dart'; import '../../../../widgets/avatar.dart'; diff --git a/lib/pangea/pages/class_settings/p_class_widgets/class_name_button.dart b/lib/pangea/pages/class_settings/p_class_widgets/class_name_button.dart index cca0df0d3..c8879b0c5 100644 --- a/lib/pangea/pages/class_settings/p_class_widgets/class_name_button.dart +++ b/lib/pangea/pages/class_settings/p_class_widgets/class_name_button.dart @@ -1,9 +1,14 @@ -import 'package:fluffychat/pages/chat_details/chat_details.dart'; -import 'package:fluffychat/utils/matrix_sdk_extensions/matrix_locals.dart'; +// Flutter imports: import 'package:flutter/material.dart'; + +// Package imports: import 'package:flutter_gen/gen_l10n/l10n.dart'; import 'package:matrix/matrix.dart'; +// Project imports: +import 'package:fluffychat/pages/chat_details/chat_details.dart'; +import 'package:fluffychat/utils/matrix_sdk_extensions/matrix_locals.dart'; + class ClassNameButton extends StatelessWidget { final Room room; final ChatDetailsController controller; diff --git a/lib/pangea/pages/class_settings/p_class_widgets/class_settings_button.dart b/lib/pangea/pages/class_settings/p_class_widgets/class_settings_button.dart index f2738c1ac..291e21aa4 100644 --- a/lib/pangea/pages/class_settings/p_class_widgets/class_settings_button.dart +++ b/lib/pangea/pages/class_settings/p_class_widgets/class_settings_button.dart @@ -1,4 +1,7 @@ +// Flutter imports: import 'package:flutter/material.dart'; + +// Package imports: import 'package:flutter_gen/gen_l10n/l10n.dart'; import 'package:go_router/go_router.dart'; diff --git a/lib/pangea/pages/class_settings/p_class_widgets/class_show_edit_dialog.dart b/lib/pangea/pages/class_settings/p_class_widgets/class_show_edit_dialog.dart index 3d058e8d9..c6f65b54b 100644 --- a/lib/pangea/pages/class_settings/p_class_widgets/class_show_edit_dialog.dart +++ b/lib/pangea/pages/class_settings/p_class_widgets/class_show_edit_dialog.dart @@ -1,5 +1,8 @@ -import 'package:adaptive_dialog/adaptive_dialog.dart'; +// Flutter imports: import 'package:flutter/material.dart'; + +// Package imports: +import 'package:adaptive_dialog/adaptive_dialog.dart'; import 'package:flutter_gen/gen_l10n/l10n.dart'; import 'package:future_loading_dialog/future_loading_dialog.dart'; diff --git a/lib/pangea/pages/class_settings/p_class_widgets/delete_class_tile.dart b/lib/pangea/pages/class_settings/p_class_widgets/delete_class_tile.dart index cc7b447e3..c1e8c9771 100644 --- a/lib/pangea/pages/class_settings/p_class_widgets/delete_class_tile.dart +++ b/lib/pangea/pages/class_settings/p_class_widgets/delete_class_tile.dart @@ -1,11 +1,16 @@ -import 'package:fluffychat/pangea/utils/delete_room.dart'; -import 'package:fluffychat/widgets/matrix.dart'; +// Flutter imports: import 'package:flutter/material.dart'; + +// Package imports: import 'package:flutter_gen/gen_l10n/l10n.dart'; import 'package:future_loading_dialog/future_loading_dialog.dart'; import 'package:go_router/go_router.dart'; import 'package:matrix/matrix.dart'; +// Project imports: +import 'package:fluffychat/pangea/utils/delete_room.dart'; +import 'package:fluffychat/widgets/matrix.dart'; + class DeleteSpaceTile extends StatelessWidget { final Room room; diff --git a/lib/pangea/pages/class_settings/p_class_widgets/room_rules_editor.dart b/lib/pangea/pages/class_settings/p_class_widgets/room_rules_editor.dart index e9462a2cb..0f5555fe9 100644 --- a/lib/pangea/pages/class_settings/p_class_widgets/room_rules_editor.dart +++ b/lib/pangea/pages/class_settings/p_class_widgets/room_rules_editor.dart @@ -1,9 +1,13 @@ -import 'package:fluffychat/pangea/models/class_model.dart'; +// Flutter imports: import 'package:flutter/material.dart'; + +// Package imports: import 'package:flutter_gen/gen_l10n/l10n.dart'; import 'package:future_loading_dialog/future_loading_dialog.dart'; import 'package:matrix/matrix.dart'; +// Project imports: +import 'package:fluffychat/pangea/models/class_model.dart'; import '../../../../config/app_config.dart'; import '../../../../widgets/matrix.dart'; import '../../../constants/pangea_event_types.dart'; diff --git a/lib/pangea/pages/connect/p_sso_button.dart b/lib/pangea/pages/connect/p_sso_button.dart index f97ea7f06..42226bb85 100644 --- a/lib/pangea/pages/connect/p_sso_button.dart +++ b/lib/pangea/pages/connect/p_sso_button.dart @@ -1,11 +1,16 @@ -import 'package:fluffychat/config/app_config.dart'; -import 'package:fluffychat/pages/homeserver_picker/homeserver_picker.dart'; -import 'package:fluffychat/widgets/matrix.dart'; +// Flutter imports: import 'package:flutter/material.dart'; + +// Package imports: import 'package:flutter_gen/gen_l10n/l10n.dart'; import 'package:flutter_svg/svg.dart'; import 'package:matrix/matrix.dart'; +// Project imports: +import 'package:fluffychat/config/app_config.dart'; +import 'package:fluffychat/pages/homeserver_picker/homeserver_picker.dart'; +import 'package:fluffychat/widgets/matrix.dart'; + class ButtonInfo { String iconPath; String text; diff --git a/lib/pangea/pages/exchange/add_exchange_to_class.dart b/lib/pangea/pages/exchange/add_exchange_to_class.dart index 711ae22ef..477ac303b 100644 --- a/lib/pangea/pages/exchange/add_exchange_to_class.dart +++ b/lib/pangea/pages/exchange/add_exchange_to_class.dart @@ -1,9 +1,14 @@ +// Flutter imports: +import 'package:flutter/material.dart'; + +// Package imports: +import 'package:flutter_gen/gen_l10n/l10n.dart'; +import 'package:go_router/go_router.dart'; + +// Project imports: import 'package:fluffychat/pangea/widgets/class/add_class_and_invite.dart'; import 'package:fluffychat/pangea/widgets/class/add_space_toggles.dart'; import 'package:fluffychat/widgets/matrix.dart'; -import 'package:flutter/material.dart'; -import 'package:flutter_gen/gen_l10n/l10n.dart'; -import 'package:go_router/go_router.dart'; class AddExchangeToClass extends StatefulWidget { const AddExchangeToClass({Key? key}) : super(key: key); diff --git a/lib/pangea/pages/find_partner/find_partner.dart b/lib/pangea/pages/find_partner/find_partner.dart index 634e94285..bd37c899a 100644 --- a/lib/pangea/pages/find_partner/find_partner.dart +++ b/lib/pangea/pages/find_partner/find_partner.dart @@ -1,9 +1,12 @@ +// Dart imports: import 'dart:async'; -import 'package:fluffychat/pangea/models/user_model.dart'; +// Flutter imports: import 'package:flutter/material.dart'; -import 'package:fluffychat/pangea/models/language_model.dart'; +// Project imports: +import 'package:fluffychat/pangea/models/language_model.dart'; +import 'package:fluffychat/pangea/models/user_model.dart'; import '../../../widgets/matrix.dart'; import '../../controllers/pangea_controller.dart'; import '../../models/user_profile_search_model.dart'; diff --git a/lib/pangea/pages/find_partner/find_partner_view.dart b/lib/pangea/pages/find_partner/find_partner_view.dart index 9845aa9e0..b96a6b917 100644 --- a/lib/pangea/pages/find_partner/find_partner_view.dart +++ b/lib/pangea/pages/find_partner/find_partner_view.dart @@ -1,4 +1,13 @@ +// Flutter imports: +import 'package:flutter/material.dart'; + +// Package imports: import 'package:country_picker/country_picker.dart'; +import 'package:flutter_gen/gen_l10n/l10n.dart'; +import 'package:go_router/go_router.dart'; +import 'package:matrix/matrix.dart' as matrix; + +// Project imports: import 'package:fluffychat/config/themes.dart'; import 'package:fluffychat/pangea/models/user_model.dart'; import 'package:fluffychat/pangea/widgets/common/list_placeholder.dart'; @@ -6,11 +15,6 @@ import 'package:fluffychat/pangea/widgets/common/pangea_logo_svg.dart'; import 'package:fluffychat/pangea/widgets/user_settings/p_language_dropdown.dart'; import 'package:fluffychat/widgets/avatar.dart'; import 'package:fluffychat/widgets/matrix.dart'; -import 'package:flutter/material.dart'; -import 'package:flutter_gen/gen_l10n/l10n.dart'; -import 'package:go_router/go_router.dart'; -import 'package:matrix/matrix.dart' as matrix; - import '../../../widgets/profile_bottom_sheet.dart'; import 'find_partner.dart'; diff --git a/lib/pangea/pages/new_class/new_class.dart b/lib/pangea/pages/new_class/new_class.dart index 18c676cb4..30d5ae0de 100644 --- a/lib/pangea/pages/new_class/new_class.dart +++ b/lib/pangea/pages/new_class/new_class.dart @@ -1,17 +1,22 @@ +// Dart imports: import 'dart:developer'; -import 'package:fluffychat/pangea/pages/new_class/new_class_view.dart'; -import 'package:fluffychat/pangea/utils/class_code.dart'; -import 'package:fluffychat/pangea/utils/error_handler.dart'; -import 'package:fluffychat/widgets/matrix.dart'; +// Flutter imports: import 'package:flutter/foundation.dart'; import 'package:flutter/material.dart'; + +// Package imports: import 'package:flutter_gen/gen_l10n/l10n.dart'; import 'package:future_loading_dialog/future_loading_dialog.dart'; import 'package:go_router/go_router.dart'; import 'package:matrix/matrix.dart' as sdk; import 'package:matrix/matrix.dart'; +// Project imports: +import 'package:fluffychat/pangea/pages/new_class/new_class_view.dart'; +import 'package:fluffychat/pangea/utils/class_code.dart'; +import 'package:fluffychat/pangea/utils/error_handler.dart'; +import 'package:fluffychat/widgets/matrix.dart'; import '../../controllers/pangea_controller.dart'; import '../../widgets/space/class_settings.dart'; import '../class_settings/p_class_widgets/room_rules_editor.dart'; diff --git a/lib/pangea/pages/new_class/new_class_view.dart b/lib/pangea/pages/new_class/new_class_view.dart index 5249c191e..e40cc08ce 100644 --- a/lib/pangea/pages/new_class/new_class_view.dart +++ b/lib/pangea/pages/new_class/new_class_view.dart @@ -1,10 +1,14 @@ +// Flutter imports: +import 'package:flutter/material.dart'; +import 'package:flutter/services.dart'; + +// Package imports: +import 'package:flutter_gen/gen_l10n/l10n.dart'; + +// Project imports: import 'package:fluffychat/pangea/constants/class_default_values.dart'; import 'package:fluffychat/pangea/pages/new_class/new_class.dart'; import 'package:fluffychat/widgets/layouts/max_width_body.dart'; -import 'package:flutter/material.dart'; -import 'package:flutter/services.dart'; -import 'package:flutter_gen/gen_l10n/l10n.dart'; - import '../../widgets/space/class_settings.dart'; import '../class_settings/p_class_widgets/room_rules_editor.dart'; diff --git a/lib/pangea/pages/p_user_age/p_user_age.dart b/lib/pangea/pages/p_user_age/p_user_age.dart index 250528e79..699dd2fcf 100644 --- a/lib/pangea/pages/p_user_age/p_user_age.dart +++ b/lib/pangea/pages/p_user_age/p_user_age.dart @@ -1,16 +1,21 @@ +// Dart imports: import 'dart:developer'; +// Flutter imports: +import 'package:flutter/foundation.dart'; +import 'package:flutter/material.dart'; + +// Package imports: +import 'package:flutter_gen/gen_l10n/l10n.dart'; +import 'package:intl/intl.dart'; + +// Project imports: import 'package:fluffychat/pangea/constants/age_limits.dart'; import 'package:fluffychat/pangea/controllers/pangea_controller.dart'; import 'package:fluffychat/pangea/pages/p_user_age/p_user_age_view.dart'; import 'package:fluffychat/pangea/utils/p_extension.dart'; import 'package:fluffychat/widgets/fluffy_chat_app.dart'; import 'package:fluffychat/widgets/matrix.dart'; -import 'package:flutter/foundation.dart'; -import 'package:flutter/material.dart'; -import 'package:flutter_gen/gen_l10n/l10n.dart'; -import 'package:intl/intl.dart'; - import '../../utils/bot_name.dart'; import '../../utils/error_handler.dart'; diff --git a/lib/pangea/pages/p_user_age/p_user_age_view.dart b/lib/pangea/pages/p_user_age/p_user_age_view.dart index 6ad1bbfb9..b4f5e9e49 100644 --- a/lib/pangea/pages/p_user_age/p_user_age_view.dart +++ b/lib/pangea/pages/p_user_age/p_user_age_view.dart @@ -1,7 +1,12 @@ -import 'package:fluffychat/pangea/pages/p_user_age/p_user_age.dart'; +// Flutter imports: import 'package:flutter/material.dart'; -import 'package:intl/intl.dart'; + +// Package imports: import 'package:flutter_gen/gen_l10n/l10n.dart'; +import 'package:intl/intl.dart'; + +// Project imports: +import 'package:fluffychat/pangea/pages/p_user_age/p_user_age.dart'; import '../../../widgets/layouts/login_scaffold.dart'; class PUserAgeView extends StatelessWidget { diff --git a/lib/pangea/pages/settings_learning/settings_learning.dart b/lib/pangea/pages/settings_learning/settings_learning.dart index 965967095..49554c3e3 100644 --- a/lib/pangea/pages/settings_learning/settings_learning.dart +++ b/lib/pangea/pages/settings_learning/settings_learning.dart @@ -1,9 +1,13 @@ +// Dart imports: import 'dart:async'; +// Flutter imports: +import 'package:flutter/material.dart'; + +// Project imports: import 'package:fluffychat/pangea/controllers/pangea_controller.dart'; import 'package:fluffychat/pangea/pages/settings_learning/settings_learning_view.dart'; import 'package:fluffychat/widgets/matrix.dart'; -import 'package:flutter/material.dart'; class SettingsLearning extends StatefulWidget { const SettingsLearning({Key? key}) : super(key: key); diff --git a/lib/pangea/pages/settings_learning/settings_learning_view.dart b/lib/pangea/pages/settings_learning/settings_learning_view.dart index 59941237f..cdc394a4c 100644 --- a/lib/pangea/pages/settings_learning/settings_learning_view.dart +++ b/lib/pangea/pages/settings_learning/settings_learning_view.dart @@ -1,3 +1,11 @@ +// Flutter imports: +import 'package:flutter/material.dart'; + +// Package imports: +import 'package:flutter_gen/gen_l10n/l10n.dart'; +import 'package:future_loading_dialog/future_loading_dialog.dart'; + +// Project imports: import 'package:fluffychat/pangea/models/class_model.dart'; import 'package:fluffychat/pangea/pages/settings_learning/settings_learning.dart'; import 'package:fluffychat/pangea/utils/error_handler.dart'; @@ -5,10 +13,6 @@ import 'package:fluffychat/pangea/widgets/user_settings/country_picker_tile.dart import 'package:fluffychat/pangea/widgets/user_settings/language_tile.dart'; import 'package:fluffychat/pangea/widgets/user_settings/p_settings_switch_list_tile.dart'; import 'package:fluffychat/widgets/layouts/max_width_body.dart'; -import 'package:flutter/material.dart'; -import 'package:flutter_gen/gen_l10n/l10n.dart'; -import 'package:future_loading_dialog/future_loading_dialog.dart'; - import '../../../config/app_config.dart'; class SettingsLearningView extends StatelessWidget { diff --git a/lib/pangea/pages/settings_subscription/change_subscription.dart b/lib/pangea/pages/settings_subscription/change_subscription.dart index d86d55a5e..e1dde3de3 100644 --- a/lib/pangea/pages/settings_subscription/change_subscription.dart +++ b/lib/pangea/pages/settings_subscription/change_subscription.dart @@ -1,11 +1,16 @@ +// Flutter imports: +import 'package:flutter/foundation.dart'; +import 'package:flutter/material.dart'; + +// Package imports: import 'package:adaptive_dialog/adaptive_dialog.dart'; +import 'package:flutter_gen/gen_l10n/l10n.dart'; + +// Project imports: import 'package:fluffychat/pangea/controllers/pangea_controller.dart'; import 'package:fluffychat/pangea/pages/settings_subscription/settings_subscription.dart'; import 'package:fluffychat/pangea/widgets/subscription/subscription_buttons.dart'; import 'package:fluffychat/widgets/matrix.dart'; -import 'package:flutter/foundation.dart'; -import 'package:flutter/material.dart'; -import 'package:flutter_gen/gen_l10n/l10n.dart'; class ChangeSubscription extends StatelessWidget { final SubscriptionManagementController controller; diff --git a/lib/pangea/pages/settings_subscription/settings_subscription.dart b/lib/pangea/pages/settings_subscription/settings_subscription.dart index 037e9fb27..ddd67ff87 100644 --- a/lib/pangea/pages/settings_subscription/settings_subscription.dart +++ b/lib/pangea/pages/settings_subscription/settings_subscription.dart @@ -1,5 +1,13 @@ +// Dart imports: import 'dart:async'; +// Flutter imports: +import 'package:flutter/material.dart'; + +// Package imports: +import 'package:url_launcher/url_launcher_string.dart'; + +// Project imports: import 'package:fluffychat/config/app_config.dart'; import 'package:fluffychat/pangea/config/environment.dart'; import 'package:fluffychat/pangea/controllers/pangea_controller.dart'; @@ -7,8 +15,6 @@ import 'package:fluffychat/pangea/controllers/subscription_controller.dart'; import 'package:fluffychat/pangea/pages/settings_subscription/settings_subscription_view.dart'; import 'package:fluffychat/pangea/utils/subscription_app_id.dart'; import 'package:fluffychat/widgets/matrix.dart'; -import 'package:flutter/material.dart'; -import 'package:url_launcher/url_launcher_string.dart'; class SubscriptionManagement extends StatefulWidget { const SubscriptionManagement({Key? key}) : super(key: key); diff --git a/lib/pangea/pages/settings_subscription/settings_subscription_view.dart b/lib/pangea/pages/settings_subscription/settings_subscription_view.dart index bcc9fb2a6..dbcdf4166 100644 --- a/lib/pangea/pages/settings_subscription/settings_subscription_view.dart +++ b/lib/pangea/pages/settings_subscription/settings_subscription_view.dart @@ -1,12 +1,17 @@ +// Flutter imports: +import 'package:flutter/material.dart'; + +// Package imports: +import 'package:flutter_gen/gen_l10n/l10n.dart'; +import 'package:intl/intl.dart'; + +// Project imports: import 'package:fluffychat/pangea/controllers/pangea_controller.dart'; import 'package:fluffychat/pangea/controllers/subscription_controller.dart'; import 'package:fluffychat/pangea/pages/settings_subscription/change_subscription.dart'; import 'package:fluffychat/pangea/pages/settings_subscription/settings_subscription.dart'; import 'package:fluffychat/widgets/layouts/max_width_body.dart'; import 'package:fluffychat/widgets/matrix.dart'; -import 'package:flutter/material.dart'; -import 'package:flutter_gen/gen_l10n/l10n.dart'; -import 'package:intl/intl.dart'; class SettingsSubscriptionView extends StatelessWidget { final SubscriptionManagementController controller; diff --git a/lib/pangea/pages/sign_up/signup.dart b/lib/pangea/pages/sign_up/signup.dart index af6a515ba..dafe65b70 100644 --- a/lib/pangea/pages/sign_up/signup.dart +++ b/lib/pangea/pages/sign_up/signup.dart @@ -1,11 +1,16 @@ +// Flutter imports: +import 'package:flutter/material.dart'; + +// Package imports: +import 'package:flutter_gen/gen_l10n/l10n.dart'; + +// Project imports: import 'package:fluffychat/pangea/pages/sign_up/signup_view.dart'; import 'package:fluffychat/pangea/utils/error_handler.dart'; import 'package:fluffychat/pangea/utils/firebase_analytics.dart'; import 'package:fluffychat/utils/localized_exception_extension.dart'; import 'package:fluffychat/utils/platform_infos.dart'; import 'package:fluffychat/widgets/matrix.dart'; -import 'package:flutter/material.dart'; -import 'package:flutter_gen/gen_l10n/l10n.dart'; class SignupPage extends StatefulWidget { const SignupPage({Key? key}) : super(key: key); diff --git a/lib/pangea/pages/sign_up/signup_view.dart b/lib/pangea/pages/sign_up/signup_view.dart index ba673216a..7724e02ba 100644 --- a/lib/pangea/pages/sign_up/signup_view.dart +++ b/lib/pangea/pages/sign_up/signup_view.dart @@ -1,9 +1,12 @@ +// Flutter imports: import 'package:flutter/material.dart'; +// Package imports: import 'package:flutter_gen/gen_l10n/l10n.dart'; -import 'package:fluffychat/widgets/layouts/login_scaffold.dart'; +// Project imports: import 'package:fluffychat/pangea/widgets/signup/tos_checkbox.dart'; +import 'package:fluffychat/widgets/layouts/login_scaffold.dart'; import 'signup.dart'; class SignupPageView extends StatelessWidget { diff --git a/lib/pangea/repo/class_repo.dart b/lib/pangea/repo/class_repo.dart index f6f576602..858cf7cac 100644 --- a/lib/pangea/repo/class_repo.dart +++ b/lib/pangea/repo/class_repo.dart @@ -1,10 +1,15 @@ +// Dart imports: import 'dart:convert'; -import 'package:fluffychat/pangea/models/class_email_invite_model.dart'; -import 'package:fluffychat/pangea/models/class_model.dart'; +// Flutter imports: import 'package:flutter/material.dart'; + +// Package imports: import 'package:http/http.dart'; +// Project imports: +import 'package:fluffychat/pangea/models/class_email_invite_model.dart'; +import 'package:fluffychat/pangea/models/class_model.dart'; import '../network/requests.dart'; import '../network/urls.dart'; diff --git a/lib/pangea/repo/contextualized_translation_repo.dart b/lib/pangea/repo/contextualized_translation_repo.dart index 9d2f608dd..21aede9fc 100644 --- a/lib/pangea/repo/contextualized_translation_repo.dart +++ b/lib/pangea/repo/contextualized_translation_repo.dart @@ -1,10 +1,13 @@ +// Dart imports: import 'dart:convert'; -import 'package:fluffychat/pangea/constants/model_keys.dart'; -import 'package:fluffychat/pangea/utils/error_handler.dart'; +// Package imports: import 'package:http/http.dart'; import 'package:sentry_flutter/sentry_flutter.dart'; +// Project imports: +import 'package:fluffychat/pangea/constants/model_keys.dart'; +import 'package:fluffychat/pangea/utils/error_handler.dart'; import '../config/environment.dart'; import '../models/pangea_token_model.dart'; import '../network/requests.dart'; diff --git a/lib/pangea/repo/exchange_repo.dart b/lib/pangea/repo/exchange_repo.dart index 97bd9ed74..131dbbeaa 100644 --- a/lib/pangea/repo/exchange_repo.dart +++ b/lib/pangea/repo/exchange_repo.dart @@ -1,3 +1,4 @@ +// Flutter imports: import 'package:flutter/material.dart'; class PExchangeRepo { diff --git a/lib/pangea/repo/full_text_translation_repo.dart b/lib/pangea/repo/full_text_translation_repo.dart index 4be05da57..0968eaf94 100644 --- a/lib/pangea/repo/full_text_translation_repo.dart +++ b/lib/pangea/repo/full_text_translation_repo.dart @@ -1,9 +1,12 @@ //Question for Jordan - is this for an individual token or could it be a span? +// Dart imports: import 'dart:convert'; +// Package imports: import 'package:http/http.dart'; +// Project imports: import '../config/environment.dart'; import '../constants/model_keys.dart'; import '../network/requests.dart'; diff --git a/lib/pangea/repo/igc_repo.dart b/lib/pangea/repo/igc_repo.dart index 712510899..ead9322e1 100644 --- a/lib/pangea/repo/igc_repo.dart +++ b/lib/pangea/repo/igc_repo.dart @@ -1,13 +1,16 @@ +// Dart imports: import 'dart:convert'; +// Package imports: +import 'package:http/http.dart'; + +// Project imports: import 'package:fluffychat/pangea/config/environment.dart'; import 'package:fluffychat/pangea/models/language_detection_model.dart'; import 'package:fluffychat/pangea/models/lemma.dart'; import 'package:fluffychat/pangea/models/pangea_match_model.dart'; import 'package:fluffychat/pangea/models/pangea_token_model.dart'; import 'package:fluffychat/pangea/repo/span_data_repo.dart'; -import 'package:http/http.dart'; - import '../constants/model_keys.dart'; import '../models/igc_text_data_model.dart'; import '../network/requests.dart'; diff --git a/lib/pangea/repo/interactive_translation_repo.dart b/lib/pangea/repo/interactive_translation_repo.dart index debb5c776..f68a8e8ec 100644 --- a/lib/pangea/repo/interactive_translation_repo.dart +++ b/lib/pangea/repo/interactive_translation_repo.dart @@ -1,8 +1,11 @@ +// Dart imports: import 'dart:convert'; -import 'package:fluffychat/pangea/config/environment.dart'; +// Package imports: import 'package:http/http.dart'; +// Project imports: +import 'package:fluffychat/pangea/config/environment.dart'; import '../models/custom_input_translation_model.dart'; import '../models/it_response_model.dart'; import '../models/system_choice_translation_model.dart'; diff --git a/lib/pangea/repo/language_repo.dart b/lib/pangea/repo/language_repo.dart index fb564ac48..418fa8e7c 100644 --- a/lib/pangea/repo/language_repo.dart +++ b/lib/pangea/repo/language_repo.dart @@ -1,12 +1,17 @@ +// Dart imports: import 'dart:convert'; import 'dart:developer'; +// Flutter imports: +import 'package:flutter/foundation.dart'; + +// Package imports: +import 'package:http/http.dart'; + +// Project imports: import 'package:fluffychat/pangea/models/language_model.dart'; import 'package:fluffychat/pangea/network/urls.dart'; import 'package:fluffychat/pangea/utils/error_handler.dart'; -import 'package:flutter/foundation.dart'; -import 'package:http/http.dart'; - import '../config/environment.dart'; import '../network/requests.dart'; diff --git a/lib/pangea/repo/message_service.repo.dart b/lib/pangea/repo/message_service.repo.dart index 49288de5e..40b9ec4d2 100644 --- a/lib/pangea/repo/message_service.repo.dart +++ b/lib/pangea/repo/message_service.repo.dart @@ -1,3 +1,4 @@ +// Project imports: import '../config/environment.dart'; import '../network/requests.dart'; import '../network/urls.dart'; diff --git a/lib/pangea/repo/similarity_repo.dart b/lib/pangea/repo/similarity_repo.dart index 1dd21d5bd..7d2e67ef9 100644 --- a/lib/pangea/repo/similarity_repo.dart +++ b/lib/pangea/repo/similarity_repo.dart @@ -1,8 +1,11 @@ +// Dart imports: import 'dart:convert'; -import 'package:fluffychat/pangea/config/environment.dart'; +// Package imports: import 'package:http/http.dart'; +// Project imports: +import 'package:fluffychat/pangea/config/environment.dart'; import '../network/requests.dart'; import '../network/urls.dart'; diff --git a/lib/pangea/repo/span_data_repo.dart b/lib/pangea/repo/span_data_repo.dart index df20b0580..68212a869 100644 --- a/lib/pangea/repo/span_data_repo.dart +++ b/lib/pangea/repo/span_data_repo.dart @@ -1,11 +1,14 @@ +// Dart imports: import 'dart:convert'; +// Package imports: +import 'package:http/http.dart'; + +// Project imports: import 'package:fluffychat/pangea/config/environment.dart'; import 'package:fluffychat/pangea/enum/span_choice_type.dart'; import 'package:fluffychat/pangea/enum/span_data_type.dart'; import 'package:fluffychat/pangea/models/span_data.dart'; -import 'package:http/http.dart'; - import '../constants/model_keys.dart'; import '../network/requests.dart'; import '../network/urls.dart'; diff --git a/lib/pangea/repo/subscription_repo.dart b/lib/pangea/repo/subscription_repo.dart index 92c7ee532..856a60dcc 100644 --- a/lib/pangea/repo/subscription_repo.dart +++ b/lib/pangea/repo/subscription_repo.dart @@ -1,13 +1,18 @@ +// Dart imports: import 'dart:convert'; +// Flutter imports: +import 'package:flutter/material.dart'; + +// Package imports: import 'package:collection/collection.dart'; +import 'package:http/http.dart' as http; + +// Project imports: import 'package:fluffychat/pangea/config/environment.dart'; import 'package:fluffychat/pangea/controllers/subscription_controller.dart'; import 'package:fluffychat/pangea/utils/error_handler.dart'; import 'package:fluffychat/pangea/utils/subscription_app_id.dart'; -import 'package:flutter/material.dart'; -import 'package:http/http.dart' as http; - import '../network/urls.dart'; class SubscriptionRepo { diff --git a/lib/pangea/repo/tokens_repo.dart b/lib/pangea/repo/tokens_repo.dart index 7b6c2ba60..fa8eb0c27 100644 --- a/lib/pangea/repo/tokens_repo.dart +++ b/lib/pangea/repo/tokens_repo.dart @@ -1,9 +1,12 @@ +// Dart imports: import 'dart:convert'; -import 'package:fluffychat/pangea/constants/model_keys.dart'; -import 'package:fluffychat/pangea/utils/error_handler.dart'; +// Package imports: import 'package:http/http.dart'; +// Project imports: +import 'package:fluffychat/pangea/constants/model_keys.dart'; +import 'package:fluffychat/pangea/utils/error_handler.dart'; import '../config/environment.dart'; import '../models/pangea_token_model.dart'; import '../network/requests.dart'; diff --git a/lib/pangea/repo/topic_data_repo.dart b/lib/pangea/repo/topic_data_repo.dart index e9f7b4d89..ccdd18181 100644 --- a/lib/pangea/repo/topic_data_repo.dart +++ b/lib/pangea/repo/topic_data_repo.dart @@ -1,8 +1,13 @@ +// Dart imports: import 'dart:convert'; +// Flutter imports: import 'package:flutter/services.dart'; + +// Package imports: import 'package:http/http.dart'; +// Project imports: import '../config/environment.dart'; import '../models/chat_topic_model.dart'; import '../models/lemma.dart'; diff --git a/lib/pangea/repo/user_repo.dart b/lib/pangea/repo/user_repo.dart index 3f0ad0d9b..61fd56b8c 100644 --- a/lib/pangea/repo/user_repo.dart +++ b/lib/pangea/repo/user_repo.dart @@ -1,9 +1,12 @@ +// Dart imports: import 'dart:convert'; import 'dart:developer'; -import 'package:fluffychat/pangea/constants/model_keys.dart'; +// Package imports: import 'package:http/http.dart'; +// Project imports: +import 'package:fluffychat/pangea/constants/model_keys.dart'; import '../../widgets/matrix.dart'; import '../models/user_model.dart'; import '../models/user_profile_search_model.dart'; diff --git a/lib/pangea/repo/word_repo.dart b/lib/pangea/repo/word_repo.dart index 362c3b643..13d9db995 100644 --- a/lib/pangea/repo/word_repo.dart +++ b/lib/pangea/repo/word_repo.dart @@ -1,8 +1,11 @@ +// Dart imports: import 'dart:convert'; -import 'package:fluffychat/pangea/config/environment.dart'; +// Package imports: import 'package:http/http.dart'; +// Project imports: +import 'package:fluffychat/pangea/config/environment.dart'; import '../constants/model_keys.dart'; import '../models/word_data_model.dart'; import '../network/requests.dart'; diff --git a/lib/pangea/utils/add_to_space.dart b/lib/pangea/utils/add_to_space.dart index 1496eb411..bd6fda71b 100644 --- a/lib/pangea/utils/add_to_space.dart +++ b/lib/pangea/utils/add_to_space.dart @@ -1,9 +1,14 @@ -import 'package:fluffychat/pangea/controllers/pangea_controller.dart'; -import 'package:fluffychat/widgets/matrix.dart'; +// Flutter imports: import 'package:flutter/material.dart'; + +// Package imports: import 'package:flutter_gen/gen_l10n/l10n.dart'; import 'package:matrix/matrix.dart'; +// Project imports: +import 'package:fluffychat/pangea/controllers/pangea_controller.dart'; +import 'package:fluffychat/widgets/matrix.dart'; + bool canAddToSpace(Room space, PangeaController pangeaController) { final bool pangeaPermission = pangeaController.permissionsController.canUserGroupChat(roomID: space.id); diff --git a/lib/pangea/utils/any_state_holder.dart b/lib/pangea/utils/any_state_holder.dart index a804ef96a..e12bb8203 100644 --- a/lib/pangea/utils/any_state_holder.dart +++ b/lib/pangea/utils/any_state_holder.dart @@ -1,8 +1,13 @@ +// Dart imports: import 'dart:async'; +// Flutter imports: import 'package:flutter/material.dart'; + +// Package imports: import 'package:sentry_flutter/sentry_flutter.dart'; +// Project imports: import '../models/widget_measurement.dart'; class PangeaAnyState { diff --git a/lib/pangea/utils/archive_space.dart b/lib/pangea/utils/archive_space.dart index e48127d1e..4164bfe2b 100644 --- a/lib/pangea/utils/archive_space.dart +++ b/lib/pangea/utils/archive_space.dart @@ -1,6 +1,9 @@ +// Package imports: +import 'package:matrix/matrix.dart'; + +// Project imports: import 'package:fluffychat/pangea/extensions/pangea_room_extension.dart'; import 'package:fluffychat/pangea/utils/error_handler.dart'; -import 'package:matrix/matrix.dart'; Future archiveSpace(Room? space, Client client) async { if (space == null) { diff --git a/lib/pangea/utils/bot_name.dart b/lib/pangea/utils/bot_name.dart index dc7c0da8f..d400994b8 100644 --- a/lib/pangea/utils/bot_name.dart +++ b/lib/pangea/utils/bot_name.dart @@ -1,3 +1,4 @@ +// Project imports: import 'package:fluffychat/pangea/config/environment.dart'; class BotName { diff --git a/lib/pangea/utils/bot_style.dart b/lib/pangea/utils/bot_style.dart index 86afcd6e2..8531f2be9 100644 --- a/lib/pangea/utils/bot_style.dart +++ b/lib/pangea/utils/bot_style.dart @@ -1,6 +1,9 @@ +// Flutter imports: +import 'package:flutter/material.dart'; + +// Project imports: import 'package:fluffychat/config/app_config.dart'; import 'package:fluffychat/pangea/utils/error_handler.dart'; -import 'package:flutter/material.dart'; class BotStyle { static TextStyle text( diff --git a/lib/pangea/utils/chat_list_handle_space_tap.dart b/lib/pangea/utils/chat_list_handle_space_tap.dart index 6979aac12..617e60c99 100644 --- a/lib/pangea/utils/chat_list_handle_space_tap.dart +++ b/lib/pangea/utils/chat_list_handle_space_tap.dart @@ -1,12 +1,16 @@ -import 'package:fluffychat/pages/chat_list/chat_list.dart'; -import 'package:fluffychat/pangea/extensions/pangea_room_extension.dart'; -import 'package:fluffychat/widgets/matrix.dart'; +// Flutter imports: import 'package:flutter/material.dart'; + +// Package imports: import 'package:flutter_gen/gen_l10n/l10n.dart'; import 'package:future_loading_dialog/future_loading_dialog.dart'; import 'package:go_router/go_router.dart'; import 'package:matrix/matrix.dart'; +// Project imports: +import 'package:fluffychat/pages/chat_list/chat_list.dart'; +import 'package:fluffychat/pangea/extensions/pangea_room_extension.dart'; +import 'package:fluffychat/widgets/matrix.dart'; import 'error_handler.dart'; // ignore: curly_braces_in_flow_control_structures diff --git a/lib/pangea/utils/class_chat_power_levels.dart b/lib/pangea/utils/class_chat_power_levels.dart index 73dfecf65..0581445d4 100644 --- a/lib/pangea/utils/class_chat_power_levels.dart +++ b/lib/pangea/utils/class_chat_power_levels.dart @@ -1,7 +1,11 @@ -import 'package:fluffychat/pangea/constants/pangea_event_types.dart'; +// Flutter imports: import 'package:flutter/material.dart'; + +// Package imports: import 'package:matrix/matrix.dart'; +// Project imports: +import 'package:fluffychat/pangea/constants/pangea_event_types.dart'; import '../../widgets/matrix.dart'; import '../constants/class_default_values.dart'; import '../extensions/pangea_room_extension.dart'; diff --git a/lib/pangea/utils/class_code.dart b/lib/pangea/utils/class_code.dart index c41bc9cd8..a31a84106 100644 --- a/lib/pangea/utils/class_code.dart +++ b/lib/pangea/utils/class_code.dart @@ -1,11 +1,16 @@ +// Dart imports: import 'dart:math'; -import 'package:fluffychat/pangea/utils/error_handler.dart'; +// Flutter imports: import 'package:flutter/material.dart'; + +// Package imports: import 'package:flutter_gen/gen_l10n/l10n.dart'; import 'package:future_loading_dialog/future_loading_dialog.dart'; import 'package:go_router/go_router.dart'; +// Project imports: +import 'package:fluffychat/pangea/utils/error_handler.dart'; import '../controllers/pangea_controller.dart'; class ClassCodeUtil { diff --git a/lib/pangea/utils/delete_room.dart b/lib/pangea/utils/delete_room.dart index 2558e4c48..e987d2b40 100644 --- a/lib/pangea/utils/delete_room.dart +++ b/lib/pangea/utils/delete_room.dart @@ -1,6 +1,8 @@ -import 'package:fluffychat/pangea/constants/class_default_values.dart'; +// Package imports: import 'package:matrix/matrix.dart'; +// Project imports: +import 'package:fluffychat/pangea/constants/class_default_values.dart'; import 'error_handler.dart'; Future deleteRoom(String? roomID, Client client) async { diff --git a/lib/pangea/utils/download_chat.dart b/lib/pangea/utils/download_chat.dart index 38a34b139..b430eb471 100644 --- a/lib/pangea/utils/download_chat.dart +++ b/lib/pangea/utils/download_chat.dart @@ -1,12 +1,13 @@ +// Dart imports: import 'dart:async'; import 'dart:io'; -import 'package:csv/csv.dart'; -import 'package:fluffychat/pangea/models/class_model.dart'; -import 'package:fluffychat/pangea/models/pangea_message_event.dart'; -import 'package:fluffychat/pangea/utils/error_handler.dart'; +// Flutter imports: import 'package:flutter/foundation.dart'; import 'package:flutter/material.dart'; + +// Package imports: +import 'package:csv/csv.dart'; import 'package:flutter_gen/gen_l10n/l10n.dart'; import 'package:intl/intl.dart'; import 'package:matrix/matrix.dart'; @@ -17,6 +18,10 @@ import 'package:permission_handler/permission_handler.dart'; import 'package:syncfusion_flutter_xlsio/xlsio.dart'; import 'package:universal_html/html.dart' as webFile; +// Project imports: +import 'package:fluffychat/pangea/models/class_model.dart'; +import 'package:fluffychat/pangea/models/pangea_message_event.dart'; +import 'package:fluffychat/pangea/utils/error_handler.dart'; import '../models/choreo_record.dart'; enum DownloadType { txt, csv, xlsx } diff --git a/lib/pangea/utils/error_handler.dart b/lib/pangea/utils/error_handler.dart index b961bad28..870678d58 100644 --- a/lib/pangea/utils/error_handler.dart +++ b/lib/pangea/utils/error_handler.dart @@ -1,12 +1,18 @@ +// Dart imports: import 'dart:async'; -import 'package:fluffychat/pangea/config/environment.dart'; +// Flutter imports: import 'package:flutter/foundation.dart'; import 'package:flutter/material.dart'; + +// Package imports: import 'package:flutter_gen/gen_l10n/l10n.dart'; import 'package:http/http.dart' as http; import 'package:sentry_flutter/sentry_flutter.dart'; +// Project imports: +import 'package:fluffychat/pangea/config/environment.dart'; + class ErrorHandler { ErrorHandler(); diff --git a/lib/pangea/utils/find_conversation_partner_dialog.dart b/lib/pangea/utils/find_conversation_partner_dialog.dart index 640524331..cc3801531 100644 --- a/lib/pangea/utils/find_conversation_partner_dialog.dart +++ b/lib/pangea/utils/find_conversation_partner_dialog.dart @@ -1,7 +1,11 @@ +// Flutter imports: import 'package:flutter/material.dart'; + +// Package imports: import 'package:flutter_gen/gen_l10n/l10n.dart'; import 'package:go_router/go_router.dart'; +// Project imports: import '../controllers/pangea_controller.dart'; void findConversationPartnerDialog( diff --git a/lib/pangea/utils/firebase_analytics.dart b/lib/pangea/utils/firebase_analytics.dart index 40da756c2..d0d902089 100644 --- a/lib/pangea/utils/firebase_analytics.dart +++ b/lib/pangea/utils/firebase_analytics.dart @@ -1,12 +1,18 @@ -import 'package:firebase_analytics/firebase_analytics.dart'; -import 'package:firebase_core/firebase_core.dart'; -import 'package:fluffychat/pangea/controllers/subscription_controller.dart'; -// PageRoute import +// Flutter imports: import 'package:flutter/widgets.dart'; +// Package imports: +import 'package:firebase_analytics/firebase_analytics.dart'; +import 'package:firebase_core/firebase_core.dart'; + +// Project imports: +import 'package:fluffychat/pangea/controllers/subscription_controller.dart'; import '../../config/firebase_options.dart'; import '../enum/use_type.dart'; +// PageRoute import + + // Add import: // import 'package:fluffychat/pangea/utils/firebase_analytics.dart'; // Call method: GoogleAnalytics.logout() diff --git a/lib/pangea/utils/get_chat_list_item_subtitle.dart b/lib/pangea/utils/get_chat_list_item_subtitle.dart index 4626bad82..aecca13d1 100644 --- a/lib/pangea/utils/get_chat_list_item_subtitle.dart +++ b/lib/pangea/utils/get_chat_list_item_subtitle.dart @@ -1,11 +1,15 @@ +// Flutter imports: +import 'package:flutter/material.dart'; + +// Package imports: +import 'package:flutter_gen/gen_l10n/l10n.dart'; +import 'package:matrix/matrix.dart'; + +// Project imports: import 'package:fluffychat/pangea/constants/language_keys.dart'; import 'package:fluffychat/pangea/controllers/pangea_controller.dart'; import 'package:fluffychat/pangea/models/class_model.dart'; import 'package:fluffychat/pangea/models/pangea_message_event.dart'; -import 'package:flutter/material.dart'; -import 'package:flutter_gen/gen_l10n/l10n.dart'; -import 'package:matrix/matrix.dart'; - import '../../utils/matrix_sdk_extensions/matrix_locals.dart'; class GetChatListItemSubtitle { diff --git a/lib/pangea/utils/instructions.dart b/lib/pangea/utils/instructions.dart index f99705304..a1559c4b8 100644 --- a/lib/pangea/utils/instructions.dart +++ b/lib/pangea/utils/instructions.dart @@ -1,6 +1,10 @@ +// Flutter imports: import 'package:flutter/material.dart'; + +// Package imports: import 'package:flutter_gen/gen_l10n/l10n.dart'; +// Project imports: import '../../config/app_config.dart'; import '../../widgets/matrix.dart'; import '../controllers/pangea_controller.dart'; diff --git a/lib/pangea/utils/join_all_space_chats.dart b/lib/pangea/utils/join_all_space_chats.dart index 054bf7c62..22058f1a0 100644 --- a/lib/pangea/utils/join_all_space_chats.dart +++ b/lib/pangea/utils/join_all_space_chats.dart @@ -1,7 +1,12 @@ -import 'package:fluffychat/pangea/utils/error_handler.dart'; +// Flutter imports: import 'package:flutter/material.dart'; + +// Package imports: import 'package:matrix/matrix.dart'; +// Project imports: +import 'package:fluffychat/pangea/utils/error_handler.dart'; + // Used in lock space. Handles case when child rooms return null from client.getRoomById // Because the user hasn't joined them Future> joinAllSpaceChats(Room space, Client client) async { diff --git a/lib/pangea/utils/language_level_copy.dart b/lib/pangea/utils/language_level_copy.dart index 7f68f544a..7a18e9080 100644 --- a/lib/pangea/utils/language_level_copy.dart +++ b/lib/pangea/utils/language_level_copy.dart @@ -1,4 +1,7 @@ +// Flutter imports: import 'package:flutter/material.dart'; + +// Package imports: import 'package:flutter_gen/gen_l10n/l10n.dart'; class LanguageLevelTextPicker { diff --git a/lib/pangea/utils/lock_room.dart b/lib/pangea/utils/lock_room.dart index 92d1a6f5d..01c3b4b48 100644 --- a/lib/pangea/utils/lock_room.dart +++ b/lib/pangea/utils/lock_room.dart @@ -1,6 +1,9 @@ +// Package imports: +import 'package:matrix/matrix.dart'; + +// Project imports: import 'package:fluffychat/pangea/extensions/pangea_room_extension.dart'; import 'package:fluffychat/pangea/utils/join_all_space_chats.dart'; -import 'package:matrix/matrix.dart'; Future unlockChat(Room room, Client client) async { final Map powerLevelsContent = Map.from( diff --git a/lib/pangea/utils/logout.dart b/lib/pangea/utils/logout.dart index cffc2608a..5dfa26af0 100644 --- a/lib/pangea/utils/logout.dart +++ b/lib/pangea/utils/logout.dart @@ -1,9 +1,14 @@ -import 'package:adaptive_dialog/adaptive_dialog.dart'; -import 'package:fluffychat/widgets/matrix.dart'; +// Flutter imports: import 'package:flutter/material.dart'; + +// Package imports: +import 'package:adaptive_dialog/adaptive_dialog.dart'; import 'package:flutter_gen/gen_l10n/l10n.dart'; import 'package:future_loading_dialog/future_loading_dialog.dart'; +// Project imports: +import 'package:fluffychat/widgets/matrix.dart'; + void pLogoutAction(BuildContext context, {bool? isDestructiveAction}) async { if (await showOkCancelAlertDialog( useRootNavigator: false, diff --git a/lib/pangea/utils/martix.utils.dart b/lib/pangea/utils/martix.utils.dart index 99e535a1b..eb9f5a6a3 100644 --- a/lib/pangea/utils/martix.utils.dart +++ b/lib/pangea/utils/martix.utils.dart @@ -1,3 +1,4 @@ +// Package imports: import 'package:matrix/matrix.dart'; class MatrixUtils { diff --git a/lib/pangea/utils/match_copy.dart b/lib/pangea/utils/match_copy.dart index 94abd4335..a4ad52945 100644 --- a/lib/pangea/utils/match_copy.dart +++ b/lib/pangea/utils/match_copy.dart @@ -1,12 +1,17 @@ +// Dart imports: import 'dart:developer'; -import 'package:fluffychat/pangea/enum/span_data_type.dart'; -import 'package:fluffychat/pangea/utils/error_handler.dart'; +// Flutter imports: import 'package:flutter/foundation.dart'; import 'package:flutter/material.dart'; + +// Package imports: import 'package:flutter_gen/gen_l10n/l10n.dart'; import 'package:sentry_flutter/sentry_flutter.dart'; +// Project imports: +import 'package:fluffychat/pangea/enum/span_data_type.dart'; +import 'package:fluffychat/pangea/utils/error_handler.dart'; import '../constants/match_rule_ids.dart'; import '../models/pangea_match_model.dart'; diff --git a/lib/pangea/utils/overlay.dart b/lib/pangea/utils/overlay.dart index 397549f65..ffda1d906 100644 --- a/lib/pangea/utils/overlay.dart +++ b/lib/pangea/utils/overlay.dart @@ -1,12 +1,15 @@ +// Dart imports: import 'dart:developer'; import 'dart:math'; -import 'package:fluffychat/config/app_config.dart'; -import 'package:fluffychat/pangea/utils/any_state_holder.dart'; -import 'package:fluffychat/pangea/widgets/common_widgets/overlay_container.dart'; +// Flutter imports: import 'package:flutter/foundation.dart'; import 'package:flutter/material.dart'; +// Project imports: +import 'package:fluffychat/config/app_config.dart'; +import 'package:fluffychat/pangea/utils/any_state_holder.dart'; +import 'package:fluffychat/pangea/widgets/common_widgets/overlay_container.dart'; import '../../config/themes.dart'; import '../../widgets/matrix.dart'; import 'error_handler.dart'; diff --git a/lib/pangea/utils/p_store.dart b/lib/pangea/utils/p_store.dart index a071722cd..1f7e9ff78 100644 --- a/lib/pangea/utils/p_store.dart +++ b/lib/pangea/utils/p_store.dart @@ -1,6 +1,9 @@ -import 'package:fluffychat/pangea/controllers/pangea_controller.dart'; +// Package imports: import 'package:get_storage/get_storage.dart'; +// Project imports: +import 'package:fluffychat/pangea/controllers/pangea_controller.dart'; + class PLocalStore { final GetStorage _box = GetStorage(); final PangeaController pangeaController; diff --git a/lib/pangea/utils/password_forgotten.dart b/lib/pangea/utils/password_forgotten.dart index e117e9f06..3b2271173 100644 --- a/lib/pangea/utils/password_forgotten.dart +++ b/lib/pangea/utils/password_forgotten.dart @@ -1,10 +1,14 @@ -import 'package:adaptive_dialog/adaptive_dialog.dart'; -import 'package:fluffychat/pages/login/login.dart'; +// Flutter imports: import 'package:flutter/material.dart'; + +// Package imports: +import 'package:adaptive_dialog/adaptive_dialog.dart'; import 'package:flutter_gen/gen_l10n/l10n.dart'; import 'package:future_loading_dialog/future_loading_dialog.dart'; import 'package:matrix/matrix.dart'; +// Project imports: +import 'package:fluffychat/pages/login/login.dart'; import '../../widgets/matrix.dart'; extension PangeaPasswordForgotten on LoginController { diff --git a/lib/pangea/utils/platform_name.dart b/lib/pangea/utils/platform_name.dart index f5b6c1dd4..5823f3d97 100644 --- a/lib/pangea/utils/platform_name.dart +++ b/lib/pangea/utils/platform_name.dart @@ -1,5 +1,7 @@ +// Dart imports: import 'dart:io' show Platform; +// Flutter imports: import 'package:flutter/foundation.dart' show kIsWeb, kDebugMode; class MyPlatformName { diff --git a/lib/pangea/utils/report_message.dart b/lib/pangea/utils/report_message.dart index 333d0f563..fa2ea5ac6 100644 --- a/lib/pangea/utils/report_message.dart +++ b/lib/pangea/utils/report_message.dart @@ -1,10 +1,15 @@ +// Flutter imports: +import 'package:flutter/material.dart'; + +// Package imports: +import 'package:flutter_gen/gen_l10n/l10n.dart'; +import 'package:matrix/matrix.dart'; + +// Project imports: import 'package:fluffychat/pangea/constants/pangea_message_types.dart'; import 'package:fluffychat/pangea/extensions/client_extension.dart'; import 'package:fluffychat/pangea/extensions/pangea_room_extension.dart'; import 'package:fluffychat/widgets/matrix.dart'; -import 'package:flutter/material.dart'; -import 'package:flutter_gen/gen_l10n/l10n.dart'; -import 'package:matrix/matrix.dart'; Future reportMessage( BuildContext context, diff --git a/lib/pangea/utils/set_class_name.dart b/lib/pangea/utils/set_class_name.dart index ca2aba448..f2d73c0f0 100644 --- a/lib/pangea/utils/set_class_name.dart +++ b/lib/pangea/utils/set_class_name.dart @@ -1,8 +1,12 @@ -import 'package:fluffychat/widgets/matrix.dart'; +// Flutter imports: import 'package:flutter/material.dart'; + +// Package imports: import 'package:flutter_gen/gen_l10n/l10n.dart'; import 'package:future_loading_dialog/future_loading_dialog.dart'; +// Project imports: +import 'package:fluffychat/widgets/matrix.dart'; import '../../utils/matrix_sdk_extensions/matrix_locals.dart'; void setClassDisplayname(BuildContext context, String? roomId) async { diff --git a/lib/pangea/utils/set_class_topic.dart b/lib/pangea/utils/set_class_topic.dart index 1f01a3b20..5d36b2d65 100644 --- a/lib/pangea/utils/set_class_topic.dart +++ b/lib/pangea/utils/set_class_topic.dart @@ -1,7 +1,10 @@ +// Flutter imports: import 'package:flutter/material.dart'; + +// Package imports: +import 'package:flutter_gen/gen_l10n/l10n.dart'; import 'package:future_loading_dialog/future_loading_dialog.dart'; import 'package:matrix/matrix.dart'; -import 'package:flutter_gen/gen_l10n/l10n.dart'; void setClassTopic(Room room, BuildContext context) { final TextEditingController textFieldController = diff --git a/lib/pangea/utils/shared_prefs.dart b/lib/pangea/utils/shared_prefs.dart index 5b3fc0025..f98254c5e 100644 --- a/lib/pangea/utils/shared_prefs.dart +++ b/lib/pangea/utils/shared_prefs.dart @@ -1,6 +1,9 @@ -import 'package:shared_preferences/shared_preferences.dart'; +// Dart imports: import 'dart:convert'; +// Package imports: +import 'package:shared_preferences/shared_preferences.dart'; + class MyShared { static saveString(String key, String value) async { final SharedPreferences _prefs = await SharedPreferences.getInstance(); diff --git a/lib/pangea/utils/space_navigator.dart b/lib/pangea/utils/space_navigator.dart index af72a0b25..9b0510582 100644 --- a/lib/pangea/utils/space_navigator.dart +++ b/lib/pangea/utils/space_navigator.dart @@ -1,5 +1,7 @@ +// Dart imports: import 'dart:async'; +// Flutter imports: import 'package:flutter/material.dart'; /// this is a workaround to allow navigation of spaces out from any widget. diff --git a/lib/pangea/utils/subscription_app_id.dart b/lib/pangea/utils/subscription_app_id.dart index 20a69d4a2..6aaf43237 100644 --- a/lib/pangea/utils/subscription_app_id.dart +++ b/lib/pangea/utils/subscription_app_id.dart @@ -1,5 +1,7 @@ +// Dart imports: import 'dart:io'; +// Flutter imports: import 'package:flutter/foundation.dart'; class SubscriptionAppIds { diff --git a/lib/pangea/utils/sync_status_util.dart b/lib/pangea/utils/sync_status_util.dart index dacff01d4..bbd657887 100644 --- a/lib/pangea/utils/sync_status_util.dart +++ b/lib/pangea/utils/sync_status_util.dart @@ -1,10 +1,15 @@ +// Dart imports: import 'dart:async'; -import 'package:fluffychat/utils/localized_exception_extension.dart'; +// Flutter imports: import 'package:flutter/material.dart'; + +// Package imports: import 'package:flutter_gen/gen_l10n/l10n.dart'; import 'package:matrix/matrix.dart'; +// Project imports: +import 'package:fluffychat/utils/localized_exception_extension.dart'; import '../../widgets/matrix.dart'; class PLoadingStatus extends StatefulWidget { diff --git a/lib/pangea/utils/sync_status_util_v2.dart b/lib/pangea/utils/sync_status_util_v2.dart index 5d2ac85e6..06a44a9f4 100644 --- a/lib/pangea/utils/sync_status_util_v2.dart +++ b/lib/pangea/utils/sync_status_util_v2.dart @@ -1,8 +1,12 @@ -import 'package:fluffychat/utils/localized_exception_extension.dart'; +// Flutter imports: import 'package:flutter/material.dart'; + +// Package imports: import 'package:flutter_gen/gen_l10n/l10n.dart'; import 'package:matrix/matrix.dart'; +// Project imports: +import 'package:fluffychat/utils/localized_exception_extension.dart'; import '../../widgets/matrix.dart'; import 'error_handler.dart'; diff --git a/lib/pangea/widgets/chat/locked_chat_message.dart b/lib/pangea/widgets/chat/locked_chat_message.dart index 3e5ec93a5..75ceea9f6 100644 --- a/lib/pangea/widgets/chat/locked_chat_message.dart +++ b/lib/pangea/widgets/chat/locked_chat_message.dart @@ -1,7 +1,12 @@ -import 'package:fluffychat/config/app_config.dart'; +// Flutter imports: import 'package:flutter/material.dart'; + +// Package imports: import 'package:flutter_gen/gen_l10n/l10n.dart'; +// Project imports: +import 'package:fluffychat/config/app_config.dart'; + class LockedChatMessage extends StatelessWidget { const LockedChatMessage({Key? key}) : super(key: key); diff --git a/lib/pangea/widgets/chat_list/chat_list_body_text.dart b/lib/pangea/widgets/chat_list/chat_list_body_text.dart index bd30b99fa..411769be7 100644 --- a/lib/pangea/widgets/chat_list/chat_list_body_text.dart +++ b/lib/pangea/widgets/chat_list/chat_list_body_text.dart @@ -1,7 +1,11 @@ -import 'package:fluffychat/pangea/controllers/pangea_controller.dart'; +// Flutter imports: import 'package:flutter/material.dart'; + +// Package imports: import 'package:flutter_gen/gen_l10n/l10n.dart'; +// Project imports: +import 'package:fluffychat/pangea/controllers/pangea_controller.dart'; import '../../../pages/chat_list/chat_list.dart'; import '../../../widgets/matrix.dart'; import '../../extensions/pangea_room_extension.dart'; diff --git a/lib/pangea/widgets/class/add_class_and_invite.dart b/lib/pangea/widgets/class/add_class_and_invite.dart index 58442568c..a9fbd6e63 100644 --- a/lib/pangea/widgets/class/add_class_and_invite.dart +++ b/lib/pangea/widgets/class/add_class_and_invite.dart @@ -1,14 +1,19 @@ +// Dart imports: import 'dart:developer'; -import 'package:fluffychat/config/app_config.dart'; -import 'package:fluffychat/pangea/extensions/pangea_room_extension.dart'; +// Flutter imports: import 'package:flutter/foundation.dart'; import 'package:flutter/material.dart'; + +// Package imports: import 'package:flutter_gen/gen_l10n/l10n.dart'; import 'package:future_loading_dialog/future_loading_dialog.dart'; import 'package:go_router/go_router.dart'; import 'package:matrix/matrix.dart'; +// Project imports: +import 'package:fluffychat/config/app_config.dart'; +import 'package:fluffychat/pangea/extensions/pangea_room_extension.dart'; import '../../../widgets/matrix.dart'; import '../../utils/error_handler.dart'; import '../../utils/firebase_analytics.dart'; diff --git a/lib/pangea/widgets/class/add_space_toggles.dart b/lib/pangea/widgets/class/add_space_toggles.dart index 2b72c7701..2e26a6b2a 100644 --- a/lib/pangea/widgets/class/add_space_toggles.dart +++ b/lib/pangea/widgets/class/add_space_toggles.dart @@ -1,14 +1,19 @@ +// Dart imports: import 'dart:math'; -import 'package:collection/collection.dart'; -import 'package:fluffychat/config/app_config.dart'; -import 'package:fluffychat/pangea/extensions/pangea_room_extension.dart'; -import 'package:fluffychat/pangea/utils/error_handler.dart'; +// Flutter imports: import 'package:flutter/material.dart'; + +// Package imports: +import 'package:collection/collection.dart'; import 'package:flutter_gen/gen_l10n/l10n.dart'; import 'package:future_loading_dialog/future_loading_dialog.dart'; import 'package:matrix/matrix.dart'; +// Project imports: +import 'package:fluffychat/config/app_config.dart'; +import 'package:fluffychat/pangea/extensions/pangea_room_extension.dart'; +import 'package:fluffychat/pangea/utils/error_handler.dart'; import '../../../widgets/matrix.dart'; import '../../utils/firebase_analytics.dart'; import 'add_class_and_invite.dart'; diff --git a/lib/pangea/widgets/class/join_with_link.dart b/lib/pangea/widgets/class/join_with_link.dart index ef844e2ac..83114fa03 100644 --- a/lib/pangea/widgets/class/join_with_link.dart +++ b/lib/pangea/widgets/class/join_with_link.dart @@ -1,11 +1,15 @@ +// Flutter imports: +import 'package:flutter/material.dart'; + +// Package imports: +import 'package:flutter_gen/gen_l10n/l10n.dart'; +import 'package:go_router/go_router.dart'; + +// Project imports: import 'package:fluffychat/pangea/constants/url_query_parameter_keys.dart'; import 'package:fluffychat/pangea/controllers/pangea_controller.dart'; import 'package:fluffychat/pangea/utils/class_code.dart'; import 'package:fluffychat/widgets/layouts/empty_page.dart'; -import 'package:flutter/material.dart'; -import 'package:flutter_gen/gen_l10n/l10n.dart'; -import 'package:go_router/go_router.dart'; - import '../../../widgets/matrix.dart'; import '../../constants/local.key.dart'; import '../../utils/error_handler.dart'; diff --git a/lib/pangea/widgets/common/aligned_dialog.dart b/lib/pangea/widgets/common/aligned_dialog.dart index c08513300..312c3f634 100644 --- a/lib/pangea/widgets/common/aligned_dialog.dart +++ b/lib/pangea/widgets/common/aligned_dialog.dart @@ -1,3 +1,4 @@ +// Flutter imports: import 'package:flutter/material.dart'; Future showAlignedDialog({ diff --git a/lib/pangea/widgets/common/bot_face_svg.dart b/lib/pangea/widgets/common/bot_face_svg.dart index 54143626e..b35714e7a 100644 --- a/lib/pangea/widgets/common/bot_face_svg.dart +++ b/lib/pangea/widgets/common/bot_face_svg.dart @@ -1,3 +1,4 @@ +// Flutter imports: import 'package:flutter/material.dart'; enum BotExpression { surprised, right, addled, left, down, shocked } diff --git a/lib/pangea/widgets/common/list_placeholder.dart b/lib/pangea/widgets/common/list_placeholder.dart index 0886967a5..6c7fa6d6e 100644 --- a/lib/pangea/widgets/common/list_placeholder.dart +++ b/lib/pangea/widgets/common/list_placeholder.dart @@ -1,3 +1,4 @@ +// Flutter imports: import 'package:flutter/material.dart'; class ListPlaceholder extends StatelessWidget { diff --git a/lib/pangea/widgets/common/p_circular_loader.dart b/lib/pangea/widgets/common/p_circular_loader.dart index f292d9b23..1cc927dd5 100644 --- a/lib/pangea/widgets/common/p_circular_loader.dart +++ b/lib/pangea/widgets/common/p_circular_loader.dart @@ -1,3 +1,4 @@ +// Flutter imports: import 'package:flutter/material.dart'; class PCircular extends StatelessWidget { diff --git a/lib/pangea/widgets/common/pangea_logo_svg.dart b/lib/pangea/widgets/common/pangea_logo_svg.dart index 6407950e5..6a2b3b94f 100644 --- a/lib/pangea/widgets/common/pangea_logo_svg.dart +++ b/lib/pangea/widgets/common/pangea_logo_svg.dart @@ -1,4 +1,7 @@ +// Flutter imports: import 'package:flutter/material.dart'; + +// Package imports: import 'package:flutter_svg/svg.dart'; class PangeaLogoSvg extends StatelessWidget { diff --git a/lib/pangea/widgets/common/star_rating.dart b/lib/pangea/widgets/common/star_rating.dart index b2a7d56f5..2f34490e5 100644 --- a/lib/pangea/widgets/common/star_rating.dart +++ b/lib/pangea/widgets/common/star_rating.dart @@ -1,3 +1,4 @@ +// Flutter imports: import 'package:flutter/material.dart'; typedef void RatingChangeCallback(double rating); diff --git a/lib/pangea/widgets/common_widgets/edit_list_tile.dart b/lib/pangea/widgets/common_widgets/edit_list_tile.dart index 4b6067371..7780673e2 100644 --- a/lib/pangea/widgets/common_widgets/edit_list_tile.dart +++ b/lib/pangea/widgets/common_widgets/edit_list_tile.dart @@ -1,5 +1,7 @@ +// Flutter imports: import 'package:flutter/material.dart'; +// Project imports: import '../../../utils/url_launcher.dart'; import '../../../widgets/avatar.dart'; diff --git a/lib/pangea/widgets/common_widgets/overlay_container.dart b/lib/pangea/widgets/common_widgets/overlay_container.dart index c836dffdb..e0a9f28da 100644 --- a/lib/pangea/widgets/common_widgets/overlay_container.dart +++ b/lib/pangea/widgets/common_widgets/overlay_container.dart @@ -1,3 +1,4 @@ +// Flutter imports: import 'package:flutter/material.dart'; class OverlayContainer extends StatelessWidget { diff --git a/lib/pangea/widgets/common_widgets/p_input_field.dart b/lib/pangea/widgets/common_widgets/p_input_field.dart index 31bab0e58..02dc7692e 100644 --- a/lib/pangea/widgets/common_widgets/p_input_field.dart +++ b/lib/pangea/widgets/common_widgets/p_input_field.dart @@ -1,5 +1,7 @@ +// Flutter imports: import 'package:flutter/material.dart'; +// Package imports: import 'package:flutter_gen/gen_l10n/l10n.dart'; class PInputTextField extends StatelessWidget { diff --git a/lib/pangea/widgets/flag.dart b/lib/pangea/widgets/flag.dart index 0e05311d9..329d52ab8 100644 --- a/lib/pangea/widgets/flag.dart +++ b/lib/pangea/widgets/flag.dart @@ -1,6 +1,8 @@ -import 'package:fluffychat/widgets/avatar.dart'; +// Flutter imports: import 'package:flutter/material.dart'; +// Project imports: +import 'package:fluffychat/widgets/avatar.dart'; import '../models/language_model.dart'; class LanguageFlag extends StatelessWidget { diff --git a/lib/pangea/widgets/igc/card_error_widget.dart b/lib/pangea/widgets/igc/card_error_widget.dart index eba38718b..d0b3d1f1e 100644 --- a/lib/pangea/widgets/igc/card_error_widget.dart +++ b/lib/pangea/widgets/igc/card_error_widget.dart @@ -1,9 +1,12 @@ +// Flutter imports: +import 'package:flutter/material.dart'; + +// Project imports: import 'package:fluffychat/pangea/choreographer/controllers/choreographer.dart'; import 'package:fluffychat/pangea/utils/bot_style.dart'; import 'package:fluffychat/pangea/utils/error_handler.dart'; import 'package:fluffychat/pangea/widgets/common/bot_face_svg.dart'; import 'package:fluffychat/pangea/widgets/igc/card_header.dart'; -import 'package:flutter/material.dart'; class CardErrorWidget extends StatelessWidget { final Object? error; diff --git a/lib/pangea/widgets/igc/card_header.dart b/lib/pangea/widgets/igc/card_header.dart index 4907b5994..c8e52f598 100644 --- a/lib/pangea/widgets/igc/card_header.dart +++ b/lib/pangea/widgets/igc/card_header.dart @@ -1,6 +1,8 @@ -import 'package:fluffychat/config/app_config.dart'; +// Flutter imports: import 'package:flutter/material.dart'; +// Project imports: +import 'package:fluffychat/config/app_config.dart'; import '../../../widgets/matrix.dart'; import '../../utils/bot_style.dart'; import '../common/bot_face_svg.dart'; diff --git a/lib/pangea/widgets/igc/pangea_rich_text.dart b/lib/pangea/widgets/igc/pangea_rich_text.dart index a70abb316..e9b430fd0 100644 --- a/lib/pangea/widgets/igc/pangea_rich_text.dart +++ b/lib/pangea/widgets/igc/pangea_rich_text.dart @@ -1,6 +1,15 @@ +// Dart imports: import 'dart:developer'; import 'dart:ui'; +// Flutter imports: +import 'package:flutter/foundation.dart'; +import 'package:flutter/material.dart'; + +// Package imports: +import 'package:sentry_flutter/sentry_flutter.dart'; + +// Project imports: import 'package:fluffychat/config/app_config.dart'; import 'package:fluffychat/pangea/choreographer/controllers/choreographer.dart'; import 'package:fluffychat/pangea/constants/language_keys.dart'; @@ -9,10 +18,6 @@ import 'package:fluffychat/pangea/models/language_model.dart'; import 'package:fluffychat/pangea/models/pangea_message_event.dart'; import 'package:fluffychat/pangea/utils/error_handler.dart'; import 'package:fluffychat/widgets/matrix.dart'; -import 'package:flutter/foundation.dart'; -import 'package:flutter/material.dart'; -import 'package:sentry_flutter/sentry_flutter.dart'; - import '../../models/igc_text_data_model.dart'; import '../../models/language_detection_model.dart'; import '../../models/pangea_match_model.dart'; diff --git a/lib/pangea/widgets/igc/pangea_text_controller.dart b/lib/pangea/widgets/igc/pangea_text_controller.dart index 64f8aa0a5..3676dcf88 100644 --- a/lib/pangea/widgets/igc/pangea_text_controller.dart +++ b/lib/pangea/widgets/igc/pangea_text_controller.dart @@ -1,10 +1,13 @@ +// Dart imports: import 'dart:developer'; -import 'package:fluffychat/pangea/widgets/igc/span_card.dart'; -import 'package:fluffychat/pangea/widgets/igc/word_data_card.dart'; +// Flutter imports: import 'package:flutter/foundation.dart'; import 'package:flutter/material.dart'; +// Project imports: +import 'package:fluffychat/pangea/widgets/igc/span_card.dart'; +import 'package:fluffychat/pangea/widgets/igc/word_data_card.dart'; import '../../choreographer/controllers/choreographer.dart'; import '../../enum/edit_type.dart'; import '../../models/pangea_token_model.dart'; diff --git a/lib/pangea/widgets/igc/span_card.dart b/lib/pangea/widgets/igc/span_card.dart index 945bf1770..30d8ba9b5 100644 --- a/lib/pangea/widgets/igc/span_card.dart +++ b/lib/pangea/widgets/igc/span_card.dart @@ -1,5 +1,14 @@ +// Dart imports: import 'dart:developer'; +// Flutter imports: +import 'package:flutter/foundation.dart'; +import 'package:flutter/material.dart'; + +// Package imports: +import 'package:flutter_gen/gen_l10n/l10n.dart'; + +// Project imports: import 'package:fluffychat/config/app_config.dart'; import 'package:fluffychat/pangea/enum/span_data_type.dart'; import 'package:fluffychat/pangea/models/span_data.dart'; @@ -7,10 +16,6 @@ import 'package:fluffychat/pangea/utils/bot_style.dart'; import 'package:fluffychat/pangea/utils/error_handler.dart'; import 'package:fluffychat/pangea/utils/match_copy.dart'; import 'package:fluffychat/pangea/widgets/igc/card_error_widget.dart'; -import 'package:flutter/foundation.dart'; -import 'package:flutter/material.dart'; -import 'package:flutter_gen/gen_l10n/l10n.dart'; - import '../../../widgets/matrix.dart'; import '../../choreographer/widgets/choice_array.dart'; import '../../controllers/pangea_controller.dart'; diff --git a/lib/pangea/widgets/igc/span_data.dart b/lib/pangea/widgets/igc/span_data.dart index 892c245a1..52520beb9 100644 --- a/lib/pangea/widgets/igc/span_data.dart +++ b/lib/pangea/widgets/igc/span_data.dart @@ -4,8 +4,10 @@ // SpanChoice of text in message from options // Call to server for additional/followup info +// Package imports: import 'package:collection/collection.dart'; +// Project imports: import '../../enum/span_choice_type.dart'; import '../../enum/span_data_type.dart'; diff --git a/lib/pangea/widgets/igc/word_data_card.dart b/lib/pangea/widgets/igc/word_data_card.dart index 85437f347..c584f1f3a 100644 --- a/lib/pangea/widgets/igc/word_data_card.dart +++ b/lib/pangea/widgets/igc/word_data_card.dart @@ -1,5 +1,16 @@ +// Dart imports: import 'dart:developer'; +// Flutter imports: +import 'package:flutter/foundation.dart'; +import 'package:flutter/material.dart'; + +// Package imports: +import 'package:flutter_gen/gen_l10n/l10n.dart'; +import 'package:http/http.dart'; +import 'package:matrix/matrix.dart'; + +// Project imports: import 'package:fluffychat/pangea/constants/language_keys.dart'; import 'package:fluffychat/pangea/controllers/contextual_definition_controller.dart'; import 'package:fluffychat/pangea/controllers/pangea_controller.dart'; @@ -11,12 +22,6 @@ import 'package:fluffychat/pangea/widgets/common/bot_face_svg.dart'; import 'package:fluffychat/pangea/widgets/common/p_circular_loader.dart'; import 'package:fluffychat/pangea/widgets/igc/card_header.dart'; import 'package:fluffychat/widgets/matrix.dart'; -import 'package:flutter/foundation.dart'; -import 'package:flutter/material.dart'; -import 'package:flutter_gen/gen_l10n/l10n.dart'; -import 'package:http/http.dart'; -import 'package:matrix/matrix.dart'; - import '../../models/word_data_model.dart'; import '../flag.dart'; import 'card_error_widget.dart'; diff --git a/lib/pangea/widgets/login/home_picker_logo.dart b/lib/pangea/widgets/login/home_picker_logo.dart index 2864020b7..5c8c12b44 100644 --- a/lib/pangea/widgets/login/home_picker_logo.dart +++ b/lib/pangea/widgets/login/home_picker_logo.dart @@ -1,5 +1,10 @@ +// Flutter imports: import 'package:flutter/material.dart'; + +// Package imports: import 'package:flutter_svg/flutter_svg.dart'; + +// Project imports: import '../../../config/app_config.dart'; import '../common/pangea_logo_svg.dart'; diff --git a/lib/pangea/widgets/new_group/topics_list.dart b/lib/pangea/widgets/new_group/topics_list.dart index e720b95af..b2bdf6920 100644 --- a/lib/pangea/widgets/new_group/topics_list.dart +++ b/lib/pangea/widgets/new_group/topics_list.dart @@ -1,7 +1,10 @@ +// Dart imports: import 'dart:convert'; +// Flutter imports: import 'package:flutter/material.dart'; +// Project imports: import '../../models/chat_topic_model.dart'; /// the widget loads the list of ChatTopic from assets/chat_data.json diff --git a/lib/pangea/widgets/new_group/vocab_list.dart b/lib/pangea/widgets/new_group/vocab_list.dart index ae3a5d59c..0824c81f6 100644 --- a/lib/pangea/widgets/new_group/vocab_list.dart +++ b/lib/pangea/widgets/new_group/vocab_list.dart @@ -1,8 +1,12 @@ -import 'package:fluffychat/pangea/controllers/pangea_controller.dart'; -import 'package:fluffychat/widgets/matrix.dart'; +// Flutter imports: import 'package:flutter/material.dart'; + +// Package imports: import 'package:flutter_gen/gen_l10n/l10n.dart'; +// Project imports: +import 'package:fluffychat/pangea/controllers/pangea_controller.dart'; +import 'package:fluffychat/widgets/matrix.dart'; import '../../models/chat_topic_model.dart'; import '../../models/lemma.dart'; import '../../repo/topic_data_repo.dart'; diff --git a/lib/pangea/widgets/signup/signup_buttons.dart b/lib/pangea/widgets/signup/signup_buttons.dart index cc312a8f3..c82f29dc7 100644 --- a/lib/pangea/widgets/signup/signup_buttons.dart +++ b/lib/pangea/widgets/signup/signup_buttons.dart @@ -1,16 +1,22 @@ +// Dart imports: import 'dart:typed_data'; +// Flutter imports: +import 'package:flutter/material.dart'; + +// Package imports: import 'package:adaptive_dialog/adaptive_dialog.dart'; +import 'package:flutter_gen/gen_l10n/l10n.dart'; +import 'package:go_router/go_router.dart'; +import 'package:image_picker/image_picker.dart'; +import 'package:matrix/matrix.dart'; + +// Project imports: import 'package:fluffychat/pangea/controllers/pangea_controller.dart'; import 'package:fluffychat/pangea/widgets/common/pangea_logo_svg.dart'; import 'package:fluffychat/utils/localized_exception_extension.dart'; import 'package:fluffychat/utils/platform_infos.dart'; import 'package:fluffychat/widgets/matrix.dart'; -import 'package:flutter/material.dart'; -import 'package:flutter_gen/gen_l10n/l10n.dart'; -import 'package:go_router/go_router.dart'; -import 'package:image_picker/image_picker.dart'; -import 'package:matrix/matrix.dart'; class SignupButtons extends StatefulWidget { const SignupButtons({Key? key}) : super(key: key); diff --git a/lib/pangea/widgets/signup/tos_checkbox.dart b/lib/pangea/widgets/signup/tos_checkbox.dart index 08a973065..05dce6952 100644 --- a/lib/pangea/widgets/signup/tos_checkbox.dart +++ b/lib/pangea/widgets/signup/tos_checkbox.dart @@ -1,8 +1,13 @@ +// Flutter imports: +import 'package:flutter/material.dart'; + +// Package imports: +import 'package:flutter_gen/gen_l10n/l10n.dart'; + +// Project imports: import 'package:fluffychat/config/app_config.dart'; import 'package:fluffychat/pangea/pages/sign_up/signup.dart'; import 'package:fluffychat/utils/url_launcher.dart'; -import 'package:flutter/material.dart'; -import 'package:flutter_gen/gen_l10n/l10n.dart'; class TosCheckbox extends StatelessWidget { final SignupPageController controller; diff --git a/lib/pangea/widgets/space/class_settings.dart b/lib/pangea/widgets/space/class_settings.dart index a891377ce..86066e972 100644 --- a/lib/pangea/widgets/space/class_settings.dart +++ b/lib/pangea/widgets/space/class_settings.dart @@ -1,12 +1,17 @@ +// Dart imports: import 'dart:developer'; -import 'package:fluffychat/pangea/models/class_model.dart'; +// Flutter imports: import 'package:flutter/foundation.dart'; import 'package:flutter/material.dart'; + +// Package imports: import 'package:flutter_gen/gen_l10n/l10n.dart'; import 'package:future_loading_dialog/future_loading_dialog.dart'; import 'package:matrix/matrix.dart'; +// Project imports: +import 'package:fluffychat/pangea/models/class_model.dart'; import '../../../widgets/matrix.dart'; import '../../constants/language_keys.dart'; import '../../constants/language_level_type.dart'; diff --git a/lib/pangea/widgets/subscription/subscription_buttons.dart b/lib/pangea/widgets/subscription/subscription_buttons.dart index d17c47465..267233ec7 100644 --- a/lib/pangea/widgets/subscription/subscription_buttons.dart +++ b/lib/pangea/widgets/subscription/subscription_buttons.dart @@ -1,9 +1,14 @@ +// Flutter imports: +import 'package:flutter/material.dart'; + +// Package imports: +import 'package:flutter_gen/gen_l10n/l10n.dart'; + +// Project imports: import 'package:fluffychat/pangea/controllers/pangea_controller.dart'; import 'package:fluffychat/pangea/controllers/subscription_controller.dart'; import 'package:fluffychat/pangea/pages/settings_subscription/settings_subscription.dart'; import 'package:fluffychat/widgets/matrix.dart'; -import 'package:flutter/material.dart'; -import 'package:flutter_gen/gen_l10n/l10n.dart'; class SubscriptionButtons extends StatelessWidget { final SubscriptionManagementController controller; diff --git a/lib/pangea/widgets/subscription/subscription_options.dart b/lib/pangea/widgets/subscription/subscription_options.dart index 6301ccb29..5c3343930 100644 --- a/lib/pangea/widgets/subscription/subscription_options.dart +++ b/lib/pangea/widgets/subscription/subscription_options.dart @@ -1,8 +1,13 @@ +// Flutter imports: +import 'package:flutter/material.dart'; + +// Package imports: +import 'package:flutter_gen/gen_l10n/l10n.dart'; + +// Project imports: import 'package:fluffychat/config/app_config.dart'; import 'package:fluffychat/pangea/controllers/pangea_controller.dart'; import 'package:fluffychat/pangea/controllers/subscription_controller.dart'; -import 'package:flutter/material.dart'; -import 'package:flutter_gen/gen_l10n/l10n.dart'; class SubscriptionOptions extends StatelessWidget { final PangeaController pangeaController; diff --git a/lib/pangea/widgets/subscription/subscription_paywall.dart b/lib/pangea/widgets/subscription/subscription_paywall.dart index fd24f4662..cc97871cc 100644 --- a/lib/pangea/widgets/subscription/subscription_paywall.dart +++ b/lib/pangea/widgets/subscription/subscription_paywall.dart @@ -1,7 +1,12 @@ +// Flutter imports: +import 'package:flutter/material.dart'; + +// Package imports: +import 'package:flutter_gen/gen_l10n/l10n.dart'; + +// Project imports: import 'package:fluffychat/pangea/controllers/pangea_controller.dart'; import 'package:fluffychat/pangea/widgets/subscription/subscription_options.dart'; -import 'package:flutter/material.dart'; -import 'package:flutter_gen/gen_l10n/l10n.dart'; class SubscriptionPaywall extends StatelessWidget { final PangeaController pangeaController; diff --git a/lib/pangea/widgets/user_settings/country_picker_tile.dart b/lib/pangea/widgets/user_settings/country_picker_tile.dart index 8b765551d..bb66c4e85 100644 --- a/lib/pangea/widgets/user_settings/country_picker_tile.dart +++ b/lib/pangea/widgets/user_settings/country_picker_tile.dart @@ -1,13 +1,18 @@ +// Dart imports: import 'dart:developer'; -import 'package:country_picker/country_picker.dart'; -import 'package:fluffychat/pangea/controllers/pangea_controller.dart'; -import 'package:fluffychat/widgets/matrix.dart'; +// Flutter imports: import 'package:flutter/foundation.dart'; import 'package:flutter/material.dart'; + +// Package imports: +import 'package:country_picker/country_picker.dart'; import 'package:flutter_gen/gen_l10n/l10n.dart'; import 'package:future_loading_dialog/future_loading_dialog.dart'; +// Project imports: +import 'package:fluffychat/pangea/controllers/pangea_controller.dart'; +import 'package:fluffychat/widgets/matrix.dart'; import '../../models/user_model.dart'; class CountryPickerTile extends StatelessWidget { diff --git a/lib/pangea/widgets/user_settings/language_tile.dart b/lib/pangea/widgets/user_settings/language_tile.dart index db5d7f0d3..52e5d2efe 100644 --- a/lib/pangea/widgets/user_settings/language_tile.dart +++ b/lib/pangea/widgets/user_settings/language_tile.dart @@ -1,9 +1,13 @@ +// Flutter imports: +import 'package:flutter/material.dart'; + +// Package imports: +import 'package:flutter_gen/gen_l10n/l10n.dart'; + +// Project imports: import 'package:fluffychat/pangea/controllers/pangea_controller.dart'; import 'package:fluffychat/pangea/models/language_model.dart'; import 'package:fluffychat/widgets/matrix.dart'; -import 'package:flutter/material.dart'; -import 'package:flutter_gen/gen_l10n/l10n.dart'; - import '../flag.dart'; import 'p_language_dialog.dart'; diff --git a/lib/pangea/widgets/user_settings/p_language_dialog.dart b/lib/pangea/widgets/user_settings/p_language_dialog.dart index 8dc4936a2..99c5d44fc 100644 --- a/lib/pangea/widgets/user_settings/p_language_dialog.dart +++ b/lib/pangea/widgets/user_settings/p_language_dialog.dart @@ -1,13 +1,18 @@ +// Dart imports: import 'dart:developer'; -import 'package:fluffychat/pangea/controllers/pangea_controller.dart'; -import 'package:fluffychat/pangea/models/language_model.dart'; -import 'package:fluffychat/pangea/utils/error_handler.dart'; +// Flutter imports: import 'package:flutter/foundation.dart'; import 'package:flutter/material.dart'; + +// Package imports: import 'package:flutter_gen/gen_l10n/l10n.dart'; import 'package:future_loading_dialog/future_loading_dialog.dart'; +// Project imports: +import 'package:fluffychat/pangea/controllers/pangea_controller.dart'; +import 'package:fluffychat/pangea/models/language_model.dart'; +import 'package:fluffychat/pangea/utils/error_handler.dart'; import '../../../config/themes.dart'; import '../../../widgets/matrix.dart'; import 'p_language_dropdown.dart'; diff --git a/lib/pangea/widgets/user_settings/p_language_dropdown.dart b/lib/pangea/widgets/user_settings/p_language_dropdown.dart index 3c40f9011..d713a6aac 100644 --- a/lib/pangea/widgets/user_settings/p_language_dropdown.dart +++ b/lib/pangea/widgets/user_settings/p_language_dropdown.dart @@ -1,6 +1,8 @@ -import 'package:fluffychat/pangea/models/language_model.dart'; +// Flutter imports: import 'package:flutter/material.dart'; +// Project imports: +import 'package:fluffychat/pangea/models/language_model.dart'; import '../../widgets/flag.dart'; class PLanguageDropdown extends StatefulWidget { diff --git a/lib/pangea/widgets/user_settings/p_question_container.dart b/lib/pangea/widgets/user_settings/p_question_container.dart index ac6c48409..b4a8a5e0a 100644 --- a/lib/pangea/widgets/user_settings/p_question_container.dart +++ b/lib/pangea/widgets/user_settings/p_question_container.dart @@ -1,3 +1,4 @@ +// Flutter imports: import 'package:flutter/material.dart'; class PQuestionContainer extends StatelessWidget { diff --git a/lib/pangea/widgets/user_settings/p_settings_switch_list_tile.dart b/lib/pangea/widgets/user_settings/p_settings_switch_list_tile.dart index 9b37a5719..0d3b0eb72 100644 --- a/lib/pangea/widgets/user_settings/p_settings_switch_list_tile.dart +++ b/lib/pangea/widgets/user_settings/p_settings_switch_list_tile.dart @@ -1,7 +1,10 @@ +// Flutter imports: +import 'package:flutter/material.dart'; + +// Project imports: import 'package:fluffychat/config/app_config.dart'; import 'package:fluffychat/pangea/controllers/pangea_controller.dart'; import 'package:fluffychat/widgets/matrix.dart'; -import 'package:flutter/material.dart'; class PSettingsSwitchListTile extends StatefulWidget { final bool defaultValue; diff --git a/lib/pangea/word_cloud/word_cloud_setting.dart b/lib/pangea/word_cloud/word_cloud_setting.dart index 06c80933d..aa5ce51cc 100644 --- a/lib/pangea/word_cloud/word_cloud_setting.dart +++ b/lib/pangea/word_cloud/word_cloud_setting.dart @@ -1,8 +1,12 @@ +// Dart imports: import 'dart:math'; -import 'package:fluffychat/pangea/word_cloud/word_cloud_shape.dart'; +// Flutter imports: import 'package:flutter/material.dart'; +// Project imports: +import 'package:fluffychat/pangea/word_cloud/word_cloud_shape.dart'; + class WordCloudSetting { double mapX = 0; double mapY = 0; diff --git a/lib/pangea/word_cloud/word_cloud_tap_view.dart b/lib/pangea/word_cloud/word_cloud_tap_view.dart index a062acb71..bc59f100c 100644 --- a/lib/pangea/word_cloud/word_cloud_tap_view.dart +++ b/lib/pangea/word_cloud/word_cloud_tap_view.dart @@ -1,8 +1,11 @@ +// Flutter imports: +import 'package:flutter/material.dart'; + +// Project imports: import 'package:fluffychat/pangea/word_cloud/word_cloud_data.dart'; import 'package:fluffychat/pangea/word_cloud/word_cloud_setting.dart'; import 'package:fluffychat/pangea/word_cloud/word_cloud_shape.dart'; import 'package:fluffychat/pangea/word_cloud/word_cloud_tap.dart'; -import 'package:flutter/material.dart'; class WordCloudTapView extends StatefulWidget { final WordCloudData data; diff --git a/lib/pangea/word_cloud/word_cloud_view.dart b/lib/pangea/word_cloud/word_cloud_view.dart index e4c95b953..869e10258 100644 --- a/lib/pangea/word_cloud/word_cloud_view.dart +++ b/lib/pangea/word_cloud/word_cloud_view.dart @@ -1,7 +1,10 @@ +// Flutter imports: +import 'package:flutter/material.dart'; + +// Project imports: import 'package:fluffychat/pangea/word_cloud/word_cloud_data.dart'; import 'package:fluffychat/pangea/word_cloud/word_cloud_setting.dart'; import 'package:fluffychat/pangea/word_cloud/word_cloud_shape.dart'; -import 'package:flutter/material.dart'; class WordCloudView extends StatefulWidget { final WordCloudData data; diff --git a/lib/utils/account_bundles.dart b/lib/utils/account_bundles.dart index 8bd296e05..336c7202e 100644 --- a/lib/utils/account_bundles.dart +++ b/lib/utils/account_bundles.dart @@ -1,3 +1,4 @@ +// Package imports: import 'package:matrix/matrix.dart'; class AccountBundles { diff --git a/lib/utils/adaptive_bottom_sheet.dart b/lib/utils/adaptive_bottom_sheet.dart index 8b4a96c30..5d403e2f6 100644 --- a/lib/utils/adaptive_bottom_sheet.dart +++ b/lib/utils/adaptive_bottom_sheet.dart @@ -1,7 +1,10 @@ +// Flutter imports: +import 'package:flutter/material.dart'; + +// Project imports: import 'package:fluffychat/config/app_config.dart'; import 'package:fluffychat/config/themes.dart'; import 'package:fluffychat/utils/platform_infos.dart'; -import 'package:flutter/material.dart'; Future showAdaptiveBottomSheet({ required BuildContext context, diff --git a/lib/utils/background_push.dart b/lib/utils/background_push.dart index 6ee4c8c07..67f8617c6 100644 --- a/lib/utils/background_push.dart +++ b/lib/utils/background_push.dart @@ -17,20 +17,19 @@ * along with this program. If not, see . */ +// Dart imports: import 'dart:async'; import 'dart:convert'; import 'dart:io'; +// Flutter imports: +import 'package:flutter/foundation.dart'; +import 'package:flutter/material.dart'; + +// Package imports: import 'package:fcm_shared_isolate/fcm_shared_isolate.dart'; import 'package:firebase_core/firebase_core.dart'; import 'package:firebase_messaging/firebase_messaging.dart'; -import 'package:fluffychat/pangea/constants/language_keys.dart'; -import 'package:fluffychat/pangea/utils/error_handler.dart'; -import 'package:fluffychat/utils/matrix_sdk_extensions/client_stories_extension.dart'; -import 'package:fluffychat/utils/push_helper.dart'; -import 'package:fluffychat/widgets/fluffy_chat_app.dart'; -import 'package:flutter/foundation.dart'; -import 'package:flutter/material.dart'; import 'package:flutter_app_badger/flutter_app_badger.dart'; import 'package:flutter_gen/gen_l10n/l10n.dart'; import 'package:flutter_local_notifications/flutter_local_notifications.dart'; @@ -38,6 +37,12 @@ import 'package:http/http.dart' as http; import 'package:matrix/matrix.dart'; import 'package:unifiedpush/unifiedpush.dart'; +// Project imports: +import 'package:fluffychat/pangea/constants/language_keys.dart'; +import 'package:fluffychat/pangea/utils/error_handler.dart'; +import 'package:fluffychat/utils/matrix_sdk_extensions/client_stories_extension.dart'; +import 'package:fluffychat/utils/push_helper.dart'; +import 'package:fluffychat/widgets/fluffy_chat_app.dart'; import '../config/app_config.dart'; import '../config/setting_keys.dart'; import '../widgets/matrix.dart'; diff --git a/lib/utils/client_manager.dart b/lib/utils/client_manager.dart index 449c2ca17..b7204af66 100644 --- a/lib/utils/client_manager.dart +++ b/lib/utils/client_manager.dart @@ -1,15 +1,20 @@ -import 'package:fluffychat/pangea/constants/pangea_event_types.dart'; -import 'package:fluffychat/utils/custom_http_client.dart'; -import 'package:fluffychat/utils/custom_image_resizer.dart'; -import 'package:fluffychat/utils/matrix_sdk_extensions/flutter_hive_collections_database.dart'; -import 'package:fluffychat/utils/platform_infos.dart'; +// Flutter imports: import 'package:flutter/foundation.dart'; + +// Package imports: import 'package:hive_flutter/hive_flutter.dart'; import 'package:matrix/encryption/utils/key_verification.dart'; import 'package:matrix/matrix.dart'; import 'package:path_provider/path_provider.dart'; import 'package:shared_preferences/shared_preferences.dart'; +// Project imports: +import 'package:fluffychat/pangea/constants/pangea_event_types.dart'; +import 'package:fluffychat/utils/custom_http_client.dart'; +import 'package:fluffychat/utils/custom_image_resizer.dart'; +import 'package:fluffychat/utils/matrix_sdk_extensions/flutter_hive_collections_database.dart'; +import 'package:fluffychat/utils/platform_infos.dart'; + abstract class ClientManager { static const String clientNamespace = 'im.fluffychat.store.clients'; static Future> getClients({ diff --git a/lib/utils/custom_http_client.dart b/lib/utils/custom_http_client.dart index 479e5edb5..317c66a59 100644 --- a/lib/utils/custom_http_client.dart +++ b/lib/utils/custom_http_client.dart @@ -1,9 +1,12 @@ +// Dart imports: import 'dart:convert'; import 'dart:io'; +// Package imports: import 'package:http/http.dart' as http; import 'package:http/io_client.dart'; +// Project imports: import 'package:fluffychat/config/isrg_x1.dart'; class CustomHttpClient { diff --git a/lib/utils/custom_image_resizer.dart b/lib/utils/custom_image_resizer.dart index 48b803a90..4052da94b 100644 --- a/lib/utils/custom_image_resizer.dart +++ b/lib/utils/custom_image_resizer.dart @@ -1,6 +1,8 @@ +// Dart imports: import 'dart:typed_data'; import 'dart:ui'; +// Package imports: import 'package:matrix/matrix.dart'; import 'package:native_imaging/native_imaging.dart' as native; diff --git a/lib/utils/custom_scroll_behaviour.dart b/lib/utils/custom_scroll_behaviour.dart index ba25e9564..cd46cc055 100644 --- a/lib/utils/custom_scroll_behaviour.dart +++ b/lib/utils/custom_scroll_behaviour.dart @@ -1,3 +1,4 @@ +// Flutter imports: import 'package:flutter/gestures.dart'; import 'package:flutter/material.dart'; diff --git a/lib/utils/date_time_extension.dart b/lib/utils/date_time_extension.dart index fac35352d..7cc46e766 100644 --- a/lib/utils/date_time_extension.dart +++ b/lib/utils/date_time_extension.dart @@ -1,4 +1,7 @@ +// Flutter imports: import 'package:flutter/material.dart'; + +// Package imports: import 'package:flutter_gen/gen_l10n/l10n.dart'; import 'package:intl/intl.dart'; diff --git a/lib/utils/error_reporter.dart b/lib/utils/error_reporter.dart index 8869966eb..c6974b9c4 100644 --- a/lib/utils/error_reporter.dart +++ b/lib/utils/error_reporter.dart @@ -1,15 +1,21 @@ +// Dart imports: import 'dart:io'; -import 'package:adaptive_dialog/adaptive_dialog.dart'; -import 'package:fluffychat/config/app_config.dart'; -import 'package:fluffychat/utils/localized_exception_extension.dart'; -import 'package:fluffychat/utils/platform_infos.dart'; +// Flutter imports: import 'package:flutter/foundation.dart'; import 'package:flutter/material.dart'; + +// Package imports: +import 'package:adaptive_dialog/adaptive_dialog.dart'; import 'package:flutter_gen/gen_l10n/l10n.dart'; import 'package:matrix/matrix.dart'; import 'package:url_launcher/url_launcher.dart'; +// Project imports: +import 'package:fluffychat/config/app_config.dart'; +import 'package:fluffychat/utils/localized_exception_extension.dart'; +import 'package:fluffychat/utils/platform_infos.dart'; + class ErrorReporter { final BuildContext context; final String? message; diff --git a/lib/utils/fluffy_share.dart b/lib/utils/fluffy_share.dart index 598e88d34..6499adba5 100644 --- a/lib/utils/fluffy_share.dart +++ b/lib/utils/fluffy_share.dart @@ -1,9 +1,13 @@ -import 'package:fluffychat/utils/platform_infos.dart'; +// Flutter imports: import 'package:flutter/material.dart'; import 'package:flutter/services.dart'; + +// Package imports: import 'package:flutter_gen/gen_l10n/l10n.dart'; import 'package:share_plus/share_plus.dart'; +// Project imports: +import 'package:fluffychat/utils/platform_infos.dart'; import '../widgets/matrix.dart'; abstract class FluffyShare { diff --git a/lib/utils/localized_exception_extension.dart b/lib/utils/localized_exception_extension.dart index d665c7f10..325e0dc39 100644 --- a/lib/utils/localized_exception_extension.dart +++ b/lib/utils/localized_exception_extension.dart @@ -1,10 +1,14 @@ +// Dart imports: import 'dart:io'; +// Flutter imports: import 'package:flutter/material.dart'; +// Package imports: import 'package:flutter_gen/gen_l10n/l10n.dart'; import 'package:matrix/matrix.dart'; +// Project imports: import 'package:fluffychat/pages/tasks/tasks.dart'; import 'uia_request_manager.dart'; diff --git a/lib/utils/matrix_sdk_extensions/client_stories_extension.dart b/lib/utils/matrix_sdk_extensions/client_stories_extension.dart index 184afc8fd..362e87186 100644 --- a/lib/utils/matrix_sdk_extensions/client_stories_extension.dart +++ b/lib/utils/matrix_sdk_extensions/client_stories_extension.dart @@ -1,9 +1,14 @@ -import 'package:adaptive_dialog/adaptive_dialog.dart'; -import 'package:fluffychat/utils/matrix_sdk_extensions/matrix_locals.dart'; +// Flutter imports: import 'package:flutter/cupertino.dart'; + +// Package imports: +import 'package:adaptive_dialog/adaptive_dialog.dart'; import 'package:flutter_gen/gen_l10n/l10n.dart'; import 'package:matrix/matrix.dart'; +// Project imports: +import 'package:fluffychat/utils/matrix_sdk_extensions/matrix_locals.dart'; + extension ClientStoriesExtension on Client { static const String storiesRoomType = 'msc3588.stories.stories-room'; static const String storiesBlockListType = 'msc3588.stories.block-list'; diff --git a/lib/utils/matrix_sdk_extensions/device_extension.dart b/lib/utils/matrix_sdk_extensions/device_extension.dart index 55f3ebfc9..180a8c1a7 100644 --- a/lib/utils/matrix_sdk_extensions/device_extension.dart +++ b/lib/utils/matrix_sdk_extensions/device_extension.dart @@ -1,5 +1,7 @@ +// Flutter imports: import 'package:flutter/material.dart'; +// Package imports: import 'package:matrix/matrix.dart'; IconData _getIconFromName(String displayname) { diff --git a/lib/utils/matrix_sdk_extensions/event_extension.dart b/lib/utils/matrix_sdk_extensions/event_extension.dart index ddd5abe80..9bc9258cd 100644 --- a/lib/utils/matrix_sdk_extensions/event_extension.dart +++ b/lib/utils/matrix_sdk_extensions/event_extension.dart @@ -1,12 +1,16 @@ +// Dart imports: import 'dart:developer'; +// Flutter imports: import 'package:flutter/foundation.dart'; import 'package:flutter/material.dart'; +// Package imports: import 'package:async/async.dart' as async; import 'package:future_loading_dialog/future_loading_dialog.dart'; import 'package:matrix/matrix.dart'; +// Project imports: import 'package:fluffychat/utils/size_string.dart'; import 'matrix_file_extension.dart'; diff --git a/lib/utils/matrix_sdk_extensions/filtered_timeline_extension.dart b/lib/utils/matrix_sdk_extensions/filtered_timeline_extension.dart index 7ae2bf0c5..eccc21bed 100644 --- a/lib/utils/matrix_sdk_extensions/filtered_timeline_extension.dart +++ b/lib/utils/matrix_sdk_extensions/filtered_timeline_extension.dart @@ -1,5 +1,7 @@ +// Package imports: import 'package:matrix/matrix.dart'; +// Project imports: import '../../config/app_config.dart'; extension IsStateExtension on Event { diff --git a/lib/utils/matrix_sdk_extensions/flutter_hive_collections_database.dart b/lib/utils/matrix_sdk_extensions/flutter_hive_collections_database.dart index 3fe18942c..138403e74 100644 --- a/lib/utils/matrix_sdk_extensions/flutter_hive_collections_database.dart +++ b/lib/utils/matrix_sdk_extensions/flutter_hive_collections_database.dart @@ -1,8 +1,12 @@ +// Dart imports: import 'dart:convert'; import 'dart:io'; +// Flutter imports: import 'package:flutter/foundation.dart' hide Key; import 'package:flutter/services.dart'; + +// Package imports: import 'package:flutter_secure_storage/flutter_secure_storage.dart'; import 'package:hive/hive.dart'; import 'package:matrix/matrix.dart'; diff --git a/lib/utils/matrix_sdk_extensions/ios_badge_client_extension.dart b/lib/utils/matrix_sdk_extensions/ios_badge_client_extension.dart index bea7713d0..c0170c245 100644 --- a/lib/utils/matrix_sdk_extensions/ios_badge_client_extension.dart +++ b/lib/utils/matrix_sdk_extensions/ios_badge_client_extension.dart @@ -1,7 +1,9 @@ +// Package imports: import 'package:flutter_app_badger/flutter_app_badger.dart'; import 'package:flutter_local_notifications/flutter_local_notifications.dart'; import 'package:matrix/matrix.dart'; +// Project imports: import 'package:fluffychat/utils/platform_infos.dart'; extension IosBadgeClientExtension on Client { diff --git a/lib/utils/matrix_sdk_extensions/matrix_file_extension.dart b/lib/utils/matrix_sdk_extensions/matrix_file_extension.dart index 438af8b00..041b27b3a 100644 --- a/lib/utils/matrix_sdk_extensions/matrix_file_extension.dart +++ b/lib/utils/matrix_sdk_extensions/matrix_file_extension.dart @@ -1,9 +1,11 @@ +// Dart imports: import 'dart:io'; -import 'package:file_picker/file_picker.dart'; -import 'package:fluffychat/utils/platform_infos.dart'; -import 'package:fluffychat/utils/size_string.dart'; +// Flutter imports: import 'package:flutter/material.dart'; + +// Package imports: +import 'package:file_picker/file_picker.dart'; import 'package:flutter_gen/gen_l10n/l10n.dart'; import 'package:future_loading_dialog/future_loading_dialog.dart'; import 'package:matrix/matrix.dart'; @@ -11,6 +13,10 @@ import 'package:path_provider/path_provider.dart'; import 'package:share_plus/share_plus.dart'; import 'package:universal_html/html.dart' as html; +// Project imports: +import 'package:fluffychat/utils/platform_infos.dart'; +import 'package:fluffychat/utils/size_string.dart'; + extension MatrixFileExtension on MatrixFile { void save(BuildContext context) async { if (PlatformInfos.isIOS) { diff --git a/lib/utils/matrix_sdk_extensions/matrix_locals.dart b/lib/utils/matrix_sdk_extensions/matrix_locals.dart index 4a9b68274..4f3afd1c4 100644 --- a/lib/utils/matrix_sdk_extensions/matrix_locals.dart +++ b/lib/utils/matrix_sdk_extensions/matrix_locals.dart @@ -1,3 +1,4 @@ +// Package imports: import 'package:flutter_gen/gen_l10n/l10n.dart'; import 'package:matrix/matrix.dart'; diff --git a/lib/utils/matrix_sdk_extensions/presence_extension.dart b/lib/utils/matrix_sdk_extensions/presence_extension.dart index bb6e1069e..7218d30b5 100644 --- a/lib/utils/matrix_sdk_extensions/presence_extension.dart +++ b/lib/utils/matrix_sdk_extensions/presence_extension.dart @@ -1,8 +1,11 @@ +// Flutter imports: import 'package:flutter/material.dart'; +// Package imports: import 'package:flutter_gen/gen_l10n/l10n.dart'; import 'package:matrix/matrix.dart'; +// Project imports: import '../date_time_extension.dart'; extension PresenceExtension on CachedPresence { diff --git a/lib/utils/platform_infos.dart b/lib/utils/platform_infos.dart index 6cb6bbb16..4710ccc11 100644 --- a/lib/utils/platform_infos.dart +++ b/lib/utils/platform_infos.dart @@ -1,12 +1,17 @@ +// Dart imports: import 'dart:io'; +// Flutter imports: import 'package:flutter/foundation.dart'; import 'package:flutter/material.dart'; + +// Package imports: import 'package:flutter_gen/gen_l10n/l10n.dart'; import 'package:go_router/go_router.dart'; import 'package:package_info_plus/package_info_plus.dart'; import 'package:url_launcher/url_launcher_string.dart'; +// Project imports: import '../config/app_config.dart'; abstract class PlatformInfos { diff --git a/lib/utils/push_helper.dart b/lib/utils/push_helper.dart index 0b2c94330..265b318bd 100644 --- a/lib/utils/push_helper.dart +++ b/lib/utils/push_helper.dart @@ -1,7 +1,19 @@ +// Dart imports: import 'dart:convert'; import 'dart:io'; import 'dart:ui'; +// Flutter imports: +import 'package:flutter/material.dart'; + +// Package imports: +import 'package:flutter_cache_manager/flutter_cache_manager.dart'; +import 'package:flutter_gen/gen_l10n/l10n.dart'; +import 'package:flutter_local_notifications/flutter_local_notifications.dart'; +import 'package:matrix/matrix.dart'; +import 'package:shared_preferences/shared_preferences.dart'; + +// Project imports: import 'package:fluffychat/config/app_config.dart'; import 'package:fluffychat/config/setting_keys.dart'; import 'package:fluffychat/pangea/utils/error_handler.dart'; @@ -9,12 +21,6 @@ import 'package:fluffychat/utils/client_manager.dart'; import 'package:fluffychat/utils/matrix_sdk_extensions/matrix_locals.dart'; import 'package:fluffychat/utils/platform_infos.dart'; import 'package:fluffychat/utils/voip/callkeep_manager.dart'; -import 'package:flutter/material.dart'; -import 'package:flutter_cache_manager/flutter_cache_manager.dart'; -import 'package:flutter_gen/gen_l10n/l10n.dart'; -import 'package:flutter_local_notifications/flutter_local_notifications.dart'; -import 'package:matrix/matrix.dart'; -import 'package:shared_preferences/shared_preferences.dart'; Future pushHelper( PushNotification notification, { diff --git a/lib/utils/resize_image.dart b/lib/utils/resize_image.dart index 3bfe81a6d..f845c6ba1 100644 --- a/lib/utils/resize_image.dart +++ b/lib/utils/resize_image.dart @@ -1,9 +1,12 @@ +// Dart imports: import 'dart:io'; +// Package imports: import 'package:matrix/matrix.dart'; import 'package:path_provider/path_provider.dart'; import 'package:video_compress/video_compress.dart'; +// Project imports: import 'package:fluffychat/utils/platform_infos.dart'; extension ResizeImage on MatrixFile { diff --git a/lib/utils/room_status_extension.dart b/lib/utils/room_status_extension.dart index 3b4e623f7..2bbeb5311 100644 --- a/lib/utils/room_status_extension.dart +++ b/lib/utils/room_status_extension.dart @@ -1,8 +1,11 @@ +// Flutter imports: import 'package:flutter/widgets.dart'; +// Package imports: import 'package:flutter_gen/gen_l10n/l10n.dart'; import 'package:matrix/matrix.dart'; +// Project imports: import '../config/app_config.dart'; import 'date_time_extension.dart'; diff --git a/lib/utils/story_theme_data.dart b/lib/utils/story_theme_data.dart index 9006dcc0a..c37cdf03f 100644 --- a/lib/utils/story_theme_data.dart +++ b/lib/utils/story_theme_data.dart @@ -1,5 +1,7 @@ +// Flutter imports: import 'package:flutter/material.dart'; +// Package imports: import 'package:matrix/matrix.dart'; class StoryThemeData { diff --git a/lib/utils/stream_extension.dart b/lib/utils/stream_extension.dart index 66e840fce..25f2eb613 100644 --- a/lib/utils/stream_extension.dart +++ b/lib/utils/stream_extension.dart @@ -1,3 +1,4 @@ +// Dart imports: import 'dart:async'; extension StreamExtension on Stream { diff --git a/lib/utils/string_color.dart b/lib/utils/string_color.dart index b3c251b3a..09421c17b 100644 --- a/lib/utils/string_color.dart +++ b/lib/utils/string_color.dart @@ -1,3 +1,4 @@ +// Flutter imports: import 'package:flutter/material.dart'; extension StringColor on String { diff --git a/lib/utils/uia_request_manager.dart b/lib/utils/uia_request_manager.dart index 716c0d172..22f145191 100644 --- a/lib/utils/uia_request_manager.dart +++ b/lib/utils/uia_request_manager.dart @@ -1,11 +1,15 @@ +// Dart imports: import 'dart:async'; +// Package imports: import 'package:adaptive_dialog/adaptive_dialog.dart'; -import 'package:fluffychat/widgets/matrix.dart'; import 'package:flutter_gen/gen_l10n/l10n.dart'; import 'package:matrix/matrix.dart'; import 'package:url_launcher/url_launcher_string.dart'; +// Project imports: +import 'package:fluffychat/widgets/matrix.dart'; + extension UiaRequestManager on MatrixState { Future uiaRequestHandler(UiaRequest uiaRequest) async { final l10n = L10n.of(context)!; diff --git a/lib/utils/update_checker_no_store.dart b/lib/utils/update_checker_no_store.dart index d41bc07f6..1a7301a62 100644 --- a/lib/utils/update_checker_no_store.dart +++ b/lib/utils/update_checker_no_store.dart @@ -1,15 +1,19 @@ +// Dart imports: import 'dart:convert'; import 'dart:io'; +// Flutter imports: import 'package:flutter/foundation.dart'; import 'package:flutter/material.dart'; +// Package imports: import 'package:adaptive_dialog/adaptive_dialog.dart'; import 'package:flutter_gen/gen_l10n/l10n.dart'; import 'package:http/http.dart'; import 'package:matrix/matrix.dart'; import 'package:path_provider/path_provider.dart'; +// Project imports: import 'platform_infos.dart'; /// helper class checking for updates on platforms without store release diff --git a/lib/utils/url_launcher.dart b/lib/utils/url_launcher.dart index 5be6c808a..439852f95 100644 --- a/lib/utils/url_launcher.dart +++ b/lib/utils/url_launcher.dart @@ -1,11 +1,9 @@ +// Flutter imports: +import 'package:flutter/material.dart'; + +// Package imports: import 'package:adaptive_dialog/adaptive_dialog.dart'; import 'package:collection/collection.dart' show IterableExtension; -import 'package:fluffychat/config/app_config.dart'; -import 'package:fluffychat/pages/user_bottom_sheet/user_bottom_sheet.dart'; -import 'package:fluffychat/utils/adaptive_bottom_sheet.dart'; -import 'package:fluffychat/widgets/matrix.dart'; -import 'package:fluffychat/widgets/public_room_bottom_sheet.dart'; -import 'package:flutter/material.dart'; import 'package:flutter_gen/gen_l10n/l10n.dart'; import 'package:future_loading_dialog/future_loading_dialog.dart'; import 'package:go_router/go_router.dart'; @@ -13,6 +11,12 @@ import 'package:matrix/matrix.dart'; import 'package:punycode/punycode.dart'; import 'package:url_launcher/url_launcher_string.dart'; +// Project imports: +import 'package:fluffychat/config/app_config.dart'; +import 'package:fluffychat/pages/user_bottom_sheet/user_bottom_sheet.dart'; +import 'package:fluffychat/utils/adaptive_bottom_sheet.dart'; +import 'package:fluffychat/widgets/matrix.dart'; +import 'package:fluffychat/widgets/public_room_bottom_sheet.dart'; import 'platform_infos.dart'; class UrlLauncher { diff --git a/lib/utils/voip/callkeep_manager.dart b/lib/utils/voip/callkeep_manager.dart index 6de7cb6e3..07fb2c6e8 100644 --- a/lib/utils/voip/callkeep_manager.dart +++ b/lib/utils/voip/callkeep_manager.dart @@ -1,13 +1,17 @@ +// Dart imports: import 'dart:async'; +// Flutter imports: import 'package:flutter/material.dart'; +// Package imports: import 'package:callkeep/callkeep.dart'; import 'package:flutter_foreground_task/flutter_foreground_task.dart'; import 'package:flutter_gen/gen_l10n/l10n.dart'; import 'package:matrix/matrix.dart'; import 'package:permission_handler/permission_handler.dart'; +// Project imports: import 'package:fluffychat/utils/voip_plugin.dart'; class CallKeeper { diff --git a/lib/utils/voip/user_media_manager.dart b/lib/utils/voip/user_media_manager.dart index 874da93ee..de19596d8 100644 --- a/lib/utils/voip/user_media_manager.dart +++ b/lib/utils/voip/user_media_manager.dart @@ -1,8 +1,11 @@ +// Flutter imports: import 'package:flutter/foundation.dart'; +// Package imports: import 'package:flutter_ringtone_player/flutter_ringtone_player.dart'; import 'package:just_audio/just_audio.dart'; +// Project imports: import 'package:fluffychat/utils/platform_infos.dart'; class UserMediaManager { diff --git a/lib/utils/voip_plugin.dart b/lib/utils/voip_plugin.dart index 186b4da3d..785f1ece0 100644 --- a/lib/utils/voip_plugin.dart +++ b/lib/utils/voip_plugin.dart @@ -1,15 +1,20 @@ +// Dart imports: import 'dart:core'; -import 'package:fluffychat/pages/chat_list/chat_list.dart'; -import 'package:fluffychat/pages/dialer/dialer.dart'; -import 'package:fluffychat/utils/platform_infos.dart'; +// Flutter imports: import 'package:flutter/foundation.dart'; import 'package:flutter/material.dart'; + +// Package imports: import 'package:flutter_foreground_task/flutter_foreground_task.dart'; import 'package:flutter_webrtc/flutter_webrtc.dart' as webrtc_impl; import 'package:matrix/matrix.dart'; import 'package:webrtc_interface/webrtc_interface.dart' hide Navigator; +// Project imports: +import 'package:fluffychat/pages/chat_list/chat_list.dart'; +import 'package:fluffychat/pages/dialer/dialer.dart'; +import 'package:fluffychat/utils/platform_infos.dart'; import '../../utils/voip/callkeep_manager.dart'; import '../../utils/voip/user_media_manager.dart'; import '../widgets/matrix.dart'; diff --git a/lib/widgets/adaptive_flat_button.dart b/lib/widgets/adaptive_flat_button.dart index faed7e951..c525e8813 100644 --- a/lib/widgets/adaptive_flat_button.dart +++ b/lib/widgets/adaptive_flat_button.dart @@ -1,6 +1,8 @@ +// Flutter imports: import 'package:flutter/cupertino.dart'; import 'package:flutter/material.dart'; +// Project imports: import 'package:fluffychat/utils/platform_infos.dart'; class AdaptiveFlatButton extends StatelessWidget { diff --git a/lib/widgets/app_lock.dart b/lib/widgets/app_lock.dart index ace02b227..f39401545 100644 --- a/lib/widgets/app_lock.dart +++ b/lib/widgets/app_lock.dart @@ -1,9 +1,12 @@ +// Flutter imports: import 'package:flutter/material.dart'; +// Package imports: import 'package:flutter_secure_storage/flutter_secure_storage.dart'; import 'package:matrix/matrix.dart'; import 'package:provider/provider.dart'; +// Project imports: import 'package:fluffychat/config/setting_keys.dart'; import 'package:fluffychat/widgets/lock_screen.dart'; diff --git a/lib/widgets/avatar.dart b/lib/widgets/avatar.dart index b711d614f..a5de36275 100644 --- a/lib/widgets/avatar.dart +++ b/lib/widgets/avatar.dart @@ -1,7 +1,12 @@ +// Flutter imports: +import 'package:flutter/material.dart'; + +// Package imports: +import 'package:matrix/matrix.dart'; + +// Project imports: import 'package:fluffychat/utils/string_color.dart'; import 'package:fluffychat/widgets/mxc_image.dart'; -import 'package:flutter/material.dart'; -import 'package:matrix/matrix.dart'; class Avatar extends StatelessWidget { final Uri? mxContent; diff --git a/lib/widgets/chat_settings_popup_menu.dart b/lib/widgets/chat_settings_popup_menu.dart index 698f0cf7a..077cf006f 100644 --- a/lib/widgets/chat_settings_popup_menu.dart +++ b/lib/widgets/chat_settings_popup_menu.dart @@ -1,18 +1,23 @@ +// Dart imports: import 'dart:async'; -import 'package:adaptive_dialog/adaptive_dialog.dart'; -import 'package:fluffychat/pangea/controllers/pangea_controller.dart'; -import 'package:fluffychat/pangea/extensions/pangea_room_extension.dart'; -import 'package:fluffychat/pangea/models/class_model.dart'; -import 'package:fluffychat/pangea/utils/download_chat.dart'; +// Flutter imports: import 'package:flutter/material.dart'; import 'package:flutter/services.dart'; + +// Package imports: +import 'package:adaptive_dialog/adaptive_dialog.dart'; import 'package:flutter_gen/gen_l10n/l10n.dart'; import 'package:future_loading_dialog/future_loading_dialog.dart'; import 'package:go_router/go_router.dart'; import 'package:keyboard_shortcuts/keyboard_shortcuts.dart'; import 'package:matrix/matrix.dart'; +// Project imports: +import 'package:fluffychat/pangea/controllers/pangea_controller.dart'; +import 'package:fluffychat/pangea/extensions/pangea_room_extension.dart'; +import 'package:fluffychat/pangea/models/class_model.dart'; +import 'package:fluffychat/pangea/utils/download_chat.dart'; import 'matrix.dart'; class ChatSettingsPopupMenu extends StatefulWidget { diff --git a/lib/widgets/connection_status_header.dart b/lib/widgets/connection_status_header.dart index 2283c41bf..a3d1755e7 100644 --- a/lib/widgets/connection_status_header.dart +++ b/lib/widgets/connection_status_header.dart @@ -1,10 +1,14 @@ +// Dart imports: import 'dart:async'; +// Flutter imports: import 'package:flutter/material.dart'; +// Package imports: import 'package:flutter_gen/gen_l10n/l10n.dart'; import 'package:matrix/matrix.dart'; +// Project imports: import '../config/themes.dart'; import '../utils/localized_exception_extension.dart'; import 'matrix.dart'; diff --git a/lib/widgets/content_banner.dart b/lib/widgets/content_banner.dart index f9e6a6167..6fb10d13c 100644 --- a/lib/widgets/content_banner.dart +++ b/lib/widgets/content_banner.dart @@ -1,7 +1,10 @@ +// Flutter imports: import 'package:flutter/material.dart'; +// Package imports: import 'package:matrix/matrix.dart'; +// Project imports: import 'package:fluffychat/widgets/mxc_image.dart'; class ContentBanner extends StatelessWidget { diff --git a/lib/widgets/error_widget.dart b/lib/widgets/error_widget.dart index 8606c7608..cb80cf364 100644 --- a/lib/widgets/error_widget.dart +++ b/lib/widgets/error_widget.dart @@ -1,5 +1,7 @@ +// Flutter imports: import 'package:flutter/material.dart'; +// Project imports: import 'package:fluffychat/utils/error_reporter.dart'; class FluffyChatErrorWidget extends StatefulWidget { diff --git a/lib/widgets/fluffy_chat_app.dart b/lib/widgets/fluffy_chat_app.dart index ac202798b..18892a21b 100644 --- a/lib/widgets/fluffy_chat_app.dart +++ b/lib/widgets/fluffy_chat_app.dart @@ -1,16 +1,20 @@ -import 'package:country_picker/country_picker.dart'; -import 'package:fluffychat/config/routes.dart'; -import 'package:fluffychat/config/themes.dart'; -import 'package:fluffychat/pangea/utils/firebase_analytics.dart'; -import 'package:fluffychat/widgets/app_lock.dart'; -import 'package:fluffychat/widgets/theme_builder.dart'; +// Flutter imports: import 'package:flutter/material.dart'; + +// Package imports: +import 'package:country_picker/country_picker.dart'; import 'package:flutter_gen/gen_l10n/l10n.dart'; import 'package:flutter_localizations/flutter_localizations.dart'; import 'package:go_router/go_router.dart'; import 'package:matrix/matrix.dart'; import 'package:shared_preferences/shared_preferences.dart'; +// Project imports: +import 'package:fluffychat/config/routes.dart'; +import 'package:fluffychat/config/themes.dart'; +import 'package:fluffychat/pangea/utils/firebase_analytics.dart'; +import 'package:fluffychat/widgets/app_lock.dart'; +import 'package:fluffychat/widgets/theme_builder.dart'; import '../config/app_config.dart'; import '../utils/custom_scroll_behaviour.dart'; import 'matrix.dart'; diff --git a/lib/widgets/hover_builder.dart b/lib/widgets/hover_builder.dart index f895d8532..9ce3eae20 100644 --- a/lib/widgets/hover_builder.dart +++ b/lib/widgets/hover_builder.dart @@ -1,3 +1,4 @@ +// Flutter imports: import 'package:flutter/material.dart'; class HoverBuilder extends StatefulWidget { diff --git a/lib/widgets/layouts/empty_page.dart b/lib/widgets/layouts/empty_page.dart index d976d0e0b..f6faaeb52 100644 --- a/lib/widgets/layouts/empty_page.dart +++ b/lib/widgets/layouts/empty_page.dart @@ -1,8 +1,12 @@ +// Dart imports: import 'dart:math'; -import 'package:fluffychat/pangea/widgets/common/pangea_logo_svg.dart'; +// Flutter imports: import 'package:flutter/material.dart'; +// Project imports: +import 'package:fluffychat/pangea/widgets/common/pangea_logo_svg.dart'; + class EmptyPage extends StatelessWidget { final bool loading; static const double _width = 300; diff --git a/lib/widgets/layouts/login_scaffold.dart b/lib/widgets/layouts/login_scaffold.dart index 5eaa3f86d..508d4949d 100644 --- a/lib/widgets/layouts/login_scaffold.dart +++ b/lib/widgets/layouts/login_scaffold.dart @@ -1,9 +1,14 @@ +// Flutter imports: +import 'package:flutter/material.dart'; + +// Package imports: +import 'package:flutter_gen/gen_l10n/l10n.dart'; +import 'package:url_launcher/url_launcher_string.dart'; + +// Project imports: import 'package:fluffychat/config/app_config.dart'; import 'package:fluffychat/config/themes.dart'; import 'package:fluffychat/utils/platform_infos.dart'; -import 'package:flutter/material.dart'; -import 'package:flutter_gen/gen_l10n/l10n.dart'; -import 'package:url_launcher/url_launcher_string.dart'; class LoginScaffold extends StatelessWidget { final Widget body; diff --git a/lib/widgets/layouts/max_width_body.dart b/lib/widgets/layouts/max_width_body.dart index f57214a3d..0f6ce49c6 100644 --- a/lib/widgets/layouts/max_width_body.dart +++ b/lib/widgets/layouts/max_width_body.dart @@ -1,8 +1,12 @@ +// Dart imports: import 'dart:math'; -import 'package:fluffychat/config/app_config.dart'; +// Flutter imports: import 'package:flutter/material.dart'; +// Project imports: +import 'package:fluffychat/config/app_config.dart'; + class MaxWidthBody extends StatelessWidget { final Widget? child; final double maxWidth; diff --git a/lib/widgets/layouts/two_column_layout.dart b/lib/widgets/layouts/two_column_layout.dart index a6f4c8bdf..81bc10a95 100644 --- a/lib/widgets/layouts/two_column_layout.dart +++ b/lib/widgets/layouts/two_column_layout.dart @@ -1,3 +1,4 @@ +// Flutter imports: import 'package:flutter/material.dart'; class TwoColumnLayout extends StatelessWidget { diff --git a/lib/widgets/local_notifications_extension.dart b/lib/widgets/local_notifications_extension.dart index e326b9aa8..25b3c51c1 100644 --- a/lib/widgets/local_notifications_extension.dart +++ b/lib/widgets/local_notifications_extension.dart @@ -1,12 +1,12 @@ +// Dart imports: import 'dart:io'; +// Flutter imports: +import 'package:flutter/foundation.dart'; + +// Package imports: import 'package:desktop_lifecycle/desktop_lifecycle.dart'; import 'package:desktop_notifications/desktop_notifications.dart'; -import 'package:fluffychat/config/app_config.dart'; -import 'package:fluffychat/utils/matrix_sdk_extensions/matrix_locals.dart'; -import 'package:fluffychat/utils/platform_infos.dart'; -import 'package:fluffychat/widgets/matrix.dart'; -import 'package:flutter/foundation.dart'; import 'package:flutter_gen/gen_l10n/l10n.dart'; import 'package:go_router/go_router.dart'; import 'package:http/http.dart' as http; @@ -14,6 +14,12 @@ import 'package:matrix/matrix.dart'; import 'package:path_provider/path_provider.dart'; import 'package:universal_html/html.dart' as html; +// Project imports: +import 'package:fluffychat/config/app_config.dart'; +import 'package:fluffychat/utils/matrix_sdk_extensions/matrix_locals.dart'; +import 'package:fluffychat/utils/platform_infos.dart'; +import 'package:fluffychat/widgets/matrix.dart'; + extension LocalNotificationsExtension on MatrixState { static final html.AudioElement _audioPlayer = html.AudioElement() ..src = 'assets/assets/sounds/notification.ogg' diff --git a/lib/widgets/lock_screen.dart b/lib/widgets/lock_screen.dart index 775b132b1..3075af419 100644 --- a/lib/widgets/lock_screen.dart +++ b/lib/widgets/lock_screen.dart @@ -1,11 +1,17 @@ +// Dart imports: import 'dart:async'; +// Flutter imports: +import 'package:flutter/material.dart'; + +// Package imports: +import 'package:flutter_gen/gen_l10n/l10n.dart'; + +// Project imports: import 'package:fluffychat/config/app_config.dart'; import 'package:fluffychat/config/themes.dart'; import 'package:fluffychat/widgets/app_lock.dart'; import 'package:fluffychat/widgets/theme_builder.dart'; -import 'package:flutter/material.dart'; -import 'package:flutter_gen/gen_l10n/l10n.dart'; class LockScreen extends StatefulWidget { const LockScreen({super.key}); diff --git a/lib/widgets/log_view.dart b/lib/widgets/log_view.dart index e7e5f9238..a24e92f8f 100644 --- a/lib/widgets/log_view.dart +++ b/lib/widgets/log_view.dart @@ -1,4 +1,7 @@ +// Flutter imports: import 'package:flutter/material.dart'; + +// Package imports: import 'package:go_router/go_router.dart'; import 'package:matrix/matrix.dart'; diff --git a/lib/widgets/matrix.dart b/lib/widgets/matrix.dart index b9acf4828..f2202d234 100644 --- a/lib/widgets/matrix.dart +++ b/lib/widgets/matrix.dart @@ -1,20 +1,16 @@ +// Dart imports: import 'dart:async'; import 'dart:convert'; import 'dart:io'; +// Flutter imports: +import 'package:flutter/foundation.dart'; +import 'package:flutter/material.dart'; + +// Package imports: import 'package:adaptive_dialog/adaptive_dialog.dart'; import 'package:collection/collection.dart'; import 'package:desktop_notifications/desktop_notifications.dart'; -import 'package:fluffychat/pangea/controllers/pangea_controller.dart'; -import 'package:fluffychat/pangea/utils/any_state_holder.dart'; -import 'package:fluffychat/utils/client_manager.dart'; -import 'package:fluffychat/utils/localized_exception_extension.dart'; -import 'package:fluffychat/utils/platform_infos.dart'; -import 'package:fluffychat/utils/uia_request_manager.dart'; -import 'package:fluffychat/utils/voip_plugin.dart'; -import 'package:fluffychat/widgets/fluffy_chat_app.dart'; -import 'package:flutter/foundation.dart'; -import 'package:flutter/material.dart'; import 'package:flutter_gen/gen_l10n/l10n.dart'; import 'package:future_loading_dialog/future_loading_dialog.dart'; import 'package:http/http.dart' as http; @@ -26,6 +22,15 @@ import 'package:shared_preferences/shared_preferences.dart'; import 'package:universal_html/html.dart' as html; import 'package:url_launcher/url_launcher_string.dart'; +// Project imports: +import 'package:fluffychat/pangea/controllers/pangea_controller.dart'; +import 'package:fluffychat/pangea/utils/any_state_holder.dart'; +import 'package:fluffychat/utils/client_manager.dart'; +import 'package:fluffychat/utils/localized_exception_extension.dart'; +import 'package:fluffychat/utils/platform_infos.dart'; +import 'package:fluffychat/utils/uia_request_manager.dart'; +import 'package:fluffychat/utils/voip_plugin.dart'; +import 'package:fluffychat/widgets/fluffy_chat_app.dart'; import '../config/app_config.dart'; import '../config/setting_keys.dart'; import '../pages/key_verification/key_verification_dialog.dart'; diff --git a/lib/widgets/mxc_image.dart b/lib/widgets/mxc_image.dart index 0aedd1e4f..789571f6f 100644 --- a/lib/widgets/mxc_image.dart +++ b/lib/widgets/mxc_image.dart @@ -1,10 +1,14 @@ +// Dart imports: import 'dart:typed_data'; +// Flutter imports: import 'package:flutter/material.dart'; +// Package imports: import 'package:http/http.dart' as http; import 'package:matrix/matrix.dart'; +// Project imports: import 'package:fluffychat/config/themes.dart'; import 'package:fluffychat/utils/matrix_sdk_extensions/matrix_file_extension.dart'; import 'package:fluffychat/widgets/matrix.dart'; diff --git a/lib/widgets/permission_slider_dialog.dart b/lib/widgets/permission_slider_dialog.dart index 712432cef..5444bfb95 100644 --- a/lib/widgets/permission_slider_dialog.dart +++ b/lib/widgets/permission_slider_dialog.dart @@ -1,6 +1,9 @@ -import 'package:adaptive_dialog/adaptive_dialog.dart'; +// Flutter imports: import 'package:flutter/cupertino.dart'; import 'package:flutter/material.dart'; + +// Package imports: +import 'package:adaptive_dialog/adaptive_dialog.dart'; import 'package:flutter_gen/gen_l10n/l10n.dart'; enum PermissionLevel { diff --git a/lib/widgets/presence_builder.dart b/lib/widgets/presence_builder.dart index 223fe0cc7..bd37ae081 100644 --- a/lib/widgets/presence_builder.dart +++ b/lib/widgets/presence_builder.dart @@ -1,7 +1,10 @@ +// Flutter imports: import 'package:flutter/material.dart'; +// Package imports: import 'package:matrix/matrix.dart'; +// Project imports: import 'package:fluffychat/widgets/matrix.dart'; class PresenceBuilder extends StatelessWidget { diff --git a/lib/widgets/profile_bottom_sheet.dart b/lib/widgets/profile_bottom_sheet.dart index 2fe882447..c720d241f 100644 --- a/lib/widgets/profile_bottom_sheet.dart +++ b/lib/widgets/profile_bottom_sheet.dart @@ -1,11 +1,16 @@ -import 'package:fluffychat/widgets/avatar.dart'; -import 'package:fluffychat/widgets/matrix.dart'; +// Flutter imports: import 'package:flutter/material.dart'; + +// Package imports: import 'package:flutter_gen/gen_l10n/l10n.dart'; import 'package:future_loading_dialog/future_loading_dialog.dart'; import 'package:go_router/go_router.dart'; import 'package:matrix/matrix.dart'; +// Project imports: +import 'package:fluffychat/widgets/avatar.dart'; +import 'package:fluffychat/widgets/matrix.dart'; + class ProfileBottomSheet extends StatelessWidget { final String userId; final BuildContext outerContext; diff --git a/lib/widgets/public_room_bottom_sheet.dart b/lib/widgets/public_room_bottom_sheet.dart index eb386c432..c72792a64 100644 --- a/lib/widgets/public_room_bottom_sheet.dart +++ b/lib/widgets/public_room_bottom_sheet.dart @@ -1,13 +1,17 @@ -import 'package:fluffychat/utils/url_launcher.dart'; -import 'package:fluffychat/widgets/avatar.dart'; -import 'package:fluffychat/widgets/matrix.dart'; +// Flutter imports: import 'package:flutter/material.dart'; + +// Package imports: import 'package:flutter_gen/gen_l10n/l10n.dart'; import 'package:flutter_linkify/flutter_linkify.dart'; import 'package:future_loading_dialog/future_loading_dialog.dart'; import 'package:go_router/go_router.dart'; import 'package:matrix/matrix.dart'; +// Project imports: +import 'package:fluffychat/utils/url_launcher.dart'; +import 'package:fluffychat/widgets/avatar.dart'; +import 'package:fluffychat/widgets/matrix.dart'; import '../utils/localized_exception_extension.dart'; class PublicRoomBottomSheet extends StatelessWidget { diff --git a/lib/widgets/settings_switch_list_tile.dart b/lib/widgets/settings_switch_list_tile.dart index 8f4285a4b..6a175f599 100644 --- a/lib/widgets/settings_switch_list_tile.dart +++ b/lib/widgets/settings_switch_list_tile.dart @@ -1,5 +1,7 @@ +// Flutter imports: import 'package:flutter/material.dart'; +// Project imports: import 'matrix.dart'; class SettingsSwitchListTile extends StatefulWidget { diff --git a/lib/widgets/theme_builder.dart b/lib/widgets/theme_builder.dart index b35a0b449..8ad6a0824 100644 --- a/lib/widgets/theme_builder.dart +++ b/lib/widgets/theme_builder.dart @@ -1,5 +1,7 @@ +// Flutter imports: import 'package:flutter/material.dart'; +// Package imports: import 'package:collection/collection.dart'; import 'package:dynamic_color/dynamic_color.dart'; import 'package:provider/provider.dart'; diff --git a/lib/widgets/unread_rooms_badge.dart b/lib/widgets/unread_rooms_badge.dart index 53582391c..1d12ced18 100644 --- a/lib/widgets/unread_rooms_badge.dart +++ b/lib/widgets/unread_rooms_badge.dart @@ -1,7 +1,11 @@ -import 'package:badges/badges.dart' as b; +// Flutter imports: import 'package:flutter/material.dart'; + +// Package imports: +import 'package:badges/badges.dart' as b; import 'package:matrix/matrix.dart'; +// Project imports: import 'matrix.dart'; class UnreadRoomsBadge extends StatelessWidget { diff --git a/test/archive_test.dart b/test/archive_test.dart index 25bb090e7..01975a49d 100644 --- a/test/archive_test.dart +++ b/test/archive_test.dart @@ -1,3 +1,4 @@ +// Package imports: import 'package:flutter_test/flutter_test.dart'; void main() { diff --git a/test/command_hint_test.dart b/test/command_hint_test.dart index e56f06052..f8062dcef 100644 --- a/test/command_hint_test.dart +++ b/test/command_hint_test.dart @@ -1,8 +1,11 @@ +// Dart imports: import 'dart:convert'; import 'dart:io'; +// Package imports: import 'package:flutter_test/flutter_test.dart'; +// Project imports: import 'utils/test_client.dart'; void main() async { diff --git a/test/homeserver_picker_test.dart b/test/homeserver_picker_test.dart index 054f49cab..d44497df2 100644 --- a/test/homeserver_picker_test.dart +++ b/test/homeserver_picker_test.dart @@ -1,6 +1,7 @@ //import 'package:fluffychat/pages/homeserver_picker.dart'; //import 'package:fluffychat/main.dart'; +// Package imports: import 'package:flutter_test/flutter_test.dart'; //import 'utils/test_client.dart'; diff --git a/test/utils/test_client.dart b/test/utils/test_client.dart index 55fccd03f..cb9c9172c 100644 --- a/test/utils/test_client.dart +++ b/test/utils/test_client.dart @@ -1,9 +1,11 @@ // ignore_for_file: depend_on_referenced_packages +// Package imports: import 'package:matrix/encryption/utils/key_verification.dart'; import 'package:matrix/matrix.dart'; import 'package:matrix_api_lite/fake_matrix_api.dart'; +// Project imports: import 'package:fluffychat/utils/matrix_sdk_extensions/flutter_hive_collections_database.dart'; Future prepareTestClient({ diff --git a/test/widget_test.dart b/test/widget_test.dart index 7d1d98eb6..399376b23 100644 --- a/test/widget_test.dart +++ b/test/widget_test.dart @@ -7,6 +7,7 @@ //import 'package:fluffychat/main.dart'; +// Package imports: import 'package:flutter_test/flutter_test.dart'; //import 'utils/test_client.dart'; diff --git a/test_driver/integration_test.dart b/test_driver/integration_test.dart index b38629cca..ab5f47188 100644 --- a/test_driver/integration_test.dart +++ b/test_driver/integration_test.dart @@ -1,3 +1,4 @@ +// Package imports: import 'package:integration_test/integration_test_driver.dart'; Future main() => integrationDriver();